diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /kio | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio')
216 files changed, 1624 insertions, 1592 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; diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc index 6a5a1346c..a7e8c87c9 100644 --- a/kio/httpfilter/httpfilter.cc +++ b/kio/httpfilter/httpfilter.cc @@ -81,7 +81,7 @@ HTTPFilterMD5::HTTPFilterMD5() TQString HTTPFilterMD5::md5() { - return TQString::fromLatin1(context.base64Digest()); + return TQString::tqfromLatin1(context.base64Digest()); } void diff --git a/kio/httpfilter/httpfilter.h b/kio/httpfilter/httpfilter.h index 6d74a56ea..520a1c627 100644 --- a/kio/httpfilter/httpfilter.h +++ b/kio/httpfilter/httpfilter.h @@ -33,7 +33,7 @@ #include <tqobject.h> #include <kmdcodec.h> -class HTTPFilterBase : public QObject +class HTTPFilterBase : public TQObject { Q_OBJECT public: diff --git a/kio/kfile/config-kfile.h b/kio/kfile/config-kfile.h index 8715ed273..3c5b7c09b 100644 --- a/kio/kfile/config-kfile.h +++ b/kio/kfile/config-kfile.h @@ -3,7 +3,7 @@ const int kfile_area = 250; -#define DefaultViewStyle TQString::fromLatin1("SimpleView") +#define DefaultViewStyle TQString::tqfromLatin1("SimpleView") #define DefaultPannerPosition 40 #define DefaultMixDirsAndFiles false #define DefaultShowStatusLine false @@ -14,19 +14,19 @@ const int kfile_area = 250; #define DefaultRecentURLsNumber 15 #define DefaultDirectoryFollowing true #define DefaultAutoSelectExtChecked true -#define ConfigGroup TQString::fromLatin1("KFileDialog Settings") -#define RecentURLs TQString::fromLatin1("Recent URLs") -#define RecentFiles TQString::fromLatin1("Recent Files") -#define RecentURLsNumber TQString::fromLatin1("Maximum of recent URLs") -#define RecentFilesNumber TQString::fromLatin1("Maximum of recent files") -#define DialogWidth TQString::fromLatin1("Width (%1)") -#define DialogHeight TQString::fromLatin1("Height (%1)") -#define ConfigShowStatusLine TQString::fromLatin1("ShowStatusLine") -#define AutoDirectoryFollowing TQString::fromLatin1("Automatic directory following") -#define PathComboCompletionMode TQString::fromLatin1("PathCombo Completionmode") -#define LocationComboCompletionMode TQString::fromLatin1("LocationCombo Completionmode") -#define ShowSpeedbar TQString::fromLatin1("Show Speedbar") -#define ShowBookmarks TQString::fromLatin1("Show Bookmarks") -#define AutoSelectExtChecked TQString::fromLatin1("Automatically select filename extension") +#define ConfigGroup TQString::tqfromLatin1("KFileDialog Settings") +#define RecentURLs TQString::tqfromLatin1("Recent URLs") +#define RecentFiles TQString::tqfromLatin1("Recent Files") +#define RecentURLsNumber TQString::tqfromLatin1("Maximum of recent URLs") +#define RecentFilesNumber TQString::tqfromLatin1("Maximum of recent files") +#define DialogWidth TQString::tqfromLatin1("Width (%1)") +#define DialogHeight TQString::tqfromLatin1("Height (%1)") +#define ConfigShowStatusLine TQString::tqfromLatin1("ShowStatusLine") +#define AutoDirectoryFollowing TQString::tqfromLatin1("Automatic directory following") +#define PathComboCompletionMode TQString::tqfromLatin1("PathCombo Completionmode") +#define LocationComboCompletionMode TQString::tqfromLatin1("LocationCombo Completionmode") +#define ShowSpeedbar TQString::tqfromLatin1("Show Speedbar") +#define ShowBookmarks TQString::tqfromLatin1("Show Bookmarks") +#define AutoSelectExtChecked TQString::tqfromLatin1("Automatically select filename extension") #endif diff --git a/kio/kfile/images.h b/kio/kfile/images.h index f544e2f0a..62e42afeb 100644 --- a/kio/kfile/images.h +++ b/kio/kfile/images.h @@ -248,7 +248,7 @@ static struct EmbedImage { static const TQImage& qembed_findImage( const TQString& name ) { static TQDict<TQImage> dict; - TQImage* img = dict.find( name ); + TQImage* img = dict.tqfind( name ); if ( !img ) { for ( int i = 0; embed_image_vec[i].data; i++ ) { if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) { diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp index 7f253f8c5..0e58aee6e 100644 --- a/kio/kfile/kacleditwidget.cpp +++ b/kio/kfile/kacleditwidget.cpp @@ -85,7 +85,7 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name ) m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" ); connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) ); TQWidget *spacer = new TQWidget( vbox ); - spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); slotUpdateButtons(); } @@ -148,7 +148,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent, qualifier( _qualifier ), isPartial( false ) { m_pACLListView = dynamic_cast<KACLListView*>( parent ); - repaint(); + tqrepaint(); } @@ -192,7 +192,7 @@ TQString KACLListViewItem::key( int, bool ) const } void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { TQColorGroup mycg = cg; if ( isDefault ) { @@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) ); p->setFont( font ); } - KListViewItem::paintCell( p, mycg, column, width, alignment ); + KListViewItem::paintCell( p, mycg, column, width, tqalignment ); KACLListViewItem *below =0; if ( itemBelow() ) @@ -247,7 +247,7 @@ void KACLListViewItem::updatePermPixmaps() setPixmap( 4, TQPixmap() ); } -void KACLListViewItem::repaint() +void KACLListViewItem::tqrepaint() { int idx = 0; switch ( type ) @@ -495,17 +495,17 @@ void EditACLEntryDialog::slotUpdateAllowedUsersAndGroups() m_groupsCombo->clear(); if ( m_defaultCB && m_defaultCB->isChecked() ) { m_usersCombo->insertStringList( m_defaultUsers ); - if ( m_defaultUsers.find( oldUser ) != m_defaultUsers.end() ) + if ( m_defaultUsers.tqfind( oldUser ) != m_defaultUsers.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_defaultGroups ); - if ( m_defaultGroups.find( oldGroup ) != m_defaultGroups.end() ) + if ( m_defaultGroups.tqfind( oldGroup ) != m_defaultGroups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } else { m_usersCombo->insertStringList( m_users ); - if ( m_users.find( oldUser ) != m_users.end() ) + if ( m_users.tqfind( oldUser ) != m_users.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_groups ); - if ( m_groups.find( oldGroup ) != m_groups.end() ) + if ( m_groups.tqfind( oldGroup ) != m_groups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } } @@ -527,7 +527,7 @@ void EditACLEntryDialog::slotOk() } if ( m_defaultCB ) m_item->isDefault = m_defaultCB->isChecked(); - m_item->repaint(); + m_item->tqrepaint(); KDialogBase::slotOk(); } @@ -582,14 +582,14 @@ KACLListView::KACLListView( TQWidget* parent, const char* name ) struct passwd *user = 0; setpwent(); while ( ( user = getpwent() ) != 0 ) { - m_allUsers << TQString::fromLatin1( user->pw_name ); + m_allUsers << TQString::tqfromLatin1( user->pw_name ); } endpwent(); struct group *gr = 0; setgrent(); while ( ( gr = getgrent() ) != 0 ) { - m_allGroups << TQString::fromLatin1( gr->gr_name ); + m_allGroups << TQString::tqfromLatin1( gr->gr_name ); } endgrent(); m_allUsers.sort(); @@ -1019,7 +1019,7 @@ void KACLListView::slotRemoveEntry() delete item; } else { item->value = 0; - item->repaint(); + item->tqrepaint(); } if ( !itemWasDefault ) calculateEffectiveRights(); @@ -1030,7 +1030,7 @@ void KACLListView::slotRemoveEntry() || item->type == Group || item->type == Others ) ) { item->value = 0; - item->repaint(); + item->tqrepaint(); } else { delete item; } diff --git a/kio/kfile/kacleditwidget.h b/kio/kfile/kacleditwidget.h index 70e7ab54f..e436f16e6 100644 --- a/kio/kfile/kacleditwidget.h +++ b/kio/kfile/kacleditwidget.h @@ -24,6 +24,10 @@ #include <config.h> #endif +#ifdef Q_MOC_RUN +#define USE_POSIX_ACL +#endif // Q_MOC_RUN + #ifdef USE_POSIX_ACL #include <klistview.h> @@ -34,9 +38,10 @@ class KACLListViewItem; class KACLListView; class TQPushButton; -class KACLEditWidget : QWidget +class KACLEditWidget : TQWidget { Q_OBJECT + TQ_OBJECT public: KACLEditWidget( TQWidget *parent = 0, const char *name = 0 ); KACL getACL() const; diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h index 8bd0292d3..9b4d9d48e 100644 --- a/kio/kfile/kacleditwidget_p.h +++ b/kio/kfile/kacleditwidget_p.h @@ -24,6 +24,10 @@ #include <config.h> #endif +#ifdef Q_MOC_RUN +#define USE_POSIX_ACL +#endif // Q_MOC_RUN + #ifdef USE_POSIX_ACL #include <klistview.h> #include <sys/acl.h> @@ -45,7 +49,8 @@ class TQCheckBox; */ class KACLListView : public KListView { -Q_OBJECT + Q_OBJECT + TQ_OBJECT friend class KACLListViewItem; public: enum Types @@ -129,6 +134,7 @@ private: class EditACLEntryDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: EditACLEntryDialog( KACLListView *listView, KACLListViewItem *item, const TQStringList &users, @@ -180,10 +186,10 @@ public: void togglePerm( acl_perm_t perm ); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); void updatePermPixmaps(); - void repaint(); + void tqrepaint(); KACLListView::EntryType type; unsigned short value; diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp index 6baf6d36f..41b4176fa 100644 --- a/kio/kfile/kcombiview.cpp +++ b/kio/kfile/kcombiview.cpp @@ -300,7 +300,7 @@ void KCombiView::slotSortingChanged( TQDir::SortSpec sorting ) KFileView *KCombiView::focusView( KFileView *preferred ) const { - TQWidget *w = focusWidget(); + TQWidget *w = tqfocusWidget(); KFileView *other = (right == preferred) ? left : right; return (preferred && w == preferred->widget()) ? preferred : other; } @@ -358,9 +358,9 @@ bool KCombiView::eventFilter( TQObject *o, TQEvent *e ) // only the focused view may have a selection if ( type == TQEvent::FocusIn ) { - if ( o == left ) + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(left) ) right->clearSelection(); - else if ( o == right->widget() ) + else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(right->widget()) ) left->clearSelection(); } diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index aec3c10f1..30513bbf3 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -35,7 +35,7 @@ #include "kcustommenueditor.h" -class KCustomMenuEditor::Item : public QListViewItem +class KCustomMenuEditor::Item : public TQListViewItem { public: Item(TQListView *parent, KService::Ptr service) @@ -94,11 +94,11 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) m_listView->addColumn(i18n("Menu")); m_listView->setFullWidth(true); m_listView->setSorting(-1); - KButtonBox *buttonBox = new KButtonBox(page, Vertical); - buttonBox->addButton(i18n("New..."), this, TQT_SLOT(slotNewItem())); - d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem())); - d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp())); - d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown())); + KButtonBox *buttonBox = new KButtonBox(page, Qt::Vertical); + buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem())); + d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem())); + d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp())); + d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveDown())); buttonBox->layout(); connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); refreshButton(); diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index 6013b7c57..af3e25eec 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -111,13 +111,13 @@ KDirOperator::KDirOperator(const KURL& _url, TQString strPath = TQDir::currentDirPath(); strPath.append('/'); currUrl = KURL(); - currUrl.setProtocol(TQString::fromLatin1("file")); + currUrl.setProtocol(TQString::tqfromLatin1("file")); currUrl.setPath(strPath); } else { currUrl = _url; if ( currUrl.protocol().isEmpty() ) - currUrl.setProtocol(TQString::fromLatin1("file")); + currUrl.setProtocol(TQString::tqfromLatin1("file")); currUrl.addPath("/"); // make sure we have a trailing slash! } @@ -144,7 +144,7 @@ KDirOperator::KDirOperator(const KURL& _url, setupActions(); setupMenu(); - setFocusPolicy(TQWidget::WheelFocus); + setFocusPolicy(TQ_WheelFocus); } KDirOperator::~KDirOperator() @@ -414,7 +414,7 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) { url.addPath( *it ); exists = KIO::NetAccess::exists( url, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() ); + writeOk = !exists && KIO::NetAccess::mkdir( url, tqtopLevelWidget() ); } if ( exists ) // url was already existant @@ -484,7 +484,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, if ( doIt ) { KIO::DeleteJob *job = KIO::del( urls, false, showProgress ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; } @@ -547,7 +547,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, if ( doIt ) { KIO::CopyJob *job = KIO::trash( urls, showProgress ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; } @@ -555,12 +555,12 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, return 0L; } -void KDirOperator::trashSelected(KAction::ActivationReason reason, Qt::ButtonState state) +void KDirOperator::trashSelected(KAction::ActivationReason reason, TQt::ButtonState state) { if ( !m_fileView ) return; - if ( reason == KAction::PopupMenuActivation && ( state & Qt::ShiftButton ) ) { + if ( reason == KAction::PopupMenuActivation && ( state & ShiftButton ) ) { deleteSelected(); return; } @@ -590,7 +590,7 @@ void KDirOperator::checkPath(const TQString &, bool /*takeFiles*/) // SLOT text = text.stripWhiteSpace(); // if the argument is no URL (the check is quite fragil) and it's // no absolute path, we add the current directory to get a correct url - if (text.find(':') < 0 && text[0] != '/') + if (text.tqfind(':') < 0 && text[0] != '/') text.insert(0, currUrl); // in case we have a selection defined and someone patched the file- @@ -651,7 +651,7 @@ void KDirOperator::setURL(const KURL& _newurl, bool clearforward) if ( !isReadable( newurl ) ) { // maybe newurl is a file? check its parent directory - newurl.cd(TQString::fromLatin1("..")); + newurl.cd(TQString::tqfromLatin1("..")); if ( !isReadable( newurl ) ) { resetCursor(); KMessageBox::error(viewWidget(), @@ -719,7 +719,7 @@ void KDirOperator::pathChanged() TQApplication::restoreOverrideCursor(); // when KIO::Job emits finished, the slot will restore the cursor - TQApplication::setOverrideCursor( waitCursor ); + TQApplication::setOverrideCursor( tqwaitCursor ); if ( !isReadable( currUrl )) { KMessageBox::error(viewWidget(), @@ -777,7 +777,7 @@ KURL KDirOperator::url() const void KDirOperator::cdUp() { KURL tmp(currUrl); - tmp.cd(TQString::fromLatin1("..")); + tmp.cd(TQString::tqfromLatin1("..")); setURL(tmp, true); } @@ -825,7 +825,7 @@ bool KDirOperator::checkPreviewInternal() const { TQStringList supported = KIO::PreviewJob::supportedMimeTypes(); // no preview support for directories? - if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 ) + if ( dirOnlyMode() && supported.tqfindIndex( "inode/directory" ) == -1 ) return false; TQStringList mimeTypes = dir->mimeFilters(); @@ -1071,7 +1071,7 @@ void KDirOperator::connectView(KFileView *view) m_fileView->widget()->show(); if ( listDir ) { - TQApplication::setOverrideCursor( waitCursor ); + TQApplication::setOverrideCursor( tqwaitCursor ); openURL( currUrl ); } else @@ -1120,7 +1120,7 @@ void KDirOperator::setDirLister( KDirLister *lister ) dir->setAutoUpdate( true ); - TQWidget* mainWidget = topLevelWidget(); + TQWidget* mainWidget = tqtopLevelWidget(); dir->setMainWindow (mainWidget); kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl; @@ -1253,27 +1253,27 @@ void KDirOperator::slotCompletionMatch(const TQString& match) void KDirOperator::setupActions() { - myActionCollection = new KActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); + myActionCollection = new KActionCollection( tqtopLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" ); actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); - upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" ); + upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" ); upAction->setText( i18n("Parent Folder") ); - backAction = KStdAction::back( this, TQT_SLOT( back() ), myActionCollection, "back" ); - forwardAction = KStdAction::forward( this, TQT_SLOT(forward()), myActionCollection, "forward" ); - homeAction = KStdAction::home( this, TQT_SLOT( home() ), myActionCollection, "home" ); + backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" ); + forwardAction = KStdAction::forward( TQT_TQOBJECT(this), TQT_SLOT(forward()), myActionCollection, "forward" ); + homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" ); homeAction->setText(i18n("Home Folder")); - reloadAction = KStdAction::redisplay( this, TQT_SLOT(rereadDir()), myActionCollection, "reload" ); + reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" ); actionSeparator = new KActionSeparator( myActionCollection, "separator" ); d->viewActionSeparator = new KActionSeparator( myActionCollection, "viewActionSeparator" ); mkdirAction = new KAction( i18n("New Folder..."), 0, - this, TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); + TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); KAction* trash = new KAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), this, TQT_SLOT( trashSelected( KAction::ActivationReason, Qt::ButtonState ) ) ); - new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, this, + new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); - mkdirAction->setIcon( TQString::fromLatin1("folder_new") ); + mkdirAction->setIcon( TQString::tqfromLatin1("folder_new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload )); @@ -1281,19 +1281,19 @@ void KDirOperator::setupActions() // the sort menu actions sortActionMenu = new KActionMenu( i18n("Sorting"), myActionCollection, "sorting menu"); byNameAction = new KRadioAction( i18n("By Name"), 0, - this, TQT_SLOT( slotSortByName() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ), myActionCollection, "by name" ); byDateAction = new KRadioAction( i18n("By Date"), 0, - this, TQT_SLOT( slotSortByDate() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ), myActionCollection, "by date" ); bySizeAction = new KRadioAction( i18n("By Size"), 0, - this, TQT_SLOT( slotSortBySize() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ), myActionCollection, "by size" ); reverseAction = new KToggleAction( i18n("Reverse"), 0, - this, TQT_SLOT( slotSortReversed() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); - TQString sortGroup = TQString::fromLatin1("sort"); + TQString sortGroup = TQString::tqfromLatin1("sort"); byNameAction->setExclusiveGroup( sortGroup ); byDateAction->setExclusiveGroup( sortGroup ); bySizeAction->setExclusiveGroup( sortGroup ); @@ -1325,7 +1325,7 @@ void KDirOperator::setupActions() myActionCollection, "show hidden" ); // showHiddenAction->setCheckedState( i18n("Hide Hidden Files") ); separateDirsAction = new KToggleAction( i18n("Separate Folders"), KShortcut(), - this, + TQT_TQOBJECT(this), TQT_SLOT(slotSeparateDirs()), myActionCollection, "separate dirs" ); KToggleAction *previewAction = new KToggleAction(i18n("Show Preview"), @@ -1337,7 +1337,7 @@ void KDirOperator::setupActions() TQT_SLOT( togglePreview( bool ))); - TQString viewGroup = TQString::fromLatin1("view"); + TQString viewGroup = TQString::tqfromLatin1("view"); shortAction->setExclusiveGroup( viewGroup ); detailedAction->setExclusiveGroup( viewGroup ); @@ -1348,7 +1348,7 @@ void KDirOperator::setupActions() connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleHidden( bool ) )); - new KAction( i18n("Properties"), KShortcut(ALT+Key_Return), this, + new KAction( i18n("Properties"), KShortcut(ALT+Key_Return), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), myActionCollection, "properties" ); } @@ -1383,11 +1383,11 @@ void KDirOperator::setupMenu(int whichActions) if (whichActions & FileActions) { actionMenu->insert( mkdirAction ); - if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & Qt::ShiftButton)) + if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); KConfig *globalconfig = KGlobal::config(); - KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); - if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & Qt::ShiftButton) || + KConfigGroupSaver cs( globalconfig, TQString::tqfromLatin1("KDE") ); + if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) actionMenu->insert( myActionCollection->action( "delete" ) ); actionMenu->insert( actionSeparator ); @@ -1450,45 +1450,45 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group ) defaultView = 0; int sorting = 0; - TQString viewStyle = kc->readEntry( TQString::fromLatin1("View Style"), - TQString::fromLatin1("Simple") ); - if ( viewStyle == TQString::fromLatin1("Detail") ) + TQString viewStyle = kc->readEntry( TQString::tqfromLatin1("View Style"), + TQString::tqfromLatin1("Simple") ); + if ( viewStyle == TQString::tqfromLatin1("Detail") ) defaultView |= KFile::Detail; else defaultView |= KFile::Simple; - if ( kc->readBoolEntry( TQString::fromLatin1("Separate Directories"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Separate Directories"), DefaultMixDirsAndFiles ) ) defaultView |= KFile::SeparateDirs; - if ( kc->readBoolEntry(TQString::fromLatin1("Show Preview"), false)) + if ( kc->readBoolEntry(TQString::tqfromLatin1("Show Preview"), false)) defaultView |= KFile::PreviewContents; - if ( kc->readBoolEntry( TQString::fromLatin1("Sort case insensitively"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort case insensitively"), DefaultCaseInsensitive ) ) sorting |= TQDir::IgnoreCase; - if ( kc->readBoolEntry( TQString::fromLatin1("Sort directories first"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort directories first"), DefaultDirsFirst ) ) sorting |= TQDir::DirsFirst; - TQString name = TQString::fromLatin1("Name"); - TQString sortBy = kc->readEntry( TQString::fromLatin1("Sort by"), name ); + TQString name = TQString::tqfromLatin1("Name"); + TQString sortBy = kc->readEntry( TQString::tqfromLatin1("Sort by"), name ); if ( sortBy == name ) sorting |= TQDir::Name; - else if ( sortBy == TQString::fromLatin1("Size") ) + else if ( sortBy == TQString::tqfromLatin1("Size") ) sorting |= TQDir::Size; - else if ( sortBy == TQString::fromLatin1("Date") ) + else if ( sortBy == TQString::tqfromLatin1("Date") ) sorting |= TQDir::Time; mySorting = static_cast<TQDir::SortSpec>( sorting ); setSorting( mySorting ); - if ( kc->readBoolEntry( TQString::fromLatin1("Show hidden files"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Show hidden files"), DefaultShowHidden ) ) { showHiddenAction->setChecked( true ); dir->setShowingDotFiles( true ); } - if ( kc->readBoolEntry( TQString::fromLatin1("Sort reversed"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort reversed"), DefaultSortReversed ) ) reverseAction->setChecked( true ); @@ -1505,18 +1505,18 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group ) if ( !group.isEmpty() ) kc->setGroup( group ); - TQString sortBy = TQString::fromLatin1("Name"); + TQString sortBy = TQString::tqfromLatin1("Name"); if ( KFile::isSortBySize( mySorting ) ) - sortBy = TQString::fromLatin1("Size"); + sortBy = TQString::tqfromLatin1("Size"); else if ( KFile::isSortByDate( mySorting ) ) - sortBy = TQString::fromLatin1("Date"); - kc->writeEntry( TQString::fromLatin1("Sort by"), sortBy ); + sortBy = TQString::tqfromLatin1("Date"); + kc->writeEntry( TQString::tqfromLatin1("Sort by"), sortBy ); - kc->writeEntry( TQString::fromLatin1("Sort reversed"), + kc->writeEntry( TQString::tqfromLatin1("Sort reversed"), reverseAction->isChecked() ); - kc->writeEntry( TQString::fromLatin1("Sort case insensitively"), + kc->writeEntry( TQString::tqfromLatin1("Sort case insensitively"), caseInsensitiveAction->isChecked() ); - kc->writeEntry( TQString::fromLatin1("Sort directories first"), + kc->writeEntry( TQString::tqfromLatin1("Sort directories first"), dirsFirstAction->isChecked() ); // don't save the separate dirs or preview when an application specific @@ -1530,26 +1530,26 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group ) if ( !appSpecificPreview ) { if ( separateDirsAction->isEnabled() ) - kc->writeEntry( TQString::fromLatin1("Separate Directories"), + kc->writeEntry( TQString::tqfromLatin1("Separate Directories"), separateDirsAction->isChecked() ); KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview")); if ( previewAction->isEnabled() ) { bool hasPreview = previewAction->isChecked(); - kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview ); + kc->writeEntry( TQString::tqfromLatin1("Show Preview"), hasPreview ); } } - kc->writeEntry( TQString::fromLatin1("Show hidden files"), + kc->writeEntry( TQString::tqfromLatin1("Show hidden files"), showHiddenAction->isChecked() ); KFile::FileView fv = static_cast<KFile::FileView>( m_viewKind ); TQString style; if ( KFile::isDetailView( fv ) ) - style = TQString::fromLatin1("Detail"); + style = TQString::tqfromLatin1("Detail"); else if ( KFile::isSimpleView( fv ) ) - style = TQString::fromLatin1("Simple"); - kc->writeEntry( TQString::fromLatin1("View Style"), style ); + style = TQString::tqfromLatin1("Simple"); + kc->writeEntry( TQString::tqfromLatin1("View Style"), style ); kc->setGroup( oldGroup ); } diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index a2d318b96..85bcf9187 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -94,7 +94,7 @@ namespace KIO { * @short A widget for displaying files and browsing directories. * @author Stephan Kulow <coolo@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org> */ -class KIO_EXPORT KDirOperator : public QWidget +class KIO_EXPORT KDirOperator : public TQWidget { Q_OBJECT @@ -710,7 +710,7 @@ public slots: * @since 3.4 */ // ### KDE4: make virtual - void trashSelected(KAction::ActivationReason, Qt::ButtonState); + void trashSelected(KAction::ActivationReason, TQt::ButtonState); protected slots: /** diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index a361a8bde..1b546148e 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -122,11 +122,11 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQT_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - KAction* newFolder = new KAction( i18n("New Folder..."), "folder_new", 0, this, TQT_SLOT( slotMkdir() ), this); + KAction* newFolder = new KAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); - m_showHiddenFolders = new KToggleAction ( i18n( "Show Hidden Folders" ), 0, this, - TQT_SLOT( slotShowHiddenFoldersToggled() ), this); + m_showHiddenFolders = new KToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), + TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this)); m_showHiddenFolders->plug(m_contextMenu); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); @@ -211,7 +211,7 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) { while ( pos > 0 ) { - pos = path.findRev( '/', pos -1 ); + pos = path.tqfindRev( '/', pos -1 ); if ( pos >= 0 ) { dirToList.setPath( path.left( pos +1 ) ); @@ -248,7 +248,7 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) { // scroll to make item the topmost item view()->ensureItemVisible( item ); - TQRect r = view()->itemRect( item ); + TQRect r = view()->tqitemRect( item ); if ( r.isValid() ) { int x, y; @@ -390,8 +390,8 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text ) if ( item ) { item->setSelected( false ); - // 2002/12/27, deselected item is not repainted, so force it - item->repaint(); + // 2002/12/27, deselected item is not tqrepainted, so force it + item->tqrepaint(); } } @@ -426,7 +426,7 @@ void KDirSelectDialog::slotMkdir() { folderurl.addPath( *it ); exists = KIO::NetAccess::exists( folderurl, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() ); + writeOk = !exists && KIO::NetAccess::mkdir( folderurl, tqtopLevelWidget() ); } if ( exists ) // url was already existant diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 3c9bfbb8c..86dfc756d 100644 --- a/kio/kfile/kdirsize.cpp +++ b/kio/kfile/kdirsize.cpp @@ -63,7 +63,7 @@ void KDirSize::processList() } kdDebug(kfile_area) << "KDirSize::processList finished" << endl; if ( !m_bAsync ) - qApp->exit_loop(); + tqApp->exit_loop(); emitResult(); } @@ -139,7 +139,7 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory ) { KDirSize * dirSize = dirSizeJob( directory ); dirSize->setSync(); - qApp->enter_loop(); + tqApp->enter_loop(); return dirSize->totalSize(); } @@ -155,7 +155,7 @@ void KDirSize::slotResult( KIO::Job * job ) else { if ( !m_bAsync ) - qApp->exit_loop(); + tqApp->exit_loop(); KIO::Job::slotResult( job ); } } diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 179b69f72..5fe26f696 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -100,7 +100,7 @@ void KDiskFreeSp::dfDone() TQTextStream t (dfStringErrOut, IO_ReadOnly); TQString s=t.readLine(); - if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("Filesystem") ) ) + if ( (s.isEmpty()) || ( s.left(10) != TQString::tqfromLatin1("Filesystem") ) ) kdError() << "Error running df command... got [" << s << "]" << endl; while ( !t.eof() ) { TQString u,v; @@ -109,7 +109,7 @@ void KDiskFreeSp::dfDone() if ( !s.isEmpty() ) { //kdDebug(kfile_area) << "GOT: [" << s << "]" << endl; - if (s.find(BLANK)<0) // devicename was too long, rest in next line + if (s.tqfind(BLANK)<0) // devicename was too long, rest in next line if ( !t.eof() ) { // just appends the next line v=t.readLine(); s=s.append(v); @@ -119,30 +119,30 @@ void KDiskFreeSp::dfDone() //kdDebug(kfile_area) << "[" << s << "]" << endl; - //TQString deviceName = s.left(s.find(BLANK)); - s=s.remove(0,s.find(BLANK)+1 ); + //TQString deviceName = s.left(s.tqfind(BLANK)); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " DeviceName: [" << deviceName << "]" << endl; if (!NO_FS_TYPE) - s=s.remove(0,s.find(BLANK)+1 ); // eat fs type + s=s.remove(0,s.tqfind(BLANK)+1 ); // eat fs type - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBSize = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Size: [" << kBSize << "]" << endl; - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBUsed = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Used: [" << kBUsed << "]" << endl; - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBAvail = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Avail: [" << kBAvail << "]" << endl; - s=s.remove(0,s.find(BLANK)+1 ); // delete the capacity 94% + s=s.remove(0,s.tqfind(BLANK)+1 ); // delete the capacity 94% TQString mountPoint = s.stripWhiteSpace(); //kdDebug(kfile_area) << " MountPoint: [" << mountPoint << "]" << endl; diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index 6a0591d6f..5fccfe3b0 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -37,7 +37,7 @@ class KProcess; * This class parses the output of "df" to find the disk usage * information for a given partition (mount point). */ -class KIO_EXPORT KDiskFreeSp : public QObject +class KIO_EXPORT KDiskFreeSp : public TQObject { Q_OBJECT public: KDiskFreeSp( TQObject *parent=0, const char *name=0 ); diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index 396006504..be5ca033b 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -54,7 +54,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin d->encoding->clear (); TQString sEncoding = encoding; if (sEncoding.isEmpty()) - sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + sEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); int insert = 0; diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 823714396..6643d5a4c 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -317,7 +317,7 @@ void KFileDetailView::updateView( const KFileItem *i ) item->init(); setSortingKey( item, i ); - //item->repaint(); // only repaints if visible + //item->tqrepaint(); // only tqrepaints if visible } void KFileDetailView::setSortingKey( KFileListViewItem *item, diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 937c8f56c..7e0baff83 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -78,7 +78,7 @@ public: TQRect rect() const { - TQRect r = listView()->itemRect(this); + TQRect r = listView()->tqitemRect(this); return TQRect( listView()->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 0c9364943..586b34d62 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -100,7 +100,7 @@ enum Buttons { HOTLIST_BUTTON, template class TQPtrList<KIO::StatJob>; namespace { - static void silenceQToolBar(QtMsgType, const char *) + static void silenceQToolBar(TQtMsgType, const char *) { } } @@ -204,7 +204,7 @@ void KFileDialog::setLocationLabel(const TQString& text) void KFileDialog::setFilter(const TQString& filter) { - int pos = filter.find('/'); + int pos = filter.tqfind('/'); // Check for an un-escaped '/', if found // interpret as a MIME filter. @@ -219,7 +219,7 @@ void KFileDialog::setFilter(const TQString& filter) // escaped '/' characters. TQString copy (filter); - for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos) + for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos) copy.remove(pos, 1); ops->clearFilter(); @@ -258,7 +258,7 @@ void KFileDialog::setMimeFilter( const TQStringList& mimeTypes, filterWidget->setMimeFilter( mimeTypes, defaultType ); TQStringList types = TQStringList::split(" ", filterWidget->currentFilter()); - types.append( TQString::fromLatin1( "inode/directory" )); + types.append( TQString::tqfromLatin1( "inode/directory" )); ops->clearFilter(); ops->setMimeFilter( types ); d->hasDefaultFilter = !defaultType.isEmpty(); @@ -357,7 +357,7 @@ void KFileDialog::slotOk() bool multi = (mode() & KFile::Files) != 0; KFileItemListIterator it( *items ); - TQString endQuote = TQString::fromLatin1("\" "); + TQString endQuote = TQString::tqfromLatin1("\" "); TQString name, files; while ( it.current() ) { name = (*it)->name(); @@ -402,7 +402,7 @@ void KFileDialog::slotOk() } } - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { // ### after message freeze, add message for directories! @@ -446,7 +446,7 @@ void KFileDialog::slotOk() return; } - KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(selectedURL,tqtopLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { KMessageBox::sorry( d->mainWidget, @@ -555,7 +555,7 @@ void KFileDialog::slotOk() it != list.end(); ++it ) { job = KIO::stat( *it, !(*it).isLocalFile() ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); KIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), @@ -565,7 +565,7 @@ void KFileDialog::slotOk() } job = KIO::stat(d->url,!d->url.isLocalFile()); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); d->statJobs.append( job ); connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*))); } @@ -831,10 +831,10 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->autoSelectExtChecked = false; d->urlBar = 0; // delayed loading - QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); + TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true); toolbar->setFlat(true); - qInstallMsgHandler( oldHandler ); + tqInstallMsgHandler( oldHandler ); d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, toolbar, "path combo" ); @@ -934,7 +934,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleBookmarks( bool )) ); - KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", this, "extra menu" ); + KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " "Various options can be accessed from this menu including: <ul>" "<li>how files are sorted in the list</li>" @@ -965,7 +965,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge menu->plug( toolbar ); //Insert a separator. - KToolBarSeparator* spacerWidget = new KToolBarSeparator(Horizontal, false /*no line*/, + KToolBarSeparator* spacerWidget = new KToolBarSeparator(Qt::Horizontal, false /*no line*/, toolbar); d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget); toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo); @@ -1076,17 +1076,17 @@ void KFileDialog::initGUI() TQGridLayout* lafBox= new TQGridLayout(2, 3, KDialog::spacingHint()); - lafBox->addWidget(d->locationLabel, 0, 0, AlignVCenter); - lafBox->addWidget(locationEdit, 0, 1, AlignVCenter); - lafBox->addWidget(d->okButton, 0, 2, AlignVCenter); + lafBox->addWidget(d->locationLabel, 0, 0, Qt::AlignVCenter); + lafBox->addWidget(locationEdit, 0, 1, Qt::AlignVCenter); + lafBox->addWidget(d->okButton, 0, 2, Qt::AlignVCenter); - lafBox->addWidget(d->filterLabel, 1, 0, AlignVCenter); - lafBox->addWidget(filterWidget, 1, 1, AlignVCenter); - lafBox->addWidget(d->cancelButton, 1, 2, AlignVCenter); + lafBox->addWidget(d->filterLabel, 1, 0, Qt::AlignVCenter); + lafBox->addWidget(filterWidget, 1, 1, Qt::AlignVCenter); + lafBox->addWidget(d->cancelButton, 1, 2, Qt::AlignVCenter); lafBox->setColStretch(1, 4); - vbox->addLayout(lafBox, 0); + vbox->addLayout(TQT_TQLAYOUT(lafBox), 0); vbox->addSpacing(3); // add the Automatically Select Extension checkbox @@ -1133,7 +1133,7 @@ void KFileDialog::slotFilterChanged() TQString filter = filterWidget->currentFilter(); ops->clearFilter(); - if ( filter.find( '/' ) > -1 ) { + if ( filter.tqfind( '/' ) > -1 ) { TQStringList types = TQStringList::split( " ", filter ); types.prepend( "inode/directory" ); ops->setMimeFilter( types ); @@ -1250,7 +1250,7 @@ void KFileDialog::setSelection(const TQString& url) } else { TQString filename = u.url(); - int sep = filename.findRev('/'); + int sep = filename.tqfindRev('/'); if (sep >= 0) { // there is a / in it if ( KProtocolInfo::supportsListing( u )) { KURL dir(u); @@ -1335,7 +1335,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir, const TQString& filter, WId parent_id, const TQString& caption) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KFileDialog dlg(startDir, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) @@ -1474,7 +1474,7 @@ KURL::List& KFileDialog::parseSelectedURLs() const if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename static const TQString &prot = KGlobal::staticQString(":/"); KURL u; - if ( d->filenames.find( prot ) != -1 ) + if ( d->filenames.tqfind( prot ) != -1 ) u = d->filenames; else u.setPath( d->filenames ); @@ -1504,7 +1504,7 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const KURL u( ops->url() ); TQString name; - int count = line.contains( '"' ); + int count = line.tqcontains( '"' ); if ( count == 0 ) { // no " " -> assume one single file u.setFileName( line ); if ( u.isValid() ) @@ -1526,8 +1526,8 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const int start = 0; int index1 = -1, index2 = -1; while ( true ) { - index1 = line.find( '"', start ); - index2 = line.find( '"', index1 + 1 ); + index1 = line.tqfind( '"', start ); + index2 = line.tqfind( '"', index1 + 1 ); if ( index1 < 0 ) break; @@ -1548,7 +1548,7 @@ TQString KFileDialog::selectedFile() const { if ( result() == TQDialog::Accepted ) { - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget()); if (url.isLocalFile()) return url.path(); else { @@ -1570,7 +1570,7 @@ TQStringList KFileDialog::selectedFiles() const KURL::List urls = parseSelectedURLs(); TQValueListConstIterator<KURL> it = urls.begin(); while ( it != urls.end() ) { - url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget()); + url = KIO::NetAccess::mostLocalURL(*it,tqtopLevelWidget()); if ( url.isLocalFile() ) list.append( url.path() ); ++it; @@ -1617,7 +1617,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi const TQString& caption) { bool specialDir = dir.at(0) == ':'; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) @@ -1737,8 +1737,8 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) d->autoSelectExtChecked = kc->readBoolEntry (AutoSelectExtChecked, DefaultAutoSelectExtChecked); updateAutoSelectExtension (); - int w1 = minimumSize().width(); - int w2 = toolbar->sizeHint().width() + 10; + int w1 = tqminimumSize().width(); + int w2 = toolbar->tqsizeHint().width() + 10; if (w1 < w2) setMinimumWidth(w2); @@ -1885,7 +1885,7 @@ static TQString getExtensionFromPatternList (const TQStringList &patternList) // *.JP? if ((*it).startsWith ("*.") && (*it).length () > 2 && - (*it).find ('*', 2) < 0 && (*it).find ('?', 2) < 0) + (*it).tqfind ('*', 2) < 0 && (*it).tqfind ('?', 2) < 0) { ret = (*it).mid (1); break; @@ -1937,7 +1937,7 @@ void KFileDialog::updateAutoSelectExtension (void) if (!filter.isEmpty ()) { // e.g. "*.cpp" - if (filter.find ('/') < 0) + if (filter.tqfind ('/') < 0) { d->extension = getExtensionFromPatternList (TQStringList::split (" ", filter)).lower (); kdDebug (kfile_area) << "\tsetFilter-style: pattern ext=\'" @@ -2056,10 +2056,10 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) KURL url = getCompleteURL (urlStr); kdDebug (kfile_area) << "updateLocationEditExtension (" << url << ")" << endl; - const int fileNameOffset = urlStr.findRev ('/') + 1; + const int fileNameOffset = urlStr.tqfindRev ('/') + 1; TQString fileName = urlStr.mid (fileNameOffset); - const int dot = fileName.findRev ('.'); + const int dot = fileName.tqfindRev ('.'); const int len = fileName.length (); if (dot > 0 && // has an extension already and it's not a hidden file // like ".hidden" (but we do accept ".hidden.ext") @@ -2068,7 +2068,7 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) { // exists? KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + if (KIO::NetAccess::stat (url, t, tqtopLevelWidget())) { kdDebug (kfile_area) << "\tfile exists" << endl; @@ -2115,7 +2115,7 @@ void KFileDialog::updateFilter () KMimeType::Ptr mime = KMimeType::findByPath(urlStr, 0, true); if (mime && mime->name() != KMimeType::defaultMimeType()) { if (filterWidget->currentFilter() != mime->name() && - filterWidget->filters.findIndex(mime->name()) != -1) { + filterWidget->filters.tqfindIndex(mime->name()) != -1) { filterWidget->setCurrentFilter(mime->name()); } } @@ -2135,7 +2135,7 @@ void KFileDialog::appendExtension (KURL &url) kdDebug (kfile_area) << "appendExtension(" << url << ")" << endl; const int len = fileName.length (); - const int dot = fileName.findRev ('.'); + const int dot = fileName.tqfindRev ('.'); const bool suppressExtension = (dot == len - 1); const bool unspecifiedExtension = (dot <= 0); @@ -2146,7 +2146,7 @@ void KFileDialog::appendExtension (KURL &url) // exists? KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + if (KIO::NetAccess::stat (url, t, tqtopLevelWidget())) { kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl; return; @@ -2265,7 +2265,7 @@ void KFileDialog::toggleBookmarks(bool show) connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), TQT_SLOT( enterURL( const TQString& ))); - toolbar->insertButton(TQString::fromLatin1("bookmark"), + toolbar->insertButton(TQString::tqfromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, i18n("Bookmarks"), 5); toolbar->getButton(HOTLIST_BUTTON)->setPopup(d->bookmarkHandler->menu(), @@ -2361,11 +2361,11 @@ void KFileDialog::setNonExtSelection() TQString pattern, filename = locationEdit->currentText().stripWhiteSpace(); KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 ) + if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.tqfind( '*' , 1 ) == -1 ) locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 ); else { - int lastDot = filename.findRev( '.' ); + int lastDot = filename.tqfindRev( '.' ); if ( lastDot > 0 ) locationEdit->lineEdit()->setSelection( 0, lastDot ); } diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp index c865cc0e1..771cc76b0 100644 --- a/kio/kfile/kfilefiltercombo.cpp +++ b/kio/kfile/kfilefiltercombo.cpp @@ -68,11 +68,11 @@ void KFileFilterCombo::setFilter(const TQString& filter) if (!filter.isEmpty()) { TQString tmp = filter; - int index = tmp.find('\n'); + int index = tmp.tqfind('\n'); while (index > 0) { filters.append(tmp.left(index)); tmp = tmp.mid(index + 1); - index = tmp.find('\n'); + index = tmp.tqfind('\n'); } filters.append(tmp); } @@ -82,7 +82,7 @@ void KFileFilterCombo::setFilter(const TQString& filter) TQStringList::ConstIterator it; TQStringList::ConstIterator end(filters.end()); for (it = filters.begin(); it != end; ++it) { - int tab = (*it).find('|'); + int tab = (*it).tqfind('|'); insertItem((tab < 0) ? *it : (*it).mid(tab + 1)); } @@ -101,7 +101,7 @@ TQString KFileFilterCombo::currentFilter() const } } - int tab = f.find('|'); + int tab = f.tqfind('|'); if (tab < 0) return f; else @@ -129,7 +129,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types, { clear(); filters.clear(); - TQString delim = TQString::fromLatin1(", "); + TQString delim = TQString::tqfromLatin1(", "); d->hasAllSupportedFiles = false; m_allTypes = defaultType.isEmpty() && (types.count() > 1); @@ -179,7 +179,7 @@ void KFileFilterCombo::slotFilterChanged() bool KFileFilterCombo::eventFilter( TQObject *o, TQEvent *e ) { - if ( o == lineEdit() && e->type() == TQEvent::FocusOut ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit()) && e->type() == TQEvent::FocusOut ) { if ( currentText() != d->lastFilter ) emit filterChanged(); } diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index a4c65924d..38bdec9b3 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -60,25 +60,25 @@ public: noArrangement = false; ignoreMaximumSize = false; - smallColumns = new KRadioAction( i18n("Small Icons"), 0, parent, + smallColumns = new KRadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent), TQT_SLOT( slotSmallColumns() ), parent->actionCollection(), "small columns" ); - largeRows = new KRadioAction( i18n("Large Icons"), 0, parent, + largeRows = new KRadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent), TQT_SLOT( slotLargeRows() ), parent->actionCollection(), "large rows" ); - smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode")); - largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode")); + smallColumns->setExclusiveGroup(TQString::tqfromLatin1("IconView mode")); + largeRows->setExclusiveGroup(TQString::tqfromLatin1("IconView mode")); previews = new KToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), "show previews" ); - zoomIn = KStdAction::zoomIn( parent, TQT_SLOT( zoomIn() ), + zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ), parent->actionCollection(), "zoomIn" ); - zoomOut = KStdAction::zoomOut( parent, TQT_SLOT( zoomOut() ), + zoomOut = KStdAction::zoomOut( TQT_TQOBJECT(parent), TQT_SLOT( zoomOut() ), parent->actionCollection(), "zoomOut" ); previews->setGroup("previews"); @@ -191,7 +191,7 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group ) { TQString gr = group.isEmpty() ? TQString("KFileIconView") : group; KConfigGroupSaver cs( kc, gr ); - TQString small = TQString::fromLatin1("SmallColumns"); + TQString small = TQString::tqfromLatin1("SmallColumns"); d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE ); d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) ); @@ -214,8 +214,8 @@ void KFileIconView::writeConfig( KConfig *kc, const TQString& group ) KConfigGroupSaver cs( kc, gr ); TQString viewMode = d->smallColumns->isChecked() ? - TQString::fromLatin1("SmallColumns") : - TQString::fromLatin1("LargeRows"); + TQString::tqfromLatin1("SmallColumns") : + TQString::tqfromLatin1("LargeRows"); if(!kc->hasDefault( "ViewMode" ) && viewMode == DEFAULT_VIEW_MODE ) kc->revertToDefault( "ViewMode" ); else @@ -251,12 +251,12 @@ void KFileIconView::showToolTip( TQIconViewItem *item ) int w = maxItemWidth() - ( itemTextPos() == TQIconView::Bottom ? 0 : item->pixmapRect().width() ) - 4; if ( fontMetrics().width( item->text() ) >= w ) { - toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(item->text()), 0, + toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").arg(item->text()), 0, "myToolTip", - WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); + (WFlags)(WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM) ); toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); toolTip->setLineWidth( 1 ); - toolTip->setAlignment( AlignLeft | AlignTop ); + toolTip->tqsetAlignment( AlignLeft | AlignTop ); toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) ); toolTip->adjustSize(); TQRect screen = TQApplication::desktop()->screenGeometry( @@ -268,7 +268,7 @@ void KFileIconView::showToolTip( TQIconViewItem *item ) toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y()); } toolTip->setFont( TQToolTip::font() ); - toolTip->setPalette( TQToolTip::palette(), true ); + toolTip->tqsetPalette( TQToolTip::palette(), true ); toolTip->show(); } } @@ -338,7 +338,7 @@ void KFileIconView::insertItem( KFileItem *i ) KFileView::insertItem( i ); TQIconView* qview = static_cast<TQIconView*>( this ); - // Since creating and initializing an item leads to a repaint, + // Since creating and initializing an item leads to a tqrepaint, // we disable updates on the IconView for a while. qview->setUpdatesEnabled( false ); KFileIconViewItem *item = new KFileIconViewItem( qview, i ); @@ -450,7 +450,7 @@ void KFileIconView::updateView( bool b ) if ( !item->pixmapSize().isNull() ) item->setPixmapSize( TQSize( 0, 0 ) ); } - // recalculate item parameters but avoid an in-place repaint + // recalculate item parameters but avoid an in-place tqrepaint item->setPixmap( (item->fileInfo())->pixmap( myIconSize ), true, false ); item = static_cast<KFileIconViewItem *>(item->nextItem()); } while ( item != 0L ); @@ -736,7 +736,7 @@ void KFileIconView::listingCompleted() // need to remove our tooltip, eventually bool KFileIconView::eventFilter( TQObject *o, TQEvent *e ) { - if ( o == viewport() || o == this ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { int type = e->type(); if ( type == TQEvent::Leave || type == TQEvent::FocusOut ) @@ -763,7 +763,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i, if ( updateTextAndPixmap ) { - // this causes a repaint of the item, which we want to avoid during + // this causes a tqrepaint of the item, which we want to avoid during // directory listing, when all items are created. We want to paint all // items at once, not every single item in that case. item->setText( i->text() , false, false ); @@ -866,7 +866,7 @@ void KFileIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) if ((dropOptions() & AutoOpenDirs) == 0) return; - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); if ( item ) { // are we over an item ? d->dropItem = item; d->autoOpenTimer.start( autoOpenDelay() ); // restart timer @@ -889,7 +889,7 @@ void KFileIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) if ((dropOptions() & AutoOpenDirs) == 0) return; - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); if ( item ) { // are we over an item ? if (d->dropItem != item) { @@ -921,7 +921,7 @@ void KFileIconView::contentsDropEvent( TQDropEvent *e ) } e->acceptAction(); // Yes - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); KFileItem * fileItem = 0; if (item) fileItem = item->fileInfo(); diff --git a/kio/kfile/kfilemetainfowidget.cpp b/kio/kfile/kfilemetainfowidget.cpp index c9328f026..4b8adefc3 100644 --- a/kio/kfile/kfilemetainfowidget.cpp +++ b/kio/kfile/kfilemetainfowidget.cpp @@ -272,7 +272,7 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() TQWidget* KFileMetaInfoWidget::makeDateWidget() { - TQWidget *e = new QDateEdit(m_item.value().toDate(), this); + TQWidget *e = new TQDateEdit(m_item.value().toDate(), this); connect(e, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotDateChanged(const TQDate&))); return e; @@ -280,12 +280,12 @@ TQWidget* KFileMetaInfoWidget::makeDateWidget() TQWidget* KFileMetaInfoWidget::makeTimeWidget() { - return new QTimeEdit(m_item.value().toTime(), this); + return new TQTimeEdit(m_item.value().toTime(), this); } TQWidget* KFileMetaInfoWidget::makeDateTimeWidget() { - return new QDateTimeEdit(m_item.value().toDateTime(), this); + return new TQDateTimeEdit(m_item.value().toDateTime(), this); } void KFileMetaInfoWidget::reparentValidator( TQWidget *widget, diff --git a/kio/kfile/kfilemetainfowidget.h b/kio/kfile/kfilemetainfowidget.h index c22936b5e..96614950b 100644 --- a/kio/kfile/kfilemetainfowidget.h +++ b/kio/kfile/kfilemetainfowidget.h @@ -27,7 +27,7 @@ /*! * A widget to display file meta infos (like id3 for mp3) */ -class KIO_EXPORT KFileMetaInfoWidget: public QWidget +class KIO_EXPORT KFileMetaInfoWidget: public TQWidget { Q_OBJECT public: diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp index 1be7743a1..676549a29 100644 --- a/kio/kfile/kfilemetapreview.cpp +++ b/kio/kfile/kfilemetapreview.cpp @@ -43,7 +43,7 @@ void KFileMetaPreview::initPreviewProviders() KImageFilePreview *imagePreview = new KImageFilePreview( m_stack ); (void) m_stack->addWidget( imagePreview ); m_stack->raiseWidget( imagePreview ); - resize( imagePreview->sizeHint() ); + resize( imagePreview->tqsizeHint() ); TQStringList mimeTypes = imagePreview->supportedMimeTypes(); TQStringList::ConstIterator it = mimeTypes.begin(); @@ -62,7 +62,7 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT if ( mimeType == "inode/directory" ) return 0L; - KPreviewWidgetBase *provider = m_previewProviders.find( mimeType ); + KPreviewWidgetBase *provider = m_previewProviders.tqfind( mimeType ); if ( provider ) return provider; @@ -87,15 +87,15 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT } // with the new mimetypes from the audio-preview, try again - provider = m_previewProviders.find( mimeType ); + provider = m_previewProviders.tqfind( mimeType ); if ( provider ) return provider; // ### mimetype may be image/* for example, try that - int index = mimeType.find( '/' ); + int index = mimeType.tqfind( '/' ); if ( index > 0 ) { - provider = m_previewProviders.find( mimeType.left( index + 1 ) + "*" ); + provider = m_previewProviders.tqfind( mimeType.left( index + 1 ) + "*" ); if ( provider ) return provider; } @@ -107,7 +107,7 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT TQString parentMimeType = mimeInfo->parentMimeType(); while ( !parentMimeType.isEmpty() ) { - provider = m_previewProviders.find( parentMimeType ); + provider = m_previewProviders.tqfind( parentMimeType ); if ( provider ) return provider; @@ -123,11 +123,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT { if ( textProperty.toBool() ) { - provider = m_previewProviders.find( "text/plain" ); + provider = m_previewProviders.tqfind( "text/plain" ); if ( provider ) return provider; - provider = m_previewProviders.find( "text/*" ); + provider = m_previewProviders.tqfind( "text/*" ); if ( provider ) return provider; } @@ -188,7 +188,7 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent ) return 0L; } - return dynamic_cast<KPreviewWidgetBase*>( factory->create( parent, "kfileaudiopreview" )); + return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "kfileaudiopreview" )); } void KFileMetaPreview::virtual_hook( int, void* ) {} diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index b221a1ebb..c0f73949e 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->parentWidget() == this ) { + if ( preview && preview->tqparentWidget() == this ) { preview->reparent(0L, 0, TQPoint(0, 0), false); } } @@ -68,9 +68,9 @@ void KFilePreview::init( KFileView *view ) preview = new TQWidget((TQSplitter*)this, "preview"); TQString tmp = i18n("No preview available."); TQLabel *l = new TQLabel(tmp, preview); - l->setMinimumSize(l->sizeHint()); + l->setMinimumSize(l->tqsizeHint()); l->move(10, 5); - preview->setMinimumWidth(l->sizeHint().width()+20); + preview->setMinimumWidth(l->tqsizeHint().width()+20); setResizeMode(preview, TQSplitter::KeepSize); // Why copy the actions? --ellis, 13 Jan 02. @@ -123,7 +123,7 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &) delete preview; preview = const_cast<TQWidget*>(w); preview->reparent((TQSplitter*)this, 0, TQPoint(0, 0), true); - preview->resize(preview->sizeHint()); + preview->resize(preview->tqsizeHint()); preview->show(); } @@ -149,7 +149,7 @@ void KFilePreview::updateView(bool b) { left->updateView(b); if(preview) - preview->repaint(b); + preview->tqrepaint(b); } void KFilePreview::updateView(const KFileItem *i) diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp index 329bd19dc..c396a1b58 100644 --- a/kio/kfile/kfilesharedlg.cpp +++ b/kio/kfile/kfilesharedlg.cpp @@ -184,13 +184,13 @@ void KFileSharePropsPlugin::init() // Some help text TQLabel *label = new TQLabel( i18n("Sharing this folder makes it available under Linux/UNIX (NFS) and Windows (Samba).") , m_widget ); - label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak ); vbox->addWidget( label, 0 ); KSeparator* sep=new KSeparator(m_widget); vbox->addWidget( sep, 0 ); label = new TQLabel( i18n("You can also reconfigure file sharing authorization.") , m_widget ); - label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak ); vbox->addWidget( label, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index 154009625..c3449ca9b 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -133,15 +133,15 @@ void KFileSpeedBar::save( KConfig *config ) writeConfig( config, "KFileDialog Speedbar" ); } -TQSize KFileSpeedBar::sizeHint() const +TQSize KFileSpeedBar::tqsizeHint() const { - TQSize sizeHint = KURLBar::sizeHint(); + TQSize tqsizeHint = KURLBar::tqsizeHint(); int ems = fontMetrics().width("mmmmmmmmmmmm"); - if (sizeHint.width() < ems) + if (tqsizeHint.width() < ems) { - sizeHint.setWidth(ems); + tqsizeHint.setWidth(ems); } - return sizeHint; + return tqsizeHint; } #include "kfilespeedbar.moc" diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index 28c621651..171081101 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -31,7 +31,7 @@ public: ~KFileSpeedBar(); virtual void save( KConfig *config ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private: bool m_initializeSpeedbar : 1; diff --git a/kio/kfile/kfiletreebranch.cpp b/kio/kfile/kfiletreebranch.cpp index 352bd875e..4f7539490 100644 --- a/kio/kfile/kfiletreebranch.cpp +++ b/kio/kfile/kfiletreebranch.cpp @@ -182,7 +182,7 @@ void KFileTreeBranch::addItems( const KFileItemList& list ) if( !m_showExtensions && !currItem->isDir() ) /* Need to cut the extension */ { TQString name = currItem->text(); - int mPoint = name.findRev( '.' ); + int mPoint = name.tqfindRev( '.' ); if( mPoint > 0 ) name = name.left( mPoint ); newKFTVI->setText( 0, name ); diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp index e8451077d..14a365392 100644 --- a/kio/kfile/kfiletreeview.cpp +++ b/kio/kfile/kfiletreeview.cpp @@ -342,7 +342,7 @@ void KFileTreeView::slotAutoOpenFolder() return; m_dropItem->setOpen( true ); - m_dropItem->repaint(); + m_dropItem->tqrepaint(); } @@ -413,7 +413,7 @@ KFileTreeBranchList& KFileTreeView::branches() bool KFileTreeView::removeBranch( KFileTreeBranch *branch ) { - if(m_branches.contains(branch)) + if(m_branches.tqcontains(branch)) { delete (branch->root()); m_branches.remove( branch ); @@ -522,7 +522,7 @@ void KFileTreeView::slotAnimation() } uint & iconNumber = it.data().iconNumber; - TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); + TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); // kdDebug(250) << "Loading icon " << icon << endl; item->setPixmap( 0, DesktopIcon( icon,KIcon::SizeSmall,KIcon::ActiveState )); // KFileTreeViewFactory::instance() ) ); @@ -558,7 +558,7 @@ void KFileTreeView::stopAnimation( KFileTreeViewItem * item ) kdDebug(250) << "Stoping Animation !" << endl; - MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item); + MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item); if ( it != m_mapCurrentOpeningFolders.end() ) { if( item->isDir() && isOpen( item) ) @@ -666,7 +666,7 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & ) if ( item ) { TQString text = static_cast<KFileViewItem*>( item )->toolTipText(); if ( !text.isEmpty() ) - tip ( m_view->itemRect( item ), text ); + tip ( m_view->tqitemRect( item ), text ); } #endif } diff --git a/kio/kfile/kfiletreeview.h b/kio/kfile/kfiletreeview.h index 92565269d..fb242b2c6 100644 --- a/kio/kfile/kfiletreeview.h +++ b/kio/kfile/kfiletreeview.h @@ -37,7 +37,7 @@ class TQTimer; -class KIO_EXPORT KFileTreeViewToolTip : public QToolTip +class KIO_EXPORT KFileTreeViewToolTip : public TQToolTip { public: KFileTreeViewToolTip( TQListView *view ) : TQToolTip( view ), m_view( view ) {} diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index 165801652..eb12a9498 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -258,7 +258,7 @@ sort_by_name: void KFileView::updateView(bool f) { - widget()->repaint(f); + widget()->tqrepaint(f); } void KFileView::updateView(const KFileItem *) diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index 05b32e863..1a13e264e 100644 --- a/kio/kfile/kfileview.h +++ b/kio/kfile/kfileview.h @@ -34,7 +34,7 @@ class KActionCollection; * internal class to make easier to use signals possible * @internal **/ -class KIO_EXPORT KFileViewSignaler : public QObject +class KIO_EXPORT KFileViewSignaler : public TQObject { Q_OBJECT @@ -146,11 +146,11 @@ public: virtual void clear(); /** - * does a repaint of the view. + * does a tqrepaint of the view. * * The default implementation calls * \code - * widget()->repaint(f) + * widget()->tqrepaint(f) * \endcode **/ virtual void updateView(bool f = true); diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index 164abd35a..2b1b68d68 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -60,7 +60,7 @@ class KIconCanvas::KIconCanvasPrivate /** * Helper class for sorting icon paths by icon name */ -class IconPath : public QString +class IconPath : public TQString { protected: TQString m_iconName; @@ -68,7 +68,7 @@ protected: public: IconPath(const TQString &ip) : TQString (ip) { - int n = findRev('/'); + int n = tqfindRev('/'); m_iconName = (n==-1) ? static_cast<TQString>(*this) : mid(n+1); } @@ -119,7 +119,7 @@ void KIconCanvas::loadFiles(const TQStringList& files) void KIconCanvas::slotLoadFiles() { setResizeMode(Fixed); - TQApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(tqwaitCursor); // disable updates to not trigger paint events when adding child items setUpdatesEnabled( false ); @@ -136,8 +136,8 @@ void KIconCanvas::slotLoadFiles() for (it=mFiles.begin(), i=0; it!=end; ++it, i++) { // Calling kapp->processEvents() makes the iconview flicker like hell - // (it's being repainted once for every new item), so we don't do this. - // Instead, we directly repaint the progress bar without going through + // (it's being tqrepainted once for every new item), so we don't do this. + // Instead, we directly tqrepaint the progress bar without going through // the event-loop. We do that just once for every 10th item so that // the progress bar doesn't flicker in turn. (pfeiffer) if ( emitProgress >= 10 ) { @@ -259,7 +259,7 @@ void KIconDialog::init() mGroupOrSize = KIcon::Desktop; mContext = KIcon::Any; mType = 0; - mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); + mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::tqfromLatin1("*.png")); TQWidget *main = new TQWidget( this ); setMainWidget(main); @@ -367,7 +367,7 @@ void KIconDialog::init() mContextMap[ mNumContext++ ] = context_id[ i ]; } } - mpCombo->setFixedSize(mpCombo->sizeHint()); + mpCombo->setFixedSize(mpCombo->tqsizeHint()); mpBrowseBut->setFixedWidth(mpCombo->width()); @@ -631,8 +631,8 @@ void KIconDialog::slotProgress(int p) { mpProgress->setProgress(p); // commented out the following since setProgress already paints ther - // progress bar. ->repaint() only makes it flicker - //mpProgress->repaint(); + // progress bar. ->tqrepaint() only makes it flicker + //mpProgress->tqrepaint(); } void KIconDialog::slotFinished() diff --git a/kio/kfile/kicondialog.h b/kio/kfile/kicondialog.h index 54b9ea921..e15b76884 100644 --- a/kio/kfile/kicondialog.h +++ b/kio/kfile/kicondialog.h @@ -254,7 +254,7 @@ private: * @see KIconDialog * @short A push button that allows selection of an icon. */ -class KIO_EXPORT KIconButton: public QPushButton +class KIO_EXPORT KIconButton: public TQPushButton { Q_OBJECT Q_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon ) diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index 2d9f7881a..f2869314c 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -43,8 +43,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) imageLabel = new TQLabel( this ); imageLabel->setFrameStyle( TQFrame::NoFrame ); - imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); - imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); + imageLabel->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); vb->addWidget( imageLabel ); TQHBoxLayout *hb = new TQHBoxLayout( 0 ); @@ -137,7 +137,7 @@ void KImageFilePreview::resizeEvent( TQResizeEvent * ) timer->start( 100, true ); // forces a new preview } -TQSize KImageFilePreview::sizeHint() const +TQSize KImageFilePreview::tqsizeHint() const { return TQSize( 20, 200 ); // otherwise it ends up huge??? } diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index 864fc5d31..3e64f2a7b 100644 --- a/kio/kfile/kimagefilepreview.h +++ b/kio/kfile/kimagefilepreview.h @@ -36,7 +36,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase KImageFilePreview(TQWidget *parent); ~KImageFilePreview(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: virtual void showPreview(const KURL &url); diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index 281fbc622..d3d3f7c41 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -38,7 +38,7 @@ #undef Bool -class MetaPropsScrollView : public QScrollView +class MetaPropsScrollView : public TQScrollView { public: MetaPropsScrollView(TQWidget* parent = 0, const char* name = 0) @@ -56,8 +56,8 @@ protected: virtual void viewportResizeEvent(TQResizeEvent* ev) { TQScrollView::viewportResizeEvent(ev); - m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()), - kMax(m_frame->sizeHint().height(), ev->size().height())); + m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()), + kMax(m_frame->tqsizeHint().height(), ev->size().height())); }; private: @@ -179,7 +179,7 @@ void KFileMetaPropsPlugin::createLayout() iit!=editItems.end(); ++iit) { TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox); - l->setAlignment( AlignAuto | AlignTop | ExpandTabs ); + l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); TQValidator* val = mtinfo->createValidator(*git, (*iit).key()); if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl; w = new KFileMetaInfoWidget(*iit, val, groupBox); @@ -192,7 +192,7 @@ void KFileMetaPropsPlugin::createLayout() iit!=readItems.end(); ++iit) { TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox); - l->setAlignment( AlignAuto | AlignTop | ExpandTabs ); + l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); (new KFileMetaInfoWidget(*iit, KFileMetaInfoWidget::ReadOnly, 0L, groupBox)); } } @@ -201,7 +201,7 @@ void KFileMetaPropsPlugin::createLayout() // the add key (disabled until fully implemented) /* d->m_add = new TQPushButton(i18n("&Add"), topframe); - d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + d->m_add->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); tmp->addWidget(d->m_add); @@ -216,7 +216,7 @@ void KFileMetaPropsPlugin::createLayout() d->m_add->setEnabled(false); for (TQStringList::Iterator it = sk.begin(); it!=sk.end(); ++it) { - if ( l.find(*it)==l.end() ) + if ( l.tqfind(*it)==l.end() ) { d->m_add->setEnabled(true); kdDebug(250) << "**first addable key is " << (*it).latin1() << "**" <<endl; diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index 9e370643f..47461dbce 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -112,7 +112,7 @@ namespace KNotify }; // Needed for displaying tooltips in the listview's QHeader - class KNotifyToolTip : public QToolTip + class KNotifyToolTip : public TQToolTip { public: KNotifyToolTip( TQHeader *header ) @@ -130,10 +130,10 @@ namespace KNotify protected: virtual void maybeTip ( const TQPoint& p ) { - TQHeader *header = static_cast<TQHeader*>( parentWidget() ); + TQHeader *header = static_cast<TQHeader*>( tqparentWidget() ); int section = 0; - if ( header->orientation() == Horizontal ) + if ( header->orientation() == Qt::Horizontal ) section= header->sectionAt( p.x() ); else section= header->sectionAt( p.y() ); @@ -181,7 +181,7 @@ KNotifyDialog::~KNotifyDialog() void KNotifyDialog::addApplicationEvents( const char *appName ) { addApplicationEvents( TQString::fromUtf8( appName ) + - TQString::fromLatin1( "/eventsrc" ) ); + TQString::tqfromLatin1( "/eventsrc" ) ); } void KNotifyDialog::addApplicationEvents( const TQString& path ) @@ -514,7 +514,7 @@ void KNotifyWidget::updatePixmaps( ListViewItem *item ) void KNotifyWidget::addVisibleApp( Application *app ) { - if ( !app || (m_visibleApps.findRef( app ) != -1) ) + if ( !app || (m_visibleApps.tqfindRef( app ) != -1) ) return; m_visibleApps.append( app ); @@ -820,7 +820,7 @@ void KNotifyWidget::save() { if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("knotify", "", "reconfigure()", ""); + kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); } emit changed( false ); @@ -830,8 +830,8 @@ void KNotifyWidget::save() // "/opt/kde3/share/apps/kwin/eventsrc" TQString KNotifyWidget::makeRelative( const TQString& fullPath ) { - int slash = fullPath.findRev( '/' ) - 1; - slash = fullPath.findRev( '/', slash ); + int slash = fullPath.tqfindRev( '/' ) - 1; + slash = fullPath.tqfindRev( '/', slash ); if ( slash < 0 ) return TQString::null; @@ -1001,17 +1001,17 @@ void KNotifyWidget::enableAll( int what, bool enable ) Application::Application( const TQString &path ) { TQString config_file = path; - config_file[config_file.find('/')] = '.'; + config_file[config_file.tqfind('/')] = '.'; m_events = 0L; config = new KConfig(config_file, false, false); kc = new KConfig(path, true, false, "data"); - kc->setGroup( TQString::fromLatin1("!Global!") ); - m_icon = kc->readEntry(TQString::fromLatin1("IconName"), - TQString::fromLatin1("misc")); - m_description = kc->readEntry( TQString::fromLatin1("Comment"), + kc->setGroup( TQString::tqfromLatin1("!Global!") ); + m_icon = kc->readEntry(TQString::tqfromLatin1("IconName"), + TQString::tqfromLatin1("misc")); + m_description = kc->readEntry( TQString::tqfromLatin1("Comment"), i18n("No description available") ); - int index = path.find( '/' ); + int index = path.tqfind( '/' ); if ( index >= 0 ) m_appname = path.left( index ); else @@ -1070,10 +1070,10 @@ void Application::reloadEvents( bool revertToDefaults ) Event *e = 0L; - TQString global = TQString::fromLatin1("!Global!"); - TQString default_group = TQString::fromLatin1("<default>"); - TQString name = TQString::fromLatin1("Name"); - TQString comment = TQString::fromLatin1("Comment"); + TQString global = TQString::tqfromLatin1("!Global!"); + TQString default_group = TQString::tqfromLatin1("<default>"); + TQString name = TQString::tqfromLatin1("Name"); + TQString comment = TQString::tqfromLatin1("Comment"); TQStringList conflist = kc->groupList(); TQStringList::ConstIterator it = conflist.begin(); diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index 70e195aba..337f4d1be 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -323,7 +323,7 @@ namespace KNotify /** * @internal */ - class ListViewItem : public QListViewItem + class ListViewItem : public TQListViewItem { public: ListViewItem( TQListView *view, Event *event ); diff --git a/kio/kfile/knotifywidgetbase.ui b/kio/kfile/knotifywidgetbase.ui index 99fd07582..c2ce7ab68 100644 --- a/kio/kfile/knotifywidgetbase.ui +++ b/kio/kfile/knotifywidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KNotifyWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KNotifyWidgetBase</cstring> </property> @@ -109,7 +109,7 @@ </sizepolicy> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_controlsBox</cstring> </property> @@ -120,7 +120,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>m_affectAllApps</cstring> </property> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -155,14 +155,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>318</width> <height>16</height> </size> </property> </spacer> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>m_buttonDisable</cstring> </property> @@ -173,7 +173,7 @@ <string>Allows you to change the behavior for all events at once</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_buttonEnable</cstring> </property> @@ -196,7 +196,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_actionsBox</cstring> </property> @@ -207,7 +207,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_stderr</cstring> </property> @@ -215,7 +215,7 @@ <string>Print a message to standard &error output</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_messageBox</cstring> </property> @@ -223,7 +223,7 @@ <string>Show a &message in a pop-up window</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_execute</cstring> </property> @@ -231,7 +231,7 @@ <string>E&xecute a program:</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout25</cstring> </property> @@ -239,7 +239,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_playSound</cstring> </property> @@ -247,7 +247,7 @@ <string>Play a &sound:</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_playButton</cstring> </property> @@ -260,7 +260,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_taskbar</cstring> </property> @@ -268,7 +268,7 @@ <string>Mark &taskbar entry</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_logToFile</cstring> </property> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -341,7 +341,7 @@ </sizepolicy> </property> </widget> - <widget class="QCheckBox" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>m_passivePopup</cstring> </property> @@ -354,7 +354,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -362,7 +362,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_extension</cstring> </property> @@ -391,14 +391,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_playerButton</cstring> </property> diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index 2a3e7e690..8d79dadae 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -131,7 +131,7 @@ void KAppTreeListItem::activate() void KAppTreeListItem::setOpen( bool o ) { if( o && !parsed ) { // fill the children before opening - ((KApplicationTree *) parent())->addDesktopGroup( path, this ); + ((KApplicationTree *) tqparent())->addDesktopGroup( path, this ); parsed = true; } TQListViewItem::setOpen( o ); @@ -279,8 +279,8 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i) void KApplicationTree::resizeEvent( TQResizeEvent * e) { - setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent) - -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth)); + setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) + -2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth)); KListView::resizeEvent(e); } @@ -340,7 +340,7 @@ KOpenWithDlg::KOpenWithDlg( const KURL::List& _urls, const TQString&_text, { TQString caption = KStringHandler::csqueeze( _urls.first().prettyURL() ); if (_urls.count() > 1) - caption += TQString::fromLatin1("..."); + caption += TQString::tqfromLatin1("..."); setCaption(caption); setServiceType( _urls ); init( _text, _value ); @@ -376,7 +376,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls ) if ( _urls.count() == 1 ) { qServiceType = KMimeType::findByURL( _urls.first())->name(); - if (qServiceType == TQString::fromLatin1("application/octet-stream")) + if (qServiceType == TQString::tqfromLatin1("application/octet-stream")) qServiceType = TQString::null; } else @@ -401,7 +401,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQToolButton *clearButton = new TQToolButton( this ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); - clearButton->setFixedSize( clearButton->sizeHint() ); + clearButton->setFixedSize( clearButton->tqsizeHint() ); connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) ); @@ -413,13 +413,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) KHistoryCombo *combo = new KHistoryCombo(); combo->setDuplicatesEnabled( false ); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); - int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") ); + int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); - int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), + int mode = kc->readNumEntry(TQString::tqfromLatin1("CompletionMode"), KGlobalSettings::completionMode()); combo->setCompletionMode((KGlobalSettings::Completion)mode); - TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); + TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") ); combo->setHistoryItems( list, true ); edit = new KURLRequester( combo, this ); } @@ -483,8 +483,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // check to see if we use konsole if not disable the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); - TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") nocloseonexit->hide(); @@ -518,7 +518,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) //edit->setText( _value ); // This is what caused "can't click on items before clicking on Name header". // Probably due to the resizeEvent handler using width(). - //resize( minimumWidth(), sizeHint().height() ); + //resize( minimumWidth(), tqsizeHint().height() ); edit->setFocus(); slotTextChanged(); } @@ -634,12 +634,12 @@ void KOpenWithDlg::slotOK() { TQString exec = serv->exec(); fullExec = exec; - exec.replace("%u", "", false); - exec.replace("%f", "", false); - exec.replace("-caption %c", ""); - exec.replace("-caption \"%c\"", ""); - exec.replace("%i", ""); - exec.replace("%m", ""); + exec.tqreplace("%u", "", false); + exec.tqreplace("%f", "", false); + exec.tqreplace("-caption %c", ""); + exec.tqreplace("-caption \"%c\"", ""); + exec.tqreplace("%i", ""); + exec.tqreplace("%m", ""); exec = exec.simplifyWhiteSpace(); if (exec == typedExec) { @@ -666,13 +666,13 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); - preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); m_command = preferredTerminal; // only add --noclose when we are sure it is konsole we're using if (preferredTerminal == "konsole" && nocloseonexit->isChecked()) - m_command += TQString::fromLatin1(" --noclose"); - m_command += TQString::fromLatin1(" -e "); + m_command += TQString::tqfromLatin1(" --noclose"); + m_command += TQString::tqfromLatin1(" -e "); m_command += edit->url(); kdDebug(250) << "Setting m_command to " << m_command << endl; } @@ -740,7 +740,7 @@ void KOpenWithDlg::slotOK() { desktop = new KDesktopFile(newPath); } - desktop->writeEntry("Type", TQString::fromLatin1("Application")); + desktop->writeEntry("Type", TQString::tqfromLatin1("Application")); desktop->writeEntry("Name", initialServiceName); desktop->writePathEntry("Exec", fullExec); if (terminal->isChecked()) @@ -760,7 +760,7 @@ void KOpenWithDlg::slotOK() if (bRemember || d->saveNewApps) { TQStringList mimeList = desktop->readListEntry("MimeType", ';'); - if (!qServiceType.isEmpty() && !mimeList.contains(qServiceType)) + if (!qServiceType.isEmpty() && !mimeList.tqcontains(qServiceType)) mimeList.append(qServiceType); desktop->writeEntry("MimeType", mimeList, ';'); @@ -814,9 +814,9 @@ void KOpenWithDlg::accept() combo->addToHistory( edit->url() ); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); - kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); - kc->writeEntry(TQString::fromLatin1("CompletionMode"), + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") ); + kc->writeEntry( TQString::tqfromLatin1("History"), combo->historyItems() ); + kc->writeEntry(TQString::tqfromLatin1("CompletionMode"), combo->completionMode()); // don't store the completion-list, as it contains all of KURLCompletion's // executables diff --git a/kio/kfile/kopenwith_p.h b/kio/kfile/kopenwith_p.h index 5583b03d9..f395d94bd 100644 --- a/kio/kfile/kopenwith_p.h +++ b/kio/kfile/kopenwith_p.h @@ -37,7 +37,7 @@ class TQStringList; /** * @internal */ -class KAppTreeListItem : public QListViewItem +class KAppTreeListItem : public TQListViewItem { bool parsed; bool directory; diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h index 3a2a49b31..e8f2ca48c 100644 --- a/kio/kfile/kpreviewwidgetbase.h +++ b/kio/kfile/kpreviewwidgetbase.h @@ -41,7 +41,7 @@ class KURL; * @short Abstract baseclass for all preview widgets. * @author Frerich Raabe <raabe@kde.org> */ -class KIO_EXPORT KPreviewWidgetBase : public QWidget +class KIO_EXPORT KPreviewWidgetBase : public TQWidget { Q_OBJECT @@ -84,7 +84,7 @@ protected: private: class KPreviewWidgetBasePrivate; KPreviewWidgetBasePrivate * d() const { - return s_private->find( const_cast<KPreviewWidgetBase*>( this ) ); + return s_private->tqfind( const_cast<KPreviewWidgetBase*>( this ) ); } static TQPtrDict<KPreviewWidgetBasePrivate> * s_private; }; diff --git a/kio/kfile/kpropertiesdesktopadvbase.ui b/kio/kfile/kpropertiesdesktopadvbase.ui index fe1122136..a4ac75d4f 100644 --- a/kio/kfile/kpropertiesdesktopadvbase.ui +++ b/kio/kfile/kpropertiesdesktopadvbase.ui @@ -1,6 +1,7 @@ + <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KPropertiesDesktopAdvBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>widget11</cstring> </property> @@ -19,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -40,14 +41,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>terminalCheck</cstring> </property> @@ -58,7 +59,7 @@ <string>Check this option if the application you want to run is a text mode application or if you want the information that is provided by the terminal emulator window.</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>terminalEditLabel</cstring> </property> @@ -69,7 +70,7 @@ <cstring>terminalEdit</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>terminalCloseCheck</cstring> </property> @@ -87,7 +88,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2_2</cstring> </property> @@ -98,7 +99,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>suidCheck</cstring> </property> @@ -119,14 +120,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>suidEditLabel</cstring> </property> @@ -150,7 +151,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup4</cstring> </property> @@ -161,7 +162,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>startupInfoCheck</cstring> </property> @@ -172,7 +173,7 @@ <string>Check this option if you want to make clear that your application has started. This visual feedback may appear as a busy cursor or in the taskbar.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>systrayCheck</cstring> </property> @@ -183,7 +184,7 @@ <string>Check this option if you want to have a system tray handle for your application.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -194,7 +195,7 @@ <cstring>dcopCombo</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>None</string> @@ -229,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> diff --git a/kio/kfile/kpropertiesdesktopbase.ui b/kio/kfile/kpropertiesdesktopbase.ui index 7809d5135..73e6d953c 100644 --- a/kio/kfile/kpropertiesdesktopbase.ui +++ b/kio/kfile/kpropertiesdesktopbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KPropertiesDesktopBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KPropertiesDesktopBase</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="7"> + <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="7"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -95,7 +95,7 @@ <p>If you want to associate this application with one or more mimetypes that are not in this list, click on the button <b>Add</b> below. If there are one or more filetypes that this application cannot handle, you may want to remove them from the list clicking on the button <b>Remove</b> below.</p></qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>nameLabel</cstring> </property> @@ -117,7 +117,7 @@ <string>Type the name you want to give to this application here. This application will appear under this name in the applications menu and in the panel.</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -139,7 +139,7 @@ <string>Type the description of this application, based on its use, here. Examples: a dial up application (KPPP) would be "Dial up tool".</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -161,7 +161,7 @@ <string>Type any comment you think is useful here.</string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -205,7 +205,7 @@ Following the command, you can have several place holders which will be replaced %c - the caption</string> </property> </widget> - <widget class="QPushButton" row="3" column="6"> + <widget class="TQPushButton" row="3" column="6"> <property name="name"> <cstring>browseButton</cstring> </property> @@ -216,7 +216,7 @@ Following the command, you can have several place holders which will be replaced <string>Click here to browse your file system in order to find the desired executable.</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -238,7 +238,7 @@ Following the command, you can have several place holders which will be replaced <string>Sets the working directory for your application.</string> </property> </widget> - <widget class="QPushButton" row="8" column="0"> + <widget class="TQPushButton" row="8" column="0"> <property name="name"> <cstring>addFiletypeButton</cstring> </property> @@ -259,14 +259,14 @@ Following the command, you can have several place holders which will be replaced <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>53</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="8" column="3"> + <widget class="TQPushButton" row="8" column="3"> <property name="name"> <cstring>delFiletypeButton</cstring> </property> @@ -287,14 +287,14 @@ Following the command, you can have several place holders which will be replaced <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>53</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="8" column="5" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="8" column="5" rowspan="1" colspan="2"> <property name="name"> <cstring>advancedButton</cstring> </property> diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 0116123f1..a7be5de64 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -516,7 +516,7 @@ void KPropertiesDialog::insertPages() if ( mimetype.isEmpty() ) return; - TQString query = TQString::fromLatin1( + TQString query = TQString::tqfromLatin1( "('KPropsDlg/Plugin' in ServiceTypes) and " "((not exist [X-KDE-Protocol]) or " " ([X-KDE-Protocol] == '%1' ) )" ).arg(item->url().protocol()); @@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages() { KPropsDlgPlugin *plugin = KParts::ComponentFactory ::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(), - this, + TQT_TQOBJECT(this), (*it)->name().latin1() ); if ( !plugin ) continue; @@ -704,7 +704,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) d = new KFilePropsPluginPrivate; d->bMultiple = (properties->items().count() > 1); d->bIconChanged = false; - d->bKDesktopMode = (TQCString(qApp->name()) == "kdesktop"); // nasty heh? + d->bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh? d->bDesktopFile = KDesktopPropsPlugin::supports(properties->items()); kdDebug(250) << "KFilePropsPlugin::KFilePropsPlugin bMultiple=" << d->bMultiple << endl; @@ -718,7 +718,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) kdDebug() << "url=" << url << " bDesktopFile=" << bDesktopFile << " isLocal=" << isLocal << " isReallyLocal=" << isReallyLocal << endl; mode_t mode = item->mode(); bool hasDirs = item->isDir() && !item->isLink(); - bool hasRoot = url.path() == TQString::fromLatin1("/"); + bool hasRoot = url.path() == TQString::tqfromLatin1("/"); TQString iconStr = KMimeType::iconForURL(url, mode); TQString directory = properties->kurl().directory(); TQString protocol = properties->kurl().protocol(); @@ -752,15 +752,15 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->setColStretch(1, 0); grid->setColStretch(2, 1); grid->addColSpacing(1, KDialog::spacingHint()); - vbl->addLayout(grid); + vbl->addLayout(TQT_TQLAYOUT(grid)); int curRow = 0; if ( !d->bMultiple ) { TQString path; if ( !m_bFromTemplate ) { - isTrash = ( properties->kurl().protocol().find( "trash", 0, false)==0 ); - if ( properties->kurl().protocol().find("device", 0, false)==0) + isTrash = ( properties->kurl().protocol().tqfind( "trash", 0, false)==0 ); + if ( properties->kurl().protocol().tqfind("device", 0, false)==0) isDevice = true; // Extract the full name, but without file: for local files if ( isReallyLocal ) @@ -831,7 +831,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) magicMimeComment = TQString::null; } - if ( url.path() == TQString::fromLatin1("/") ) + if ( url.path() == TQString::tqfromLatin1("/") ) hasRoot = true; if ( (*it)->isDir() && !(*it)->isLink() ) { @@ -859,7 +859,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) if ( !isDevice && !isTrash && (bDesktopFile || S_ISDIR(mode)) && !d->bMultiple /*not implemented for multiple*/ ) { KIconButton *iconButton = new KIconButton( d->m_frame ); - int bsize = 66 + 2 * iconButton->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * iconButton->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin); iconButton->setFixedSize(bsize, bsize); iconButton->setIconSize(48); iconButton->setStrictIconSize(false); @@ -883,12 +883,12 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) this, TQT_SLOT( slotIconChanged() ) ); } else { TQLabel *iconLabel = new TQLabel( d->m_frame ); - int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * iconLabel->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); iconArea = iconLabel; } - grid->addWidget(iconArea, curRow, 0, AlignLeft); + grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft); if (d->bMultiple || isTrash || isDevice || hasRoot) { @@ -908,11 +908,11 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // Enhanced rename: Don't highlight the file extension. TQString pattern; KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) + if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1) d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1); else { - int lastDot = filename.findRev('.'); + int lastDot = filename.tqfindRev('.'); if (lastDot > 0) d->m_lined->setSelection(0, lastDot); } @@ -942,7 +942,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) //TODO: wrap for win32 or mac? TQPushButton *button = new TQPushButton(box); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("configure")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("configure")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); button->setIconSet( iconSet ); button->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -1127,7 +1127,7 @@ void KFilePropsPlugin::slotEditFileType() #ifdef Q_WS_X11 TQString mime; if ( d->mimeType == KMimeType::defaultMimeType() ) { - int pos = d->oldFileName.findRev( '.' ); + int pos = d->oldFileName.tqfindRev( '.' ); if ( pos != -1 ) mime = "*" + d->oldFileName.mid(pos); else @@ -1136,9 +1136,9 @@ void KFilePropsPlugin::slotEditFileType() else mime = d->mimeType; //TODO: wrap for win32 or mac? - TQString keditfiletype = TQString::fromLatin1("keditfiletype"); + TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); KRun::runCommand( keditfiletype - + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId()) + + " --parent " + TQString::number( (ulong)properties->tqtopLevelWidget()->winId()) + " " + KProcess::quote(mime), keditfiletype, keditfiletype /*unused*/); #endif @@ -1234,7 +1234,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job ) KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize(); KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles(); KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs(); - m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") + m_sizeLabel->setText( TQString::tqfromLatin1("%1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) .arg(KGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) @@ -1362,9 +1362,9 @@ void KFilePropsPlugin::applyChanges() connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL &, const KURL & ) ), TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) ); // wait for job - TQWidget dummy(0,0,WType_Dialog|WShowModal); + TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); return; } @@ -1384,7 +1384,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) if (job) { // allow apply() to return - qApp->exit_loop(); + tqApp->exit_loop(); if ( job->error() ) { job->showErrorDialog( d->m_frame ); @@ -1427,7 +1427,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) void KFilePropsPlugin::applyIconChanges() { - KIconButton *iconButton = ::qt_cast<KIconButton *>( iconArea ); + KIconButton *iconButton = ::tqqt_cast<KIconButton *>( iconArea ); if ( !iconButton || !d->bIconChanged ) return; // handle icon changes - only local files (or pseudo-local) for now @@ -1439,7 +1439,7 @@ void KFilePropsPlugin::applyIconChanges() if (S_ISDIR(properties->item()->mode())) { - path = url.path(1) + TQString::fromLatin1(".directory"); + path = url.path(1) + TQString::tqfromLatin1(".directory"); // don't call updateUrl because the other tabs (i.e. permissions) // apply to the directory, not the .directory file. } @@ -1563,7 +1563,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TQString path = properties->kurl().path(-1); TQString fname = properties->kurl().fileName(); bool isLocal = properties->kurl().isLocalFile(); - bool isTrash = ( properties->kurl().protocol().find("trash", 0, false)==0 ); + bool isTrash = ( properties->kurl().protocol().tqfind("trash", 0, false)==0 ); bool IamRoot = (geteuid() == 0); KFileItem * item = properties->item(); @@ -1710,11 +1710,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr "sense for programs and scripts. It is required when you want to " "execute them.")); - TQLayoutItem *spacer = new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding); + TQLayoutItem *spacer = TQT_TQLAYOUTITEM(new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); gl->addMultiCell(spacer, 5, 5, 0, 1); pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb); - gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, AlignRight); + gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, Qt::AlignRight); connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() )); } else @@ -1753,7 +1753,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr kcom->setOrder(KCompletion::Sorted); setpwent(); for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(user->pw_name)); + kcom->addItem(TQString::tqfromLatin1(user->pw_name)); endpwent(); usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto : KGlobalSettings::CompletionNone); @@ -1781,7 +1781,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++) { if (IamRoot) - groupList += TQString::fromLatin1(ge->gr_name); + groupList += TQString::tqfromLatin1(ge->gr_name); else { /* pick the groups to which the user belongs */ @@ -1802,14 +1802,14 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /* add the effective Group to the list .. */ ge = getgrgid (getegid()); if (ge) { - TQString name = TQString::fromLatin1(ge->gr_name); + TQString name = TQString::tqfromLatin1(ge->gr_name); if (name.isEmpty()) name.setNum(ge->gr_gid); - if (groupList.find(name) == groupList.end()) + if (groupList.tqfind(name) == groupList.end()) groupList += name; } - bool isMyGroup = groupList.contains(strGroup); + bool isMyGroup = groupList.tqcontains(strGroup); /* add the group the file currently belongs to .. * .. if its not there already @@ -1843,7 +1843,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr { grpCombo = new TQComboBox(gb, "combogrouplist"); grpCombo->insertStringList(groupList); - grpCombo->setCurrentItem(groupList.findIndex(strGroup)); + grpCombo->setCurrentItem(groupList.tqfindIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); connect( grpCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( changed() ) ); @@ -1966,7 +1966,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { TQWhatsThis::add(l, execWhatsThis); theNotSpecials.append( l ); // GJ: Add space between normal and special modes - TQSize size = l->sizeHint(); + TQSize size = l->tqsizeHint(); size.setWidth(size.width() + 15); l->setFixedSize(size); gl->addWidget (l, 1, 3); @@ -2518,9 +2518,9 @@ void KFilePermissionsPropsPlugin::applyChanges() connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); // Wait for job - TQWidget dummy(0,0,WType_Dialog|WShowModal); + TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } if (dirs.count() > 0) { @@ -2534,9 +2534,9 @@ void KFilePermissionsPropsPlugin::applyChanges() connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); // Wait for job - TQWidget dummy(0,0,WType_Dialog|WShowModal); + TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } } @@ -2547,7 +2547,7 @@ void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job ) if (job->error()) job->showErrorDialog( d->m_frame ); // allow apply() to return - qApp->exit_loop(); + tqApp->exit_loop(); } @@ -2639,7 +2639,7 @@ void KURLPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Link")); + config.writeEntry( "Type", TQString::tqfromLatin1("Link")); config.writePathEntry( "URL", URLEdit->url() ); // Users can't create a Link .desktop file with a Name field, // but distributions can. Update the Name field in that case. @@ -2685,35 +2685,35 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl tmpQLabel = new TQLabel( d->m_frame, "Label_1" ); tmpQLabel->setText( i18n("Pattern ( example: *.html;*.htm )") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); mainlayout->addWidget(tmpQLabel, 1); //patternEdit->setGeometry( 10, 40, 210, 30 ); //patternEdit->setText( "" ); patternEdit->setMaxLength( 512 ); - patternEdit->setMinimumSize( patternEdit->sizeHint() ); + patternEdit->setMinimumSize( patternEdit->tqsizeHint() ); patternEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(patternEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_2" ); tmpQLabel->setText( i18n("Mime Type") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); mainlayout->addWidget(tmpQLabel, 1); //mimeEdit->setGeometry( 10, 160, 210, 30 ); mimeEdit->setMaxLength( 256 ); - mimeEdit->setMinimumSize( mimeEdit->sizeHint() ); + mimeEdit->setMinimumSize( mimeEdit->tqsizeHint() ); mimeEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(mimeEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_3" ); tmpQLabel->setText( i18n("Comment") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); mainlayout->addWidget(tmpQLabel, 1); //commentEdit->setGeometry( 10, 100, 210, 30 ); commentEdit->setMaxLength( 256 ); - commentEdit->setMinimumSize( commentEdit->sizeHint() ); + commentEdit->setMinimumSize( commentEdit->tqsizeHint() ); commentEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(commentEdit, 1); @@ -2796,7 +2796,7 @@ void KBindingPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("MimeType") ); + config.writeEntry( "Type", TQString::tqfromLatin1("MimeType") ); config.writeEntry( "Patterns", patternEdit->text() ); config.writeEntry( "Comment", commentEdit->text() ); @@ -2852,8 +2852,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP if ((mountPoint != "-") && (mountPoint != "none") && !mountPoint.isEmpty() && device != "none") { - devices.append( device + TQString::fromLatin1(" (") - + mountPoint + TQString::fromLatin1(")") ); + devices.append( device + TQString::tqfromLatin1(" (") + + mountPoint + TQString::tqfromLatin1(")") ); m_devicelist.append(device); d->mountpointlist.append(mountPoint); } @@ -2916,7 +2916,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP layout->addMultiCellWidget(sep, 6, 6, 0, 1); unmounted = new KIconButton( d->m_frame ); - int bsize = 66 + 2 * unmounted->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * unmounted->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin); unmounted->setFixedSize(bsize, bsize); unmounted->setIconType(KIcon::Desktop, KIcon::Device); layout->addWidget(unmounted, 7, 0); @@ -2945,7 +2945,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP device->setEditText( deviceStr ); if ( !deviceStr.isEmpty() ) { // Set default options for this device (first matching entry) - int index = m_devicelist.findIndex(deviceStr); + int index = m_devicelist.tqfindIndex(deviceStr); if (index != -1) { //kdDebug(250) << "found it " << index << endl; @@ -3020,7 +3020,7 @@ void KDevicePropsPlugin::slotActivated( int index ) void KDevicePropsPlugin::slotDeviceChanged() { // Update mountpoint so that it matches the typed device - int index = m_devicelist.findIndex( device->currentText() ); + int index = m_devicelist.tqfindIndex( device->currentText() ); if ( index != -1 ) mountpoint->setText( d->mountpointlist[index] ); else @@ -3077,7 +3077,7 @@ void KDevicePropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("FSDevice") ); + config.writeEntry( "Type", TQString::tqfromLatin1("FSDevice") ); config.writeEntry( "Dev", device->currentText() ); config.writeEntry( "MountPoint", mountpoint->text() ); @@ -3107,7 +3107,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) w = new KPropertiesDesktopBase(frame); mainlayout->addWidget(w); - bool bKDesktopMode = (TQCString(qApp->name()) == "kdesktop"); // nasty heh? + bool bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh? if (bKDesktopMode) { @@ -3255,11 +3255,11 @@ void KDesktopPropsPlugin::slotAddFiletype() TQString mimetype = (*it)->name(); if (mimetype == KMimeType::defaultMimeType()) continue; - int index = mimetype.find("/"); + int index = mimetype.tqfind("/"); TQString maj = mimetype.left(index); TQString min = mimetype.mid(index+1); - TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( maj ); + TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( maj ); if ( mit == majorMap.end() ) { majorGroup = new TQListViewItem( mw->listView, maj ); majorGroup->setExpandable(true); @@ -3274,7 +3274,7 @@ void KDesktopPropsPlugin::slotAddFiletype() TQListViewItem *item = new TQListViewItem(majorGroup, min, (*it)->comment()); item->setPixmap(0, (*it)->pixmap(KIcon::Small, IconSize(KIcon::Small))); } - TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( "all" ); + TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( "all" ); if ( mit != majorMap.end()) { mw->listView->setCurrentItem(mit.data()); @@ -3362,7 +3362,7 @@ void KDesktopPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writeEntry( "Comment", w->commentEdit->text() ); config.writeEntry( "Comment", w->commentEdit->text(), true, false, true ); // for compat config.writeEntry( "GenericName", w->genNameEdit->text() ); @@ -3446,9 +3446,9 @@ void KDesktopPropsPlugin::slotAdvanced() // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", - TQString::fromLatin1("konsole")); + TQString::tqfromLatin1("konsole")); bool terminalCloseBool = false; @@ -3493,7 +3493,7 @@ void KDesktopPropsPlugin::slotAdvanced() int i, maxEntries = 1000; setpwent(); for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(pw->pw_name)); + kcom->addItem(TQString::tqfromLatin1(pw->pw_name)); endpwent(); if (i < maxEntries) { @@ -3672,9 +3672,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", - TQString::fromLatin1("konsole")); + TQString::tqfromLatin1("konsole")); int posOptions = 1; d->nocloseonexitCheck = 0L; @@ -3767,7 +3767,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) int i, maxEntries = 1000; setpwent(); for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(pw->pw_name)); + kcom->addItem(TQString::tqfromLatin1(pw->pw_name)); endpwent(); if (i < maxEntries) { @@ -3854,7 +3854,7 @@ void KExecPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writePathEntry( "Exec", execEdit->text() ); config.writePathEntry( "SwallowExec", swallowExecEdit->text() ); config.writeEntry( "SwallowTitle", swallowTitleEdit->text() ); @@ -3862,7 +3862,7 @@ void KExecPropsPlugin::applyChanges() TQString temp = terminalEdit->text(); if (d->nocloseonexitCheck ) if ( d->nocloseonexitCheck->isChecked() ) - temp += TQString::fromLatin1("--noclose "); + temp += TQString::tqfromLatin1("--noclose "); temp = temp.stripWhiteSpace(); config.writeEntry( "TerminalOptions", temp ); config.writeEntry( "X-KDE-SubstituteUID", suidCheck->isChecked() ); @@ -3892,7 +3892,7 @@ class KApplicationPropsPlugin::KApplicationPropsPluginPrivate public: KApplicationPropsPluginPrivate() { - m_kdesktopMode = TQCString(qApp->name()) == "kdesktop"; // nasty heh? + m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh? } ~KApplicationPropsPluginPrivate() { @@ -3931,7 +3931,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - toplayout->addLayout(grid); + toplayout->addLayout(TQT_TQLAYOUT(grid)); if ( d->m_kdesktopMode ) { @@ -3967,7 +3967,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) grid->setColStretch(2, 1); grid->setRowStretch( 0, 1 ); grid->setRowStretch( 3, 1 ); - toplayout->addLayout(grid, 2); + toplayout->addLayout(TQT_TQLAYOUT(grid), 2); extensionsList = new TQListBox( d->m_frame ); extensionsList->setSelectionMode( TQListBox::Extended ); @@ -4097,7 +4097,7 @@ void KApplicationPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writeEntry( "Comment", commentEdit->text() ); config.writeEntry( "Comment", commentEdit->text(), true, false, true ); // for compat config.writeEntry( "GenericName", genNameEdit->text() ); diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index dc6a621f9..4243bf602 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -434,7 +434,7 @@ private: * You can also include X-KDE-Protocol=file if you want that plugin * to be loaded only for local files, for instance. */ -class KIO_EXPORT KPropsDlgPlugin : public QObject +class KIO_EXPORT KPropsDlgPlugin : public TQObject { Q_OBJECT public: diff --git a/kio/kfile/kpropertiesmimetypebase.ui b/kio/kfile/kpropertiesmimetypebase.ui index 0223f22a6..df7c796da 100644 --- a/kio/kfile/kpropertiesmimetypebase.ui +++ b/kio/kfile/kpropertiesmimetypebase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KPropertiesMimetypeBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>widget2</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 22b4cd477..85cdebb02 100644 --- a/kio/kfile/krecentdirs.cpp +++ b/kio/kfile/krecentdirs.cpp @@ -52,13 +52,13 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re if (key[1] == ':') { key = key.mid(2); - config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly); + config = new KSimpleConfig(TQString::tqfromLatin1("krecentdirsrc"), readOnly); } else { key = key.mid(1); config = KGlobal::config(); - config->setGroup(TQString::fromLatin1("Recent Dirs")); + config->setGroup(TQString::tqfromLatin1("Recent Dirs")); } result=config->readPathListEntry(key); diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index 69fd63df5..7b5c6908a 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -45,7 +45,7 @@ TQString KRecentDocument::recentDocumentDirectory() { // need to change this path, not sure where - return locateLocal("data", TQString::fromLatin1("RecentDocuments/")); + return locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")); } TQStringList KRecentDocument::recentDocuments() @@ -74,7 +74,7 @@ TQStringList KRecentDocument::recentDocuments() void KRecentDocument::add(const KURL& url) { - KRecentDocument::add(url, qApp->argv()[0]); // ### argv[0] might not match the service filename! + KRecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename! } void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) @@ -88,9 +88,9 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) kdDebug(250) << "KRecentDocument::add for " << openStr << endl; KConfig *config = KGlobal::config(); TQString oldGrp = config->group(); - config->setGroup(TQString::fromLatin1("RecentDocuments")); - bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); - int maxEntries = config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); + config->setGroup(TQString::tqfromLatin1("RecentDocuments")); + bool useRecent = config->readBoolEntry(TQString::tqfromLatin1("UseRecent"), true); + int maxEntries = config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10); config->setGroup(oldGrp); if(!useRecent) @@ -100,7 +100,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) TQString dStr = path + url.fileName(); - TQString ddesktop = dStr + TQString::fromLatin1(".desktop"); + TQString ddesktop = dStr + TQString::tqfromLatin1(".desktop"); int i=1; // check for duplicates @@ -108,7 +108,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) // see if it points to the same file and application KSimpleConfig tmp(ddesktop); tmp.setDesktopGroup(); - if(tmp.readEntry(TQString::fromLatin1("X-KDE-LastOpenedWith")) + if(tmp.readEntry(TQString::tqfromLatin1("X-KDE-LastOpenedWith")) == desktopEntryName) { utime(TQFile::encodeName(ddesktop), NULL); @@ -118,7 +118,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) ++i; if ( i > maxEntries ) break; - ddesktop = dStr + TQString::fromLatin1("[%1].desktop").arg(i); + ddesktop = dStr + TQString::tqfromLatin1("[%1].desktop").arg(i); } TQDir dir(path); @@ -129,7 +129,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) TQStringList::Iterator it; it = list.begin(); while(i > maxEntries-1){ - TQFile::remove(dir.absPath() + TQString::fromLatin1("/") + (*it)); + TQFile::remove(dir.absPath() + TQString::tqfromLatin1("/") + (*it)); --i, ++it; } } @@ -137,15 +137,15 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) // create the applnk KSimpleConfig conf(ddesktop); conf.setDesktopGroup(); - conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); - conf.writePathEntry( TQString::fromLatin1("URL"), openStr ); + conf.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") ); + conf.writePathEntry( TQString::tqfromLatin1("URL"), openStr ); // If you change the line below, change the test in the above loop - conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); + conf.writeEntry( TQString::tqfromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); TQString name = url.fileName(); if (name.isEmpty()) name = openStr; - conf.writeEntry( TQString::fromLatin1("Name"), name ); - conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) ); + conf.writeEntry( TQString::tqfromLatin1("Name"), name ); + conf.writeEntry( TQString::tqfromLatin1("Icon"), KMimeType::iconForURL( url ) ); } void KRecentDocument::add(const TQString &openStr, bool isUrl) @@ -170,8 +170,8 @@ void KRecentDocument::clear() int KRecentDocument::maximumItems() { KConfig *config = KGlobal::config(); - KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); - return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); + KConfigGroupSaver sa(config, TQString::tqfromLatin1("RecentDocuments")); + return config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index d1a9de4ea..692fbd8de 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -53,7 +53,7 @@ * Handles tooltips in the KURLBar * @internal */ -class KURLBarToolTip : public QToolTip +class KURLBarToolTip : public TQToolTip { public: KURLBarToolTip( TQListBox *view ) : TQToolTip( view ), m_view( view ) {} @@ -64,7 +64,7 @@ protected: if ( item ) { TQString text = static_cast<KURLBarItem*>( item )->toolTip(); if ( !text.isEmpty() ) - tip( m_view->itemRect( item ), text ); + tip( m_view->tqitemRect( item ), text ); } } @@ -188,11 +188,11 @@ void KURLBarItem::paint( TQPainter *p ) if ( isCurrent() || isSelected() ) { int h = height( box ); - TQBrush brush = box->colorGroup().brush( TQColorGroup::Highlight ); + TQBrush brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); p->fillRect( 0, 0, w, h, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->colorGroup().mid() ); + pen.setColor( box->tqcolorGroup().mid() ); p->setPen( pen ); p->drawPoint( 0, 0 ); @@ -225,10 +225,10 @@ void KURLBarItem::paint( TQPainter *p ) int xPos = pm->width() + margin + 2; if ( isCurrent() || isSelected() ) { - p->setPen( box->colorGroup().highlight().dark(115) ); + p->setPen( box->tqcolorGroup().highlight().dark(115) ); p->drawText( xPos + ( TQApplication::reverseLayout() ? -1 : 1), yPos + 1, visibleText ); - p->setPen( box->colorGroup().highlightedText() ); + p->setPen( box->tqcolorGroup().highlightedText() ); } p->drawText( xPos, yPos, visibleText ); @@ -257,10 +257,10 @@ void KURLBarItem::paint( TQPainter *p ) x = QMAX( x, margin ); if ( isCurrent() || isSelected() ) { - p->setPen( box->colorGroup().highlight().dark(115) ); + p->setPen( box->tqcolorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, visibleText ); - p->setPen( box->colorGroup().highlightedText() ); + p->setPen( box->tqcolorGroup().highlightedText() ); } p->drawText( x, y, visibleText ); @@ -268,7 +268,7 @@ void KURLBarItem::paint( TQPainter *p ) } } -TQSize KURLBarItem::sizeHint() const +TQSize KURLBarItem::tqsizeHint() const { int wmin = 0; int hmin = 0; @@ -284,9 +284,9 @@ TQSize KURLBarItem::sizeHint() const } if ( lb->isVertical() ) - wmin = QMIN( wmin, lb->viewport()->sizeHint().width() ); + wmin = QMIN( wmin, lb->viewport()->tqsizeHint().width() ); else - hmin = QMIN( hmin, lb->viewport()->sizeHint().height() ); + hmin = QMIN( hmin, lb->viewport()->tqsizeHint().height() ); return TQSize( wmin, hmin ); } @@ -294,17 +294,17 @@ TQSize KURLBarItem::sizeHint() const int KURLBarItem::width( const TQListBox *lb ) const { if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) - return QMAX( sizeHint().width(), lb->viewport()->width() ); + return QMAX( tqsizeHint().width(), lb->viewport()->width() ); else - return sizeHint().width(); + return tqsizeHint().width(); } int KURLBarItem::height( const TQListBox *lb ) const { if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) - return sizeHint().height(); + return tqsizeHint().height(); else - return QMAX( sizeHint().height(), lb->viewport()->height() ); + return QMAX( tqsizeHint().height(), lb->viewport()->height() ); } bool KURLBarItem::isPersistent() const @@ -341,7 +341,7 @@ KURLBar::KURLBar( bool useGlobalItems, TQWidget *parent, const char *name, WFlag d = new KURLBarPrivate(); setListBox( 0L ); - setSizePolicy( TQSizePolicy( isVertical() ? + tqsetSizePolicy( TQSizePolicy( isVertical() ? TQSizePolicy::Maximum : TQSizePolicy::Preferred, isVertical() ? @@ -378,7 +378,7 @@ KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& descri void KURLBar::setOrientation( Qt::Orientation orient ) { m_listBox->setOrientation( orient ); - setSizePolicy( TQSizePolicy( isVertical() ? + tqsetSizePolicy( TQSizePolicy( isVertical() ? TQSizePolicy::Maximum : TQSizePolicy::Preferred, isVertical() ? @@ -397,18 +397,18 @@ void KURLBar::setListBox( KURLBarListBox *view ) if ( !view ) { m_listBox = new KURLBarListBox( this, "urlbar listbox" ); - setOrientation( Vertical ); + setOrientation( Qt::Vertical ); } else { m_listBox = view; - if ( m_listBox->parentWidget() != this ) + if ( m_listBox->tqparentWidget() != this ) m_listBox->reparent( this, TQPoint(0,0) ); m_listBox->resize( width(), height() ); } m_listBox->setSelectionMode( KListBox::Single ); paletteChange( palette() ); - m_listBox->setFocusPolicy( TabFocus ); + m_listBox->setFocusPolicy( TQ_TabFocus ); connect( m_listBox, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), TQT_SLOT( slotSelected( int, TQListBoxItem * ))); @@ -435,7 +435,7 @@ void KURLBar::setIconSize( int size ) item = static_cast<KURLBarItem*>( item->next() ); } - resize( sizeHint() ); + resize( tqsizeHint() ); updateGeometry(); } @@ -466,14 +466,14 @@ void KURLBar::paletteChange( const TQPalette & ) setPalette( pal ); } -TQSize KURLBar::sizeHint() const +TQSize KURLBar::tqsizeHint() const { - return m_listBox->sizeHint(); + return m_listBox->tqsizeHint(); #if 0 // this code causes vertical and or horizontal scrollbars appearing // depending on the text, font, moonphase and earth rotation. Just using - // m_listBox->sizeHint() fixes this (although the widget can then be + // m_listBox->tqsizeHint() fixes this (although the widget can then be // resized to a smaller size so that scrollbars appear). int w = 0; int h = 0; @@ -484,7 +484,7 @@ TQSize KURLBar::sizeHint() const item; item = static_cast<KURLBarItem*>( item->next() ) ) { - TQSize sh = item->sizeHint(); + TQSize sh = item->tqsizeHint(); if ( vertical ) { w = QMAX( w, sh.width() ); @@ -508,9 +508,9 @@ TQSize KURLBar::sizeHint() const #endif } -TQSize KURLBar::minimumSizeHint() const +TQSize KURLBar::tqminimumSizeHint() const { - TQSize s = sizeHint(); // ### + TQSize s = tqsizeHint(); // ### int w = s.width() + m_listBox->verticalScrollBar()->width(); int h = s.height() + m_listBox->horizontalScrollBar()->height(); return TQSize( w, h ); @@ -844,7 +844,7 @@ KURLBarListBox::~KURLBarListBox() void KURLBarListBox::paintEvent( TQPaintEvent* ) { TQPainter p(this); - p.setPen( colorGroup().mid() ); + p.setPen( tqcolorGroup().mid() ); p.drawRect( 0, 0, width(), height() ); } @@ -886,7 +886,7 @@ void KURLBarListBox::contextMenuEvent( TQContextMenuEvent *e ) void KURLBarListBox::setOrientation( Qt::Orientation orient ) { - if ( orient == Vertical ) { + if ( orient == Qt::Vertical ) { setColumnMode( 1 ); setRowMode( Variable ); } @@ -980,7 +980,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, if ( KGlobal::instance()->aboutData() ) appName = KGlobal::instance()->aboutData()->programName(); if ( appName.isEmpty() ) - appName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); + appName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() ); m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box ); m_appLocal->setChecked( appLocal ); TQWhatsThis::add( m_appLocal, diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h index 8da43ff15..32969cff7 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -39,7 +39,7 @@ class KURLBar; * @see KURLBar * @see KURLBarListBox */ -class KIO_EXPORT KURLBarItem : public QListBoxPixmap +class KIO_EXPORT KURLBarItem : public TQListBoxPixmap { public: /** @@ -109,7 +109,7 @@ public: * returns the preferred size of this item * @since 3.1 */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * returns the width of this item. @@ -227,7 +227,7 @@ class KURLBarListBox; * @author Carsten Pfeiffer <pfeiffer@kde.org> * @short A URL-bar widget, as used in the KFileDialog */ -class KIO_EXPORT KURLBar : public QFrame +class KIO_EXPORT KURLBar : public TQFrame { Q_OBJECT @@ -319,12 +319,12 @@ public: * @returns a proper sizehint, depending on the orientation and the number * of items available. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * @returns a proper minimum size (reimplemented) */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * Call this method to read a saved configuration from @p config, @@ -382,7 +382,7 @@ public: /** * @returns true if the bar is in vertical mode. */ - bool isVertical() const { return orientation() == Vertical; } + bool isVertical() const { return orientation() == Qt::Vertical; } public slots: /** diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 72c7cbd07..f7bf58bc0 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -31,7 +31,7 @@ class KURLComboBox::KURLComboBoxPrivate { public: KURLComboBoxPrivate() { - dirpix = SmallIcon(TQString::fromLatin1("folder")); + dirpix = SmallIcon(TQString::tqfromLatin1("folder")); } TQPixmap dirpix; @@ -70,9 +70,9 @@ void KURLComboBox::init( Mode mode ) defaultList.setAutoDelete( true ); setInsertionPolicy( NoInsertion ); setTrapReturnKey( true ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); - opendirPix = SmallIcon(TQString::fromLatin1("folder_open")); + opendirPix = SmallIcon(TQString::tqfromLatin1("folder_open")); connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int ))); } @@ -152,7 +152,7 @@ void KURLComboBox::setURLs( TQStringList urls, OverLoadResolving remove ) // kill duplicates TQString text; while ( it != urls.end() ) { - while ( urls.contains( *it ) > 1 ) { + while ( urls.tqcontains( *it ) > 1 ) { it = urls.remove( it ); continue; } diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp index ae8f5b623..66b79925e 100644 --- a/kio/kfile/kurlrequester.cpp +++ b/kio/kfile/kurlrequester.cpp @@ -112,9 +112,9 @@ public: void connectSignals( TQObject *receiver ) { TQObject *sender; if ( combo ) - sender = combo; + sender = TQT_TQOBJECT(combo); else - sender = edit; + sender = TQT_TQOBJECT(edit); connect( sender, TQT_SIGNAL( textChanged( const TQString& )), receiver, TQT_SIGNAL( textChanged( const TQString& ))); @@ -206,7 +206,7 @@ void KURLRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KURLDragPushButton( this, "kfile button"); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -220,14 +220,14 @@ void KURLRequester::init() widget->installEventFilter( this ); setFocusProxy( widget ); - d->connectSignals( this ); + d->connectSignals( TQT_TQOBJECT(this) ); connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() )); myCompletion = new KURLCompletion(); d->setCompletionObject( myCompletion ); KAccel *accel = new KAccel( this ); - accel->insert( KStdAccel::Open, this, TQT_SLOT( slotOpenDialog() )); + accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() )); accel->readSettings(); } @@ -340,7 +340,7 @@ TQString KURLRequester::filter( ) const KFileDialog * KURLRequester::fileDialog() const { if ( !myFileDialog ) { - TQWidget *p = parentWidget(); + TQWidget *p = tqparentWidget(); myFileDialog = new KFileDialog( TQString::null, d->fileDialogFilter, p, "file dialog", true ); @@ -386,7 +386,7 @@ void KURLRequester::slotUpdateURL() bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev ) { - if ( ( d->edit == obj ) || ( d->combo == obj ) ) + if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) ) { if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut )) // Forward focusin/focusout events to the urlrequester; needed by file form element in khtml @@ -402,7 +402,7 @@ KPushButton * KURLRequester::button() const KEditListBox::CustomEditor KURLRequester::customEditor() { - setSizePolicy(TQSizePolicy( TQSizePolicy::Preferred, + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed)); KLineEdit *edit = d->edit; diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h index 1bdbeee3e..fa40d0656 100644 --- a/kio/kfile/kurlrequester.h +++ b/kio/kfile/kurlrequester.h @@ -53,7 +53,7 @@ class TQTimer; * @short A widget to request a filename/url from the user * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KIO_EXPORT KURLRequester : public QHBox +class KIO_EXPORT KURLRequester : public TQHBox { Q_OBJECT Q_PROPERTY( TQString url READ url WRITE setURL ) diff --git a/kio/kfile/kurlrequesterdlg.cpp b/kio/kfile/kurlrequesterdlg.cpp index 19409afdc..defa09264 100644 --- a/kio/kfile/kurlrequesterdlg.cpp +++ b/kio/kfile/kurlrequesterdlg.cpp @@ -67,7 +67,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) topLayout->addWidget( label ); urlRequester_ = new KURLRequester( urlName, plainPage(), "urlRequester" ); - urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); + urlRequester_->setMinimumWidth( urlRequester_->tqsizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); urlRequester_->setFocus(); connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp index 47fcd02ca..c66ed3ff2 100644 --- a/kio/kfile/tests/kdirselectdialogtest.cpp +++ b/kio/kfile/tests/kdirselectdialogtest.cpp @@ -10,7 +10,7 @@ int main( int argc, char **argv ) KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null ); if ( u.isValid() ) KMessageBox::information( 0L, - TQString::fromLatin1("You selected the url: %1") + TQString::tqfromLatin1("You selected the url: %1") .arg( u.prettyURL() ), "Selected URL" ); return 0; diff --git a/kio/kfile/tests/kfdtest.cpp b/kio/kfile/tests/kfdtest.cpp index 25e2da949..43dbb4fd0 100644 --- a/kio/kfile/tests/kfdtest.cpp +++ b/kio/kfile/tests/kfdtest.cpp @@ -25,10 +25,10 @@ void KFDTest::doit() if ( dlg->exec() == KDialog::Accepted ) { - KMessageBox::information(0, TQString::fromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() )); + KMessageBox::information(0, TQString::tqfromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() )); } -// qApp->quit(); +// tqApp->quit(); } #include "kfdtest.moc" diff --git a/kio/kfile/tests/kfdtest.h b/kio/kfile/tests/kfdtest.h index 3f980bc94..6c59550b8 100644 --- a/kio/kfile/tests/kfdtest.h +++ b/kio/kfile/tests/kfdtest.h @@ -10,7 +10,7 @@ #include <tqobject.h> -class KFDTest : public QObject +class KFDTest : public TQObject { Q_OBJECT diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index 5c520dd5d..bad100809 100644 --- a/kio/kfile/tests/kfiletreeviewtest.cpp +++ b/kio/kfile/tests/kfiletreeviewtest.cpp @@ -148,7 +148,7 @@ int main(int argc, char **argv) { for( int i = 1; i < argc; i++ ) { - argv1 = TQString::fromLatin1(argv[i]); + argv1 = TQString::tqfromLatin1(argv[i]); kdDebug() << "Opening " << argv1 << endl; if( argv1 == "-d" ) tf->setDirOnly(); diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp index b84cbc967..48c8a1a2b 100644 --- a/kio/kfile/tests/kfstest.cpp +++ b/kio/kfile/tests/kfstest.cpp @@ -51,11 +51,11 @@ int main(int argc, char **argv) TQString argv1; TQString startDir; if (argc > 1) - argv1 = TQString::fromLatin1(argv[1]); + argv1 = TQString::tqfromLatin1(argv[1]); if ( argc > 2 ) - startDir = TQString::fromLatin1( argv[2]); + startDir = TQString::tqfromLatin1( argv[2]); - if (argv1 == TQString::fromLatin1("diroperator")) { + if (argv1 == TQString::tqfromLatin1("diroperator")) { KDirOperator *op = new KDirOperator(startDir, 0, "operator"); op->setViewConfig( KGlobal::config(), "TestGroup" ); op->setView(KFile::Simple); @@ -64,24 +64,24 @@ int main(int argc, char **argv) a.exec(); } - else if (argv1 == TQString::fromLatin1("justone")) { + else if (argv1 == TQString::tqfromLatin1("justone")) { TQString name = KFileDialog::getOpenFileName(startDir); qDebug("filename=%s",name.latin1()); } - else if (argv1 == TQString::fromLatin1("existingURL")) { + else if (argv1 == TQString::tqfromLatin1("existingURL")) { KURL url = KFileDialog::getExistingURL(); qDebug("URL=%s",url.url().latin1()); name1 = url.url(); } - else if (argv1 == TQString::fromLatin1("preview")) { + else if (argv1 == TQString::tqfromLatin1("preview")) { KURL u = KFileDialog::getImageOpenURL(); qDebug("filename=%s", u.url().latin1()); } - else if (argv1 == TQString::fromLatin1("preselect")) { - names = KFileDialog::getOpenFileNames(TQString::fromLatin1("/etc/passwd")); + else if (argv1 == TQString::tqfromLatin1("preselect")) { + names = KFileDialog::getOpenFileNames(TQString::tqfromLatin1("/etc/passwd")); TQStringList::Iterator it = names.begin(); while ( it != names.end() ) { qDebug("selected file: %s", (*it).latin1()); @@ -89,10 +89,10 @@ int main(int argc, char **argv) } } - else if (argv1 == TQString::fromLatin1("dirs")) + else if (argv1 == TQString::tqfromLatin1("dirs")) name1 = KFileDialog::getExistingDirectory(); - else if (argv1 == TQString::fromLatin1("heap")) { + else if (argv1 == TQString::tqfromLatin1("heap")) { KFileDialog *dlg = new KFileDialog( startDir, TQString::null, 0L, "file dialog", true ); dlg->setMode( KFile::File); @@ -104,33 +104,33 @@ int main(int argc, char **argv) if ( urlBar ) { urlBar->insertDynamicItem( KURL("ftp://ftp.kde.org"), - TQString::fromLatin1("KDE FTP Server") ); + TQString::tqfromLatin1("KDE FTP Server") ); } if ( dlg->exec() == KDialog::Accepted ) name1 = dlg->selectedURL().url(); } - else if ( argv1 == TQString::fromLatin1("eventloop") ) + else if ( argv1 == TQString::tqfromLatin1("eventloop") ) { KFDTest *test = new KFDTest( startDir ); return a.exec(); } - else if (argv1 == TQString::fromLatin1("save")) { + else if (argv1 == TQString::tqfromLatin1("save")) { KURL u = KFileDialog::getSaveURL(); -// TQString(TQDir::homeDirPath() + TQString::fromLatin1("/testfile")), +// TQString(TQDir::homeDirPath() + TQString::tqfromLatin1("/testfile")), // TQString::null, 0L); name1 = u.url(); } - else if (argv1 == TQString::fromLatin1("icon")) { + else if (argv1 == TQString::tqfromLatin1("icon")) { KIconDialog dlg; TQString icon = dlg.selectIcon(); kdDebug() << icon << endl; } -// else if ( argv1 == TQString::fromLatin1("dirselect") ) { +// else if ( argv1 == TQString::tqfromLatin1("dirselect") ) { // KURL url; // url.setPath( "/" ); // KURL selected = KDirSelectDialog::selectDirectory( url ); @@ -140,7 +140,7 @@ int main(int argc, char **argv) else { KFileDialog dlg(startDir, - TQString::fromLatin1("*|All Files\n" + TQString::tqfromLatin1("*|All Files\n" "*.lo *.o *.la|All libtool Files"), 0, 0, true); // dlg.setFilter( "*.kdevelop" ); @@ -177,7 +177,7 @@ int main(int argc, char **argv) } if (!(name1.isNull())) - KMessageBox::information(0, TQString::fromLatin1("You selected the file " ) + name1, - TQString::fromLatin1("Your Choice")); + KMessageBox::information(0, TQString::tqfromLatin1("You selected the file " ) + name1, + TQString::tqfromLatin1("Your Choice")); return 0; } diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp index 9248eec5d..4a1d4bec0 100644 --- a/kio/kfile/tests/kurlrequestertest.cpp +++ b/kio/kfile/tests/kurlrequestertest.cpp @@ -10,7 +10,7 @@ int main( int argc, char **argv ) qDebug( "Selected url: %s", url.url().latin1()); KURLRequester *req = new KURLRequester(); - KEditListBox *el = new KEditListBox( TQString::fromLatin1("Test"), req->customEditor() ); + KEditListBox *el = new KEditListBox( TQString::tqfromLatin1("Test"), req->customEditor() ); el->show(); return app.exec(); } diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp index d4aa27353..318e99277 100644 --- a/kio/kio/authinfo.cpp +++ b/kio/kio/authinfo.cpp @@ -76,17 +76,17 @@ TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a) { s << a.url << a.username << a.password << a.prompt << a.caption << a.comment << a.commentLabel << a.realmValue << a.digestInfo - << Q_UINT8(a.verifyPath ? 1:0) << Q_UINT8(a.readOnly ? 1:0) - << Q_UINT8(a.keepPassword ? 1:0) << Q_UINT8(a.modified ? 1:0); + << TQ_UINT8(a.verifyPath ? 1:0) << TQ_UINT8(a.readOnly ? 1:0) + << TQ_UINT8(a.keepPassword ? 1:0) << TQ_UINT8(a.modified ? 1:0); return s; } TQDataStream& KIO::operator>> (TQDataStream& s, AuthInfo& a) { - Q_UINT8 verify = 0; - Q_UINT8 ro = 0; - Q_UINT8 keep = 0; - Q_UINT8 mod = 0; + TQ_UINT8 verify = 0; + TQ_UINT8 ro = 0; + TQ_UINT8 keep = 0; + TQ_UINT8 mod = 0; s >> a.url >> a.username >> a.password >> a.prompt >> a.caption >> a.comment >> a.commentLabel >> a.realmValue >> a.digestInfo @@ -146,7 +146,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc, return false; } - if ( !loginMap.contains( type ) ) + if ( !loginMap.tqcontains( type ) ) return false; LoginList l = loginMap[type]; @@ -158,7 +158,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc, AutoLogin &log = *it; if ( (mode & defaultOnly) == defaultOnly && - log.machine == TQString::fromLatin1("default") && + log.machine == TQString::tqfromLatin1("default") && (login.login.isEmpty() || login.login == log.login) ) { login.type = log.type; @@ -169,7 +169,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc, } if ( (mode & presetOnly) == presetOnly && - log.machine == TQString::fromLatin1("preset") && + log.machine == TQString::tqfromLatin1("preset") && (login.login.isEmpty() || login.login == log.login) ) { login.type = log.type; @@ -237,7 +237,7 @@ TQString NetRC::extract( const char* buf, const char* key, int& pos ) if ( idx > start ) { pos = idx; - return TQString::fromLatin1( buf+start, idx-start); + return TQString::tqfromLatin1( buf+start, idx-start); } } } @@ -280,7 +280,7 @@ bool NetRC::parse( int fd ) while( buf[tail-1] == '\n' || buf[tail-1] =='\r' ) tail--; - TQString mac = TQString::fromLatin1(buf, tail).stripWhiteSpace(); + TQString mac = TQString::tqfromLatin1(buf, tail).stripWhiteSpace(); if ( !mac.isEmpty() ) loginMap[type][index].macdef[macro].append( mac ); @@ -294,12 +294,12 @@ bool NetRC::parse( int fd ) if (strncasecmp(buf+pos, "default", 7) == 0 ) { pos += 7; - l.machine = TQString::fromLatin1("default"); + l.machine = TQString::tqfromLatin1("default"); } else if (strncasecmp(buf+pos, "preset", 6) == 0 ) { pos += 6; - l.machine = TQString::fromLatin1("preset"); + l.machine = TQString::tqfromLatin1("preset"); } } // kdDebug() << "Machine: " << l.machine << endl; @@ -314,7 +314,7 @@ bool NetRC::parse( int fd ) type = l.type = extract( buf, "type", pos ); if ( l.type.isEmpty() && !l.machine.isEmpty() ) - type = l.type = TQString::fromLatin1("ftp"); + type = l.type = TQString::tqfromLatin1("ftp"); // kdDebug() << "Type: " << l.type << endl; macro = extract( buf, "macdef", pos ); diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp index e1d343c10..56c24b072 100644 --- a/kio/kio/chmodjob.cpp +++ b/kio/kio/chmodjob.cpp @@ -121,7 +121,7 @@ void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) break; } } - if ( !isLink && relativePath != TQString::fromLatin1("..") ) + if ( !isLink && relativePath != TQString::tqfromLatin1("..") ) { ChmodInfo info; info.url = m_lstItems.first()->url(); // base directory diff --git a/kio/kio/connection.h b/kio/kio/connection.h index 6858c8422..758202968 100644 --- a/kio/kio/connection.h +++ b/kio/kio/connection.h @@ -46,7 +46,7 @@ namespace KIO { * It handles a queue of commands to be sent which makes it possible to * queue data before an actual connection has been established. */ - class KIO_EXPORT Connection : public QObject + class KIO_EXPORT Connection : public TQObject { Q_OBJECT public: diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp index 161c82296..bcbd3191e 100644 --- a/kio/kio/dataprotocol.cpp +++ b/kio/kio/dataprotocol.cpp @@ -121,7 +121,7 @@ inline TQString extract(const TQString &buf, int &pos, TQChar c1, TQChar c2 = '\0', TQChar c3 = '\0') { int oldpos = pos; pos = find(buf,oldpos,c1,c2,c3); - return TQString(buf.unicode() + oldpos, pos - oldpos); + return TQString(buf.tqunicode() + oldpos, pos - oldpos); } /** ignores all whitespaces @@ -186,11 +186,11 @@ static void parseDataHeader(const KURL &url, DataHeader &header_info) { header_info.is_base64 = false; // decode url and save it - TQString &raw_url = header_info.url = TQString::fromLatin1("data:") + url.path(); + TQString &raw_url = header_info.url = TQString::tqfromLatin1("data:") + url.path(); int raw_url_len = (int)raw_url.length(); // jump over scheme part (must be "data:", we don't even check that) - header_info.data_offset = raw_url.find(':'); + header_info.data_offset = raw_url.tqfind(':'); header_info.data_offset++; // jump over colon or to begin if scheme was missing // read mime type diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp index d16ecc0d4..8ec90b2a7 100644 --- a/kio/kio/dataslave.cpp +++ b/kio/kio/dataslave.cpp @@ -137,7 +137,7 @@ void DataSlave::send(int cmd, const TQByteArray &arr) { break; default: error(ERR_UNSUPPORTED_ACTION, - unsupportedActionErrorString(TQString::fromLatin1("data"),cmd)); + unsupportedActionErrorString(TQString::tqfromLatin1("data"),cmd)); }/*end switch*/ } diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 8293901ae..fea74a037 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -98,7 +98,7 @@ void DefaultProgress::init() topLayout->addStrut( 360 ); // makes dlg at least that wide TQGridLayout *grid = new TQGridLayout( 2, 3 ); - topLayout->addLayout(grid); + topLayout->addLayout(TQT_TQLAYOUT(grid)); grid->addColSpacing(1, KDialog::spacingHint()); // filenames or action name grid->addWidget(new TQLabel(i18n("Source:"), this), 0, 0); @@ -130,9 +130,9 @@ void DefaultProgress::init() hBox->addWidget(resumeLabel); progressLabel = new TQLabel( this ); -/* progressLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, +/* progressLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ) );*/ - progressLabel->setAlignment( TQLabel::AlignRight ); + progressLabel->tqsetAlignment( TQLabel::AlignRight ); hBox->addWidget( progressLabel ); hBox = new TQHBoxLayout(); @@ -171,8 +171,8 @@ void DefaultProgress::init() connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); hBox->addWidget( d->cancelClose ); - resize( sizeHint() ); - setMaximumHeight(sizeHint().height()); + resize( tqsizeHint() ); + setMaximumHeight(tqsizeHint().height()); d->keepOpenChecked = false; d->noCaptionYet = true; @@ -273,7 +273,7 @@ void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent ) void DefaultProgress::slotInfoMessage( KIO::Job*, const TQString & msg ) { speedLabel->setText( msg ); - speedLabel->setAlignment( speedLabel->alignment() & ~Qt::WordBreak ); + speedLabel->tqsetAlignment( speedLabel->tqalignment() & ~TQt::WordBreak ); } diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp index 5caa08465..c83d5750c 100644 --- a/kio/kio/forwardingslavebase.cpp +++ b/kio/kio/forwardingslavebase.cpp @@ -126,7 +126,7 @@ void ForwardingSlaveBase::get(const KURL &url) KIO::TransferJob *job = KIO::get(new_url, false, false); connectTransferJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -142,7 +142,7 @@ void ForwardingSlaveBase::put(const KURL &url, int permissions, resume, false); connectTransferJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -156,7 +156,7 @@ void ForwardingSlaveBase::stat(const KURL &url) KIO::SimpleJob *job = KIO::stat(new_url, false); connectSimpleJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -170,7 +170,7 @@ void ForwardingSlaveBase::mimetype(const KURL &url) KIO::TransferJob *job = KIO::mimetype(new_url, false); connectTransferJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -184,7 +184,7 @@ void ForwardingSlaveBase::listDir(const KURL &url) KIO::ListJob *job = KIO::listDir(new_url, false); connectListJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -198,7 +198,7 @@ void ForwardingSlaveBase::mkdir(const KURL &url, int permissions) KIO::SimpleJob *job = KIO::mkdir(new_url, permissions); connectSimpleJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -213,7 +213,7 @@ void ForwardingSlaveBase::rename(const KURL &src, const KURL &dest, KIO::Job *job = KIO::rename(new_src, new_dest, overwrite); connectJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -228,7 +228,7 @@ void ForwardingSlaveBase::symlink(const TQString &target, const KURL &dest, KIO::SimpleJob *job = KIO::symlink(target, new_dest, overwrite, false); connectSimpleJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -242,7 +242,7 @@ void ForwardingSlaveBase::chmod(const KURL &url, int permissions) KIO::SimpleJob *job = KIO::chmod(new_url, permissions); connectSimpleJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -258,7 +258,7 @@ void ForwardingSlaveBase::copy(const KURL &src, const KURL &dest, overwrite, false); connectJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -280,7 +280,7 @@ void ForwardingSlaveBase::del(const KURL &url, bool isfile) connectSimpleJob(job); } - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -363,7 +363,7 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job) finished(); } - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } void ForwardingSlaveBase::slotWarning(KIO::Job* /*job*/, const TQString &msg) @@ -399,7 +399,7 @@ void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url) job->kill( true ); finished(); - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/, diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index f99219524..6cf30c505 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -97,7 +97,7 @@ KIO_EXPORT TQString KIO::number( KIO::filesize_t size ) { char charbuf[256]; sprintf(charbuf, "%lld", size); - return TQString::fromLatin1(charbuf); + return TQString::tqfromLatin1(charbuf); } KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize, @@ -167,12 +167,12 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str ) TQString str( _str ); int i = 0; - while ( ( i = str.find( "%", i ) ) != -1 ) + while ( ( i = str.tqfind( "%", i ) ) != -1 ) { str.replace( i, 1, "%%"); i += 2; } - while ( ( i = str.find( "/" ) ) != -1 ) + while ( ( i = str.tqfind( "/" ) ) != -1 ) str.replace( i, 1, "%2f"); return str; } @@ -284,7 +284,7 @@ KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorTe result = i18n( "Could not create socket for accessing %1." ).arg( errorText ); break; case KIO::ERR_COULD_NOT_CONNECT: - result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("localhost") : errorText ); + result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::tqfromLatin1("localhost") : errorText ); break; case KIO::ERR_CONNECTION_BROKEN: result = i18n( "Connection to host %1 is broken." ).arg( errorText ); @@ -477,16 +477,16 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0 url = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); ret << errorName; - ret << TQString::fromLatin1( "<qt><p><b>" ) + errorName + - TQString::fromLatin1( "</b></p><p>" ) + description + - TQString::fromLatin1( "</p>" ); - ret2 = TQString::fromLatin1( "<qt><p>" ); + ret << TQString::tqfromLatin1( "<qt><p><b>" ) + errorName + + TQString::tqfromLatin1( "</b></p><p>" ) + description + + TQString::tqfromLatin1( "</p>" ); + ret2 = TQString::tqfromLatin1( "<qt><p>" ); if ( !techName.isEmpty() ) - ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::fromLatin1( "</p>" ); + ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::tqfromLatin1( "</p>" ); ret2 += i18n( "</p><p><b>Details of the request</b>:" ); ret2 += i18n( "</p><ul><li>URL: %1</li>" ).arg( url ); if ( !protocol.isEmpty() ) { @@ -497,12 +497,12 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0 if ( !causes.isEmpty() ) { ret2 += i18n( "<p><b>Possible causes</b>:</p><ul><li>" ); ret2 += causes.join( "</li><li>" ); - ret2 += TQString::fromLatin1( "</li></ul>" ); + ret2 += TQString::tqfromLatin1( "</li></ul>" ); } if ( !solutions.isEmpty() ) { ret2 += i18n( "<p><b>Possible solutions</b>:</p><ul><li>" ); ret2 += solutions.join( "</li><li>" ); - ret2 += TQString::fromLatin1( "</li></ul>" ); + ret2 += TQString::tqfromLatin1( "</li></ul>" ); } ret << ret2; return ret; @@ -559,7 +559,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT protocol = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); TQString errorName, techName, description; @@ -1738,7 +1738,7 @@ static TQString get_mount_info(const TQString& filename, if ( is_my_mountpoint( mounted[i].f_mntonname, realname, max ) ) { mountPoint = TQFile::decodeName(mounted[i].f_mntonname); - fstype = TQString::fromLatin1(mounttype); + fstype = TQString::tqfromLatin1(mounttype); check_mount_point( mounttype, mounted[i].f_mntfromname, isautofs, isslow ); // keep going, looking for a potentially better one @@ -1805,7 +1805,7 @@ static TQString get_mount_info(const TQString& filename, if ( is_my_mountpoint( mountedto, realname, max ) ) { mountPoint = TQFile::decodeName(mountedto); - fstype = TQString::fromLatin1(ent->vfsent_name); + fstype = TQString::tqfromLatin1(ent->vfsent_name); check_mount_point(ent->vfsent_name, device_name, isautofs, isslow); if (ismanual == Unseen) diff --git a/kio/kio/global.h b/kio/kio/global.h index 402d7b431..ea42f3e1d 100644 --- a/kio/kio/global.h +++ b/kio/kio/global.h @@ -34,9 +34,9 @@ namespace KIO { /// 64-bit file offset - typedef Q_LLONG fileoffset_t; + typedef TQ_LLONG fileoffset_t; /// 64-bit file size - typedef Q_ULLONG filesize_t; + typedef TQ_ULLONG filesize_t; /** * Converts @p size from bytes to the string representation. @@ -536,7 +536,7 @@ public: it != metaData.end(); ++it) { - replace(it.key(), it.data()); + tqreplace(it.key(), it.data()); } return *this; } diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index b20c09c10..2b82d2411 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 *parentWidget ) +void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget ) { d->m_autoErrorHandling = enable; - d->m_errorParentWidget = parentWidget; + d->m_errorParentWidget = tqparentWidget; } bool Job::isAutoErrorHandlingEnabled() const @@ -392,7 +392,7 @@ MetaData Job::metaData() const TQString Job::queryMetaData(const TQString &key) { - if (!m_incomingMetaData.contains(key)) + if (!m_incomingMetaData.tqcontains(key)) return TQString::null; return m_incomingMetaData[key]; } @@ -758,7 +758,7 @@ SimpleJob *KIO::mkdir( const KURL& url, int permissions ) SimpleJob *KIO::rmdir( const KURL& url ) { //kdDebug(7007) << "rmdir " << url << endl; - KIO_ARGS << url << Q_INT8(false); // isFile is false + KIO_ARGS << url << TQ_INT8(false); // isFile is false return new SimpleJob(url, CMD_DEL, packedArgs, false); } @@ -772,14 +772,14 @@ SimpleJob *KIO::chmod( const KURL& url, int permissions ) SimpleJob *KIO::rename( const KURL& src, const KURL & dest, bool overwrite ) { //kdDebug(7007) << "rename " << src << " " << dest << endl; - KIO_ARGS << src << dest << (Q_INT8) overwrite; + KIO_ARGS << src << dest << (TQ_INT8) overwrite; return new SimpleJob(src, CMD_RENAME, packedArgs, false); } SimpleJob *KIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo ) { //kdDebug(7007) << "symlink target=" << target << " " << dest << endl; - KIO_ARGS << target << dest << (Q_INT8) overwrite; + KIO_ARGS << target << dest << (TQ_INT8) overwrite; return new SimpleJob(dest, CMD_SYMLINK, packedArgs, showProgressInfo); } @@ -791,8 +791,8 @@ SimpleJob *KIO::special(const KURL& url, const TQByteArray & data, bool showProg SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo ) { - KIO_ARGS << int(1) << Q_INT8( ro ? 1 : 0 ) - << TQString::fromLatin1(fstype) << dev << point; + KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 ) + << TQString::tqfromLatin1(fstype) << dev << point; SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo ); if ( showProgressInfo ) Observer::self()->mounting( job, dev, point ); @@ -821,8 +821,8 @@ StatJob::StatJob( const KURL& url, int command, void StatJob::start(Slave *slave) { - m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); - m_outgoingMetaData.replace( "details", TQString::number(m_details) ); + m_outgoingMetaData.tqreplace( "statSide", m_bSource ? "source" : "dest" ); + m_outgoingMetaData.tqreplace( "details", TQString::number(m_details) ); connect( slave, TQT_SIGNAL( statEntry( const KIO::UDSEntry& ) ), TQT_SLOT( slotStatEntry( const KIO::UDSEntry & ) ) ); @@ -946,7 +946,7 @@ void TransferJob::slotRedirection( const KURL &url) // Some websites keep redirecting to themselves where each redirection // acts as the stage in a state-machine. We define "endless redirections" // as 5 redirections to the same URL. - if (m_redirectionList.contains(url) > 5) + if (m_redirectionList.tqcontains(url) > 5) { kdDebug(7007) << "TransferJob::slotRedirection: CYCLIC REDIRECTION!" << endl; m_error = ERR_CYCLIC_LINK; @@ -997,7 +997,7 @@ void TransferJob::slotFinished() } case CMD_PUT: { int permissions; - Q_INT8 iOverwrite, iResume; + TQ_INT8 iOverwrite, iResume; istream >> dummyUrl >> iOverwrite >> iResume >> permissions; m_packedArgs.truncate(0); TQDataStream stream( m_packedArgs, IO_WriteOnly ); @@ -1328,7 +1328,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool for( TQValueList< int >::ConstIterator it = overriden_ports->begin(); it != overriden_ports->end(); ++it ) - if( overriden_ports->contains( url.port())) + if( overriden_ports->tqcontains( url.port())) _error = 0; } @@ -1380,7 +1380,7 @@ void TransferJob::slotPostRedirection() TransferJob *KIO::put( const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo ) { - KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions; + KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; TransferJob * job = new TransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo ); return job; } @@ -1413,7 +1413,7 @@ void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data ) if ( data.size() == 0 ) return; unsigned int oldSize = m_data.size(); - m_data.resize( oldSize + data.size(), TQGArray::SpeedOptim ); + m_data.tqresize( oldSize + data.size(), TQGArray::SpeedOptim ); memcpy( m_data.data() + oldSize, data.data(), data.size() ); } @@ -1451,7 +1451,7 @@ StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgre StoredTransferJob *KIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo ) { - KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions; + KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; StoredTransferJob * job = new StoredTransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo ); job->setData( arr ); return job; @@ -1480,7 +1480,7 @@ void MimetypeJob::slotFinished( ) // Due to the "protocol doesn't support listing" code in KRun, we // assumed it was a file. kdDebug(7007) << "It is in fact a directory!" << endl; - m_mimetype = TQString::fromLatin1("inode/directory"); + m_mimetype = TQString::tqfromLatin1("inode/directory"); emit TransferJob::mimetype( this, m_mimetype ); m_error = 0; } @@ -1663,7 +1663,7 @@ void FileCopyJob::startCopyJob() void FileCopyJob::startCopyJob(const KURL &slave_url) { //kdDebug(7007) << "FileCopyJob::startCopyJob()" << endl; - KIO_ARGS << m_src << m_dest << m_permissions << (Q_INT8) m_overwrite; + KIO_ARGS << m_src << m_dest << m_permissions << (TQ_INT8) m_overwrite; m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false); addSubjob( m_copyJob ); connectSubjob( m_copyJob ); @@ -1673,7 +1673,7 @@ void FileCopyJob::startCopyJob(const KURL &slave_url) void FileCopyJob::startRenameJob(const KURL &slave_url) { - KIO_ARGS << m_src << m_dest << (Q_INT8) m_overwrite; + KIO_ARGS << m_src << m_dest << (TQ_INT8) m_overwrite; m_moveJob = new SimpleJob(slave_url, CMD_RENAME, packedArgs, false); addSubjob( m_moveJob ); connectSubjob( m_moveJob ); @@ -1974,7 +1974,7 @@ FileCopyJob *KIO::file_move( const KURL& src, const KURL& dest, int permissions, SimpleJob *KIO::file_delete( const KURL& src, bool showProgressInfo) { - KIO_ARGS << src << Q_INT8(true); // isFile + KIO_ARGS << src << TQ_INT8(true); // isFile return new SimpleJob(src, CMD_DEL, packedArgs, showProgressInfo ); } @@ -2571,11 +2571,11 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list) KProtocolInfo::fileNameUsedForCopying( url ) == KProtocolInfo::FromURL ) { //destFileName = url.fileName(); // Doesn't work for recursive listing // Count the number of prefixes used by the recursive listjob - int numberOfSlashes = displayName.contains( '/' ); // don't make this a find()! + int numberOfSlashes = displayName.tqcontains( '/' ); // don't make this a find()! TQString path = url.path(); int pos = 0; for ( int n = 0; n < numberOfSlashes + 1; ++n ) { - pos = path.findRev( '/', pos - 1 ); + pos = path.tqfindRev( '/', pos - 1 ); if ( pos == -1 ) { // error kdWarning(7007) << "kioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl; break; @@ -2763,7 +2763,7 @@ void CopyJob::startRenameJob( const KURL& slave_url ) files.append(info); emit aboutToCreate( this, files ); - KIO_ARGS << m_currentSrcURL << dest << (Q_INT8) false /*no overwrite*/; + KIO_ARGS << m_currentSrcURL << dest << (TQ_INT8) false /*no overwrite*/; SimpleJob * newJob = new SimpleJob(slave_url, CMD_RENAME, packedArgs, false); Scheduler::scheduleJob(newJob); addSubjob( newJob ); @@ -2789,7 +2789,7 @@ void CopyJob::skip( const KURL & sourceUrl ) // Check if this is one if toplevel sources // If yes, remove it from m_srcList, for a correct FilesRemoved() signal //kdDebug(7007) << "CopyJob::skip: looking for " << sourceUrl << endl; - KURL::List::Iterator sit = m_srcList.find( sourceUrl ); + KURL::List::Iterator sit = m_srcList.tqfind( sourceUrl ); if ( sit != m_srcList.end() ) { //kdDebug(7007) << "CopyJob::skip: removing " << sourceUrl << " from list" << endl; @@ -2967,7 +2967,7 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job ) TQString path = (*renamedirit).uDest.path(); if ( path.left(oldPath.length()) == oldPath ) { TQString n = path; - n.replace( 0, oldPath.length(), newPath ); + n.tqreplace( 0, oldPath.length(), newPath ); kdDebug(7007) << "dirs list: " << (*renamedirit).uSource.path() << " was going to be " << path << ", changed into " << n << endl; @@ -2981,7 +2981,7 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job ) TQString path = (*renamefileit).uDest.path(); if ( path.left(oldPath.length()) == oldPath ) { TQString n = path; - n.replace( 0, oldPath.length(), newPath ); + n.tqreplace( 0, oldPath.length(), newPath ); kdDebug(7007) << "files list: " << (*renamefileit).uSource.path() << " was going to be " << path << ", changed into " << n << endl; @@ -3107,7 +3107,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) } else { - if ( m_bCurrentOperationIsLink && ::qt_cast<KIO::DeleteJob*>( job ) ) + if ( m_bCurrentOperationIsLink && ::tqqt_cast<KIO::DeleteJob*>( job ) ) { // Very special case, see a few lines below // We are deleting the source of a symlink we successfully moved... ignore error @@ -3124,7 +3124,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) { // Special case for moving links. That operation needs two jobs, unlike others. if ( m_bCurrentOperationIsLink && m_mode == Move - && !::qt_cast<KIO::DeleteJob *>( job ) // Deleting source not already done + && !::tqqt_cast<KIO::DeleteJob *>( job ) // Deleting source not already done ) { subjobs.remove( job ); @@ -3359,7 +3359,7 @@ void CopyJob::copyNextFile() bool devicesOk=false; // if the source is a devices url, handle it a littlebit special - if ((*it).uSource.protocol()==TQString::fromLatin1("devices")) + if ((*it).uSource.protocol()==TQString::tqfromLatin1("devices")) { TQByteArray data; TQByteArray param; @@ -3395,20 +3395,20 @@ void CopyJob::copyNextFile() config.setDesktopGroup(); KURL url = (*it).uSource; url.setPass( "" ); - config.writePathEntry( TQString::fromLatin1("URL"), url.url() ); - config.writeEntry( TQString::fromLatin1("Name"), url.url() ); - config.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); + config.writePathEntry( TQString::tqfromLatin1("URL"), url.url() ); + config.writeEntry( TQString::tqfromLatin1("Name"), url.url() ); + config.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") ); TQString protocol = (*it).uSource.protocol(); - if ( protocol == TQString::fromLatin1("ftp") ) - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("ftp") ); - else if ( protocol == TQString::fromLatin1("http") ) - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("www") ); - else if ( protocol == TQString::fromLatin1("info") ) - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("info") ); - else if ( protocol == TQString::fromLatin1("mailto") ) // sven: - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("kmail") ); // added mailto: support + if ( protocol == TQString::tqfromLatin1("ftp") ) + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("ftp") ); + else if ( protocol == TQString::tqfromLatin1("http") ) + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("www") ); + else if ( protocol == TQString::tqfromLatin1("info") ) + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("info") ); + else if ( protocol == TQString::tqfromLatin1("mailto") ) // sven: + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("kmail") ); // added mailto: support else - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("unknown") ); + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("unknown") ); config.sync(); files.remove( it ); m_processedFiles++; @@ -4305,7 +4305,7 @@ void DeleteJob::slotResult( Job *job ) { // Add toplevel dir in list of dirs dirs.append( url ); - if ( url.isLocalFile() && !m_parentDirs.contains( url.path(-1) ) ) + if ( url.isLocalFile() && !m_parentDirs.tqcontains( url.path(-1) ) ) m_parentDirs.append( url.path(-1) ); if ( !KProtocolInfo::canDeleteRecursive( url ) ) { @@ -4334,7 +4334,7 @@ void DeleteJob::slotResult( Job *job ) //kdDebug(7007) << " Target is a file" << endl; files.append( url ); } - if ( url.isLocalFile() && !m_parentDirs.contains( url.directory(false) ) ) + if ( url.isLocalFile() && !m_parentDirs.tqcontains( url.directory(false) ) ) m_parentDirs.append( url.directory(false) ); ++m_currentStat; statNextSrc(); @@ -4435,7 +4435,7 @@ void MultiGetJob::flushQueue(TQPtrList<GetRequest> &queue) } } // Send number of URLs, (URL, metadata)* - KIO_ARGS << (Q_INT32) queue.count(); + KIO_ARGS << (TQ_INT32) queue.count(); for(entry = queue.first(); entry; entry = queue.next()) { stream << entry->url << entry->metaData; @@ -4585,12 +4585,12 @@ TQString CacheInfo::cachedFileName() TQString CEF = m_url.path(); - int p = CEF.find('/'); + int p = CEF.tqfind('/'); while(p != -1) { CEF[p] = separator; - p = CEF.find('/', p); + p = CEF.tqfind('/', p); } TQString host = m_url.host().lower(); @@ -4651,7 +4651,7 @@ TQFile *CacheInfo::cachedFile() ok = false; time_t date; - time_t currentDate = time(0); + time_t tqcurrentDate = time(0); // URL if (ok && (!fgets(buffer, 400, fs))) @@ -4673,10 +4673,10 @@ TQFile *CacheInfo::cachedFile() if (ok) { date = (time_t) strtoul(buffer, 0, 10); - if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge)) + if (m_maxCacheAge && (difftime(tqcurrentDate, date) > m_maxCacheAge)) { m_bMustRevalidate = true; - m_expireDate = currentDate; + m_expireDate = tqcurrentDate; } } @@ -4690,7 +4690,7 @@ TQFile *CacheInfo::cachedFile() { date = (time_t) strtoul(buffer, 0, 10); // After the expire date we need to revalidate. - if (!date || difftime(currentDate, date) >= 0) + if (!date || difftime(tqcurrentDate, date) >= 0) m_bMustRevalidate = true; m_expireDate = date; } diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index 03ff3d452..6651565f1 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 parentWidget (if supplied) , right before + * is called with the specified @p tqparentWidget (if supplied) , right before * the emission of the result signal. * * The default is false. * * @param enable enable or disable automatic error handling - * @param parentWidget the parent widget, passed to showErrorDialog. + * @param tqparentWidget the parent widget, passed to showErrorDialog. * Can be 0 for top-level * @see isAutoErrorHandlingEnabled(), showErrorDialog() */ - void setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget = 0 ); + void setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget = 0 ); /** * Returns whether automatic error handling is enabled or disabled. diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp index 432a50d31..4d12bf3e9 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 - // invalidated, on deletion + // tqinvalidated, on deletion ret = acl_get_entry( newACL, ACL_FIRST_ENTRY, &entry ); } else { ret = acl_get_entry( newACL, ACL_NEXT_ENTRY, &entry ); @@ -619,12 +619,12 @@ TQString KACL::asString() const TQString KACL::KACLPrivate::getUserName( uid_t uid ) const { TQString *temp; - temp = m_usercache.find( uid ); + temp = m_usercache.tqfind( uid ); if ( !temp ) { struct passwd *user = getpwuid( uid ); if ( user ) { - m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) ); - return TQString::fromLatin1( user->pw_name ); + m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) ); + return TQString::tqfromLatin1( user->pw_name ); } else return TQString::number( uid ); @@ -637,12 +637,12 @@ TQString KACL::KACLPrivate::getUserName( uid_t uid ) const TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const { TQString *temp; - temp = m_groupcache.find( gid ); + temp = m_groupcache.tqfind( gid ); if ( !temp ) { struct group *grp = getgrgid( gid ); if ( grp ) { - m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) ); - return TQString::fromLatin1( grp->gr_name ); + m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) ); + return TQString::tqfromLatin1( grp->gr_name ); } else return TQString::number( gid ); @@ -654,7 +654,7 @@ TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const static TQString aclAsString(const acl_t acl) { char *aclString = acl_to_text( acl, 0 ); - TQString ret = TQString::fromLatin1( aclString ); + TQString ret = TQString::tqfromLatin1( aclString ); acl_free( (void*)aclString ); return ret; } diff --git a/kio/kio/kar.cpp b/kio/kio/kar.cpp index 9f9435294..92f923343 100644 --- a/kio/kio/kar.cpp +++ b/kio/kio/kar.cpp @@ -45,7 +45,7 @@ KAr::KAr( const TQString& filename ) //kdDebug(7042) << "KAr(filename) reached." << endl; m_filename = filename; d = new KArPrivate; - setDevice( new TQFile( filename ) ); + setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); } KAr::KAr( TQIODevice * dev ) @@ -86,7 +86,7 @@ bool KAr::openArchive( int mode ) char magic[8]; dev->readBlock (magic, 8); - if (qstrncmp(magic, "!<arch>", 7) != 0) { + if (tqstrncmp(magic, "!<arch>", 7) != 0) { kdWarning(7042) << "Invalid main magic" << endl; return false; } @@ -140,7 +140,7 @@ bool KAr::openArchive( int mode ) return false; } name = &ar_longnames[name.mid(1, 15).toInt()]; - name = name.left(name.find("/")); + name = name.left(name.tqfind("/")); } } if (skip_entry) continue; diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp index 592e513d4..9f1ec3c79 100644 --- a/kio/kio/karchive.cpp +++ b/kio/kio/karchive.cpp @@ -90,7 +90,7 @@ KArchive::~KArchive() bool KArchive::open( int mode ) { - if ( m_dev && !m_dev->open( mode ) ) + if ( m_dev && !m_dev->tqopen( mode ) ) return false; if ( m_open ) @@ -362,7 +362,7 @@ bool KArchive::writeData( const char* data, uint size ) bool KArchive::writeData_impl( const char* data, uint size ) { Q_ASSERT( device() ); - return device()->writeBlock( data, size ) == (Q_LONG)size; + return device()->writeBlock( data, size ) == (TQ_LONG)size; } KArchiveDirectory * KArchive::rootDir() @@ -375,7 +375,7 @@ KArchiveDirectory * KArchive::rootDir() TQString username = pw ? TQFile::decodeName(pw->pw_name) : TQString::number( getuid() ); TQString groupname = grp ? TQFile::decodeName(grp->gr_name) : TQString::number( getgid() ); - d->rootDir = new KArchiveDirectory( this, TQString::fromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null ); + d->rootDir = new KArchiveDirectory( this, TQString::tqfromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null ); } return d->rootDir; } @@ -406,7 +406,7 @@ KArchiveDirectory * KArchive::findOrCreate( const TQString & path ) } // Otherwise go up and try again - int pos = path.findRev( '/' ); + int pos = path.tqfindRev( '/' ); KArchiveDirectory * parent; TQString dirname; if ( pos == -1 ) // no more slash => create in root dir @@ -548,13 +548,13 @@ KArchiveEntry* KArchiveDirectory::entry( TQString name ) // not "const TQString & name" since we want a local copy // (to remove leading slash if any) { - int pos = name.find( '/' ); + int pos = name.tqfind( '/' ); if ( pos == 0 ) // ouch absolute path (see also KArchive::findOrCreate) { if (name.length()>1) { name = name.mid( 1 ); // remove leading slash - pos = name.find( '/' ); // look again + pos = name.tqfind( '/' ); // look again } else // "/" return this; @@ -563,7 +563,7 @@ KArchiveEntry* KArchiveDirectory::entry( TQString name ) if ( pos != -1 && pos == (int)name.length()-1 ) { name = name.left( pos ); - pos = name.find( '/' ); // look again + pos = name.tqfind( '/' ); // look again } if ( pos != -1 ) { diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h index dbfe02bff..ff1fe1f7c 100644 --- a/kio/kio/karchive.h +++ b/kio/kio/karchive.h @@ -512,12 +512,12 @@ public: * Position of the data in the [uncompressed] archive. * @return the position of the file */ - int position() const; // TODO use Q_LONG in KDE-4.0 + int position() const; // TODO use TQ_LONG in KDE-4.0 /** * Size of the data. * @return the size of the file */ - int size() const; // TODO use Q_LONG in KDE-4.0 + int size() const; // TODO use TQ_LONG in KDE-4.0 /** * Set size of data, usually after writing the file. * @param s the new size of the file @@ -555,8 +555,8 @@ public: void copyTo(const TQString& dest) const; private: - int m_pos; // TODO use Q_LONG in KDE-4.0 - int m_size; // TODO use Q_LONG in KDE-4.0 + int m_pos; // TODO use TQ_LONG in KDE-4.0 + int m_size; // TODO use TQ_LONG in KDE-4.0 protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h index 1d8662590..e73edec35 100644 --- a/kio/kio/kautomount.h +++ b/kio/kio/kautomount.h @@ -24,6 +24,10 @@ #include <kdelibs_export.h> +#ifdef Q_MOC_RUN +#define Q_OS_UNIX +#endif // Q_MOC_RUN + #ifdef Q_OS_UNIX namespace KIO { @@ -38,7 +42,7 @@ class Job; * * @short This class implements synchronous mounting of devices. */ -class KIO_EXPORT KAutoMount : public QObject +class KIO_EXPORT KAutoMount : public TQObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; @@ -83,7 +87,7 @@ private: * * @short This class implements synchronous unmounting of devices, */ -class KIO_EXPORT KAutoUnmount : public QObject +class KIO_EXPORT KAutoUnmount : public TQObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index bb6462006..9708234d1 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -47,7 +47,7 @@ KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance m_service = service; m_instance = instance; - if ( !!m_service && !m_service->serviceTypes().contains( "KDataTool" ) ) + if ( !!m_service && !m_service->serviceTypes().tqcontains( "KDataTool" ) ) { kdDebug(30003) << "The service " << m_service->name().latin1() << " does not feature the service type KDataTool" << endl; @@ -130,7 +130,7 @@ TQString KDataToolInfo::iconName() const TQStringList KDataToolInfo::commands() const { if ( !m_service ) - return TQString::null; + return TQString(); return m_service->property( "Commands" ).toStringList(); } @@ -138,7 +138,7 @@ TQStringList KDataToolInfo::commands() const TQStringList KDataToolInfo::userCommands() const { if ( !m_service ) - return TQString::null; + return TQString(); return TQStringList::split( ',', m_service->comment() ); } @@ -167,11 +167,11 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const if ( !datatype.isEmpty() ) { - constr = TQString::fromLatin1( "DataType == '%1'" ).arg( datatype ); + constr = TQString::tqfromLatin1( "DataType == '%1'" ).arg( datatype ); } if ( !mimetype.isEmpty() ) { - TQString tmp = TQString::fromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype ); + TQString tmp = TQString::tqfromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype ); if ( constr.isEmpty() ) constr = tmp; else @@ -180,7 +180,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const /* Bug in KTrader ? Test with HEAD-kdelibs! if ( instance ) { - TQString tmp = TQString::fromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() ); + TQString tmp = TQString::tqfromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() ); if ( constr.isEmpty() ) constr = tmp; else @@ -196,7 +196,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const { // Temporary replacement for the non-working trader query above if ( !instance || !(*it)->property("ExcludeFrom").toStringList() - .contains( instance->instanceName() ) ) + .tqcontains( instance->instanceName() ) ) lst.append( KDataToolInfo( *it, instance ) ); else kdDebug() << (*it)->entryPath() << " excluded." << endl; diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h index 69751db79..ec76ca5b2 100644 --- a/kio/kio/kdatatool.h +++ b/kio/kio/kdatatool.h @@ -194,6 +194,7 @@ private: class KIO_EXPORT KDataToolAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Constructs a new KDataToolAction. @@ -250,9 +251,10 @@ private: * @see KDataToolAction, and for activating a tool, passing it the data * (and possibly getting modified data from it). */ -class KIO_EXPORT KDataTool : public QObject +class KIO_EXPORT KDataTool : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 901f382b8..11721f751 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -113,7 +113,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, lister->d->rootFileItem = 0; } - else if ( lister->d->lstDirs.find( _url ) != lister->d->lstDirs.end() ) + else if ( lister->d->lstDirs.tqfind( _url ) != lister->d->lstDirs.end() ) { // stop the job listing _url for this lister stop( lister, _url ); @@ -311,7 +311,7 @@ void KDirListerCache::stop( KDirLister *lister ) TQPtrList<KDirLister> *listers; while ( (listers = it.current()) ) { - if ( listers->findRef( lister ) > -1 ) + if ( listers->tqfindRef( lister ) > -1 ) { // lister is listing url TQString url = it.currentKey(); @@ -457,7 +457,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not // that itemsInUse doesn't. When emitting the canceled signals lstDirs must // not contain anything that itemsInUse does not contain. (otherwise it // might crash in findByName()). - lister->d->lstDirs.remove( lister->d->lstDirs.find( url ) ); + lister->d->lstDirs.remove( lister->d->lstDirs.tqfind( url ) ); DirItem *item = itemsInUse[urlStr]; @@ -670,7 +670,7 @@ KFileItem *KDirListerCache::findByURL( const KDirLister *lister, const KURL& _u parentDir.setPath( parentDir.directory() ); // If lister is set, check that it contains this dir - if ( lister && !lister->d->lstDirs.contains( parentDir ) ) + if ( lister && !lister->d->lstDirs.tqcontains( parentDir ) ) return 0L; KFileItemList *itemList = itemsForDir( parentDir ); @@ -760,7 +760,7 @@ void KDirListerCache::FilesChanged( const KURL::List &fileList ) // Let's update the dir. KURL dir( *it ); dir.setPath( dir.directory( true ) ); - if ( dirsToUpdate.find( dir ) == dirsToUpdate.end() ) + if ( dirsToUpdate.tqfind( dir ) == dirsToUpdate.end() ) dirsToUpdate.prepend( dir ); } } @@ -890,7 +890,7 @@ void KDirListerCache::slotFileDirty( const TQString& _file ) // delayed updating of files, FAM is flooding us with events void KDirListerCache::slotFileDirtyDelayed() { - TQString file = TQString::fromUtf8( sender()->name() ); + TQString file = TQString::fromUtf8( TQT_TQOBJECT_CONST(sender())->name() ); kdDebug(7004) << k_funcinfo << file << endl; @@ -1110,7 +1110,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) kdl->d->url = newUrl; } - *kdl->d->lstDirs.find( oldUrl ) = newUrl; + *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl; if ( kdl->d->lstDirs.count() == 1 ) { @@ -1147,7 +1147,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) kdl->d->url = newUrl; } - *kdl->d->lstDirs.find( oldUrl ) = newUrl; + *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl; if ( kdl->d->lstDirs.count() == 1 ) { @@ -1429,7 +1429,7 @@ void KDirListerCache::emitRedirections( const KURL &oldUrl, const KURL &url ) // And notify the dirlisters of the redirection for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() ) { - *kdl->d->lstDirs.find( oldUrl ) = url; + *kdl->d->lstDirs.tqfind( oldUrl ) = url; if ( kdl->d->lstDirs.count() == 1 ) emit kdl->redirection( url ); @@ -1478,7 +1478,7 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j ) if ( listers ) for ( kdl = tmpLst->first(); kdl; kdl = tmpLst->next() ) { - Q_ASSERT( listers->containsRef( kdl ) == 0 ); + Q_ASSERT( listers->tqcontainsRef( kdl ) == 0 ); listers->append( kdl ); } else @@ -2095,8 +2095,8 @@ void KDirLister::setMimeFilter( const TQStringList& mimeFilter ) if ( !(d->changes & MIME_FILTER) ) d->oldMimeFilter = d->mimeFilter; - if ( mimeFilter.find("all/allfiles") != mimeFilter.end() || - mimeFilter.find("all/all") != mimeFilter.end() ) + if ( mimeFilter.tqfind("all/allfiles") != mimeFilter.end() || + mimeFilter.tqfind("all/all") != mimeFilter.end() ) d->mimeFilter.clear(); else d->mimeFilter = mimeFilter; diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h index 8a0109e89..d088cc281 100644 --- a/kio/kio/kdirlister.h +++ b/kio/kio/kdirlister.h @@ -52,7 +52,7 @@ namespace KIO { class Job; class ListJob; } * @short Helper class for the kiojob used to list and update a directory. * @author Michael Brade <brade@kde.org> */ -class KIO_EXPORT KDirLister : public QObject +class KIO_EXPORT KDirLister : public TQObject { class KDirListerPrivate; friend class KDirListerPrivate; diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp index bbea148fa..c9418ef9d 100644 --- a/kio/kio/kdirwatch.cpp +++ b/kio/kio/kdirwatch.cpp @@ -23,7 +23,7 @@ // Februar 2002 - Add file watching and remote mount check for STAT // Mar 30, 2001 - Native support for Linux dir change notification. // Jan 28, 2000 - Usage of FAM service on IRIX (Josef.Weidendorfer@in.tum.de) -// May 24. 1998 - List of times introduced, and some bugs are fixed. (sven) +// May 24. 1998 - List of times introduced, and some bugs are fixed. (sven)1 // May 23. 1998 - Removed static pointer - you can have more instances. // It was Needed for KRegistry. KDirWatch now emits signals and doesn't // call (or need) KFM. No more URL's - just plain paths. (sven) @@ -123,7 +123,7 @@ static int dnotify_signal = 0; * * As this is called asynchronously, only a flag is set and * a rescan is requested. - * This is done by writing into a pipe to trigger a QSocketNotifier + * This is done by writing into a pipe to trigger a TQSocketNotifier * watching on this pipe: a timer is started and after a timeout, * the rescan is done. */ @@ -135,7 +135,7 @@ void KDirWatchPrivate::dnotify_handler(int, siginfo_t *si, void *) // (Richard Stevens, Advanced programming in the Unix Environment) int saved_errno = errno; - Entry* e = dwp_self->fd_Entry.find(si->si_fd); + Entry* e = dwp_self->fd_Entry.tqfind(si->si_fd); // kdDebug(7001) << "DNOTIFY Handler: fd " << si->si_fd << " path " // << TQString(e ? e->path:"unknown") << endl; @@ -551,7 +551,7 @@ KDirWatchPrivate::Entry* KDirWatchPrivate::entry(const TQString& _path) if ( path.length() > 1 && path.right(1) == "/" ) path.truncate( path.length() - 1 ); - EntryMap::Iterator it = m_mapEntries.find( path ); + EntryMap::Iterator it = m_mapEntries.tqfind( path ); if ( it == m_mapEntries.end() ) return 0; else @@ -684,7 +684,7 @@ bool KDirWatchPrivate::useDNotify(Entry* e) return false; } - fd_Entry.replace(fd, e); + fd_Entry.tqreplace(fd, e); e->dn_fd = fd; kdDebug(7001) << " Setup DNotify (fd " << fd @@ -782,7 +782,7 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, if ( path.length() > 1 && path.right(1) == "/" ) path.truncate( path.length() - 1 ); - EntryMap::Iterator it = m_mapEntries.find( path ); + EntryMap::Iterator it = m_mapEntries.tqfind( path ); if ( it != m_mapEntries.end() ) { if (sub_entry) { @@ -830,7 +830,7 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, (*it).addClient(instance); kdDebug(7001) << "Added already watched Entry " << path << " (now " << (*it).clients() << " clients)" - << TQString(" [%1]").arg(instance->name()) << endl; + << TQString(TQString(" [%1]").arg(instance->name())) << endl; } return; } @@ -873,8 +873,8 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, kdDebug(7001) << "Added " << (e->isDir ? "Dir ":"File ") << path << (e->m_status == NonExistent ? " NotExisting" : "") - << (sub_entry ? TQString(" for %1").arg(sub_entry->path) : TQString("")) - << (instance ? TQString(" [%1]").arg(instance->name()) : TQString("")) + << (sub_entry ? TQString(TQString(" for %1").arg(sub_entry->path)) : TQString("")) + << (instance ? TQString(TQString(" [%1]").arg(instance->name())) : TQString("")) << endl; @@ -923,7 +923,7 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance, if (delayRemove) { // removeList is allowed to contain any entry at most once - if (removeList.findRef(e)==-1) + if (removeList.tqfindRef(e)==-1) removeList.append(e); // now e->isValid() is false return; @@ -998,8 +998,8 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance, } kdDebug(7001) << "Removed " << (e->isDir ? "Dir ":"File ") << e->path - << (sub_entry ? TQString(" for %1").arg(sub_entry->path) : TQString("")) - << (instance ? TQString(" [%1]").arg(instance->name()) : TQString("")) + << (sub_entry ? TQString(TQString(" for %1").arg(sub_entry->path)) : TQString("")) + << (instance ? TQString(TQString(" [%1]").arg(instance->name())) : TQString("")) << endl; m_mapEntries.remove( e->path ); // <e> not valid any more } @@ -1611,7 +1611,7 @@ KDirWatch::KDirWatch (TQObject* parent, const char* name) static int nameCounter = 0; nameCounter++; - setName(TQString("KDirWatch-%1").arg(nameCounter).ascii()); + setName(TQString(TQString("KDirWatch-%1").arg(nameCounter)).ascii()); } if (!dwp_self) diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h index 36f2737b3..e04b0ad1e 100644 --- a/kio/kio/kdirwatch.h +++ b/kio/kio/kdirwatch.h @@ -60,7 +60,7 @@ class KDirWatchPrivate; * @short Class for watching directory and file changes. * @author Sven Radej <sven@lisa.exp.univie.ac.at> */ -class KIO_EXPORT KDirWatch : public QObject +class KIO_EXPORT KDirWatch : public TQObject { Q_OBJECT diff --git a/kio/kio/kdirwatch_p.h b/kio/kio/kdirwatch_p.h index 9920b866d..1c0ec8fe7 100644 --- a/kio/kio/kdirwatch_p.h +++ b/kio/kio/kdirwatch_p.h @@ -1,6 +1,6 @@ /* Private Header for class of KDirWatchPrivate * - * this separate header file is needed for MOC processing + * this separate header file is needed for TQMOC processing * because KDirWatchPrivate has signals and slots */ @@ -18,7 +18,7 @@ /* KDirWatchPrivate is a singleton and does the watching * for every KDirWatch instance in the application. */ -class KDirWatchPrivate : public QObject +class KDirWatchPrivate : public TQObject { Q_OBJECT public: diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index 010832573..b15731f1c 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -973,12 +973,12 @@ void KFileItem::setExtraData( const void *key, void *value ) if ( !key ) return; - m_extra.replace( key, value ); + m_extra.tqreplace( key, value ); } const void * KFileItem::extraData( const void *key ) const { - TQMapConstIterator<const void*,void*> it = m_extra.find( key ); + TQMapConstIterator<const void*,void*> it = m_extra.tqfind( key ); if ( it != m_extra.end() ) return it.data(); return 0L; @@ -986,7 +986,7 @@ const void * KFileItem::extraData( const void *key ) const void * KFileItem::extraData( const void *key ) { - TQMapIterator<const void*,void*> it = m_extra.find( key ); + TQMapIterator<const void*,void*> it = m_extra.tqfind( key ); if ( it != m_extra.end() ) return it.data(); return 0L; @@ -1041,7 +1041,7 @@ TQString KFileItem::parsePermissions(mode_t perm) const if (hasExtendedACL()) p[10]='+'; - return TQString::fromLatin1(p); + return TQString::tqfromLatin1(p); } // check if we need to cache this @@ -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() invalidates, + // We don't need to save/restore anything that refresh() tqinvalidates, // since that means we can re-determine those by ourselves. s << a.m_url; s << a.m_strName; diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index fcab35f19..ee79e72a2 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -38,12 +38,12 @@ #include "kfilemetainfo.h" // shared data of a KFileMetaInfoItem -class KFileMetaInfoItem::Data : public QShared +class KFileMetaInfoItem::Data : public TQShared { public: Data( const KFileMimeTypeInfo::ItemInfo* mti, const TQString& _key, const TQVariant& _value ) - : QShared(), + : TQShared(), mimeTypeInfo( mti ), key( _key ), value( _value ), @@ -270,11 +270,11 @@ void KFileMetaInfoItem::deref() /////////////////////////////////////////////////////////////////// // shared data of a KFileMetaInfo -class KFileMetaInfo::Data : public QShared +class KFileMetaInfo::Data : public TQShared { public: Data(const KURL& _url, uint _what) - : QShared(), + : TQShared(), url(_url), what(_what), mimeTypeInfo( 0L ) @@ -410,7 +410,7 @@ TQStringList KFileMetaInfo::preferredGroups() const // move all keys from the preferred groups that are in our list to a new list for ( pref = preferred.begin(); pref != preferred.end(); ++pref ) { - TQStringList::Iterator group = list.find(*pref); + TQStringList::Iterator group = list.tqfind(*pref); if ( group != list.end() ) { newlist.append( *group ); @@ -440,7 +440,7 @@ TQStringList KFileMetaInfo::preferredKeys() const KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const { - TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.find( key ); + TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.tqfind( key ); if ( it != d->groups.end() ) return it.data(); else @@ -450,8 +450,8 @@ KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const bool KFileMetaInfo::addGroup( const TQString& name ) { assert(isValid()); - if ( d->mimeTypeInfo->supportedGroups().contains(name) && - ! d->groups.contains(name) ) + if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) && + ! d->groups.tqcontains(name) ) { KFileMetaInfoGroup group( name, d->mimeTypeInfo ); @@ -486,7 +486,7 @@ bool KFileMetaInfo::addGroup( const TQString& name ) bool KFileMetaInfo::removeGroup( const TQString& name ) { - TQMapIterator<TQString, KFileMetaInfoGroup> it = d->groups.find(name); + TQMapIterator<TQString, KFileMetaInfoGroup> it = d->groups.tqfind(name); if ( (it==d->groups.end()) || !((*it).attributes() & KFileMimeTypeInfo::Removable)) return false; @@ -608,7 +608,7 @@ bool KFileMetaInfo::contains(const TQString& key) const bool KFileMetaInfo::containsGroup(const TQString& key) const { - return groups().contains(key); + return groups().tqcontains(key); } KFileMetaInfoItem KFileMetaInfo::item( const TQString& key) const @@ -642,15 +642,15 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, // try the preferred groups first if ( !preferredGroup.isEmpty() ) { TQMapIterator<TQString,KFileMetaInfoGroup> it = - d->groups.find( preferredGroup ); + d->groups.tqfind( preferredGroup ); // try to create the preferred group, if necessary if ( it == d->groups.end() && createGroup ) { const KFileMimeTypeInfo::GroupInfo *groupInfo = d->mimeTypeInfo->groupInfo( preferredGroup ); - if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) { + if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) ) { if ( addGroup( preferredGroup ) ) - it = d->groups.find( preferredGroup ); + it = d->groups.tqfind( preferredGroup ); } } @@ -668,7 +668,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, TQStringList::ConstIterator groupIt = groups.begin(); for ( ; groupIt != groups.end(); ++groupIt ) { - TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.find( *groupIt ); + TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.tqfind( *groupIt ); if ( it != d->groups.end() ) { KFileMetaInfoGroup group = it.data(); @@ -680,7 +680,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, { const KFileMimeTypeInfo::GroupInfo *groupInfo = d->mimeTypeInfo->groupInfo( *groupIt ); - if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) + if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) ) { if ( addGroup( *groupIt ) ) { @@ -717,8 +717,8 @@ KFileMetaInfoItem KFileMetaInfo::findEditableItem( KFileMetaInfoGroup& group, KFileMetaInfoGroup KFileMetaInfo::appendGroup(const TQString& name) { assert(isValid()); - if ( d->mimeTypeInfo->supportedGroups().contains(name) && - ! d->groups.contains(name) ) + if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) && + ! d->groups.tqcontains(name) ) { KFileMetaInfoGroup group( name, d->mimeTypeInfo ); d->groups.insert(name, group); @@ -937,7 +937,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const query = "(not exist [X-KDE-Protocol])"; queryMimeType = mimeType; } else { - query = TQString::fromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol); + query = TQString::tqfromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol); // querying for a protocol: we have no mimetype, so we need to use KFilePlugin as one queryMimeType = "KFilePlugin"; // hopefully using KFilePlugin as genericMimeType too isn't a problem @@ -951,7 +951,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const return 0; KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService<KFilePlugin> - ( service, this, mimeType.local8Bit() ); + ( service, TQT_TQOBJECT(this), mimeType.local8Bit() ); if (!plugin) kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl; @@ -986,7 +986,7 @@ KFilePlugin* KFileMetaInfoProvider::loadAndRegisterPlugin( const TQString& mimeT first = false; } // Hopefully the above includes the mimetype we asked for! - if ( m_pendingMimetypeInfos.find( mimeType ) == 0 ) + if ( m_pendingMimetypeInfos.tqfind( mimeType ) == 0 ) kdWarning(7033) << plugin->className() << " was created for " << mimeType << " but doesn't call addMimeTypeInfo for it!" << endl; } m_pendingMimetypeInfos.clear(); @@ -1003,7 +1003,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt //kdDebug(7033) << "plugin() : looking for plugin for protocol=" << protocol << " mimeType=" << mimeType << endl; if ( !protocol.isEmpty() ) { - CachedPluginInfo *cache = m_plugins.find( protocol ); + CachedPluginInfo *cache = m_plugins.tqfind( protocol ); if ( cache && cache->plugin ) { return cache->plugin; } @@ -1014,7 +1014,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt } } - CachedPluginInfo *cache = m_plugins.find( mimeType ); + CachedPluginInfo *cache = m_plugins.tqfind( mimeType ); if ( cache ) { return cache->plugin; } @@ -1072,27 +1072,27 @@ const KFileMimeTypeInfo * KFileMetaInfoProvider::mimeTypeInfo( const TQString& m { //kdDebug(7033) << "mimeTypeInfo() : looking for plugin for protocol=" << protocol << " mimeType=" << mimeType << endl; if ( !protocol.isEmpty() ) { - CachedPluginInfo *cache = m_plugins.find( protocol ); + CachedPluginInfo *cache = m_plugins.tqfind( protocol ); if ( cache && cache->mimeTypeInfo ) { return cache->mimeTypeInfo; } if ( !cache ) { loadAndRegisterPlugin( TQString::null, protocol ); - cache = m_plugins.find( protocol ); + cache = m_plugins.tqfind( protocol ); if ( cache && cache->mimeTypeInfo ) { return cache->mimeTypeInfo; } } } - CachedPluginInfo *cache = m_plugins.find( mimeType ); + CachedPluginInfo *cache = m_plugins.tqfind( mimeType ); if ( cache ) { return cache->mimeTypeInfo; } loadAndRegisterPlugin( mimeType, TQString::null ); - cache = m_plugins.find( mimeType ); + cache = m_plugins.tqfind( mimeType ); if ( cache ) { return cache->mimeTypeInfo; } @@ -1103,7 +1103,7 @@ KFileMimeTypeInfo * KFileMetaInfoProvider::addMimeTypeInfo( const TQString& mimeType ) { - KFileMimeTypeInfo *info = m_pendingMimetypeInfos.find( mimeType ); + KFileMimeTypeInfo *info = m_pendingMimetypeInfos.tqfind( mimeType ); Q_ASSERT( !info ); if ( !info ) { @@ -1129,7 +1129,7 @@ TQStringList KFileMetaInfoProvider::supportedMimeTypes() const const TQStringList mimeTypes = (*it)->serviceTypes(); TQStringList::ConstIterator it2 = mimeTypes.begin(); for ( ; it2 != mimeTypes.end(); ++it2 ) - if ( allMimeTypes.find( *it2 ) == allMimeTypes.end() && + if ( allMimeTypes.tqfind( *it2 ) == allMimeTypes.end() && *it2 != kfilePlugin ) // also in serviceTypes() allMimeTypes.append( *it2 ); } @@ -1144,11 +1144,11 @@ TQStringList KFileMetaInfoProvider::supportedMimeTypes() const // shared data of a KFileMetaInfoGroup -class KFileMetaInfoGroup::Data : public QShared +class KFileMetaInfoGroup::Data : public TQShared { public: Data(const TQString& _name) - : QShared(), + : TQShared(), name(_name), mimeTypeInfo(0L), dirty( false ), @@ -1235,7 +1235,7 @@ TQStringList KFileMetaInfoGroup::preferredKeys() const // move all keys from the preferred keys that are in our list to a new list for ( pref = begin; pref!=end; ++pref ) { - TQStringList::Iterator item = list.find(*pref); + TQStringList::Iterator item = list.tqfind(*pref); if ( item != list.end() ) { newlist.append( *item ); @@ -1288,12 +1288,12 @@ bool KFileMetaInfoGroup::supportsVariableKeys() const bool KFileMetaInfoGroup::contains( const TQString& key ) const { - return d->items.contains(key); + return d->items.tqcontains(key); } KFileMetaInfoItem KFileMetaInfoGroup::item( const TQString& key) const { - TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.find( key ); + TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.tqfind( key ); if ( it != d->items.end() ) return it.data(); @@ -1356,7 +1356,7 @@ void KFileMetaInfoGroup::deref() KFileMetaInfoItem KFileMetaInfoGroup::addItem( const TQString& key ) { assert(isValid()); - TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.find( key ); + TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.tqfind( key ); if ( it != d->items.end() ) return it.data(); @@ -1395,7 +1395,7 @@ bool KFileMetaInfoGroup::removeItem( const TQString& key ) return false; } - TQMapIterator<TQString, KFileMetaInfoItem> it = d->items.find(key); + TQMapIterator<TQString, KFileMetaInfoItem> it = d->items.tqfind(key); if ( it==d->items.end() ) { kdDebug(7033) << "trying to remove the non existant item " << key << "\n"; @@ -1482,7 +1482,7 @@ KFileMimeTypeInfo::~KFileMimeTypeInfo() const KFileMimeTypeInfo::GroupInfo * KFileMimeTypeInfo::groupInfo( const TQString& group ) const { - return m_groups.find( group ); + return m_groups.tqfind( group ); } KFileMimeTypeInfo::GroupInfo * KFileMimeTypeInfo::addGroupInfo( @@ -1523,7 +1523,7 @@ TQStringList KFileMimeTypeInfo::supportedKeys() const for ( ; it.current(); ++it ) { // need to nuke dupes TQStringList list = it.current()->supportedKeys(); for ( lit = list.begin(); lit != list.end(); ++lit ) { - if ( keys.find( *lit ) == keys.end() ) + if ( keys.tqfind( *lit ) == keys.end() ) keys.append( *lit ); } } @@ -1564,7 +1564,7 @@ KFileMimeTypeInfo::GroupInfo::~GroupInfo() const KFileMimeTypeInfo::ItemInfo * KFileMimeTypeInfo::GroupInfo::itemInfo( const TQString& key ) const { - ItemInfo* item = m_itemDict.find( key ); + ItemInfo* item = m_itemDict.tqfind( key ); // if we the item isn't found and variable keys are supported, we need to // return the default variable key iteminfo. diff --git a/kio/kio/kfilemetainfo.h b/kio/kio/kfilemetainfo.h index d6a6e7e4c..1552ede9f 100644 --- a/kio/kio/kfilemetainfo.h +++ b/kio/kio/kfilemetainfo.h @@ -1391,7 +1391,7 @@ private: * PreferredItems=Items,Size * @endcode **/ -class KIO_EXPORT KFilePlugin : public QObject +class KIO_EXPORT KFilePlugin : public TQObject { Q_OBJECT diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp index 1f6dca285..8fea509d7 100644 --- a/kio/kio/kfileshare.cpp +++ b/kio/kio/kfileshare.cpp @@ -90,7 +90,7 @@ void KFileShare::readConfig() // static { // Create KFileSharePrivate instance KFileSharePrivate::self(); - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true); s_sharingEnabled = config.readEntry("FILESHARING", "yes") == "yes"; s_restricted = config.readEntry("RESTRICT", "yes") == "yes"; @@ -105,7 +105,7 @@ void KFileShare::readConfig() // static else { // check if current user is in fileshare group KUserGroup shareGroup(s_fileShareGroup); - if (shareGroup.users().findIndex(KUser()) > -1 ) + if (shareGroup.users().tqfindIndex(KUser()) > -1 ) s_authorization = Authorized; else s_authorization = UserNotAllowed; @@ -221,9 +221,9 @@ int KFileShare::isDirectoryShared( const TQString& _path ) if ( path[path.length()-1] != '/' ) path += '/'; //return s_shareList && s_shareList->contains( path ); - if( (*s_shareMap).contains(path) && !((*s_shareMap)[path].isEmpty()) ) { + if( (*s_shareMap).tqcontains(path) && !((*s_shareMap)[path].isEmpty()) ) { ret+=1; - if( (*s_shareMap)[path].find("readwrite") != -1 ) + if( (*s_shareMap)[path].tqfind("readwrite") != -1 ) ret+=2; } @@ -241,7 +241,7 @@ KFileShare::Authorization KFileShare::authorization() TQString KFileShare::findExe( const char* exeName ) { // /usr/sbin on Mandrake, $PATH allows flexibility for other distributions - TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::fromLatin1(":/usr/sbin"); + TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::tqfromLatin1(":/usr/sbin"); TQString exe = KStandardDirs::findExe( exeName, path ); if (exe.isEmpty()) kdError() << exeName << " not found in " << path << endl; diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h index 6fddebd65..a7158bf71 100644 --- a/kio/kio/kfileshare.h +++ b/kio/kio/kfileshare.h @@ -29,7 +29,7 @@ class KDirWatch; * @internal * Do not use, ever. */ -class KFileSharePrivate : public QObject +class KFileSharePrivate : public TQObject { Q_OBJECT diff --git a/kio/kio/kfilterdev.cpp b/kio/kio/kfilterdev.cpp index 224d68761..187b16654 100644 --- a/kio/kio/kfilterdev.cpp +++ b/kio/kio/kfilterdev.cpp @@ -70,9 +70,9 @@ TQIODevice* KFilterDev::createFilterDevice(KFilterBase* base, TQFile* file) //we don't need a filter if (base==0) - return new TQFile(file->name()); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) + return TQT_TQIODEVICE(new TQFile(file->name())); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) - base->setDevice(file); + base->setDevice(TQT_TQIODEVICE(file)); return new KFilterDev(base); } #endif @@ -86,11 +86,11 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin : KFilterBase::findFilterByMimeType( mimetype ); if ( base ) { - base->setDevice(f, true); + base->setDevice(TQT_TQIODEVICE(f), true); return new KFilterDev(base, true); } if(!forceFilter) - return f; + return TQT_TQIODEVICE(f); else { delete f; @@ -132,7 +132,7 @@ bool KFilterDev::open( int mode ) d->bNeedHeader = !d->bSkipHeaders; filter->init( mode ); d->bOpenedUnderlyingDevice = !filter->device()->isOpen(); - bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( mode ) : true; + bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQIODevice_OpenModeFlag)mode ) : true; d->result = KFilterBase::OK; if ( !ret ) @@ -142,7 +142,7 @@ bool KFilterDev::open( int mode ) setState( IO_Open ); setMode( mode ); } - ioIndex = 0; + TQIODevice::at(0); return ret; } @@ -169,7 +169,11 @@ void KFilterDev::flush() // Hmm, might not be enough... } +#ifdef USE_QT4 +qint64 KFilterDev::size() const +#else // USE_QT4 TQIODevice::Offset KFilterDev::size() const +#endif // USE_QT4 { // Well, hmm, Houston, we have a problem. // We can't know the size of the uncompressed data @@ -184,21 +188,21 @@ TQIODevice::Offset KFilterDev::size() const TQIODevice::Offset KFilterDev::at() const { - return ioIndex; + return TQIODevice::at(); } bool KFilterDev::at( TQIODevice::Offset pos ) { - //kdDebug(7005) << "KFilterDev::at " << pos << " currently at " << ioIndex << endl; + //kdDebug(7005) << "KFilterDev::at " << pos << " currently at " << TQIODevice::at() << endl; - if ( ioIndex == pos ) + if ( TQIODevice::at() == pos ) return true; Q_ASSERT ( filter->mode() == IO_ReadOnly ); if ( pos == 0 ) { - ioIndex = 0; + TQIODevice::at(0); // We can forget about the cached data d->ungetchBuffer.resize(0); d->bNeedHeader = !d->bSkipHeaders; @@ -208,8 +212,8 @@ bool KFilterDev::at( TQIODevice::Offset pos ) return filter->device()->reset(); } - if ( ioIndex < pos ) // we can start from here - pos = pos - ioIndex; + if ( TQIODevice::at() < pos ) // we can start from here + pos = pos - TQIODevice::at(); else { // we have to start from 0 ! Ugly and slow, but better than the previous @@ -219,7 +223,7 @@ bool KFilterDev::at( TQIODevice::Offset pos ) } //kdDebug(7005) << "KFilterDev::at : reading " << pos << " dummy bytes" << endl; - TQByteArray dummy( QMIN( pos, 3*BUFFER_SIZE ) ); + TQByteArray dummy( TQMIN( pos, 3*BUFFER_SIZE ) ); d->bIgnoreData = true; bool result = ( (TQIODevice::Offset)readBlock( dummy.data(), pos ) == pos ); d->bIgnoreData = false; @@ -232,7 +236,7 @@ bool KFilterDev::atEnd() const && d->ungetchBuffer.isEmpty(); } -Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) +TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) { Q_ASSERT ( filter->mode() == IO_ReadOnly ); //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl; @@ -252,10 +256,10 @@ Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) } else { - dataReceived = QMIN( len, maxlen ); + dataReceived = TQMIN( len, maxlen ); } d->ungetchBuffer.truncate( len - dataReceived ); - ioIndex += dataReceived; + TQIODevice::at(TQIODevice::at() + dataReceived); } // If we came to the end of the stream @@ -268,17 +272,17 @@ Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) return -1; - Q_ULONG outBufferSize; + TQ_ULONG outBufferSize; if ( d->bIgnoreData ) { - outBufferSize = QMIN( maxlen, 3*BUFFER_SIZE ); + outBufferSize = TQMIN( maxlen, 3*BUFFER_SIZE ); } else { outBufferSize = maxlen; } outBufferSize -= dataReceived; - Q_ULONG availOut = outBufferSize; + TQ_ULONG availOut = outBufferSize; filter->setOutBuffer( data, outBufferSize ); bool decompressedAll = false; @@ -335,7 +339,7 @@ Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) { availOut = maxlen - dataReceived; } - ioIndex += outReceived; + TQIODevice::at(TQIODevice::at() + outReceived); if (d->result == KFilterBase::END) { //kdDebug(7005) << "KFilterDev::readBlock got END. dataReceived=" << dataReceived << endl; @@ -351,7 +355,7 @@ Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) return dataReceived; } -Q_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, Q_ULONG len ) +TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len ) { Q_ASSERT ( filter->mode() == IO_WriteOnly ); // If we had an error, return 0. @@ -394,7 +398,7 @@ Q_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, Q_ULONG len ) // Move on in the input buffer data += wrote; dataWritten += wrote; - ioIndex += wrote; + TQIODevice::at(TQIODevice::at() + wrote); availIn = len - dataWritten; //kdDebug(7005) << " KFilterDev::writeBlock availIn=" << availIn << " dataWritten=" << dataWritten << " ioIndex=" << ioIndex << endl; @@ -439,7 +443,7 @@ int KFilterDev::getch() int len = d->ungetchBuffer.length(); int ch = d->ungetchBuffer[ len-1 ]; d->ungetchBuffer.truncate( len - 1 ); - ioIndex++; + TQIODevice::at(TQIODevice::at() + 1); //kdDebug(7005) << "KFilterDev::getch from ungetch: " << TQString(TQChar(ch)) << endl; return ch; } @@ -465,7 +469,7 @@ int KFilterDev::ungetch( int ch ) // pipe or similar => we cannot ungetch, so do it manually d->ungetchBuffer +=ch; - ioIndex--; + TQIODevice::at(TQIODevice::at() - 1); return ch; } diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h index d36229859..7d8fe5288 100644 --- a/kio/kio/kfilterdev.h +++ b/kio/kio/kfilterdev.h @@ -33,7 +33,7 @@ class KFilterBase; * * @author David Faure <faure@kde.org> */ -class KIO_EXPORT KFilterDev : public QIODevice +class KIO_EXPORT KFilterDev : public TQIODevice { public: /** @@ -77,7 +77,11 @@ public: void setSkipHeaders(); // Not implemented +#ifdef USE_QT4 + virtual qint64 size() const; +#else // USE_QT4 virtual TQIODevice::Offset size() const; +#endif // USE_QT4 virtual TQIODevice::Offset at() const; /** @@ -87,8 +91,8 @@ public: virtual bool atEnd() const; - virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ); - virtual Q_LONG writeBlock( const char *data, Q_ULONG len ); + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ); //int readLine( char *data, uint maxlen ); virtual int getch(); diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp index 8d4a45db4..87bbf6879 100644 --- a/kio/kio/kimageio.cpp +++ b/kio/kio/kimageio.cpp @@ -68,7 +68,7 @@ KImageIOFormat::~KImageIOFormat() void KImageIOFormat::load( TQDataStream& _str) { - Q_INT8 iRead, iWrite; + TQ_INT8 iRead, iWrite; KSycocaEntry::read(_str, mType); KSycocaEntry::read(_str, mHeader); KSycocaEntry::read(_str, mFlags); @@ -86,8 +86,8 @@ void KImageIOFormat::save( TQDataStream& _str) { KSycocaEntry::save( _str ); - Q_INT8 iRead = bRead ? 1 : 0; - Q_INT8 iWrite = bWrite ? 1 : 0; + TQ_INT8 iRead = bRead ? 1 : 0; + TQ_INT8 iWrite = bWrite ? 1 : 0; _str << mType << mHeader << mFlags << iRead << iWrite << mSuffices << mMimetype << mLib << mPattern << rPaths; @@ -100,18 +100,18 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) { if (mLib.isEmpty()) { - iio->setStatus(1); // Error + iio->setqStatus(1); // Error return; } TQString libpath = KLibLoader::findLibrary(mLib.ascii()); if ( libpath.isEmpty()) { - iio->setStatus(1); // Error + iio->setqStatus(1); // Error return; } lt_dlhandle libhandle = lt_dlopen( TQFile::encodeName(libpath) ); if (libhandle == 0) { - iio->setStatus(1); // error + iio->setqStatus(1); // error kdWarning() << "KImageIOFormat::callLibFunc: couldn't dlopen " << mLib << "(" << lt_dlerror() << ")" << endl; return; } @@ -123,7 +123,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) lt_ptr func = lt_dlsym(libhandle, funcName.ascii()); if (func == NULL) { - iio->setStatus(1); // error + iio->setqStatus(1); // error kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl; } mReadFunc = (void (*)(TQImageIO *))func; @@ -134,7 +134,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) lt_ptr func = lt_dlsym(libhandle, funcName.ascii()); if (func == NULL) { - iio->setStatus(1); // error + iio->setqStatus(1); // error kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl; } mWriteFunc = (void (*)(TQImageIO *))func; @@ -145,12 +145,12 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) if (mReadFunc) mReadFunc(iio); else - iio->setStatus(1); // Error + iio->setqStatus(1); // Error else if (mWriteFunc) mWriteFunc(iio); else - iio->setStatus(1); // Error + iio->setqStatus(1); // Error } @@ -193,7 +193,7 @@ KImageIOFactory::KImageIOFactory() : KSycocaFactory( KST_KImageIO ) } } -QString +TQString KImageIOFactory::createPattern( KImageIO::Mode _mode) { TQStringList patterns; @@ -232,7 +232,7 @@ KImageIOFactory::createPattern( KImageIO::Mode _mode) patterns.sort(); patterns.prepend(allPatterns); - TQString pattern = patterns.join(TQString::fromLatin1("\n")); + TQString pattern = patterns.join(TQString::tqfromLatin1("\n")); return pattern; } @@ -256,7 +256,7 @@ KImageIOFactory::readImage( TQImageIO *iio) } if (!format || !format->bRead) { - iio->setStatus(1); // error + iio->setqStatus(1); // error return; } @@ -283,7 +283,7 @@ KImageIOFactory::writeImage( TQImageIO *iio) } if (!format || !format->bWrite) { - iio->setStatus(1); // error + iio->setqStatus(1); // error return; } @@ -380,7 +380,7 @@ void KImageIO::registerFormats() (void) KImageIOFactory::self(); } -QString +TQString KImageIO::pattern(Mode _mode) { if (_mode == Reading) @@ -489,7 +489,7 @@ TQString KImageIO::type(const TQString& filename) { KImageIOFormatList *formatList = KImageIOFactory::self()->formatList; TQString suffix = filename; - int dot = suffix.findRev('.'); + int dot = suffix.tqfindRev('.'); if (dot >= 0) suffix = suffix.mid(dot + 1); @@ -500,7 +500,7 @@ TQString KImageIO::type(const TQString& filename) ++it ) { KImageIOFormat *format = (*it); - if (format->mSuffices.contains(suffix)) + if (format->mSuffices.tqcontains(suffix)) return format->mType; } } diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h index 035a3cd15..1b82e2e49 100644 --- a/kio/kio/klimitediodevice.h +++ b/kio/kio/klimitediodevice.h @@ -28,7 +28,7 @@ * @author David Faure <david@mandrakesoft.com> * @since 3.1 */ -class KIO_EXPORT KLimitedIODevice : public QIODevice +class KIO_EXPORT KLimitedIODevice : public TQIODevice { public: /** @@ -67,14 +67,18 @@ public: virtual void close() {} virtual void flush() {} +#ifdef USE_QT4 + virtual qint64 size() const { return m_length; } +#else // USE_QT4 virtual Offset size() const { return m_length; } +#endif // USE_QT4 - virtual Q_LONG readBlock ( char * data, Q_ULONG maxlen ) + virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen ) { maxlen = QMIN( maxlen, m_length - at() ); // Apply upper limit return m_dev->readBlock( data, maxlen ); } - virtual Q_LONG writeBlock ( const char *, Q_ULONG ) { return -1; } // unsupported + virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported virtual int putch( int ) { return -1; } // unsupported virtual int getch() { @@ -94,8 +98,8 @@ public: virtual bool atEnd() const { return m_dev->atEnd() || m_dev->at() >= m_start + m_length; } private: TQIODevice* m_dev; - Q_ULONG m_start; - Q_ULONG m_length; + TQ_ULONG m_start; + TQ_ULONG m_length; }; #endif diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index 72b249249..f59ee9d10 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -525,7 +525,7 @@ class KMimeMagicUtimeConf public: KMimeMagicUtimeConf() { - tmpDirs << TQString::fromLatin1("/tmp"); // default value + tmpDirs << TQString::tqfromLatin1("/tmp"); // default value // The trick is that we also don't want the user to override globally set // directories. So we have to misuse KStandardDirs :} @@ -565,8 +565,8 @@ public: bool restoreAccessTime( const TQString & file ) const { - TQString dir = file.left( file.findRev( '/' ) ); - bool res = tmpDirs.contains( dir ); + TQString dir = file.left( file.tqfindRev( '/' ) ); + bool res = tmpDirs.tqcontains( dir ); //kdDebug(7018) << "restoreAccessTime " << file << " dir=" << dir << " result=" << res << endl; return res; } @@ -2270,7 +2270,7 @@ refineResult(KMimeMagicResult *r, const TQString & _filename) else if ( tmp == "application/x-sharedlib" ) { - if ( _filename.find( ".so" ) == -1 ) + if ( _filename.tqfind( ".so" ) == -1 ) { tmp = "application/x-executable"; r->setMimeType( tmp ); diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index a698e7495..ab65c4c24 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -265,7 +265,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, { // Assume inode/directory, if the protocol supports listing. if ( KProtocolInfo::supportsListing( _url ) ) - return mimeType( TQString::fromLatin1("inode/directory") ); + return mimeType( TQString::tqfromLatin1("inode/directory") ); else return defaultMimeTypePtr(); // == 'no idea', e.g. for "data:,foo/" } @@ -382,15 +382,15 @@ void KMimeType::init( KDesktopFile * config ) m_lstPatterns = config->readListEntry( "Patterns", ';' ); // Read the X-KDE-AutoEmbed setting and store it in the properties map - TQString XKDEAutoEmbed = TQString::fromLatin1("X-KDE-AutoEmbed"); + TQString XKDEAutoEmbed = TQString::tqfromLatin1("X-KDE-AutoEmbed"); if ( config->hasKey( XKDEAutoEmbed ) ) m_mapProps.insert( XKDEAutoEmbed, TQVariant( config->readBoolEntry( XKDEAutoEmbed ), 0 ) ); - TQString XKDEText = TQString::fromLatin1("X-KDE-text"); + TQString XKDEText = TQString::tqfromLatin1("X-KDE-text"); if ( config->hasKey( XKDEText ) ) m_mapProps.insert( XKDEText, config->readBoolEntry( XKDEText ) ); - TQString XKDEIsAlso = TQString::fromLatin1("X-KDE-IsAlso"); + TQString XKDEIsAlso = TQString::tqfromLatin1("X-KDE-IsAlso"); if ( config->hasKey( XKDEIsAlso ) ) { TQString inherits = config->readEntry( XKDEIsAlso ); if ( inherits != name() ) @@ -399,7 +399,7 @@ void KMimeType::init( KDesktopFile * config ) kdWarning(7009) << "Error: " << inherits << " inherits from itself!!!!" << endl; } - TQString XKDEPatternsAccuracy = TQString::fromLatin1("X-KDE-PatternsAccuracy"); + TQString XKDEPatternsAccuracy = TQString::tqfromLatin1("X-KDE-PatternsAccuracy"); if ( config->hasKey( XKDEPatternsAccuracy ) ) m_mapProps.insert( XKDEPatternsAccuracy, config->readEntry( XKDEPatternsAccuracy ) ); @@ -632,9 +632,9 @@ TQString KFolderType::icon( const KURL& _url, bool _is_local ) const entries.append( ep->d_name ); if ( readdir( dp ) == 0 ) { // only three // check if we got "." ".." and ".directory" - isempty = entries.find( "." ) != entries.end() && - entries.find( ".." ) != entries.end() && - entries.find( ".directory" ) != entries.end(); + isempty = entries.tqfind( "." ) != entries.end() && + entries.tqfind( ".." ) != entries.end() && + entries.tqfind( ".directory" ) != entries.end(); } } if (!isempty && !strcmp(ep->d_name, ".directory")) @@ -838,7 +838,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf KURL mpURL; mpURL.setPath( mp ); // Open a new window - retval = KRun::runURL( mpURL, TQString::fromLatin1("inode/directory") ); + retval = KRun::runURL( mpURL, TQString::tqfromLatin1("inode/directory") ); } else { @@ -995,15 +995,15 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices if( cfg.hasKey( "X-KDE-GetActionMenu" )) { TQString dcopcall = cfg.readEntry( "X-KDE-GetActionMenu" ); - const TQCString app = dcopcall.section(' ', 0,0).utf8(); + const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8(); TQByteArray dataToSend; TQDataStream dataStream(dataToSend, IO_WriteOnly); dataStream << file_list; TQCString replyType; TQByteArray replyData; - TQCString object = dcopcall.section(' ', 1,-2).utf8(); - TQString function = dcopcall.section(' ', -1); + TQCString object = TQString(dcopcall.section(' ', 1,-2)).utf8(); + TQString function = dcopcall.section(' ', -1); if(!function.endsWith("(KURL::List)")) { kdWarning() << "Desktop file " << path << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl; } else { diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index d8ceb930b..7f041b722 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -134,15 +134,15 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) for (; it != mimetypes.end(); ++it) { TQString mimetype = (*it)->name(); - int index = mimetype.find("/"); + int index = mimetype.tqfind("/"); TQString maj = mimetype.left(index); - if ( d->groups.count() && !d->groups.contains( maj ) ) + if ( d->groups.count() && !d->groups.tqcontains( maj ) ) continue; TQString min = mimetype.right(mimetype.length() - (index+1)); - TQMapIterator<TQString,TQListViewItem*> mit = groups.find( maj ); + TQMapIterator<TQString,TQListViewItem*> mit = groups.tqfind( maj ); if ( mit == groups.end() ) { groupItem = new TQListViewItem( d->lvMimeTypes, maj ); @@ -167,7 +167,7 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) if ( d->visuals & Patterns ) item->setText( cl, (*it)->patterns().join("; ") ); - if ( selMimeTypes.contains(mimetype) ) + if ( selMimeTypes.tqcontains(mimetype) ) { item->setOn( true ); groupItem->setOpen( true ); @@ -189,15 +189,15 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) void KMimeTypeChooser::editMimeType() { - if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->parent()) ) + if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->tqparent()) ) return; - TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 ); + TQString mt = (d->lvMimeTypes->currentItem()->tqparent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 ); // thanks to libkonq/konq_operations.cc connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()), this, TQT_SLOT(slotSycocaDatabaseChanged()) ); - TQString keditfiletype = TQString::fromLatin1("keditfiletype"); + TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); KRun::runCommand( keditfiletype - + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) + + " --parent " + TQString::number( (ulong)tqtopLevelWidget()->winId()) + " " + KProcess::quote(mt), keditfiletype, keditfiletype /*unused*/); } @@ -205,7 +205,7 @@ void KMimeTypeChooser::editMimeType() void KMimeTypeChooser::slotCurrentChanged(TQListViewItem* i) { if ( d->btnEditMimeType ) - d->btnEditMimeType->setEnabled( i->parent() ); + d->btnEditMimeType->setEnabled( i->tqparent() ); } void KMimeTypeChooser::slotSycocaDatabaseChanged() @@ -220,8 +220,8 @@ TQStringList KMimeTypeChooser::mimeTypes() const TQListViewItemIterator it( d->lvMimeTypes ); for (; it.current(); ++it) { - if ( it.current()->parent() && ((TQCheckListItem*)it.current())->isOn() ) - l << it.current()->parent()->text(0) + "/" + it.current()->text(0); // FIXME uncecked, should be Ok unless someone changes mimetypes during this! + if ( it.current()->tqparent() && ((TQCheckListItem*)it.current())->isOn() ) + l << it.current()->tqparent()->text(0) + "/" + it.current()->text(0); // FIXME uncecked, should be Ok unless someone changes mimetypes during this! } return l; } @@ -234,9 +234,9 @@ TQStringList KMimeTypeChooser::patterns() const TQListViewItemIterator it( d->lvMimeTypes ); for (; it.current(); ++it) { - if ( it.current()->parent() && ((TQCheckListItem*)it.current())->isOn() ) + if ( it.current()->tqparent() && ((TQCheckListItem*)it.current())->isOn() ) { - p = KMimeType::mimeType( it.current()->parent()->text(0) + "/" + it.current()->text(0) ); + p = KMimeType::mimeType( it.current()->tqparent()->text(0) + "/" + it.current()->text(0) ); if ( p->name() != defMT ) l += p->patterns(); } diff --git a/kio/kio/kmimetypechooser.h b/kio/kio/kmimetypechooser.h index 0827d5b30..355eeb707 100644 --- a/kio/kio/kmimetypechooser.h +++ b/kio/kio/kmimetypechooser.h @@ -31,7 +31,7 @@ * * @author Anders Lund (anders at alweb dk), jan 23, 2002 */ -class KIO_EXPORT KMimeTypeChooser : public QVBox +class KIO_EXPORT KMimeTypeChooser : public TQVBox { Q_OBJECT diff --git a/kio/kio/kmimetyperesolver.h b/kio/kio/kmimetyperesolver.h index 4ac6347f2..fdbbb1e5b 100644 --- a/kio/kio/kmimetyperesolver.h +++ b/kio/kio/kmimetyperesolver.h @@ -46,7 +46,7 @@ protected: * itself. So an object of this class is used to handle signals, slots etc. * and forwards them to the KMimeTypeResolver instance. */ -class KIO_EXPORT KMimeTypeResolverHelper : public QObject +class KIO_EXPORT KMimeTypeResolverHelper : public TQObject { Q_OBJECT diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp index f0fdfce6d..faf7448ee 100644 --- a/kio/kio/knfsshare.cpp +++ b/kio/kio/knfsshare.cpp @@ -123,7 +123,7 @@ bool KNFSSharePrivate::readExportsFile() { // Handle quotation marks if ( completeLine[0] == '"' ) { - int i = completeLine.find('"',1); + int i = completeLine.tqfind('"',1); if (i == -1) { kdError() << "KNFSShare: Parse error: Missing quotation mark: " << completeLine << endl; continue; @@ -131,9 +131,9 @@ bool KNFSSharePrivate::readExportsFile() { path = completeLine.mid(1,i-1); } else { // no quotation marks - int i = completeLine.find(' '); + int i = completeLine.tqfind(' '); if (i == -1) - i = completeLine.find('\t'); + i = completeLine.tqfind('\t'); if (i == -1) path = completeLine; @@ -180,7 +180,7 @@ bool KNFSShare::isDirectoryShared( const TQString & path ) const { if ( path[path.length()-1] != '/' ) fixedPath += '/'; - return d->sharedPaths.find(fixedPath) != 0; + return d->sharedPaths.tqfind(fixedPath) != 0; } TQStringList KNFSShare::sharedDirectories() const { diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index 8fb8b3227..8b333da07 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -267,7 +267,7 @@ TQString KProtocolManager::proxyForURL( const KURL &url ) } break; case EnvVarProxy: - proxy = TQString::fromLocal8Bit(getenv(proxyFor(url.protocol()).local8Bit())).stripWhiteSpace(); + proxy = TQString(TQString::fromLocal8Bit(getenv(proxyFor(url.protocol()).local8Bit()))).stripWhiteSpace(); break; case ManualProxy: proxy = proxyFor( url.protocol() ); @@ -277,7 +277,7 @@ TQString KProtocolManager::proxyForURL( const KURL &url ) break; } - return (proxy.isEmpty() ? TQString::fromLatin1("DIRECT") : proxy); + return (proxy.isEmpty() ? TQString::tqfromLatin1("DIRECT") : proxy); } void KProtocolManager::badProxy( const TQString &proxy ) @@ -462,7 +462,7 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) if( modifiers.contains('p') ) { // TODO: determine this value instead of hardcoding it... - supp += TQString::fromLatin1("; X11"); + supp += TQString::tqfromLatin1("; X11"); } if( modifiers.contains('m') ) { @@ -471,13 +471,13 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) if( modifiers.contains('l') ) { TQStringList languageList = KGlobal::locale()->languageList(); - TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) + if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::fromLatin1("en"); + (*it) = TQString::tqfromLatin1("en"); } if( languageList.count() ) supp += TQString("; %1").arg(languageList.join(", ")); diff --git a/kio/kio/kremoteencoding.cpp b/kio/kio/kremoteencoding.cpp index 632eeb8b2..23fd0563d 100644 --- a/kio/kio/kremoteencoding.cpp +++ b/kio/kio/kremoteencoding.cpp @@ -37,13 +37,13 @@ TQString KRemoteEncoding::decode(const TQCString& name) const { #ifdef CHECK_UTF8 if (codec->mibEnum() == 106 && !KStringHandler::isUtf8(name)) - return TQString::fromLatin1(name); + return TQString::tqfromLatin1(name); #endif TQString result = codec->toUnicode(name); if (codec->fromUnicode(result) != name) // fallback in case of decoding failure - return TQString::fromLatin1(name); + return TQString::tqfromLatin1(name); return result; } diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 9e51a2938..a8304427c 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -386,15 +386,15 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List /// compatibility hack -- KDE 4: remove TQRegExp re("^\\s*(?:/bin/)?sh\\s+-c\\s+(.*)$"); if (!re.search( exec )) { - exec = re.cap( 1 ).stripWhiteSpace(); + exec = TQString(re.cap( 1 )).stripWhiteSpace(); for (uint pos = 0; pos < exec.length(); ) { - TQChar c = exec.unicode()[pos]; + TQChar c = exec.tqunicode()[pos]; if (c != '\'' && c != '"') goto synerr; // what else can we do? after normal parsing the substs would be insecure - int pos2 = exec.find( c, pos + 1 ) - 1; + int pos2 = exec.tqfind( c, pos + 1 ) - 1; if (pos2 < 0) goto synerr; // quoting error - memcpy( (void *)(exec.unicode() + pos), exec.unicode() + pos + 1, (pos2 - pos) * sizeof(TQChar)); + memcpy( (void *)(exec.tqunicode() + pos), exec.tqunicode() + pos + 1, (pos2 - pos) * sizeof(TQChar)); pos = pos2; exec.remove( pos, 2 ); } @@ -545,8 +545,8 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath ) for (TQStringList::ConstIterator it = args.begin(); it != args.end(); ++it) if (!(*it).contains('=')) // Remove path if wanted - return removePath ? (*it).mid((*it).findRev('/') + 1) : *it; - return TQString::null; + return removePath ? (*it).mid(TQString(*it).tqfindRev('/') + 1) : *it; + return TQString(); } static pid_t runCommandInternal( KProcess* proc, const KService* service, const TQString& binName, @@ -708,7 +708,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service { // compat mode: assume KIO if not set and it's a KDE app TQStringList categories = _service.property("Categories").toStringList(); - if ( categories.find("KDE") != categories.end() ) + if ( categories.tqfind("KDE") != categories.end() ) supportedProtocols.append( "KIO" ); else { // if no KDE app, be a bit over-generic supportedProtocols.append( "http"); @@ -719,10 +719,10 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl; KURL::List urls( _urls ); - if ( supportedProtocols.find( "KIO" ) == supportedProtocols.end() ) { + if ( supportedProtocols.tqfind( "KIO" ) == supportedProtocols.end() ) { for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) { const KURL url = *it; - bool supported = url.isLocalFile() || supportedProtocols.find( url.protocol().lower() ) != supportedProtocols.end(); + bool supported = url.isLocalFile() || supportedProtocols.tqfind( url.protocol().lower() ) != supportedProtocols.end(); kdDebug(7010) << "Looking at url=" << url << " supported=" << supported << endl; if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" ) { @@ -861,7 +861,7 @@ pid_t KRun::runCommand( const TQString& cmd, const TQString &execName, const TQS *proc << cmd; KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) ); TQString bin = binaryName( cmd, false ); - int pos = bin.findRev( '/' ); + int pos = bin.tqfindRev( '/' ); if (pos != -1) { proc->setWorkingDirectory( bin.mid(0, pos) ); } @@ -927,7 +927,7 @@ void KRun::init() if (m_strURL.url().startsWith("$(")) { // check for environment variables and make necessary translations TQString aValue = m_strURL.url(); - int nDollarPos = aValue.find( '$' ); + int nDollarPos = aValue.tqfind( '$' ); while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) { // there is at least one $ @@ -983,7 +983,7 @@ void KRun::init() aValue.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = aValue.find( '$', nDollarPos ); + nDollarPos = aValue.tqfind( '$', nDollarPos ); } m_strURL = KURL(aValue); bypassErrorMessage = true; @@ -1360,7 +1360,7 @@ void KRun::foundMimeType( const TQString& type ) return; } */ - KIO::TransferJob *job = ::qt_cast<KIO::TransferJob *>( m_job ); + KIO::TransferJob *job = ::tqqt_cast<KIO::TransferJob *>( m_job ); if ( job ) { job->putOnHold(); diff --git a/kio/kio/krun.h b/kio/kio/krun.h index 17fa434e3..5cf8189c9 100644 --- a/kio/kio/krun.h +++ b/kio/kio/krun.h @@ -55,7 +55,7 @@ namespace KIO { * * @short Opens files with their associated applications in KDE */ -class KIO_EXPORT KRun : public QObject +class KIO_EXPORT KRun : public TQObject { Q_OBJECT public: @@ -475,7 +475,7 @@ public: * It sends a notification when the process exits (for the taskbar) * and it will show an error message if necessary (e.g. "program not found"). */ -class KIO_EXPORT KProcessRunner : public QObject +class KIO_EXPORT KProcessRunner : public TQObject { Q_OBJECT diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp index defeae4a7..3eea9e145 100644 --- a/kio/kio/ksambashare.cpp +++ b/kio/kio/ksambashare.cpp @@ -62,7 +62,7 @@ bool KSambaSharePrivate::load() { * @return wether a smb.conf was found. **/ bool KSambaSharePrivate::findSmbConf() { - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true); smbConf = config.readEntry("SMBCONF"); if ( TQFile::exists(smbConf) ) @@ -144,7 +144,7 @@ bool KSambaSharePrivate::readSmbConf() { } // parameter - int i = completeLine.find('='); + int i = completeLine.tqfind('='); if (i>-1) { @@ -203,7 +203,7 @@ bool KSambaShare::isDirectoryShared( const TQString & path ) const { if ( path[path.length()-1] != '/' ) fixedPath += '/'; - return d->sharedPaths.find(fixedPath) != 0; + return d->sharedPaths.tqfind(fixedPath) != 0; } TQStringList KSambaShare::sharedDirectories() const { diff --git a/kio/kio/kscan.cpp b/kio/kio/kscan.cpp index 21e8086b8..49ae7c5ab 100644 --- a/kio/kio/kscan.cpp +++ b/kio/kio/kscan.cpp @@ -41,7 +41,7 @@ KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( parent, name, "KScanDialog", args ); + TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KScanDialog", args ); return dynamic_cast<KScanDialog *>( res ); } @@ -84,7 +84,7 @@ KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( parent, name, "KOCRDialog", args ); + TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KOCRDialog", args ); return dynamic_cast<KOCRDialog *>( res ); } @@ -133,7 +133,7 @@ TQObject *KScanDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return createDialog( static_cast<TQWidget *>( parent ), name, modal ); + return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); } @@ -166,7 +166,7 @@ TQObject *KOCRDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return createDialog( static_cast<TQWidget *>( parent ), name, modal ); + return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); } void KScanDialog::virtual_hook( int id, void* data ) diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index 3af62f26f..36fb0f9fa 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -128,9 +128,9 @@ KService::init( KDesktopFile *config ) } // Try to make up a name. m_strName = entryPath(); - int i = m_strName.findRev('/'); + int i = m_strName.tqfindRev('/'); m_strName = m_strName.mid(i+1); - i = m_strName.findRev('.'); + i = m_strName.tqfindRev('.'); if (i != -1) m_strName = m_strName.left(i); } @@ -189,10 +189,10 @@ KService::init( KDesktopFile *config ) } TQString name = entryPath(); - int pos = name.findRev('/'); + int pos = name.tqfindRev('/'); if (pos != -1) name = name.mid(pos+1); - pos = name.find('.'); + pos = name.tqfind('.'); if (pos != -1) name = name.left(pos); @@ -200,7 +200,7 @@ KService::init( KDesktopFile *config ) if (kde4application && !m_strExec.startsWith("/")) { m_strExec = "KDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec; } else if (config->readBoolEntry("X-KDE-SubstituteUID")) { - int space = m_strExec.find(" "); + int space = m_strExec.tqfind(" "); if (space==-1) m_strExec = KStandardDirs::findExe(m_strExec); else { @@ -253,7 +253,7 @@ KService::init( KDesktopFile *config ) m_lstServiceTypes += config->readListEntry( "MimeType", ';' ); entryMap.remove("MimeType"); - if ( m_strType == "Application" && !m_lstServiceTypes.contains("Application") ) + if ( m_strType == "Application" && !m_lstServiceTypes.tqcontains("Application") ) // Applications implement the service type "Application" ;-) m_lstServiceTypes += "Application"; @@ -327,11 +327,11 @@ void KService::load( TQDataStream& s ) // dummies are here because of fields that were removed, to keep bin compat. // Feel free to re-use, but fields for Applications only (not generic services) // should rather be added to application.desktop - Q_INT8 def, term, dummy1, dummy2; - Q_INT8 dst, initpref; + TQ_INT8 def, term, dummy1, dummy2; + TQ_INT8 dst, initpref; TQString dummyStr1, dummyStr2; int dummyI1, dummyI2; - Q_UINT32 dummyUI32; + TQ_UINT32 dummyUI32; // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x! // !! This data structure should remain binary compatible at all times !! @@ -358,13 +358,13 @@ void KService::load( TQDataStream& s ) void KService::save( TQDataStream& s ) { KSycocaEntry::save( s ); - Q_INT8 def = m_bAllowAsDefault, initpref = m_initialPreference; - Q_INT8 term = m_bTerminal; - Q_INT8 dst = (Q_INT8) m_DCOPServiceType; - Q_INT8 dummy1 = 0, dummy2 = 0; // see ::load + TQ_INT8 def = m_bAllowAsDefault, initpref = m_initialPreference; + TQ_INT8 term = m_bTerminal; + TQ_INT8 dst = (TQ_INT8) m_DCOPServiceType; + TQ_INT8 dummy1 = 0, dummy2 = 0; // see ::load TQString dummyStr1, dummyStr2; int dummyI1 = 0, dummyI2 = 0; - Q_UINT32 dummyUI32 = 0; + TQ_UINT32 dummyUI32 = 0; // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x! // !! This data structure should remain binary compatible at all times !! @@ -572,7 +572,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const // Then we use a homebuild class based on KConfigBase to convert the TQString. // For some often used property types we do the conversion ourselves. - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( _name ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { //kdDebug(7012) << "Property not found " << _name << endl; @@ -684,7 +684,7 @@ KService::Ptr KService::serviceByStorageId( const TQString& _storageId ) return new KService(_storageId); TQString tmp = _storageId; - tmp = tmp.mid(tmp.findRev('/')+1); // Strip dir + tmp = tmp.mid(tmp.tqfindRev('/')+1); // Strip dir if (tmp.endsWith(".desktop")) tmp.truncate(tmp.length()-8); @@ -720,7 +720,7 @@ TQString KService::username() const { } bool KService::noDisplay() const { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "NoDisplay" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "NoDisplay" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString().lower(); @@ -728,21 +728,21 @@ bool KService::noDisplay() const { return true; } - it = m_mapProps.find( "OnlyShowIn" ); + it = m_mapProps.tqfind( "OnlyShowIn" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString(); TQStringList aList = TQStringList::split(';', aValue); - if (!aList.contains("KDE")) + if (!aList.tqcontains("KDE")) return true; } - it = m_mapProps.find( "NotShowIn" ); + it = m_mapProps.tqfind( "NotShowIn" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString(); TQStringList aList = TQStringList::split(';', aValue); - if (aList.contains("KDE")) + if (aList.tqcontains("KDE")) return true; } @@ -758,7 +758,7 @@ TQString KService::untranslatedGenericName() const { } bool KService::SuSEunimportant() const { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-SuSE-Unimportant" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "X-SuSE-Unimportant" ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { return false; @@ -772,7 +772,7 @@ bool KService::SuSEunimportant() const { } TQString KService::parentApp() const { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-KDE-ParentApp" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "X-KDE-ParentApp" ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { return TQString::null; @@ -783,8 +783,8 @@ TQString KService::parentApp() const { bool KService::allowMultipleFiles() const { // Can we pass multiple files on the command line or do we have to start the application for every single file ? - if ( m_strExec.find( "%F" ) != -1 || m_strExec.find( "%U" ) != -1 || - m_strExec.find( "%N" ) != -1 || m_strExec.find( "%D" ) != -1 ) + if ( m_strExec.tqfind( "%F" ) != -1 || m_strExec.tqfind( "%U" ) != -1 || + m_strExec.tqfind( "%N" ) != -1 || m_strExec.tqfind( "%D" ) != -1 ) return true; else return false; @@ -836,7 +836,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName else result = base + TQString("-%1.desktop").arg(i); - if (reservedMenuIds && reservedMenuIds->contains(result)) + if (reservedMenuIds && reservedMenuIds->tqcontains(result)) continue; // Lookup service by menu-id @@ -887,7 +887,7 @@ void KService::rebuildKSycoca(TQWidget *parent) DCOPClient *client = kapp->dcopClient(); int result = client->callAsync("kded", "kbuildsycoca", "recreate()", - data, &dlg, TQT_SLOT(slotFinished())); + data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished())); if (result) { diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp index 1f79deb19..d2d4a9623 100644 --- a/kio/kio/kservicefactory.cpp +++ b/kio/kio/kservicefactory.cpp @@ -40,7 +40,7 @@ KServiceFactory::KServiceFactory() if (m_str) { // Read Header - Q_INT32 i; + TQ_INT32 i; (*m_str) >> i; m_nameDictOffset = i; (*m_str) >> i; @@ -52,14 +52,14 @@ KServiceFactory::KServiceFactory() (*m_str) >> i; m_menuIdDictOffset = i; - int saveOffset = m_str->device()->at(); + int saveOffset = m_str->tqdevice()->at(); // Init index tables m_nameDict = new KSycocaDict(m_str, m_nameDictOffset); // Init index tables m_relNameDict = new KSycocaDict(m_str, m_relNameDictOffset); // Init index tables m_menuIdDict = new KSycocaDict(m_str, m_menuIdDictOffset); - saveOffset = m_str->device()->at(saveOffset); + saveOffset = m_str->tqdevice()->at(saveOffset); } else { @@ -191,7 +191,7 @@ KService* KServiceFactory::createEntry(int offset) break; default: - kdError(7011) << TQString("KServiceFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type) << endl; + kdError(7011) << TQString(TQString("KServiceFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type)) << endl; return 0; } if (!newEntry->isValid()) @@ -225,11 +225,11 @@ KService::List KServiceFactory::allInitServices() // Assume we're NOT building a database - m_str->device()->at(m_initListOffset); - Q_INT32 entryCount; + m_str->tqdevice()->at(m_initListOffset); + TQ_INT32 entryCount; (*m_str) >> entryCount; - Q_INT32 *offsetList = new Q_INT32[entryCount]; + TQ_INT32 *offsetList = new TQ_INT32[entryCount]; for(int i = 0; i < entryCount; i++) { (*m_str) >> offsetList[i]; @@ -253,10 +253,10 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) TQDataStream *str = m_str; // Jump to the offer list - str->device()->at( m_offerListOffset ); + str->tqdevice()->at( m_offerListOffset ); - Q_INT32 aServiceTypeOffset; - Q_INT32 aServiceOffset; + TQ_INT32 aServiceTypeOffset; + TQ_INT32 aServiceOffset; // We might want to do a binary search instead of a linear search // since servicetype offsets are sorted. Bah. while (true) @@ -268,14 +268,14 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) if ( aServiceTypeOffset == serviceTypeOffset ) { // Save stream position ! - int savedPos = str->device()->at(); + int savedPos = str->tqdevice()->at(); // Create Service KService * serv = createEntry( aServiceOffset ); if (serv) list.append( KService::Ptr( serv ) ); // Restore position - str->device()->at( savedPos ); - } else if ( aServiceTypeOffset > (Q_INT32)serviceTypeOffset ) + str->tqdevice()->at( savedPos ); + } else if ( aServiceTypeOffset > (TQ_INT32)serviceTypeOffset ) break; // too far } else diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp index f5d2970a9..0560d033c 100644 --- a/kio/kio/kservicegroup.cpp +++ b/kio/kio/kservicegroup.cpp @@ -84,12 +84,12 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp TQStringList tmpList; if (config.hasKey("OnlyShowIn")) { - if (!config.readListEntry("OnlyShowIn", ';').contains("KDE")) + if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE")) d->m_bNoDisplay = true; } if (config.hasKey("NotShowIn")) { - if (config.readListEntry("NotShowIn", ';').contains("KDE")) + if (config.readListEntry("NotShowIn", ';').tqcontains("KDE")) d->m_bNoDisplay = true; } @@ -103,7 +103,7 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp m_strCaption = _relpath; if (m_strCaption.right(1) == "/") m_strCaption = m_strCaption.left(m_strCaption.length()-1); - int i = m_strCaption.findRev('/'); + int i = m_strCaption.tqfindRev('/'); if (i > 0) m_strCaption = m_strCaption.mid(i+1); } @@ -229,11 +229,11 @@ bool KServiceGroup::SuSEshortMenu() const void KServiceGroup::load( TQDataStream& s ) { TQStringList groupList; - Q_INT8 noDisplay; - Q_INT8 _showEmptyMenu; - Q_INT8 inlineHeader; - Q_INT8 _inlineAlias; - Q_INT8 _allowInline; + TQ_INT8 noDisplay; + TQ_INT8 _showEmptyMenu; + TQ_INT8 inlineHeader; + TQ_INT8 _inlineAlias; + TQ_INT8 _allowInline; s >> m_strCaption >> m_strIcon >> m_strComment >> groupList >> m_strBaseGroupName >> m_childCount >> noDisplay >> d->suppressGenericNames >> d->directoryEntryPath >> @@ -302,11 +302,11 @@ void KServiceGroup::save( TQDataStream& s ) (void) childCount(); - Q_INT8 noDisplay = d->m_bNoDisplay ? 1 : 0; - Q_INT8 _showEmptyMenu = d->m_bShowEmptyMenu ? 1 : 0; - Q_INT8 inlineHeader = d->m_bShowInlineHeader ? 1 : 0; - Q_INT8 _inlineAlias = d->m_bInlineAlias ? 1 : 0; - Q_INT8 _allowInline = d->m_bAllowInline ? 1 : 0; + TQ_INT8 noDisplay = d->m_bNoDisplay ? 1 : 0; + TQ_INT8 _showEmptyMenu = d->m_bShowEmptyMenu ? 1 : 0; + TQ_INT8 inlineHeader = d->m_bShowInlineHeader ? 1 : 0; + TQ_INT8 _inlineAlias = d->m_bInlineAlias ? 1 : 0; + TQ_INT8 _allowInline = d->m_bAllowInline ? 1 : 0; s << m_strCaption << m_strIcon << m_strComment << groupList << m_strBaseGroupName << m_childCount << noDisplay << d->suppressGenericNames << d->directoryEntryPath << @@ -707,7 +707,7 @@ KServiceGroup::childGroup(const TQString &parent) return KServiceGroupFactory::self()->findGroupByDesktopPath("#parent#"+parent, true); } -QString +TQString KServiceGroup::directoryEntryPath() const { return d->directoryEntryPath; diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp index 9bca4dc63..326c41173 100644 --- a/kio/kio/kservicegroupfactory.cpp +++ b/kio/kio/kservicegroupfactory.cpp @@ -36,14 +36,14 @@ KServiceGroupFactory::KServiceGroupFactory() if (m_str) { // Read Header - Q_INT32 i; + TQ_INT32 i; (*m_str) >> i; m_baseGroupDictOffset = i; - int saveOffset = m_str->device()->at(); + int saveOffset = m_str->tqdevice()->at(); // Init index tables m_baseGroupDict = new KSycocaDict(m_str, m_baseGroupDictOffset); - m_str->device()->at(saveOffset); + m_str->tqdevice()->at(saveOffset); } else { @@ -124,7 +124,7 @@ KServiceGroup* KServiceGroupFactory::createGroup(int offset, bool deep) break; default: - kdError(7011) << TQString("KServiceGroupFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type) << endl; + kdError(7011) << TQString(TQString("KServiceGroupFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type)) << endl; return 0; } if (!newEntry->isValid()) diff --git a/kio/kio/kservicetype.cpp b/kio/kio/kservicetype.cpp index 48693aceb..b8b4e4659 100644 --- a/kio/kio/kservicetype.cpp +++ b/kio/kio/kservicetype.cpp @@ -82,7 +82,7 @@ KServiceType::init( KDesktopFile *config) for( ; gIt != tmpList.end(); ++gIt ) { - if ( (*gIt).find( "Property::" ) == 0 ) + if ( (*gIt).tqfind( "Property::" ) == 0 ) { config->setGroup( *gIt ); TQVariant v = config->readPropertyEntry( "Value", @@ -95,7 +95,7 @@ KServiceType::init( KDesktopFile *config) gIt = tmpList.begin(); for( ; gIt != tmpList.end(); ++gIt ) { - if( (*gIt).find( "PropertyDef::" ) == 0 ) + if( (*gIt).tqfind( "PropertyDef::" ) == 0 ) { config->setGroup( *gIt ); m_mapPropDefs.insert( (*gIt).mid( 13 ), @@ -125,11 +125,11 @@ KServiceType::KServiceType( TQDataStream& _str, int offset ) void KServiceType::load( TQDataStream& _str ) { - Q_INT8 b; + TQ_INT8 b; _str >> m_strName >> m_strIcon >> m_strComment >> m_mapProps >> m_mapPropDefs >> b; m_bValid = b; - m_bDerived = m_mapProps.contains("X-KDE-Derived"); + m_bDerived = m_mapProps.tqcontains("X-KDE-Derived"); } void @@ -140,7 +140,7 @@ KServiceType::save( TQDataStream& _str ) // You may add new fields at the end. Make sure to update the version // number in ksycoca.h _str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs - << (Q_INT8)m_bValid; + << (TQ_INT8)m_bValid; } KServiceType::~KServiceType() @@ -170,7 +170,7 @@ bool KServiceType::inherits( const TQString& servTypeName ) const return false; } -QVariant +TQVariant KServiceType::property( const TQString& _name ) const { TQVariant v; @@ -182,7 +182,7 @@ KServiceType::property( const TQString& _name ) const else if ( _name == "Comment" ) v = TQVariant( m_strComment ); else { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( _name ); if ( it != m_mapProps.end() ) v = it.data(); } @@ -190,7 +190,7 @@ KServiceType::property( const TQString& _name ) const return v; } -QStringList +TQStringList KServiceType::propertyNames() const { TQStringList res; @@ -209,13 +209,13 @@ KServiceType::propertyNames() const TQVariant::Type KServiceType::propertyDef( const TQString& _name ) const { - TQMap<TQString,TQVariant::Type>::ConstIterator it = m_mapPropDefs.find( _name ); + TQMap<TQString,TQVariant::Type>::ConstIterator it = m_mapPropDefs.tqfind( _name ); if ( it == m_mapPropDefs.end() ) return TQVariant::Invalid; return it.data(); } -QStringList +TQStringList KServiceType::propertyDefNames() const { TQStringList l; @@ -239,7 +239,7 @@ static void addUnique(KService::List &lst, TQDict<KService> &dict, const KServic for( ; it != newLst.end(); ++it ) { KService *service = static_cast<KService*>(*it); - if (dict.find(service->desktopEntryPath())) + if (dict.tqfind(service->desktopEntryPath())) continue; dict.insert(service->desktopEntryPath(), service); lst.append(service); diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp index 8287bca44..99a0ee349 100644 --- a/kio/kio/kservicetypefactory.cpp +++ b/kio/kio/kservicetypefactory.cpp @@ -39,7 +39,7 @@ KServiceTypeFactory::KServiceTypeFactory() if (m_str) { // Read Header - Q_INT32 i,n; + TQ_INT32 i,n; (*m_str) >> i; m_fastPatternOffset = i; (*m_str) >> i; @@ -102,7 +102,7 @@ TQVariant::Type KServiceTypeFactory::findPropertyTypeByName(const TQString &_nam assert (!KSycoca::self()->isBuilding()); - TQMapConstIterator<TQString,int> it = m_propertyTypeDict.find(_name); + TQMapConstIterator<TQString,int> it = m_propertyTypeDict.tqfind(_name); if (it != m_propertyTypeDict.end()) { return (TQVariant::Type)it.data(); } @@ -118,23 +118,23 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt // Get stream to the header TQDataStream *str = m_str; - str->device()->at( m_fastPatternOffset ); + str->tqdevice()->at( m_fastPatternOffset ); - Q_INT32 nrOfEntries; + TQ_INT32 nrOfEntries; (*str) >> nrOfEntries; - Q_INT32 entrySize; + TQ_INT32 entrySize; (*str) >> entrySize; - Q_INT32 fastOffset = str->device()->at( ); + TQ_INT32 fastOffset = str->tqdevice()->at( ); - Q_INT32 matchingOffset = 0; + TQ_INT32 matchingOffset = 0; // Let's go for a binary search in the "fast" pattern index - Q_INT32 left = 0; - Q_INT32 right = nrOfEntries - 1; - Q_INT32 middle; + TQ_INT32 left = 0; + TQ_INT32 right = nrOfEntries - 1; + TQ_INT32 middle; // Extract extension - int lastDot = _filename.findRev('.'); + int lastDot = _filename.tqfindRev('.'); int ext_len = _filename.length() - lastDot - 1; if (lastDot != -1 && ext_len <= 4) // if no '.', skip the extension lookup { @@ -145,7 +145,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt while (left <= right) { middle = (left + right) / 2; // read pattern at position "middle" - str->device()->at( middle * entrySize + fastOffset ); + str->tqdevice()->at( middle * entrySize + fastOffset ); KSycocaEntry::read(*str, pattern); int cmp = pattern.compare( extension ); if (cmp < 0) @@ -166,10 +166,10 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt // Now try the "other" Pattern table if ( m_patterns.isEmpty() ) { - str->device()->at( m_otherPatternOffset ); + str->tqdevice()->at( m_otherPatternOffset ); TQString pattern; - Q_INT32 mimetypeOffset; + TQ_INT32 mimetypeOffset; while (true) { @@ -186,7 +186,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt TQStringList::const_iterator it = m_patterns.begin(); TQStringList::const_iterator end = m_patterns.end(); - TQValueVector<Q_INT32>::const_iterator it_offset = m_pattern_offsets.begin(); + TQValueVector<TQ_INT32>::const_iterator it_offset = m_pattern_offsets.begin(); for ( ; it != end; ++it, ++it_offset ) { @@ -280,7 +280,7 @@ KServiceType * KServiceTypeFactory::createEntry(int offset) break; default: - kdError(7011) << TQString("KServiceTypeFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type) << endl; + kdError(7011) << TQString(TQString("KServiceTypeFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type)) << endl; break; } if (newEntry && !newEntry->isValid()) diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h index db64aa115..fd3c96a1a 100644 --- a/kio/kio/kservicetypefactory.h +++ b/kio/kio/kservicetypefactory.h @@ -113,7 +113,7 @@ protected: private: TQStringList m_patterns; - TQValueVector<Q_INT32> m_pattern_offsets; + TQValueVector<TQ_INT32> m_pattern_offsets; protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/kio/kio/kshellcompletion.cpp b/kio/kio/kshellcompletion.cpp index 2fb67a31f..bd3c43be7 100644 --- a/kio/kio/kshellcompletion.cpp +++ b/kio/kio/kshellcompletion.cpp @@ -217,22 +217,22 @@ bool KShellCompletion::quoteText(TQString *text, bool force, bool skip_last) con int pos = 0; if ( !force ) { - pos = text->find( m_word_break_char ); + pos = text->tqfind( m_word_break_char ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->find( m_quote_char1 ); + pos = text->tqfind( m_quote_char1 ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->find( m_quote_char2 ); + pos = text->tqfind( m_quote_char2 ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->find( m_escape_char ); + pos = text->tqfind( m_escape_char ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } diff --git a/kio/kio/ktar.cpp b/kio/kio/ktar.cpp index 0b77fff52..6c8227d3e 100644 --- a/kio/kio/ktar.cpp +++ b/kio/kio/ktar.cpp @@ -129,7 +129,7 @@ void KTar::prepareDevice( const TQString & filename, const TQString & mimetype, bool /*forced*/ ) { if( "application/x-tar" == mimetype ) - setDevice( new TQFile( filename ) ); + setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); else { // The compression filters are very slow with random access. @@ -149,7 +149,7 @@ void KTar::prepareDevice( const TQString & filename, // the device must be closed, however, for KArchive.setDevice() TQFile* file = d->tmpFile->file(); file->close(); - setDevice(file); + setDevice(TQT_TQIODEVICE(file)); } } @@ -185,9 +185,9 @@ void KTar::setOrigFileName( const TQCString & fileName ) d->origFileName = fileName; } -Q_LONG KTar::readRawHeader(char *buffer) { +TQ_LONG KTar::readRawHeader(char *buffer) { // Read header - Q_LONG n = device()->readBlock( buffer, 0x200 ); + TQ_LONG n = device()->readBlock( buffer, 0x200 ); if ( n == 0x200 && buffer[0] != 0 ) { // Make sure this is actually a tar header if (strncmp(buffer + 257, "ustar", 5)) { @@ -223,7 +223,7 @@ Q_LONG KTar::readRawHeader(char *buffer) { } bool KTar::readLonglink(char *buffer,TQCString &longlink) { - Q_LONG n = 0; + TQ_LONG n = 0; TQIODevice *dev = device(); // read size of longlink from size field in header // size is in bytes including the trailing null (which we ignore) @@ -252,11 +252,11 @@ bool KTar::readLonglink(char *buffer,TQCString &longlink) { return true; } -Q_LONG KTar::readHeader(char *buffer,TQString &name,TQString &symlink) { +TQ_LONG KTar::readHeader(char *buffer,TQString &name,TQString &symlink) { name.truncate(0); symlink.truncate(0); while (true) { - Q_LONG n = readRawHeader(buffer); + TQ_LONG n = readRawHeader(buffer); if (n != 0x200) return n; // is it a longlink? @@ -320,7 +320,7 @@ bool KTar::KTarPrivate::fillTempFile( const TQString & filename) { delete filterDev; return false; } - Q_LONG len = -1; + TQ_LONG len = -1; while ( !filterDev->atEnd() && len != 0) { len = filterDev->readBlock(buffer.data(),buffer.size()); if ( len < 0 ) { // corrupted archive @@ -372,7 +372,7 @@ bool KTar::openArchive( int mode ) TQString symlink; // Read header - Q_LONG n = readHeader(buffer,name,symlink); + TQ_LONG n = readHeader(buffer,name,symlink); if (n < 0) return false; if (n == 0x200) { @@ -385,7 +385,7 @@ bool KTar::openArchive( int mode ) name = name.left( name.length() - 1 ); } - int pos = name.findRev( '/' ); + int pos = name.tqfindRev( '/' ); if ( pos == -1 ) nm = name; else @@ -534,7 +534,7 @@ bool KTar::KTarPrivate::writeBackTempFile( const TQString & filename ) { if ( forced ) static_cast<KFilterDev *>(dev)->setOrigFileName( origFileName ); TQByteArray buffer(8*1024); - Q_LONG len; + TQ_LONG len; while ( ! file->atEnd()) { len = file->readBlock(buffer.data(),buffer.size()); dev->writeBlock(buffer.data(),len); @@ -633,7 +633,7 @@ bool KTar::prepareWriting( const TQString& name, const TQString& user, const TQS bool KTar::doneWriting( uint size ) { - // Write alignment + // Write tqalignment int rest = size % 0x200; if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at() + (rest ? 0x200 - rest : 0); // Record our new end of archive @@ -642,7 +642,7 @@ bool KTar::doneWriting( uint size ) char buffer[ 0x201 ]; for( uint i = 0; i < 0x200; ++i ) buffer[i] = 0; - Q_LONG nwritten = device()->writeBlock( buffer, 0x200 - rest ); + TQ_LONG nwritten = device()->writeBlock( buffer, 0x200 - rest ); return nwritten == 0x200 - rest; } return true; @@ -853,7 +853,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, if ( dirName.right(1) != "/" ) dirName += "/"; - if ( d->dirList.contains( dirName ) ) + if ( d->dirList.tqcontains( dirName ) ) return true; // already there char buffer[ 0x201 ]; diff --git a/kio/kio/ktar.h b/kio/kio/ktar.h index 95c52a32c..67f004a39 100644 --- a/kio/kio/ktar.h +++ b/kio/kio/ktar.h @@ -139,9 +139,9 @@ private: void writeLonglink(char *buffer, const TQCString &name, char typeflag, const char *uname, const char *gname); - Q_LONG readRawHeader(char *buffer); + TQ_LONG readRawHeader(char *buffer); bool readLonglink(char *buffer,TQCString &longlink); - Q_LONG readHeader(char *buffer,TQString &name,TQString &symlink); + TQ_LONG readHeader(char *buffer,TQString &name,TQString &symlink); TQString m_filename; protected: diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h index e5bb734e6..4b2690dc7 100644 --- a/kio/kio/ktrader.h +++ b/kio/kio/ktrader.h @@ -82,7 +82,7 @@ * applications or components. * @author Torben Weis <weis@kde.org> */ -class KIO_EXPORT KTrader : public QObject +class KIO_EXPORT KTrader : public TQObject { Q_OBJECT public: diff --git a/kio/kio/ktraderparsetree.cpp b/kio/kio/ktraderparsetree.cpp index 711ec5356..969599db6 100644 --- a/kio/kio/ktraderparsetree.cpp +++ b/kio/kio/ktraderparsetree.cpp @@ -415,7 +415,7 @@ bool ParseTreeMATCH::eval( ParseContext *_context ) const if ( c1.type != ParseContext::T_STRING || c2.type != ParseContext::T_STRING ) return false; - _context->b = ( c2.str.find( c1.str ) != -1 ); + _context->b = ( c2.str.tqfind( c1.str ) != -1 ); return true; } @@ -465,7 +465,7 @@ bool ParseTreeIN::eval( ParseContext *_context ) const if ( c1.type == ParseContext::T_STRING && c2.type == ParseContext::T_STR_SEQ ) { - _context->b = ( c2.strSeq.find( c1.str ) != c2.strSeq.end() ); + _context->b = ( c2.strSeq.tqfind( c1.str ) != c2.strSeq.end() ); return true; } @@ -535,7 +535,7 @@ bool ParseTreeMIN2::eval( ParseContext *_context ) const if ( !_context->initMaxima( m_strId ) ) return false; - TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.find( m_strId ); + TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.tqfind( m_strId ); if ( it == _context->maxima.end() ) return false; @@ -568,7 +568,7 @@ bool ParseTreeMAX2::eval( ParseContext *_context ) const return false; // Find extrema - TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.find( m_strId ); + TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.tqfind( m_strId ); if ( it == _context->maxima.end() ) return false; @@ -651,7 +651,7 @@ bool ParseContext::initMaxima( const TQString& _prop ) return false; // Did we cache the result ? - TQMap<TQString,PreferencesMaxima>::Iterator it = maxima.find( _prop ); + TQMap<TQString,PreferencesMaxima>::Iterator it = maxima.tqfind( _prop ); if ( it != maxima.end() ) return ( it.data().type == PreferencesMaxima::PM_DOUBLE || it.data().type == PreferencesMaxima::PM_INT ); diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp index 2c4c5b12e..e4b885ce5 100644 --- a/kio/kio/kurifilter.cpp +++ b/kio/kio/kurifilter.cpp @@ -35,7 +35,7 @@ template class TQPtrList<KURIFilterPlugin>; KURIFilterPlugin::KURIFilterPlugin( TQObject *parent, const char *name, double pri ) :TQObject( parent, name ) { - m_strName = TQString::fromLatin1( name ); + m_strName = TQString::tqfromLatin1( name ); m_dblPriority = pri; } @@ -171,32 +171,32 @@ TQString KURIFilterData::iconName() case KURIFilterData::EXECUTABLE: { TQString exeName = m_pURI.url(); - exeName = exeName.mid( exeName.findRev( '/' ) + 1 ); // strip path if given + exeName = exeName.mid( exeName.tqfindRev( '/' ) + 1 ); // strip path if given KService::Ptr service = KService::serviceByDesktopName( exeName ); - if (service && service->icon() != TQString::fromLatin1( "unknown" )) + if (service && service->icon() != TQString::tqfromLatin1( "unknown" )) m_strIconName = service->icon(); // Try to find an icon with the same name as the binary (useful for non-kde apps) else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) m_strIconName = exeName; else // not found, use default - m_strIconName = TQString::fromLatin1("exec"); + m_strIconName = TQString::tqfromLatin1("exec"); break; } case KURIFilterData::HELP: { - m_strIconName = TQString::fromLatin1("khelpcenter"); + m_strIconName = TQString::tqfromLatin1("khelpcenter"); break; } case KURIFilterData::SHELL: { - m_strIconName = TQString::fromLatin1("konsole"); + m_strIconName = TQString::tqfromLatin1("konsole"); break; } case KURIFilterData::ERROR: case KURIFilterData::BLOCKED: { - m_strIconName = TQString::fromLatin1("error"); + m_strIconName = TQString::tqfromLatin1("error"); break; } default: diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h index 0960c1419..2cd999582 100644 --- a/kio/kio/kurifilter.h +++ b/kio/kio/kurifilter.h @@ -347,9 +347,10 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public QObject +class KIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT + TQ_OBJECT public: diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 88a566b5f..339f6c351 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -80,7 +80,7 @@ class CompletionThread; * matches from an asyncrynous lookup. */ -class CompletionMatchEvent : public QCustomEvent +class CompletionMatchEvent : public TQCustomEvent { public: CompletionMatchEvent( CompletionThread *thread ) : @@ -95,7 +95,7 @@ private: CompletionThread *m_completionThread; }; -class CompletionThread : public QThread +class CompletionThread : public TQThread { protected: CompletionThread( KURLCompletion *receiver ) : @@ -786,7 +786,7 @@ bool KURLCompletion::envCompletion(const MyURL &url, TQString *match) while ( *env ) { TQString s = TQString::fromLocal8Bit( *env ); - int pos = s.find('='); + int pos = s.tqfind('='); if ( pos == -1 ) pos = s.length(); @@ -1407,7 +1407,7 @@ static bool expandEnv( TQString &text ) bool expanded = false; - while ( (pos = text.find('$', pos)) != -1 ) { + while ( (pos = text.tqfind('$', pos)) != -1 ) { // Skip escaped '$' // @@ -1419,8 +1419,8 @@ static bool expandEnv( TQString &text ) else { // Find the end of the variable = next '/' or ' ' // - int pos2 = text.find( ' ', pos+1 ); - int pos_tmp = text.find( '/', pos+1 ); + int pos2 = text.tqfind( ' ', pos+1 ); + int pos_tmp = text.tqfind( '/', pos+1 ); if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) pos2 = pos_tmp; @@ -1467,8 +1467,8 @@ static bool expandTilde(TQString &text) // Find the end of the user name = next '/' or ' ' // - int pos2 = text.find( ' ', 1 ); - int pos_tmp = text.find( '/', 1 ); + int pos2 = text.tqfind( ' ', 1 ); + int pos_tmp = text.tqfind( '/', 1 ); if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) pos2 = pos_tmp; diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index b7ef68c76..8fddf763d 100644 --- a/kio/kio/kuserprofile.cpp +++ b/kio/kio/kuserprofile.cpp @@ -165,7 +165,7 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers( const TQString& _ser if (_genericServiceType.isEmpty() /*no constraint*/ || (*it)->hasServiceType( _genericServiceType )) { // Check that we don't already have it ;) - if ( serviceList.find( (*it)->desktopEntryPath() ) == serviceList.end() ) + if ( serviceList.tqfind( (*it)->desktopEntryPath() ) == serviceList.end() ) { bool allow = (*it)->allowAsDefault(); KServiceOffer o( (*it), (*it)->initialPreferenceForMimeType(_servicetype), allow ); @@ -215,7 +215,7 @@ int KServiceTypeProfile::preference( const TQString& _service ) const KService::Ptr service = KService::serviceByName( _service ); if (!service) return 0; - TQMap<TQString,Service>::ConstIterator it = m_mapServices.find( service->storageId() ); + TQMap<TQString,Service>::ConstIterator it = m_mapServices.tqfind( service->storageId() ); if ( it == m_mapServices.end() ) return 0; @@ -233,7 +233,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const return false; // Look what the user says ... - TQMap<TQString,Service>::ConstIterator it = m_mapServices.find( service->storageId() ); + TQMap<TQString,Service>::ConstIterator it = m_mapServices.tqfind( service->storageId() ); if ( it == m_mapServices.end() ) return 0; @@ -270,7 +270,7 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers() const if ( m_strGenericServiceType.isEmpty() || (*it)->hasServiceType( m_strGenericServiceType ) ) { // Now look into the profile, to find this service's preference. - TQMap<TQString,Service>::ConstIterator it2 = m_mapServices.find( (*it)->storageId() ); + TQMap<TQString,Service>::ConstIterator it2 = m_mapServices.tqfind( (*it)->storageId() ); if( it2 != m_mapServices.end() ) { diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp index 6f29bb264..1e1dd6241 100644 --- a/kio/kio/kzip.cpp +++ b/kio/kio/kzip.cpp @@ -60,7 +60,7 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer) { if ( dt.isValid() ) { - const Q_UINT16 time = + const TQ_UINT16 time = ( dt.time().hour() << 11 ) // 5 bit hour | ( dt.time().minute() << 5 ) // 6 bit minute | ( dt.time().second() >> 1 ); // 5 bit double seconds @@ -68,7 +68,7 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer) buffer[0] = char(time); buffer[1] = char(time >> 8); - const Q_UINT16 date = + const TQ_UINT16 date = ( ( dt.date().year() - 1980 ) << 9 ) // 7 bit year 1980-based | ( dt.date().month() << 5 ) // 4 bit month | ( dt.date().day() ); // 5 bit day @@ -87,13 +87,13 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer) static time_t transformFromMsDos(const char* buffer) { - Q_UINT16 time = (uchar)buffer[0] | ( (uchar)buffer[1] << 8 ); + TQ_UINT16 time = (uchar)buffer[0] | ( (uchar)buffer[1] << 8 ); int h = time >> 11; int m = ( time & 0x7ff ) >> 5; int s = ( time & 0x1f ) * 2 ; TQTime qt(h, m, s); - Q_UINT16 date = (uchar)buffer[2] | ( (uchar)buffer[3] << 8 ); + TQ_UINT16 date = (uchar)buffer[2] | ( (uchar)buffer[3] << 8 ); int y = ( date >> 9 ) + 1980; int o = ( date & 0x1ff ) >> 5; int d = ( date & 0x1f ); @@ -385,7 +385,7 @@ bool KZip::openArchive( int mode ) return false; } Q_ASSERT( d->m_saveFile->file() ); - setDevice( d->m_saveFile->file() ); + setDevice( TQT_TQIODEVICE(d->m_saveFile->file()) ); } return true; case IO_ReadOnly: @@ -393,8 +393,8 @@ bool KZip::openArchive( int mode ) { // ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact. if ( !m_filename.isEmpty() ) { - setDevice( new TQFile( m_filename ) ); - if ( !device()->open( mode ) ) + setDevice( TQT_TQIODEVICE(new TQFile( m_filename )) ); + if ( !device()->tqopen( mode ) ) return false; } break; // continued below @@ -462,9 +462,9 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; int compression_mode = (uchar)buffer[2] | (uchar)buffer[3] << 8; time_t mtime = transformFromMsDos( buffer+4 ); - Q_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8 + TQ_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8 | (uchar)buffer[14] << 16 | (uchar)buffer[15] << 24; - Q_LONG uncomp_size = (uchar)buffer[16] | (uchar)buffer[17] << 8 + TQ_LONG uncomp_size = (uchar)buffer[16] | (uchar)buffer[17] << 8 | (uchar)buffer[18] << 16 | (uchar)buffer[19] << 24; int namelen = (uchar)buffer[20] | (uchar)buffer[21] << 8; int extralen = (uchar)buffer[22] | (uchar)buffer[23] << 8; @@ -578,7 +578,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; } } else { - if ( compr_size > (Q_LONG)dev->size() ) + if ( compr_size > (TQ_LONG)dev->size() ) { // here we cannot trust the compressed size, so scan through the compressed // data to find the next header @@ -736,7 +736,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; else Q_ASSERT(access & S_IFDIR); } - int pos = name.findRev( '/' ); + int pos = name.tqfindRev( '/' ); if ( pos == -1 ) entryName = name; else @@ -871,9 +871,9 @@ bool KZip::closeArchive() char buffer[ 22 ]; // first used for 12, then for 22 at the end uLong crc = crc32(0L, Z_NULL, 0); - Q_LONG centraldiroffset = device()->at(); + TQ_LONG centraldiroffset = device()->at(); //kdDebug(7040) << "closearchive: centraldiroffset: " << centraldiroffset << endl; - Q_LONG atbackup = centraldiroffset; + TQ_LONG atbackup = centraldiroffset; TQPtrListIterator<KZipFileEntry> it( d->m_fileList ); for ( ; it.current() ; ++it ) @@ -994,7 +994,7 @@ bool KZip::closeArchive() if ( !ok ) return false; } - Q_LONG centraldirendoffset = device()->at(); + TQ_LONG centraldirendoffset = device()->at(); //kdDebug(7040) << "closearchive: centraldirendoffset: " << centraldirendoffset << endl; //kdDebug(7040) << "closearchive: device()->at(): " << device()->at() << endl; @@ -1133,7 +1133,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, // Find or create parent dir KArchiveDirectory* parentDir = rootDir(); TQString fileName( name ); - int i = name.findRev( '/' ); + int i = name.tqfindRev( '/' ); if ( i != -1 ) { TQString dir = name.left( i ); @@ -1383,9 +1383,9 @@ bool KZip::writeData_impl(const char * c, uint i) // and they didn't mention it in their docs... d->m_crc = crc32(d->m_crc, (const Bytef *) c , i); - Q_LONG written = d->m_currentDev->writeBlock( c, i ); + TQ_LONG written = d->m_currentDev->writeBlock( c, i ); //kdDebug(7040) << "KZip::writeData wrote " << i << " bytes." << endl; - bool ok = written == (Q_LONG)i; + bool ok = written == (TQ_LONG)i; if ( !ok ) abort(); return ok; diff --git a/kio/kio/kzip.h b/kio/kio/kzip.h index 291f827f8..26bfc71d3 100644 --- a/kio/kio/kzip.h +++ b/kio/kio/kzip.h @@ -230,8 +230,8 @@ public: {}*/ KZipFileEntry( KZip* zip, const TQString& name, int access, int date, const TQString& user, const TQString& group, const TQString& symlink, - const TQString& path, Q_LONG start, Q_LONG uncompressedSize, - int encoding, Q_LONG compressedSize) : + const TQString& path, TQ_LONG start, TQ_LONG uncompressedSize, + int encoding, TQ_LONG compressedSize) : KArchiveFile( zip, name, access, date, user, group, symlink, start, uncompressedSize ), m_crc(0), @@ -241,14 +241,14 @@ public: m_path( path ) {} int encoding() const { return m_encoding; } - Q_LONG compressedSize() const { return m_compressedSize; } + TQ_LONG compressedSize() const { return m_compressedSize; } /// Only used when writing - void setCompressedSize(Q_LONG compressedSize) { m_compressedSize = compressedSize; } + void setCompressedSize(TQ_LONG compressedSize) { m_compressedSize = compressedSize; } /// Header start: only used when writing - void setHeaderStart(Q_LONG headerstart) { m_headerStart = headerstart; } - Q_LONG headerStart() const {return m_headerStart; } + void setHeaderStart(TQ_LONG headerstart) { m_headerStart = headerstart; } + TQ_LONG headerStart() const {return m_headerStart; } /// CRC: only used when writing unsigned long crc32() const { return m_crc; } @@ -274,8 +274,8 @@ public: private: unsigned long m_crc; - Q_LONG m_compressedSize; - Q_LONG m_headerStart; + TQ_LONG m_compressedSize; + TQ_LONG m_headerStart; int m_encoding; TQString m_path; // KDE4: d pointer or at least some int for future extensions diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 3998584e3..28bc23633 100644 --- a/kio/kio/metainfojob.cpp +++ b/kio/kio/metainfojob.cpp @@ -86,7 +86,7 @@ void MetaInfoJob::removeItem(const KFileItem* item) determineNextFile(); } - d->items.remove(d->items.find(item)); + d->items.remove(d->items.tqfind(item)); } void MetaInfoJob::determineNextFile() diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp index 5189b93d6..975a42c10 100644 --- a/kio/kio/netaccess.cpp +++ b/kio/kio/netaccess.cpp @@ -293,7 +293,7 @@ void NetAccess::removeTempFile(const TQString& name) { if (!tmpfiles) return; - if (tmpfiles->contains(name)) + if (tmpfiles->tqcontains(name)) { unlink(TQFile::encodeName(name)); tmpfiles->remove(name); @@ -373,7 +373,7 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions, TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window ) { bJobOK = true; // success unless further error occurs - m_mimetype = TQString::fromLatin1("unknown"); + m_mimetype = TQString::tqfromLatin1("unknown"); KIO::Job * job = KIO::mimetype( url ); job->setWindow (window); connect( job, TQT_SIGNAL( result (KIO::Job *) ), @@ -403,7 +403,7 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman remoteTempFileName = tmpFile.name(); // only need the filename KTempFile adds some KDE specific dirs // that probably does not exist on the remote side - int pos = remoteTempFileName.findRev('/'); + int pos = remoteTempFileName.tqfindRev('/'); remoteTempFileName = "/tmp/fishexec_" + remoteTempFileName.mid(pos + 1); tempPathUrl.setPath( remoteTempFileName ); bJobOK = true; // success unless further error occurs @@ -462,16 +462,16 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* connect( job, TQT_SIGNAL( result (KIO::Job *) ), this, TQT_SLOT( slotResult (KIO::Job *) ) ); - TQMetaObject *meta = job->metaObject(); + TQMetaObject *meta = job->tqmetaObject(); static const char dataSignal[] = "data(KIO::Job*,const TQByteArray&)"; - if ( meta->findSignal( dataSignal ) != -1 ) { + if ( meta->tqfindSignal( dataSignal ) != -1 ) { connect( job, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)), this, TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) ); } static const char redirSignal[] = "redirection(KIO::Job*,const KURL&)"; - if ( meta->findSignal( redirSignal ) != -1 ) { + if ( meta->tqfindSignal( redirSignal ) != -1 ) { connect( job, TQT_SIGNAL(redirection(KIO::Job*,const KURL&)), this, TQT_SLOT(slotRedirection(KIO::Job*, const KURL&)) ); } @@ -492,10 +492,10 @@ void qt_leave_modal( TQWidget *widget ); void NetAccess::enter_loop() { - TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQWidget::NoFocus ); + TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); + dummy.setFocusPolicy( TQ_NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } @@ -515,7 +515,7 @@ void NetAccess::slotResult( KIO::Job * job ) if ( m_metaData ) *m_metaData = job->metaData(); - qApp->exit_loop(); + tqApp->exit_loop(); } void NetAccess::slotData( KIO::Job*, const TQByteArray& data ) diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h index caeb7b985..3fb9103af 100644 --- a/kio/kio/netaccess.h +++ b/kio/kio/netaccess.h @@ -56,7 +56,7 @@ namespace KIO { * * @short Provides an easy, synchronous interface to KIO file operations. */ -class KIO_EXPORT NetAccess : public QObject +class KIO_EXPORT NetAccess : public TQObject { Q_OBJECT @@ -92,7 +92,7 @@ public: * } * \endcode * - * Of course, your user interface will still process exposure/repaint + * Of course, your user interface will still process exposure/tqrepaint * events during the download. * * If the download fails, lastError() and lastErrorString() will be set. diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index 83434906b..1670e83bb 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -87,12 +87,12 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, { lbl = new TQLabel( main ); lbl->setPixmap( pix ); - lbl->setAlignment( Qt::AlignLeft|Qt::AlignVCenter ); - lbl->setFixedSize( lbl->sizeHint() ); + lbl->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter ); + lbl->setFixedSize( lbl->tqsizeHint() ); d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft ); } d->prompt = new TQLabel( main ); - d->prompt->setAlignment( Qt::AlignLeft|Qt::AlignVCenter|Qt::WordBreak ); + d->prompt->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter|TQt::WordBreak ); d->layout->addWidget( d->prompt, 0, 2, Qt::AlignLeft ); if ( prompt.isEmpty() ) setPrompt( i18n( "You need to supply a username and a password" ) ); @@ -106,12 +106,12 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 4: Username field d->userNameLabel = new TQLabel( i18n("&Username:"), main ); - d->userNameLabel->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); - d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() ); + d->userNameLabel->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + d->userNameLabel->setFixedSize( d->userNameLabel->tqsizeHint() ); d->userNameHBox = new TQHBox( main ); d->userEdit = new KLineEdit( d->userNameHBox ); - TQSize s = d->userEdit->sizeHint(); + TQSize s = d->userEdit->tqsizeHint(); d->userEdit->setFixedHeight( s.height() ); d->userEdit->setMinimumWidth( s.width() ); d->userNameLabel->setBuddy( d->userEdit ); @@ -123,15 +123,15 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 6: Password field lbl = new TQLabel( i18n("&Password:"), main ); - lbl->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); - lbl->setFixedSize( lbl->sizeHint() ); + lbl->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + lbl->setFixedSize( lbl->tqsizeHint() ); TQHBox* hbox = new TQHBox( main ); d->passEdit = new KLineEdit( hbox ); if ( cfg->readEntry("EchoMode", "OneStar") == "NoEcho" ) d->passEdit->setEchoMode( TQLineEdit::NoEcho ); else d->passEdit->setEchoMode( TQLineEdit::Password ); - s = d->passEdit->sizeHint(); + s = d->passEdit->tqsizeHint(); d->passEdit->setFixedHeight( s.height() ); d->passEdit->setMinimumWidth( s.width() ); lbl->setBuddy( d->passEdit ); @@ -145,7 +145,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 8: Keep Password hbox = new TQHBox( main ); d->keepCheckBox = new TQCheckBox( i18n("&Keep password"), hbox ); - d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() ); + d->keepCheckBox->setFixedSize( d->keepCheckBox->tqsizeHint() ); d->keep = cfg->readBoolEntry("Keep", false ); d->keepCheckBox->setChecked( d->keep ); connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); @@ -165,7 +165,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->userEdit->setFocus(); d->userEditCombo = 0; -// setFixedSize( sizeHint() ); +// setFixedSize( tqsizeHint() ); } TQString PasswordDialog::username() const @@ -198,7 +198,7 @@ static void calculateLabelSize(TQLabel *label) // Calculate a proper size for the text. { TQSimpleRichText rt(qt_text, label->font()); - TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget()); + TQRect d = KGlobalSettings::desktopGeometry(label->tqtopLevelWidget()); pref_width = d.width() / 4; rt.setWidth(pref_width-10); @@ -239,11 +239,11 @@ void PasswordDialog::addCommentLine( const TQString& label, TQWidget *main = mainWidget(); TQLabel* lbl = new TQLabel( label, main); - lbl->setAlignment( Qt::AlignVCenter|Qt::AlignRight ); - lbl->setFixedSize( lbl->sizeHint() ); + lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignRight ); + lbl->setFixedSize( lbl->tqsizeHint() ); d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); lbl = new TQLabel( comment, main); - lbl->setAlignment( Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak ); + lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak ); calculateLabelSize(lbl); d->layout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft ); d->layout->addRowSpacing( 3, 10 ); // Add a spacer @@ -304,7 +304,7 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin delete d->userEdit; d->userEditCombo = new KComboBox( true, d->userNameHBox ); d->userEdit = d->userEditCombo->lineEdit(); - TQSize s = d->userEditCombo->sizeHint(); + TQSize s = d->userEditCombo->tqsizeHint(); d->userEditCombo->setFixedHeight( s.height() ); d->userEditCombo->setMinimumWidth( s.width() ); d->userNameLabel->setBuddy( d->userEditCombo ); @@ -321,7 +321,7 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin void PasswordDialog::slotActivated( const TQString& userName ) { - TQMap<TQString, TQString>::ConstIterator it = d->knownLogins.find( userName ); + TQMap<TQString, TQString>::ConstIterator it = d->knownLogins.tqfind( userName ); if ( it != d->knownLogins.end() ) setPassword( it.data() ); } diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp index 399350236..37ba406f6 100644 --- a/kio/kio/paste.cpp +++ b/kio/kio/paste.cpp @@ -105,7 +105,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, const TQCString& fmt = formats[i]; KMimeType::Ptr mime = KMimeType::mimeType( fmt ); if ( mime != KMimeType::defaultMimeTypePtr() ) - formatLabels.append( i18n( "%1 (%2)" ).arg( mime->comment() ).arg( fmt ) ); + formatLabels.append( i18n( "%1 (%2)" ).arg( mime->comment() ).arg( fmt.data() ) ); else formatLabels.append( fmt ); } @@ -135,9 +135,9 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, // if "data" came from QClipboard, then it was deleted already - by a nice 0-seconds timer // In that case, get it again. Let's hope the user didn't copy something else meanwhile :/ if ( clipboard ) { - data = TQApplication::clipboard()->data(); + data = TQApplication::tqclipboard()->data(); } - const TQByteArray ba = data->encodedData( chosenFormat ); + const TQByteArray ba = data->tqencodedData( chosenFormat ); return pasteDataAsyncTo( new_url, ba ); } #endif @@ -146,13 +146,13 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, KIO_EXPORT bool KIO::isClipboardEmpty() { #ifndef QT_NO_MIMECLIPBOARD - TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "text/uri-list" ) && data->encodedData( "text/uri-list" ).size() > 0 ) + TQMimeSource *data = TQApplication::tqclipboard()->data(); + if ( data->provides( "text/uri-list" ) && data->tqencodedData( "text/uri-list" ).size() > 0 ) return false; #else // Happens with some versions of Qt Embedded... :/ // Guess. - TQString data = TQApplication::clipboard()->text(); + TQString data = TQApplication::tqclipboard()->text(); if(data.contains("://")) return false; #endif @@ -194,7 +194,7 @@ KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url, if ( formats.size() > 1 ) { return chooseAndPaste( dest_url, data, formats, dialogText, widget, clipboard ); } - ba = data->encodedData( formats.first() ); + ba = data->tqencodedData( formats.first() ); } if ( ba.size() == 0 ) { @@ -215,7 +215,7 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move ) } #ifndef QT_NO_MIMECLIPBOARD - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); // First check for URLs. KURL::List urls; @@ -233,14 +233,14 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move ) // If moving, erase the clipboard contents, the original files don't exist anymore if ( move ) - TQApplication::clipboard()->clear(); + TQApplication::tqclipboard()->clear(); return res; } return pasteMimeSource( data, dest_url, TQString::null, 0 /*TODO parent widget*/, true /*clipboard*/ ); #else TQByteArray ba; TQTextStream txtStream( ba, IO_WriteOnly ); - TQStringList data = TQStringList::split("\n", TQApplication::clipboard()->text()); + TQStringList data = TQStringList::split("\n", TQApplication::tqclipboard()->text()); KURL::List urls; KURLDrag::decode(data, urls); TQStringList::Iterator end(data.end()); @@ -290,7 +290,7 @@ KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& KIO_EXPORT TQString KIO::pasteActionText() { - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); KURL::List urls; if ( KURLDrag::canDecode( data ) && KURLDrag::decode( data, urls ) ) { if ( urls.isEmpty() ) diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index 3802093c1..34735c26d 100644 --- a/kio/kio/previewjob.cpp +++ b/kio/kio/previewjob.cpp @@ -96,7 +96,7 @@ struct KIO::PreviewJobPrivate // If the file to create a thumb for was a temp file, this is its name TQString tempName; // Over that, it's too much - unsigned long maximumSize; + unsigned long tqmaximumSize; // the size for the icon overlay int iconSize; // the transparency of the blended mimetype icon @@ -163,7 +163,7 @@ void PreviewJob::startPreview() TQMap<TQString, KService::Ptr> mimeMap; for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - if (!d->enabledPlugins || d->enabledPlugins->contains((*it)->desktopEntryName())) + if (!d->enabledPlugins || d->enabledPlugins->tqcontains((*it)->desktopEntryName())) { TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) @@ -176,7 +176,7 @@ void PreviewJob::startPreview() { PreviewItem item; item.item = it.current(); - TQMap<TQString, KService::Ptr>::ConstIterator plugin = mimeMap.find(it.current()->mimetype()); + TQMap<TQString, KService::Ptr>::ConstIterator plugin = mimeMap.tqfind(it.current()->mimetype()); if (plugin == mimeMap.end() && (it.current()->mimetype() != "application/x-desktop") && (it.current()->mimetype() != "media/builtin-mydocuments") @@ -187,7 +187,7 @@ void PreviewJob::startPreview() && (it.current()->mimetype() != "media/builtin-webbrowser")) { TQString mimeType = it.current()->mimetype(); - plugin = mimeMap.find(mimeType.replace(TQRegExp("/.*"), "/*")); + plugin = mimeMap.tqfind(mimeType.replace(TQRegExp("/.*"), "/*")); if (plugin == mimeMap.end()) { @@ -196,7 +196,7 @@ void PreviewJob::startPreview() TQString parentMimeType = mimeInfo->parentMimeType(); while (!parentMimeType.isEmpty()) { - plugin = mimeMap.find(parentMimeType); + plugin = mimeMap.tqfind(parentMimeType); if (plugin != mimeMap.end()) break; KMimeType::Ptr parentMimeInfo = KMimeType::mimeType(parentMimeType); @@ -215,10 +215,10 @@ void PreviewJob::startPreview() { if (textProperty.toBool()) { - plugin = mimeMap.find("text/plain"); + plugin = mimeMap.tqfind("text/plain"); if (plugin == mimeMap.end()) { - plugin = mimeMap.find( "text/*" ); + plugin = mimeMap.tqfind( "text/*" ); } } } @@ -246,7 +246,7 @@ void PreviewJob::startPreview() // Read configuration value for the maximum allowed size KConfig * config = KGlobal::config(); KConfigGroupSaver cgs( config, "PreviewSettings" ); - d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); + d->tqmaximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); if (bNeedCache) { @@ -339,7 +339,7 @@ void PreviewJob::slotResult( KIO::Job *job ) } else if ( (*it).m_uds == KIO::UDS_SIZE ) { - if ( filesize_t((*it).m_long) > d->maximumSize && + if ( filesize_t((*it).m_long) > d->tqmaximumSize && !d->ignoreMaximumSize && !d->currentItem.plugin->property("IgnoreMaximumSize").toBool() ) { @@ -405,7 +405,7 @@ bool PreviewJob::statResultThumbnail() else d->origName = url.url(); #endif - KMD5 md5( TQFile::encodeName( d->origName ) ); + KMD5 md5( TQFile::encodeName( d->origName ).data() ); d->thumbName = TQFile::encodeName( md5.hexDigest() ) + ".png"; TQImage thumb; @@ -533,9 +533,9 @@ void PreviewJob::emitPreview(const TQImage &thumb) double imgRatio = (double)thumb.height() / (double)thumb.width(); if (imgRatio > (double)d->height / (double)d->width) pix.convertFromImage( - thumb.smoothScale((int)QMAX((double)d->height / imgRatio, 1), d->height)); + thumb.smoothScale((int)TQMAX((double)d->height / imgRatio, 1), d->height)); else pix.convertFromImage( - thumb.smoothScale(d->width, (int)QMAX((double)d->width * imgRatio, 1))); + thumb.smoothScale(d->width, (int)TQMAX((double)d->width * imgRatio, 1))); } else pix.convertFromImage(thumb); emit gotPreview(d->currentItem.item, pix); @@ -553,7 +553,7 @@ TQStringList PreviewJob::availablePlugins() TQStringList result; KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - if (!result.contains((*it)->desktopEntryName())) + if (!result.tqcontains((*it)->desktopEntryName())) result.append((*it)->desktopEntryName()); return result; } diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index fe830b2e3..2cc928692 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -194,12 +194,12 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, lib->unload(); continue; } - TQObject *obj = factory->create( this, (*it)->name().latin1() ); + TQObject *obj = factory->create( TQT_TQOBJECT(this), (*it)->name().latin1() ); if(!obj) { lib->unload(); continue; } - RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(obj); + RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(TQT_TQWIDGET(obj)); if(!plugin ){ delete obj; continue; @@ -223,7 +223,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, // No plugin found, build default dialog TQGridLayout * gridLayout = new TQGridLayout( 0L, 9, 2, KDialog::marginHint(), KDialog::spacingHint() ); - pLayout->addLayout(gridLayout); + pLayout->addLayout(TQT_TQLAYOUT(gridLayout)); gridLayout->setColStretch(0,0); gridLayout->setColStretch(1,10); @@ -380,7 +380,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, d->bCancel->setDefault( true ); layout->addWidget( d->bCancel ); - resize( sizeHint() ); + resize( tqsizeHint() ); } RenameDlg::~RenameDlg() @@ -440,13 +440,13 @@ TQString RenameDlg::suggestName(const KURL& baseURL, const TQString& oldName) TQString dotSuffix, suggestedName; TQString basename = oldName; - int index = basename.find( '.' ); + int index = basename.tqfind( '.' ); if ( index != -1 ) { dotSuffix = basename.mid( index ); basename.truncate( index ); } - int pos = basename.findRev( '_' ); + int pos = basename.tqfindRev( '_' ); if(pos != -1 ){ TQString tmp = basename.mid( pos+1 ); bool ok; diff --git a/kio/kio/renamedlg.h b/kio/kio/renamedlg.h index a1b5d6bb2..373abf446 100644 --- a/kio/kio/renamedlg.h +++ b/kio/kio/renamedlg.h @@ -45,7 +45,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW * @short A dialog for renaming files. * @since 3.1 */ -class KIO_EXPORT RenameDlg : public QDialog +class KIO_EXPORT RenameDlg : public TQDialog { Q_OBJECT public: diff --git a/kio/kio/renamedlgplugin.h b/kio/kio/renamedlgplugin.h index 39319fdb8..b4dd8b9fb 100644 --- a/kio/kio/renamedlgplugin.h +++ b/kio/kio/renamedlgplugin.h @@ -31,7 +31,7 @@ * @short Base class for RenameDlg plugins. * @since 3.1 */ -class KIO_EXPORT RenameDlgPlugin : public QWidget +class KIO_EXPORT RenameDlgPlugin : public TQWidget { public: /** diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 8ab080486..830ebe93c 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -110,7 +110,7 @@ class KIO::Scheduler::ProtocolInfoDict : public TQDict<KIO::Scheduler::ProtocolI KIO::Scheduler::ProtocolInfo * KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol) { - ProtocolInfo *info = find(protocol); + ProtocolInfo *info = tqfind(protocol); if (!info) { info = new ProtocolInfo; @@ -206,7 +206,7 @@ void Scheduler::_doJob(SimpleJob *job) { jobData->checkOnHold = checkOnHold; checkOnHold = false; } - extraJobData->replace(job, jobData); + extraJobData->tqreplace(job, jobData); newJobs.append(job); slaveTimer.start(0, true); #ifndef NDEBUG @@ -217,7 +217,7 @@ void Scheduler::_doJob(SimpleJob *job) { void Scheduler::_scheduleJob(SimpleJob *job) { newJobs.removeRef(job); - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); if (!jobData) { kdFatal(7006) << "BUG! _ScheduleJob(): No extraJobData for job!" << endl; @@ -237,7 +237,7 @@ void Scheduler::_cancelJob(SimpleJob *job) { if ( !slave ) { // was not yet running (don't call this on a finished job!) - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); if (!jobData) return; // I said: "Don't call this on a finished job!" @@ -249,7 +249,7 @@ void Scheduler::_cancelJob(SimpleJob *job) { slave = slaveList->first(); for(; slave; slave = slaveList->next()) { - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); if (list && list->removeRef(job)) break; // Job was found and removed. // Fall through to kill the slave as well! @@ -402,7 +402,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) // kdDebug(7006) << "scheduler: job started " << job << endl; - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); setupSlave(slave, job->url(), jobData->protocol, jobData->proxy, newSlave); job->start(slave); @@ -414,7 +414,7 @@ bool Scheduler::startJobDirect() { debug_info(); SimpleJob *job = newJobs.take(0); - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); if (!jobData) { kdFatal(7006) << "BUG! startjobDirect(): No extraJobData for job!" @@ -481,7 +481,7 @@ static Slave *searchIdleList(SlaveList *idleSlaves, const KURL &url, const TQStr Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) { Slave *slave = 0; - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); if (!jobData) { kdFatal(7006) << "BUG! findIdleSlave(): No extraJobData for job!" << endl; @@ -504,7 +504,7 @@ Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) if ( bCanReuse ) { KIO::MetaData outgoing = tJob->outgoingMetaData(); - TQString resume = (!outgoing.contains("resume")) ? TQString::null : outgoing["resume"]; + TQString resume = (!outgoing.tqcontains("resume")) ? TQString() : outgoing["resume"]; kdDebug(7006) << "Resume metadata is '" << resume << "'" << endl; bCanReuse = (resume.isEmpty() || resume == "0"); } @@ -582,7 +582,7 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave) protInfo->activeSlaves.removeRef(slave); if (slave->isAlive()) { - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); if (list) { assert(slave->isConnected()); @@ -618,7 +618,7 @@ void Scheduler::slotSlaveDied(KIO::Slave *slave) urlOnHold = KURL(); } idleSlaves->removeRef(slave); - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); if (list) { // coSlave dies, kill jobs waiting in queue @@ -733,7 +733,7 @@ Scheduler::slotScheduleCoSlave() slave = nextSlave) { nextSlave = coIdleSlaves->next(); - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); assert(list); if (list && !list->isEmpty()) { @@ -784,7 +784,7 @@ void Scheduler::slotSlaveError(int errorNr, const TQString &errorMsg) { Slave *slave = (Slave *)sender(); - if (!slave->isConnected() || (coIdleSlaves->find(slave) != -1)) + if (!slave->isConnected() || (coIdleSlaves->tqfind(slave) != -1)) { // Only forward to application if slave is idle or still connecting. emit slaveError(slave, errorNr, errorMsg); @@ -805,7 +805,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job) return false; } - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); assert(list); if (!list) { @@ -865,15 +865,15 @@ Scheduler::_registerWindow(TQWidget *wid) if (!wid) return; - TQObject *obj = static_cast<TQObject *>(wid); - if (!m_windowList.contains(obj)) + TQObject *obj = TQT_TQOBJECT(wid); + if (!m_windowList.tqcontains(obj)) { // We must store the window Id because by the time // the destroyed signal is emitted we can no longer // access TQWidget::winId() (already destructed) WId windowId = wid->winId(); m_windowList.insert(obj, windowId); - connect(wid, TQT_SIGNAL(destroyed(TQObject *)), + connect(TQT_TQOBJECT(wid), TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotUnregisterWindow(TQObject*))); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); @@ -890,7 +890,7 @@ Scheduler::slotUnregisterWindow(TQObject *obj) if (!obj) return; - TQMap<TQObject *, WId>::Iterator it = m_windowList.find(obj); + TQMap<TQObject *, WId>::Iterator it = m_windowList.tqfind(obj); if (it == m_windowList.end()) return; WId windowId = it.data(); diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index 258f03e2a..2381bde91 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -236,8 +236,8 @@ SessionData::~SessionData() void SessionData::configDataFor( MetaData &configData, const TQString &proto, const TQString & ) { - if ( (proto.find("http", 0, false) == 0 ) || - (proto.find("webdav", 0, false) == 0) ) + if ( (proto.tqfind("http", 0, false) == 0 ) || + (proto.tqfind("webdav", 0, false) == 0) ) { if (!d->initDone) reset(); @@ -273,20 +273,20 @@ void SessionData::reset() // Get language settings... TQStringList languageList = KGlobal::locale()->languagesTwoAlpha(); - TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); if ( it != languageList.end() ) { - if ( languageList.contains( english ) > 0 ) + if ( languageList.tqcontains( english ) > 0 ) languageList.remove( it ); else (*it) = english; } - if ( !languageList.contains( english ) ) + if ( !languageList.tqcontains( english ) ) languageList.append( english ); d->language = languageList.join( ", " ); - d->charsets = TQString::fromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower(); + d->charsets = TQString::tqfromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower(); KProtocolManager::reparseConfiguration(); } diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h index 408045260..80433679c 100644 --- a/kio/kio/sessiondata.h +++ b/kio/kio/sessiondata.h @@ -32,7 +32,7 @@ class SlaveConfig; /** * @internal */ -class KIO_EXPORT SessionData : public QObject +class KIO_EXPORT SessionData : public TQObject { Q_OBJECT diff --git a/kio/kio/skipdlg.cpp b/kio/kio/skipdlg.cpp index f014b10d9..fabc6f841 100644 --- a/kio/kio/skipdlg.cpp +++ b/kio/kio/skipdlg.cpp @@ -71,8 +71,8 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo // vlayout->addStrut( 360 ); makes dlg at least that wide TQLabel * lb = new TQLabel( _error_text, this ); - lb->setFixedHeight( lb->sizeHint().height() ); - lb->setMinimumWidth( lb->sizeHint().width() ); + lb->setFixedHeight( lb->tqsizeHint().height() ); + lb->setMinimumWidth( lb->tqsizeHint().width() ); vlayout->addWidget( lb ); vlayout->addSpacing( 10 ); @@ -82,26 +82,26 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo if ( b0 ) { b0->setDefault( true ); - b0->setFixedSize( b0->sizeHint() ); + b0->setFixedSize( b0->tqsizeHint() ); layout->addWidget( b0 ); layout->addSpacing( 5 ); } if ( b1 ) { - b1->setFixedSize( b1->sizeHint() ); + b1->setFixedSize( b1->tqsizeHint() ); layout->addWidget( b1 ); layout->addSpacing( 5 ); } if ( b2 ) { - b2->setFixedSize( b2->sizeHint() ); + b2->setFixedSize( b2->tqsizeHint() ); layout->addWidget( b2 ); layout->addSpacing( 5 ); } vlayout->addStretch( 10 ); vlayout->activate(); - resize( sizeHint() ); + resize( tqsizeHint() ); } SkipDlg::~SkipDlg() diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index c1a701711..b4f288d94 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -364,7 +364,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error client->attach(); TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); - KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); + KTempFile socketfile(prefix, TQString::tqfromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) { error_text = i18n("Unable to create io-slave: %1").arg(strerror(errno)); @@ -377,7 +377,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error #endif #ifndef Q_WS_WIN - KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name())); + KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); #else @@ -469,7 +469,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) client->attach(); TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); - KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); + KTempFile socketfile(prefix, TQString::tqfromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) return 0; @@ -479,7 +479,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) #endif #ifndef Q_WS_WIN - KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name())); + KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); #else diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index ad683a009..cecaf9ec3 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -340,7 +340,7 @@ void SlaveBase::dispatchLoop() void SlaveBase::connectSlave(const TQString& path) { #ifdef Q_OS_UNIX //TODO: KSocket not yet available on WIN32 - appconn->init(new KSocket(TQFile::encodeName(path))); + appconn->init(new KSocket(TQFile::encodeName(path).data())); if (!appconn->inited()) { kdDebug(7019) << "SlaveBase: failed to connect to " << path << endl; @@ -358,23 +358,23 @@ void SlaveBase::disconnectSlave() void SlaveBase::setMetaData(const TQString &key, const TQString &value) { - mOutgoingMetaData.replace(key, value); + mOutgoingMetaData.tqreplace(key, value); } TQString SlaveBase::metaData(const TQString &key) const { - if (mIncomingMetaData.contains(key)) + if (mIncomingMetaData.tqcontains(key)) return mIncomingMetaData[key]; - if (d->configData.contains(key)) + if (d->configData.tqcontains(key)) return d->configData[key]; return TQString::null; } bool SlaveBase::hasMetaData(const TQString &key) const { - if (mIncomingMetaData.contains(key)) + if (mIncomingMetaData.tqcontains(key)) return true; - if (d->configData.contains(key)) + if (d->configData.tqcontains(key)) return true; return false; } @@ -434,7 +434,7 @@ void SlaveBase::error( int _errid, const TQString &_text ) { mIncomingMetaData.clear(); // Clear meta data mOutgoingMetaData.clear(); - KIO_DATA << (Q_INT32) _errid << _text; + KIO_DATA << (TQ_INT32) _errid << _text; m_pConnection->send( MSG_ERROR, data ); //reset @@ -471,7 +471,7 @@ void SlaveBase::needSubURLData() void SlaveBase::slaveStatus( const TQString &host, bool connected ) { pid_t pid = getpid(); - Q_INT8 b = connected ? 1 : 0; + TQ_INT8 b = connected ? 1 : 0; KIO_DATA << pid << mProtocol << host << b; if (d->onHold) stream << d->onHoldUrl; @@ -543,7 +543,7 @@ void SlaveBase::processedPercent( float /* percent */ ) void SlaveBase::speed( unsigned long _bytes_per_second ) { - KIO_DATA << (Q_UINT32) _bytes_per_second; + KIO_DATA << (TQ_UINT32) _bytes_per_second; slaveWriteError = false; m_pConnection->send( INF_SPEED, data ); if (slaveWriteError) exit(); @@ -700,7 +700,7 @@ void SlaveBase::listEntry( const UDSEntry& entry, bool _ready ) void SlaveBase::listEntries( const UDSEntryList& list ) { - KIO_DATA << (Q_UINT32)list.count(); + KIO_DATA << (TQ_UINT32)list.count(); UDSEntryListConstIterator it = list.begin(); UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) @@ -898,7 +898,7 @@ int SlaveBase::messageBox( const TQString &text, MessageBoxType type, const TQSt const TQString &buttonYes, const TQString &buttonNo, const TQString &dontAskAgainName ) { kdDebug(7019) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl; - KIO_DATA << (Q_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName; + KIO_DATA << (TQ_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName; m_pConnection->send( INF_MESSAGEBOX, data ); if ( waitForAnswer( CMD_MESSAGEBOXANSWER, 0, data ) != -1 ) { @@ -1048,7 +1048,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) case CMD_PUT: { int permissions; - Q_INT8 iOverwrite, iResume; + TQ_INT8 iOverwrite, iResume; stream >> url >> iOverwrite >> iResume >> permissions; bool overwrite = ( iOverwrite != 0 ); bool resume = ( iResume != 0 ); @@ -1078,7 +1078,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) break; case CMD_RENAME: { - Q_INT8 iOverwrite; + TQ_INT8 iOverwrite; KURL url2; stream >> url >> url2 >> iOverwrite; bool overwrite = (iOverwrite != 0); @@ -1086,7 +1086,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) } break; case CMD_SYMLINK: { - Q_INT8 iOverwrite; + TQ_INT8 iOverwrite; TQString target; stream >> target >> url >> iOverwrite; bool overwrite = (iOverwrite != 0); @@ -1095,7 +1095,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) case CMD_COPY: { int permissions; - Q_INT8 iOverwrite; + TQ_INT8 iOverwrite; KURL url2; stream >> url >> url2 >> permissions >> iOverwrite; bool overwrite = (iOverwrite != 0); @@ -1103,7 +1103,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) } break; case CMD_DEL: { - Q_INT8 isFile; + TQ_INT8 isFile; stream >> url >> isFile; del( url, isFile != 0); } break; diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h index 82370ce56..48fccd74e 100644 --- a/kio/kio/slavebase.h +++ b/kio/kio/slavebase.h @@ -618,10 +618,10 @@ public: * KIO::AuthInfo authInfo; * if ( openPassDlg( authInfo ) ) * { - * kdDebug() << TQString::fromLatin1("User: ") + * kdDebug() << TQString::tqfromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::fromLatin1("Password: ") - * << TQString::fromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::tqfromLatin1("Password: ") + * << TQString::tqfromLatin1("Not displayed here!") << endl; * } * \endcode * @@ -635,10 +635,10 @@ public: * TQString errorMsg = "You entered an incorrect password."; * if ( openPassDlg( authInfo, errorMsg ) ) * { - * kdDebug() << TQString::fromLatin1("User: ") + * kdDebug() << TQString::tqfromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::fromLatin1("Password: ") - * << TQString::fromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::tqfromLatin1("Password: ") + * << TQString::tqfromLatin1("Not displayed here!") << endl; * } * \endcode * diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index fe888c99c..d9efdb6cc 100644 --- a/kio/kio/slaveconfig.cpp +++ b/kio/kio/slaveconfig.cpp @@ -79,7 +79,7 @@ void SlaveConfigPrivate::readGlobalConfig() SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_protocol) { - SlaveConfigProtocol *scp = protocol.find(_protocol); + SlaveConfigProtocol *scp = protocol.tqfind(_protocol); if (!scp) { TQString filename = KProtocolInfo::config(_protocol); @@ -94,7 +94,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_pro SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_protocol) { - SlaveConfigProtocol *scp = protocol.find(_protocol); + SlaveConfigProtocol *scp = protocol.tqfind(_protocol); if (!scp) scp = readProtocolConfig(_protocol); return scp; @@ -103,7 +103,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_pro void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigProtocol *scp, const TQString &host) { MetaData *metaData = new MetaData; - scp->host.replace(host, metaData); + scp->host.tqreplace(host, metaData); // Read stuff // Break host into domains @@ -119,7 +119,7 @@ void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigPro int pos = 0; do { - pos = host.findRev('.', pos-1); + pos = host.tqfindRev('.', pos-1); if (pos < 0) domain = host; @@ -178,11 +178,11 @@ void SlaveConfig::setConfigData(const TQString &protocol, const TQString &host, } else { - MetaData *hostConfig = scp->host.find(host); + MetaData *hostConfig = scp->host.tqfind(host); if (!hostConfig) { d->readConfigProtocolHost(protocol, scp, host); - hostConfig = scp->host.find(host); + hostConfig = scp->host.tqfind(host); assert(hostConfig); } *hostConfig += config; @@ -197,12 +197,12 @@ MetaData SlaveConfig::configData(const TQString &protocol, const TQString &host) config += scp->global; if (host.isEmpty()) return config; - MetaData *hostConfig = scp->host.find(host); + MetaData *hostConfig = scp->host.tqfind(host); if (!hostConfig) { d->readConfigProtocolHost(protocol, scp, host); emit configNeeded(protocol, host); - hostConfig = scp->host.find(host); + hostConfig = scp->host.tqfind(host); assert(hostConfig); } config += *hostConfig; diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h index 1eaaa55e4..a7ded457d 100644 --- a/kio/kio/slaveconfig.h +++ b/kio/kio/slaveconfig.h @@ -44,7 +44,7 @@ namespace KIO { * only applied when the slave is connecting with a host that matches with * the host and/or domain specified by the group. */ - class KIO_EXPORT SlaveConfig : public QObject + class KIO_EXPORT SlaveConfig : public TQObject { Q_OBJECT public: diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp index 563aad17e..62c64d566 100644 --- a/kio/kio/slaveinterface.cpp +++ b/kio/kio/slaveinterface.cpp @@ -43,7 +43,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e ) // We do the same on 64-bit platforms in case we run in a mixed 32/64bit // environment. - Q_UINT32 size = 0; + TQ_UINT32 size = 0; KIO::UDSEntry::ConstIterator it = e.begin(); for( ; it != e.end(); ++it ) { @@ -70,7 +70,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e ) TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) { e.clear(); - Q_UINT32 size; + TQ_UINT32 size; s >> size; // On 32-bit platforms we send UDS_SIZE with UDS_SIZE_LARGE in front @@ -78,8 +78,8 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) // that would break the compatibility of the wire-protocol with KDE 2. // We do the same on 64-bit platforms in case we run in a mixed 32/64bit // environment. - Q_LLONG msb = 0; - for(Q_UINT32 i = 0; i < size; i++) + TQ_LLONG msb = 0; + for(TQ_UINT32 i = 0; i < size; i++) { KIO::UDSAtom a; s >> a; @@ -92,7 +92,7 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) if (a.m_uds == KIO::UDS_SIZE) { if (a.m_long < 0) - a.m_long += (Q_LLONG) 1 << 32; + a.m_long += (TQ_LLONG) 1 << 32; a.m_long += msb << 32; } e.append(a); @@ -225,9 +225,9 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) TQDataStream stream( rawdata, IO_ReadOnly ); TQString str1; - Q_INT32 i; - Q_INT8 b; - Q_UINT32 ul; + TQ_INT32 i; + TQ_INT8 b; + TQ_UINT32 ul; switch( _cmd ) { case MSG_DATA: @@ -251,7 +251,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) break; case MSG_LIST_ENTRIES: { - Q_UINT32 count; + TQ_UINT32 count; stream >> count; UDSEntryList list; diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h index 5cca5dd77..d5b680f63 100644 --- a/kio/kio/slaveinterface.h +++ b/kio/kio/slaveinterface.h @@ -89,7 +89,7 @@ class SlaveInterfacePrivate; * * A call to foo() results in a call to slotFoo() on the other end. */ -class KIO_EXPORT SlaveInterface : public QObject +class KIO_EXPORT SlaveInterface : public TQObject { Q_OBJECT @@ -252,7 +252,7 @@ private: inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a ) { - Q_INT32 l; + TQ_INT32 l; s >> a.m_uds; if ( a.m_uds & KIO::UDS_LONG ) { @@ -273,7 +273,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a ) s << a.m_uds; if ( a.m_uds & KIO::UDS_LONG ) - s << (Q_INT32) a.m_long; + s << (TQ_INT32) a.m_long; else if ( a.m_uds & KIO::UDS_STRING ) s << a.m_str; else {} // DIE! diff --git a/kio/kio/statusbarprogress.cpp b/kio/kio/statusbarprogress.cpp index 910155799..a3fdbf9c2 100644 --- a/kio/kio/statusbarprogress.cpp +++ b/kio/kio/statusbarprogress.cpp @@ -60,11 +60,11 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) stack->addWidget( m_pProgressBar, 1 ); m_pLabel = new TQLabel( "", this ); - m_pLabel->setAlignment( AlignHCenter | AlignVCenter ); + m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); stack->addWidget( m_pLabel, 2 ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); mode = None; setMode(); @@ -144,7 +144,7 @@ bool StatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) { if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *e = (TQMouseEvent*)ev; - if ( e->button() == LeftButton ) { // toggle view on left mouse button + if ( e->button() == Qt::LeftButton ) { // toggle view on left mouse button if ( mode == Label ) { mode = Progress; } else if ( mode == Progress ) { diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp index 78093577d..5547c4d23 100644 --- a/kio/kio/tcpslavebase.cpp +++ b/kio/kio/tcpslavebase.cpp @@ -774,7 +774,7 @@ int TCPSlaveBase::verifyCertificate() } #endif if (!_IPmatchesCN && !d->militantSSL) { // force this if the user wants it - if (d->cc->getHostList(pc).contains(ourHost)) { + if (d->cc->getHostList(pc).tqcontains(ourHost)) { _IPmatchesCN = true; } } diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index e444ebd46..88f7d3059 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -244,7 +244,7 @@ void KIOExec::slotRunApp() i18n( "The file\n%1\nhas been modified.\nDo you want to upload the changes?" ).arg(dest.prettyURL()), i18n( "File Changed" ), i18n("Upload"), i18n("Do Not Upload") ) == KMessageBox::Yes ) { - kdDebug() << TQString("src='%1' dest='%2'").arg(src).arg(dest.url()).ascii() << endl; + kdDebug() << TQString(TQString("src='%1' dest='%2'").arg(src).arg(dest.url())).ascii() << endl; // Do it the synchronous way. if ( !KIO::NetAccess::upload( src, dest, 0 ) ) { diff --git a/kio/kioexec/main.h b/kio/kioexec/main.h index 59f1cdac2..6a5dee65e 100644 --- a/kio/kioexec/main.h +++ b/kio/kioexec/main.h @@ -8,7 +8,7 @@ namespace KIO { class Job; } -class KIOExec : public QObject +class KIOExec : public TQObject { Q_OBJECT public: diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp index 42cbad3a4..858cad37b 100644 --- a/kio/kpasswdserver/kpasswdserver.cpp +++ b/kio/kpasswdserver/kpasswdserver.cpp @@ -94,7 +94,7 @@ static TQString makeWalletKey( const TQString& key, const TQString& realm ) // Helper for storeInWallet/readFromWallet static TQString makeMapKey( const char* key, int entryNumber ) { - TQString str = TQString::fromLatin1( key ); + TQString str = TQString::tqfromLatin1( key ); if ( entryNumber > 1 ) str += "-" + TQString::number( entryNumber ); return str; @@ -115,12 +115,12 @@ static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const K kdDebug(130) << "storeInWallet: walletKey=" << walletKey << " reading existing map" << endl; if ( wallet->readMap( walletKey, map ) == 0 ) { Map::ConstIterator end = map.end(); - Map::ConstIterator it = map.find( "login" ); + Map::ConstIterator it = map.tqfind( "login" ); while ( it != end ) { if ( it.data() == info.username ) { break; // OK, overwrite this entry } - it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) ); + it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) ); } // If no entry was found, create a new entry - entryNumber is set already. } @@ -148,17 +148,17 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const typedef TQMap<TQString,TQString> Map; int entryNumber = 1; Map::ConstIterator end = map.end(); - Map::ConstIterator it = map.find( "login" ); + Map::ConstIterator it = map.tqfind( "login" ); while ( it != end ) { //kdDebug(130) << "readFromWallet: found " << it.key() << "=" << it.data() << endl; - Map::ConstIterator pwdIter = map.find( makeMapKey( "password", entryNumber ) ); + Map::ConstIterator pwdIter = map.tqfind( makeMapKey( "password", entryNumber ) ); if ( pwdIter != end ) { if ( it.data() == username ) password = pwdIter.data(); knownLogins.insert( it.data(), pwdIter.data() ); } - it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) ); + it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) ); } //kdDebug(130) << knownLogins.count() << " known logins" << endl; @@ -541,7 +541,7 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i) const KPasswdServer::AuthInfo * KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) { - AuthInfoList *authList = m_authDict.find(key); + AuthInfoList *authList = m_authDict.tqfind(key); if (!authList) return 0; @@ -579,7 +579,7 @@ KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) void KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) { - AuthInfoList *authList = m_authDict.find(key); + AuthInfoList *authList = m_authDict.tqfind(key); if (!authList) return; @@ -606,7 +606,7 @@ KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info void KPasswdServer::addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled) { - AuthInfoList *authList = m_authDict.find(key); + AuthInfoList *authList = m_authDict.tqfind(key); if (!authList) { authList = new AuthInfoList; @@ -659,7 +659,7 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long else if (windowId && (current->expire != AuthInfo::expNever)) { current->expire = AuthInfo::expWindowClose; - if (!current->windowList.contains(windowId)) + if (!current->windowList.tqcontains(windowId)) current->windowList.append(windowId); } else if (current->expire == AuthInfo::expTime) @@ -670,13 +670,13 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long // Update mWindowIdList if (windowId) { - TQStringList *keysChanged = mWindowIdList.find(windowId); + TQStringList *keysChanged = mWindowIdList.tqfind(windowId); if (!keysChanged) { keysChanged = new TQStringList; mWindowIdList.insert(windowId, keysChanged); } - if (!keysChanged->contains(key)) + if (!keysChanged->tqcontains(key)) keysChanged->append(key); } } @@ -684,14 +684,14 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long void KPasswdServer::removeAuthForWindowId(long windowId) { - TQStringList *keysChanged = mWindowIdList.find(windowId); + TQStringList *keysChanged = mWindowIdList.tqfind(windowId); if (!keysChanged) return; for(TQStringList::ConstIterator it = keysChanged->begin(); it != keysChanged->end(); ++it) { TQString key = *it; - AuthInfoList *authList = m_authDict.find(key); + AuthInfoList *authList = m_authDict.tqfind(key); if (!authList) continue; diff --git a/kio/kssl/keygenwizard.ui b/kio/kssl/keygenwizard.ui index 1cecbd5fc..2130c767b 100644 --- a/kio/kssl/keygenwizard.ui +++ b/kio/kssl/keygenwizard.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KGWizardPage1</class> <author>George Staikos <staikos@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KGWizardPage1</cstring> </property> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -30,7 +30,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> diff --git a/kio/kssl/keygenwizard2.ui b/kio/kssl/keygenwizard2.ui index 9512e4ba9..a0d200428 100644 --- a/kio/kssl/keygenwizard2.ui +++ b/kio/kssl/keygenwizard2.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KGWizardPage2</class> <author>George Staikos <staikos@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KGWizardPage2</cstring> </property> @@ -17,20 +17,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel4</cstring> </property> <property name="text"> <string>You must now provide a password for the certificate request. Please choose a very secure password as this will be used to encrypt your private key.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -41,7 +41,7 @@ <cstring>_password2</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -52,7 +52,7 @@ <cstring>_password1</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>_password1</cstring> </property> @@ -60,7 +60,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>_password2</cstring> </property> diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc index 70d36cd8e..79a36ba5f 100644 --- a/kio/kssl/kopenssl.cc +++ b/kio/kssl/kopenssl.cc @@ -245,7 +245,7 @@ static TQString findMostRecentLib(TQString dir, TQString name) uint s = filter.length()-1; for (TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { TQString numberpart = (*it).mid(s); - uint endmaj = numberpart.find('.'); + uint endmaj = numberpart.tqfind('.'); if (endmaj == -1) continue; bool ok; diff --git a/kio/kssl/kssl/caroot/ca-bundle.crt b/kio/kssl/kssl/caroot/ca-bundle.crt index ca5d292c9..c9bb22213 100644 --- a/kio/kssl/kssl/caroot/ca-bundle.crt +++ b/kio/kssl/kssl/caroot/ca-bundle.crt @@ -1442,7 +1442,7 @@ QTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRp b24xEjAQBgNVBAMTCUdQIFJvb3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC AQoCggEBALrsQ7g06qNn33cJHxoQoh6pTpVMdOcM3GzGmNCr+hckmmejSRRkiY+T Ei/vj9jOEASLhcDcL7wpmK+cQsXL0pbP9KXFLW5NjDiOsmoImdWRG6jtM5NJXcvn -FUNtUvHI6NfaMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW +FUNtUvHI6NfaTQMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW gO9oCUCUwrczSYPlya4tIDeQGD0gNtp5Oa+4V59672AqIYT4/6A5IdPYbVTHw2o8 yFwfLkdyFGxVSwkGzY7FawvnB0c6fZJffQ+wXDNXg4M/HoSoeZCfl04i3HUiyG4v 1tDLduEMV5fhJo8phFPy5Y6TykuKTDUCAwEAAaNCMEAwHQYDVR0OBBYEFKJcbg1l @@ -2931,7 +2931,7 @@ O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a 77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC -hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3 +hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid3 92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc index 21bff52b1..511bd4021 100644 --- a/kio/kssl/ksslcertdlg.cc +++ b/kio/kssl/ksslcertdlg.cc @@ -155,13 +155,13 @@ void KSSLCertDlg::slotDont() { TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r) { - s << Q_INT8(r.ok?1:0) << r.choice << Q_INT8(r.save?1:0) << Q_INT8(r.send?1:0); + s << TQ_INT8(r.ok?1:0) << r.choice << TQ_INT8(r.save?1:0) << TQ_INT8(r.send?1:0); return s; } TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r) { -Q_INT8 tmp; +TQ_INT8 tmp; s >> tmp; r.ok = (tmp == 1); s >> r.choice; s >> tmp; r.save = (tmp == 1); diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index 285bb1d2d..d712c185c 100644 --- a/kio/kssl/ksslcertificate.cc +++ b/kio/kssl/ksslcertificate.cc @@ -243,7 +243,7 @@ TQString KSSLCertificate::getKDEKey() const { TQString KSSLCertificate::getMD5DigestFromKDEKey(const TQString &k) { TQString rc; - int pos = k.findRev('('); + int pos = k.tqfindRev('('); if (pos != -1) { unsigned int len = k.length(); if (k.at(len-1) == ')') { @@ -871,7 +871,7 @@ TQDateTime KSSLCertificate::getQDTNotBefore() const { #ifdef KSSL_HAVE_SSL return ASN1_UTCTIME_QDateTime(X509_get_notBefore(d->m_cert), NULL); #else -return TQDateTime::currentDateTime(); +return TQDateTime::tqcurrentDateTime(); #endif } @@ -880,7 +880,7 @@ TQDateTime KSSLCertificate::getQDTNotAfter() const { #ifdef KSSL_HAVE_SSL return ASN1_UTCTIME_QDateTime(X509_get_notAfter(d->m_cert), NULL); #else -return TQDateTime::currentDateTime(); +return TQDateTime::tqcurrentDateTime(); #endif } diff --git a/kio/kssl/ksslcertificatecache.cc b/kio/kssl/ksslcertificatecache.cc index eb4ff2d86..226e21c71 100644 --- a/kio/kssl/ksslcertificatecache.cc +++ b/kio/kssl/ksslcertificatecache.cc @@ -381,13 +381,13 @@ KSSLCertificate *KSSLCertificateCache::getCertByMD5Digest(const TQString &key) { TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p) { - s << (Q_UINT32)p; + s << (TQ_UINT32)p; return s; } TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p) { - Q_UINT32 pd; + TQ_UINT32 pd; s >> pd; p = (KSSLCertificateCache::KSSLCertificatePolicy) pd; return s; diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index 70e8a094c..ea7dd1457 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -73,7 +73,7 @@ class KSSLInfoDlg::KSSLInfoDlgPrivate { KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *name, bool modal) - : KDialog(parent, name, modal, Qt::WDestructiveClose), d(new KSSLInfoDlgPrivate) { + : KDialog(parent, name, modal, (WFlags)TQt::WDestructiveClose), d(new KSSLInfoDlgPrivate) { TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); d->m_secCon = secureConnection; d->m_layout = new TQGridLayout(topLayout, 3, 3, KDialog::spacingHint()); @@ -273,14 +273,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { d->_serialNum->setText(x->getSerialNumber()); cspl = d->_validFrom->palette(); - if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC)) + if (x->getQDTNotBefore() > TQDateTime::tqcurrentDateTime(Qt::UTC)) cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); d->_validFrom->setPalette(cspl); d->_validFrom->setText(x->getNotBefore()); cspl = d->_validUntil->palette(); - if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC)) + if (x->getQDTNotAfter() < TQDateTime::tqcurrentDateTime(Qt::UTC)) cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); d->_validUntil->setPalette(cspl); @@ -305,8 +305,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { ksv = ksvl.first(); if (ksv == KSSLCertificate::SelfSigned) { - if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) && - x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) { + if (x->getQDTNotAfter() > TQDateTime::tqcurrentDateTime(Qt::UTC) && + x->getQDTNotBefore() < TQDateTime::tqcurrentDateTime(Qt::UTC)) { if (KSSLSigners().useForSSL(*x)) ksv = KSSLCertificate::Ok; } else { @@ -331,7 +331,7 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { } d->_csl->setText(errorStr); - d->_csl->setMinimumSize(d->_csl->sizeHint()); + d->_csl->setMinimumSize(d->_csl->tqsizeHint()); d->_subject->setValues(x->getSubject()); d->_issuer->setValues(x->getIssuer()); @@ -399,37 +399,37 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) { TQLabel *label = 0L; if (!(tmp = cert.getValue("O")).isEmpty()) { label = new TQLabel(i18n("Organization:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("OU")).isEmpty()) { label = new TQLabel(i18n("Organizational unit:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("L")).isEmpty()) { label = new TQLabel(i18n("Locality:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("ST")).isEmpty()) { label = new TQLabel(i18n("Federal State","State:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("C")).isEmpty()) { label = new TQLabel(i18n("Country:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("CN")).isEmpty()) { label = new TQLabel(i18n("Common name:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("Email")).isEmpty()) { label = new TQLabel(i18n("Email:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); if (mailCatcher) { KURLLabel *mail = new KURLLabel(tmp, tmp, _frame); connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &))); diff --git a/kio/kssl/ksslpeerinfo.cc b/kio/kssl/ksslpeerinfo.cc index d1c2d00fc..8d960ceb7 100644 --- a/kio/kssl/ksslpeerinfo.cc +++ b/kio/kssl/ksslpeerinfo.cc @@ -65,7 +65,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) { #ifdef Q_WS_WIN //TODO kresolver not ported d->peerHost = d->peerHost.lower(); #else - d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); + d->peerHost = TQString::tqfromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); #endif } diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index 5a77b12bf..40b3493cd 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -169,7 +169,7 @@ TQString KSSLSettings::getCipherList() { int bits = d->kossl->SSL_CIPHER_get_bits(sc, NULL); if (m_cfg->readBoolEntry(tcipher, bits >= 56)) { CipherNode *xx = new CipherNode(sc->name,bits); - if (!cipherList.contains(xx)) + if (!cipherList.tqcontains(xx)) cipherList.prepend(xx); else delete xx; diff --git a/kio/kssl/ksslx509map.cc b/kio/kssl/ksslx509map.cc index 7896fdfcf..222d187cb 100644 --- a/kio/kssl/ksslx509map.cc +++ b/kio/kssl/ksslx509map.cc @@ -33,12 +33,12 @@ KSSLX509Map::~KSSLX509Map() { void KSSLX509Map::setValue(const TQString& key, const TQString& value) { - m_pairs.replace(key, value); + m_pairs.tqreplace(key, value); } TQString KSSLX509Map::getValue(const TQString& key) const { - if (!m_pairs.contains(key)) { + if (!m_pairs.tqcontains(key)) { return TQString::null; } @@ -63,7 +63,7 @@ unsigned int length = str.length(); for(head = 0, tail = 0; tail < length-1; head = tail+1) { TQString thisline; - tail = str.find(tok, head); + tail = str.tqfind(tok, head); if (tail > length) // last token - none at end tail = length; @@ -85,11 +85,11 @@ TQStringList vl = tokenizeBy(name, TQRegExp("/[A-Za-z]+="), false); for (TQStringList::Iterator j = vl.begin(); j != vl.end(); ++j) { TQStringList apair = tokenizeBy(*j, TQRegExp("="), false); - if (m_pairs.contains(apair[0])) { + if (m_pairs.tqcontains(apair[0])) { TQString oldValue = m_pairs[apair[0]]; oldValue += "\n"; oldValue += apair[1]; - m_pairs.replace(apair[0], oldValue); + m_pairs.tqreplace(apair[0], oldValue); } else { m_pairs.insert(apair[0], apair[1]); } diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp index b547f7e6b..e9bc75dc1 100644 --- a/kio/misc/kdesasl/kdesasl.cpp +++ b/kio/misc/kdesasl/kdesasl.cpp @@ -49,10 +49,10 @@ KDESasl::~KDESasl() { TQCString KDESasl::chooseMethod(const TQStrIList aMethods) { - if (aMethods.contains("DIGEST-MD5")) mMethod = "DIGEST-MD5"; - else if (aMethods.contains("CRAM-MD5")) mMethod = "CRAM-MD5"; - else if (aMethods.contains("PLAIN")) mMethod = "PLAIN"; - else if (aMethods.contains("LOGIN")) mMethod = "LOGIN"; + if (aMethods.tqcontains("DIGEST-MD5")) mMethod = "DIGEST-MD5"; + else if (aMethods.tqcontains("CRAM-MD5")) mMethod = "CRAM-MD5"; + else if (aMethods.tqcontains("PLAIN")) mMethod = "PLAIN"; + else if (aMethods.tqcontains("LOGIN")) mMethod = "LOGIN"; else mMethod = TQCString(); return mMethod; } diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp index 096fc1f03..0dacc662f 100644 --- a/kio/misc/kfile/fileprops.cpp +++ b/kio/misc/kfile/fileprops.cpp @@ -267,16 +267,16 @@ static void printSupportedMimeTypes() if ( allMimeTypes.isEmpty() ) { cout << - i18n("No support for metadata extraction found.").local8Bit() + i18n("No support for metadata extraction found.").local8Bit().data() << endl; return; } - cout << i18n("Supported MimeTypes:").local8Bit() << endl; + cout << i18n("Supported MimeTypes:").local8Bit().data() << endl; TQStringList::ConstIterator it = allMimeTypes.begin(); for ( ; it != allMimeTypes.end(); it++ ) - cout << (*it).local8Bit() << endl; + cout << (*it).local8Bit().data() << endl; } // caller needs to delete the returned list! @@ -304,8 +304,8 @@ static void printMimeTypes( const KCmdLineArgs *args ) { KURL url = args->url( i ); KMimeType::Ptr mt = KMimeType::findByURL( url ); - cout << args->arg(i) << ": " << mt->comment().local8Bit() << " (" - << mt->name().local8Bit() << ")" << endl; + cout << args->arg(i) << ": " << mt->comment().local8Bit().data() << " (" + << mt->name().local8Bit().data() << ")" << endl; } } @@ -313,7 +313,7 @@ static void printList( const TQStringList& list ) { TQStringList::ConstIterator it = list.begin(); for ( ; it != list.end(); ++it ) - cout << (*it).local8Bit() << endl; + cout << (*it).local8Bit().data() << endl; cout << endl; } @@ -330,7 +330,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList, { TQString file = props->fileName() + " "; TQString fileString = line.replace( 3, file.length(), file ); - cout << TQFile::encodeName( fileString ) << endl; + cout << TQFile::encodeName( fileString ).data() << endl; if ( args->isSet( "listsupported" ) ) { @@ -349,7 +349,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList, TQStringList::ConstIterator git = groups.begin(); for ( ; git != groups.end(); ++git ) { - cout << "Group: " << (*git).local8Bit() << endl; + cout << "Group: " << (*git).local8Bit().data() << endl; printList( props->availableKeys( *git ) ); } } @@ -363,7 +363,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList, TQString key = TQString::fromLocal8Bit( args->getOption("getValue")); TQStringList::ConstIterator git = props->groupsToUse().begin(); for ( ; git != props->groupsToUse().end(); ++git ) - cout << props->getValue( *git, key ).local8Bit() << endl; + cout << props->getValue( *git, key ).local8Bit().data() << endl; } if ( args->isSet( "setValue" ) ) @@ -464,7 +464,7 @@ int main( int argc, char **argv ) if ( !quiet ) { cerr << args->arg(i) << ": " << - i18n("Cannot determine metadata").local8Bit() << endl; + i18n("Cannot determine metadata").local8Bit().data() << endl; } delete props; } diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/kntlm/des.cpp index b6683ac34..bb4fab88b 100644 --- a/kio/misc/kntlm/des.cpp +++ b/kio/misc/kntlm/des.cpp @@ -25,7 +25,7 @@ static void permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *ou static void perminit_ip (DES_KEY * key); static void spinit (DES_KEY * key); static void perminit_fp (DES_KEY * key); -static Q_UINT32 f (DES_KEY * key, Q_UINT32 r, char *subkey); +static TQ_UINT32 f (DES_KEY * key, TQ_UINT32 r, char *subkey); /* Tables defined in the Data Encryption Standard documents */ @@ -240,9 +240,9 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/) static void ntlm_des_encrypt (DES_KEY * key, unsigned char *block) { - Q_UINT32 left, right; + TQ_UINT32 left, right; char *knp; - Q_UINT32 work[2]; /* Working data storage */ + TQ_UINT32 work[2]; /* Working data storage */ permute_ip (block, key, (unsigned char *) work); /* Initial Permutation */ left = KFromToBigEndian(work[0]); @@ -352,11 +352,11 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock) } /* The nonlinear function f(r,k), the heart of DES */ -static Q_UINT32 -f (DES_KEY * key, Q_UINT32 r, char *subkey) +static TQ_UINT32 +f (DES_KEY * key, TQ_UINT32 r, char *subkey) { - Q_UINT32 *spp; - Q_UINT32 rval, rt; + TQ_UINT32 *spp; + TQ_UINT32 rval, rt; int er; #ifdef TRACE @@ -377,7 +377,7 @@ f (DES_KEY * key, Q_UINT32 r, char *subkey) spp = &key->sp[7][0]; rval = spp[(er ^ *subkey--) & 0x3f]; spp -= 64; - rt = (Q_UINT32) r >> 3; + rt = (TQ_UINT32) r >> 3; rval |= spp[((int) rt ^ *subkey--) & 0x3f]; spp -= 64; rt >>= 4; @@ -457,7 +457,7 @@ spinit (DES_KEY * key) { char pbox[32]; int p, i, s, j, rowcol; - Q_UINT32 val; + TQ_UINT32 val; /* Compute pbox, the inverse of p32i. * This is easier to work with diff --git a/kio/misc/kntlm/des.h b/kio/misc/kntlm/des.h index 1cb2f27e5..0f6f59dc9 100644 --- a/kio/misc/kntlm/des.h +++ b/kio/misc/kntlm/des.h @@ -6,7 +6,7 @@ typedef struct des_key { char kn[16][8]; - Q_UINT32 sp[8][64]; + TQ_UINT32 sp[8][64]; char iperm[16][16][8]; char fperm[16][16][8]; } DES_KEY; diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp index a3eca3bdd..db2b45b6c 100644 --- a/kio/misc/kntlm/kntlm.cpp +++ b/kio/misc/kntlm/kntlm.cpp @@ -32,12 +32,12 @@ #include "des.h" #include "kntlm.h" -TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode ) +TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode ) { //watch for buffer overflows - Q_UINT32 offset; - Q_UINT16 len; - offset = KFromToLittleEndian((Q_UINT32)secbuf.offset); + TQ_UINT32 offset; + TQ_UINT16 len; + offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset); len = KFromToLittleEndian(secbuf.len); if ( offset > buf.size() || offset + len > buf.size() ) return TQString::null; @@ -45,10 +45,10 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool un TQString str; const char *c = buf.data() + offset; - if ( unicode ) { + if ( tqunicode ) { str = UnicodeLE2TQString( (TQChar*) c, len >> 1 ); } else { - str = TQString::fromLatin1( c, len ); + str = TQString::tqfromLatin1( c, len ); } return str; } @@ -56,9 +56,9 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool un TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf ) { TQByteArray ret; - Q_UINT32 offset; - Q_UINT16 len; - offset = KFromToLittleEndian((Q_UINT32)secbuf.offset); + TQ_UINT32 offset; + TQ_UINT16 len; + offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset); len = KFromToLittleEndian(secbuf.len); //watch for buffer overflows if ( offset > buf.size() || @@ -67,11 +67,11 @@ TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf ) return ret; } -void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode ) +void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode ) { TQByteArray tmp; - if ( unicode ) { + if ( tqunicode ) { tmp = QString2UnicodeLE( str ); addBuf( buf, secbuf, tmp ); } else { @@ -85,26 +85,26 @@ void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bo void KNTLM::addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data ) { - Q_UINT32 offset; - Q_UINT16 len, maxlen; + TQ_UINT32 offset; + TQ_UINT16 len, maxlen; offset = (buf.size() + 1) & 0xfffffffe; len = data.size(); maxlen = data.size(); - secbuf.offset = KFromToLittleEndian((Q_UINT32)offset); + secbuf.offset = KFromToLittleEndian((TQ_UINT32)offset); secbuf.len = KFromToLittleEndian(len); secbuf.maxlen = KFromToLittleEndian(maxlen); buf.resize( offset + len ); memcpy( buf.data() + offset, data.data(), data.size() ); } -bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, Q_UINT32 flags ) +bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, TQ_UINT32 flags ) { TQByteArray rbuf( sizeof(Negotiate) ); rbuf.fill( 0 ); memcpy( rbuf.data(), "NTLMSSP", 8 ); - ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)1 ); + ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)1 ); if ( !domain.isEmpty() ) { flags |= Negotiate_Domain_Supplied; addString( rbuf, ((Negotiate*) rbuf.data())->domain, domain ); @@ -126,21 +126,21 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt Challenge *ch = (Challenge *) challenge.data(); TQByteArray response; uint chsize = challenge.size(); - bool unicode = false; + bool tqunicode = false; TQString dom; //challenge structure too small if ( chsize < 32 ) return false; - unicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode; + tqunicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode; if ( domain.isEmpty() ) - dom = getString( challenge, ch->targetName, unicode ); + dom = getString( challenge, ch->targetName, tqunicode ); else dom = domain; rbuf.fill( 0 ); memcpy( rbuf.data(), "NTLMSSP", 8 ); - ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)3 ); + ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)3 ); ((Auth*) rbuf.data())->flags = ch->flags; TQByteArray targetInfo = getBuf( challenge, ch->targetInfo ); @@ -164,10 +164,10 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt addBuf( rbuf, ((Auth*) rbuf.data())->lmResponse, response ); // } if ( !dom.isEmpty() ) - addString( rbuf, ((Auth*) rbuf.data())->domain, dom, unicode ); - addString( rbuf, ((Auth*) rbuf.data())->user, user, unicode ); + addString( rbuf, ((Auth*) rbuf.data())->domain, dom, tqunicode ); + addString( rbuf, ((Auth*) rbuf.data())->user, user, tqunicode ); if ( !workstation.isEmpty() ) - addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, unicode ); + addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, tqunicode ); auth = rbuf; @@ -241,10 +241,10 @@ TQByteArray KNTLM::getNTLMResponse( const TQString &password, const unsigned cha TQByteArray KNTLM::ntlmHash( const TQString &password ) { KMD4::Digest digest; - TQByteArray ret, unicode; - unicode = QString2UnicodeLE( password ); + TQByteArray ret, tqunicode; + tqunicode = QString2UnicodeLE( password ); - KMD4 md4( unicode ); + KMD4 md4( tqunicode ); md4.rawDigest( digest ); ret.duplicate( (const char*) digest, sizeof( digest ) ); return ret; @@ -298,10 +298,10 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo ) blob.fill( 0 ); Blob *bl = (Blob *) blob.data(); - bl->signature = KFromToBigEndian( (Q_UINT32) 0x01010000 ); - Q_UINT64 now = TQDateTime::currentDateTime().toTime_t(); - now += (Q_UINT64)3600*(Q_UINT64)24*(Q_UINT64)134774; - now *= (Q_UINT64)10000000; + bl->signature = KFromToBigEndian( (TQ_UINT32) 0x01010000 ); + TQ_UINT64 now = TQDateTime::tqcurrentDateTime().toTime_t(); + now += (TQ_UINT64)3600*(TQ_UINT64)24*(TQ_UINT64)134774; + now *= (TQ_UINT64)10000000; bl->timestamp = KFromToLittleEndian( now ); for ( uint i = 0; i<8; i++ ) { bl->challenge[i] = KApplication::random() % 0xff; @@ -312,7 +312,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo ) TQByteArray KNTLM::hmacMD5( const TQByteArray &data, const TQByteArray &key ) { - Q_UINT8 ipad[64], opad[64]; + TQ_UINT8 ipad[64], opad[64]; KMD5::Digest digest; TQByteArray ret; @@ -372,18 +372,18 @@ void KNTLM::convertKey( unsigned char *key_56, void* ks ) TQByteArray KNTLM::QString2UnicodeLE( const TQString &target ) { - TQByteArray unicode( target.length() * 2 ); + TQByteArray tqunicode( target.length() * 2 ); for ( uint i = 0; i < target.length(); i++ ) { - ((Q_UINT16*)unicode.data())[ i ] = KFromToLittleEndian( target[i].unicode() ); + ((TQ_UINT16*)tqunicode.data())[ i ] = KFromToLittleEndian( target[i].tqunicode() ); } - return unicode; + return tqunicode; } TQString KNTLM::UnicodeLE2TQString( const TQChar* data, uint len ) { TQString ret; for ( uint i = 0; i < len; i++ ) { - ret += KFromToLittleEndian( data[ i ].unicode() ); + ret += KFromToLittleEndian( data[ i ].tqunicode() ); } return ret; } diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h index 9be4ea357..8a89001ab 100644 --- a/kio/misc/kntlm/kntlm.h +++ b/kio/misc/kntlm/kntlm.h @@ -70,9 +70,9 @@ public: typedef struct { - Q_UINT16 len; - Q_UINT16 maxlen; - Q_UINT32 offset; + TQ_UINT16 len; + TQ_UINT16 maxlen; + TQ_UINT32 offset; } SecBuf; /** @@ -81,8 +81,8 @@ public: typedef struct { char signature[8]; /* "NTLMSSP\0" */ - Q_UINT32 msgType; /* 1 */ - Q_UINT32 flags; + TQ_UINT32 msgType; /* 1 */ + TQ_UINT32 flags; SecBuf domain; SecBuf workstation; } Negotiate; @@ -93,11 +93,11 @@ public: typedef struct { char signature[8]; - Q_UINT32 msgType; /* 2 */ + TQ_UINT32 msgType; /* 2 */ SecBuf targetName; - Q_UINT32 flags; - Q_UINT8 challengeData[8]; - Q_UINT32 context[2]; + TQ_UINT32 flags; + TQ_UINT8 challengeData[8]; + TQ_UINT32 context[2]; SecBuf targetInfo; } Challenge; @@ -107,23 +107,23 @@ public: typedef struct { char signature[8]; - Q_UINT32 msgType; /* 3 */ + TQ_UINT32 msgType; /* 3 */ SecBuf lmResponse; SecBuf ntResponse; SecBuf domain; SecBuf user; SecBuf workstation; SecBuf sessionKey; - Q_UINT32 flags; + TQ_UINT32 flags; } Auth; typedef struct { - Q_UINT32 signature; - Q_UINT32 reserved; - Q_UINT64 timestamp; - Q_UINT8 challenge[8]; - Q_UINT8 unknown[4]; + TQ_UINT32 signature; + TQ_UINT32 reserved; + TQ_UINT64 timestamp; + TQ_UINT8 challenge[8]; + TQ_UINT8 unknown[4]; //Target info block - variable length } Blob; @@ -139,7 +139,7 @@ public: */ static bool getNegotiate( TQByteArray &negotiate, const TQString &domain = TQString::null, const TQString &workstation = TQString::null, - Q_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM ); + TQ_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM ); /** * Creates the type 3 message which should be sent to the server after * the challenge (type 2) received. @@ -212,7 +212,7 @@ public: /** * Extracts a string field from an NTLM structure. */ - static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode ); + static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode ); /** * Extracts a byte array from an NTLM structure. */ @@ -226,7 +226,7 @@ private: static TQString UnicodeLE2TQString( const TQChar* data, uint len ); static void addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data ); - static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = false ); + static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode = false ); static void convertKey( unsigned char *key_56, void* ks ); }; diff --git a/kio/misc/kntlm/kswap.h b/kio/misc/kntlm/kswap.h index 336321fd4..9eca243de 100644 --- a/kio/misc/kntlm/kswap.h +++ b/kio/misc/kntlm/kswap.h @@ -47,52 +47,52 @@ #ifdef HAVE_BYTESWAP_H #include <byteswap.h> - inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return bswap_16( b ); } - inline Q_INT16 KSWAP_16( Q_INT16 b ) { return bswap_16( (Q_UINT16)b ); } - inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return bswap_32( b ); } - inline Q_INT32 KSWAP_32( Q_INT32 b ) { return bswap_32( (Q_UINT32)b ); } - inline Q_UINT64 KSWAP_64( Q_UINT64 b ) { return bswap_64( b ); } - inline Q_INT64 KSWAP_64( Q_INT64 b ) { return bswap_64( (Q_UINT64)b ); } + inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return bswap_16( b ); } + inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return bswap_16( (TQ_UINT16)b ); } + inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return bswap_32( b ); } + inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return bswap_32( (TQ_UINT32)b ); } + inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) { return bswap_64( b ); } + inline TQ_INT64 KSWAP_64( TQ_INT64 b ) { return bswap_64( (TQ_UINT64)b ); } #else /* HAVE_BYTESWAP_H */ #ifdef WORDS_BIGENDIAN - inline Q_UINT16 KSWAP_16( Q_UINT16 b ) + inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return (((b) & 0x00ff) << 8 | ((b) & 0xff00) >> 8); } - inline Q_INT16 KSWAP_16( Q_INT16 b ) + inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { - return ((((Q_UINT16)b) & 0x00ff) << 8 | (((Q_UINT16)b) & 0xff00) >> 8); + return ((((TQ_UINT16)b) & 0x00ff) << 8 | (((TQ_UINT16)b) & 0xff00) >> 8); } - inline Q_UINT32 KSWAP_32( Q_UINT32 b ) + inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return ((((b) & 0xff000000) >> 24) | (((b) & 0x00ff0000) >> 8) | \ (((b) & 0x0000ff00) << 8) | (((b) & 0x000000ff) << 24)); } - inline Q_INT32 KSWAP_32( Q_INT32 b ) + inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return - (((((Q_UINT32)b) & 0xff000000) >> 24) | ((((Q_UINT32)b) & 0x00ff0000) >> 8) | \ - ((((Q_UINT32)b) & 0x0000ff00) << 8) | ((((Q_UINT32)b) & 0x000000ff) << 24)); + (((((TQ_UINT32)b) & 0xff000000) >> 24) | ((((TQ_UINT32)b) & 0x00ff0000) >> 8) | \ + ((((TQ_UINT32)b) & 0x0000ff00) << 8) | ((((TQ_UINT32)b) & 0x000000ff) << 24)); } #else /* WORDS_BIGENDIAN */ #include <sys/types.h> #include <netinet/in.h> - inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return htons(b); } - inline Q_INT16 KSWAP_16( Q_INT16 b ) { return htons((Q_UINT16)b); } - inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return htonl(b); } - inline Q_INT32 KSWAP_32( Q_INT32 b ) { return htonl((Q_UINT32)b); } + inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return htons(b); } + inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return htons((TQ_UINT16)b); } + inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return htonl(b); } + inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return htonl((TQ_UINT32)b); } #endif - inline Q_UINT64 KSWAP_64( Q_UINT64 b ) + inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) { union { - Q_UINT64 ll; - Q_UINT32 l[2]; + TQ_UINT64 ll; + TQ_UINT32 l[2]; } w, r; w.ll = b; r.l[0] = KSWAP_32( w.l[1] ); @@ -100,13 +100,13 @@ return r.ll; } - inline Q_INT64 KSWAP_64( Q_INT64 b ) + inline TQ_INT64 KSWAP_64( TQ_INT64 b ) { union { - Q_UINT64 ll; - Q_UINT32 l[2]; + TQ_UINT64 ll; + TQ_UINT32 l[2]; } w, r; - w.ll = (Q_UINT64) b; + w.ll = (TQ_UINT64) b; r.l[0] = KSWAP_32( w.l[1] ); r.l[1] = KSWAP_32( w.l[0] ); return r.ll; @@ -117,7 +117,7 @@ * \ingroup KSWAP * Converts a 16 bit unsigned value from/to big-endian byte order to/from the machine order. */ -inline Q_UINT16 KFromToBigEndian( Q_UINT16 b ) +inline TQ_UINT16 KFromToBigEndian( TQ_UINT16 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -130,7 +130,7 @@ inline Q_UINT16 KFromToBigEndian( Q_UINT16 b ) * \ingroup KSWAP * Converts a 16 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) +inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -143,7 +143,7 @@ inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit unsigned value from/to big-endian byte order to/from the machine order. */ -inline Q_UINT32 KFromToBigEndian( Q_UINT32 b ) +inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -156,7 +156,7 @@ inline Q_UINT32 KFromToBigEndian( Q_UINT32 b ) * \ingroup KSWAP * Converts a 32 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) +inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -169,7 +169,7 @@ inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit unsigned value from/to big-endian byte order to/from the machine order. */ -inline Q_UINT64 KFromToBigEndian( Q_UINT64 b ) +inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -182,7 +182,7 @@ inline Q_UINT64 KFromToBigEndian( Q_UINT64 b ) * \ingroup KSWAP * Converts a 64 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) +inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -195,7 +195,7 @@ inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit signed value from/to big-endian byte order to/from the machine order. */ -inline Q_INT16 KFromToBigEndian( Q_INT16 b ) +inline TQ_INT16 KFromToBigEndian( TQ_INT16 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -208,7 +208,7 @@ inline Q_INT16 KFromToBigEndian( Q_INT16 b ) * \ingroup KSWAP * Converts a 16 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len ) +inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -221,7 +221,7 @@ inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit signed value from/to big-endian byte order to/from the machine order. */ -inline Q_INT32 KFromToBigEndian( Q_INT32 b ) +inline TQ_INT32 KFromToBigEndian( TQ_INT32 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -234,7 +234,7 @@ inline Q_INT32 KFromToBigEndian( Q_INT32 b ) * \ingroup KSWAP * Converts a 32 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len ) +inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -247,7 +247,7 @@ inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit signed value from/to big-endian byte order to/from the machine order. */ -inline Q_INT64 KFromToBigEndian( Q_INT64 b ) +inline TQ_INT64 KFromToBigEndian( TQ_INT64 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -260,7 +260,7 @@ inline Q_INT64 KFromToBigEndian( Q_INT64 b ) * \ingroup KSWAP * Converts a 64 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len ) +inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -273,7 +273,7 @@ inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b ) +inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -286,7 +286,7 @@ inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b ) * \ingroup KSWAP * Converts a 16 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) +inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -299,7 +299,7 @@ inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b ) +inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -312,7 +312,7 @@ inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b ) * \ingroup KSWAP * Converts a 32 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) +inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -325,7 +325,7 @@ inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b ) +inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -338,7 +338,7 @@ inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b ) * \ingroup KSWAP * Converts a 64 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) +inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -351,7 +351,7 @@ inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit signed value from/to little-endian byte order to/from the machine order. */ -inline Q_INT16 KFromToLittleEndian( Q_INT16 b ) +inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -364,7 +364,7 @@ inline Q_INT16 KFromToLittleEndian( Q_INT16 b ) * \ingroup KSWAP * Converts a 16 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len ) +inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -377,7 +377,7 @@ inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit signed value from/to little-endian byte order to/from the machine order. */ -inline Q_INT32 KFromToLittleEndian( Q_INT32 b ) +inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -390,7 +390,7 @@ inline Q_INT32 KFromToLittleEndian( Q_INT32 b ) * \ingroup KSWAP * Converts a 32 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len ) +inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -403,7 +403,7 @@ inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit signed value from/to little-endian byte order to/from the machine order. */ -inline Q_INT64 KFromToLittleEndian( Q_INT64 b ) +inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -416,7 +416,7 @@ inline Q_INT64 KFromToLittleEndian( Q_INT64 b ) * \ingroup KSWAP * Converts a 64 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_INT64 *out, Q_INT64 *in, uint len ) +inline void KFromToLittleEndian( TQ_INT64 *out, TQ_INT64 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 7a84958f7..671c2a941 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -126,7 +126,7 @@ namespace KPAC return; } - int dot = m_hostname.find( '.' ); + int dot = m_hostname.tqfind( '.' ); if ( dot >= 0 ) { m_hostname.remove( 0, dot + 1 ); // remove one domain level diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h index 05d8569cc..82418882f 100644 --- a/kio/misc/kpac/downloader.h +++ b/kio/misc/kpac/downloader.h @@ -29,7 +29,7 @@ namespace KIO { class Job; } namespace KPAC { - class Downloader : public QObject + class Downloader : public TQObject { Q_OBJECT public: diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp index 6cba79db6..f843dc045 100644 --- a/kio/misc/kpac/proxyscout.cpp +++ b/kio/misc/kpac/proxyscout.cpp @@ -162,9 +162,9 @@ namespace KPAC // this particular case, simply calling setProtocol() on // it trashes the whole URL. int len = proxyURL.protocol().length(); - if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len ) + if ( !proxyURL.isValid() || proxy.tqfind( ":/", len ) != len ) proxy.prepend("http://"); - BlackList::Iterator it = m_blackList.find( proxy ); + BlackList::Iterator it = m_blackList.tqfind( proxy ); if ( it == m_blackList.end() ) return proxy; else if ( std::time( 0 ) - *it > 1800 ) // 30 minutes { diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp index 55faef8a1..243f5f9c2 100644 --- a/kio/misc/kpac/script.cpp +++ b/kio/misc/kpac/script.cpp @@ -49,7 +49,7 @@ TQString UString::qstring() const UString::UString( const TQString &s ) { UChar* data = new UChar[ s.length() ]; - std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) ); + std::memcpy( data, s.tqunicode(), s.length() * sizeof( UChar ) ); rep = Rep::create( data, s.length() ); } diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp index d84e4c297..b80a23d1b 100644 --- a/kio/misc/ksendbugmail/main.cpp +++ b/kio/misc/ksendbugmail/main.cpp @@ -101,11 +101,11 @@ int main(int argc, char **argv) { if (!fromaddr.isEmpty()) { TQString name = emailConfig.getSetting(KEMailSettings::RealName); if (!name.isEmpty()) - fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">"); + fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">"); } else { struct passwd *p; p = getpwuid(getuid()); - fromaddr = TQString::fromLatin1(p->pw_name); + fromaddr = TQString::tqfromLatin1(p->pw_name); fromaddr += "@"; char buffer[256]; buffer[0] = '\0'; @@ -117,7 +117,7 @@ int main(int argc, char **argv) { TQString server = emailConfig.getSetting(KEMailSettings::OutServer); if (server.isEmpty()) - server=TQString::fromLatin1("bugs.kde.org"); + server=TQString::tqfromLatin1("bugs.kde.org"); SMTP *sm = new SMTP; BugMailer bm(sm); @@ -129,7 +129,7 @@ int main(int argc, char **argv) { sm->setSenderAddress(fromaddr); sm->setRecipientAddress(recipient); sm->setMessageSubject(subject); - sm->setMessageHeader(TQString::fromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient)); + sm->setMessageHeader(TQString::tqfromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient.data())); sm->setMessageBody(text); sm->sendMessage(); diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp index 36a417b88..ac3e7b74f 100644 --- a/kio/misc/ksendbugmail/smtp.cpp +++ b/kio/misc/ksendbugmail/smtp.cpp @@ -74,22 +74,22 @@ void SMTP::setTimeOut(int timeout) void SMTP::setSenderAddress(const TQString& sender) { senderAddress = sender; - int index = senderAddress.find('<'); + int index = senderAddress.tqfind('<'); if (index == -1) return; senderAddress = senderAddress.mid(index + 1); - index = senderAddress.find('>'); + index = senderAddress.tqfind('>'); if (index != -1) senderAddress = senderAddress.left(index); senderAddress = senderAddress.simplifyWhiteSpace(); while (1) { - index = senderAddress.find(' '); + index = senderAddress.tqfind(' '); if (index != -1) senderAddress = senderAddress.mid(index + 1); // take one side else break; } - index = senderAddress.find('@'); + index = senderAddress.tqfind('@'); if (index == -1) senderAddress.append("@localhost"); // won't go through without a local mail system @@ -134,7 +134,7 @@ void SMTP::sendMessage(void) kdDebug() << "state was == FINISHED\n" << endl; finished = false; state = IN; - writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName); + writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName); write(sock->socket(), writeString.ascii(), writeString.length()); } if(connected){ @@ -218,7 +218,7 @@ void SMTP::socketRead(KSocket *socket) readBuffer[n] = '\0'; lineBuffer += readBuffer; - nl = lineBuffer.find('\n'); + nl = lineBuffer.tqfind('\n'); if(nl == -1) return; lastLine = lineBuffer.left(nl); @@ -249,7 +249,7 @@ void SMTP::processLine(TQString *line) int i, stat; TQString tmpstr; - i = line->find(' '); + i = line->tqfind(' '); tmpstr = line->left(i); if(i > 3) kdDebug() << "warning: SMTP status code longer then 3 digits: " << tmpstr << endl; @@ -262,7 +262,7 @@ void SMTP::processLine(TQString *line) switch(stat){ case GREET: //220 state = IN; - writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName); + writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName); kdDebug() << "out: " << writeString << endl; write(sock->socket(), writeString.ascii(), writeString.length()); break; @@ -273,19 +273,19 @@ void SMTP::processLine(TQString *line) switch(state){ case IN: state = READY; - writeString = TQString::fromLatin1("mail from: %1\r\n").arg(senderAddress); + writeString = TQString::tqfromLatin1("mail from: %1\r\n").arg(senderAddress); kdDebug() << "out: " << writeString << endl; write(sock->socket(), writeString.ascii(), writeString.length()); break; case READY: state = SENTFROM; - writeString = TQString::fromLatin1("rcpt to: %1\r\n").arg(recipientAddress); + writeString = TQString::tqfromLatin1("rcpt to: %1\r\n").arg(recipientAddress); kdDebug() << "out: " << writeString << endl; write(sock->socket(), writeString.ascii(), writeString.length()); break; case SENTFROM: state = SENTTO; - writeString = TQString::fromLatin1("data\r\n"); + writeString = TQString::tqfromLatin1("data\r\n"); kdDebug() << "out: " << writeString << endl; write(sock->socket(), writeString.ascii(), writeString.length()); break; @@ -305,11 +305,11 @@ void SMTP::processLine(TQString *line) break; case READYDATA: //354 state = DATA; - writeString = TQString::fromLatin1("Subject: %1\r\n").arg(messageSubject); + writeString = TQString::tqfromLatin1("Subject: %1\r\n").arg(messageSubject); writeString += messageHeader; writeString += "\r\n"; writeString += messageBody; - writeString += TQString::fromLatin1(".\r\n"); + writeString += TQString::tqfromLatin1(".\r\n"); kdDebug() << "out: " << writeString; write(sock->socket(), writeString.ascii(), writeString.length()); break; diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 9e8b85574..1a7cc1edf 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -72,7 +72,7 @@ static void updatePoliciesConfig(KConfig *cfg) { cfg->setGroup(*i); // remove it if it has expired - if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::currentDateTime()) { + if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::tqcurrentDateTime()) { cfg->deleteGroup(*i); continue; } @@ -164,7 +164,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (node->permanent || - node->expires > TQDateTime::currentDateTime()) { + node->expires > TQDateTime::tqcurrentDateTime()) { // First convert to a binary format and then write the // kconfig entry write the (CN, policy, cert) to // KSimpleConfig @@ -239,7 +239,7 @@ TQStringList groups = cfg->groupList(); // remove it if it has expired if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { cfg->deleteGroup(*i); continue; } @@ -278,9 +278,9 @@ KSSLCNode *node; node->permanent = permanent; if (!permanent) { - node->expires = TQDateTime::currentDateTime(); + node->expires = TQDateTime::tqcurrentDateTime(); // FIXME: make this configurable - node->expires = node->expires.addSecs(3600); + node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(3600)); } cacheSaveToDisk(); @@ -297,8 +297,8 @@ KSSLCNode *node; certList.prepend(n); if (!permanent) { - n->expires = TQDateTime::currentDateTime(); - n->expires = n->expires.addSecs(3600); + n->expires = TQDateTime::tqcurrentDateTime(); + n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(3600)); } searchAddCert(n->cert); @@ -312,7 +312,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) { if (!node->permanent && - node->expires < TQDateTime::currentDateTime()) { + node->expires < TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -338,7 +338,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && - node->expires < TQDateTime::currentDateTime()) { + node->expires < TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -362,7 +362,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) { if (!node->permanent && - node->expires < TQDateTime::currentDateTime()) { + node->expires < TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -386,7 +386,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && - node->expires < TQDateTime::currentDateTime()) { + node->expires < TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -410,7 +410,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && node->expires < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -535,7 +535,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && node->expires < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); searchRemoveCert(node->cert); @@ -563,7 +563,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && node->expires < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); searchRemoveCert(node->cert); @@ -572,7 +572,7 @@ KSSLCNode *node; return false; } - if (!node->hosts.contains(host)) { + if (!node->hosts.tqcontains(host)) { node->hosts << host; } @@ -593,7 +593,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && node->expires < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); searchRemoveCert(node->cert); @@ -623,8 +623,8 @@ void KSSLD::caVerifyUpdate() { return; cfg->setGroup(TQString::null); - Q_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); - Q_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); + TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); + TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); if (oldStamp != newStamp) { caRegenerate(); @@ -857,14 +857,14 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) { cert->getEmails(mails); for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) { TQString email = static_cast<const TQString &>(*iter).lower(); - TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email); if (it == skEmail.end()) it = skEmail.insert(email, TQPtrVector<KSSLCertificate>()); TQPtrVector<KSSLCertificate> &elem = *it; - if (elem.findRef(cert) == -1) { + if (elem.tqfindRef(cert) == -1) { unsigned int n = 0; for(; n < elem.size(); n++) { if (!elem.at(n)) { @@ -887,14 +887,14 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) { TQStringList mails; cert->getEmails(mails); for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) { - TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(static_cast<const TQString &>(*iter).lower()); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(static_cast<const TQString &>(*iter).lower()); if (it == skEmail.end()) break; TQPtrVector<KSSLCertificate> &elem = *it; - int n = elem.findRef(cert); + int n = elem.tqfindRef(cert); if (n != -1) elem.remove(n); } @@ -903,7 +903,7 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) { TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) { TQStringList rc; - TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email.lower()); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email.lower()); kdDebug() << "GETKDEKey " << email.latin1() << endl; @@ -924,7 +924,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) { KSSLCertificate KSSLD::getCertByMD5Digest(const TQString &key) { - TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.find(key); + TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.tqfind(key); kdDebug() << "Searching cert for " << key.latin1() << endl; diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui index ecf2d236f..60b75da28 100644 --- a/kio/misc/kwalletd/kbetterthankdialogbase.ui +++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KBetterThanKDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KBetterThanKDialogBase</cstring> </property> @@ -37,14 +37,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>21</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layout1</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_allowOnce</cstring> </property> @@ -63,7 +63,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_allowAlways</cstring> </property> @@ -71,7 +71,7 @@ <string>Allow &Always</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_deny</cstring> </property> @@ -79,7 +79,7 @@ <string>&Deny</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_denyForever</cstring> </property> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -140,13 +140,13 @@ <include location="global" impldecl="in declaration">kactivelabel.h</include> <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">clicked()</slot> - <slot>setLabel( const QString & label )</slot> + <slot>setLabel( const TQString & label )</slot> <slot access="private">init()</slot> <slot access="protected">accept()</slot> <slot access="protected">reject()</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp index c431ecf69..d4c87bd28 100644 --- a/kio/misc/kwalletd/ktimeout.cpp +++ b/kio/misc/kwalletd/ktimeout.cpp @@ -39,7 +39,7 @@ void KTimeout::clear() { void KTimeout::removeTimer(int id) { - TQTimer *t = _timers.find(id); + TQTimer *t = _timers.tqfind(id); if (t != 0L) { _timers.remove(id); // autodeletes } @@ -47,7 +47,7 @@ void KTimeout::removeTimer(int id) { void KTimeout::addTimer(int id, int timeout) { - if (_timers.find(id) != 0L) { + if (_timers.tqfind(id) != 0L) { return; } @@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) { void KTimeout::resetTimer(int id, int timeout) { - TQTimer *t = _timers.find(id); + TQTimer *t = _timers.tqfind(id); if (t) { t->changeInterval(timeout); } diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 069575710..2cd8cd406 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -121,7 +121,7 @@ int KWalletD::generateHandle() { // ASSUMPTION: RAND_MAX is fairly large. do { rc = rand(); - } while (_wallets.find(rc) || rc == 0); + } while (_wallets.tqfind(rc) || rc == 0); return rc; } @@ -308,7 +308,7 @@ void KWalletD::checkActiveDialog() { } int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) { - if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet())) { + if (_firstUse && !wallets().tqcontains(KWallet::Wallet::LocalWallet())) { // First use wizard KWalletWizard *wiz = new KWalletWizard(0); setupDialog( wiz, wId, appid, modal ); @@ -529,11 +529,11 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool KApplication::startServiceByDesktopName("kwalletmanager-kwalletd"); } } else { - if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { + if (!_handles[appid].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { return -1; } _handles[appid].append(rc); - _wallets.find(rc)->ref(); + _wallets.tqfind(rc)->ref(); } return rc; @@ -567,7 +567,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W KConfig cfg("kwalletrc"); cfg.setGroup("Auto Allow"); TQStringList apps = cfg.readListEntry(wallet); - if (!apps.contains(thisApp)) { + if (!apps.tqcontains(thisApp)) { apps += thisApp; _implicitAllowMap[wallet] += thisApp; cfg.writeEntry(wallet, apps); @@ -578,7 +578,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W KConfig cfg("kwalletrc"); cfg.setGroup("Auto Deny"); TQStringList apps = cfg.readListEntry(wallet); - if (!apps.contains(thisApp)) { + if (!apps.tqcontains(thisApp)) { apps += thisApp; _implicitDenyMap[wallet] += thisApp; cfg.writeEntry(wallet, apps); @@ -646,7 +646,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin return; } - w = _wallets.find(handle); + w = _wallets.tqfind(handle); reclose = true; } else { handle = it.currentKey(); @@ -712,12 +712,12 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { const TQString& wallet = w->walletName(); assert(_passwords.contains(wallet)); if (w->refCount() == 0 || force) { - invalidateHandle(handle); + tqinvalidateHandle(handle); if (_closeIdle && _timeouts) { _timeouts->removeTimer(handle); } _wallets.remove(handle); - if (_passwords.contains(wallet)) { + if (_passwords.tqcontains(wallet)) { w->close(TQByteArray().duplicate(_passwords[wallet].data(), _passwords[wallet].length())); _passwords[wallet].fill(0); _passwords.remove(wallet); @@ -735,14 +735,14 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { int KWalletD::close(int handle, bool force) { TQCString appid = friendlyDCOPPeerName(); - KWallet::Backend *w = _wallets.find(handle); + KWallet::Backend *w = _wallets.tqfind(handle); bool contains = false; if (w) { // the handle is valid - if (_handles.contains(appid)) { // we know this app - if (_handles[appid].contains(handle)) { + if (_handles.tqcontains(appid)) { // we know this app + if (_handles[appid].tqcontains(handle)) { // the app owns this handle - _handles[appid].remove(_handles[appid].find(handle)); + _handles[appid].remove(_handles[appid].tqfind(handle)); contains = true; if (_handles[appid].isEmpty()) { _handles.remove(appid); @@ -757,9 +757,9 @@ int KWalletD::close(int handle, bool force) { } _wallets.remove(handle); if (force) { - invalidateHandle(handle); + tqinvalidateHandle(handle); } - if (_passwords.contains(w->walletName())) { + if (_passwords.tqcontains(w->walletName())) { w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length())); _passwords[w->walletName()].fill(0); _passwords.remove(w->walletName()); @@ -792,7 +792,7 @@ bool KWalletD::isOpen(int handle) { return false; } - KWallet::Backend *rc = _wallets.find(handle); + KWallet::Backend *rc = _wallets.tqfind(handle); if (rc == 0 && ++_failed > 5) { _failed = 0; @@ -812,8 +812,8 @@ TQStringList KWalletD::wallets() const { dir.setFilter(TQDir::Files | TQDir::NoSymLinks); - const QFileInfoList *list = dir.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = dir.entryInfoList(); + TQFileInfoListIterator it(*list); TQFileInfo *fi; while ((fi = it.current()) != 0L) { TQString fn = fi->fileName(); @@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke void KWalletD::slotAppUnregistered(const TQCString& app) { - if (_handles.contains(app)) { + if (_handles.tqcontains(app)) { TQValueList<int> l = _handles[app]; for (TQValueList<int>::Iterator i = l.begin(); i != l.end(); ++i) { _handles[app].remove(*i); - KWallet::Backend *w = _wallets.find(*i); + KWallet::Backend *w = _wallets.tqfind(*i); if (w && !_leaveOpen && 0 == w->deref()) { close(w->walletName(), true); } @@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) { } -void KWalletD::invalidateHandle(int handle) { +void KWalletD::tqinvalidateHandle(int handle) { for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin(); i != _handles.end(); ++i) { @@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) { return 0L; } - KWallet::Backend *w = _wallets.find(handle); + KWallet::Backend *w = _wallets.tqfind(handle); if (w) { // the handle is valid - if (_handles.contains(appid)) { // we know this app - if (_handles[appid].contains(handle)) { + if (_handles.tqcontains(appid)) { // we know this app + if (_handles[appid].tqcontains(handle)) { // the app owns this handle _failed = 0; if (_closeIdle && _timeouts) { @@ -1285,7 +1285,7 @@ TQStringList KWalletD::users(const TQString& wallet) const { ++it) { if (it.current()->walletName() == wallet) { for (TQMap<TQCString,TQValueList<int> >::ConstIterator hit = _handles.begin(); hit != _handles.end(); ++hit) { - if (hit.data().contains(it.currentKey())) { + if (hit.data().tqcontains(it.currentKey())) { rc += hit.key(); } } @@ -1302,7 +1302,7 @@ bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& ap it.current(); ++it) { if (it.current()->walletName() == wallet) { - if (_handles[application].contains(it.currentKey())) { + if (_handles[application].tqcontains(it.currentKey())) { _handles[application].remove(it.currentKey()); if (_handles[application].isEmpty()) { @@ -1416,7 +1416,7 @@ bool KWalletD::isEnabled() const { bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) { - if (!wallets().contains(wallet)) { + if (!wallets().tqcontains(wallet)) { return true; } @@ -1435,7 +1435,7 @@ bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) { - if (!wallets().contains(wallet)) { + if (!wallets().tqcontains(wallet)) { return true; } @@ -1454,12 +1454,12 @@ bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, c bool KWalletD::implicitAllow(const TQString& wallet, const TQCString& app) { - return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app)); + return _implicitAllowMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); } bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) { - return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app)); + return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); } @@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() { if (!dc) { return ""; } - return dc->senderId().replace(TQRegExp("-[0-9]+$"), ""); + return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), ""); } void KWalletD::timedOut(int id) { - KWallet::Backend *w = _wallets.find(id); + KWallet::Backend *w = _wallets.tqfind(id); if (w) { closeWallet(w, id, true); } diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h index 2aea371ba..ba83b4efc 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 invalidateHandle(int handle); + void tqinvalidateHandle(int handle); // Emit signals about closing wallets void doCloseSignals(int,const TQString&); void emitFolderUpdated(const TQString&, const TQString&); diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui index 609508e11..809993077 100644 --- a/kio/misc/kwalletd/kwalletwizard.ui +++ b/kio/misc/kwalletd/kwalletwizard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWalletWizard</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>KWalletWizard</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>KDE Wallet Wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page1</cstring> </property> @@ -36,14 +36,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -58,11 +58,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -83,11 +83,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QButtonGroup" row="2" column="1"> + <widget class="TQButtonGroup" row="2" column="1"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -104,7 +104,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>_basic</cstring> </property> @@ -115,7 +115,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>_advanced</cstring> </property> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>21</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>31</height> @@ -161,7 +161,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page4</cstring> </property> @@ -172,7 +172,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -185,7 +185,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page2</cstring> </property> @@ -196,7 +196,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -207,7 +207,7 @@ <enum>RichText</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> <cstring>layout7</cstring> </property> @@ -215,7 +215,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -223,7 +223,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -233,14 +233,14 @@ <property name="text"> <string>Enter a new password:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>_pass1</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -250,7 +250,7 @@ <property name="text"> <string>Verify password:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -259,7 +259,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -267,7 +267,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>_pass1</cstring> </property> @@ -278,7 +278,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>_pass2</cstring> </property> @@ -293,7 +293,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>_useWallet</cstring> </property> @@ -311,7 +311,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -328,7 +328,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>21</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>31</height> @@ -362,27 +362,27 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>70</height> </size> </property> </spacer> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>_matchLabel</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page3</cstring> </property> @@ -393,7 +393,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -403,7 +403,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -417,14 +417,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>121</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_networkWallet</cstring> </property> @@ -432,7 +432,7 @@ <string>Store network passwords and local passwords in separate wallet files</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>_closeIdle</cstring> </property> @@ -450,7 +450,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -530,16 +530,16 @@ <tabstop>_pass2</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">qcheckbox.h</include> + <include location="global" impldecl="in declaration">tqcheckbox.h</include> <include location="global" impldecl="in implementation">klocale.h</include> <include location="local" impldecl="in implementation">kwalletwizard.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">passwordPageUpdate()</slot> <slot access="private">init()</slot> <slot>setAdvanced()</slot> <slot>setBasic()</slot> <slot access="private">destroy()</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index b1d060f21..0524d60b3 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -99,7 +99,7 @@ class UIServerSystemTray:public KSystemTray pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); setPixmap(loadIcon("filesave")); //actionCollection()->action("file_quit")->setEnabled(true); - KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection()); } }; @@ -272,8 +272,8 @@ void ProgressItem::setPercent( unsigned long percent ) { void ProgressItem::setInfoMessage( const TQString & msg ) { TQString plainTextMsg(msg); - plainTextMsg.replace( TQRegExp( "</?b>" ), TQString::null ); - plainTextMsg.replace( TQRegExp( "<img.*>" ), TQString::null ); + plainTextMsg.tqreplace( TQRegExp( "</?b>" ), TQString() ); + plainTextMsg.tqreplace( TQRegExp( "<img.*>" ), TQString() ); setText( ListProgress::TB_PROGRESS, plainTextMsg ); defaultProgress->slotInfoMessage( 0, msg ); @@ -596,10 +596,10 @@ UIServer::UIServer() // setup toolbar toolBar()->insertButton("editdelete", TOOL_CANCEL, - TQT_SIGNAL(clicked()), this, + TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); toolBar()->insertButton("configure", TOOL_CONFIGURE, - TQT_SIGNAL(clicked()), this, + TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), true, i18n("Settings...")); toolBar()->setBarPos( KToolBar::Left ); @@ -1195,7 +1195,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta, kdDebug(7024) << "ssl_cert_errors=" << meta["ssl_cert_errors"] << endl; kid->setCertState(meta["ssl_cert_errors"]); - TQString ip = meta.contains("ssl_proxied") ? "" : meta["ssl_peer_ip"]; + TQString ip = meta.tqcontains("ssl_proxied") ? "" : meta["ssl_peer_ip"]; kid->setup( x, ip, url, // the URL @@ -1291,7 +1291,7 @@ TQByteArray UIServer::open_RenameDlg64( int id, kdDebug(7024) << "KIO::open_RenameDlg done" << endl; TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); - stream << Q_UINT8(result) << newDest; + stream << TQ_UINT8(result) << newDest; if ( item && result != KIO::R_CANCEL ) setItemVisible( item, true ); return data; diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp index 0c8470a61..64167d9ea 100644 --- a/kio/tests/dataprotocoltest.cpp +++ b/kio/tests/dataprotocoltest.cpp @@ -47,7 +47,7 @@ public: // meta_data[key] = value; // cout << "§ " << key << " = " << value << endl; TQString prefix = "Metadata[\""+key+"\"]: "; - KIO::MetaData::Iterator it = attributes_expected.find(key); + KIO::MetaData::Iterator it = attributes_expected.tqfind(key); if (it != attributes_expected.end()) { testStrings(prefix,it.data(),value); // remove key from map diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index 9fe4b4c49..93b250075 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -532,7 +532,7 @@ void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst ) void JobTest::copyFileToSystem() { - if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) { + if ( !KProtocolInfo::isKnownProtocol( TQString::tqfromLatin1( "system" ) ) ) { kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl; return; } diff --git a/kio/tests/jobtest.h b/kio/tests/jobtest.h index 533ffba8c..83ec2da7c 100644 --- a/kio/tests/jobtest.h +++ b/kio/tests/jobtest.h @@ -24,7 +24,7 @@ #include <tqobject.h> #include <kio/job.h> -class JobTest : public QObject +class JobTest : public TQObject { Q_OBJECT diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp index 58ae319b2..372589dd9 100644 --- a/kio/tests/kacltest.cpp +++ b/kio/tests/kacltest.cpp @@ -80,22 +80,22 @@ int main(int argc, char *argv[]) } #ifdef Q_OS_FREEBSD -static const TQString s_group1 = TQString::fromLatin1("staff"); -static const TQString s_group2 = TQString::fromLatin1("guest"); +static const TQString s_group1 = TQString::tqfromLatin1("staff"); +static const TQString s_group2 = TQString::tqfromLatin1("guest"); #else -static const TQString s_group1 = TQString::fromLatin1("audio"); -static const TQString s_group2 = TQString::fromLatin1("users"); +static const TQString s_group1 = TQString::tqfromLatin1("audio"); +static const TQString s_group2 = TQString::tqfromLatin1("users"); #endif -static const TQString s_testACL = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::rwx\nother::r--\n" ); -static const TQString s_testACL2 = TQString::fromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") + - TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) + - TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) + - TQString::fromLatin1( "mask::r-x\nother::r--\n" ); -static const TQString s_testACLEffective = TQString::fromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) + - TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) + - TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) + - TQString::fromLatin1( "mask::r-x\nother::r--\n" ); +static const TQString s_testACL = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::rwx\nother::r--\n" ); +static const TQString s_testACL2 = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") + + TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) + + TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) + + TQString::tqfromLatin1( "mask::r-x\nother::r--\n" ); +static const TQString s_testACLEffective = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) + + TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) + + TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) + + TQString::tqfromLatin1( "mask::r-x\nother::r--\n" ); KACLTest::KACLTest() :m_acl( s_testACL ) @@ -265,8 +265,8 @@ void KACLTest::testSettingExtended() // groups, all and named - const TQString expected2 = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 + - TQString::fromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::fromLatin1(":r--\nmask::rwx\nother::r--\n" ); + const TQString expected2 = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 + + TQString::tqfromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::tqfromLatin1(":r--\nmask::rwx\nother::r--\n" ); CharlesII.setACL( s_testACL ); // reset ACLGroupPermissionsList groups; ACLGroupPermissions group = qMakePair( s_group1, ( unsigned short )3 ); diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h index c3572d929..9a76e6246 100644 --- a/kio/tests/kdcopcheck.h +++ b/kio/tests/kdcopcheck.h @@ -5,7 +5,7 @@ #include <tqstring.h> #include <tqobject.h> -class TestService : public QObject +class TestService : public TQObject { Q_OBJECT public: diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp index a831041e1..c2a642c1f 100644 --- a/kio/tests/kdefaultprogresstest.cpp +++ b/kio/tests/kdefaultprogresstest.cpp @@ -18,7 +18,7 @@ int main(int argc, char **argv) dlg->slotTotalDirs( 0L, 1 ); dlg->slotSpeed( 0L, 55 ); - dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Starting..." ) ); + dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Starting..." ) ); int files = 0; for ( int size = 0 ; size < 12000 ; size += 1 ) @@ -31,7 +31,7 @@ int main(int argc, char **argv) } kapp->processEvents(); } - dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) ); + dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Done." ) ); delete dlg; return 0; diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp index 6137f5e71..8acef5b24 100644 --- a/kio/tests/kdirlistertest.cpp +++ b/kio/tests/kdirlistertest.cpp @@ -47,7 +47,7 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) layout->addWidget( startR ); layout->addWidget( startT ); layout->addWidget( test ); - resize( layout->sizeHint() ); + resize( layout->tqsizeHint() ); connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); diff --git a/kio/tests/kdirlistertest.h b/kio/tests/kdirlistertest.h index 6b1e831f5..12e72c911 100644 --- a/kio/tests/kdirlistertest.h +++ b/kio/tests/kdirlistertest.h @@ -31,7 +31,7 @@ using namespace std; -class PrintSignals : public QObject +class PrintSignals : public TQObject { Q_OBJECT public: @@ -98,7 +98,7 @@ public slots: { cout << "*** speed: " << bytes_per_second << endl; } }; -class KDirListerTest : public QWidget +class KDirListerTest : public TQWidget { Q_OBJECT public: diff --git a/kio/tests/kdirwatchunittest.cpp b/kio/tests/kdirwatchunittest.cpp index 1bd17edd6..870b85de9 100644 --- a/kio/tests/kdirwatchunittest.cpp +++ b/kio/tests/kdirwatchunittest.cpp @@ -26,7 +26,7 @@ void KDirWatchTest::VERIFY_NOTHING() for (int i = 0; i < 20; ++i) { usleep(100*1000); - qApp->processEvents(); + tqApp->processEvents(); } bool nothing_failed = true; @@ -47,7 +47,7 @@ void KDirWatchTest::VERIFY_DIRTY(const TQString& alert) for (int i = 0; i < 20; ++i) { usleep(100*1000); - qApp->processEvents(); + tqApp->processEvents(); } VERIFY (m_s[sigCreated] == m_signals[sigCreated] && @@ -64,7 +64,7 @@ void KDirWatchTest::VERIFY_CREATED(const TQString& alert) for (int i = 0; i < 20; ++i) { usleep(100*1000); - qApp->processEvents(); + tqApp->processEvents(); } VERIFY (m_s[sigDirty] == m_signals[sigDirty] && @@ -81,7 +81,7 @@ void KDirWatchTest::VERIFY_DELETED(const TQString& alert) for (int i = 0; i < 20; ++i) { usleep(100*1000); - qApp->processEvents(); + tqApp->processEvents(); } VERIFY (m_s[sigDirty] == m_signals[sigDirty] && diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index 0db23457d..5689aaae9 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -144,24 +144,24 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) hbLayout = new TQHBoxLayout( topLayout, 15 ); pbStart = new TQPushButton( "&Start", main_widget ); - pbStart->setFixedSize( pbStart->sizeHint() ); + pbStart->setFixedSize( pbStart->tqsizeHint() ); connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); - pbStop->setFixedSize( pbStop->sizeHint() ); + pbStop->setFixedSize( pbStop->tqsizeHint() ); pbStop->setEnabled( false ); connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); hbLayout->addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); - close->setFixedSize( close->sizeHint() ); + close->setFixedSize( close->tqsizeHint() ); connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); - main_widget->setMinimumSize( main_widget->sizeHint() ); + main_widget->setMinimumSize( main_widget->tqsizeHint() ); setCentralWidget( main_widget ); slave = 0; @@ -545,7 +545,7 @@ int main(int argc, char **argv) { KioslaveTest test( src, dest, op, pr ); test.show(); // Bug in KTMW / Qt / layouts ? - test.resize( test.sizeHint() ); + test.resize( test.tqsizeHint() ); app.setMainWidget(&test); app.exec(); diff --git a/kio/tests/kruntest.h b/kio/tests/kruntest.h index 8cbc7af53..68e7a7280 100644 --- a/kio/tests/kruntest.h +++ b/kio/tests/kruntest.h @@ -40,7 +40,7 @@ public: class TQPushButton; -class Receiver : public QWidget +class Receiver : public TQWidget { Q_OBJECT public: diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp index 4a4fcabb0..a9fa8198a 100644 --- a/kio/tests/ksycocatest.cpp +++ b/kio/tests/ksycocatest.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption TQCString instname = "kword"; - TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname ); + TQString desktopPath = TQString::tqfromLatin1( "Office/%1.desktop" ).arg( instname ); qDebug( "Looking for %s", desktopPath.latin1() ); KService::Ptr service = KService::serviceByDesktopPath( desktopPath ); if ( service ) diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp index 8e4b023cb..dca72c234 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -45,7 +45,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType if( abs_path ) { - m_filterData->setAbsolutePath( TQString::fromLatin1( abs_path ) ); + m_filterData->setAbsolutePath( TQString::tqfromLatin1( abs_path ) ); kdDebug() << "Filtering: " << a << " with abs_path=" << abs_path << endl; } else @@ -98,7 +98,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType { // Hack for other locales than english, normalize google hosts to google.com cmd = cmd.replace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" ); - if ( cmd != TQString::fromLatin1( expectedResult ) ) + if ( cmd != TQString::tqfromLatin1( expectedResult ) ) { kdError() << " Got " << cmd << " expected " << expectedResult << endl; ::exit(1); diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp index 612dab558..4750636b8 100644 --- a/kio/tests/kurlcompletiontest.cpp +++ b/kio/tests/kurlcompletiontest.cpp @@ -96,8 +96,8 @@ void KURLCompletionTest::testLocalRelativePath() waitForCompletion(); TQStringList comp1all = m_completion->allMatches(); assert( comp1all.count() == 2 ); - assert( comp1all.find( "file1" ) != comp1all.end() ); - assert( comp1all.find( "file#a" ) != comp1all.end() ); + assert( comp1all.tqfind( "file1" ) != comp1all.end() ); + assert( comp1all.tqfind( "file#a" ) != comp1all.end() ); TQString comp1 = m_completion->replacedPath( "file1" ); // like KURLRequester does assert( comp1 == "file1" ); @@ -138,9 +138,9 @@ void KURLCompletionTest::testLocalURL() TQStringList comp1all = m_completion->allMatches(); kdDebug() << comp1all << endl; assert( comp1all.count() == 2 ); - assert( comp1all.find( m_dirURL.url() + "file1" ) != comp1all.end() ); + assert( comp1all.tqfind( m_dirURL.url() + "file1" ) != comp1all.end() ); TQString filehash = m_dirURL.url() + "file%23a"; - assert( comp1all.find( filehash ) != comp1all.end() ); + assert( comp1all.tqfind( filehash ) != comp1all.end() ); TQString filehashPath = m_completion->replacedPath( filehash ); // note that it returns a path!! kdDebug() << filehashPath << endl; assert( filehashPath == m_dirURL.path() + "file#a" ); diff --git a/kio/tests/previewtest.h b/kio/tests/previewtest.h index a7e1727d6..27d797403 100644 --- a/kio/tests/previewtest.h +++ b/kio/tests/previewtest.h @@ -6,7 +6,7 @@ class KLineEdit; class TQLabel; class KFileItem; -class PreviewTest : public QWidget +class PreviewTest : public TQWidget { Q_OBJECT public: |