diff options
Diffstat (limited to 'kio')
273 files changed, 2359 insertions, 2359 deletions
diff --git a/kio/DESIGN b/kio/DESIGN index 6cd25dcbb..30a037c81 100644 --- a/kio/DESIGN +++ b/kio/DESIGN @@ -91,7 +91,7 @@ job. (This is a quite unlikely situation, but nevertheless possible)) File Operations: -listRecursive is implemented as listDir and tqfinding out if in the result +listRecursive is implemented as listDir and finding out if in the result is a directory. If there is, another listDir job is issued. As listDir is a readonly operation it fails when a directory isn't readable .. but the main job goes on and discards the error, because @@ -99,11 +99,11 @@ bIgnoreSubJobsError is true, which is what we want (David) del is implemented as listRecursive, removing all files and removing all empty directories. This basically means if one directory isn't readable - we don't remove it as listRecursive didn't tqfind it. But the del will later + we don't remove it as listRecursive didn't find it. But the del will later on try to remove it's parent directory and fail. But there are cases when it would be possible to delete the dir in chmod the dir before. On the other hand del("/") shouldn't list the whole file system and remove all - user owned files just to tqfind out it can't remove everything else (this + user owned files just to find out it can't remove everything else (this basically means we have to take care of things we can remove before we try) ... Well, rm -rf / refuses to do anything, so we should just do the same: @@ -181,7 +181,7 @@ There will be two ways how the application can display progress : KMail : - app creates Job - app creates a progress dialog : this should be a ProgressBase descendant - e.g. tqStatusProgress or custom progress dialog + e.g. StatusProgress or custom progress dialog - app calls progress->setJob( job ) in order to connect job's signals with progress dialog slots @@ -197,7 +197,7 @@ B. customized progress dialogs - DefaultProgress ( former KIOSimpleProgressDialog ) that will be used for regular progress dialogs created by GUI Progress Server - - tqStatusProgress ( former KIOLittleProgressDialog ) that can be used for + - StatusProgress ( former KIOLittleProgressDialog ) that can be used for embedding in status bar C. GUI Progress Server diff --git a/kio/DESIGN.krun b/kio/DESIGN.krun index bd7846f9a..948ef79a3 100644 --- a/kio/DESIGN.krun +++ b/kio/DESIGN.krun @@ -2,7 +2,7 @@ konq_run / krun should determine the mimetype by actually getting the contents of the URL. It should then put the slave on hold and tell the job-scheduler which request the -slave is currently handling. (tqStatus: implemented in konq_run) +slave is currently handling. (Status: implemented in konq_run) Now krun/konq_run should determine which client should process the result of the request. @@ -10,17 +10,17 @@ result of the request. * When the client belongs to the same process, no action needs to be taken. When a new job is created for the request which is on hold the existing slave will be re-used and the request resumed. -(tqStatus: implemented) +(Status: implemented) * When the client is an external process, the on-hold-slave should be removed from the job-scheduler and should connect itself with klauncher. This is hard because it must ensure that the external program does not request the slave before it has been transfered to -klauncher. (tqStatus: to be done) +klauncher. (Status: to be done) * When a slave is on hold but not used for a certain period of time, or, when another slave is put on hold, the slave should be killed. -(tqStatus: almost done) +(Status: almost done) ===== diff --git a/kio/Makefile.am b/kio/Makefile.am index 2ad4dbddc..8349d4038 100644 --- a/kio/Makefile.am +++ b/kio/Makefile.am @@ -58,8 +58,8 @@ dummy.cpp: echo >dummy.cpp messages: - $(EXTRACTRC) `tqfind . ../kioslave -name "*.rc" -o -name "*.ui"` > rc.cpp - $(XGETTEXT) `tqfind . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot + $(EXTRACTRC) `find . ../kioslave -name "*.rc" -o -name "*.ui"` > rc.cpp + $(XGETTEXT) `find . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot rm -f rc.cpp DOXYGEN_REFERENCES = kdecore kdefx kjs dcop kdeui kio/kio kio/kfile diff --git a/kio/bookmarks/dptrtemplate.h b/kio/bookmarks/dptrtemplate.h index a34f021be..2a69d6a54 100644 --- a/kio/bookmarks/dptrtemplate.h +++ b/kio/bookmarks/dptrtemplate.h @@ -34,10 +34,10 @@ public: d_ptr = new TQPtrDict<PrivateData>; qAddPostRoutine( cleanup_d_ptr ); } - PrivateData* ret = d_ptr->tqfind( (void*) instance ); + PrivateData* ret = d_ptr->find( (void*) instance ); if ( ! ret ) { ret = new PrivateData; - d_ptr->tqreplace( (void*) instance, ret ); + d_ptr->replace( (void*) instance, ret ); } return ret; } diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index a33c24ffc..44b8b496c 100644 --- a/kio/bookmarks/kbookmark.cc +++ b/kio/bookmarks/kbookmark.cc @@ -220,7 +220,7 @@ bool KBookmarkGroup::isToolbarGroup() const return ( element.attribute("toolbar") == "yes" ); } -TQDomElement KBookmarkGroup::tqfindToolbar() const +TQDomElement KBookmarkGroup::findToolbar() const { if ( element.attribute("toolbar") == "yes" ) return element; @@ -234,7 +234,7 @@ TQDomElement KBookmarkGroup::tqfindToolbar() const return e; else { - TQDomElement result = KBookmarkGroup(e).tqfindToolbar(); + TQDomElement result = KBookmarkGroup(e).findToolbar(); if (!result.isNull()) return result; } @@ -412,7 +412,7 @@ static TQDomText get_or_create_text(TQDomNode node) } // Look for a metadata with owner="http://www.kde.org" or without any owner (for compatibility) -static TQDomNode tqfindOrCreateMetadata( TQDomNode& parent ) +static TQDomNode findOrCreateMetadata( TQDomNode& parent ) { static const char kdeOwner[] = "http://www.kde.org"; TQDomElement metadataElement; @@ -440,14 +440,14 @@ bool KBookmark::hasMetaData() const // It doesn't matter much in practice since it's only called for newly-created bookmarks, // which will get metadata soon after anyway. TQDomNode n = cd_or_create( internalElement(), "info" ); - return tqfindOrCreateMetadata( n ).hasChildNodes(); + return findOrCreateMetadata( n ).hasChildNodes(); } void KBookmark::updateAccessMetadata() { kdDebug(7043) << "KBookmark::updateAccessMetadata " << address() << " " << url().prettyURL() << endl; - const uint timet = TQDateTime::tqcurrentDateTime().toTime_t(); + const uint timet = TQDateTime::currentDateTime().toTime_t(); setMetaDataItem( "time_added", TQString::number( timet ), DontOverwriteMetaData ); setMetaDataItem( "time_visited", TQString::number( timet ) ); @@ -465,7 +465,7 @@ void KBookmark::updateAccessMetadata() TQString KBookmark::metaDataItem( const TQString &key ) const { TQDomNode infoNode = cd_or_create( internalElement(), "info" ); - infoNode = tqfindOrCreateMetadata( infoNode ); + infoNode = findOrCreateMetadata( infoNode ); for ( TQDomNode n = infoNode.firstChild(); !n.isNull(); n = n.nextSibling() ) { if ( !n.isElement() ) { continue; @@ -481,7 +481,7 @@ TQString KBookmark::metaDataItem( const TQString &key ) const void KBookmark::setMetaDataItem( const TQString &key, const TQString &value, MetaDataOverwriteMode mode ) { TQDomNode infoNode = cd_or_create( internalElement(), "info" ); - infoNode = tqfindOrCreateMetadata( infoNode ); + infoNode = findOrCreateMetadata( infoNode ); TQDomNode item = cd_or_create( infoNode, key ); TQDomText text = get_or_create_text( item ); diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h index 06915e141..84f177522 100644 --- a/kio/bookmarks/kbookmark.h +++ b/kio/bookmarks/kbookmark.h @@ -130,13 +130,13 @@ public: * @return address of parent */ static TQString parentAddress( const TQString & address ) - { return address.left( address.tqfindRev('/') ); } + { return address.left( address.findRev('/') ); } /** * @return position in parent (e.g. /4/5/2 -> 2) */ static uint positionInParent( const TQString & address ) - { return address.mid( address.tqfindRev('/') + 1 ).toInt(); } + { return address.mid( address.findRev('/') + 1 ).toInt(); } /** * @return address of previous sibling (e.g. /4/5/2 -> /4/5/1) @@ -293,7 +293,7 @@ public: /** * @internal */ - TQDomElement tqfindToolbar() const; + TQDomElement findToolbar() const; /** * @return the list of urls of bookmarks at top level of the group diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc index 203e6bf33..ec1e3e670 100644 --- a/kio/bookmarks/kbookmarkbar.cc +++ b/kio/bookmarks/kbookmarkbar.cc @@ -192,7 +192,7 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) for (KBookmark bm = parent.first(); !bm.isNull(); bm = parent.next(bm)) { TQString text = bm.text(); - text.tqreplace( '&', "&&" ); + text.replace( '&', "&&" ); if (!bm.isGroup()) { if ( bm.isSeparator() ) @@ -282,7 +282,7 @@ static void removeTempSep(KBookmarkBarPrivate* p) } } -static KAction* tqfindPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int id) +static KAction* findPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int id) { TQPtrListIterator<KAction> it( actions ); for (; (*it); ++it ) @@ -313,7 +313,7 @@ static TQString handleToolbarDragMoveEvent( int index = 0; KToolBarButton* b; - b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos)); + b = dynamic_cast<KToolBarButton*>(tb->childAt(pos)); KAction *a = 0; TQString address; atFirst = false; @@ -321,7 +321,7 @@ static TQString handleToolbarDragMoveEvent( if (b) { index = tb->itemIndex(b->id()); - TQRect r = b->tqgeometry(); + TQRect r = b->geometry(); if (pos.x() < ((r.left() + r.right())/2)) { // if in first half of button then @@ -350,28 +350,28 @@ static TQString handleToolbarDragMoveEvent( { index = actions.count() - 1; b = tb->getButton(tb->idAt(index)); - // if !b and not past last button, we didn't tqfind button - if (pos.x() <= b->tqgeometry().left()) + // if !b and not past last button, we didn't find button + if (pos.x() <= b->geometry().left()) goto skipact; // TODO - rename } if ( !b ) return TQString::null; // TODO Make it works for that case - a = tqfindPluggedAction(actions, tb, b->id()); + a = findPluggedAction(actions, tb, b->id()); Q_ASSERT(a); address = a->property("address").toString(); p->m_sepIndex = index + (atFirst ? 0 : 1); #if 0 { // ugly workaround to fix the goto scoping problems... - KBookmark bk = mgr->tqfindByAddress( address ); + KBookmark bk = mgr->findByAddress( address ); if (bk.isGroup()) // TODO - fix this ****!!!, manhatten distance should be used!!! { kdDebug() << "kbookmarkbar:: popping up " << bk.text() << endl; KBookmarkActionMenu *menu = dynamic_cast<KBookmarkActionMenu*>(a); Q_ASSERT(menu); - menu->popup(tb->mapToGlobal(b->tqgeometry().center())); + menu->popup(tb->mapToGlobal(b->geometry().center())); } } #endif @@ -394,12 +394,12 @@ static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions Q_ASSERT(tb); KToolBarButton *b; - b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos)); + b = dynamic_cast<KToolBarButton*>(tb->childAt(pos)); if (!b) return 0; KAction *a = 0; - a = tqfindPluggedAction(actions, tb, b->id()); + a = findPluggedAction(actions, tb, b->id()); Q_ASSERT(a); pt = tb->mapToGlobal(pos); @@ -461,7 +461,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e ) if (_a && mev->button() == Qt::RightButton) { dptr()->m_highlightedAddress = _a->property("address").toString(); - KBookmark bookmark = m_pManager->tqfindByAddress( dptr()->m_highlightedAddress ); + KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress ); RMB::begin_rmb_action(this); KPopupMenu *pm = new KPopupMenu; rmbSelf(this)->fillContextMenu( pm, dptr()->m_highlightedAddress, 0 ); @@ -471,7 +471,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e ) mev->accept(); } - return !!_a; // ignore the event if we didn't tqfind the button + return !!_a; // ignore the event if we didn't find the button } else if ( e->type() == TQEvent::DragLeave ) { @@ -489,7 +489,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e ) kdWarning(7043) << "Sorry, currently you can only drop one address " "onto the bookmark bar!" << endl; KBookmark toInsert = list.first(); - KBookmark bookmark = m_pManager->tqfindByAddress( dptr()->m_dropAddress ); + KBookmark bookmark = m_pManager->findByAddress( dptr()->m_dropAddress ); Q_ASSERT(!bookmark.isNull()); kdDebug(7043) << "inserting " << TQString(dptr()->m_atFirst ? "before" : "after") diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h index dd3b1ebed..71c2dcc8c 100644 --- a/kio/bookmarks/kbookmarkbar.h +++ b/kio/bookmarks/kbookmarkbar.h @@ -39,7 +39,7 @@ class TQPopupMenu; * identical to using KBookmarkMenu so follow the directions * there. */ -class KIO_EXPORT KBookmarkBar : public TQObject +class KIO_EXPORT KBookmarkBar : public QObject { Q_OBJECT friend class RMB; diff --git a/kio/bookmarks/kbookmarkdrag.cc b/kio/bookmarks/kbookmarkdrag.cc index 358e329a9..d13893eed 100644 --- a/kio/bookmarks/kbookmarkdrag.cc +++ b/kio/bookmarks/kbookmarkdrag.cc @@ -54,8 +54,8 @@ KBookmarkDrag::KBookmarkDrag( const TQValueList<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 tqencodedData because when cutting a folder, the children - // wouldn't be part of the bookmarks anymore, when tqencodedData + // in encodedData because when cutting a folder, the children + // wouldn't be part of the bookmarks anymore, when encodedData // is requested. TQDomElement elem = m_doc.createElement("xbel"); m_doc.appendChild( elem ); @@ -76,16 +76,16 @@ const char* KBookmarkDrag::format( int i ) const else return 0; } -TQByteArray KBookmarkDrag::tqencodedData( const char* mime ) const +TQByteArray KBookmarkDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "text/uri-list" ) - return TQUriDrag::tqencodedData( mime ); + return TQUriDrag::encodedData( mime ); else if ( mimetype == "application/x-xbel" ) { a = m_doc.toCString(); - //kdDebug(7043) << "KBookmarkDrag::tqencodedData " << m_doc.toCString() << endl; + //kdDebug(7043) << "KBookmarkDrag::encodedData " << m_doc.toCString() << endl; } else if ( mimetype == "text/plain" ) { @@ -117,7 +117,7 @@ TQValueList<KBookmark> KBookmarkDrag::decode( const TQMimeSource * e ) TQValueList<KBookmark> bookmarks; if ( e->provides("application/x-xbel") ) { - TQByteArray s( e->tqencodedData("application/x-xbel") ); + TQByteArray s( e->encodedData("application/x-xbel") ); //kdDebug(7043) << "KBookmarkDrag::decode s=" << TQCString(s) << endl; TQDomDocument doc; doc.setContent( s ); diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h index acdc9efce..98aa3b881 100644 --- a/kio/bookmarks/kbookmarkdrag.h +++ b/kio/bookmarks/kbookmarkdrag.h @@ -43,7 +43,7 @@ public: virtual ~KBookmarkDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; static bool canDecode( const TQMimeSource * e ); static TQValueList<KBookmark> decode( const TQMimeSource * e ); diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h index 2fd1925d2..bf8d61137 100644 --- a/kio/bookmarks/kbookmarkimporter.h +++ b/kio/bookmarks/kbookmarkimporter.h @@ -34,7 +34,7 @@ * and KActionMenu uses it to create actions directly. * @since 3.2 */ -class KIO_EXPORT KBookmarkImporterBase : public TQObject +class KIO_EXPORT KBookmarkImporterBase : public QObject { Q_OBJECT public: @@ -44,7 +44,7 @@ public: void setFilename(const TQString &filename) { m_fileName = filename; } virtual void parse() = 0; - virtual TQString tqfindDefaultLocation(bool forSaving = false) const = 0; + virtual TQString findDefaultLocation(bool forSaving = false) const = 0; // TODO - make this static? void setupSignalForwards(TQObject *src, TQObject *dst); @@ -90,7 +90,7 @@ class KIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, prote public: KXBELBookmarkImporterImpl() {} virtual void parse(); - virtual TQString tqfindDefaultLocation(bool = false) const { return TQString::null; } + virtual TQString findDefaultLocation(bool = false) const { return TQString::null; } protected: virtual void visit(const KBookmark &); virtual void visitEnter(const KBookmarkGroup &); diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/kio/bookmarks/kbookmarkimporter_crash.cc index 6e83d9a6b..594dc0239 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.cc +++ b/kio/bookmarks/kbookmarkimporter_crash.cc @@ -104,7 +104,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() { TQCString &clientId = *it; - if ( tqstrncmp(clientId, "konqueror", 9) != 0 ) + if ( qstrncmp(clientId, "konqueror", 9) != 0 ) continue; TQByteArray data, replyData; @@ -114,7 +114,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() if ( !dcop->call( clientId.data(), "KonquerorIface", "crashLogFile()", data, replyType, replyData) ) { - kdWarning() << "can't tqfind dcop function KonquerorIface::crashLogFile()" << endl; + kdWarning() << "can't find dcop function KonquerorIface::crashLogFile()" << endl; continue; } @@ -127,7 +127,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() activeLogs[ret] = true; } - TQDir d( KCrashBookmarkImporterImpl().tqfindDefaultLocation() ); + TQDir d( KCrashBookmarkImporterImpl().findDefaultLocation() ); d.setSorting( TQDir::Time ); d.setFilter( TQDir::Files ); d.setNameFilter( "konqueror-crash-*.log" ); @@ -141,7 +141,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() int count = 0; for ( ; (( fi = it.current() ) != 0) && (count < 20); ++it, ++count ) { - bool stillAlive = activeLogs.tqcontains( fi->absFilePath() ); + bool stillAlive = activeLogs.contains( fi->absFilePath() ); if ( !stillAlive ) crashFiles << fi->absFilePath(); } @@ -190,7 +190,7 @@ TQString KCrashBookmarkImporter::crashBookmarksDir() static KCrashBookmarkImporterImpl *p = 0; if (!p) p = new KCrashBookmarkImporterImpl; - return p->tqfindDefaultLocation(); + return p->findDefaultLocation(); } void KCrashBookmarkImporterImpl::setShouldDelete( bool shouldDelete ) @@ -207,7 +207,7 @@ void KCrashBookmarkImporter::parseCrashBookmarks( bool del ) importer.parse(); } -TQString KCrashBookmarkImporterImpl::tqfindDefaultLocation( bool ) const +TQString KCrashBookmarkImporterImpl::findDefaultLocation( bool ) const { return locateLocal( "tmp", "" ); } diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h index 79b01852e..e22ef1b9e 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.h +++ b/kio/bookmarks/kbookmarkimporter_crash.h @@ -34,7 +34,7 @@ * A class for importing all crash sessions as bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject +class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public QObject { Q_OBJECT public: @@ -63,7 +63,7 @@ public: KCrashBookmarkImporterImpl() : m_shouldDelete(false) { } void setShouldDelete(bool); virtual void parse(); - virtual TQString tqfindDefaultLocation(bool forSaving = false) const; + virtual TQString findDefaultLocation(bool forSaving = false) const; static TQStringList getCrashLogs(); private: bool m_shouldDelete; diff --git a/kio/bookmarks/kbookmarkimporter_ie.cc b/kio/bookmarks/kbookmarkimporter_ie.cc index 5c63062fd..f37a6a4be 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.cc +++ b/kio/bookmarks/kbookmarkimporter_ie.cc @@ -111,7 +111,7 @@ TQString KIEBookmarkImporter::IEBookmarksDir() static KIEBookmarkImporterImpl* p = 0; if (!p) p = new KIEBookmarkImporterImpl; - return p->tqfindDefaultLocation(); + return p->findDefaultLocation(); } void KIEBookmarkImporterImpl::parse() { @@ -120,7 +120,7 @@ void KIEBookmarkImporterImpl::parse() { importer.parseIEBookmarks(); } -TQString KIEBookmarkImporterImpl::tqfindDefaultLocation(bool) const +TQString KIEBookmarkImporterImpl::findDefaultLocation(bool) const { // notify user that they must give a new dir such // as "Favourites" as otherwise it'll just place @@ -147,7 +147,7 @@ private: static TQString ieStyleQuote( const TQString &str ) { TQString s(str); - s.tqreplace(TQRegExp("[/\\:*?\"<>|]"), "_"); + s.replace(TQRegExp("[/\\:*?\"<>|]"), "_"); return s; } diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h index af286d6c1..2a9ddac6d 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.h +++ b/kio/bookmarks/kbookmarkimporter_ie.h @@ -33,7 +33,7 @@ * A class for importing IE bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject +class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public QObject { Q_OBJECT public: @@ -67,7 +67,7 @@ class KIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase public: KIEBookmarkImporterImpl() { } virtual void parse(); - virtual TQString tqfindDefaultLocation(bool forSaving = false) const; + virtual TQString findDefaultLocation(bool forSaving = false) const; private: class KIEBookmarkImporterImplPrivate *d; }; diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc index 79568be02..49999e675 100644 --- a/kio/bookmarks/kbookmarkimporter_kde1.cc +++ b/kio/bookmarks/kbookmarkimporter_kde1.cc @@ -48,7 +48,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & TQDir dir( _path ); TQString canonical = dir.canonicalPath(); - if ( m_lstParsedDirs.tqcontains(canonical) ) + if ( m_lstParsedDirs.contains(canonical) ) { kdWarning() << "Directory " << canonical << " already parsed" << endl; return; diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc index f9e0c7be4..5521bee7e 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.cc +++ b/kio/bookmarks/kbookmarkimporter_ns.cc @@ -50,7 +50,7 @@ void KNSBookmarkImporterImpl::parse() static const int g_lineLimit = 16*1024; TQCString s(g_lineLimit); // skip header - while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.tqcontains("<DL>")); + while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.contains("<DL>")); while(f.readLine(s.data(), g_lineLimit)>=0) { if ( s[s.length()-1] != '\n' ) // Gosh, this line is longer than g_lineLimit. Skipping. @@ -61,14 +61,14 @@ void KNSBookmarkImporterImpl::parse() TQCString t = s.stripWhiteSpace(); if(t.left(12).upper() == "<DT><A HREF=" || t.left(16).upper() == "<DT><H3><A HREF=") { - int firstQuotes = t.tqfind('"')+1; - int secondQuotes = t.tqfind('"', firstQuotes); + int firstQuotes = t.find('"')+1; + int secondQuotes = t.find('"', firstQuotes); if (firstQuotes != -1 && secondQuotes != -1) { TQCString link = t.mid(firstQuotes, secondQuotes-firstQuotes); - int endTag = t.tqfind('>', secondQuotes+1); + int endTag = t.find('>', secondQuotes+1); TQCString name = t.mid(endTag+1); - name = name.left(name.tqfindRev('<')); + name = name.left(name.findRev('<')); if ( name.right(4) == "</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.tqfind('>', 7); + int endTag = t.find('>', 7); TQCString name = t.mid(endTag+1); - name = name.left(name.tqfindRev('<')); + name = name.left(name.findRev('<')); TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) ); TQCString additionalInfo = t.mid( 8, endTag-8 ); bool folded = (additionalInfo.left(6) == "FOLDED"); @@ -101,7 +101,7 @@ void KNSBookmarkImporterImpl::parse() } } -TQString KNSBookmarkImporterImpl::tqfindDefaultLocation(bool forSaving) const +TQString KNSBookmarkImporterImpl::findDefaultLocation(bool forSaving) const { if (m_utf8) { @@ -138,7 +138,7 @@ TQString KNSBookmarkImporter::netscapeBookmarksFile( bool forSaving ) p = new KNSBookmarkImporterImpl; p->setUtf8(false); } - return p->tqfindDefaultLocation(forSaving); + return p->findDefaultLocation(forSaving); } TQString KNSBookmarkImporter::mozillaBookmarksFile( bool forSaving ) @@ -149,7 +149,7 @@ TQString KNSBookmarkImporter::mozillaBookmarksFile( bool forSaving ) p = new KNSBookmarkImporterImpl; p->setUtf8(true); } - return p->tqfindDefaultLocation(forSaving); + return p->findDefaultLocation(forSaving); } @@ -191,7 +191,7 @@ void KNSBookmarkExporterImpl::write(KBookmarkGroup parent) { fstream.setEncoding(m_utf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); TQString charset - = m_utf8 ? "UTF-8" : TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()).upper(); + = m_utf8 ? "UTF-8" : TQString::fromLatin1(TQTextCodec::codecForLocale()->name()).upper(); fstream << "<!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 666cc1e0f..8b5c76338 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.h +++ b/kio/bookmarks/kbookmarkimporter_ns.h @@ -34,7 +34,7 @@ * A class for importing NS bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject +class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public QObject { Q_OBJECT public: @@ -70,7 +70,7 @@ public: KNSBookmarkImporterImpl() : m_utf8(false) { } void setUtf8(bool utf8) { m_utf8 = utf8; } virtual void parse(); - virtual TQString tqfindDefaultLocation(bool forSaving = false) const; + virtual TQString findDefaultLocation(bool forSaving = false) const; private: bool m_utf8; class KNSBookmarkImporterImplPrivate *d; diff --git a/kio/bookmarks/kbookmarkimporter_opera.cc b/kio/bookmarks/kbookmarkimporter_opera.cc index 648c2ca25..45ac1a7ca 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.cc +++ b/kio/bookmarks/kbookmarkimporter_opera.cc @@ -94,7 +94,7 @@ TQString KOperaBookmarkImporter::operaBookmarksFile() static KOperaBookmarkImporterImpl *p = 0; if (!p) p = new KOperaBookmarkImporterImpl; - return p->tqfindDefaultLocation(); + return p->findDefaultLocation(); } void KOperaBookmarkImporterImpl::parse() { @@ -103,7 +103,7 @@ void KOperaBookmarkImporterImpl::parse() { importer.parseOperaBookmarks(); } -TQString KOperaBookmarkImporterImpl::tqfindDefaultLocation(bool saving) const +TQString KOperaBookmarkImporterImpl::findDefaultLocation(bool saving) const { return saving ? KFileDialog::getSaveFileName( TQDir::homeDirPath() + "/.opera", diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h index 14087957b..e87df2efe 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.h +++ b/kio/bookmarks/kbookmarkimporter_opera.h @@ -32,7 +32,7 @@ * A class for importing Opera bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject +class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public QObject { Q_OBJECT public: @@ -63,7 +63,7 @@ class KIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase public: KOperaBookmarkImporterImpl() { } virtual void parse(); - virtual TQString tqfindDefaultLocation(bool forSaving = false) const; + virtual TQString findDefaultLocation(bool forSaving = false) const; private: class KOperaBookmarkImporterImplPrivate *d; }; diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 0afdf413a..1a9e5dc4e 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -63,7 +63,7 @@ class KBookmarkMap : private KBookmarkGroupTraverser { public: KBookmarkMap( KBookmarkManager * ); void update(); - TQValueList<KBookmark> tqfind( const TQString &url ) const + TQValueList<KBookmark> find( const TQString &url ) const { return m_bk_map[url]; } private: virtual void visit(const KBookmark &); @@ -329,7 +329,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co // Save the bookmark toolbar folder for quick loading // but only when it will actually make things quicker - const TQString cacheFilename = filename + TQString::tqfromLatin1(".tbcache"); + const TQString cacheFilename = filename + TQString::fromLatin1(".tbcache"); if(toolbarCache && !root().isToolbarGroup()) { KSaveFile cacheFile( cacheFilename ); @@ -337,7 +337,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co { TQString str; TQTextStream stream(&str, IO_WriteOnly); - stream << root().tqfindToolbar(); + stream << root().findToolbar(); TQCString cstr = str.utf8(); cacheFile.file()->writeBlock( cstr.data(), cstr.length() ); cacheFile.close(); @@ -367,7 +367,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co "of the error needs to be fixed as quickly as possible, " "which is most likely a full hard drive.") .arg(filename).arg(TQString::fromLocal8Bit(strerror(file.status()))); - if (tqApp->type() != TQApplication::Tty) + if (qApp->type() != TQApplication::Tty) KMessageBox::error( 0L, error ); else kdError() << error << endl; @@ -388,7 +388,7 @@ KBookmarkGroup KBookmarkManager::toolbar() if(!m_docIsLoaded) { kdDebug(7043) << "KBookmarkManager::toolbar trying cache" << endl; - const TQString cacheFilename = m_bookmarksFile + TQString::tqfromLatin1(".tbcache"); + const TQString cacheFilename = m_bookmarksFile + TQString::fromLatin1(".tbcache"); TQFileInfo bmInfo(m_bookmarksFile); TQFileInfo cacheInfo(cacheFilename); if (m_toolbarDoc.isNull() && @@ -415,16 +415,16 @@ KBookmarkGroup KBookmarkManager::toolbar() // Fallback to the normal way if there is no cache or if the bookmark file // is already loaded - TQDomElement elem = root().tqfindToolbar(); + TQDomElement elem = root().findToolbar(); if (elem.isNull()) return root(); // Root is the bookmark toolbar if none has been set. else - return KBookmarkGroup(root().tqfindToolbar()); + return KBookmarkGroup(root().findToolbar()); } -KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tolerant ) +KBookmark KBookmarkManager::findByAddress( const TQString & address, bool tolerant ) { - //kdDebug(7043) << "KBookmarkManager::tqfindByAddress " << address << endl; + //kdDebug(7043) << "KBookmarkManager::findByAddress " << address << endl; KBookmark result = root(); // The address is something like /5/10/2+ TQStringList addresses = TQStringList::split(TQRegExp("[/+]"),address); @@ -452,7 +452,7 @@ KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tole result = bk; } if (result.isNull()) { - kdWarning() << "KBookmarkManager::tqfindByAddress: couldn't tqfind item " << address << endl; + kdWarning() << "KBookmarkManager::findByAddress: couldn't find item " << address << endl; Q_ASSERT(!tolerant); } //kdWarning() << "found " << result.address() << endl; @@ -462,7 +462,7 @@ KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tole static TQString pickUnusedTitle( KBookmarkGroup parentBookmark, const TQString &title, const TQString &url ) { - // If this title is already used, we'll try to tqfind something unused. + // If this title is already used, we'll try to find something unused. KBookmark ch = parentBookmark.first(); int count = 1; TQString uniqueTitle = title; @@ -521,7 +521,7 @@ KBookmarkGroup KBookmarkManager::addBookmarkDialog( } KBookmarkGroup parentBookmark; - parentBookmark = tqfindByAddress( parentBookmarkAddress ).toGroup(); + parentBookmark = findByAddress( parentBookmarkAddress ).toGroup(); Q_ASSERT( !parentBookmark.isNull() ); TQString uniqueTitle = pickUnusedTitle( parentBookmark, title, url ); @@ -584,7 +584,7 @@ void KBookmarkManager::notifyChanged( TQString groupAddress ) // DCOP call parse(); //kdDebug(7043) << "KBookmarkManager::notifyChanged " << groupAddress << endl; - //KBookmarkGroup group = tqfindByAddress( groupAddress ).toGroup(); + //KBookmarkGroup group = findByAddress( groupAddress ).toGroup(); //Q_ASSERT(!group.isNull()); emit changed( groupAddress, TQString::null ); } @@ -614,11 +614,11 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser ) void KBookmarkManager::slotEditBookmarks() { KProcess proc; - proc << TQString::tqfromLatin1("keditbookmarks"); + proc << TQString::fromLatin1("keditbookmarks"); if (!dptr()->m_editorCaption.isNull()) - proc << TQString::tqfromLatin1("--customcaption") << dptr()->m_editorCaption; + proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption; if (!dptr()->m_browserEditor) - proc << TQString::tqfromLatin1("--nobrowser"); + proc << TQString::fromLatin1("--nobrowser"); proc << m_bookmarksFile; proc.start(KProcess::DontCare); } @@ -626,8 +626,8 @@ void KBookmarkManager::slotEditBookmarks() void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address ) { KProcess proc; - proc << TQString::tqfromLatin1("keditbookmarks") - << TQString::tqfromLatin1("--address") << address + proc << TQString::fromLatin1("keditbookmarks") + << TQString::fromLatin1("--address") << address << m_bookmarksFile; proc.start(KProcess::DontCare); } @@ -649,7 +649,7 @@ bool KBookmarkManager::updateAccessMetadata( const TQString & url, bool emitSign s_bk_map->update(); } - TQValueList<KBookmark> list = s_bk_map->tqfind(url); + TQValueList<KBookmark> list = s_bk_map->find(url); if ( list.count() == 0 ) return false; @@ -672,7 +672,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic s_bk_map->update(); } - TQValueList<KBookmark> list = s_bk_map->tqfind(url); + TQValueList<KBookmark> list = s_bk_map->find(url); for ( TQValueList<KBookmark>::iterator it = list.begin(); it != list.end(); ++it ) { @@ -690,7 +690,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic TQString KBookmarkManager::userBookmarksFile() { - return locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + return locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); } KBookmarkManager* KBookmarkManager::userBookmarksManager() diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h index e8fcd6196..403a2e1b3 100644 --- a/kio/bookmarks/kbookmarkmanager.h +++ b/kio/bookmarks/kbookmarkmanager.h @@ -57,7 +57,7 @@ class KIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject protected: /** * Creates a bookmark manager with a path to the bookmarks. By - * default, it will use the KDE standard dirs to tqfind and create the + * default, it will use the KDE standard dirs to find and create the * correct location. If you are using your own app-specific * bookmarks directory, you must instantiate this class with your * own path <em>before</em> KBookmarkManager::managerForFile() is ever @@ -152,10 +152,10 @@ public: /** * @return the bookmark designated by @p address * @param address the address belonging to the bookmark you're looking for - * @param tolerate when true tries to tqfind the most tolerable bookmark position + * @param tolerate when true tries to find the most tolerable bookmark position * @see KBookmark::address */ - KBookmark tqfindByAddress( const TQString & address, bool tolerate = false ); + KBookmark findByAddress( const TQString & address, bool tolerate = false ); /** * Saves the bookmark file and notifies everyone. diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index a7b3c02a7..69c9debd6 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -226,7 +226,7 @@ bool RMB::invalid( int val ) KBookmark RMB::atAddress(const TQString & address) { - KBookmark bookmark = m_pManager->tqfindByAddress( address ); + KBookmark bookmark = m_pManager->findByAddress( address ); Q_ASSERT(!bookmark.isNull()); return bookmark; } @@ -537,7 +537,7 @@ void KBookmarkMenu::addNewFolder() TQString title = i18n( "&New Bookmark Folder..." ); int p; - while ( ( p = title.tqfind( '&' ) ) >= 0 ) + while ( ( p = title.find( '&' ) ) >= 0 ) title.remove( p, 1 ); KAction * paNewFolder = new KAction( title, @@ -617,13 +617,13 @@ void KBookmarkMenu::fillBookmarkMenu() } } - KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); bool separatorInserted = false; for ( KBookmark bm = parentBookmark.first(); !bm.isNull(); bm = parentBookmark.next(bm) ) { TQString text = KStringHandler::csqueeze(bm.fullText(), 60); - text.tqreplace( '&', "&&" ); + text.replace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); @@ -708,7 +708,7 @@ void KBookmarkMenu::slotAddBookmarksList() KExtendedBookmarkOwner::QStringPairList list; extOwner->fillBookmarksList( list ); - KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); KBookmarkGroup group = parentBookmark.createNewFolder( m_pManager ); if ( group.isNull() ) @@ -733,7 +733,7 @@ void KBookmarkMenu::slotAddBookmark() void KBookmarkMenu::slotNewFolder() { if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); KBookmarkGroup group = parentBookmark.createNewFolder( m_pManager ); if ( !group.isNull() ) @@ -895,7 +895,7 @@ void KBookmarkEditDialog::slotUser1() TQString address = KBookmarkFolderTree::selectedAddress( m_folderTree ); if ( address.isNull() ) return; - KBookmarkGroup bm = m_mgr->tqfindByAddress( address ).toGroup(); + KBookmarkGroup bm = m_mgr->findByAddress( address ).toGroup(); Q_ASSERT(!bm.isNull()); Q_ASSERT(m_editType == InsertionMode); @@ -1056,7 +1056,7 @@ void KBookmarkMenuNSImporter::connectToImporter(const TQObject &importer) void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCString & url, const TQString & ) { TQString _text = KStringHandler::csqueeze(text); - _text.tqreplace( '&', "&&" ); + _text.replace( '&', "&&" ); KAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0); connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )), m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) )); @@ -1069,7 +1069,7 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQString & ) { TQString _text = KStringHandler::csqueeze(text); - _text.tqreplace( '&', "&&" ); + _text.replace( '&', "&&" ); KActionMenu * actionMenu = new KActionMenu( _text, "folder", m_actionCollection, 0L ); actionMenu->plug( mstack.top()->m_parentMenu ); mstack.top()->m_actions.append( actionMenu ); @@ -1175,7 +1175,7 @@ void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &n // make sure list includes type config.setGroup("Bookmarks"); - if (elist.tqcontains(id) < 1) { + if (elist.contains(id) < 1) { elist << id; config.writeEntry("DynamicMenus", elist); } diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index 13691e5e0..f3d1c75b6 100644 --- a/kio/bookmarks/kbookmarkmenu.h +++ b/kio/bookmarks/kbookmarkmenu.h @@ -76,7 +76,7 @@ namespace KIO { class Job; } * 1a) Reimplement your own KBookmarkOwner * 1b) Reimplement and instantiate your own KBookmarkManager */ -class KIO_EXPORT KBookmarkMenu : public TQObject +class KIO_EXPORT KBookmarkMenu : public QObject { Q_OBJECT friend class KBookmarkMenuNSImporter; @@ -238,7 +238,7 @@ protected: /** * A class connected to KNSBookmarkImporter, to fill KActionMenus. */ -class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject +class KIO_EXPORT KBookmarkMenuNSImporter : public QObject { Q_OBJECT public: diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc index a7e8c87c9..6a5a1346c 100644 --- a/kio/httpfilter/httpfilter.cc +++ b/kio/httpfilter/httpfilter.cc @@ -81,7 +81,7 @@ HTTPFilterMD5::HTTPFilterMD5() TQString HTTPFilterMD5::md5() { - return TQString::tqfromLatin1(context.base64Digest()); + return TQString::fromLatin1(context.base64Digest()); } void diff --git a/kio/httpfilter/httpfilter.h b/kio/httpfilter/httpfilter.h index 520a1c627..6d74a56ea 100644 --- a/kio/httpfilter/httpfilter.h +++ b/kio/httpfilter/httpfilter.h @@ -33,7 +33,7 @@ #include <tqobject.h> #include <kmdcodec.h> -class HTTPFilterBase : public TQObject +class HTTPFilterBase : public QObject { Q_OBJECT public: diff --git a/kio/kfile/ChangeLog b/kio/kfile/ChangeLog index 3f121b600..bb43f16da 100644 --- a/kio/kfile/ChangeLog +++ b/kio/kfile/ChangeLog @@ -34,7 +34,7 @@ Fri Feb 18 23:35:04 2000 Carsten Pfeiffer <[email protected]> Thu Feb 17 19:09:54 2000 Carsten Pfeiffer <[email protected]> * kfiledialog.{cpp,h} (KDirComboBox): - Added KDirComboBox and tqreplaced the directory combobox with it. It + Added KDirComboBox and replaced the directory combobox with it. It even does something now :) Items need to be indented tho. * kfilereader.cpp, kdiroperator.{cpp,h}: @@ -43,12 +43,12 @@ Thu Feb 17 19:09:54 2000 Carsten Pfeiffer <[email protected]> Tue Feb 15 14:21:41 2000 Carsten Pfeiffer <[email protected]> * kfile.h (class KFile): - added a small class that tqcontains all the enums now. + added a small class that contains all the enums now. cleaned up the enums (hope not too many apps will be broken) added flags for "Existing files only" and "local files only" * all views (setSelected()): - tqreplaced highlightItem(item) with setSelected(item, bool) which makes + replaced highlightItem(item) with setSelected(item, bool) which makes it more suitable and more consistent with Qt. added selectionChanged() method (necessary for multiselection) @@ -161,12 +161,12 @@ Sat Jan 29 15:33:37 2000 Carsten Pfeiffer <[email protected]> * kfileview.cpp (compareItems): - added support to disable sorting directories first (QDir::DirsFirst) - added support to sort by date and to sort reversed - - removed unused tqfindCompletion method + - removed unused findCompletion method - sort case insensitive by default - some optimization for mergeList - fixed infinite loop in mergeLists, when the lists are the same (I think another one is still there, but I'm tired now) - - changed setSortMode stuff: Switching-mode tqreplaced with + - changed setSortMode stuff: Switching-mode replaced with sortReversed(). The enum Switching will be removed, soon. - made setSortMode public @@ -292,7 +292,7 @@ Wed Dec 2 15:59:13 1998 Carsten Pfeiffer <[email protected]> * kfilesimpleview.cpp: added some checks to prevent division with zero using the latest qt snapshots - * kfilesimpleview.cpp: added a tqrepaint call after a resize + * kfilesimpleview.cpp: added a repaint call after a resize * kfiledialog.cpp: new experimental button order @@ -599,7 +599,7 @@ Wed Mar 18 02:56:32 1998 Stephan Kulow <[email protected]> * kdir.cpp: disable parent button in / - * kfiledialog.cpp: fixed tqlayout of mkdir dialog + * kfiledialog.cpp: fixed layout of mkdir dialog * kdir.cpp: use currentDir instead of homeDir as default @@ -666,7 +666,7 @@ Tue Feb 10 01:09:16 1998 Richard Moore <[email protected]> Fri Feb 6 18:08:14 1998 Stephan Kulow <[email protected]> - * kfiledialog.cpp: tqreplaced the location lineedit with an combo + * kfiledialog.cpp: replaced the location lineedit with an combo box. Currently configurable with a compiler define. Fri Feb 6 17:07:26 1998 Stephan Kulow <[email protected]> @@ -694,7 +694,7 @@ Mon Jan 19 01:10:11 1998 Stephan Kulow <[email protected]> * kdir.cpp: added isReadable() to indicate, that the dir is not correct - * kfiledialog.cpp: played a little bit with the tqgeometry management + * kfiledialog.cpp: played a little bit with the geometry management Sun Jan 18 15:00:06 1998 Stephan Kulow <[email protected]> diff --git a/kio/kfile/NOTES b/kio/kfile/NOTES index 0fe395c85..c3fb6fbcb 100644 --- a/kio/kfile/NOTES +++ b/kio/kfile/NOTES @@ -29,7 +29,7 @@ for more integration between kfile and konqueror. 16/08/2000. has a QWidget * canvas() method, xOffset() and yOffset() (4) KFileIconView holds a QPtrDict to look up a QIconViewItem quickly from a given KFileItem. This will help for e.g. deleteItems and refreshItems. -(5) KFileListView holds a QPtrDict to tqfind the QListViewItem for a +(5) KFileListView holds a QPtrDict to find the QListViewItem for a KFileItem. It implements different modes if we want the tree view in kfile ? @@ -86,7 +86,7 @@ KActions for it. Important : -Make sure to take ktqfind into account. It would be nice if it could use the +Make sure to take kfind into account. It would be nice if it could use the same views as konqueror, to have access to all the view modes, as well as image preview, etc. diff --git a/kio/kfile/config-kfile.h b/kio/kfile/config-kfile.h index 6c18c8019..8715ed273 100644 --- a/kio/kfile/config-kfile.h +++ b/kio/kfile/config-kfile.h @@ -3,10 +3,10 @@ const int kfile_area = 250; -#define DefaultViewStyle TQString::tqfromLatin1("SimpleView") +#define DefaultViewStyle TQString::fromLatin1("SimpleView") #define DefaultPannerPosition 40 #define DefaultMixDirsAndFiles false -#define DefaultShowtqStatusLine false +#define DefaultShowStatusLine false #define DefaultShowHidden false #define DefaultCaseInsensitive true #define DefaultDirsFirst true @@ -14,19 +14,19 @@ const int kfile_area = 250; #define DefaultRecentURLsNumber 15 #define DefaultDirectoryFollowing true #define DefaultAutoSelectExtChecked true -#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 ConfigShowtqStatusLine TQString::tqfromLatin1("ShowtqStatusLine") -#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") +#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") #endif diff --git a/kio/kfile/images.h b/kio/kfile/images.h index 3d248ba24..f544e2f0a 100644 --- a/kio/kfile/images.h +++ b/kio/kfile/images.h @@ -48,7 +48,7 @@ static const QRgb group_data[] = { 0x0,0x0,0x0,0x0 }; -static const QRgb tqmask_data[] = { +static const QRgb mask_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11c84a00,0x1000000,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68d14e00,0xffda6400,0x72bf4700,0x3000000,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14d04d00,0xefda6400,0xfffec300,0xf2d86300,0x24742b00, @@ -234,7 +234,7 @@ static struct EmbedImage { } embed_image_vec[] = { { 16, 16, 32, (const unsigned char*)group_grey_data, 0, 0, TRUE, "group-grey" }, { 16, 16, 32, (const unsigned char*)group_data, 0, 0, TRUE, "group" }, - { 16, 16, 32, (const unsigned char*)tqmask_data, 0, 0, TRUE, "tqmask" }, + { 16, 16, 32, (const unsigned char*)mask_data, 0, 0, TRUE, "mask" }, { 16, 16, 32, (const unsigned char*)others_grey_data, 0, 0, TRUE, "others-grey" }, { 16, 16, 32, (const unsigned char*)others_data, 0, 0, TRUE, "others" }, { 16, 16, 32, (const unsigned char*)user_green_data, 0, 0, TRUE, "user-green" }, @@ -245,10 +245,10 @@ static struct EmbedImage { { 0, 0, 0, 0, 0, 0, 0, 0 } }; -static const TQImage& qembed_tqfindImage( const TQString& name ) +static const TQImage& qembed_findImage( const TQString& name ) { static TQDict<TQImage> dict; - TQImage* img = dict.tqfind( name ); + TQImage* img = dict.find( 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 8e887b59c..7f253f8c5 100644 --- a/kio/kfile/kacleditwidget.cpp +++ b/kio/kfile/kacleditwidget.cpp @@ -63,7 +63,7 @@ static struct { { I18N_NOOP( "Owner" ), "user-grey", 0 }, { I18N_NOOP( "Owning Group" ), "group-grey", 0 }, { I18N_NOOP( "Others" ), "others-grey", 0 }, - { I18N_NOOP( "Mask" ), "tqmask", 0 }, + { I18N_NOOP( "Mask" ), "mask", 0 }, { I18N_NOOP( "Named User" ), "user", 0 }, { I18N_NOOP( "Named Group" ), "group", 0 }, }; @@ -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->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); slotUpdateButtons(); } @@ -148,7 +148,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent, qualifier( _qualifier ), isPartial( false ) { m_pACLListView = dynamic_cast<KACLListView*>( parent ); - tqrepaint(); + repaint(); } @@ -192,7 +192,7 @@ TQString KACLListViewItem::key( int, bool ) const } void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { 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, tqalignment ); + KListViewItem::paintCell( p, mycg, column, width, alignment ); KACLListViewItem *below =0; if ( itemBelow() ) @@ -247,7 +247,7 @@ void KACLListViewItem::updatePermPixmaps() setPixmap( 4, TQPixmap() ); } -void KACLListViewItem::tqrepaint() +void KACLListViewItem::repaint() { int idx = 0; switch ( type ) @@ -287,7 +287,7 @@ void KACLListViewItem::calcEffectiveRights() { TQString strEffective = TQString( "---" ); - // Do we need to worry about the tqmask entry? It applies to named users, + // Do we need to worry about the mask entry? It applies to named users, // owning group, and named groups if ( m_pACLListView->hasMaskEntry() && ( type == KACLListView::NamedUser @@ -296,22 +296,22 @@ void KACLListViewItem::calcEffectiveRights() && !isDefault ) { - strEffective[0] = ( m_pACLListView->tqmaskPermissions() & value & ACL_READ ) ? 'r' : '-'; - strEffective[1] = ( m_pACLListView->tqmaskPermissions() & value & ACL_WRITE ) ? 'w' : '-'; - strEffective[2] = ( m_pACLListView->tqmaskPermissions() & value & ACL_EXECUTE ) ? 'x' : '-'; + strEffective[0] = ( m_pACLListView->maskPermissions() & value & ACL_READ ) ? 'r' : '-'; + strEffective[1] = ( m_pACLListView->maskPermissions() & value & ACL_WRITE ) ? 'w' : '-'; + strEffective[2] = ( m_pACLListView->maskPermissions() & value & ACL_EXECUTE ) ? 'x' : '-'; /* // What about any partial perms? - if ( tqmaskPerms & partialPerms & ACL_READ || // Partial perms on entry - tqmaskPartialPerms & perms & ACL_READ || // Partial perms on tqmask - tqmaskPartialPerms & partialPerms & ACL_READ ) // Partial perms on tqmask and entry + if ( maskPerms & partialPerms & ACL_READ || // Partial perms on entry + maskPartialPerms & perms & ACL_READ || // Partial perms on mask + maskPartialPerms & partialPerms & ACL_READ ) // Partial perms on mask and entry strEffective[0] = 'R'; - if ( tqmaskPerms & partialPerms & ACL_WRITE || // Partial perms on entry - tqmaskPartialPerms & perms & ACL_WRITE || // Partial perms on tqmask - tqmaskPartialPerms & partialPerms & ACL_WRITE ) // Partial perms on tqmask and entry + if ( maskPerms & partialPerms & ACL_WRITE || // Partial perms on entry + maskPartialPerms & perms & ACL_WRITE || // Partial perms on mask + maskPartialPerms & partialPerms & ACL_WRITE ) // Partial perms on mask and entry strEffective[1] = 'W'; - if ( tqmaskPerms & partialPerms & ACL_EXECUTE || // Partial perms on entry - tqmaskPartialPerms & perms & ACL_EXECUTE || // Partial perms on tqmask - tqmaskPartialPerms & partialPerms & ACL_EXECUTE ) // Partial perms on tqmask and entry + if ( maskPerms & partialPerms & ACL_EXECUTE || // Partial perms on entry + maskPartialPerms & perms & ACL_EXECUTE || // Partial perms on mask + maskPartialPerms & partialPerms & ACL_EXECUTE ) // Partial perms on mask and entry strEffective[2] = 'X'; */ } @@ -339,7 +339,7 @@ bool KACLListViewItem::isDeletable() const { bool isMaskAndDeletable = false; if (type == KACLListView::Mask ) { - if ( !isDefault && m_pACLListView->tqmaskCanBeDeleted() ) + if ( !isDefault && m_pACLListView->maskCanBeDeleted() ) isMaskAndDeletable = true; else if ( isDefault && m_pACLListView->defaultMaskCanBeDeleted() ) isMaskAndDeletable = true; @@ -424,8 +424,8 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem m_buttonGroup->insert( owningGroupType, KACLListView::Group ); TQRadioButton *othersType = new TQRadioButton( i18n("Others"), m_buttonGroup, "othersType" ); m_buttonGroup->insert( othersType, KACLListView::Others ); - TQRadioButton *tqmaskType = new TQRadioButton( i18n("Mask"), m_buttonGroup, "tqmaskType" ); - m_buttonGroup->insert( tqmaskType, KACLListView::Mask ); + TQRadioButton *maskType = new TQRadioButton( i18n("Mask"), m_buttonGroup, "maskType" ); + m_buttonGroup->insert( maskType, KACLListView::Mask ); TQRadioButton *namedUserType = new TQRadioButton( i18n("Named User"), m_buttonGroup, "namesUserType" ); m_buttonGroup->insert( namedUserType, KACLListView::NamedUser ); TQRadioButton *namedGroupType = new TQRadioButton( i18n("Named Group"), m_buttonGroup, "namedGroupType" ); @@ -481,9 +481,9 @@ void EditACLEntryDialog::slotUpdateAllowedTypes() } for ( int i=1; i < KACLListView::AllTypes; i=i*2 ) { if ( allowedTypes & i ) - m_buttonGroup->tqfind( i )->show(); + m_buttonGroup->find( i )->show(); else - m_buttonGroup->tqfind( i )->hide(); + m_buttonGroup->find( i )->hide(); } } @@ -495,17 +495,17 @@ void EditACLEntryDialog::slotUpdateAllowedUsersAndGroups() m_groupsCombo->clear(); if ( m_defaultCB && m_defaultCB->isChecked() ) { m_usersCombo->insertStringList( m_defaultUsers ); - if ( m_defaultUsers.tqfind( oldUser ) != m_defaultUsers.end() ) + if ( m_defaultUsers.find( oldUser ) != m_defaultUsers.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_defaultGroups ); - if ( m_defaultGroups.tqfind( oldGroup ) != m_defaultGroups.end() ) + if ( m_defaultGroups.find( oldGroup ) != m_defaultGroups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } else { m_usersCombo->insertStringList( m_users ); - if ( m_users.tqfind( oldUser ) != m_users.end() ) + if ( m_users.find( oldUser ) != m_users.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_groups ); - if ( m_groups.tqfind( oldGroup ) != m_groups.end() ) + if ( m_groups.find( 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->tqrepaint(); + m_item->repaint(); KDialogBase::slotOk(); } @@ -571,10 +571,10 @@ KACLListView::KACLListView( TQWidget* parent, const char* name ) // Load the avatars for ( int i=0; i < LAST_IDX; ++i ) { - s_itemAttributes[i].pixmap = new TQPixmap( qembed_tqfindImage( s_itemAttributes[i].pixmapName ) ); + s_itemAttributes[i].pixmap = new TQPixmap( qembed_findImage( s_itemAttributes[i].pixmapName ) ); } - m_yesPixmap = new TQPixmap( qembed_tqfindImage( "yes" ) ); - m_yesPartialPixmap = new TQPixmap( qembed_tqfindImage( "yespartial" ) ); + m_yesPixmap = new TQPixmap( qembed_findImage( "yes" ) ); + m_yesPartialPixmap = new TQPixmap( qembed_findImage( "yespartial" ) ); setSelectionMode( TQListView::Extended ); @@ -582,14 +582,14 @@ KACLListView::KACLListView( TQWidget* parent, const char* name ) struct passwd *user = 0; setpwent(); while ( ( user = getpwent() ) != 0 ) { - m_allUsers << TQString::tqfromLatin1( user->pw_name ); + m_allUsers << TQString::fromLatin1( user->pw_name ); } endpwent(); struct group *gr = 0; setgrent(); while ( ( gr = getgrent() ) != 0 ) { - m_allGroups << TQString::tqfromLatin1( gr->gr_name ); + m_allGroups << TQString::fromLatin1( gr->gr_name ); } endgrent(); m_allUsers.sort(); @@ -651,9 +651,9 @@ void KACLListView::fillItemsFromACL( const KACL &pACL, bool defaults ) item = new KACLListViewItem( this, Others, pACL.othersPermissions(), defaults ); bool hasMask = false; - unsigned short tqmask = pACL.tqmaskPermissions( hasMask ); + unsigned short mask = pACL.maskPermissions( hasMask ); if ( hasMask ) { - item = new KACLListViewItem( this, Mask, tqmask, defaults ); + item = new KACLListViewItem( this, Mask, mask, defaults ); } // read all named user entries @@ -680,7 +680,7 @@ void KACLListView::setACL( const KACL &acl ) m_ACL = acl; fillItemsFromACL( m_ACL ); - m_tqmask = acl.tqmaskPermissions( m_hasMask ); + m_mask = acl.maskPermissions( m_hasMask ); calculateEffectiveRights(); } @@ -818,13 +818,13 @@ void KACLListView::entryClicked( TQListViewItem* pItem, const TQPoint& /*pt*/, i { // Mark the required entries as no longer being partial entries. // That is, they will get applied to all selected directories. - KACLListViewItem* pUserObj = tqfindACLEntryByType( this, ACL_USER_OBJ ); + KACLListViewItem* pUserObj = findACLEntryByType( this, ACL_USER_OBJ ); pUserObj->entry()->setPartialEntry( false ); - KACLListViewItem* pGroupObj = tqfindACLEntryByType( this, ACL_GROUP_OBJ ); + KACLListViewItem* pGroupObj = findACLEntryByType( this, ACL_GROUP_OBJ ); pGroupObj->entry()->setPartialEntry( false ); - KACLListViewItem* pOther = tqfindACLEntryByType( this, ACL_OTHER ); + KACLListViewItem* pOther = findACLEntryByType( this, ACL_OTHER ); pOther->entry()->setPartialEntry( false ); update(); @@ -845,29 +845,29 @@ void KACLListView::calculateEffectiveRights() } -unsigned short KACLListView::tqmaskPermissions() const +unsigned short KACLListView::maskPermissions() const { - return m_tqmask; + return m_mask; } -void KACLListView::setMaskPermissions( unsigned short tqmaskPerms ) +void KACLListView::setMaskPermissions( unsigned short maskPerms ) { - m_tqmask = tqmaskPerms; + m_mask = maskPerms; calculateEffectiveRights(); } -acl_perm_t KACLListView::tqmaskPartialPermissions() const +acl_perm_t KACLListView::maskPartialPermissions() const { // return m_pMaskEntry->m_partialPerms; return 0; } -void KACLListView::setMaskPartialPermissions( acl_perm_t /*tqmaskPartialPerms*/ ) +void KACLListView::setMaskPartialPermissions( acl_perm_t /*maskPartialPerms*/ ) { - //m_pMaskEntry->m_partialPerms = tqmaskPartialPerms; + //m_pMaskEntry->m_partialPerms = maskPartialPerms; calculateEffectiveRights(); } @@ -882,12 +882,12 @@ bool KACLListView::hasDefaultEntries() const return false; } -const KACLListViewItem* KACLListView::tqfindDefaultItemByType( EntryType type ) const +const KACLListViewItem* KACLListView::findDefaultItemByType( EntryType type ) const { - return tqfindItemByType( type, true ); + return findItemByType( type, true ); } -const KACLListViewItem* KACLListView::tqfindItemByType( EntryType type, bool defaults ) const +const KACLListViewItem* KACLListView::findItemByType( EntryType type, bool defaults ) const { TQListViewItemIterator it( const_cast<KACLListView*>( this ) ); while ( it.current() ) { @@ -905,7 +905,7 @@ unsigned short KACLListView::calculateMaskValue( bool defaults ) const { // KACL auto-adds the relevant maks entries, so we can simply query bool dummy; - return itemsToACL( defaults ).tqmaskPermissions( dummy ); + return itemsToACL( defaults ).maskPermissions( dummy ); } void KACLListView::slotAddEntry() @@ -914,7 +914,7 @@ void KACLListView::slotAddEntry() if ( !m_hasMask ) allowedTypes |= Mask; int allowedDefaultTypes = NamedUser | NamedGroup; - if ( !tqfindDefaultItemByType( Mask ) ) + if ( !findDefaultItemByType( Mask ) ) allowedDefaultTypes |= Mask; if ( !hasDefaultEntries() ) allowedDefaultTypes |= User | Group; @@ -927,24 +927,24 @@ void KACLListView::slotAddEntry() if ( !item ) return; // canceled if ( item->type == Mask && !item->isDefault ) { m_hasMask = true; - m_tqmask = item->value; + m_mask = item->value; } if ( item->isDefault && !hasDefaultEntries() ) { // first default entry, fill in what is needed if ( item->type != User ) { - unsigned short v = tqfindDefaultItemByType( User )->value; + unsigned short v = findDefaultItemByType( User )->value; new KACLListViewItem( this, User, v, true ); } if ( item->type != Group ) { - unsigned short v = tqfindDefaultItemByType( Group )->value; + unsigned short v = findDefaultItemByType( Group )->value; new KACLListViewItem( this, Group, v, true ); } if ( item->type != Others ) { - unsigned short v = tqfindDefaultItemByType( Others )->value; + unsigned short v = findDefaultItemByType( Others )->value; new KACLListViewItem( this, Others, v, true ); } } - const KACLListViewItem *defaultMaskItem = tqfindDefaultItemByType( Mask ); + const KACLListViewItem *defaultMaskItem = findDefaultItemByType( Mask ); if ( item->isDefault && !defaultMaskItem ) { unsigned short v = calculateMaskValue( true ); new KACLListViewItem( this, Mask, v, true ); @@ -953,11 +953,11 @@ void KACLListView::slotAddEntry() ( item->type == Group || item->type == NamedUser || item->type == NamedGroup ) ) { - // auto-add a tqmask entry + // auto-add a mask entry unsigned short v = calculateMaskValue( false ); new KACLListViewItem( this, Mask, v, false ); m_hasMask = true; - m_tqmask = v; + m_mask = v; } calculateEffectiveRights(); sort(); @@ -978,7 +978,7 @@ void KACLListView::slotEditEntry() if ( !m_hasMask || itemWasMask ) allowedTypes |= Mask; int allowedDefaultTypes = item->type | NamedUser | NamedGroup; - if ( !tqfindDefaultItemByType( Mask ) ) + if ( !findDefaultItemByType( Mask ) ) allowedDefaultTypes |= Mask; if ( !hasDefaultEntries() ) allowedDefaultTypes |= User | Group; @@ -990,10 +990,10 @@ void KACLListView::slotEditEntry() dlg.exec(); if ( itemWasMask && item->type != Mask ) { m_hasMask = false; - m_tqmask = 0; + m_mask = 0; } if ( !itemWasMask && item->type == Mask ) { - m_tqmask = item->value; + m_mask = item->value; m_hasMask = true; } calculateEffectiveRights(); @@ -1006,20 +1006,20 @@ void KACLListView::slotRemoveEntry() while ( it.current() ) { KACLListViewItem *item = static_cast<KACLListViewItem*>( it.current() ); ++it; - /* First check if it's a tqmask entry and if so, make sure that there is - * either no name user or group entry, which means the tqmask can be + /* First check if it's a mask entry and if so, make sure that there is + * either no name user or group entry, which means the mask can be * removed, or don't remove it, but reset it. That is allowed. */ if ( item->type == Mask ) { bool itemWasDefault = item->isDefault; - if ( !itemWasDefault && tqmaskCanBeDeleted() ) { + if ( !itemWasDefault && maskCanBeDeleted() ) { m_hasMask= false; - m_tqmask = 0; + m_mask = 0; delete item; } else if ( itemWasDefault && defaultMaskCanBeDeleted() ) { delete item; } else { item->value = 0; - item->tqrepaint(); + item->repaint(); } if ( !itemWasDefault ) calculateEffectiveRights(); @@ -1030,7 +1030,7 @@ void KACLListView::slotRemoveEntry() || item->type == Group || item->type == Others ) ) { item->value = 0; - item->tqrepaint(); + item->repaint(); } else { delete item; } @@ -1038,14 +1038,14 @@ void KACLListView::slotRemoveEntry() } } -bool KACLListView::tqmaskCanBeDeleted() const +bool KACLListView::maskCanBeDeleted() const { - return !tqfindItemByType( NamedUser ) && !tqfindItemByType( NamedGroup ); + return !findItemByType( NamedUser ) && !findItemByType( NamedGroup ); } bool KACLListView::defaultMaskCanBeDeleted() const { - return !tqfindDefaultItemByType( NamedUser ) && !tqfindDefaultItemByType( NamedGroup ); + return !findDefaultItemByType( NamedUser ) && !findDefaultItemByType( NamedGroup ); } #include "kacleditwidget.moc" diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h index 4cadf0efe..8bd0292d3 100644 --- a/kio/kfile/kacleditwidget_p.h +++ b/kio/kfile/kacleditwidget_p.h @@ -73,16 +73,16 @@ public: bool hasDefaultEntries() const; bool allowDefaults() const { return m_allowDefaults; } void setAllowDefaults( bool v ) { m_allowDefaults = v; } - unsigned short tqmaskPermissions() const; - void setMaskPermissions( unsigned short tqmaskPerms ); - acl_perm_t tqmaskPartialPermissions() const; - void setMaskPartialPermissions( acl_perm_t tqmaskPerms ); + unsigned short maskPermissions() const; + void setMaskPermissions( unsigned short maskPerms ); + acl_perm_t maskPartialPermissions() const; + void setMaskPartialPermissions( acl_perm_t maskPerms ); - bool tqmaskCanBeDeleted() const; + bool maskCanBeDeleted() const; bool defaultMaskCanBeDeleted() const; - const KACLListViewItem* tqfindDefaultItemByType( EntryType type ) const; - const KACLListViewItem* tqfindItemByType( EntryType type, + const KACLListViewItem* findDefaultItemByType( EntryType type ) const; + const KACLListViewItem* findItemByType( EntryType type, bool defaults = false ) const; unsigned short calculateMaskValue( bool defaults ) const; void calculateEffectiveRights(); @@ -117,7 +117,7 @@ private: KACL m_ACL; KACL m_defaultACL; - unsigned short m_tqmask; + unsigned short m_mask; bool m_hasMask; bool m_allowDefaults; TQStringList m_allUsers; @@ -180,10 +180,10 @@ public: void togglePerm( acl_perm_t perm ); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); void updatePermPixmaps(); - void tqrepaint(); + void repaint(); KACLListView::EntryType type; unsigned short value; diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp index a21eafe05..6baf6d36f 100644 --- a/kio/kfile/kcombiview.cpp +++ b/kio/kfile/kcombiview.cpp @@ -282,7 +282,7 @@ KFileItem * KCombiView::prevItem( const KFileItem *fileItem ) const // with the next view's last item! if ( m_lastViewForPrevItem != otherView ) { fileItem = otherView->firstFileItem(); - while ( otherView->nextItem( fileItem ) ) // tqfind the last item + while ( otherView->nextItem( fileItem ) ) // find the last item fileItem = otherView->nextItem( fileItem ); } @@ -300,7 +300,7 @@ void KCombiView::slotSortingChanged( TQDir::SortSpec sorting ) KFileView *KCombiView::focusView( KFileView *preferred ) const { - TQWidget *w = tqfocusWidget(); + TQWidget *w = focusWidget(); KFileView *other = (right == preferred) ? left : right; return (preferred && w == preferred->widget()) ? preferred : other; } diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index 3b4e9a68c..aec3c10f1 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -57,8 +57,8 @@ public: TQString serviceName = s->name(); // item names may contain ampersands. To avoid them being converted - // to accelators, tqreplace them with two ampersands. - serviceName.tqreplace("&", "&&"); + // to accelators, replace them with two ampersands. + serviceName.replace("&", "&&"); TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); @@ -99,7 +99,7 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) 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())); - buttonBox->tqlayout(); + 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 75d72f258..6013b7c57 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::tqfromLatin1("file")); + currUrl.setProtocol(TQString::fromLatin1("file")); currUrl.setPath(strPath); } else { currUrl = _url; if ( currUrl.protocol().isEmpty() ) - currUrl.setProtocol(TQString::tqfromLatin1("file")); + currUrl.setProtocol(TQString::fromLatin1("file")); currUrl.addPath("/"); // make sure we have a trailing slash! } @@ -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, tqtopLevelWidget() ); + writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() ); } 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 (tqtopLevelWidget()); + job->setWindow (topLevelWidget()); 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 (tqtopLevelWidget()); + job->setWindow (topLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; } @@ -590,13 +590,13 @@ 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.tqfind(':') < 0 && text[0] != '/') + if (text.find(':') < 0 && text[0] != '/') text.insert(0, currUrl); // in case we have a selection defined and someone patched the file- // name, we check, if the end of the new name is changed. if (!selection.isNull()) { - int position = text.tqfindRev('/'); + int position = text.findRev('/'); ASSERT(position >= 0); // we already inserted the current dir in case TQString filename = text.mid(position + 1, text.length()); if (filename != selection) @@ -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::tqfromLatin1("..")); + newurl.cd(TQString::fromLatin1("..")); if ( !isReadable( newurl ) ) { resetCursor(); KMessageBox::error(viewWidget(), @@ -777,7 +777,7 @@ KURL KDirOperator::url() const void KDirOperator::cdUp() { KURL tmp(currUrl); - tmp.cd(TQString::tqfromLatin1("..")); + tmp.cd(TQString::fromLatin1("..")); setURL(tmp, true); } @@ -825,7 +825,7 @@ bool KDirOperator::checkPreviewInternal() const { TQStringList supported = KIO::PreviewJob::supportedMimeTypes(); // no preview support for directories? - if ( dirOnlyMode() && supported.tqfindIndex( "inode/directory" ) == -1 ) + if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 ) return false; TQStringList mimeTypes = dir->mimeFilters(); @@ -851,7 +851,7 @@ bool KDirOperator::checkPreviewInternal() const } if ( !nameFilter.isEmpty() ) { - // tqfind the mimetypes of all the filter-patterns and + // find the mimetypes of all the filter-patterns and KServiceTypeFactory *fac = KServiceTypeFactory::self(); TQStringList::Iterator it1 = nameFilter.begin(); for ( ; it1 != nameFilter.end(); ++it1 ) { @@ -859,7 +859,7 @@ bool KDirOperator::checkPreviewInternal() const return true; } - KMimeType *mt = fac->tqfindFromPattern( *it1 ); + KMimeType *mt = fac->findFromPattern( *it1 ); if ( !mt ) continue; TQString mime = mt->name(); @@ -1120,7 +1120,7 @@ void KDirOperator::setDirLister( KDirLister *lister ) dir->setAutoUpdate( true ); - TQWidget* mainWidget = tqtopLevelWidget(); + TQWidget* mainWidget = topLevelWidget(); dir->setMainWindow (mainWidget); kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl; @@ -1194,7 +1194,7 @@ void KDirOperator::setCurrentItem( const TQString& filename ) const KFileItem *item = 0L; if ( !filename.isNull() ) - item = static_cast<KFileItem *>(dir->tqfindByName( filename )); + item = static_cast<KFileItem *>(dir->findByName( filename )); m_fileView->clearSelection(); if ( item ) { @@ -1253,7 +1253,7 @@ void KDirOperator::slotCompletionMatch(const TQString& match) void KDirOperator::setupActions() { - myActionCollection = new KActionCollection( tqtopLevelWidget(), this, "KDirOperator::myActionCollection" ); + myActionCollection = new KActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" ); @@ -1273,7 +1273,7 @@ void KDirOperator::setupActions() this, TQT_SLOT( trashSelected( KAction::ActivationReason, Qt::ButtonState ) ) ); new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, this, TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); - mkdirAction->setIcon( TQString::tqfromLatin1("folder_new") ); + mkdirAction->setIcon( TQString::fromLatin1("folder_new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload )); @@ -1293,7 +1293,7 @@ void KDirOperator::setupActions() this, TQT_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); - TQString sortGroup = TQString::tqfromLatin1("sort"); + TQString sortGroup = TQString::fromLatin1("sort"); byNameAction->setExclusiveGroup( sortGroup ); byDateAction->setExclusiveGroup( sortGroup ); bySizeAction->setExclusiveGroup( sortGroup ); @@ -1337,7 +1337,7 @@ void KDirOperator::setupActions() TQT_SLOT( togglePreview( bool ))); - TQString viewGroup = TQString::tqfromLatin1("view"); + TQString viewGroup = TQString::fromLatin1("view"); shortAction->setExclusiveGroup( viewGroup ); detailedAction->setExclusiveGroup( viewGroup ); @@ -1386,7 +1386,7 @@ void KDirOperator::setupMenu(int whichActions) if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & Qt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); KConfig *globalconfig = KGlobal::config(); - KConfigGroupSaver cs( globalconfig, TQString::tqfromLatin1("KDE") ); + KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & Qt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) actionMenu->insert( myActionCollection->action( "delete" ) ); @@ -1450,45 +1450,45 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group ) defaultView = 0; int sorting = 0; - TQString viewStyle = kc->readEntry( TQString::tqfromLatin1("View Style"), - TQString::tqfromLatin1("Simple") ); - if ( viewStyle == TQString::tqfromLatin1("Detail") ) + TQString viewStyle = kc->readEntry( TQString::fromLatin1("View Style"), + TQString::fromLatin1("Simple") ); + if ( viewStyle == TQString::fromLatin1("Detail") ) defaultView |= KFile::Detail; else defaultView |= KFile::Simple; - if ( kc->readBoolEntry( TQString::tqfromLatin1("Separate Directories"), + if ( kc->readBoolEntry( TQString::fromLatin1("Separate Directories"), DefaultMixDirsAndFiles ) ) defaultView |= KFile::SeparateDirs; - if ( kc->readBoolEntry(TQString::tqfromLatin1("Show Preview"), false)) + if ( kc->readBoolEntry(TQString::fromLatin1("Show Preview"), false)) defaultView |= KFile::PreviewContents; - if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort case insensitively"), + if ( kc->readBoolEntry( TQString::fromLatin1("Sort case insensitively"), DefaultCaseInsensitive ) ) sorting |= TQDir::IgnoreCase; - if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort directories first"), + if ( kc->readBoolEntry( TQString::fromLatin1("Sort directories first"), DefaultDirsFirst ) ) sorting |= TQDir::DirsFirst; - TQString name = TQString::tqfromLatin1("Name"); - TQString sortBy = kc->readEntry( TQString::tqfromLatin1("Sort by"), name ); + TQString name = TQString::fromLatin1("Name"); + TQString sortBy = kc->readEntry( TQString::fromLatin1("Sort by"), name ); if ( sortBy == name ) sorting |= TQDir::Name; - else if ( sortBy == TQString::tqfromLatin1("Size") ) + else if ( sortBy == TQString::fromLatin1("Size") ) sorting |= TQDir::Size; - else if ( sortBy == TQString::tqfromLatin1("Date") ) + else if ( sortBy == TQString::fromLatin1("Date") ) sorting |= TQDir::Time; mySorting = static_cast<TQDir::SortSpec>( sorting ); setSorting( mySorting ); - if ( kc->readBoolEntry( TQString::tqfromLatin1("Show hidden files"), + if ( kc->readBoolEntry( TQString::fromLatin1("Show hidden files"), DefaultShowHidden ) ) { showHiddenAction->setChecked( true ); dir->setShowingDotFiles( true ); } - if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort reversed"), + if ( kc->readBoolEntry( TQString::fromLatin1("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::tqfromLatin1("Name"); + TQString sortBy = TQString::fromLatin1("Name"); if ( KFile::isSortBySize( mySorting ) ) - sortBy = TQString::tqfromLatin1("Size"); + sortBy = TQString::fromLatin1("Size"); else if ( KFile::isSortByDate( mySorting ) ) - sortBy = TQString::tqfromLatin1("Date"); - kc->writeEntry( TQString::tqfromLatin1("Sort by"), sortBy ); + sortBy = TQString::fromLatin1("Date"); + kc->writeEntry( TQString::fromLatin1("Sort by"), sortBy ); - kc->writeEntry( TQString::tqfromLatin1("Sort reversed"), + kc->writeEntry( TQString::fromLatin1("Sort reversed"), reverseAction->isChecked() ); - kc->writeEntry( TQString::tqfromLatin1("Sort case insensitively"), + kc->writeEntry( TQString::fromLatin1("Sort case insensitively"), caseInsensitiveAction->isChecked() ); - kc->writeEntry( TQString::tqfromLatin1("Sort directories first"), + kc->writeEntry( TQString::fromLatin1("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::tqfromLatin1("Separate Directories"), + kc->writeEntry( TQString::fromLatin1("Separate Directories"), separateDirsAction->isChecked() ); KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview")); if ( previewAction->isEnabled() ) { bool hasPreview = previewAction->isChecked(); - kc->writeEntry( TQString::tqfromLatin1("Show Preview"), hasPreview ); + kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview ); } } - kc->writeEntry( TQString::tqfromLatin1("Show hidden files"), + kc->writeEntry( TQString::fromLatin1("Show hidden files"), showHiddenAction->isChecked() ); KFile::FileView fv = static_cast<KFile::FileView>( m_viewKind ); TQString style; if ( KFile::isDetailView( fv ) ) - style = TQString::tqfromLatin1("Detail"); + style = TQString::fromLatin1("Detail"); else if ( KFile::isSimpleView( fv ) ) - style = TQString::tqfromLatin1("Simple"); - kc->writeEntry( TQString::tqfromLatin1("View Style"), style ); + style = TQString::fromLatin1("Simple"); + kc->writeEntry( TQString::fromLatin1("View Style"), style ); kc->setGroup( oldGroup ); } diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index 2df357575..a361a8bde 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -211,7 +211,7 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) { while ( pos > 0 ) { - pos = path.tqfindRev( '/', pos -1 ); + pos = path.findRev( '/', pos -1 ); if ( pos >= 0 ) { dirToList.setPath( path.left( pos +1 ) ); @@ -232,7 +232,7 @@ void KDirSelectDialog::openNextDir( KFileTreeViewItem * /*parent*/ ) KURL url = d->dirsToList.pop(); - KFileTreeViewItem *item = view()->tqfindItem( d->branch, url.path().mid(1)); + KFileTreeViewItem *item = view()->findItem( d->branch, url.path().mid(1)); if ( item ) { if ( !item->isOpen() ) @@ -248,7 +248,7 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) { // scroll to make item the topmost item view()->ensureItemVisible( item ); - TQRect r = view()->tqitemRect( item ); + TQRect r = view()->itemRect( item ); if ( r.isValid() ) { int x, y; @@ -376,7 +376,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text ) if ( d->branch ) { KURL url = KURL::fromPathOrURL( KShell::tildeExpand( text ) ); - KFileTreeViewItem *item = d->branch->tqfindTVIByURL( url ); + KFileTreeViewItem *item = d->branch->findTVIByURL( url ); if ( item ) { view()->setCurrentItem( item ); @@ -390,8 +390,8 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text ) if ( item ) { item->setSelected( false ); - // 2002/12/27, deselected item is not tqrepainted, so force it - item->tqrepaint(); + // 2002/12/27, deselected item is not repainted, so force it + item->repaint(); } } @@ -426,7 +426,7 @@ void KDirSelectDialog::slotMkdir() { folderurl.addPath( *it ); exists = KIO::NetAccess::exists( folderurl, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( folderurl, tqtopLevelWidget() ); + writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() ); } if ( exists ) // url was already existant diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 86dfc756d..3c9bfbb8c 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 ) - tqApp->exit_loop(); + qApp->exit_loop(); emitResult(); } @@ -139,7 +139,7 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory ) { KDirSize * dirSize = dirSizeJob( directory ); dirSize->setSync(); - tqApp->enter_loop(); + qApp->enter_loop(); return dirSize->totalSize(); } @@ -155,7 +155,7 @@ void KDirSize::slotResult( KIO::Job * job ) else { if ( !m_bAsync ) - tqApp->exit_loop(); + qApp->exit_loop(); KIO::Job::slotResult( job ); } } diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 23562b63f..179b69f72 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::tqfromLatin1("Filesystem") ) ) + if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("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.tqfind(BLANK)<0) // devicename was too long, rest in next line + if (s.find(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.tqfind(BLANK)); - s=s.remove(0,s.tqfind(BLANK)+1 ); + //TQString deviceName = s.left(s.find(BLANK)); + s=s.remove(0,s.find(BLANK)+1 ); //kdDebug(kfile_area) << " DeviceName: [" << deviceName << "]" << endl; if (!NO_FS_TYPE) - s=s.remove(0,s.tqfind(BLANK)+1 ); // eat fs type + s=s.remove(0,s.find(BLANK)+1 ); // eat fs type - u=s.left(s.tqfind(BLANK)); + u=s.left(s.find(BLANK)); unsigned long kBSize = u.toULong(); - s=s.remove(0,s.tqfind(BLANK)+1 ); + s=s.remove(0,s.find(BLANK)+1 ); //kdDebug(kfile_area) << " Size: [" << kBSize << "]" << endl; - u=s.left(s.tqfind(BLANK)); + u=s.left(s.find(BLANK)); unsigned long kBUsed = u.toULong(); - s=s.remove(0,s.tqfind(BLANK)+1 ); + s=s.remove(0,s.find(BLANK)+1 ); //kdDebug(kfile_area) << " Used: [" << kBUsed << "]" << endl; - u=s.left(s.tqfind(BLANK)); + u=s.left(s.find(BLANK)); unsigned long kBAvail = u.toULong(); - s=s.remove(0,s.tqfind(BLANK)+1 ); + s=s.remove(0,s.find(BLANK)+1 ); //kdDebug(kfile_area) << " Avail: [" << kBAvail << "]" << endl; - s=s.remove(0,s.tqfind(BLANK)+1 ); // delete the capacity 94% + s=s.remove(0,s.find(BLANK)+1 ); // delete the capacity 94% TQString mountPoint = s.stripWhiteSpace(); //kdDebug(kfile_area) << " MountPoint: [" << mountPoint << "]" << endl; @@ -160,10 +160,10 @@ void KDiskFreeSp::dfDone() delete this; } -KDiskFreeSp * KDiskFreeSp::tqfindUsageInfo( const TQString & path ) +KDiskFreeSp * KDiskFreeSp::findUsageInfo( const TQString & path ) { KDiskFreeSp * job = new KDiskFreeSp; - TQString mountPoint = KIO::tqfindPathMountPoint( path ); + TQString mountPoint = KIO::findPathMountPoint( path ); job->readDF( mountPoint ); return job; } diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index eeb285b08..6a0591d6f 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -34,10 +34,10 @@ class KProcess; /** - * This class parses the output of "df" to tqfind the disk usage + * This class parses the output of "df" to find the disk usage * information for a given partition (mount point). */ -class KIO_EXPORT KDiskFreeSp : public TQObject +class KIO_EXPORT KDiskFreeSp : public QObject { Q_OBJECT public: KDiskFreeSp( TQObject *parent=0, const char *name=0 ); @@ -60,7 +60,7 @@ public: * if this mount point is found, with the info requested. * done is emitted in any case. */ - static KDiskFreeSp * tqfindUsageInfo( const TQString & path ); + static KDiskFreeSp * findUsageInfo( const TQString & path ); signals: void foundMountPoint( const TQString & mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail ); diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index be5ca033b..396006504 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::tqfromLatin1(KGlobal::locale()->encoding()); + sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); int insert = 0; diff --git a/kio/kfile/kencodingfiledialog.h b/kio/kfile/kencodingfiledialog.h index ae28a9e76..15b44f9c3 100644 --- a/kio/kfile/kencodingfiledialog.h +++ b/kio/kfile/kencodingfiledialog.h @@ -32,8 +32,8 @@ struct KEncodingFileDialogPrivate; * * * The dialog has been designed to allow applications to customise it - * by subclassing. It uses tqgeometry management to ensure that subclasses - * can easily add children that will be incorporated into the tqlayout. + * by subclassing. It uses geometry management to ensure that subclasses + * can easily add children that will be incorporated into the layout. */ class KIO_EXPORT KEncodingFileDialog : public KFileDialog diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 6643d5a4c..823714396 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->tqrepaint(); // only tqrepaints if visible + //item->repaint(); // only repaints if visible } void KFileDetailView::setSortingKey( KFileListViewItem *item, diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 7e0baff83..937c8f56c 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -78,7 +78,7 @@ public: TQRect rect() const { - TQRect r = listView()->tqitemRect(this); + TQRect r = listView()->itemRect(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 0cdeaa029..0c9364943 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -117,7 +117,7 @@ struct KFileDialogPrivate TQString selection; // now following all kind of widgets, that I need to rebuild - // the tqgeometry management + // the geometry management TQBoxLayout *boxLayout; TQWidget *mainWidget; @@ -204,7 +204,7 @@ void KFileDialog::setLocationLabel(const TQString& text) void KFileDialog::setFilter(const TQString& filter) { - int pos = filter.tqfind('/'); + int pos = filter.find('/'); // 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.tqfind("\\/", pos)) != -1; ++pos) + for (pos = 0; (pos = copy.find("\\/", 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::tqfromLatin1( "inode/directory" )); + types.append( TQString::fromLatin1( "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::tqfromLatin1("\" "); + TQString endQuote = TQString::fromLatin1("\" "); TQString name, files; while ( it.current() ) { name = (*it)->name(); @@ -402,7 +402,7 @@ void KFileDialog::slotOk() } } - KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { // ### after message freeze, add message for directories! @@ -422,7 +422,7 @@ void KFileDialog::slotOk() if ( (mode() & KFile::Files) == KFile::Files ) {// multiselection mode TQString locationText = locationEdit->currentText(); - if ( locationText.tqcontains( '/' )) { + if ( locationText.contains( '/' )) { // relative path? -> prepend the current directory KURL u( ops->url(), KShell::tildeExpand(locationText)); if ( u.isValid() ) @@ -446,7 +446,7 @@ void KFileDialog::slotOk() return; } - KURL url = KIO::NetAccess::mostLocalURL(selectedURL,tqtopLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { KMessageBox::sorry( d->mainWidget, @@ -538,7 +538,7 @@ void KFileDialog::slotOk() d->filenames = KShell::tildeExpand(locationEdit->currentText()); if ( (mode() & KFile::Files) == KFile::Files && - !locationEdit->currentText().tqcontains( '/' )) { + !locationEdit->currentText().contains( '/' )) { kdDebug(kfile_area) << "Files\n"; KURL::List list = parseSelectedURLs(); for ( KURL::List::ConstIterator it = list.begin(); @@ -555,7 +555,7 @@ void KFileDialog::slotOk() it != list.end(); ++it ) { job = KIO::stat( *it, !(*it).isLocalFile() ); - job->setWindow (tqtopLevelWidget()); + job->setWindow (topLevelWidget()); 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 (tqtopLevelWidget()); + job->setWindow (topLevelWidget()); d->statJobs.append( job ); connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*))); } @@ -658,7 +658,7 @@ void KFileDialog::accept() for ( ; it != list.end(); ++it ) { const KURL& url = *it; // we strip the last slash (-1) because KURLComboBox does that as well - // when operating in file-mode. If we wouldn't , dupe-tqfinding wouldn't + // when operating in file-mode. If we wouldn't , dupe-finding wouldn't // work. TQString file = url.isLocalFile() ? url.path(-1) : url.prettyURL(-1); @@ -831,10 +831,10 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->autoSelectExtChecked = false; d->urlBar = 0; // delayed loading - QtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); + QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true); toolbar->setFlat(true); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, toolbar, "path combo" ); @@ -1063,7 +1063,7 @@ void KFileDialog::initSpeedbar() void KFileDialog::initGUI() { - delete d->boxLayout; // deletes all sub tqlayouts + delete d->boxLayout; // deletes all sub layouts d->boxLayout = new TQVBoxLayout( d->mainWidget, 0, KDialog::spacingHint()); d->boxLayout->addWidget(toolbar, AlignTop); @@ -1133,7 +1133,7 @@ void KFileDialog::slotFilterChanged() TQString filter = filterWidget->currentFilter(); ops->clearFilter(); - if ( filter.tqfind( '/' ) > -1 ) { + if ( filter.find( '/' ) > -1 ) { TQStringList types = TQStringList::split( " ", filter ); types.prepend( "inode/directory" ); ops->setMimeFilter( types ); @@ -1204,7 +1204,7 @@ void KFileDialog::enterURL( const KURL& url) void KFileDialog::enterURL( const TQString& url ) { - setURL( KURL::fromPathOrURL( KURLCompletion::tqreplacedPath( url, true, true )) ); + setURL( KURL::fromPathOrURL( KURLCompletion::replacedPath( url, true, true )) ); } void KFileDialog::toolbarCallback(int) // SLOT @@ -1250,7 +1250,7 @@ void KFileDialog::setSelection(const TQString& url) } else { TQString filename = u.url(); - int sep = filename.tqfindRev('/'); + int sep = filename.findRev('/'); if (sep >= 0) { // there is a / in it if ( KProtocolInfo::supportsListing( u )) { KURL dir(u); @@ -1310,9 +1310,9 @@ void KFileDialog::slotLocationChanged( const TQString& text ) updateFilter(); } -void KFileDialog::updatetqStatusLine(int /* dirs */, int /* files */) +void KFileDialog::updateStatusLine(int /* dirs */, int /* files */) { - kdWarning() << "KFileDialog::updatetqStatusLine is deprecated! The status line no longer exists. Do not try and use it!" << endl; + kdWarning() << "KFileDialog::updateStatusLine is deprecated! The status line no longer exists. Do not try and use it!" << endl; } TQString KFileDialog::getOpenFileName(const TQString& startDir, @@ -1335,7 +1335,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir, const TQString& filter, WId parent_id, const TQString& caption) { - TQWidget* parent = TQWidget::tqfind( parent_id ); + TQWidget* parent = TQWidget::find( parent_id ); KFileDialog dlg(startDir, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) @@ -1471,10 +1471,10 @@ KURL::List& KFileDialog::parseSelectedURLs() const } d->urlList.clear(); - if ( d->filenames.tqcontains( '/' )) { // assume _one_ absolute filename + if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename static const TQString &prot = KGlobal::staticQString(":/"); KURL u; - if ( d->filenames.tqfind( prot ) != -1 ) + if ( d->filenames.find( 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.tqcontains( '"' ); + int count = line.contains( '"' ); 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.tqfind( '"', start ); - index2 = line.tqfind( '"', index1 + 1 ); + index1 = line.find( '"', start ); + index2 = line.find( '"', 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,tqtopLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); 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,tqtopLevelWidget()); + url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget()); 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::tqfind( parent_id ); + TQWidget* parent = 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 = tqminimumSize().width(); - int w2 = toolbar->tqsizeHint().width() + 10; + int w1 = minimumSize().width(); + int w2 = toolbar->sizeHint().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).tqfind ('*', 2) < 0 && (*it).tqfind ('?', 2) < 0) + (*it).find ('*', 2) < 0 && (*it).find ('?', 2) < 0) { ret = (*it).mid (1); break; @@ -1937,7 +1937,7 @@ void KFileDialog::updateAutoSelectExtension (void) if (!filter.isEmpty ()) { // e.g. "*.cpp" - if (filter.tqfind ('/') < 0) + if (filter.find ('/') < 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.tqfindRev ('/') + 1; + const int fileNameOffset = urlStr.findRev ('/') + 1; TQString fileName = urlStr.mid (fileNameOffset); - const int dot = fileName.tqfindRev ('.'); + const int dot = fileName.findRev ('.'); 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, tqtopLevelWidget())) + if (KIO::NetAccess::stat (url, t, topLevelWidget())) { kdDebug (kfile_area) << "\tfile exists" << endl; @@ -2112,10 +2112,10 @@ void KFileDialog::updateFilter () if (urlStr.isEmpty ()) return; - KMimeType::Ptr mime = KMimeType::tqfindByPath(urlStr, 0, true); + KMimeType::Ptr mime = KMimeType::findByPath(urlStr, 0, true); if (mime && mime->name() != KMimeType::defaultMimeType()) { if (filterWidget->currentFilter() != mime->name() && - filterWidget->filters.tqfindIndex(mime->name()) != -1) { + filterWidget->filters.findIndex(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.tqfindRev ('.'); + const int dot = fileName.findRev ('.'); 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, tqtopLevelWidget())) + if (KIO::NetAccess::stat (url, t, topLevelWidget())) { 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::tqfromLatin1("bookmark"), + toolbar->insertButton(TQString::fromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, i18n("Bookmarks"), 5); toolbar->getButton(HOTLIST_BUTTON)->setPopup(d->bookmarkHandler->menu(), @@ -2359,13 +2359,13 @@ void KFileDialog::setNonExtSelection() { // Enhanced rename: Don't highlight the file extension. TQString pattern, filename = locationEdit->currentText().stripWhiteSpace(); - KServiceTypeFactory::self()->tqfindFromPattern( filename, &pattern ); + KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.tqfind( '*' , 1 ) == -1 ) + if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 ) locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 ); else { - int lastDot = filename.tqfindRev( '.' ); + int lastDot = filename.findRev( '.' ); if ( lastDot > 0 ) locationEdit->lineEdit()->setSelection( 0, lastDot ); } diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h index 1fd4f7b7f..33e0c9b12 100644 --- a/kio/kfile/kfiledialog.h +++ b/kio/kfile/kfiledialog.h @@ -57,7 +57,7 @@ struct KFileDialogPrivate; * Provides a user (and developer) friendly way to * select files and directories. * - * The widget can be used as a drop in tqreplacement for the + * The widget can be used as a drop in replacement for the * TQFileDialog widget, but has greater functionality and a nicer GUI. * * You will usually want to use one of the static methods @@ -65,8 +65,8 @@ struct KFileDialogPrivate; * or for multiple files getOpenFileNames() or getOpenURLs(). * * The dialog has been designed to allow applications to customise it - * by subclassing. It uses tqgeometry management to ensure that subclasses - * can easily add children that will be incorporated into the tqlayout. + * by subclassing. It uses geometry management to ensure that subclasses + * can easily add children that will be incorporated into the layout. * * \image html kfiledialog.png "KDE File Dialog" * @@ -276,7 +276,7 @@ public: * want to show the suffix to select by a specific filter, you must * repeat it. * - * If the filter tqcontains an unescaped '/', a mimetype-filter is assumed. + * If the filter contains an unescaped '/', a mimetype-filter is assumed. * If you would like a '/' visible in your filter it can be escaped with * a '\'. You can specify multiple mimetypes like this (separated with * space): @@ -356,7 +356,7 @@ public: * Add a preview widget and enter the preview mode. * * In this mode - * the dialog is split and the right part tqcontains your widget. + * the dialog is split and the right part contains your widget. * This widget has to inherit TQWidget and it has to implement * a slot showPreview(const KURL &); which is called * every time the file changes. You may want to look at @@ -370,7 +370,7 @@ public: /** * Adds a preview widget and enters the preview mode. * - * In this mode the dialog is split and the right part tqcontains your + * In this mode the dialog is split and the right part contains your * preview widget. * * Ownership is transferred to KFileDialog. You need to create the @@ -811,7 +811,7 @@ signals: * Emitted when the filter changed, i.e. the user entered an own filter * or chose one of the predefined set via setFilter(). * - * @param filter tqcontains the new filter (only the extension part, + * @param filter contains the new filter (only the extension part, * not the explanation), i.e. "*.cpp" or "*.cpp *.cc". * * @see setFilter() @@ -840,7 +840,7 @@ protected: void init(const TQString& startDir, const TQString& filter, TQWidget* widget); /** - * rebuild tqgeometry management. + * rebuild geometry management. * */ virtual void initGUI(); @@ -946,7 +946,7 @@ protected slots: /** * @deprecated */ - virtual void updatetqStatusLine(int dirs, int files); + virtual void updateStatusLine(int dirs, int files); virtual void slotOk(); virtual void accept(); diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp index 492c36d55..c865cc0e1 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.tqfind('\n'); + int index = tmp.find('\n'); while (index > 0) { filters.append(tmp.left(index)); tmp = tmp.mid(index + 1); - index = tmp.tqfind('\n'); + index = tmp.find('\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).tqfind('|'); + int tab = (*it).find('|'); insertItem((tab < 0) ? *it : (*it).mid(tab + 1)); } @@ -101,7 +101,7 @@ TQString KFileFilterCombo::currentFilter() const } } - int tab = f.tqfind('|'); + int tab = f.find('|'); if (tab < 0) return f; else @@ -129,7 +129,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types, { clear(); filters.clear(); - TQString delim = TQString::tqfromLatin1(", "); + TQString delim = TQString::fromLatin1(", "); d->hasAllSupportedFiles = false; m_allTypes = defaultType.isEmpty() && (types.count() > 1); diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index ab68cba4a..a4c65924d 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -70,8 +70,8 @@ public: parent->actionCollection(), "large rows" ); - smallColumns->setExclusiveGroup(TQString::tqfromLatin1("IconView mode")); - largeRows->setExclusiveGroup(TQString::tqfromLatin1("IconView mode")); + smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode")); + largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode")); previews = new KToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), @@ -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::tqfromLatin1("SmallColumns"); + TQString small = TQString::fromLatin1("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::tqfromLatin1("SmallColumns") : - TQString::tqfromLatin1("LargeRows"); + TQString::fromLatin1("SmallColumns") : + TQString::fromLatin1("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::tqfromLatin1(" %1 ").arg(item->text()), 0, + toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(item->text()), 0, "myToolTip", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); toolTip->setLineWidth( 1 ); - toolTip->tqsetAlignment( AlignLeft | AlignTop ); + toolTip->setAlignment( AlignLeft | AlignTop ); toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) ); toolTip->adjustSize(); TQRect screen = TQApplication::desktop()->screenGeometry( @@ -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 tqrepaint, + // Since creating and initializing an item leads to a repaint, // 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 tqrepaint + // recalculate item parameters but avoid an in-place repaint item->setPixmap( (item->fileInfo())->pixmap( myIconSize ), true, false ); item = static_cast<KFileIconViewItem *>(item->nextItem()); } while ( item != 0L ); @@ -763,7 +763,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i, if ( updateTextAndPixmap ) { - // this causes a tqrepaint of the item, which we want to avoid during + // this causes a repaint 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*>(tqfindItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( 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*>(tqfindItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( 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*>(tqfindItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); KFileItem * fileItem = 0; if (item) fileItem = item->fileInfo(); diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp index 3b409158c..1be7743a1 100644 --- a/kio/kfile/kfilemetapreview.cpp +++ b/kio/kfile/kfilemetapreview.cpp @@ -21,9 +21,9 @@ KFileMetaPreview::KFileMetaPreview( TQWidget *parent, const char *name ) : KPreviewWidgetBase( parent, name ), haveAudioPreview( false ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 0, 0 ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 0, 0 ); m_stack = new TQWidgetStack( this ); - tqlayout->addWidget( m_stack ); + layout->addWidget( m_stack ); // ### // m_previewProviders.setAutoDelete( true ); @@ -43,7 +43,7 @@ void KFileMetaPreview::initPreviewProviders() KImageFilePreview *imagePreview = new KImageFilePreview( m_stack ); (void) m_stack->addWidget( imagePreview ); m_stack->raiseWidget( imagePreview ); - resize( imagePreview->tqsizeHint() ); + resize( imagePreview->sizeHint() ); TQStringList mimeTypes = imagePreview->supportedMimeTypes(); TQStringList::ConstIterator it = mimeTypes.begin(); @@ -62,11 +62,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT if ( mimeType == "inode/directory" ) return 0L; - KPreviewWidgetBase *provider = m_previewProviders.tqfind( mimeType ); + KPreviewWidgetBase *provider = m_previewProviders.find( mimeType ); if ( provider ) return provider; -//qDebug("#### didn't tqfind anything for: %s", mimeType.latin1()); +//qDebug("#### didn't find anything for: %s", mimeType.latin1()); if ( s_tryAudioPreview && !mimeType.startsWith("text/") && !mimeType.startsWith("image/") ) @@ -87,15 +87,15 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT } // with the new mimetypes from the audio-preview, try again - provider = m_previewProviders.tqfind( mimeType ); + provider = m_previewProviders.find( mimeType ); if ( provider ) return provider; // ### mimetype may be image/* for example, try that - int index = mimeType.tqfind( '/' ); + int index = mimeType.find( '/' ); if ( index > 0 ) { - provider = m_previewProviders.tqfind( mimeType.left( index + 1 ) + "*" ); + provider = m_previewProviders.find( 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.tqfind( parentMimeType ); + provider = m_previewProviders.find( parentMimeType ); if ( provider ) return provider; @@ -123,11 +123,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT { if ( textProperty.toBool() ) { - provider = m_previewProviders.tqfind( "text/plain" ); + provider = m_previewProviders.find( "text/plain" ); if ( provider ) return provider; - provider = m_previewProviders.tqfind( "text/*" ); + provider = m_previewProviders.find( "text/*" ); if ( provider ) return provider; } diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index c0f73949e..b221a1ebb 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -53,7 +53,7 @@ KFilePreview::~KFilePreview() // don't delete the preview, we can reuse it // (it will get deleted by ~KDirOperator) - if ( preview && preview->tqparentWidget() == this ) { + if ( preview && preview->parentWidget() == this ) { preview->reparent(0L, 0, TQPoint(0, 0), false); } } @@ -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->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); l->move(10, 5); - preview->setMinimumWidth(l->tqsizeHint().width()+20); + preview->setMinimumWidth(l->sizeHint().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->tqsizeHint()); + preview->resize(preview->sizeHint()); preview->show(); } @@ -149,7 +149,7 @@ void KFilePreview::updateView(bool b) { left->updateView(b); if(preview) - preview->tqrepaint(b); + preview->repaint(b); } void KFilePreview::updateView(const KFileItem *i) diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h index 2bb2d860c..123d221f1 100644 --- a/kio/kfile/kfilepreview.h +++ b/kio/kfile/kfilepreview.h @@ -88,7 +88,7 @@ public: /** * This overrides KFileView::actionCollection() by returning - * the actionCollection() of the KFileView (member left) it tqcontains. + * the actionCollection() of the KFileView (member left) it contains. * This means that KFilePreview will never create a KActionCollection * object of its own. */ diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp index fa82539a8..329bd19dc 100644 --- a/kio/kfile/kfilesharedlg.cpp +++ b/kio/kfile/kfilesharedlg.cpp @@ -124,13 +124,13 @@ void KFileSharePropsPlugin::init() // 0 => not shared // 1 => shared read only // 3 => shared writeable - int dirtqStatus = KFileShare::isDirectoryShared( path ); + int dirStatus = KFileShare::isDirectoryShared( path ); if ( !path.startsWith( home ) ) ok = false; - if ( dirtqStatus == 1 ) { + if ( dirStatus == 1 ) { d->m_bAllUnshared = false; } - else if ( dirtqStatus == 3 ) { + else if ( dirStatus == 3 ) { d->m_bAllUnshared = false; d->m_bAllReadOnly = false; } @@ -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->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); + label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::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->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); + label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::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 c96e1a60e..154009625 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -81,17 +81,17 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) while (!line.isNull()) { if (line.startsWith("XDG_DOWNLOAD_DIR=")) - download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); + download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_MUSIC_DIR=")) - music = line.remove("XDG_MUSIC_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); + music = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_PICTURES_DIR=")) - pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); + pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_VIDEOS_DIR=")) - videos = line.remove("XDG_VIDEOS_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); + videos = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_TEMPLATES_DIR=")) - templates = line.remove("XDG_TEMPLATES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); + templates = line.remove("XDG_TEMPLATES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_PUBLICSHARES_DIR=")) - publicShares = line.remove("XDG_PUBLICSHARES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); + publicShares = line.remove("XDG_PUBLICSHARES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); line = s.readLine(); } @@ -133,15 +133,15 @@ void KFileSpeedBar::save( KConfig *config ) writeConfig( config, "KFileDialog Speedbar" ); } -TQSize KFileSpeedBar::tqsizeHint() const +TQSize KFileSpeedBar::sizeHint() const { - TQSize tqsizeHint = KURLBar::tqsizeHint(); + TQSize sizeHint = KURLBar::sizeHint(); int ems = fontMetrics().width("mmmmmmmmmmmm"); - if (tqsizeHint.width() < ems) + if (sizeHint.width() < ems) { - tqsizeHint.setWidth(ems); + sizeHint.setWidth(ems); } - return tqsizeHint; + return sizeHint; } #include "kfilespeedbar.moc" diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index 171081101..28c621651 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -31,7 +31,7 @@ public: ~KFileSpeedBar(); virtual void save( KConfig *config ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: bool m_initializeSpeedbar : 1; diff --git a/kio/kfile/kfiletreebranch.cpp b/kio/kfile/kfiletreebranch.cpp index c0a5d1b6e..352bd875e 100644 --- a/kio/kfile/kfiletreebranch.cpp +++ b/kio/kfile/kfiletreebranch.cpp @@ -126,7 +126,7 @@ KFileTreeViewItem *KFileTreeBranch::parentKFTVItem( KFileItem *item ) dirUrl.setFileName( TQString::null ); // kdDebug(250) << "Directory url is " << dirUrl.prettyURL() << endl; - parent = tqfindTVIByURL( dirUrl ); + parent = findTVIByURL( dirUrl ); // kdDebug(250) << "Returning as parent item <" << parent << ">" << endl; return( parent ); } @@ -141,7 +141,7 @@ void KFileTreeBranch::slotRefreshItems( const KFileItemList& list ) while ( (currItem = it.current()) != 0 ) { - item = tqfindTVIByURL(currItem->url()); + item = findTVIByURL(currItem->url()); if (item) { item->setPixmap(0, item->fileItem()->pixmap( KIcon::SizeSmall )); item->setText( 0, item->fileItem()->text()); @@ -182,14 +182,14 @@ void KFileTreeBranch::addItems( const KFileItemList& list ) if( !m_showExtensions && !currItem->isDir() ) /* Need to cut the extension */ { TQString name = currItem->text(); - int mPoint = name.tqfindRev( '.' ); + int mPoint = name.findRev( '.' ); if( mPoint > 0 ) name = name.left( mPoint ); newKFTVI->setText( 0, name ); } } - /* Now try to tqfind out if there are children for dirs in the treeview */ + /* Now try to find out if there are children for dirs in the treeview */ /* This stats a directory on the local file system and checks the */ /* hardlink entry in the stat-buf. This works only for local directories. */ if( dirOnlyMode() && !m_recurseChildren && currItem->isLocalFile( ) && currItem->isDir() ) @@ -197,7 +197,7 @@ void KFileTreeBranch::addItems( const KFileItemList& list ) KURL url = currItem->url(); TQString filename = url.directory( false, true ) + url.fileName(); /* do the stat trick of Carsten. The problem is, that the hardlink - * count only tqcontains directory links. Thus, this method only seem + * count only contains directory links. Thus, this method only seem * to work in dir-only mode */ kdDebug(250) << "Doing stat on " << filename << endl; KDE_struct_stat statBuf; @@ -321,7 +321,7 @@ void KFileTreeBranch::slotCanceled( const KURL& url ) m_openChildrenURLs.remove( url); // stop animations etc. - KFileTreeViewItem *item = tqfindTVIByURL(url); + KFileTreeViewItem *item = findTVIByURL(url); if (!item) return; // Uh oh... emit populateFinished(item); } @@ -365,7 +365,7 @@ void KFileTreeBranch::slotRedirect( const KURL& oldUrl, const KURL&newUrl ) } } -KFileTreeViewItem* KFileTreeBranch::tqfindTVIByURL( const KURL& url ) +KFileTreeViewItem* KFileTreeBranch::findTVIByURL( const KURL& url ) { KFileTreeViewItem *resultItem = 0; @@ -400,7 +400,7 @@ KFileTreeViewItem* KFileTreeBranch::tqfindTVIByURL( const KURL& url ) void KFileTreeBranch::slCompleted( const KURL& url ) { kdDebug(250) << "SlotCompleted hit for " << url.prettyURL() << endl; - KFileTreeViewItem *currParent = tqfindTVIByURL( url ); + KFileTreeViewItem *currParent = findTVIByURL( url ); if( ! currParent ) return; kdDebug(250) << "current parent " << currParent << " is already listed: " @@ -463,7 +463,7 @@ void KFileTreeBranch::slCompleted( const KURL& url ) if( nextChild ) /* This implies that idx > -1 */ { /* Next child is defined. We start a dirlister job on every child item - * which is a directory to tqfind out how much children are in the child + * which is a directory to find out how much children are in the child * of the last opened dir */ diff --git a/kio/kfile/kfiletreebranch.h b/kio/kfile/kfiletreebranch.h index 03976a8d7..30f5cf47c 100644 --- a/kio/kfile/kfiletreebranch.h +++ b/kio/kfile/kfiletreebranch.h @@ -166,9 +166,9 @@ protected: public: /** - * tqfind the according KFileTreeViewItem by an url + * find the according KFileTreeViewItem by an url */ - virtual KFileTreeViewItem *tqfindTVIByURL( const KURL& ); + virtual KFileTreeViewItem *findTVIByURL( const KURL& ); signals: /** @@ -213,7 +213,7 @@ private: KURL::List m_openChildrenURLs; - /* The next two members are used for caching purposes in tqfindTVIByURL. */ + /* The next two members are used for caching purposes in findTVIByURL. */ KURL m_lastFoundURL; KFileTreeViewItem *m_lastFoundItem; diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp index 2b38635b9..e8451077d 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->tqrepaint(); + m_dropItem->repaint(); } @@ -413,7 +413,7 @@ KFileTreeBranchList& KFileTreeView::branches() bool KFileTreeView::removeBranch( KFileTreeBranch *branch ) { - if(m_branches.tqcontains(branch)) + if(m_branches.contains(branch)) { delete (branch->root()); m_branches.remove( branch ); @@ -522,7 +522,7 @@ void KFileTreeView::slotAnimation() } uint & iconNumber = it.data().iconNumber; - TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); + TQString icon = TQString::fromLatin1( 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.tqfind(item); + MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item); if ( it != m_mapCurrentOpeningFolders.end() ) { if( item->isDir() && isOpen( item) ) @@ -575,7 +575,7 @@ void KFileTreeView::stopAnimation( KFileTreeViewItem * item ) else { if( item ) - kdDebug(250)<< "StopAnimation - could not tqfind item " << item->url().prettyURL()<< endl; + kdDebug(250)<< "StopAnimation - could not find item " << item->url().prettyURL()<< endl; else kdDebug(250)<< "StopAnimation - item is zero !" << endl; } @@ -616,13 +616,13 @@ void KFileTreeView::slotItemRenamed(TQListViewItem* item, const TQString &name, kdDebug(250) << "Do not bother: " << name << col << endl; } -KFileTreeViewItem *KFileTreeView::tqfindItem( const TQString& branchName, const TQString& relUrl ) +KFileTreeViewItem *KFileTreeView::findItem( const TQString& branchName, const TQString& relUrl ) { KFileTreeBranch *br = branch( branchName ); - return( tqfindItem( br, relUrl )); + return( findItem( br, relUrl )); } -KFileTreeViewItem *KFileTreeView::tqfindItem( KFileTreeBranch* brnch, const TQString& relUrl ) +KFileTreeViewItem *KFileTreeView::findItem( KFileTreeBranch* brnch, const TQString& relUrl ) { KFileTreeViewItem *ret = 0; if( brnch ) @@ -666,7 +666,7 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & ) if ( item ) { TQString text = static_cast<KFileViewItem*>( item )->toolTipText(); if ( !text.isEmpty() ) - tip ( m_view->tqitemRect( item ), text ); + tip ( m_view->itemRect( item ), text ); } #endif } diff --git a/kio/kfile/kfiletreeview.h b/kio/kfile/kfiletreeview.h index 03c4661b2..92565269d 100644 --- a/kio/kfile/kfiletreeview.h +++ b/kio/kfile/kfiletreeview.h @@ -58,7 +58,7 @@ private: * KFileTreeBranch. * * Typical usage: - * 1. create a KFileTreeView fitting in your tqlayout and add columns to it + * 1. create a KFileTreeView fitting in your layout and add columns to it * 2. call addBranch to create one or more branches * 3. retrieve the root item with KFileTreeBranch::root() and set it open * if desired. That starts the listing. @@ -133,18 +133,18 @@ public: /** * searches a branch for a KFileTreeViewItem identified by the relative url given as - * second parameter. The method adds the branches base url to the relative path and tqfinds + * second parameter. The method adds the branches base url to the relative path and finds * the item. * @returns a pointer to the item or zero if the item does not exist. * @param brnch is a pointer to the branch to search in * @param relUrl is the branch relativ url */ - KFileTreeViewItem *tqfindItem( KFileTreeBranch* brnch, const TQString& relUrl ); + KFileTreeViewItem *findItem( KFileTreeBranch* brnch, const TQString& relUrl ); /** * see method above, differs only in the first parameter. Finds the branch by its name. */ - KFileTreeViewItem *tqfindItem( const TQString& branchName, const TQString& relUrl ); + KFileTreeViewItem *findItem( const TQString& branchName, const TQString& relUrl ); /** * @returns a flag indicating if extended folder pixmaps are displayed or not. diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index eb12a9498..165801652 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -258,7 +258,7 @@ sort_by_name: void KFileView::updateView(bool f) { - widget()->tqrepaint(f); + widget()->repaint(f); } void KFileView::updateView(const KFileItem *) diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index 1a13e264e..05b32e863 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 TQObject +class KIO_EXPORT KFileViewSignaler : public QObject { Q_OBJECT @@ -146,11 +146,11 @@ public: virtual void clear(); /** - * does a tqrepaint of the view. + * does a repaint of the view. * * The default implementation calls * \code - * widget()->tqrepaint(f) + * widget()->repaint(f) * \endcode **/ virtual void updateView(bool f = true); diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index e33db8d69..164abd35a 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -68,7 +68,7 @@ protected: public: IconPath(const TQString &ip) : TQString (ip) { - int n = tqfindRev('/'); + int n = findRev('/'); m_iconName = (n==-1) ? static_cast<TQString>(*this) : mid(n+1); } @@ -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 tqrepainted once for every new item), so we don't do this. - // Instead, we directly tqrepaint the progress bar without going through + // (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 // 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::tqfromLatin1("*.png")); + mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); TQWidget *main = new TQWidget( this ); setMainWidget(main); @@ -268,11 +268,11 @@ void KIconDialog::init() top->setSpacing( spacingHint() ); TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main); - bgroup->tqlayout()->setSpacing(KDialog::spacingHint()); - bgroup->tqlayout()->setMargin(KDialog::marginHint()); + bgroup->layout()->setSpacing(KDialog::spacingHint()); + bgroup->layout()->setMargin(KDialog::marginHint()); top->addWidget(bgroup); connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int))); - TQGridLayout *grid = new TQGridLayout(bgroup->tqlayout(), 3, 2); + TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2); mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup); grid->addWidget(mpRb1, 1, 0); mpCombo = new TQComboBox(bgroup); @@ -338,7 +338,7 @@ void KIconDialog::init() I18N_NOOP( "International" ), I18N_NOOP( "Mimetypes" ), I18N_NOOP( "Places" ), - I18N_NOOP( "tqStatus" ) }; + I18N_NOOP( "Status" ) }; static const KIcon::Context context_id[] = { KIcon::Action, KIcon::Animation, @@ -351,7 +351,7 @@ void KIconDialog::init() KIcon::International, KIcon::MimeType, KIcon::Place, - KIcon::tqStatusIcon }; + KIcon::StatusIcon }; mNumContext = 0; int cnt = sizeof( context_text ) / sizeof( context_text[ 0 ] ); // check all 3 arrays have same sizes @@ -367,7 +367,7 @@ void KIconDialog::init() mContextMap[ mNumContext++ ] = context_id[ i ]; } } - mpCombo->setFixedSize(mpCombo->tqsizeHint()); + mpCombo->setFixedSize(mpCombo->sizeHint()); 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. ->tqrepaint() only makes it flicker - //mpProgress->tqrepaint(); + // progress bar. ->repaint() only makes it flicker + //mpProgress->repaint(); } void KIconDialog::slotFinished() diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index f2869314c..2d9f7881a 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->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); - imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); + imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + imageLabel->setSizePolicy( 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::tqsizeHint() const +TQSize KImageFilePreview::sizeHint() const { return TQSize( 20, 200 ); // otherwise it ends up huge??? } diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index 3e64f2a7b..864fc5d31 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 tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: virtual void showPreview(const KURL &url); diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index a8c859792..281fbc622 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -56,8 +56,8 @@ protected: virtual void viewportResizeEvent(TQResizeEvent* ev) { TQScrollView::viewportResizeEvent(ev); - m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()), - kMax(m_frame->tqsizeHint().height(), ev->size().height())); + m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()), + kMax(m_frame->sizeHint().height(), ev->size().height())); }; private: @@ -71,7 +71,7 @@ public: ~KFileMetaPropsPluginPrivate() {} TQFrame* m_frame; - TQGridLayout* m_frametqlayout; + TQGridLayout* m_framelayout; KFileMetaInfo m_info; // TQPushButton* m_add; TQPtrList<KFileMetaInfoWidget> m_editWidgets; @@ -138,8 +138,8 @@ void KFileMetaPropsPlugin::createLayout() d->m_frame = view->frame(); - TQVBoxLayout *toptqlayout = new TQVBoxLayout(d->m_frame); - toptqlayout->setSpacing(KDialog::spacingHint()); + TQVBoxLayout *toplayout = new TQVBoxLayout(d->m_frame); + toplayout->setSpacing(KDialog::spacingHint()); for (TQStringList::Iterator git=groupList.begin(); git!=groupList.end(); ++git) @@ -154,7 +154,7 @@ void KFileMetaPropsPlugin::createLayout() TQStyleSheet::escape(mtinfo->groupInfo(*git)->translatedName()), d->m_frame); - toptqlayout->addWidget(groupBox); + toplayout->addWidget(groupBox); TQValueList<KFileMetaInfoItem> readItems; TQValueList<KFileMetaInfoItem> editItems; @@ -174,12 +174,12 @@ void KFileMetaPropsPlugin::createLayout() } KFileMetaInfoWidget* w = 0L; - // then first add the editable items to the tqlayout + // then first add the editable items to the layout for (TQValueList<KFileMetaInfoItem>::Iterator iit= editItems.begin(); iit!=editItems.end(); ++iit) { TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox); - l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); + l->setAlignment( 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,16 +192,16 @@ void KFileMetaPropsPlugin::createLayout() iit!=readItems.end(); ++iit) { TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox); - l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); + l->setAlignment( AlignAuto | AlignTop | ExpandTabs ); (new KFileMetaInfoWidget(*iit, KFileMetaInfoWidget::ReadOnly, 0L, groupBox)); } } - toptqlayout->addStretch(1); + toplayout->addStretch(1); // the add key (disabled until fully implemented) /* d->m_add = new TQPushButton(i18n("&Add"), topframe); - d->m_add->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + d->m_add->setSizePolicy(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.tqfind(*it)==l.end() ) + if ( l.find(*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 3ed69ec71..9e370643f 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -65,7 +65,7 @@ enum }; // -// I don't feel like subclassing KComboBox and tqfind ways to insert that into +// I don't feel like subclassing KComboBox and find ways to insert that into // the .ui file... // namespace KNotify @@ -130,7 +130,7 @@ namespace KNotify protected: virtual void maybeTip ( const TQPoint& p ) { - TQHeader *header = static_cast<TQHeader*>( tqparentWidget() ); + TQHeader *header = static_cast<TQHeader*>( parentWidget() ); int section = 0; if ( header->orientation() == Horizontal ) @@ -181,7 +181,7 @@ KNotifyDialog::~KNotifyDialog() void KNotifyDialog::addApplicationEvents( const char *appName ) { addApplicationEvents( TQString::fromUtf8( appName ) + - TQString::tqfromLatin1( "/eventsrc" ) ); + TQString::fromLatin1( "/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.tqfindRef( app ) != -1) ) + if ( !app || (m_visibleApps.findRef( app ) != -1) ) return; m_visibleApps.append( app ); @@ -830,8 +830,8 @@ void KNotifyWidget::save() // "/opt/kde3/share/apps/kwin/eventsrc" TQString KNotifyWidget::makeRelative( const TQString& fullPath ) { - int slash = fullPath.tqfindRev( '/' ) - 1; - slash = fullPath.tqfindRev( '/', slash ); + int slash = fullPath.findRev( '/' ) - 1; + slash = fullPath.findRev( '/', slash ); if ( slash < 0 ) return TQString::null; @@ -861,7 +861,7 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) << "audio/x-adpcm"; fileDialog->setMimeFilter( filters ); - // tqfind the first "sound"-resource that tqcontains files + // find the first "sound"-resource that contains files const Application *app = currentEvent()->application(); TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); @@ -918,7 +918,7 @@ void KNotifyWidget::playSound() if (!KIO::NetAccess::exists( m_soundPath->url(), true, 0 )) { bool foundSound=false; - // tqfind the first "sound"-resource that tqcontains files + // find the first "sound"-resource that contains files const Application *app = currentEvent()->application(); TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); @@ -1001,17 +1001,17 @@ void KNotifyWidget::enableAll( int what, bool enable ) Application::Application( const TQString &path ) { TQString config_file = path; - config_file[config_file.tqfind('/')] = '.'; + config_file[config_file.find('/')] = '.'; m_events = 0L; config = new KConfig(config_file, false, false); kc = new KConfig(path, true, false, "data"); - kc->setGroup( TQString::tqfromLatin1("!Global!") ); - m_icon = kc->readEntry(TQString::tqfromLatin1("IconName"), - TQString::tqfromLatin1("misc")); - m_description = kc->readEntry( TQString::tqfromLatin1("Comment"), + kc->setGroup( TQString::fromLatin1("!Global!") ); + m_icon = kc->readEntry(TQString::fromLatin1("IconName"), + TQString::fromLatin1("misc")); + m_description = kc->readEntry( TQString::fromLatin1("Comment"), i18n("No description available") ); - int index = path.tqfind( '/' ); + int index = path.find( '/' ); if ( index >= 0 ) m_appname = path.left( index ); else @@ -1070,10 +1070,10 @@ void Application::reloadEvents( bool revertToDefaults ) Event *e = 0L; - TQString global = TQString::tqfromLatin1("!Global!"); - TQString default_group = TQString::tqfromLatin1("<default>"); - TQString name = TQString::tqfromLatin1("Name"); - TQString comment = TQString::tqfromLatin1("Comment"); + TQString global = TQString::fromLatin1("!Global!"); + TQString default_group = TQString::fromLatin1("<default>"); + TQString name = TQString::fromLatin1("Name"); + TQString comment = TQString::fromLatin1("Comment"); TQStringList conflist = kc->groupList(); TQStringList::ConstIterator it = conflist.begin(); diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index cc801ae8c..70e195aba 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -64,7 +64,7 @@ public: * @param name The widget name * @param modal If true, this will be a modal dialog, otherwise non-modal. * @param aboutData A pointer to a KAboutData object. KAboutData::appName() - * will be used to tqfind the KNotify events (in the eventsrc file). + * will be used to find the KNotify events (in the eventsrc file). * Set this to 0L if you want to add all events yourself with * addApplicationEvents(). */ @@ -83,7 +83,7 @@ public: * @param parent The parent widget for the dialog * @param name The widget name * @param aboutData A pointer to a KAboutData object. KAboutData::appName() - * will be used to tqfind the KNotify events (in the eventsrc file). + * will be used to find the KNotify events (in the eventsrc file). * @see exec for the return values. * @return The value of TQDialog::exec() */ @@ -169,7 +169,7 @@ namespace KNotify EventList *m_events; KConfig *kc; // The file that defines the events. - KConfig *config; // The file that tqcontains the settings for the events + KConfig *config; // The file that contains the settings for the events }; diff --git a/kio/kfile/knotifywidgetbase.ui b/kio/kfile/knotifywidgetbase.ui index 87eff311b..99fd07582 100644 --- a/kio/kfile/knotifywidgetbase.ui +++ b/kio/kfile/knotifywidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KNotifyWidgetBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>318</width> <height>16</height> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -391,7 +391,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -464,6 +464,6 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index e9a13b7c5..2a3e7e690 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -279,8 +279,8 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i) void KApplicationTree::resizeEvent( TQResizeEvent * e) { - setColumnWidth(0, width()-TQApplication::style().tqpixelMetric(TQStyle::PM_ScrollBarExtent) - -2*TQApplication::style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth)); + setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent) + -2*TQApplication::style().pixelMetric(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::tqfromLatin1("..."); + caption += TQString::fromLatin1("..."); 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::tqfromLatin1("application/octet-stream")) + if (qServiceType == TQString::fromLatin1("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->tqsizeHint() ); + clearButton->setFixedSize( clearButton->sizeHint() ); 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::tqfromLatin1("Open-with settings") ); - int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 ); + KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); + int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); - int mode = kc->readNumEntry(TQString::tqfromLatin1("CompletionMode"), + int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), KGlobalSettings::completionMode()); combo->setCompletionMode((KGlobalSettings::Completion)mode); - TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") ); + TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); combo->setHistoryItems( list, true ); edit = new KURLRequester( combo, this ); } @@ -433,7 +433,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) edit->setURL( _value ); TQWhatsThis::add(edit,i18n( - "Following the command, you can have several place holders which will be tqreplaced " + "Following the command, you can have several place holders which will be replaced " "with the actual values when the actual program is run:\n" "%f - a single file name\n" "%F - a list of files; use for applications that can open several local files at once\n" @@ -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::tqfromLatin1("General") ); - TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") nocloseonexit->hide(); @@ -512,13 +512,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQPushButton* cancel = b->addButton( KStdGuiItem::cancel() ); connect( cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); - b->tqlayout(); + b->layout(); topLayout->addWidget( b ); //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(), tqsizeHint().height() ); + //resize( minimumWidth(), sizeHint().height() ); edit->setFocus(); slotTextChanged(); } @@ -564,7 +564,7 @@ void KOpenWithDlg::slotHighlighted( const TQString& _name, const TQString& ) // ### indicate that default value was restored terminal->setChecked(d->curService->terminal()); TQString terminalOptions = d->curService->terminalOptions(); - nocloseonexit->setChecked( (terminalOptions.tqcontains( "--noclose" ) > 0) ); + nocloseonexit->setChecked( (terminalOptions.contains( "--noclose" ) > 0) ); m_terminaldirty = false; // slotTerminalToggled changed it } } @@ -629,17 +629,17 @@ void KOpenWithDlg::slotOK() kdDebug(250) << "looking for service " << serviceName << endl; KService::Ptr serv = KService::serviceByDesktopName( serviceName ); ok = !serv; // ok if no such service yet - // also ok if we tqfind the exact same service (well, "kwrite" == "kwrite %U" + // also ok if we find the exact same service (well, "kwrite" == "kwrite %U" if ( serv && serv->type() == "Application") { TQString exec = serv->exec(); fullExec = exec; - exec.tqreplace("%u", "", false); - exec.tqreplace("%f", "", false); - exec.tqreplace("-caption %c", ""); - exec.tqreplace("-caption \"%c\"", ""); - exec.tqreplace("%i", ""); - exec.tqreplace("%m", ""); + exec.replace("%u", "", false); + exec.replace("%f", "", false); + exec.replace("-caption %c", ""); + exec.replace("-caption \"%c\"", ""); + exec.replace("%i", ""); + exec.replace("%m", ""); exec = exec.simplifyWhiteSpace(); if (exec == typedExec) { @@ -666,13 +666,13 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); - preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("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::tqfromLatin1(" --noclose"); - m_command += TQString::tqfromLatin1(" -e "); + m_command += TQString::fromLatin1(" --noclose"); + m_command += TQString::fromLatin1(" -e "); m_command += edit->url(); kdDebug(250) << "Setting m_command to " << m_command << endl; } @@ -702,7 +702,7 @@ void KOpenWithDlg::slotOK() return; } - // if we got here, we can't seem to tqfind a service for what they + // if we got here, we can't seem to find a service for what they // wanted. The other possibility is that they have asked for the // association to be remembered. Create/update service. @@ -740,7 +740,7 @@ void KOpenWithDlg::slotOK() { desktop = new KDesktopFile(newPath); } - desktop->writeEntry("Type", TQString::tqfromLatin1("Application")); + desktop->writeEntry("Type", TQString::fromLatin1("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.tqcontains(qServiceType)) + if (!qServiceType.isEmpty() && !mimeList.contains(qServiceType)) mimeList.append(qServiceType); desktop->writeEntry("MimeType", mimeList, ';'); @@ -814,11 +814,11 @@ void KOpenWithDlg::accept() combo->addToHistory( edit->url() ); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") ); - kc->writeEntry( TQString::tqfromLatin1("History"), combo->historyItems() ); - kc->writeEntry(TQString::tqfromLatin1("CompletionMode"), + KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); + kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); + kc->writeEntry(TQString::fromLatin1("CompletionMode"), combo->completionMode()); - // don't store the completion-list, as it tqcontains all of KURLCompletion's + // don't store the completion-list, as it contains all of KURLCompletion's // executables kc->sync(); } diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h index f435fc3fd..3a2a49b31 100644 --- a/kio/kfile/kpreviewwidgetbase.h +++ b/kio/kfile/kpreviewwidgetbase.h @@ -84,7 +84,7 @@ protected: private: class KPreviewWidgetBasePrivate; KPreviewWidgetBasePrivate * d() const { - return s_private->tqfind( const_cast<KPreviewWidgetBase*>( this ) ); + return s_private->find( const_cast<KPreviewWidgetBase*>( this ) ); } static TQPtrDict<KPreviewWidgetBasePrivate> * s_private; }; diff --git a/kio/kfile/kpropertiesdesktopadvbase.ui b/kio/kfile/kpropertiesdesktopadvbase.ui index a146807f4..fe1122136 100644 --- a/kio/kfile/kpropertiesdesktopadvbase.ui +++ b/kio/kfile/kpropertiesdesktopadvbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>widget11</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -275,5 +275,5 @@ <includes> <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/kfile/kpropertiesdesktopbase.ui b/kio/kfile/kpropertiesdesktopbase.ui index ad12885f5..7809d5135 100644 --- a/kio/kfile/kpropertiesdesktopbase.ui +++ b/kio/kfile/kpropertiesdesktopbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KPropertiesDesktopBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -174,7 +174,7 @@ <property name="whatsThis" stdset="0"> <string>Type the command to start this application here. -Following the command, you can have several place holders which will be tqreplaced with the actual values when the actual program is run: +Following the command, you can have several place holders which will be replaced with the actual values when the actual program is run: %f - a single file name %F - a list of files; use for applications that can open several local files at once %u - a single URL @@ -193,7 +193,7 @@ Following the command, you can have several place holders which will be tqreplac <property name="whatsThis" stdset="0"> <string>Type the command to start this application here. -Following the command, you can have several place holders which will be tqreplaced with the actual values when the actual program is run: +Following the command, you can have several place holders which will be replaced with the actual values when the actual program is run: %f - a single file name %F - a list of files; use for applications that can open several local files at once %u - a single URL @@ -213,7 +213,7 @@ Following the command, you can have several place holders which will be tqreplac <string>&Browse...</string> </property> <property name="whatsThis" stdset="0"> - <string>Click here to browse your file system in order to tqfind the desired executable.</string> + <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"> @@ -259,7 +259,7 @@ Following the command, you can have several place holders which will be tqreplac <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>53</width> <height>20</height> @@ -287,7 +287,7 @@ Following the command, you can have several place holders which will be tqreplac <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>53</width> <height>20</height> @@ -312,5 +312,5 @@ Following the command, you can have several place holders which will be tqreplac <include location="global" impldecl="in implementation">kurlrequester.h</include> <include location="global" impldecl="in implementation">klistview.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index b06e688ef..0116123f1 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -28,12 +28,12 @@ * * some FilePermissionsPropsPlugin-changes by * Henner Zeller <[email protected]> - * some tqlayout management by + * some layout management by * Bertrand Leconte <[email protected]> - * the rest of the tqlayout management, bug fixes, adaptation to libkio, + * the rest of the layout management, bug fixes, adaptation to libkio, * template feature by * David Faure <[email protected]> - * More tqlayout, cleanups, and fixes by + * More layout, cleanups, and fixes by * Preston Brown <[email protected]> * Plugin capability, cleanups and port to KDialogBase by * Simon Hausmann <[email protected]> @@ -203,7 +203,7 @@ KPropertiesDialog::KPropertiesDialog (KFileItemList _items, TQWidget* parent, const char* name, bool modal, bool autoShow) : KDialogBase (KDialogBase::Tabbed, - // TODO: tqreplace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise + // TODO: replace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise // (empty translation before the "\n" is not allowed by msgfmt...) _items.count()>1 ? i18n( "<never used>","Properties for %n Selected Items",_items.count()) : i18n( "Properties for %1" ).arg(KIO::decodeFileName(_items.first()->url().fileName())), @@ -516,7 +516,7 @@ void KPropertiesDialog::insertPages() if ( mimetype.isEmpty() ) return; - TQString query = TQString::tqfromLatin1( + TQString query = TQString::fromLatin1( "('KPropsDlg/Plugin' in ServiceTypes) and " "((not exist [X-KDE-Protocol]) or " " ([X-KDE-Protocol] == '%1' ) )" ).arg(item->url().protocol()); @@ -704,7 +704,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) d = new KFilePropsPluginPrivate; d->bMultiple = (properties->items().count() > 1); d->bIconChanged = false; - d->bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh? + d->bKDesktopMode = (TQCString(qApp->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::tqfromLatin1("/"); + bool hasRoot = url.path() == TQString::fromLatin1("/"); TQString iconStr = KMimeType::iconForURL(url, mode); TQString directory = properties->kurl().directory(); TQString protocol = properties->kurl().protocol(); @@ -728,7 +728,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) KIO::filesize_t totalSize = item->size(hasTotalSize); TQString magicMimeComment; if ( isLocal ) { - KMimeType::Ptr magicMimeType = KMimeType::tqfindByFileContent( url.path() ); + KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() ); if ( magicMimeType->name() != KMimeType::defaultMimeType() ) magicMimeComment = magicMimeType->comment(); } @@ -759,8 +759,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) { TQString path; if ( !m_bFromTemplate ) { - isTrash = ( properties->kurl().protocol().tqfind( "trash", 0, false)==0 ); - if ( properties->kurl().protocol().tqfind("device", 0, false)==0) + isTrash = ( properties->kurl().protocol().find( "trash", 0, false)==0 ); + if ( properties->kurl().protocol().find("device", 0, false)==0) isDevice = true; // Extract the full name, but without file: for local files if ( isReallyLocal ) @@ -826,12 +826,12 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) if ( !mimeComment.isNull() && (*it)->mimeComment() != mimeComment ) mimeComment = TQString::null; if ( isLocal && !magicMimeComment.isNull() ) { - KMimeType::Ptr magicMimeType = KMimeType::tqfindByFileContent( url.path() ); + KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() ); if ( magicMimeType->comment() != magicMimeComment ) magicMimeComment = TQString::null; } - if ( url.path() == TQString::tqfromLatin1("/") ) + if ( url.path() == TQString::fromLatin1("/") ) 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().tqpixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * iconButton->style().pixelMetric(TQStyle::PM_ButtonMargin); iconButton->setFixedSize(bsize, bsize); iconButton->setIconSize(48); iconButton->setStrictIconSize(false); @@ -883,7 +883,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) this, TQT_SLOT( slotIconChanged() ) ); } else { TQLabel *iconLabel = new TQLabel( d->m_frame ); - int bsize = 66 + 2 * iconLabel->style().tqpixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); iconArea = iconLabel; @@ -907,12 +907,12 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // Enhanced rename: Don't highlight the file extension. TQString pattern; - KServiceTypeFactory::self()->tqfindFromPattern( filename, &pattern ); - if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1) + KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); + if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1); else { - int lastDot = filename.tqfindRev('.'); + int lastDot = filename.findRev('.'); 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::tqfromLatin1("configure")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("configure")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); button->setIconSet( iconSet ); button->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -1074,7 +1074,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addMultiCellWidget(sep, curRow, curRow, 0, 2); ++curRow; - TQString mountPoint = KIO::tqfindPathMountPoint( url.path() ); + TQString mountPoint = KIO::findPathMountPoint( url.path() ); if (mountPoint != "/") { @@ -1127,7 +1127,7 @@ void KFilePropsPlugin::slotEditFileType() #ifdef Q_WS_X11 TQString mime; if ( d->mimeType == KMimeType::defaultMimeType() ) { - int pos = d->oldFileName.tqfindRev( '.' ); + int pos = d->oldFileName.findRev( '.' ); 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::tqfromLatin1("keditfiletype"); + TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype - + " --parent " + TQString::number( (ulong)properties->tqtopLevelWidget()->winId()) + + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->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::tqfromLatin1("%1 (%2)\n%3, %4") + m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) .arg(KGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) @@ -1270,7 +1270,7 @@ void KFilePropsPlugin::slotSizeDetermine() bool isLocal; KFileItem * item = properties->item(); KURL url = item->mostLocalURL( isLocal ); - TQString mountPoint = KIO::tqfindPathMountPoint( url.path() ); + TQString mountPoint = KIO::findPathMountPoint( url.path() ); KDiskFreeSp * job = new KDiskFreeSp; connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, @@ -1364,7 +1364,7 @@ void KFilePropsPlugin::applyChanges() // wait for job TQWidget dummy(0,0,WType_Dialog|WShowModal); qt_enter_modal(&dummy); - tqApp->enter_loop(); + qApp->enter_loop(); qt_leave_modal(&dummy); return; } @@ -1384,7 +1384,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) if (job) { // allow apply() to return - tqApp->exit_loop(); + qApp->exit_loop(); if ( job->error() ) { job->showErrorDialog( d->m_frame ); @@ -1439,7 +1439,7 @@ void KFilePropsPlugin::applyIconChanges() if (S_ISDIR(properties->item()->mode())) { - path = url.path(1) + TQString::tqfromLatin1(".directory"); + path = url.path(1) + TQString::fromLatin1(".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().tqfind("trash", 0, false)==0 ); + bool isTrash = ( properties->kurl().protocol().find("trash", 0, false)==0 ); bool IamRoot = (geteuid() == 0); KFileItem * item = properties->item(); @@ -1654,11 +1654,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /* Group: Access Permissions */ gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); box->addWidget (gb); - gl = new TQGridLayout (gb->tqlayout(), 7, 2); + gl = new TQGridLayout (gb->layout(), 7, 2); gl->setColStretch(1, 1); l = d->explanationLabel = new TQLabel( "", gb ); @@ -1723,11 +1723,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /**** Group: Ownership ****/ gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); box->addWidget (gb); - gl = new TQGridLayout (gb->tqlayout(), 4, 3); + gl = new TQGridLayout (gb->layout(), 4, 3); gl->addRowSpacing(0, 10); /*** Set Owner ***/ @@ -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::tqfromLatin1(user->pw_name)); + kcom->addItem(TQString::fromLatin1(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::tqfromLatin1(ge->gr_name); + groupList += TQString::fromLatin1(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::tqfromLatin1(ge->gr_name); + TQString name = TQString::fromLatin1(ge->gr_name); if (name.isEmpty()) name.setNum(ge->gr_gid); - if (groupList.tqfind(name) == groupList.end()) + if (groupList.find(name) == groupList.end()) groupList += name; } - bool isMyGroup = groupList.tqcontains(strGroup); + bool isMyGroup = groupList.contains(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.tqfindIndex(strGroup)); + grpCombo->setCurrentItem(groupList.findIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); connect( grpCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( changed() ) ); @@ -1915,10 +1915,10 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { // Group: Access Permissions gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); - gl = new TQGridLayout (gb->tqlayout(), 6, 6); + gl = new TQGridLayout (gb->layout(), 6, 6); gl->addRowSpacing(0, 10); TQValueVector<TQWidget*> theNotSpecials; @@ -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->tqsizeHint(); + TQSize size = l->sizeHint(); size.setWidth(size.width() + 15); l->setFixedSize(size); gl->addWidget (l, 1, 3); @@ -2368,7 +2368,7 @@ void KFilePermissionsPropsPlugin::updateAccessControls() { } } -// gets tqmasks for files and dirs from the Access Control frame widgets +// gets masks for files and dirs from the Access Control frame widgets void KFilePermissionsPropsPlugin::getPermissionMasks(mode_t &andFilePermissions, mode_t &andDirPermissions, mode_t &orFilePermissions, @@ -2520,7 +2520,7 @@ void KFilePermissionsPropsPlugin::applyChanges() // Wait for job TQWidget dummy(0,0,WType_Dialog|WShowModal); qt_enter_modal(&dummy); - tqApp->enter_loop(); + qApp->enter_loop(); qt_leave_modal(&dummy); } if (dirs.count() > 0) { @@ -2536,7 +2536,7 @@ void KFilePermissionsPropsPlugin::applyChanges() // Wait for job TQWidget dummy(0,0,WType_Dialog|WShowModal); qt_enter_modal(&dummy); - tqApp->enter_loop(); + qApp->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 - tqApp->exit_loop(); + qApp->exit_loop(); } @@ -2571,15 +2571,15 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) { d = new KURLPropsPluginPrivate; d->m_frame = properties->addPage(i18n("U&RL")); - TQVBoxLayout *tqlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint()); TQLabel *l; l = new TQLabel( d->m_frame, "Label_1" ); l->setText( i18n("URL:") ); - tqlayout->addWidget(l); + layout->addWidget(l); URLEdit = new KURLRequester( d->m_frame, "URL Requester" ); - tqlayout->addWidget(URLEdit); + layout->addWidget(URLEdit); TQString path = properties->kurl().path(); @@ -2598,7 +2598,7 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - tqlayout->addStretch (1); + layout->addStretch (1); } KURLPropsPlugin::~KURLPropsPlugin() @@ -2639,7 +2639,7 @@ void KURLPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::tqfromLatin1("Link")); + config.writeEntry( "Type", TQString::fromLatin1("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. @@ -2680,48 +2680,48 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl commentEdit = new KLineEdit( d->m_frame, "LineEdit_2" ); mimeEdit = new KLineEdit( d->m_frame, "LineEdit_3" ); - TQBoxLayout *maintqlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint()); + TQBoxLayout *mainlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint()); TQLabel* tmpQLabel; tmpQLabel = new TQLabel( d->m_frame, "Label_1" ); tmpQLabel->setText( i18n("Pattern ( example: *.html;*.htm )") ); - tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); - maintqlayout->addWidget(tmpQLabel, 1); + tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + mainlayout->addWidget(tmpQLabel, 1); //patternEdit->setGeometry( 10, 40, 210, 30 ); //patternEdit->setText( "" ); patternEdit->setMaxLength( 512 ); - patternEdit->setMinimumSize( patternEdit->tqsizeHint() ); + patternEdit->setMinimumSize( patternEdit->sizeHint() ); patternEdit->setFixedHeight( fontHeight ); - maintqlayout->addWidget(patternEdit, 1); + mainlayout->addWidget(patternEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_2" ); tmpQLabel->setText( i18n("Mime Type") ); - tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); - maintqlayout->addWidget(tmpQLabel, 1); + tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + mainlayout->addWidget(tmpQLabel, 1); //mimeEdit->setGeometry( 10, 160, 210, 30 ); mimeEdit->setMaxLength( 256 ); - mimeEdit->setMinimumSize( mimeEdit->tqsizeHint() ); + mimeEdit->setMinimumSize( mimeEdit->sizeHint() ); mimeEdit->setFixedHeight( fontHeight ); - maintqlayout->addWidget(mimeEdit, 1); + mainlayout->addWidget(mimeEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_3" ); tmpQLabel->setText( i18n("Comment") ); - tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); - maintqlayout->addWidget(tmpQLabel, 1); + tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + mainlayout->addWidget(tmpQLabel, 1); //commentEdit->setGeometry( 10, 100, 210, 30 ); commentEdit->setMaxLength( 256 ); - commentEdit->setMinimumSize( commentEdit->tqsizeHint() ); + commentEdit->setMinimumSize( commentEdit->sizeHint() ); commentEdit->setFixedHeight( fontHeight ); - maintqlayout->addWidget(commentEdit, 1); + mainlayout->addWidget(commentEdit, 1); cbAutoEmbed = new TQCheckBox( i18n("Left click previews"), d->m_frame, "cbAutoEmbed" ); - maintqlayout->addWidget(cbAutoEmbed, 1); + mainlayout->addWidget(cbAutoEmbed, 1); - maintqlayout->addStretch (10); - maintqlayout->activate(); + mainlayout->addStretch (10); + mainlayout->activate(); TQFile f( _props->kurl().path() ); if ( !f.open( IO_ReadOnly ) ) @@ -2796,7 +2796,7 @@ void KBindingPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::tqfromLatin1("MimeType") ); + config.writeEntry( "Type", TQString::fromLatin1("MimeType") ); config.writeEntry( "Patterns", patternEdit->text() ); config.writeEntry( "Comment", commentEdit->text() ); @@ -2852,60 +2852,60 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP if ((mountPoint != "-") && (mountPoint != "none") && !mountPoint.isEmpty() && device != "none") { - devices.append( device + TQString::tqfromLatin1(" (") - + mountPoint + TQString::tqfromLatin1(")") ); + devices.append( device + TQString::fromLatin1(" (") + + mountPoint + TQString::fromLatin1(")") ); m_devicelist.append(device); d->mountpointlist.append(mountPoint); } } - TQGridLayout *tqlayout = new TQGridLayout( d->m_frame, 0, 2, 0, + TQGridLayout *layout = new TQGridLayout( d->m_frame, 0, 2, 0, KDialog::spacingHint()); - tqlayout->setColStretch(1, 1); + layout->setColStretch(1, 1); TQLabel* label; label = new TQLabel( d->m_frame ); label->setText( devices.count() == 0 ? i18n("Device (/dev/fd0):") : // old style i18n("Device:") ); // new style (combobox) - tqlayout->addWidget(label, 0, 0); + layout->addWidget(label, 0, 0); device = new TQComboBox( true, d->m_frame, "ComboBox_device" ); device->insertStringList( devices ); - tqlayout->addWidget(device, 0, 1); + layout->addWidget(device, 0, 1); connect( device, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" ); readonly->setText( i18n("Read only") ); - tqlayout->addWidget(readonly, 1, 1); + layout->addWidget(readonly, 1, 1); label = new TQLabel( d->m_frame ); label->setText( i18n("File system:") ); - tqlayout->addWidget(label, 2, 0); + layout->addWidget(label, 2, 0); TQLabel *fileSystem = new TQLabel( d->m_frame ); - tqlayout->addWidget(fileSystem, 2, 1); + layout->addWidget(fileSystem, 2, 1); label = new TQLabel( d->m_frame ); label->setText( devices.count()==0 ? i18n("Mount point (/mnt/floppy):") : // old style i18n("Mount point:")); // new style (combobox) - tqlayout->addWidget(label, 3, 0); + layout->addWidget(label, 3, 0); mountpoint = new TQLabel( d->m_frame, "LineEdit_mountpoint" ); - tqlayout->addWidget(mountpoint, 3, 1); + layout->addWidget(mountpoint, 3, 1); // show disk free d->m_freeSpaceText = new TQLabel(i18n("Free disk space:"), d->m_frame ); - tqlayout->addWidget(d->m_freeSpaceText, 4, 0); + layout->addWidget(d->m_freeSpaceText, 4, 0); d->m_freeSpaceLabel = new TQLabel( d->m_frame ); - tqlayout->addWidget( d->m_freeSpaceLabel, 4, 1 ); + layout->addWidget( d->m_freeSpaceLabel, 4, 1 ); d->m_freeSpaceBar = new TQProgressBar( d->m_frame, "freeSpaceBar" ); - tqlayout->addMultiCellWidget(d->m_freeSpaceBar, 5, 5, 0, 1); + layout->addMultiCellWidget(d->m_freeSpaceBar, 5, 5, 0, 1); // we show it in the slot when we know the values d->m_freeSpaceText->hide(); @@ -2913,18 +2913,18 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP d->m_freeSpaceBar->hide(); KSeparator* sep = new KSeparator( KSeparator::HLine, d->m_frame); - tqlayout->addMultiCellWidget(sep, 6, 6, 0, 1); + layout->addMultiCellWidget(sep, 6, 6, 0, 1); unmounted = new KIconButton( d->m_frame ); - int bsize = 66 + 2 * unmounted->style().tqpixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * unmounted->style().pixelMetric(TQStyle::PM_ButtonMargin); unmounted->setFixedSize(bsize, bsize); unmounted->setIconType(KIcon::Desktop, KIcon::Device); - tqlayout->addWidget(unmounted, 7, 0); + layout->addWidget(unmounted, 7, 0); label = new TQLabel( i18n("Unmounted Icon"), d->m_frame ); - tqlayout->addWidget(label, 7, 1); + layout->addWidget(label, 7, 1); - tqlayout->setRowStretch(8, 1); + layout->setRowStretch(8, 1); TQString path( _props->kurl().path() ); @@ -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.tqfindIndex(deviceStr); + int index = m_devicelist.findIndex(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.tqfindIndex( device->currentText() ); + int index = m_devicelist.findIndex( 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::tqfromLatin1("FSDevice") ); + config.writeEntry( "Type", TQString::fromLatin1("FSDevice") ); config.writeEntry( "Dev", device->currentText() ); config.writeEntry( "MountPoint", mountpoint->text() ); @@ -3102,12 +3102,12 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) : KPropsDlgPlugin( _props ) { TQFrame *frame = properties->addPage(i18n("&Application")); - TQVBoxLayout *maintqlayout = new TQVBoxLayout( frame, 0, KDialog::spacingHint() ); + TQVBoxLayout *mainlayout = new TQVBoxLayout( frame, 0, KDialog::spacingHint() ); w = new KPropertiesDesktopBase(frame); - maintqlayout->addWidget(w); + mainlayout->addWidget(w); - bool bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh? + bool bKDesktopMode = (TQCString(qApp->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.tqfind("/"); + int index = mimetype.find("/"); TQString maj = mimetype.left(index); TQString min = mimetype.mid(index+1); - TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( maj ); + TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( 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.tqfind( "all" ); + TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( "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::tqfromLatin1("Application")); + config.writeEntry( "Type", TQString::fromLatin1("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,17 +3446,17 @@ 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::tqfromLatin1("General") ); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", - TQString::tqfromLatin1("konsole")); + TQString::fromLatin1("konsole")); bool terminalCloseBool = false; if (preferredTerminal == "konsole") { - terminalCloseBool = (m_terminalOptionStr.tqcontains( "--noclose" ) > 0); + terminalCloseBool = (m_terminalOptionStr.contains( "--noclose" ) > 0); w->terminalCloseCheck->setChecked(terminalCloseBool); - m_terminalOptionStr.tqreplace( "--noclose", ""); + m_terminalOptionStr.replace( "--noclose", ""); } else { @@ -3493,7 +3493,7 @@ void KDesktopPropsPlugin::slotAdvanced() int i, maxEntries = 1000; setpwent(); for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::tqfromLatin1(pw->pw_name)); + kcom->addItem(TQString::fromLatin1(pw->pw_name)); endpwent(); if (i < maxEntries) { @@ -3594,22 +3594,22 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) { d = new KExecPropsPluginPrivate; d->m_frame = properties->addPage(i18n("E&xecute")); - TQVBoxLayout * maintqlayout = new TQVBoxLayout( d->m_frame, 0, + TQVBoxLayout * mainlayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint()); - // Now the widgets in the top tqlayout + // Now the widgets in the top layout TQLabel* l; l = new TQLabel( i18n( "Comman&d:" ), d->m_frame ); - maintqlayout->addWidget(l); + mainlayout->addWidget(l); - TQHBoxLayout * htqlayout; - htqlayout = new TQHBoxLayout(KDialog::spacingHint()); - maintqlayout->addLayout(htqlayout); + TQHBoxLayout * hlayout; + hlayout = new TQHBoxLayout(KDialog::spacingHint()); + mainlayout->addLayout(hlayout); execEdit = new KLineEdit( d->m_frame ); TQWhatsThis::add(execEdit,i18n( - "Following the command, you can have several place holders which will be tqreplaced " + "Following the command, you can have several place holders which will be replaced " "with the actual values when the actual program is run:\n" "%f - a single file name\n" "%F - a list of files; use for applications that can open several local files at once\n" @@ -3620,22 +3620,22 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) "%i - the icon\n" "%m - the mini-icon\n" "%c - the caption")); - htqlayout->addWidget(execEdit, 1); + hlayout->addWidget(execEdit, 1); l->setBuddy( execEdit ); execBrowse = new TQPushButton( d->m_frame ); execBrowse->setText( i18n("&Browse...") ); - htqlayout->addWidget(execBrowse); + hlayout->addWidget(execBrowse); // The groupbox about swallowing TQGroupBox* tmpQGroupBox; tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame ); tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); - maintqlayout->addWidget(tmpQGroupBox); + mainlayout->addWidget(tmpQGroupBox); - TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2); + TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2); grid->setSpacing( KDialog::spacingHint() ); grid->setColStretch(1, 1); @@ -3660,9 +3660,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) tmpQGroupBox = new TQGroupBox( d->m_frame ); tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); - maintqlayout->addWidget(tmpQGroupBox); + mainlayout->addWidget(tmpQGroupBox); - grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 3, 2); + grid = new TQGridLayout(tmpQGroupBox->layout(), 3, 2); grid->setSpacing( KDialog::spacingHint() ); grid->setColStretch(1, 1); @@ -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::tqfromLatin1("General") ); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", - TQString::tqfromLatin1("konsole")); + TQString::fromLatin1("konsole")); int posOptions = 1; d->nocloseonexitCheck = 0L; @@ -3699,9 +3699,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) tmpQGroupBox = new TQGroupBox( d->m_frame ); tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); - maintqlayout->addWidget(tmpQGroupBox); + mainlayout->addWidget(tmpQGroupBox); - grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2); + grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2); grid->setSpacing(KDialog::spacingHint()); grid->setColStretch(1, 1); @@ -3717,7 +3717,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) suidLabel->setBuddy( suidEdit ); - maintqlayout->addStretch(1); + mainlayout->addStretch(1); // now populate the page TQString path = _props->kurl().path(); @@ -3747,8 +3747,8 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) if ( d->nocloseonexitCheck ) { - d->nocloseonexitCheck->setChecked( (termOptionsStr.tqcontains( "--noclose" ) > 0) ); - termOptionsStr.tqreplace( "--noclose", ""); + d->nocloseonexitCheck->setChecked( (termOptionsStr.contains( "--noclose" ) > 0) ); + termOptionsStr.replace( "--noclose", ""); } if ( !termOptionsStr.isNull() ) terminalEdit->setText( termOptionsStr ); @@ -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::tqfromLatin1(pw->pw_name)); + kcom->addItem(TQString::fromLatin1(pw->pw_name)); endpwent(); if (i < maxEntries) { @@ -3854,7 +3854,7 @@ void KExecPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::tqfromLatin1("Application")); + config.writeEntry( "Type", TQString::fromLatin1("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::tqfromLatin1("--noclose "); + temp += TQString::fromLatin1("--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(tqApp->name()) == "kdesktop"; // nasty heh? + m_kdesktopMode = TQCString(qApp->name()) == "kdesktop"; // nasty heh? } ~KApplicationPropsPluginPrivate() { @@ -3907,7 +3907,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) { d = new KApplicationPropsPluginPrivate; d->m_frame = properties->addPage(i18n("&Application")); - TQVBoxLayout *toptqlayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint()); + TQVBoxLayout *toplayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint()); TQIconSet iconSet; TQPixmap pixMap; @@ -3931,7 +3931,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - toptqlayout->addLayout(grid); + toplayout->addLayout(grid); if ( d->m_kdesktopMode ) { @@ -3960,14 +3960,14 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) grid->addWidget(commentEdit, 2, 1); l = new TQLabel(i18n("File types:"), d->m_frame); - toptqlayout->addWidget(l, 0, AlignLeft); + toplayout->addWidget(l, 0, AlignLeft); grid = new TQGridLayout(4, 3); grid->setColStretch(0, 1); grid->setColStretch(2, 1); grid->setRowStretch( 0, 1 ); grid->setRowStretch( 3, 1 ); - toptqlayout->addLayout(grid, 2); + toplayout->addLayout(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::tqfromLatin1("Application")); + config.writeEntry( "Type", TQString::fromLatin1("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 4c734b13b..dc6a621f9 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 TQObject +class KIO_EXPORT KPropsDlgPlugin : public QObject { Q_OBJECT public: @@ -819,7 +819,7 @@ private: * * Such files are used to represent a program in kicker and konqueror. * @internal - * @deprecated tqreplaced with KDesktopPropsPlugin + * @deprecated replaced with KDesktopPropsPlugin */ /// Remove in KDE4 class KIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin @@ -875,7 +875,7 @@ private: * * Such files are used to represent a program in kicker and konqueror. * @internal - * @deprecated tqreplaced with KDesktopPropsPlugin + * @deprecated replaced with KDesktopPropsPlugin */ /// Remove in KDE4 class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin diff --git a/kio/kfile/kpropertiesmimetypebase.ui b/kio/kfile/kpropertiesmimetypebase.ui index d67d8eaaf..0223f22a6 100644 --- a/kio/kfile/kpropertiesmimetypebase.ui +++ b/kio/kfile/kpropertiesmimetypebase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>widget2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -66,5 +66,5 @@ <includes> <include location="global" impldecl="in implementation">klistview.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 85cdebb02..22b4cd477 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::tqfromLatin1("krecentdirsrc"), readOnly); + config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly); } else { key = key.mid(1); config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Recent Dirs")); + config->setGroup(TQString::fromLatin1("Recent Dirs")); } result=config->readPathListEntry(key); diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index b54bdf325..69fd63df5 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::tqfromLatin1("RecentDocuments/")); + return locateLocal("data", TQString::fromLatin1("RecentDocuments/")); } TQStringList KRecentDocument::recentDocuments() @@ -74,7 +74,7 @@ TQStringList KRecentDocument::recentDocuments() void KRecentDocument::add(const KURL& url) { - KRecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename! + KRecentDocument::add(url, qApp->argv()[0]); // ### argv[0] might not match the service filename! } void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) @@ -83,14 +83,14 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) return; TQString openStr = url.url(); - openStr.tqreplace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded + openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded kdDebug(250) << "KRecentDocument::add for " << openStr << endl; KConfig *config = KGlobal::config(); TQString oldGrp = config->group(); - config->setGroup(TQString::tqfromLatin1("RecentDocuments")); - bool useRecent = config->readBoolEntry(TQString::tqfromLatin1("UseRecent"), true); - int maxEntries = config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10); + config->setGroup(TQString::fromLatin1("RecentDocuments")); + bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); + int maxEntries = config->readNumEntry(TQString::fromLatin1("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::tqfromLatin1(".desktop"); + TQString ddesktop = dStr + TQString::fromLatin1(".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::tqfromLatin1("X-KDE-LastOpenedWith")) + if(tmp.readEntry(TQString::fromLatin1("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::tqfromLatin1("[%1].desktop").arg(i); + ddesktop = dStr + TQString::fromLatin1("[%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::tqfromLatin1("/") + (*it)); + TQFile::remove(dir.absPath() + TQString::fromLatin1("/") + (*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::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") ); - conf.writePathEntry( TQString::tqfromLatin1("URL"), openStr ); + conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); + conf.writePathEntry( TQString::fromLatin1("URL"), openStr ); // If you change the line below, change the test in the above loop - conf.writeEntry( TQString::tqfromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); + conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); TQString name = url.fileName(); if (name.isEmpty()) name = openStr; - conf.writeEntry( TQString::tqfromLatin1("Name"), name ); - conf.writeEntry( TQString::tqfromLatin1("Icon"), KMimeType::iconForURL( url ) ); + conf.writeEntry( TQString::fromLatin1("Name"), name ); + conf.writeEntry( TQString::fromLatin1("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::tqfromLatin1("RecentDocuments")); - return config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10); + KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); + return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 2d6edc0b9..d1a9de4ea 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -64,7 +64,7 @@ protected: if ( item ) { TQString text = static_cast<KURLBarItem*>( item )->toolTip(); if ( !text.isEmpty() ) - tip( m_view->tqitemRect( item ), text ); + tip( m_view->itemRect( item ), text ); } } @@ -188,11 +188,11 @@ void KURLBarItem::paint( TQPainter *p ) if ( isCurrent() || isSelected() ) { int h = height( box ); - TQBrush brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); + TQBrush brush = box->colorGroup().brush( TQColorGroup::Highlight ); p->fillRect( 0, 0, w, h, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->tqcolorGroup().mid() ); + pen.setColor( box->colorGroup().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->tqcolorGroup().highlight().dark(115) ); + p->setPen( box->colorGroup().highlight().dark(115) ); p->drawText( xPos + ( TQApplication::reverseLayout() ? -1 : 1), yPos + 1, visibleText ); - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().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->tqcolorGroup().highlight().dark(115) ); + p->setPen( box->colorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, visibleText ); - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } p->drawText( x, y, visibleText ); @@ -268,7 +268,7 @@ void KURLBarItem::paint( TQPainter *p ) } } -TQSize KURLBarItem::tqsizeHint() const +TQSize KURLBarItem::sizeHint() const { int wmin = 0; int hmin = 0; @@ -284,9 +284,9 @@ TQSize KURLBarItem::tqsizeHint() const } if ( lb->isVertical() ) - wmin = QMIN( wmin, lb->viewport()->tqsizeHint().width() ); + wmin = QMIN( wmin, lb->viewport()->sizeHint().width() ); else - hmin = QMIN( hmin, lb->viewport()->tqsizeHint().height() ); + hmin = QMIN( hmin, lb->viewport()->sizeHint().height() ); return TQSize( wmin, hmin ); } @@ -294,17 +294,17 @@ TQSize KURLBarItem::tqsizeHint() const int KURLBarItem::width( const TQListBox *lb ) const { if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) - return QMAX( tqsizeHint().width(), lb->viewport()->width() ); + return QMAX( sizeHint().width(), lb->viewport()->width() ); else - return tqsizeHint().width(); + return sizeHint().width(); } int KURLBarItem::height( const TQListBox *lb ) const { if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) - return tqsizeHint().height(); + return sizeHint().height(); else - return QMAX( tqsizeHint().height(), lb->viewport()->height() ); + return QMAX( sizeHint().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 ); - tqsetSizePolicy( TQSizePolicy( isVertical() ? + setSizePolicy( 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 ); - tqsetSizePolicy( TQSizePolicy( isVertical() ? + setSizePolicy( TQSizePolicy( isVertical() ? TQSizePolicy::Maximum : TQSizePolicy::Preferred, isVertical() ? @@ -401,7 +401,7 @@ void KURLBar::setListBox( KURLBarListBox *view ) } else { m_listBox = view; - if ( m_listBox->tqparentWidget() != this ) + if ( m_listBox->parentWidget() != this ) m_listBox->reparent( this, TQPoint(0,0) ); m_listBox->resize( width(), height() ); } @@ -435,7 +435,7 @@ void KURLBar::setIconSize( int size ) item = static_cast<KURLBarItem*>( item->next() ); } - resize( tqsizeHint() ); + resize( sizeHint() ); updateGeometry(); } @@ -466,14 +466,14 @@ void KURLBar::paletteChange( const TQPalette & ) setPalette( pal ); } -TQSize KURLBar::tqsizeHint() const +TQSize KURLBar::sizeHint() const { - return m_listBox->tqsizeHint(); + return m_listBox->sizeHint(); #if 0 // this code causes vertical and or horizontal scrollbars appearing // depending on the text, font, moonphase and earth rotation. Just using - // m_listBox->tqsizeHint() fixes this (although the widget can then be + // m_listBox->sizeHint() 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::tqsizeHint() const item; item = static_cast<KURLBarItem*>( item->next() ) ) { - TQSize sh = item->tqsizeHint(); + TQSize sh = item->sizeHint(); if ( vertical ) { w = QMAX( w, sh.width() ); @@ -508,9 +508,9 @@ TQSize KURLBar::tqsizeHint() const #endif } -TQSize KURLBar::tqminimumSizeHint() const +TQSize KURLBar::minimumSizeHint() const { - TQSize s = tqsizeHint(); // ### + TQSize s = sizeHint(); // ### 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( tqcolorGroup().mid() ); + p.setPen( colorGroup().mid() ); p.drawRect( 0, 0, width(), height() ); } @@ -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::tqfromLatin1( KGlobal::instance()->instanceName() ); + appName = TQString::fromLatin1( 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 8f247623b..8da43ff15 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -109,7 +109,7 @@ public: * returns the preferred size of this item * @since 3.1 */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * returns the width of this item. @@ -319,12 +319,12 @@ public: * @returns a proper sizehint, depending on the orientation and the number * of items available. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * @returns a proper minimum size (reimplemented) */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * Call this method to read a saved configuration from @p config, diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index f7bf58bc0..72c7cbd07 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -31,7 +31,7 @@ class KURLComboBox::KURLComboBoxPrivate { public: KURLComboBoxPrivate() { - dirpix = SmallIcon(TQString::tqfromLatin1("folder")); + dirpix = SmallIcon(TQString::fromLatin1("folder")); } TQPixmap dirpix; @@ -70,9 +70,9 @@ void KURLComboBox::init( Mode mode ) defaultList.setAutoDelete( true ); setInsertionPolicy( NoInsertion ); setTrapReturnKey( true ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); - opendirPix = SmallIcon(TQString::tqfromLatin1("folder_open")); + opendirPix = SmallIcon(TQString::fromLatin1("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.tqcontains( *it ) > 1 ) { + while ( urls.contains( *it ) > 1 ) { it = urls.remove( it ); continue; } diff --git a/kio/kfile/kurlcombobox.h b/kio/kfile/kurlcombobox.h index 60db16dce..d65cd91f5 100644 --- a/kio/kfile/kurlcombobox.h +++ b/kio/kfile/kurlcombobox.h @@ -83,7 +83,7 @@ public: /** * Sets the current url. This combo handles exactly one url additionally * to the default items and those set via setURLs(). So you can call - * setURL() as often as you want, it will always tqreplace the previous one + * setURL() as often as you want, it will always replace the previous one * set via setURL(). * If @p url is already in the combo, the last item will stay there * and the existing item becomes the current item. @@ -98,7 +98,7 @@ public: * Inserts @p urls into the combobox below the "default urls" (see * addDefaultURL). * - * If the list of urls tqcontains more items than maxItems, the first items + * If the list of urls contains more items than maxItems, the first items * will be stripped. */ void setURLs( TQStringList urls ); @@ -107,13 +107,13 @@ public: * Inserts @p urls into the combobox below the "default urls" (see * addDefaultURL). * - * If the list of urls tqcontains more items than maxItems, the @p remove + * If the list of urls contains more items than maxItems, the @p remove * parameter determines whether the first or last items will be stripped. */ void setURLs( TQStringList urls, OverLoadResolving remove ); /** - * @returns a list of all urls currently handled. The list tqcontains at most + * @returns a list of all urls currently handled. The list contains at most * maxItems() items. * Use this to save the list of urls in a config-file and reinsert them * via setURLs() next time. diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp index aa102548a..ae8f5b623 100644 --- a/kio/kfile/kurlrequester.cpp +++ b/kio/kfile/kurlrequester.cpp @@ -132,7 +132,7 @@ public: } /** - * tqreplaces ~user or $FOO, if necessary + * replaces ~user or $FOO, if necessary */ TQString url() { TQString txt = combo ? combo->currentText() : edit->text(); @@ -143,7 +143,7 @@ public: comp = dynamic_cast<KURLCompletion*>(edit->completionObject()); if ( comp ) - return comp->tqreplacedPath( txt ); + return comp->replacedPath( txt ); else return txt; } @@ -206,7 +206,7 @@ void KURLRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KURLDragPushButton( this, "kfile button"); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -340,7 +340,7 @@ TQString KURLRequester::filter( ) const KFileDialog * KURLRequester::fileDialog() const { if ( !myFileDialog ) { - TQWidget *p = tqparentWidget(); + TQWidget *p = parentWidget(); myFileDialog = new KFileDialog( TQString::null, d->fileDialogFilter, p, "file dialog", true ); @@ -402,7 +402,7 @@ KPushButton * KURLRequester::button() const KEditListBox::CustomEditor KURLRequester::customEditor() { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Preferred, + setSizePolicy(TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed)); KLineEdit *edit = d->edit; diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h index 7322d309b..1bdbeee3e 100644 --- a/kio/kfile/kurlrequester.h +++ b/kio/kfile/kurlrequester.h @@ -76,7 +76,7 @@ public: /** * Special constructor, which creates a KURLRequester widget with a custom * edit-widget. The edit-widget can be either a KComboBox or a KLineEdit - * (or inherited thereof). Note: for tqgeometry management reasons, the + * (or inherited thereof). Note: for geometry management reasons, the * edit-widget is reparented to have the KURLRequester as parent. */ KURLRequester( TQWidget *editWidget, TQWidget *parent, const char *name=0 ); @@ -218,7 +218,7 @@ signals: // forwards from LineEdit /** * Emitted when the text in the lineedit changes. - * The parameter tqcontains the contents of the lineedit. + * The parameter contains the contents of the lineedit. * @since 3.1 */ void textChanged( const TQString& ); @@ -230,7 +230,7 @@ signals: /** * Emitted when return or enter was pressed in the lineedit. - * The parameter tqcontains the contents of the lineedit. + * The parameter contains the contents of the lineedit. */ void returnPressed( const TQString& ); @@ -249,7 +249,7 @@ signals: /** * Emitted when the user changed the URL via the file dialog. - * The parameter tqcontains the contents of the lineedit. + * The parameter contains the contents of the lineedit. * // TODO KDE4: Use KURL instead */ void urlSelected( const TQString& ); diff --git a/kio/kfile/kurlrequesterdlg.cpp b/kio/kfile/kurlrequesterdlg.cpp index defa09264..19409afdc 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_->tqsizeHint().width() * 3 ); + urlRequester_->setMinimumWidth( urlRequester_->sizeHint().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 c66ed3ff2..47fcd02ca 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::tqfromLatin1("You selected the url: %1") + TQString::fromLatin1("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 43dbb4fd0..25e2da949 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::tqfromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() )); + KMessageBox::information(0, TQString::fromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() )); } -// tqApp->quit(); +// qApp->quit(); } #include "kfdtest.moc" diff --git a/kio/kfile/tests/kfdtest.h b/kio/kfile/tests/kfdtest.h index 6c59550b8..3f980bc94 100644 --- a/kio/kfile/tests/kfdtest.h +++ b/kio/kfile/tests/kfdtest.h @@ -10,7 +10,7 @@ #include <tqobject.h> -class KFDTest : public TQObject +class KFDTest : public QObject { Q_OBJECT diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index bad100809..5c520dd5d 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::tqfromLatin1(argv[i]); + argv1 = TQString::fromLatin1(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 48c8a1a2b..b84cbc967 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::tqfromLatin1(argv[1]); + argv1 = TQString::fromLatin1(argv[1]); if ( argc > 2 ) - startDir = TQString::tqfromLatin1( argv[2]); + startDir = TQString::fromLatin1( argv[2]); - if (argv1 == TQString::tqfromLatin1("diroperator")) { + if (argv1 == TQString::fromLatin1("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::tqfromLatin1("justone")) { + else if (argv1 == TQString::fromLatin1("justone")) { TQString name = KFileDialog::getOpenFileName(startDir); qDebug("filename=%s",name.latin1()); } - else if (argv1 == TQString::tqfromLatin1("existingURL")) { + else if (argv1 == TQString::fromLatin1("existingURL")) { KURL url = KFileDialog::getExistingURL(); qDebug("URL=%s",url.url().latin1()); name1 = url.url(); } - else if (argv1 == TQString::tqfromLatin1("preview")) { + else if (argv1 == TQString::fromLatin1("preview")) { KURL u = KFileDialog::getImageOpenURL(); qDebug("filename=%s", u.url().latin1()); } - else if (argv1 == TQString::tqfromLatin1("preselect")) { - names = KFileDialog::getOpenFileNames(TQString::tqfromLatin1("/etc/passwd")); + else if (argv1 == TQString::fromLatin1("preselect")) { + names = KFileDialog::getOpenFileNames(TQString::fromLatin1("/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::tqfromLatin1("dirs")) + else if (argv1 == TQString::fromLatin1("dirs")) name1 = KFileDialog::getExistingDirectory(); - else if (argv1 == TQString::tqfromLatin1("heap")) { + else if (argv1 == TQString::fromLatin1("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::tqfromLatin1("KDE FTP Server") ); + TQString::fromLatin1("KDE FTP Server") ); } if ( dlg->exec() == KDialog::Accepted ) name1 = dlg->selectedURL().url(); } - else if ( argv1 == TQString::tqfromLatin1("eventloop") ) + else if ( argv1 == TQString::fromLatin1("eventloop") ) { KFDTest *test = new KFDTest( startDir ); return a.exec(); } - else if (argv1 == TQString::tqfromLatin1("save")) { + else if (argv1 == TQString::fromLatin1("save")) { KURL u = KFileDialog::getSaveURL(); -// TQString(TQDir::homeDirPath() + TQString::tqfromLatin1("/testfile")), +// TQString(TQDir::homeDirPath() + TQString::fromLatin1("/testfile")), // TQString::null, 0L); name1 = u.url(); } - else if (argv1 == TQString::tqfromLatin1("icon")) { + else if (argv1 == TQString::fromLatin1("icon")) { KIconDialog dlg; TQString icon = dlg.selectIcon(); kdDebug() << icon << endl; } -// else if ( argv1 == TQString::tqfromLatin1("dirselect") ) { +// else if ( argv1 == TQString::fromLatin1("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::tqfromLatin1("*|All Files\n" + TQString::fromLatin1("*|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::tqfromLatin1("You selected the file " ) + name1, - TQString::tqfromLatin1("Your Choice")); + KMessageBox::information(0, TQString::fromLatin1("You selected the file " ) + name1, + TQString::fromLatin1("Your Choice")); return 0; } diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp index 4a1d4bec0..9248eec5d 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::tqfromLatin1("Test"), req->customEditor() ); + KEditListBox *el = new KEditListBox( TQString::fromLatin1("Test"), req->customEditor() ); el->show(); return app.exec(); } diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp index 318e99277..d4aa27353 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 - << TQ_UINT8(a.verifyPath ? 1:0) << TQ_UINT8(a.readOnly ? 1:0) - << TQ_UINT8(a.keepPassword ? 1:0) << TQ_UINT8(a.modified ? 1:0); + << Q_UINT8(a.verifyPath ? 1:0) << Q_UINT8(a.readOnly ? 1:0) + << Q_UINT8(a.keepPassword ? 1:0) << Q_UINT8(a.modified ? 1:0); return s; } TQDataStream& KIO::operator>> (TQDataStream& s, AuthInfo& a) { - TQ_UINT8 verify = 0; - TQ_UINT8 ro = 0; - TQ_UINT8 keep = 0; - TQ_UINT8 mod = 0; + Q_UINT8 verify = 0; + Q_UINT8 ro = 0; + Q_UINT8 keep = 0; + Q_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.tqcontains( type ) ) + if ( !loginMap.contains( 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::tqfromLatin1("default") && + log.machine == TQString::fromLatin1("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::tqfromLatin1("preset") && + log.machine == TQString::fromLatin1("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::tqfromLatin1( buf+start, idx-start); + return TQString::fromLatin1( 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::tqfromLatin1(buf, tail).stripWhiteSpace(); + TQString mac = TQString::fromLatin1(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::tqfromLatin1("default"); + l.machine = TQString::fromLatin1("default"); } else if (strncasecmp(buf+pos, "preset", 6) == 0 ) { pos += 6; - l.machine = TQString::tqfromLatin1("preset"); + l.machine = TQString::fromLatin1("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::tqfromLatin1("ftp"); + type = l.type = TQString::fromLatin1("ftp"); // kdDebug() << "Type: " << l.type << endl; macro = extract( buf, "macdef", pos ); diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp index 9d8c271ad..e1d343c10 100644 --- a/kio/kio/chmodjob.cpp +++ b/kio/kio/chmodjob.cpp @@ -40,11 +40,11 @@ using namespace KIO; -ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int tqmask, +ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask, int newOwner, int newGroup, bool recursive, bool showProgressInfo ) : KIO::Job( showProgressInfo ), state( STATE_LISTING ), - m_permissions( permissions ), m_tqmask( tqmask ), + m_permissions( permissions ), m_mask( mask ), m_newOwner( newOwner ), m_newGroup( newGroup ), m_recursive( recursive ), m_lstItems( lstItems ) { @@ -62,12 +62,12 @@ void ChmodJob::processList() ChmodInfo info; info.url = item->url(); // This is a toplevel file, we apply changes directly (no +X emulation here) - info.permissions = ( m_permissions & m_tqmask ) | ( item->permissions() & ~m_tqmask ); + info.permissions = ( m_permissions & m_mask ) | ( item->permissions() & ~m_mask ); /*kdDebug(7007) << "\n current permissions=" << TQString::number(item->permissions(),8) << "\n wanted permission=" << TQString::number(m_permissions,8) - << "\n with tqmask=" << TQString::number(m_tqmask,8) - << "\n with ~tqmask (tqmask bits we keep) =" << TQString::number((uint)~m_tqmask,8) - << "\n bits we keep =" << TQString::number(item->permissions() & ~m_tqmask,8) + << "\n with mask=" << TQString::number(m_mask,8) + << "\n with ~mask (mask bits we keep) =" << TQString::number((uint)~m_mask,8) + << "\n bits we keep =" << TQString::number(item->permissions() & ~m_mask,8) << "\n new permissions = " << TQString::number(info.permissions,8) << endl;*/ m_infos.prepend( info ); @@ -121,33 +121,33 @@ void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) break; } } - if ( !isLink && relativePath != TQString::tqfromLatin1("..") ) + if ( !isLink && relativePath != TQString::fromLatin1("..") ) { ChmodInfo info; info.url = m_lstItems.first()->url(); // base directory info.url.addPath( relativePath ); - int tqmask = m_tqmask; + int mask = m_mask; // Emulate -X: only give +x to files that had a +x bit already // So the check is the opposite : if the file had no x bit, don't touch x bits // For dirs this doesn't apply if ( !isDir ) { - int newPerms = m_permissions & tqmask; + int newPerms = m_permissions & mask; if ( (newPerms & 0111) && !(permissions & 0111) ) { // don't interfere with mandatory file locking if ( newPerms & 02000 ) - tqmask = tqmask & ~0101; + mask = mask & ~0101; else - tqmask = tqmask & ~0111; + mask = mask & ~0111; } } - info.permissions = ( m_permissions & tqmask ) | ( permissions & ~tqmask ); + info.permissions = ( m_permissions & mask ) | ( permissions & ~mask ); /*kdDebug(7007) << "\n current permissions=" << TQString::number(permissions,8) << "\n wanted permission=" << TQString::number(m_permissions,8) - << "\n with tqmask=" << TQString::number(tqmask,8) - << "\n with ~tqmask (tqmask bits we keep) =" << TQString::number((uint)~tqmask,8) - << "\n bits we keep =" << TQString::number(permissions & ~tqmask,8) + << "\n with mask=" << TQString::number(mask,8) + << "\n with ~mask (mask bits we keep) =" << TQString::number((uint)~mask,8) + << "\n bits we keep =" << TQString::number(permissions & ~mask,8) << "\n new permissions = " << TQString::number(info.permissions,8) << endl;*/ // Prepend this info in our todo list. @@ -227,7 +227,7 @@ void ChmodJob::slotResult( KIO::Job * job ) } // antlarr: KDE 4: Make owner and group be const TQString & -KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int tqmask, +KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int mask, TQString owner, TQString group, bool recursive, bool showProgressInfo ) { @@ -249,7 +249,7 @@ KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, else newGroupID = g->gr_gid; } - return new ChmodJob( lstItems, permissions, tqmask, newOwnerID, newGroupID, recursive, showProgressInfo ); + return new ChmodJob( lstItems, permissions, mask, newOwnerID, newGroupID, recursive, showProgressInfo ); } void ChmodJob::virtual_hook( int id, void* data ) diff --git a/kio/kio/chmodjob.h b/kio/kio/chmodjob.h index d1fe572f9..fdb873b17 100644 --- a/kio/kio/chmodjob.h +++ b/kio/kio/chmodjob.h @@ -42,7 +42,7 @@ namespace KIO { /** * Create new ChmodJobs using the KIO::chmod() function. */ - ChmodJob( const KFileItemList & lstItems, int permissions, int tqmask, + ChmodJob( const KFileItemList & lstItems, int permissions, int mask, int newOwner, int newGroup, bool recursive, bool showProgressInfo ); @@ -63,7 +63,7 @@ namespace KIO { }; enum { STATE_LISTING, STATE_CHMODING } state; int m_permissions; - int m_tqmask; + int m_mask; int m_newOwner; int m_newGroup; bool m_recursive; @@ -91,8 +91,8 @@ namespace KIO { * * @param lstItems The file items representing several files or directories. * @param permissions the permissions we want to set - * @param tqmask the bits we are allowed to change. - * For instance, if tqmask is 0077, we don't change + * @param mask the bits we are allowed to change. + * For instance, if mask is 0077, we don't change * the "user" bits, only "group" and "others". * @param newOwner If non-empty, the new owner for the files * @param newGroup If non-empty, the new group for the files @@ -100,7 +100,7 @@ namespace KIO { * @param showProgressInfo true to show progess information * @return The job handling the operation. */ - KIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int tqmask, + KIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask, TQString newOwner, TQString newGroup, bool recursive, bool showProgressInfo = true ); diff --git a/kio/kio/configure.in.in b/kio/kio/configure.in.in index 1aea61653..8683dfec1 100644 --- a/kio/kio/configure.in.in +++ b/kio/kio/configure.in.in @@ -1,5 +1,5 @@ dnl ------------------------------------------------------------------------ -dnl Try to tqfind if FAM is installed +dnl Try to find if FAM is installed dnl ------------------------------------------------------------------------ dnl kde_have_fam=yes @@ -23,7 +23,7 @@ if test "$kde_have_fam" = "yes" ; then fi AC_SUBST(LIBFAM) dnl ------------------------------------------------------------------------ -dnl Try to tqfind if LIBZ is installed +dnl Try to find if LIBZ is installed dnl ------------------------------------------------------------------------ dnl @@ -47,7 +47,7 @@ int getmntinfo(struct statfs **mntbufp, int flags); ]) dnl ------------------------------------------------------------------------ -dnl Try to tqfind if libvolmgt is installed (Solaris) +dnl Try to find if libvolmgt is installed (Solaris) dnl ------------------------------------------------------------------------ kde_have_volmgt=yes AC_CHECK_LIB(volmgt, volmgt_running, [LIBVOLMGT=-lvolmgt], kde_have_volmgt=no) @@ -57,7 +57,7 @@ if test "$kde_have_volmgt" = "yes"; then fi dnl ------------------------------------------------------------------------ -dnl Try to tqfind if we have Linux Dir Notification +dnl Try to find if we have Linux Dir Notification dnl ------------------------------------------------------------------------ AC_ARG_ENABLE(dnotify, @@ -103,7 +103,7 @@ if test "x$kde_enable_dnotify" = "xyes"; then fi dnl ------------------------------------------------------------------------ -dnl Try to tqfind if we have Linux Inode based Dir Notification +dnl Try to find if we have Linux Inode based Dir Notification dnl ------------------------------------------------------------------------ AC_ARG_ENABLE(inotify, diff --git a/kio/kio/connection.h b/kio/kio/connection.h index 758202968..6858c8422 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 TQObject + class KIO_EXPORT Connection : public QObject { Q_OBJECT public: diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp index 659efbf3d..161c82296 100644 --- a/kio/kio/dataprotocol.cpp +++ b/kio/kio/dataprotocol.cpp @@ -88,11 +88,11 @@ const TQChar base64_str[] = { 'b','a','s','e','6','4' }; * @p c1 to @p c3 or buf.length() if none is contained. * @param buf buffer where to look for c * @param begin zero-indexed starting position - * @param c1 character to tqfind - * @param c2 alternative character to tqfind or '\0' to ignore - * @param c3 alternative character to tqfind or '\0' to ignore + * @param c1 character to find + * @param c2 alternative character to find or '\0' to ignore + * @param c3 alternative character to find or '\0' to ignore */ -static int tqfind(const TQString &buf, int begin, TQChar c1, TQChar c2 = '\0', +static int find(const TQString &buf, int begin, TQChar c1, TQChar c2 = '\0', TQChar c3 = '\0') { int pos = begin; int size = (int)buf.length(); @@ -113,15 +113,15 @@ static int tqfind(const TQString &buf, int begin, TQChar c1, TQChar c2 = '\0', * neither character occurred. * @param buf buffer where to look for * @param pos zero-indexed position within buffer - * @param c1 character to tqfind - * @param c2 alternative character to tqfind or 0 to ignore - * @param c3 alternative character to tqfind or 0 to ignore + * @param c1 character to find + * @param c2 alternative character to find or 0 to ignore + * @param c3 alternative character to find or 0 to ignore */ inline TQString extract(const TQString &buf, int &pos, TQChar c1, TQChar c2 = '\0', TQChar c3 = '\0') { int oldpos = pos; - pos = tqfind(buf,oldpos,c1,c2,c3); - return TQString(buf.tqunicode() + oldpos, pos - oldpos); + pos = find(buf,oldpos,c1,c2,c3); + return TQString(buf.unicode() + 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::tqfromLatin1("data:") + url.path(); + TQString &raw_url = header_info.url = TQString::fromLatin1("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.tqfind(':'); + header_info.data_offset = raw_url.find(':'); 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 8ec90b2a7..d16ecc0d4 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::tqfromLatin1("data"),cmd)); + unsupportedActionErrorString(TQString::fromLatin1("data"),cmd)); }/*end switch*/ } diff --git a/kio/kio/davjob.cpp b/kio/kio/davjob.cpp index 6b2201c22..1f3b208a6 100644 --- a/kio/kio/davjob.cpp +++ b/kio/kio/davjob.cpp @@ -46,7 +46,7 @@ class DavJob::DavJobPrivate { public: TQByteArray savedStaticData; - TQByteArray str_response; // tqreplaces the TQString previously used in DavJob itself + TQByteArray str_response; // replaces the TQString previously used in DavJob itself }; DavJob::DavJob( const KURL& url, int method, const TQString& request, bool showProgressInfo ) diff --git a/kio/kio/davjob.h b/kio/kio/davjob.h index 98cdc0080..98d0fe702 100644 --- a/kio/kio/davjob.h +++ b/kio/kio/davjob.h @@ -89,7 +89,7 @@ namespace KIO { * the properties of the resource identified by the given @p url. * * @param url the URL of the resource - * @param properties a proptqfind document that describes the properties that + * @param properties a propfind document that describes the properties that * should be retrieved * @param depth the depth of the request. Can be "0", "1" or "infinity" * @param showProgressInfo true to show progress information diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 0ca33d184..8293901ae 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -130,9 +130,9 @@ void DefaultProgress::init() hBox->addWidget(resumeLabel); progressLabel = new TQLabel( this ); -/* progressLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, +/* progressLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ) );*/ - progressLabel->tqsetAlignment( TQLabel::AlignRight ); + progressLabel->setAlignment( 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( tqsizeHint() ); - setMaximumHeight(tqsizeHint().height()); + resize( sizeHint() ); + setMaximumHeight(sizeHint().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->tqsetAlignment( speedLabel->tqalignment() & ~Qt::WordBreak ); + speedLabel->setAlignment( speedLabel->alignment() & ~Qt::WordBreak ); } @@ -472,7 +472,7 @@ void DefaultProgress::checkDestination(const KURL& dest) { TQString path = dest.path( -1 ); TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" ); for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it ) - if ( path.tqcontains( *it ) ) + if ( path.contains( *it ) ) ok = false; // it's in the tmp resource } diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp index c83d5750c..5caa08465 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); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -142,7 +142,7 @@ void ForwardingSlaveBase::put(const KURL &url, int permissions, resume, false); connectTransferJob(job); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -156,7 +156,7 @@ void ForwardingSlaveBase::stat(const KURL &url) KIO::SimpleJob *job = KIO::stat(new_url, false); connectSimpleJob(job); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -170,7 +170,7 @@ void ForwardingSlaveBase::mimetype(const KURL &url) KIO::TransferJob *job = KIO::mimetype(new_url, false); connectTransferJob(job); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -184,7 +184,7 @@ void ForwardingSlaveBase::listDir(const KURL &url) KIO::ListJob *job = KIO::listDir(new_url, false); connectListJob(job); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -198,7 +198,7 @@ void ForwardingSlaveBase::mkdir(const KURL &url, int permissions) KIO::SimpleJob *job = KIO::mkdir(new_url, permissions); connectSimpleJob(job); - tqApp->eventLoop()->enterLoop(); + qApp->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); - tqApp->eventLoop()->enterLoop(); + qApp->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); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -242,7 +242,7 @@ void ForwardingSlaveBase::chmod(const KURL &url, int permissions) KIO::SimpleJob *job = KIO::chmod(new_url, permissions); connectSimpleJob(job); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -258,7 +258,7 @@ void ForwardingSlaveBase::copy(const KURL &src, const KURL &dest, overwrite, false); connectJob(job); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -280,7 +280,7 @@ void ForwardingSlaveBase::del(const KURL &url, bool isfile) connectSimpleJob(job); } - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } } @@ -363,7 +363,7 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job) finished(); } - tqApp->eventLoop()->exitLoop(); + qApp->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(); - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/, diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index a8bd85d17..f99219524 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::tqfromLatin1(charbuf); + return TQString::fromLatin1(charbuf); } KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize, @@ -167,13 +167,13 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str ) TQString str( _str ); int i = 0; - while ( ( i = str.tqfind( "%", i ) ) != -1 ) + while ( ( i = str.find( "%", i ) ) != -1 ) { - str.tqreplace( i, 1, "%%"); + str.replace( i, 1, "%%"); i += 2; } - while ( ( i = str.tqfind( "/" ) ) != -1 ) - str.tqreplace( i, 1, "%2f"); + while ( ( i = str.find( "/" ) ) != -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::tqfromLatin1("localhost") : errorText ); + result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("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::tqcurrentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); ret << errorName; - ret << TQString::tqfromLatin1( "<qt><p><b>" ) + errorName + - TQString::tqfromLatin1( "</b></p><p>" ) + description + - TQString::tqfromLatin1( "</p>" ); - ret2 = TQString::tqfromLatin1( "<qt><p>" ); + ret << TQString::fromLatin1( "<qt><p><b>" ) + errorName + + TQString::fromLatin1( "</b></p><p>" ) + description + + TQString::fromLatin1( "</p>" ); + ret2 = TQString::fromLatin1( "<qt><p>" ); if ( !techName.isEmpty() ) - ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::tqfromLatin1( "</p>" ); + ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::fromLatin1( "</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::tqfromLatin1( "</li></ul>" ); + ret2 += TQString::fromLatin1( "</li></ul>" ); } if ( !solutions.isEmpty() ) { ret2 += i18n( "<p><b>Possible solutions</b>:</p><ul><li>" ); ret2 += solutions.join( "</li><li>" ); - ret2 += TQString::tqfromLatin1( "</li></ul>" ); + ret2 += TQString::fromLatin1( "</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::tqcurrentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); TQString errorName, techName, description; @@ -700,7 +700,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT causes << i18n( "This error is very much dependent on the KDE program. The " "additional information should give you more information than is available " "to the KDE input/output architecture." ); - solutions << i18n( "Attempt to tqfind another way to accomplish the same " + solutions << i18n( "Attempt to find another way to accomplish the same " "outcome." ); break; @@ -988,7 +988,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT break; case KIO::ERR_COULD_NOT_STAT: - errorName = i18n( "Could Not Determine Resource tqStatus" ); + errorName = i18n( "Could Not Determine Resource Status" ); techName = i18n( "Could Not Stat Resource" ); description = i18n( "An attempt to determine information about the status " "of the resource <strong>%1</strong>, such as the resource name, type, " @@ -1291,7 +1291,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT #include <sys/vmount.h> #include <sys/vfs.h> -/* AIX does not prototype mntctl anywhere that I can tqfind */ +/* AIX does not prototype mntctl anywhere that I can find */ #ifndef mntctl extern "C" { int mntctl(int command, int size, void* buffer); @@ -1384,7 +1384,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename ) if( (volpath = volmgt_root()) == NULL ) { kdDebug( 7007 ) << "findDeviceMountPoint: " - << "VOLMGT: can't tqfind volmgt root dir" << endl; + << "VOLMGT: can't find volmgt root dir" << endl; return TQString::null; } @@ -1403,7 +1403,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename ) // << endl; /* - * tqfind the mountpoint + * find the mountpoint * floppies: * /dev/disketteN => <volpath>/dev/disketteN * CDROM, ZIP, and other media: @@ -1432,7 +1432,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename ) TQCString realname; realname = TQFile::encodeName(filename); - /* If the path tqcontains symlinks, get the real name */ + /* If the path contains symlinks, get the real name */ if (realpath(realname, realpath_buffer) != 0) // succes, use result from realpath realname = realpath_buffer; @@ -1453,7 +1453,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename ) TQCString device_name = mounted[i].f_mntfromname; - // If the path tqcontains symlinks, get + // If the path contains symlinks, get // the real name if (realpath(device_name, realpath_buffer) != 0) // succes, use result from realpath @@ -1546,7 +1546,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename ) return TQString::null; } - /* Loop over all file systems and see if we can tqfind our + /* Loop over all file systems and see if we can find our * mount point. * Note that this is the mount point with the longest match. * XXX: Fails if me->mnt_dir is not a realpath but goes @@ -1561,14 +1561,14 @@ TQString KIO::findDeviceMountPoint( const TQString& filename ) while (GETMNTENT(mtab, me)) { // There may be symbolic links into the /etc/mnttab - // So we have to tqfind the real device name here as well! + // So we have to find the real device name here as well! TQCString device_name = FSNAME(me); if (device_name.isEmpty() || (device_name == "none")) continue; //kdDebug( 7007 ) << "device_name=" << device_name << endl; - // If the path tqcontains symlinks, get + // If the path contains symlinks, get // the real name if (realpath(device_name, realpath_buffer) != 0) // succes, use result from realpath @@ -1690,7 +1690,7 @@ static TQString get_mount_info(const TQString& filename, memset(realname, 0, MAXPATHLEN); - /* If the path tqcontains symlinks, get the real name */ + /* If the path contains symlinks, get the real name */ if (realpath(TQFile::encodeName(filename), realname) == 0) { if( strlcpy(realname, TQFile::encodeName(filename), MAXPATHLEN)>=MAXPATHLEN) return TQString::null; @@ -1699,7 +1699,7 @@ static TQString get_mount_info(const TQString& filename, int max = 0; TQString mountPoint; - /* Loop over all file systems and see if we can tqfind our + /* Loop over all file systems and see if we can find our * mount point. * Note that this is the mount point with the longest match. * XXX: Fails if me->mnt_dir is not a realpath but goes @@ -1725,7 +1725,7 @@ static TQString get_mount_info(const TQString& filename, TQCString device_name = mounted[i].f_mntfromname; - // If the path tqcontains symlinks, get + // If the path contains symlinks, get // the real name if (realpath(device_name, realpath_buffer) != 0) // succes, use result from realpath @@ -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::tqfromLatin1(mounttype); + fstype = TQString::fromLatin1(mounttype); check_mount_point( mounttype, mounted[i].f_mntfromname, isautofs, isslow ); // keep going, looking for a potentially better one @@ -1805,12 +1805,12 @@ static TQString get_mount_info(const TQString& filename, if ( is_my_mountpoint( mountedto, realname, max ) ) { mountPoint = TQFile::decodeName(mountedto); - fstype = TQString::tqfromLatin1(ent->vfsent_name); + fstype = TQString::fromLatin1(ent->vfsent_name); check_mount_point(ent->vfsent_name, device_name, isautofs, isslow); if (ismanual == Unseen) { - // TODO: add check for ismanual, I couldn't tqfind any way + // TODO: add check for ismanual, I couldn't find any way // how to get the mount attribute from /etc/filesystems ismanual == Wrong; } @@ -1915,7 +1915,7 @@ TQString KIO::findDeviceMountPoint( const TQString& filename ) } #endif -TQString KIO::tqfindPathMountPoint(const TQString& filename) +TQString KIO::findPathMountPoint(const TQString& filename) { #ifdef Q_OS_UNIX MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong; diff --git a/kio/kio/global.h b/kio/kio/global.h index fc18f1953..402d7b431 100644 --- a/kio/kio/global.h +++ b/kio/kio/global.h @@ -420,12 +420,12 @@ namespace KIO /** * Returns the mount point on which resides @p filename. - * For instance if /home is a separate partition, tqfindPathMountPoint("/home/user/blah") + * For instance if /home is a separate partition, findPathMountPoint("/home/user/blah") * will return /home * @param filename the file name to check * @return the mount point of the given @p filename */ - KIO_EXPORT TQString tqfindPathMountPoint( const TQString & filename ); + KIO_EXPORT TQString findPathMountPoint( const TQString & filename ); /** * Checks if the path belongs to a filesystem that is probably @@ -475,12 +475,12 @@ namespace KIO * * Any file or URL can be represented by the UDSEntry type below * A UDSEntry is a list of atoms - * Each atom tqcontains a specific bit of information for the file + * Each atom contains a specific bit of information for the file * * The following UDS constants represent the different possible values * for m_uds in the UDS atom structure below * - * Each atom tqcontains a specific bit of information for the file + * Each atom contains a specific bit of information for the file */ class KIO_EXPORT UDSAtom { @@ -536,7 +536,7 @@ public: it != metaData.end(); ++it) { - tqreplace(it.key(), it.data()); + replace(it.key(), it.data()); } return *this; } diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 3fdb5d1e0..b20c09c10 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -318,10 +318,10 @@ void Job::showErrorDialog( TQWidget * parent ) } } -void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget ) +void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget ) { d->m_autoErrorHandling = enable; - d->m_errorParentWidget = tqparentWidget; + d->m_errorParentWidget = parentWidget; } bool Job::isAutoErrorHandlingEnabled() const @@ -392,7 +392,7 @@ MetaData Job::metaData() const TQString Job::queryMetaData(const TQString &key) { - if (!m_incomingMetaData.tqcontains(key)) + if (!m_incomingMetaData.contains(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 << TQ_INT8(false); // isFile is false + KIO_ARGS << url << Q_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 << (TQ_INT8) overwrite; + KIO_ARGS << src << dest << (Q_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 << (TQ_INT8) overwrite; + KIO_ARGS << target << dest << (Q_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) << TQ_INT8( ro ? 1 : 0 ) - << TQString::tqfromLatin1(fstype) << dev << point; + KIO_ARGS << int(1) << Q_INT8( ro ? 1 : 0 ) + << TQString::fromLatin1(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.tqreplace( "statSide", m_bSource ? "source" : "dest" ); - m_outgoingMetaData.tqreplace( "details", TQString::number(m_details) ); + m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); + m_outgoingMetaData.replace( "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.tqcontains(url) > 5) + if (m_redirectionList.contains(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; - TQ_INT8 iOverwrite, iResume; + Q_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->tqcontains( url.port())) + if( overriden_ports->contains( 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 << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; + KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions; TransferJob * job = new TransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo ); return job; } @@ -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 << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; + KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_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::tqfromLatin1("inode/directory"); + m_mimetype = TQString::fromLatin1("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 << (TQ_INT8) m_overwrite; + KIO_ARGS << m_src << m_dest << m_permissions << (Q_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 << (TQ_INT8) m_overwrite; + KIO_ARGS << m_src << m_dest << (Q_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 << TQ_INT8(true); // isFile + KIO_ARGS << src << Q_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.tqcontains( '/' ); // don't make this a tqfind()! + int numberOfSlashes = displayName.contains( '/' ); // don't make this a find()! TQString path = url.path(); int pos = 0; for ( int n = 0; n < numberOfSlashes + 1; ++n ) { - pos = path.tqfindRev( '/', pos - 1 ); + pos = path.findRev( '/', pos - 1 ); if ( pos == -1 ) { // error kdWarning(7007) << "kioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl; break; @@ -2677,7 +2677,7 @@ void CopyJob::statCurrentSrc() return; } else if ( m_mode == Move && ( - // Don't go renaming right away if we need a stat() to tqfind out the destination filename + // Don't go renaming right away if we need a stat() to find out the destination filename KProtocolInfo::fileNameUsedForCopying( m_currentSrcURL ) == KProtocolInfo::FromURL || destinationState != DEST_IS_DIR || m_asMethod ) ) @@ -2763,7 +2763,7 @@ void CopyJob::startRenameJob( const KURL& slave_url ) files.append(info); emit aboutToCreate( this, files ); - KIO_ARGS << m_currentSrcURL << dest << (TQ_INT8) false /*no overwrite*/; + KIO_ARGS << m_currentSrcURL << dest << (Q_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.tqfind( sourceUrl ); + KURL::List::Iterator sit = m_srcList.find( 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.tqreplace( 0, oldPath.length(), newPath ); + n.replace( 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.tqreplace( 0, oldPath.length(), newPath ); + n.replace( 0, oldPath.length(), newPath ); kdDebug(7007) << "files list: " << (*renamefileit).uSource.path() << " was going to be " << path << ", changed into " << n << endl; @@ -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::tqfromLatin1("devices")) + if ((*it).uSource.protocol()==TQString::fromLatin1("devices")) { TQByteArray data; TQByteArray param; @@ -3395,20 +3395,20 @@ void CopyJob::copyNextFile() config.setDesktopGroup(); KURL url = (*it).uSource; url.setPass( "" ); - config.writePathEntry( TQString::tqfromLatin1("URL"), url.url() ); - config.writeEntry( TQString::tqfromLatin1("Name"), url.url() ); - config.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") ); + config.writePathEntry( TQString::fromLatin1("URL"), url.url() ); + config.writeEntry( TQString::fromLatin1("Name"), url.url() ); + config.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); TQString protocol = (*it).uSource.protocol(); - 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 + 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 else - config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("unknown") ); + config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("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.tqcontains( url.path(-1) ) ) + if ( url.isLocalFile() && !m_parentDirs.contains( 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.tqcontains( url.directory(false) ) ) + if ( url.isLocalFile() && !m_parentDirs.contains( 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 << (TQ_INT32) queue.count(); + KIO_ARGS << (Q_INT32) queue.count(); for(entry = queue.first(); entry; entry = queue.next()) { stream << entry->url << entry->metaData; @@ -4471,7 +4471,7 @@ void MultiGetJob::start(Slave *slave) TransferJob::start(slave); // Anything else to do?? } -bool MultiGetJob::tqfindCurrentEntry() +bool MultiGetJob::findCurrentEntry() { if (b_multiGetActive) { @@ -4496,7 +4496,7 @@ bool MultiGetJob::tqfindCurrentEntry() void MultiGetJob::slotRedirection( const KURL &url) { - if (!tqfindCurrentEntry()) return; // Error + if (!findCurrentEntry()) return; // Error if (kapp && !kapp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "MultiGetJob: Redirection from " << m_currentEntry->url << " to " << url << " REJECTED!" << endl; @@ -4511,7 +4511,7 @@ void MultiGetJob::slotRedirection( const KURL &url) void MultiGetJob::slotFinished() { - if (!tqfindCurrentEntry()) return; + if (!findCurrentEntry()) return; if (m_redirectionURL.isEmpty()) { // No redirection, tell the world that we are finished. @@ -4561,7 +4561,7 @@ void MultiGetJob::slotMimetype( const TQString &_mimetype ) m_slave->send( m_command, m_packedArgs ); } } - if (!tqfindCurrentEntry()) return; // Error, unknown request! + if (!findCurrentEntry()) return; // Error, unknown request! emit mimetype(m_currentEntry->id, _mimetype); } @@ -4585,12 +4585,12 @@ TQString CacheInfo::cachedFileName() TQString CEF = m_url.path(); - int p = CEF.tqfind('/'); + int p = CEF.find('/'); while(p != -1) { CEF[p] = separator; - p = CEF.tqfind('/', p); + p = CEF.find('/', p); } TQString host = m_url.host().lower(); @@ -4651,7 +4651,7 @@ TQFile *CacheInfo::cachedFile() ok = false; time_t date; - time_t tqcurrentDate = time(0); + time_t currentDate = 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(tqcurrentDate, date) > m_maxCacheAge)) + if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge)) { m_bMustRevalidate = true; - m_expireDate = tqcurrentDate; + m_expireDate = currentDate; } } @@ -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(tqcurrentDate, date) >= 0) + if (!date || difftime(currentDate, date) >= 0) m_bMustRevalidate = true; m_expireDate = date; } diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index f5fa1134c..03ff3d452 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -155,17 +155,17 @@ namespace KIO { /** * Enable or disable the automatic error handling. When automatic * error handling is enabled and an error occurs, then showErrorDialog() - * is called with the specified @p tqparentWidget (if supplied) , right before + * is called with the specified @p parentWidget (if supplied) , right before * the emission of the result signal. * * The default is false. * * @param enable enable or disable automatic error handling - * @param tqparentWidget the parent widget, passed to showErrorDialog. + * @param parentWidget the parent widget, passed to showErrorDialog. * Can be 0 for top-level * @see isAutoErrorHandlingEnabled(), showErrorDialog() */ - void setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget = 0 ); + void setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget = 0 ); /** * Returns whether automatic error handling is enabled or disabled. @@ -1186,7 +1186,7 @@ namespace KIO { KURL url; MetaData metaData; }; - bool tqfindCurrentEntry(); + bool findCurrentEntry(); void flushQueue(TQPtrList<GetRequest> &queue); TQPtrList<GetRequest> m_waitQueue; diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp index e152d29cd..432a50d31 100644 --- a/kio/kio/kacl.cpp +++ b/kio/kio/kacl.cpp @@ -271,7 +271,7 @@ mode_t KACL::basePermissions() const return perms; } -unsigned short KACL::tqmaskPermissions( bool &exists ) const +unsigned short KACL::maskPermissions( bool &exists ) const { exists = true; #ifdef USE_POSIX_ACL @@ -376,7 +376,7 @@ bool KACL::KACLPrivate::setNamedUserOrGroupPermissions( const TQString& name, un } if ( allIsWell && createdNewEntry ) { // 23.1.1 of 1003.1e states that as soon as there is a named user or - // named group entry, there needs to be a tqmask entry as well, so add + // named group entry, there needs to be a mask entry as well, so add // one, if the user hasn't explicitely set one. if ( entryForTag( newACL, ACL_MASK ) == 0 ) { acl_calc_mask( &newACL ); @@ -447,7 +447,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, if ( currentTag == type ) { acl_delete_entry( newACL, entry ); // we have to start from the beginning, the iterator is - // tqinvalidated, on deletion + // invalidated, on deletion ret = acl_get_entry( newACL, ACL_FIRST_ENTRY, &entry ); } else { ret = acl_get_entry( newACL, ACL_NEXT_ENTRY, &entry ); @@ -475,7 +475,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, //printACL( newACL, "After adding entries: " ); if ( allIsWell && atLeastOneUserOrGroup ) { // 23.1.1 of 1003.1e states that as soon as there is a named user or - // named group entry, there needs to be a tqmask entry as well, so add + // named group entry, there needs to be a mask entry as well, so add // one, if the user hasn't explicitely set one. if ( entryForTag( newACL, ACL_MASK ) == 0 ) { acl_calc_mask( &newACL ); @@ -619,12 +619,12 @@ TQString KACL::asString() const TQString KACL::KACLPrivate::getUserName( uid_t uid ) const { TQString *temp; - temp = m_usercache.tqfind( uid ); + temp = m_usercache.find( uid ); if ( !temp ) { struct passwd *user = getpwuid( uid ); if ( user ) { - m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) ); - return TQString::tqfromLatin1( user->pw_name ); + m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) ); + return TQString::fromLatin1( 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.tqfind( gid ); + temp = m_groupcache.find( gid ); if ( !temp ) { struct group *grp = getgrgid( gid ); if ( grp ) { - m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) ); - return TQString::tqfromLatin1( grp->gr_name ); + m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) ); + return TQString::fromLatin1( 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::tqfromLatin1( aclString ); + TQString ret = TQString::fromLatin1( aclString ); acl_free( (void*)aclString ); return ret; } diff --git a/kio/kio/kacl.h b/kio/kio/kacl.h index 6fe415603..53bc762b0 100644 --- a/kio/kio/kacl.h +++ b/kio/kio/kacl.h @@ -111,24 +111,24 @@ public: /** @return the basic (owner/group/others) part of the ACL as a mode_t */ mode_t basePermissions() const; - /** The interface to the extended ACL. This is a tqmask, permissions for + /** The interface to the extended ACL. This is a mask, permissions for * n named users and permissions for m named groups. */ /** - * Return whether the ACL tqcontains extended entries or can be expressed + * Return whether the ACL contains extended entries or can be expressed * using only basic file permissions. - * @return whether the ACL tqcontains extended entries */ + * @return whether the ACL contains extended entries */ bool isExtended() const; /** - * Return the entry for the permissions tqmask if there is one and sets + * Return the entry for the permissions mask if there is one and sets * @p exists to true. If there is no such entry, @p exists is set to false. - * @return the permissions tqmask entry */ - unsigned short tqmaskPermissions( bool &exists ) const; + * @return the permissions mask entry */ + unsigned short maskPermissions( bool &exists ) const; - /** Set the permissions tqmask for the ACL. Permissions set for individual - * entries will be tqmasked with this, such that their effective permissions - * are the result of the logical and of their entry and the tqmask. + /** Set the permissions mask for the ACL. Permissions set for individual + * entries will be masked with this, such that their effective permissions + * are the result of the logical and of their entry and the mask. * @return success or failure */ bool setMaskPermissions( unsigned short ); diff --git a/kio/kio/kar.cpp b/kio/kio/kar.cpp index 8d8d0bba5..9f9435294 100644 --- a/kio/kio/kar.cpp +++ b/kio/kio/kar.cpp @@ -86,7 +86,7 @@ bool KAr::openArchive( int mode ) char magic[8]; dev->readBlock (magic, 8); - if (tqstrncmp(magic, "!<arch>", 7) != 0) { + if (qstrncmp(magic, "!<arch>", 7) != 0) { kdWarning(7042) << "Invalid main magic" << endl; return false; } @@ -140,13 +140,13 @@ bool KAr::openArchive( int mode ) return false; } name = &ar_longnames[name.mid(1, 15).toInt()]; - name = name.left(name.tqfind("/")); + name = name.left(name.find("/")); } } if (skip_entry) continue; name = name.stripWhiteSpace(); // Process filename - name.tqreplace( "/", "" ); + name.replace( "/", "" ); kdDebug(7042) << "Filename: " << name << " Size: " << size << endl; KArchiveEntry* entry; diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp index dd424fe69..592e513d4 100644 --- a/kio/kio/karchive.cpp +++ b/kio/kio/karchive.cpp @@ -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 ) == (TQ_LONG)size; + return device()->writeBlock( data, size ) == (Q_LONG)size; } KArchiveDirectory * KArchive::rootDir() @@ -375,17 +375,17 @@ 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::tqfromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null ); + d->rootDir = new KArchiveDirectory( this, TQString::fromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null ); } return d->rootDir; } -KArchiveDirectory * KArchive::tqfindOrCreate( const TQString & path ) +KArchiveDirectory * KArchive::findOrCreate( const TQString & path ) { - //kdDebug() << "KArchive::tqfindOrCreate " << path << endl; + //kdDebug() << "KArchive::findOrCreate " << path << endl; if ( path.isEmpty() || path == "/" || path == "." ) // root dir => found { - //kdDebug() << "KArchive::tqfindOrCreate returning rootdir" << endl; + //kdDebug() << "KArchive::findOrCreate returning rootdir" << endl; return rootDir(); } // Important note : for tar files containing absolute paths @@ -399,14 +399,14 @@ KArchiveDirectory * KArchive::tqfindOrCreate( const TQString & path ) if ( ent ) { if ( ent->isDirectory() ) - //kdDebug() << "KArchive::tqfindOrCreate found it" << endl; + //kdDebug() << "KArchive::findOrCreate found it" << endl; return (KArchiveDirectory *) ent; else kdWarning() << "Found " << path << " but it's not a directory" << endl; } // Otherwise go up and try again - int pos = path.tqfindRev( '/' ); + int pos = path.findRev( '/' ); KArchiveDirectory * parent; TQString dirname; if ( pos == -1 ) // no more slash => create in root dir @@ -418,7 +418,7 @@ KArchiveDirectory * KArchive::tqfindOrCreate( const TQString & path ) { TQString left = path.left( pos ); dirname = path.mid( pos + 1 ); - parent = tqfindOrCreate( left ); // recursive call... until we tqfind an existing dir. + parent = findOrCreate( left ); // recursive call... until we find an existing dir. } //kdDebug() << "KTar : found parent " << parent->name() << " adding " << dirname << " to ensure " << path << endl; @@ -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.tqfind( '/' ); - if ( pos == 0 ) // ouch absolute path (see also KArchive::tqfindOrCreate) + int pos = name.find( '/' ); + if ( pos == 0 ) // ouch absolute path (see also KArchive::findOrCreate) { if (name.length()>1) { name = name.mid( 1 ); // remove leading slash - pos = name.tqfind( '/' ); // look again + pos = name.find( '/' ); // 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.tqfind( '/' ); // look again + pos = name.find( '/' ); // look again } if ( pos != -1 ) { diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h index c764fb3be..dbfe02bff 100644 --- a/kio/kio/karchive.h +++ b/kio/kio/karchive.h @@ -304,7 +304,7 @@ protected: * @param path the path of the directory * @return the directory with the given @p path */ - KArchiveDirectory * tqfindOrCreate( const TQString & path ); + KArchiveDirectory * findOrCreate( const TQString & path ); /** * @internal for inherited constructors @@ -512,12 +512,12 @@ public: * Position of the data in the [uncompressed] archive. * @return the position of the file */ - int position() const; // TODO use TQ_LONG in KDE-4.0 + int position() const; // TODO use Q_LONG in KDE-4.0 /** * Size of the data. * @return the size of the file */ - int size() const; // TODO use TQ_LONG in KDE-4.0 + int size() const; // TODO use Q_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 TQ_LONG in KDE-4.0 - int m_size; // TODO use TQ_LONG in KDE-4.0 + int m_pos; // TODO use Q_LONG in KDE-4.0 + int m_size; // TODO use Q_LONG in KDE-4.0 protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp index 3bbe47c52..a4782c313 100644 --- a/kio/kio/kautomount.cpp +++ b/kio/kio/kautomount.cpp @@ -56,7 +56,7 @@ void KAutoMount::slotResult( KIO::Job * job ) Q_ASSERT( mountpoint.isValid() ); if ( mountpoint.path().isEmpty() ) - kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::findDeviceMountPoint didn't tqfind it. " + kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::findDeviceMountPoint didn't find it. " << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl; else if ( m_bShowFilemanagerWindow ) KRun::runURL( mountpoint, "inode/directory" ); diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h index 3130ddec0..1d8662590 100644 --- a/kio/kio/kautomount.h +++ b/kio/kio/kautomount.h @@ -38,7 +38,7 @@ class Job; * * @short This class implements synchronous mounting of devices. */ -class KIO_EXPORT KAutoMount : public TQObject +class KIO_EXPORT KAutoMount : public QObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; @@ -83,14 +83,14 @@ private: * * @short This class implements synchronous unmounting of devices, */ -class KIO_EXPORT KAutoUnmount : public TQObject +class KIO_EXPORT KAutoUnmount : public QObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; public: /** * Unmounts a device. - * @param mountpoint the mount point - KAutoUnmount tqfinds the device from that + * @param mountpoint the mount point - KAutoUnmount finds the device from that * @param desktopFile the file the user clicked on - to notify KDirWatch of the fact that * it should emit fileDirty for it (to have the icon change) */ diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index 6905b3c31..bb6462006 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().tqcontains( "KDataTool" ) ) + if ( !!m_service && !m_service->serviceTypes().contains( "KDataTool" ) ) { kdDebug(30003) << "The service " << m_service->name().latin1() << " does not feature the service type KDataTool" << endl; @@ -167,11 +167,11 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const if ( !datatype.isEmpty() ) { - constr = TQString::tqfromLatin1( "DataType == '%1'" ).arg( datatype ); + constr = TQString::fromLatin1( "DataType == '%1'" ).arg( datatype ); } if ( !mimetype.isEmpty() ) { - TQString tmp = TQString::tqfromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype ); + TQString tmp = TQString::fromLatin1( "'%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::tqfromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() ); + TQString tmp = TQString::fromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() ); if ( constr.isEmpty() ) constr = tmp; else @@ -194,9 +194,9 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const KTrader::OfferList::ConstIterator it = offers.begin(); for( ; it != offers.end(); ++it ) { - // Temporary tqreplacement for the non-working trader query above + // Temporary replacement for the non-working trader query above if ( !instance || !(*it)->property("ExcludeFrom").toStringList() - .tqcontains( instance->instanceName() ) ) + .contains( 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 819382380..69751db79 100644 --- a/kio/kio/kdatatool.h +++ b/kio/kio/kdatatool.h @@ -250,7 +250,7 @@ private: * @see KDataToolAction, and for activating a tool, passing it the data * (and possibly getting modified data from it). */ -class KIO_EXPORT KDataTool : public TQObject +class KIO_EXPORT KDataTool : public QObject { Q_OBJECT public: diff --git a/kio/kio/kdcopservicestarter.cpp b/kio/kio/kdcopservicestarter.cpp index 27c4d3514..3c9b55501 100644 --- a/kio/kio/kdcopservicestarter.cpp +++ b/kio/kio/kdcopservicestarter.cpp @@ -46,7 +46,7 @@ KDCOPServiceStarter::~KDCOPServiceStarter() { } -int KDCOPServiceStarter::tqfindServiceFor( const TQString& serviceType, +int KDCOPServiceStarter::findServiceFor( const TQString& serviceType, const TQString& _constraint, const TQString& preferences, TQString *error, TQCString* pDcopService, diff --git a/kio/kio/kdcopservicestarter.h b/kio/kio/kdcopservicestarter.h index 501bef030..b267476e7 100644 --- a/kio/kio/kdcopservicestarter.h +++ b/kio/kio/kdcopservicestarter.h @@ -40,7 +40,7 @@ public: /** * Check if a given DCOP interface is available - from the serviceType it's supposed to implement. * - * The trader is queried to tqfind the preferred application for this serviceType, + * The trader is queried to find the preferred application for this serviceType, * with the constraint that its X-DCOP-ServiceName property must be defined. * Then the DCOP server is checked. If the service is not available, * this method will call startServiceFor to start it. @@ -48,17 +48,17 @@ public: * @param serviceType the type of service we're looking for * @param constraint see KTrader * @param preferences see KTrader - * @param error On failure, @p error tqcontains a description of the error + * @param error On failure, @p error contains a description of the error * that occurred. If the pointer is 0, the argument will be * ignored - * @param dcopService On success, @p dcopService tqcontains the DCOP name + * @param dcopService On success, @p dcopService contains the DCOP name * under which this service is available. If the pointer is 0 the argument * will be ignored * @param flags for future extensions (currently unused) * * @return an error code indicating success (== 0) or failure (> 0). */ - int tqfindServiceFor( const TQString& serviceType, + int findServiceFor( const TQString& serviceType, const TQString& constraint = TQString::null, const TQString& preferences = TQString::null, TQString *error=0, TQCString* dcopService=0, @@ -67,7 +67,7 @@ public: /** * Find an implementation of the given @p serviceType, * and start it, to use its DCOP interface. - * The default implementation uses KTrader to tqfind the preferred Application, + * The default implementation uses KTrader to find the preferred Application, * and then starts it using kapp->startService... * * However applications (like kontact) can reimplement this method, to provide @@ -76,10 +76,10 @@ public: * @param serviceType the type of service we're looking for * @param constraint see KTrader * @param preferences see KTrader - * @param error On failure, @p error tqcontains a description of the error + * @param error On failure, @p error contains a description of the error * that occurred. If the pointer is 0, the argument will be * ignored - * @param dcopService On success, @p dcopService tqcontains the DCOP name + * @param dcopService On success, @p dcopService contains the DCOP name * under which this service is available. If the pointer is 0 the argument * will be ignored * @param flags for future extensions (currently unused) diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 5664e2572..901f382b8 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.tqfind( _url ) != lister->d->lstDirs.end() ) + else if ( lister->d->lstDirs.find( _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->tqfindRef( lister ) > -1 ) + if ( listers->findRef( lister ) > -1 ) { // lister is listing url TQString url = it.currentKey(); @@ -456,8 +456,8 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not // remove the dir from lister->d->lstDirs so that it doesn't contain things // that itemsInUse doesn't. When emitting the canceled signals lstDirs must // not contain anything that itemsInUse does not contain. (otherwise it - // might crash in tqfindByName()). - lister->d->lstDirs.remove( lister->d->lstDirs.tqfind( url ) ); + // might crash in findByName()). + lister->d->lstDirs.remove( lister->d->lstDirs.find( url ) ); DirItem *item = itemsInUse[urlStr]; @@ -498,7 +498,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not // unmounting a removable device (#37780) const bool isLocal = item->url.isLocalFile(); const bool isManuallyMounted = isLocal && KIO::manually_mounted( item->url.path() ); - bool tqcontainsManuallyMounted = false; + bool containsManuallyMounted = false; if ( !isManuallyMounted && item->lstItems && isLocal ) { // Look for a manually-mounted directory inside @@ -506,15 +506,15 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not // I hope this isn't too slow (manually_mounted caches the last device so most // of the time this is just a stat per subdir) KFileItemListIterator kit( *item->lstItems ); - for ( ; kit.current() && !tqcontainsManuallyMounted; ++kit ) + for ( ; kit.current() && !containsManuallyMounted; ++kit ) if ( (*kit)->isDir() && KIO::manually_mounted( (*kit)->url().path() ) ) - tqcontainsManuallyMounted = true; + containsManuallyMounted = true; } - if ( isManuallyMounted || tqcontainsManuallyMounted ) + if ( isManuallyMounted || containsManuallyMounted ) { kdDebug(7004) << "Not adding a watch on " << item->url << " because it " << - ( isManuallyMounted ? "is manually mounted" : "tqcontains a manually mounted subdir" ) << endl; + ( isManuallyMounted ? "is manually mounted" : "contains a manually mounted subdir" ) << endl; item->complete = false; // set to "dirty" } else @@ -570,7 +570,7 @@ void KDirListerCache::updateDirectory( const KURL& _dir ) } kdDebug(7004) << k_funcinfo << "Killed = " << killed << endl; - // we don't need to emit canceled signals since we only tqreplaced the job, + // we don't need to emit canceled signals since we only replaced the job, // the listing is continuing. Q_ASSERT( !listers || (listers && killed) ); @@ -645,7 +645,7 @@ KFileItemList *KDirListerCache::itemsForDir( const KURL &_dir ) const return item ? item->lstItems : 0; } -KFileItem *KDirListerCache::tqfindByName( const KDirLister *lister, const TQString& _name ) const +KFileItem *KDirListerCache::findByName( const KDirLister *lister, const TQString& _name ) const { Q_ASSERT( lister ); @@ -669,8 +669,8 @@ KFileItem *KDirListerCache::findByURL( const KDirLister *lister, const KURL& _u KURL parentDir( _url ); parentDir.setPath( parentDir.directory() ); - // If lister is set, check that it tqcontains this dir - if ( lister && !lister->d->lstDirs.tqcontains( parentDir ) ) + // If lister is set, check that it contains this dir + if ( lister && !lister->d->lstDirs.contains( 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.tqfind( dir ) == dirsToUpdate.end() ) + if ( dirsToUpdate.find( dir ) == dirsToUpdate.end() ) dirsToUpdate.prepend( dir ); } } @@ -959,7 +959,7 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri { TQString name; - // tqfind out about the name + // find out about the name KIO::UDSEntry::ConstIterator entit = (*it).begin(); for( ; entit != (*it).end(); ++entit ) if ( (*entit).m_uds == KIO::UDS_NAME ) @@ -1110,7 +1110,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) kdl->d->url = newUrl; } - *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl; + *kdl->d->lstDirs.find( 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.tqfind( oldUrl ) = newUrl; + *kdl->d->lstDirs.find( 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.tqfind( oldUrl ) = url; + *kdl->d->lstDirs.find( 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->tqcontainsRef( kdl ) == 0 ); + Q_ASSERT( listers->containsRef( kdl ) == 0 ); listers->append( kdl ); } else @@ -1755,7 +1755,7 @@ void KDirListerCache::deleteDir( const KURL& dirUrl ) DirItem *dir = itemsInUse.take( deletedUrl.url() ); Q_ASSERT( !dir ); - if ( !dir ) // take didn't tqfind it - move on + if ( !dir ) // take didn't find it - move on ++itu; } else @@ -2049,13 +2049,13 @@ KFileItem *KDirLister::findByURL( const KURL& _url ) const return s_pCache->findByURL( this, _url ); } -KFileItem *KDirLister::tqfindByName( const TQString& _name ) const +KFileItem *KDirLister::findByName( const TQString& _name ) const { - return s_pCache->tqfindByName( this, _name ); + return s_pCache->findByName( this, _name ); } #ifndef KDE_NO_COMPAT -KFileItem *KDirLister::tqfind( const KURL& _url ) const +KFileItem *KDirLister::find( const KURL& _url ) const { return findByURL( _url ); } @@ -2095,8 +2095,8 @@ void KDirLister::setMimeFilter( const TQStringList& mimeFilter ) if ( !(d->changes & MIME_FILTER) ) d->oldMimeFilter = d->mimeFilter; - if ( mimeFilter.tqfind("all/allfiles") != mimeFilter.end() || - mimeFilter.tqfind("all/all") != mimeFilter.end() ) + if ( mimeFilter.find("all/allfiles") != mimeFilter.end() || + mimeFilter.find("all/all") != mimeFilter.end() ) d->mimeFilter.clear(); else d->mimeFilter = mimeFilter; diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h index af5d7de22..8a0109e89 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 <[email protected]> */ -class KIO_EXPORT KDirLister : public TQObject +class KIO_EXPORT KDirLister : public QObject { class KDirListerPrivate; friend class KDirListerPrivate; @@ -251,7 +251,7 @@ public: */ virtual KFileItem *findByURL( const KURL& _url ) const; #ifndef KDE_NO_COMPAT - KFileItem *tqfind( const KURL& _url ) const; + KFileItem *find( const KURL& _url ) const; #endif /** @@ -259,7 +259,7 @@ public: * @param name the item name * @return the pointer to the KFileItem */ - virtual KFileItem *tqfindByName( const TQString& name ) const; + virtual KFileItem *findByName( const TQString& name ) const; /** * Set a name filter to only list items matching this name, e.g. "*.cpp". @@ -334,7 +334,7 @@ public: /** * Checks whether @p mime matches a filter in the list of mime types - * @param mime the mimetype to tqfind in the filter list. + * @param mime the mimetype to find in the filter list. * @return true if @p name matches a filter in the list, * otherwise false. * @see setMimeFilter. diff --git a/kio/kio/kdirlister_p.h b/kio/kio/kdirlister_p.h index 9a91e57df..a98521905 100644 --- a/kio/kio/kdirlister_p.h +++ b/kio/kio/kdirlister_p.h @@ -70,7 +70,7 @@ public: /** * List of dirs handled by this dirlister. The first entry is the base URL. - * For a tree view, it tqcontains all the dirs shown. + * For a tree view, it contains all the dirs shown. */ KURL::List lstDirs; @@ -150,13 +150,13 @@ public: KFileItemList *itemsForDir( const KURL &_dir ) const; - KFileItem *tqfindByName( const KDirLister *lister, const TQString &_name ) const; + KFileItem *findByName( const KDirLister *lister, const TQString &_name ) const; // if lister is set, it is checked that the url is held by the lister KFileItem *findByURL( const KDirLister *lister, const KURL &_url ) const; /** * Notify that files have been added in @p directory - * The receiver will list that directory again to tqfind + * The receiver will list that directory again to find * the new items (since it needs more than just the names anyway). * Reimplemented from KDirNotify. */ diff --git a/kio/kio/kdirnotify.h b/kio/kio/kdirnotify.h index 8c8051524..2082569a1 100644 --- a/kio/kio/kdirnotify.h +++ b/kio/kio/kdirnotify.h @@ -41,7 +41,7 @@ k_dcop: /** * Notify that files have been added in @p directory * Note: this is ASYNC so that it can be used with a broadcast. - * @param directory the directory that tqcontains the new files + * @param directory the directory that contains the new files */ virtual ASYNC FilesAdded( const KURL & directory ) = 0; diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp index 83d8dac9f..bbea148fa 100644 --- a/kio/kio/kdirwatch.cpp +++ b/kio/kio/kdirwatch.cpp @@ -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 TQSocketNotifier + * This is done by writing into a pipe to trigger a QSocketNotifier * 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.tqfind(si->si_fd); + Entry* e = dwp_self->fd_Entry.find(si->si_fd); // kdDebug(7001) << "DNOTIFY Handler: fd " << si->si_fd << " path " // << TQString(e ? e->path:"unknown") << endl; @@ -413,9 +413,9 @@ void KDirWatchPrivate::slotActivated() if ( path.length() && isNoisyFile( path.latin1() ) ) continue; - kdDebug(7001) << "ev wd: " << event->wd << " tqmask " << event->tqmask << " path: " << path << endl; + kdDebug(7001) << "ev wd: " << event->wd << " mask " << event->mask << " path: " << path << endl; - // now we're in deep trouble of tqfinding the + // now we're in deep trouble of finding the // associated entries // for now, we suck and iterate for ( EntryMap::Iterator it = m_mapEntries.begin(); @@ -425,7 +425,7 @@ void KDirWatchPrivate::slotActivated() e->dirty = true; if ( 1 || e->isDir) { - if( event->tqmask & IN_DELETE_SELF) { + if( event->mask & IN_DELETE_SELF) { kdDebug(7001) << "-->got deleteself signal for " << e->path << endl; e->m_status = NonExistent; if (e->isDir) @@ -433,10 +433,10 @@ void KDirWatchPrivate::slotActivated() else addEntry(0, TQFileInfo(e->path).dirPath(true), e, true); } - if ( event->tqmask & IN_IGNORED ) { + if ( event->mask & IN_IGNORED ) { e->wd = 0; } - if ( event->tqmask & (IN_CREATE|IN_MOVED_TO) ) { + if ( event->mask & (IN_CREATE|IN_MOVED_TO) ) { Entry *sub_entry = e->m_entries.first(); for(;sub_entry; sub_entry = e->m_entries.next()) if (sub_entry->path == e->path + "/" + path) break; @@ -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.tqfind( path ); + EntryMap::Iterator it = m_mapEntries.find( path ); if ( it == m_mapEntries.end() ) return 0; else @@ -668,13 +668,13 @@ bool KDirWatchPrivate::useDNotify(Entry* e) return false; } - int tqmask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT; + int mask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT; // if dependant is a file watch, we check for MODIFY & ATTRIB too for(Entry* dep=e->m_entries.first();dep;dep=e->m_entries.next()) - if (!dep->isDir) { tqmask |= DN_MODIFY|DN_ATTRIB; break; } + if (!dep->isDir) { mask |= DN_MODIFY|DN_ATTRIB; break; } if(fcntl(fd, F_SETSIG, dnotify_signal) < 0 || - fcntl(fd, F_NOTIFY, tqmask) < 0) { + fcntl(fd, F_NOTIFY, mask) < 0) { kdDebug(7001) << "Not using Linux Directory Notifications." << endl; @@ -684,7 +684,7 @@ bool KDirWatchPrivate::useDNotify(Entry* e) return false; } - fd_Entry.tqreplace(fd, e); + fd_Entry.replace(fd, e); e->dn_fd = fd; kdDebug(7001) << " Setup DNotify (fd " << fd @@ -714,19 +714,19 @@ bool KDirWatchPrivate::useINotify( Entry* e ) e->m_mode = INotifyMode; - int tqmask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW; + int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW; if(!e->isDir) - tqmask |= IN_MODIFY|IN_ATTRIB; + mask |= IN_MODIFY|IN_ATTRIB; else - tqmask |= IN_ONLYDIR; + mask |= IN_ONLYDIR; // if dependant is a file watch, we check for MODIFY & ATTRIB too for(Entry* dep=e->m_entries.first();dep;dep=e->m_entries.next()) { - if (!dep->isDir) { tqmask |= IN_MODIFY|IN_ATTRIB; break; } + if (!dep->isDir) { mask |= IN_MODIFY|IN_ATTRIB; break; } } if ( ( e->wd = inotify_add_watch( m_inotify_fd, - TQFile::encodeName( e->path ), tqmask) ) > 0 ) + TQFile::encodeName( e->path ), mask) ) > 0 ) return true; if ( e->m_status == NonExistent ) { @@ -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.tqfind( path ); + EntryMap::Iterator it = m_mapEntries.find( path ); if ( it != m_mapEntries.end() ) { if (sub_entry) { @@ -794,11 +794,11 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, { Entry* e = &(*it); if( (e->m_mode == DNotifyMode) && (e->dn_fd > 0) ) { - int tqmask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT; + int mask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT; // if dependant is a file watch, we check for MODIFY & ATTRIB too for(Entry* dep=e->m_entries.first();dep;dep=e->m_entries.next()) - if (!dep->isDir) { tqmask |= DN_MODIFY|DN_ATTRIB; break; } - if( fcntl(e->dn_fd, F_NOTIFY, tqmask) < 0) { // shouldn't happen + if (!dep->isDir) { mask |= DN_MODIFY|DN_ATTRIB; break; } + if( fcntl(e->dn_fd, F_NOTIFY, mask) < 0) { // shouldn't happen ::close(e->dn_fd); e->m_mode = UnknownMode; fd_Entry.remove(e->dn_fd); @@ -813,14 +813,14 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, { Entry* e = &(*it); if( (e->m_mode == INotifyMode) && (e->wd > 0) ) { - int tqmask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW; + int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW; if(!e->isDir) - tqmask |= IN_MODIFY|IN_ATTRIB; + mask |= IN_MODIFY|IN_ATTRIB; else - tqmask |= IN_ONLYDIR; + mask |= IN_ONLYDIR; inotify_rm_watch (m_inotify_fd, e->wd); - e->wd = inotify_add_watch( m_inotify_fd, TQFile::encodeName( e->path ), tqmask); + e->wd = inotify_add_watch( m_inotify_fd, TQFile::encodeName( e->path ), mask); } } #endif @@ -923,7 +923,7 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance, if (delayRemove) { // removeList is allowed to contain any entry at most once - if (removeList.tqfindRef(e)==-1) + if (removeList.findRef(e)==-1) removeList.append(e); // now e->isValid() is false return; @@ -1704,7 +1704,7 @@ void KDirWatch::startScan( bool notify, bool skippedToo ) } -bool KDirWatch::tqcontains( const TQString& _path ) const +bool KDirWatch::contains( const TQString& _path ) const { KDirWatchPrivate::Entry* e = d->entry(_path); if (!e) diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h index 591627a70..36f2737b3 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 <[email protected]> */ -class KIO_EXPORT KDirWatch : public TQObject +class KIO_EXPORT KDirWatch : public QObject { Q_OBJECT @@ -194,7 +194,7 @@ class KIO_EXPORT KDirWatch : public TQObject * @param path the directory to check * @return true if the directory is being watched */ - bool tqcontains( const TQString& path ) const; + bool contains( const TQString& path ) const; /** * Dump statistic information about all KDirWatch instances. diff --git a/kio/kio/kdirwatch_p.h b/kio/kio/kdirwatch_p.h index 473f1e468..9920b866d 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 TQMOC processing + * this separate header file is needed for MOC processing * because KDirWatchPrivate has signals and slots */ @@ -18,12 +18,12 @@ /* KDirWatchPrivate is a singleton and does the watching * for every KDirWatch instance in the application. */ -class KDirWatchPrivate : public TQObject +class KDirWatchPrivate : public QObject { Q_OBJECT public: - enum entrytqStatus { Normal = 0, NonExistent }; + enum entryStatus { Normal = 0, NonExistent }; enum entryMode { UnknownMode = 0, StatMode, DNotifyMode, INotifyMode, FAMMode }; enum { NoChange=0, Changed=1, Created=2, Deleted=4 }; @@ -43,7 +43,7 @@ public: time_t m_ctime; // the last observed link count int m_nlink; - entrytqStatus m_status; + entryStatus m_status; entryMode m_mode; bool isDir; // instances interested in events diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index b503be761..010832573 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -179,7 +179,7 @@ void KFileItem::init( bool _determineMimeTypeOnDemand ) m_pMimeType = KMimeType::findByURL( url, m_fileMode, isLocalURL, // use fast mode if not mimetype on demand _determineMimeTypeOnDemand, &accurate ); - //kdDebug() << "tqfinding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl; + //kdDebug() << "finding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl; // if we didn't use fast mode, or if we got a result, then this is the mimetype // otherwise, determineMimeType will be able to do better. m_bMimeTypeKnown = (!_determineMimeTypeOnDemand) || accurate; @@ -518,7 +518,7 @@ KMimeType::Ptr KFileItem::determineMimeType() KURL url = mostLocalURL(isLocalURL); m_pMimeType = KMimeType::findByURL( url, m_fileMode, isLocalURL ); - //kdDebug() << "tqfinding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl; + //kdDebug() << "finding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl; m_bMimeTypeKnown = true; } @@ -541,7 +541,7 @@ TQString KFileItem::mimeComment() KURL url = mostLocalURL(isLocalURL); TQString comment = mType->comment( url, isLocalURL ); - //kdDebug() << "tqfinding comment for " << url.url() << " : " << m_pMimeType->name() << endl; + //kdDebug() << "finding comment for " << url.url() << " : " << m_pMimeType->name() << endl; if (!comment.isEmpty()) return comment; else @@ -555,7 +555,7 @@ TQString KFileItem::iconName() bool isLocalURL; KURL url = mostLocalURL(isLocalURL); - //kdDebug() << "tqfinding icon for " << url.url() << " : " << m_pMimeType->name() << endl; + //kdDebug() << "finding icon for " << url.url() << " : " << m_pMimeType->name() << endl; return determineMimeType()->icon(url, isLocalURL); } @@ -626,7 +626,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const KURL url = mostLocalURL(isLocalURL); TQPixmap p = mime->pixmap( url, KIcon::Desktop, _size, _state ); - //kdDebug() << "tqfinding pixmap for " << url.url() << " : " << mime->name() << endl; + //kdDebug() << "finding pixmap for " << url.url() << " : " << mime->name() << endl; if (p.isNull()) kdWarning() << "Pixmap not found for mimetype " << m_pMimeType->name() << endl; @@ -774,7 +774,7 @@ TQString KFileItem::getStatusBarInfo() text += " "; text += mimeComment(); } - text.tqreplace('\n', " "); // tqreplace any newlines with a space, so the statusbar doesn't get a two-line string which messes the display up, Alex + text.replace('\n', " "); // replace any newlines with a space, so the statusbar doesn't get a two-line string which messes the display up, Alex return text; } @@ -973,12 +973,12 @@ void KFileItem::setExtraData( const void *key, void *value ) if ( !key ) return; - m_extra.tqreplace( key, value ); + m_extra.replace( key, value ); } const void * KFileItem::extraData( const void *key ) const { - TQMapConstIterator<const void*,void*> it = m_extra.tqfind( key ); + TQMapConstIterator<const void*,void*> it = m_extra.find( 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.tqfind( key ); + TQMapIterator<const void*,void*> it = m_extra.find( 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::tqfromLatin1(p); + return TQString::fromLatin1(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() tqinvalidates, + // We don't need to save/restore anything that refresh() invalidates, // since that means we can re-determine those by ourselves. s << a.m_url; s << a.m_strName; diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h index b0ce59d88..cf6344669 100644 --- a/kio/kio/kfileitem.h +++ b/kio/kio/kfileitem.h @@ -47,7 +47,7 @@ public: * Creates an item representing a file, from a UDSEntry. * This is the preferred constructor when using KIO::listDir(). * - * @param _entry the KIO entry used to get the file, tqcontains info about it + * @param _entry the KIO entry used to get the file, contains info about it * @param _url the file url * @param _determineMimeTypeOnDemand specifies if the mimetype of the given * URL should be determined immediately or on demand diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index 8ecf1af16..fcab35f19 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -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.tqfind(*pref); + TQStringList::Iterator group = list.find(*pref); if ( group != list.end() ) { newlist.append( *group ); @@ -418,7 +418,7 @@ TQStringList KFileMetaInfo::preferredGroups() const } } - // now the old list only tqcontains the non-preferred items, so we + // now the old list only contains the non-preferred items, so we // add the remaining ones to newlist newlist += list; @@ -440,7 +440,7 @@ TQStringList KFileMetaInfo::preferredKeys() const KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const { - TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.tqfind( key ); + TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.find( 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().tqcontains(name) && - ! d->groups.tqcontains(name) ) + if ( d->mimeTypeInfo->supportedGroups().contains(name) && + ! d->groups.contains(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.tqfind(name); + TQMapIterator<TQString, KFileMetaInfoGroup> it = d->groups.find(name); if ( (it==d->groups.end()) || !((*it).attributes() & KFileMimeTypeInfo::Removable)) return false; @@ -595,20 +595,20 @@ TQString KFileMetaInfo::mimeType() const return d->mimeTypeInfo->mimeType(); } -bool KFileMetaInfo::tqcontains(const TQString& key) const +bool KFileMetaInfo::contains(const TQString& key) const { TQStringList glist = groups(); for (TQStringList::Iterator it = glist.begin(); it != glist.end(); ++it) { KFileMetaInfoGroup g = d->groups[*it]; - if (g.tqcontains(key)) return true; + if (g.contains(key)) return true; } return false; } -bool KFileMetaInfo::tqcontainsGroup(const TQString& key) const +bool KFileMetaInfo::containsGroup(const TQString& key) const { - return groups().tqcontains(key); + return groups().contains(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.tqfind( preferredGroup ); + d->groups.find( 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().tqcontains( key ) ) { + if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) { if ( addGroup( preferredGroup ) ) - it = d->groups.tqfind( preferredGroup ); + it = d->groups.find( preferredGroup ); } } @@ -668,11 +668,11 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, TQStringList::ConstIterator groupIt = groups.begin(); for ( ; groupIt != groups.end(); ++groupIt ) { - TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.tqfind( *groupIt ); + TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.find( *groupIt ); if ( it != d->groups.end() ) { KFileMetaInfoGroup group = it.data(); - item = tqfindEditableItem( group, key ); + item = findEditableItem( group, key ); if ( item.isValid() ) return item; } @@ -680,7 +680,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, { const KFileMimeTypeInfo::GroupInfo *groupInfo = d->mimeTypeInfo->groupInfo( *groupIt ); - if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) ) + if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) { if ( addGroup( *groupIt ) ) { @@ -700,7 +700,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, return item; } -KFileMetaInfoItem KFileMetaInfo::tqfindEditableItem( KFileMetaInfoGroup& group, +KFileMetaInfoItem KFileMetaInfo::findEditableItem( KFileMetaInfoGroup& group, const TQString& key ) { assert(isValid()); @@ -717,8 +717,8 @@ KFileMetaInfoItem KFileMetaInfo::tqfindEditableItem( KFileMetaInfoGroup& group, KFileMetaInfoGroup KFileMetaInfo::appendGroup(const TQString& name) { assert(isValid()); - if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) && - ! d->groups.tqcontains(name) ) + if ( d->mimeTypeInfo->supportedGroups().contains(name) && + ! d->groups.contains(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::tqfromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol); + query = TQString::fromLatin1( "[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 @@ -986,7 +986,7 @@ KFilePlugin* KFileMetaInfoProvider::loadAndRegisterPlugin( const TQString& mimeT first = false; } // Hopefully the above includes the mimetype we asked for! - if ( m_pendingMimetypeInfos.tqfind( mimeType ) == 0 ) + if ( m_pendingMimetypeInfos.find( 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.tqfind( protocol ); + CachedPluginInfo *cache = m_plugins.find( protocol ); if ( cache && cache->plugin ) { return cache->plugin; } @@ -1014,7 +1014,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt } } - CachedPluginInfo *cache = m_plugins.tqfind( mimeType ); + CachedPluginInfo *cache = m_plugins.find( 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.tqfind( protocol ); + CachedPluginInfo *cache = m_plugins.find( protocol ); if ( cache && cache->mimeTypeInfo ) { return cache->mimeTypeInfo; } if ( !cache ) { loadAndRegisterPlugin( TQString::null, protocol ); - cache = m_plugins.tqfind( protocol ); + cache = m_plugins.find( protocol ); if ( cache && cache->mimeTypeInfo ) { return cache->mimeTypeInfo; } } } - CachedPluginInfo *cache = m_plugins.tqfind( mimeType ); + CachedPluginInfo *cache = m_plugins.find( mimeType ); if ( cache ) { return cache->mimeTypeInfo; } loadAndRegisterPlugin( mimeType, TQString::null ); - cache = m_plugins.tqfind( mimeType ); + cache = m_plugins.find( mimeType ); if ( cache ) { return cache->mimeTypeInfo; } @@ -1103,7 +1103,7 @@ KFileMimeTypeInfo * KFileMetaInfoProvider::addMimeTypeInfo( const TQString& mimeType ) { - KFileMimeTypeInfo *info = m_pendingMimetypeInfos.tqfind( mimeType ); + KFileMimeTypeInfo *info = m_pendingMimetypeInfos.find( 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.tqfind( *it2 ) == allMimeTypes.end() && + if ( allMimeTypes.find( *it2 ) == allMimeTypes.end() && *it2 != kfilePlugin ) // also in serviceTypes() allMimeTypes.append( *it2 ); } @@ -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.tqfind(*pref); + TQStringList::Iterator item = list.find(*pref); if ( item != list.end() ) { newlist.append( *item ); @@ -1243,7 +1243,7 @@ TQStringList KFileMetaInfoGroup::preferredKeys() const } } - // now the old list only tqcontains the non-preferred items, so we + // now the old list only contains the non-preferred items, so we // add the remaining ones to newlist newlist += list; @@ -1286,14 +1286,14 @@ bool KFileMetaInfoGroup::supportsVariableKeys() const return d->mimeTypeInfo->groupInfo(d->name)->supportsVariableKeys(); } -bool KFileMetaInfoGroup::tqcontains( const TQString& key ) const +bool KFileMetaInfoGroup::contains( const TQString& key ) const { - return d->items.tqcontains(key); + return d->items.contains(key); } KFileMetaInfoItem KFileMetaInfoGroup::item( const TQString& key) const { - TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.tqfind( key ); + TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.find( 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.tqfind( key ); + TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.find( 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.tqfind(key); + TQMapIterator<TQString, KFileMetaInfoItem> it = d->items.find(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.tqfind( group ); + return m_groups.find( 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.tqfind( *lit ) == keys.end() ) + if ( keys.find( *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.tqfind( key ); + ItemInfo* item = m_itemDict.find( 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 1fedc4c8c..d6a6e7e4c 100644 --- a/kio/kio/kfilemetainfo.h +++ b/kio/kio/kfilemetainfo.h @@ -105,7 +105,7 @@ public: * This enum exists so that you can specify units for items, which you * can usually use for integer items, so an application knows how to * display it (e.g. a time in seconds in a hh:mm:ss form). You can either - * use one of those units, or if you don't tqfind one that fits, you can + * use one of those units, or if you don't find one that fits, you can * add it yourself using a prefix and/or suffix. */ enum Unit { @@ -132,7 +132,7 @@ public: * @brief Information about a meta information group * * This is the class for one group of items of a KFileMimeTypeInfo. - * It tqcontains, among other things, the information about the group's name + * It contains, among other things, the information about the group's name * and a list of supported items. */ class KIO_EXPORT GroupInfo @@ -244,7 +244,7 @@ public: /** * This is the class for one item of a KFileMimeTypeInfo. - * It tqcontains every information about a KFileMetaInfoItem that this + * It contains every information about a KFileMetaInfoItem that this * item has in common for each file of a specific mimetype. **/ class KIO_EXPORT ItemInfo @@ -606,7 +606,7 @@ public: * KFileMetaInfo::applyChanges() , the change will be written to the * file. With this method, you can ask if this item is dirty. * - * @return true if the item tqcontains changes that have not yet been written + * @return true if the item contains changes that have not yet been written * back into the file. Removing or adding an item counts as such a change */ bool isModified() const; @@ -651,9 +651,9 @@ public: uint attributes() const; /** - * Return true if the item is valid, i.e. if it tqcontains data, false + * Return true if the item is valid, i.e. if it contains data, false * if it's invalid (created with the default constructor and not been - * assigned anything), or if KFileMetaInfoGroup::item() didn't tqfind + * assigned anything), or if KFileMetaInfoGroup::item() didn't find * your requested item). * * @return true if valid, false if invalid @@ -724,9 +724,9 @@ public: ~KFileMetaInfoGroup(); /** - * Returns true if the item is valid, i.e. if it tqcontains data, false + * Returns true if the item is valid, i.e. if it contains data, false * if it's invalid (created with the default constructor and not been - * assigned anything), or if KFileMetaInfoGroup::item() didn't tqfind + * assigned anything), or if KFileMetaInfoGroup::item() didn't find * your requested item). * * @return true if valid, false if invalid @@ -734,7 +734,7 @@ public: bool isValid() const; /** - * Returns false if the object tqcontains data, true if it's empty. An + * Returns false if the object contains data, true if it's empty. An * empty group is a group with no items (amazing, isn't it?). * * @return true if empty, false otherwise @@ -812,7 +812,7 @@ public: * * @return true if an item for this @p key exists. */ - bool tqcontains( const TQString& key ) const; + bool contains( const TQString& key ) const; /** * Returns a list of all keys. @@ -949,7 +949,7 @@ public: like comments or id3 tags */ ExtenedAttr = 0x10, /**< read filesystem based extended attributes if they are supported for the filesystem */ - Thumbnail = 0x20, /**< only read the file's thumbnail, if it tqcontains + Thumbnail = 0x20, /**< only read the file's thumbnail, if it contains one */ Preferred = 0x40, ///< get at least the preferred items Everything = 0xffff ///< read everything, even if it might take a while @@ -1164,7 +1164,7 @@ public: * @param key the key to check * @return whether an item for this @p key exists. */ - bool tqcontains( const TQString& key ) const; + bool contains( const TQString& key ) const; /** * Checks whether a group with the given @p key exists. @@ -1172,7 +1172,7 @@ public: * @param key the key to check * @return whether a group with this name exists. */ - bool tqcontainsGroup( const TQString& key ) const; + bool containsGroup( const TQString& key ) const; /** * Returns the value with the given @p key. @@ -1195,7 +1195,7 @@ public: bool isValid() const; /** - * Returns false if the object tqcontains data, true if it's empty. You'll + * Returns false if the object contains data, true if it's empty. You'll * get an empty object if no plugin for the file could be found. * * @return true if empty, false otherwise @@ -1242,7 +1242,7 @@ protected: Data* d; private: - KFileMetaInfoItem tqfindEditableItem( KFileMetaInfoGroup& group, + KFileMetaInfoItem findEditableItem( KFileMetaInfoGroup& group, const TQString& key ); void init( const KURL& url, @@ -1391,7 +1391,7 @@ private: * PreferredItems=Items,Size * @endcode **/ -class KIO_EXPORT KFilePlugin : public TQObject +class KIO_EXPORT KFilePlugin : public QObject { Q_OBJECT @@ -1639,11 +1639,11 @@ private: * @internal * Synchronous access to metadata of a local file. Usually, you don't want * to use this class for getting metainfo from a file. Use KFileMetaInfo - * directly. However, if you want to tqfind out if a specific mimetype is + * directly. However, if you want to find out if a specific mimetype is * supported and which groups and items are provided for it, you can ask * the KFileMetainfoProvider for it. **/ -class KIO_EXPORT KFileMetaInfoProvider: private TQObject +class KIO_EXPORT KFileMetaInfoProvider: private QObject { friend class KFilePlugin; diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp index e93cf37d4..1f6dca285 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::tqfromLatin1(FILESHARECONF),true); + KSimpleConfig config(TQString::fromLatin1(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().tqfindIndex(KUser()) > -1 ) + if (shareGroup.users().findIndex(KUser()) > -1 ) s_authorization = Authorized; else s_authorization = UserNotAllowed; @@ -220,10 +220,10 @@ int KFileShare::isDirectoryShared( const TQString& _path ) TQString path( _path ); if ( path[path.length()-1] != '/' ) path += '/'; - //return s_shareList && s_shareList->tqcontains( path ); - if( (*s_shareMap).tqcontains(path) && !((*s_shareMap)[path].isEmpty()) ) { + //return s_shareList && s_shareList->contains( path ); + if( (*s_shareMap).contains(path) && !((*s_shareMap)[path].isEmpty()) ) { ret+=1; - if( (*s_shareMap)[path].tqfind("readwrite") != -1 ) + if( (*s_shareMap)[path].find("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::tqfromLatin1(":/usr/sbin"); + TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::fromLatin1(":/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 a7158bf71..6fddebd65 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 TQObject +class KFileSharePrivate : public QObject { Q_OBJECT diff --git a/kio/kio/kfilterbase.cpp b/kio/kio/kfilterbase.cpp index 081a58587..50ff5498a 100644 --- a/kio/kio/kfilterbase.cpp +++ b/kio/kio/kfilterbase.cpp @@ -39,21 +39,21 @@ void KFilterBase::setDevice( TQIODevice * dev, bool autodelete ) m_bAutoDel = autodelete; } -KFilterBase * KFilterBase::tqfindFilterByFileName( const TQString & fileName ) +KFilterBase * KFilterBase::findFilterByFileName( const TQString & fileName ) { - KMimeType::Ptr mime = KMimeType::tqfindByPath( fileName ); - kdDebug(7005) << "KFilterBase::tqfindFilterByFileName mime=" << mime->name() << endl; - return tqfindFilterByMimeType(mime->name()); + KMimeType::Ptr mime = KMimeType::findByPath( fileName ); + kdDebug(7005) << "KFilterBase::findFilterByFileName mime=" << mime->name() << endl; + return findFilterByMimeType(mime->name()); } -KFilterBase * KFilterBase::tqfindFilterByMimeType( const TQString & mimeType ) +KFilterBase * KFilterBase::findFilterByMimeType( const TQString & mimeType ) { KTrader::OfferList offers = KTrader::self()->query( "KDECompressionFilter", TQString("'") + mimeType + "' in ServiceTypes" ); KTrader::OfferList::ConstIterator it = offers.begin(); KTrader::OfferList::ConstIterator end = offers.end(); - kdDebug(7005) << "KFilterBase::tqfindFilterByMimeType(" << mimeType << ") got " << offers.count() << " offers" << endl; + kdDebug(7005) << "KFilterBase::findFilterByMimeType(" << mimeType << ") got " << offers.count() << " offers" << endl; for (; it != end; ++it ) { if ((*it)->library().isEmpty()) { continue; } @@ -65,7 +65,7 @@ KFilterBase * KFilterBase::tqfindFilterByMimeType( const TQString & mimeType ) } if ( mimeType == "application/x-bzip2" || mimeType == "application/x-gzip" ) // #88574 - kdWarning(7005) << "KFilterBase::tqfindFilterByMimeType : no filter found for " << mimeType << endl; + kdWarning(7005) << "KFilterBase::findFilterByMimeType : no filter found for " << mimeType << endl; return 0L; } diff --git a/kio/kio/kfilterbase.h b/kio/kio/kfilterbase.h index 32b96e2ad..b46706241 100644 --- a/kio/kio/kfilterbase.h +++ b/kio/kio/kfilterbase.h @@ -94,7 +94,7 @@ public: * @param fileName the name of the file to filter * @return the filter for the @p fileName, or 0 if not found */ - static KFilterBase * tqfindFilterByFileName( const TQString & fileName ); + static KFilterBase * findFilterByFileName( const TQString & fileName ); /** * Call this to create the appropriate filter for the mimetype @@ -102,7 +102,7 @@ public: * @param mimeType the mime type of the file to filter * @return the filter for the @p mimeType, or 0 if not found */ - static KFilterBase * tqfindFilterByMimeType( const TQString & mimeType ); + static KFilterBase * findFilterByMimeType( const TQString & mimeType ); protected: TQIODevice * m_dev; diff --git a/kio/kio/kfilterdev.cpp b/kio/kio/kfilterdev.cpp index 3a177385d..224d68761 100644 --- a/kio/kio/kfilterdev.cpp +++ b/kio/kio/kfilterdev.cpp @@ -82,8 +82,8 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin bool forceFilter ) { TQFile * f = new TQFile( fileName ); - KFilterBase * base = mimetype.isEmpty() ? KFilterBase::tqfindFilterByFileName( fileName ) - : KFilterBase::tqfindFilterByMimeType( mimetype ); + KFilterBase * base = mimetype.isEmpty() ? KFilterBase::findFilterByFileName( fileName ) + : KFilterBase::findFilterByMimeType( mimetype ); if ( base ) { base->setDevice(f, true); @@ -107,7 +107,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype { if (inDevice==0) return 0; - KFilterBase * base = KFilterBase::tqfindFilterByMimeType(mimetype); + KFilterBase * base = KFilterBase::findFilterByMimeType(mimetype); if ( base ) { base->setDevice(inDevice, autoDeleteInDevice); @@ -232,7 +232,7 @@ bool KFilterDev::atEnd() const && d->ungetchBuffer.isEmpty(); } -TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) +Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) { Q_ASSERT ( filter->mode() == IO_ReadOnly ); //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl; @@ -268,7 +268,7 @@ TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) return -1; - TQ_ULONG outBufferSize; + Q_ULONG outBufferSize; if ( d->bIgnoreData ) { outBufferSize = QMIN( maxlen, 3*BUFFER_SIZE ); @@ -278,7 +278,7 @@ TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) outBufferSize = maxlen; } outBufferSize -= dataReceived; - TQ_ULONG availOut = outBufferSize; + Q_ULONG availOut = outBufferSize; filter->setOutBuffer( data, outBufferSize ); bool decompressedAll = false; @@ -351,7 +351,7 @@ TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) return dataReceived; } -TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len ) +Q_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, Q_ULONG len ) { Q_ASSERT ( filter->mode() == IO_WriteOnly ); // If we had an error, return 0. diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h index 6ee9314be..d36229859 100644 --- a/kio/kio/kfilterdev.h +++ b/kio/kio/kfilterdev.h @@ -87,8 +87,8 @@ public: virtual bool atEnd() const; - virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); - virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ); + virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ); + virtual Q_LONG writeBlock( const char *data, Q_ULONG len ); //int readLine( char *data, uint maxlen ); virtual int getch(); @@ -119,14 +119,14 @@ public: * * Warning: application/x-bzip2 may not be available. * In that case a TQFile opened on the compressed data will be returned ! - * Use KFilterBase::tqfindFilterByMimeType and code similar to what + * Use KFilterBase::findFilterByMimeType and code similar to what * deviceForFile is doing, to better control what's happening. * * The returned TQIODevice has to be deleted after using. * * @param fileName the name of the file to filter * @param mimetype the mime type of the file to filter, or TQString::null if unknown - * @param forceFilter if true, the function will either tqfind a compression filter, or return 0. + * @param forceFilter if true, the function will either find a compression filter, or return 0. * If false, it will always return a TQIODevice. If no * filter is available it will return a simple TQFile. * This can be useful if the file is usable without a filter. diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp index a26f25596..8d4a45db4 100644 --- a/kio/kio/kimageio.cpp +++ b/kio/kio/kimageio.cpp @@ -68,7 +68,7 @@ KImageIOFormat::~KImageIOFormat() void KImageIOFormat::load( TQDataStream& _str) { - TQ_INT8 iRead, iWrite; + Q_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 ); - TQ_INT8 iRead = bRead ? 1 : 0; - TQ_INT8 iWrite = bWrite ? 1 : 0; + Q_INT8 iRead = bRead ? 1 : 0; + Q_INT8 iWrite = bWrite ? 1 : 0; _str << mType << mHeader << mFlags << iRead << iWrite << mSuffices << mMimetype << mLib << mPattern << rPaths; @@ -124,7 +124,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) if (func == NULL) { iio->setStatus(1); // error - kdWarning() << "couln't tqfind " << funcName << " (" << lt_dlerror() << ")" << endl; + kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl; } mReadFunc = (void (*)(TQImageIO *))func; } @@ -135,7 +135,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) if (func == NULL) { iio->setStatus(1); // error - kdWarning() << "couln't tqfind " << funcName << " (" << lt_dlerror() << ")" << endl; + kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl; } mWriteFunc = (void (*)(TQImageIO *))func; } @@ -232,7 +232,7 @@ KImageIOFactory::createPattern( KImageIO::Mode _mode) patterns.sort(); patterns.prepend(allPatterns); - TQString pattern = patterns.join(TQString::tqfromLatin1("\n")); + TQString pattern = patterns.join(TQString::fromLatin1("\n")); return pattern; } @@ -489,7 +489,7 @@ TQString KImageIO::type(const TQString& filename) { KImageIOFormatList *formatList = KImageIOFactory::self()->formatList; TQString suffix = filename; - int dot = suffix.tqfindRev('.'); + int dot = suffix.findRev('.'); 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.tqcontains(suffix)) + if (format->mSuffices.contains(suffix)) return format->mType; } } diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h index 6b777129a..035a3cd15 100644 --- a/kio/kio/klimitediodevice.h +++ b/kio/kio/klimitediodevice.h @@ -69,12 +69,12 @@ public: virtual Offset size() const { return m_length; } - virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen ) + virtual Q_LONG readBlock ( char * data, Q_ULONG maxlen ) { maxlen = QMIN( maxlen, m_length - at() ); // Apply upper limit return m_dev->readBlock( data, maxlen ); } - virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported + virtual Q_LONG writeBlock ( const char *, Q_ULONG ) { return -1; } // unsupported virtual int putch( int ) { return -1; } // unsupported virtual int getch() { @@ -94,8 +94,8 @@ public: virtual bool atEnd() const { return m_dev->atEnd() || m_dev->at() >= m_start + m_length; } private: TQIODevice* m_dev; - TQ_ULONG m_start; - TQ_ULONG m_length; + Q_ULONG m_start; + Q_ULONG m_length; }; #endif diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index 4aed63808..72b249249 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -141,10 +141,10 @@ struct magic { #define LELONG 11 #define LEDATE 12 VALUETYPE value; /* either number or string */ - unsigned long tqmask; /* tqmask before comparison with value */ + unsigned long mask; /* mask before comparison with value */ char nospflag; /* suppress space character */ - /* NOTE: this string is suspected of overrunning - tqfind it! */ + /* NOTE: this string is suspected of overrunning - find it! */ char desc[MAXDESC]; /* description */ }; @@ -525,7 +525,7 @@ class KMimeMagicUtimeConf public: KMimeMagicUtimeConf() { - tmpDirs << TQString::tqfromLatin1("/tmp"); // default value + tmpDirs << TQString::fromLatin1("/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.tqfindRev( '/' ) ); - bool res = tmpDirs.tqcontains( dir ); + TQString dir = file.left( file.findRev( '/' ) ); + bool res = tmpDirs.contains( dir ); //kdDebug(7018) << "restoreAccessTime " << file << " dir=" << dir << " result=" << res << endl; return res; } @@ -909,9 +909,9 @@ int KMimeMagic::parse(char *l, int /* New-style anding: "0 byte&0x80 =0x80 dynamically linked" */ if (*l == '&') { ++l; - m->tqmask = signextend(m, strtol(l, &l, 0)); + m->mask = signextend(m, strtol(l, &l, 0)); } else - m->tqmask = (unsigned long) ~0L; + m->mask = (unsigned long) ~0L; EATAB; switch (*l) { @@ -1297,7 +1297,7 @@ mcheck(union VALUETYPE *p, struct magic *m) #if 0 qDebug("Before signextend %08x", v); #endif - v = signextend(m, v) & m->tqmask; + v = signextend(m, v) & m->mask; #if 0 qDebug("After signextend %08x", v); #endif @@ -1550,7 +1550,7 @@ fsmagic(struct config_rec* conf, const char *fn, KDE_struct_stat *sb) } /* - * Go through the whole list, stopping if you tqfind a match. Process all the + * Go through the whole list, stopping if you find a match. Process all the * continuations of that match before returning. * * We support multi-level continuations: @@ -2214,7 +2214,7 @@ KMimeMagic::setFollowLinks( bool _enable ) } KMimeMagicResult * -KMimeMagic::tqfindBufferType(const TQByteArray &array) +KMimeMagic::findBufferType(const TQByteArray &array) { unsigned char buf[HOWMANY + 1]; /* one extra for terminating '\0' */ @@ -2261,7 +2261,7 @@ refineResult(KMimeMagicResult *r, const TQString & _filename) if ( _filename.endsWith(".h") || _filename.endsWith(".hh") || _filename.endsWith(".H") - || !_filename.right(4).tqcontains('.')) + || !_filename.right(4).contains('.')) tmp += "hdr"; else tmp += "src"; @@ -2270,7 +2270,7 @@ refineResult(KMimeMagicResult *r, const TQString & _filename) else if ( tmp == "application/x-sharedlib" ) { - if ( _filename.tqfind( ".so" ) == -1 ) + if ( _filename.find( ".so" ) == -1 ) { tmp = "application/x-executable"; r->setMimeType( tmp ); @@ -2279,10 +2279,10 @@ refineResult(KMimeMagicResult *r, const TQString & _filename) } KMimeMagicResult * -KMimeMagic::tqfindBufferFileType( const TQByteArray &data, +KMimeMagic::findBufferFileType( const TQByteArray &data, const TQString &fn) { - KMimeMagicResult * r = tqfindBufferType( data ); + KMimeMagicResult * r = findBufferType( data ); refineResult(r, fn); return r; } @@ -2290,10 +2290,10 @@ KMimeMagic::tqfindBufferFileType( const TQByteArray &data, /* * Find the content-type of the given file. */ -KMimeMagicResult* KMimeMagic::tqfindFileType(const TQString & fn) +KMimeMagicResult* KMimeMagic::findFileType(const TQString & fn) { #ifdef DEBUG_MIMEMAGIC - kdDebug(7018) << "KMimeMagic::tqfindFileType " << fn << endl; + kdDebug(7018) << "KMimeMagic::findFileType " << fn << endl; #endif conf->resultBuf = TQString::null; diff --git a/kio/kio/kmimemagic.h b/kio/kio/kmimemagic.h index 8a10be2cd..d73dd306a 100644 --- a/kio/kio/kmimemagic.h +++ b/kio/kio/kmimemagic.h @@ -36,11 +36,11 @@ class KMimeMagic; // see below (read this one first) /** - * @deprecated Use KMimeType::tqfindByContent() instead + * @deprecated Use KMimeType::findByContent() instead * May be removed in KDE 4.0. - * Returned by KMimeMagic @p tqfind...Type methods. + * Returned by KMimeMagic @p find...Type methods. * - * It tqcontains the mimetype and the encoding of + * It contains the mimetype and the encoding of * the file or buffer read. */ class KIO_EXPORT_DEPRECATED KMimeMagicResult @@ -75,7 +75,7 @@ protected: }; /** - * @deprecated Use KMimeType::tqfindByContent() instead + * @deprecated Use KMimeType::findByContent() instead * May be removed in KDE 4.0. * Determine auto-magically the type of file, * not only by using its extension, but also by reading its contents. @@ -94,7 +94,7 @@ protected: * The basic usage of KMimeMagic is : * @li Get a pointer to it, using KMimeMagic::self(). * @li Use it for any file or buffer you want, using one of the three - * @p tqfind...Type() methods. + * @p find...Type() methods. * * The result is contained in the class KMimeMagicResult. */ @@ -142,7 +142,7 @@ public: void setFollowLinks( bool _enable ); /** - * Try to tqfind a MimeType for the given file. + * Try to find a MimeType for the given file. * * If no special * MimeType is found, the default MimeType is returned. @@ -153,7 +153,7 @@ public: * the returned result object changes its value * since it is reused by KMimeMagic. */ - KMimeMagicResult* tqfindFileType( const TQString & _filename ); + KMimeMagicResult* findFileType( const TQString & _filename ); /** * Same functionality as above, except data is not @@ -167,10 +167,10 @@ public: * the returned result object changes its value * since it is reused by KMimeMagic. */ - KMimeMagicResult* tqfindBufferType( const TQByteArray &p ); + KMimeMagicResult* findBufferType( const TQByteArray &p ); /** - * Same functionality as tqfindBufferType() but with + * Same functionality as findBufferType() but with * additional capability of distinguishing between * C-headers and C-Source. * @@ -183,7 +183,7 @@ public: * the returned result object changes its value * since it is reused by KMimeMagic. */ - KMimeMagicResult * tqfindBufferFileType( const TQByteArray &, const TQString & filename ); + KMimeMagicResult * findBufferFileType( const TQByteArray &, const TQString & filename ); /** * Returns a pointer to the unique KMimeMagic instance in this process. diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index 1e74f90de..a698e7495 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -68,9 +68,9 @@ bool KMimeType::s_bChecked = false; void KMimeType::buildDefaultType() { assert ( !s_pDefaultType ); - // Try to tqfind the default type + // Try to find the default type KServiceType * mime = KServiceTypeFactory::self()-> - tqfindServiceTypeByName( defaultMimeType() ); + findServiceTypeByName( defaultMimeType() ); if (mime && mime->isType( KST_KMimeType )) { @@ -133,18 +133,18 @@ void KMimeType::checkEssentialMimeTypes() void KMimeType::errorMissingMimeType( const TQString& _type ) { - TQString tmp = i18n( "Could not tqfind mime type\n%1" ).arg( _type ); + TQString tmp = i18n( "Could not find mime type\n%1" ).arg( _type ); KMessageBoxWrapper::sorry( 0, tmp ); } KMimeType::Ptr KMimeType::mimeType( const TQString& _name ) { - KServiceType * mime = KServiceTypeFactory::self()->tqfindServiceTypeByName( _name ); + KServiceType * mime = KServiceTypeFactory::self()->findServiceTypeByName( _name ); if ( !mime || !mime->isType( KST_KMimeType ) ) { - // When building ksycoca, tqfindServiceTypeByName doesn't create an object + // When building ksycoca, findServiceTypeByName doesn't create an object // but returns one from a dict. if ( !KSycoca::self()->isBuilding() ) delete mime; @@ -207,8 +207,8 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, static const TQString& slash = KGlobal::staticQString("/"); if ( ! fileName.isNull() && !path.endsWith( slash ) ) { - // Try to tqfind it out by looking at the filename - KMimeType::Ptr mime = KServiceTypeFactory::self()->tqfindFromPattern( fileName ); + // Try to find it out by looking at the filename + KMimeType::Ptr mime = KServiceTypeFactory::self()->findFromPattern( fileName ); if ( mime ) { // Found something - can we trust it ? (e.g. don't trust *.pl over HTTP, could be anything) @@ -219,7 +219,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, if ( mime->patternsAccuracy()<100 ) { KMimeMagicResult* result = - KMimeMagic::self()->tqfindFileType( path ); + KMimeMagic::self()->findFileType( path ); if ( result && result->isValid() && result->accuracy() > 0 ) return mimeType( result->mimeType() ); @@ -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::tqfromLatin1("inode/directory") ); + return mimeType( TQString::fromLatin1("inode/directory") ); else return defaultMimeTypePtr(); // == 'no idea', e.g. for "data:,foo/" } @@ -276,10 +276,10 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, } // Do some magic for local files - //kdDebug(7009) << TQString("Mime Type tqfinding for '%1'").arg(path) << endl; - KMimeMagicResult* result = KMimeMagic::self()->tqfindFileType( path ); + //kdDebug(7009) << TQString("Mime Type finding for '%1'").arg(path) << endl; + KMimeMagicResult* result = KMimeMagic::self()->findFileType( path ); - // If we still did not tqfind it, we must assume the default mime type + // If we still did not find it, we must assume the default mime type if ( !result || !result->isValid() ) return defaultMimeTypePtr(); @@ -298,27 +298,27 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, KMimeType::Ptr KMimeType::diagnoseFileName(const TQString &fileName, TQString &pattern) { - return KServiceTypeFactory::self()->tqfindFromPattern( fileName, &pattern ); + return KServiceTypeFactory::self()->findFromPattern( fileName, &pattern ); } -KMimeType::Ptr KMimeType::tqfindByPath( const TQString& path, mode_t mode, bool fast_mode ) +KMimeType::Ptr KMimeType::findByPath( const TQString& path, mode_t mode, bool fast_mode ) { KURL u; u.setPath(path); return findByURL( u, mode, true, fast_mode ); } -KMimeType::Ptr KMimeType::tqfindByContent( const TQByteArray &data, int *accuracy ) +KMimeType::Ptr KMimeType::findByContent( const TQByteArray &data, int *accuracy ) { - KMimeMagicResult *result = KMimeMagic::self()->tqfindBufferType(data); + KMimeMagicResult *result = KMimeMagic::self()->findBufferType(data); if (accuracy) *accuracy = result->accuracy(); return mimeType( result->mimeType() ); } -KMimeType::Ptr KMimeType::tqfindByFileContent( const TQString &fileName, int *accuracy ) +KMimeType::Ptr KMimeType::findByFileContent( const TQString &fileName, int *accuracy ) { - KMimeMagicResult *result = KMimeMagic::self()->tqfindFileType(fileName); + KMimeMagicResult *result = KMimeMagic::self()->findFileType(fileName); if (accuracy) *accuracy = result->accuracy(); return mimeType( result->mimeType() ); @@ -327,11 +327,11 @@ KMimeType::Ptr KMimeType::tqfindByFileContent( const TQString &fileName, int *ac #define GZIP_MAGIC1 0x1f #define GZIP_MAGIC2 0x8b -KMimeType::Format KMimeType::tqfindFormatByFileContent( const TQString &fileName ) +KMimeType::Format KMimeType::findFormatByFileContent( const TQString &fileName ) { KMimeType::Format result; result.compression = Format::NoCompression; - KMimeType::Ptr mime = tqfindByPath(fileName); + KMimeType::Ptr mime = findByPath(fileName); result.text = mime->name().startsWith("text/"); TQVariant v = mime->property("X-KDE-text"); @@ -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::tqfromLatin1("X-KDE-AutoEmbed"); + TQString XKDEAutoEmbed = TQString::fromLatin1("X-KDE-AutoEmbed"); if ( config->hasKey( XKDEAutoEmbed ) ) m_mapProps.insert( XKDEAutoEmbed, TQVariant( config->readBoolEntry( XKDEAutoEmbed ), 0 ) ); - TQString XKDEText = TQString::tqfromLatin1("X-KDE-text"); + TQString XKDEText = TQString::fromLatin1("X-KDE-text"); if ( config->hasKey( XKDEText ) ) m_mapProps.insert( XKDEText, config->readBoolEntry( XKDEText ) ); - TQString XKDEIsAlso = TQString::tqfromLatin1("X-KDE-IsAlso"); + TQString XKDEIsAlso = TQString::fromLatin1("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::tqfromLatin1("X-KDE-PatternsAccuracy"); + TQString XKDEPatternsAccuracy = TQString::fromLatin1("X-KDE-PatternsAccuracy"); if ( config->hasKey( XKDEPatternsAccuracy ) ) m_mapProps.insert( XKDEPatternsAccuracy, config->readEntry( XKDEPatternsAccuracy ) ); @@ -508,7 +508,7 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode ) const TQString mimeTypeIcon = mt->icon( _url, _url.isLocalFile() ); TQString i = mimeTypeIcon; - // if we don't tqfind an icon, maybe we can use the one for the protocol + // if we don't find an icon, maybe we can use the one for the protocol if ( i == unknown || i.isEmpty() || mt == defaultMimeTypePtr() // and for the root of the protocol (e.g. trash:/) the protocol icon has priority over the mimetype icon || _url.path().length() <= 1 ) @@ -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.tqfind( "." ) != entries.end() && - entries.tqfind( ".." ) != entries.end() && - entries.tqfind( ".directory" ) != entries.end(); + isempty = entries.find( "." ) != entries.end() && + entries.find( ".." ) != entries.end() && + entries.find( ".directory" ) != entries.end(); } } if (!isempty && !strcmp(ep->d_name, ".directory")) @@ -728,10 +728,10 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const const TQString u = cfg.readPathEntry( "URL" ); const KURL url( u ); if ( url.protocol() == "trash" ) { - // We need to tqfind if the trash is empty, preferrably without using a KIO job. + // We need to find if the trash is empty, preferrably without using a KIO job. // So instead kio_trash leaves an entry in its config file for us. KSimpleConfig trashConfig( "trashrc", true ); - trashConfig.setGroup( "tqStatus" ); + trashConfig.setGroup( "Status" ); if ( trashConfig.readBoolEntry( "Empty", true ) ) { return emptyIcon; } @@ -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::tqfromLatin1("inode/directory") ); + retval = KRun::runURL( mpURL, TQString::fromLatin1("inode/directory") ); } else { @@ -1005,7 +1005,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices TQCString object = dcopcall.section(' ', 1,-2).utf8(); TQString function = dcopcall.section(' ', -1); if(!function.endsWith("(KURL::List)")) { - kdWarning() << "Desktop file " << path << " tqcontains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl; + 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 { if(kapp->dcopClient()->call( app, object, function.utf8(), @@ -1051,7 +1051,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices else { TQString exec = cfg.readPathEntry( "Exec" ); - if ( bLocalFiles || exec.tqcontains("%U") || exec.tqcontains("%u") ) + if ( bLocalFiles || exec.contains("%U") || exec.contains("%u") ) { Service s; s.m_strName = cfg.readEntry( "Name" ); diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h index 131724d63..22f9b72ef 100644 --- a/kio/kio/kmimetype.h +++ b/kio/kio/kmimetype.h @@ -39,7 +39,7 @@ class KSimpleConfig; * * The starting point you need is often the static methods. * - * KMimeType inherits KServiceType because "text/plain" can be used to tqfind + * KMimeType inherits KServiceType because "text/plain" can be used to find * services (apps and components) "which can open text/plain". * * @see KServiceType @@ -113,7 +113,7 @@ public: * Use this function only if you don't have a special URL * for which you search a pixmap. * - * This function is useful to tqfind + * This function is useful to find * out, which icon is usually chosen for a certain mime type. Since * no URL is passed, it is impossible to obey icon hints in desktop * entries for example. @@ -149,7 +149,7 @@ public: int _state = 0, TQString * _path = 0L ) const; /** - * Convenience method to tqfind the pixmap for a URL. + * Convenience method to find the pixmap for a URL. * * Call this one when you don't know the mimetype. * @@ -282,7 +282,7 @@ public: * "application/octet-stream" is returned otherwise. * * @param _url Is the right most URL with a filesystem protocol. It - * is up to you to tqfind out about that if you have a nested + * is up to you to find out about that if you have a nested * URL. For example * "http://localhost/mist.gz#gzip:/decompress" would have to * pass the "http://..." URL part, while @@ -293,7 +293,7 @@ public: * executables) * @param _is_local_file true if the file is local * @param _fast_mode If set to true no disk access is allowed to - * tqfind out the mimetype. The result may be suboptimal, but + * find out the mimetype. The result may be suboptimal, but * it is @em fast. * @return A pointer to the matching mimetype. 0L is never returned. * @em Very @em Important: Don't store the result in a KMimeType* ! @@ -326,14 +326,14 @@ public: * @param mode the mode of the file (used, for example, to identify * executables) * @param fast_mode If set to true no disk access is allowed to - * tqfind out the mimetype. The result may be suboptimal, but + * find out the mimetype. The result may be suboptimal, but * it is @em fast. * @return A pointer to the matching mimetype. 0L is never returned. */ - static Ptr tqfindByPath( const TQString& path, mode_t mode = 0, bool fast_mode = false ); + static Ptr findByPath( const TQString& path, mode_t mode = 0, bool fast_mode = false ); /** - * Tries to tqfind out the MIME type of a data chunk by looking for + * Tries to find out the MIME type of a data chunk by looking for * certain magic numbers and characteristic strings in it. * * @param data the data to examine @@ -342,10 +342,10 @@ public: * @return a pointer to the KMimeType. application/octet-stream's KMimeType of the * type can not be found this way. */ - static Ptr tqfindByContent( const TQByteArray &data, int *accuracy=0 ); + static Ptr findByContent( const TQByteArray &data, int *accuracy=0 ); /** - * Tries to tqfind out the MIME type of a file by looking for + * Tries to find out the MIME type of a file by looking for * certain magic numbers and characteristic strings in it. * This function is similar to the previous one. Note that the * file name is not used for determining the file type, it is just @@ -357,7 +357,7 @@ public: * @return a pointer to the KMimeType. application/octet-stream's KMimeType of the * type can not be found this way. */ - static Ptr tqfindByFileContent( const TQString &fileName, int *accuracy=0 ); + static Ptr findByFileContent( const TQString &fileName, int *accuracy=0 ); struct Format{ bool text : 1; @@ -370,7 +370,7 @@ public: * or that would be human readable after decompression. * @since 3.2 */ - static Format tqfindFormatByFileContent( const TQString &fileName ); + static Format findFormatByFileContent( const TQString &fileName ); /** * Get all the mimetypes. diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 763e2bfc5..d8ceb930b 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -90,7 +90,7 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text, if (visuals & KMimeTypeChooser::EditButton) { TQHBox *btns = new TQHBox( this ); - ((TQBoxLayout*)btns->tqlayout())->addStretch(1); + ((TQBoxLayout*)btns->layout())->addStretch(1); d->btnEditMimeType = new TQPushButton( i18n("&Edit..."), btns ); connect( d->btnEditMimeType, TQT_SIGNAL(clicked()), this, TQT_SLOT(editMimeType()) ); @@ -134,15 +134,15 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) for (; it != mimetypes.end(); ++it) { TQString mimetype = (*it)->name(); - int index = mimetype.tqfind("/"); + int index = mimetype.find("/"); TQString maj = mimetype.left(index); - if ( d->groups.count() && !d->groups.tqcontains( maj ) ) + if ( d->groups.count() && !d->groups.contains( maj ) ) continue; TQString min = mimetype.right(mimetype.length() - (index+1)); - TQMapIterator<TQString,TQListViewItem*> mit = groups.tqfind( maj ); + TQMapIterator<TQString,TQListViewItem*> mit = groups.find( 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.tqcontains(mimetype) ) + if ( selMimeTypes.contains(mimetype) ) { item->setOn( true ); groupItem->setOpen( true ); @@ -195,9 +195,9 @@ void KMimeTypeChooser::editMimeType() // thanks to libkonq/konq_operations.cc connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()), this, TQT_SLOT(slotSycocaDatabaseChanged()) ); - TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); + TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype - + " --parent " + TQString::number( (ulong)tqtopLevelWidget()->winId()) + + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) + " " + KProcess::quote(mt), keditfiletype, keditfiletype /*unused*/); } @@ -294,5 +294,5 @@ KMimeTypeChooserDialog::~KMimeTypeChooserDialog() //END KMimeTypeChooserDialog -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; #include "kmimetypechooser.moc" diff --git a/kio/kio/kmimetypechooser.h b/kio/kio/kmimetypechooser.h index 45d35446f..0827d5b30 100644 --- a/kio/kio/kmimetypechooser.h +++ b/kio/kio/kmimetypechooser.h @@ -177,4 +177,4 @@ class KIO_EXPORT KMimeTypeChooserDialog : public KDialogBase KMimeTypeChooser *m_chooser; }; #endif // _KMIMETYPE_CHOOSER_H_ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kio/kio/kmimetyperesolver.h b/kio/kio/kmimetyperesolver.h index ea332dc32..4ac6347f2 100644 --- a/kio/kio/kmimetyperesolver.h +++ b/kio/kio/kmimetyperesolver.h @@ -42,11 +42,11 @@ protected: /** * @internal - * This class is used by KMimeTypeResolver, because it can't be a TQObject + * This class is used by KMimeTypeResolver, because it can't be a QObject * 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 TQObject +class KIO_EXPORT KMimeTypeResolverHelper : public QObject { Q_OBJECT @@ -168,7 +168,7 @@ private: * (no more visible icon to process). * @return the file item that was just processed. */ - IconItem * tqfindVisibleIcon(); + IconItem * findVisibleIcon(); Parent * m_parent; KMimeTypeResolverHelper *m_helper; @@ -186,10 +186,10 @@ inline void KMimeTypeResolver<IconItem, Parent>::slotProcessMimeIcons() if ( m_lstPendingMimeIconItems.count() > 0 ) { - // We only tqfind mimetypes for icons that are visible. When more + // We only find mimetypes for icons that are visible. When more // of our viewport is exposed, we'll get a signal and then get // the mimetypes for the newly visible icons. (Rikkus) - item = tqfindVisibleIcon(); + item = findVisibleIcon(); } // No more visible items. @@ -217,7 +217,7 @@ template<class IconItem, class Parent> inline void KMimeTypeResolver<IconItem, Parent>::slotViewportAdjusted() { if (m_lstPendingMimeIconItems.isEmpty()) return; - IconItem * item = tqfindVisibleIcon(); + IconItem * item = findVisibleIcon(); if (item) { m_parent->determineIcon( item ); @@ -227,7 +227,7 @@ inline void KMimeTypeResolver<IconItem, Parent>::slotViewportAdjusted() } template<class IconItem, class Parent> -inline IconItem * KMimeTypeResolver<IconItem, Parent>::tqfindVisibleIcon() +inline IconItem * KMimeTypeResolver<IconItem, Parent>::findVisibleIcon() { // Find an icon that's visible and whose mimetype we don't know. diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp index 861176c94..f0fdfce6d 100644 --- a/kio/kio/knfsshare.cpp +++ b/kio/kio/knfsshare.cpp @@ -33,7 +33,7 @@ public: KNFSSharePrivate(); bool readExportsFile(); - bool tqfindExportsFile(); + bool findExportsFile(); TQDict<bool> sharedPaths; TQString exportsFile; @@ -41,17 +41,17 @@ public: KNFSSharePrivate::KNFSSharePrivate() { - if (tqfindExportsFile()) + if (findExportsFile()) readExportsFile(); } /** - * Try to tqfind the nfs config file path + * Try to find the nfs config file path * First tries the kconfig, then checks * several well-known paths * @return wether an 'exports' file was found. **/ -bool KNFSSharePrivate::tqfindExportsFile() { +bool KNFSSharePrivate::findExportsFile() { KConfig config("knfsshare"); config.setGroup("General"); exportsFile = config.readPathEntry("exportsFile"); @@ -123,7 +123,7 @@ bool KNFSSharePrivate::readExportsFile() { // Handle quotation marks if ( completeLine[0] == '"' ) { - int i = completeLine.tqfind('"',1); + int i = completeLine.find('"',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.tqfind(' '); + int i = completeLine.find(' '); if (i == -1) - i = completeLine.tqfind('\t'); + i = completeLine.find('\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.tqfind(fixedPath) != 0; + return d->sharedPaths.find(fixedPath) != 0; } TQStringList KNFSShare::sharedDirectories() const { diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp index 416a365f2..01e3e6c18 100644 --- a/kio/kio/kprotocolinfo.cpp +++ b/kio/kio/kprotocolinfo.cpp @@ -27,7 +27,7 @@ #include "kprotocolmanager.h" // Most of this class is implemented in kdecore/kprotocolinfo_kdecore.cpp -// This file only tqcontains a few static class-functions that depend on +// This file only contains a few static class-functions that depend on // KProtocolManager KProtocolInfo* KProtocolInfo::findProtocol(const KURL &url) diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h index f297028a0..dba4694db 100644 --- a/kio/kio/kprotocolinfo.h +++ b/kio/kio/kprotocolinfo.h @@ -31,7 +31,7 @@ * Information about I/O (Internet, etc.) protocols supported by KDE. * This class is useful if you want to know which protocols - * KDE supports. In addition you can tqfind out lots of information + * KDE supports. In addition you can find out lots of information * about a certain protocol. A KProtocolInfo instance represents a * single protocol. Most of the functionality is provided by the static * methods that scan the *.protocol files of all installed kioslaves to get @@ -545,7 +545,7 @@ public: * The following parsing modes are defined: * @li "url" for a standards compliant URL * @li "rawuri" for a non-conformant URI for which URL parsing would be meaningless - * @li "mailto" for a mailto style URI (the path part tqcontains only an email address) + * @li "mailto" for a mailto style URI (the path part contains only an email address) * * @param protocol the protocol to check * @return the suggested parsing mode, or KURL::Auto if unspecified diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index 3b4206ddd..8fb8b3227 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -277,7 +277,7 @@ TQString KProtocolManager::proxyForURL( const KURL &url ) break; } - return (proxy.isEmpty() ? TQString::tqfromLatin1("DIRECT") : proxy); + return (proxy.isEmpty() ? TQString::fromLatin1("DIRECT") : proxy); } void KProtocolManager::badProxy( const TQString &proxy ) @@ -305,7 +305,7 @@ static bool revmatch(const char *host, const char *nplist) { hptr = shptr; - // Try to tqfind another domain or host in the list + // Try to find another domain or host in the list while(--nptr>=nplist && *nptr!=',' && *nptr!=' ') ; // Strip out multiple spaces and commas @@ -453,31 +453,31 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) struct utsname nam; if( uname(&nam) >= 0 ) { - if( modifiers.tqcontains('o') ) + if( modifiers.contains('o') ) { supp += TQString("; %1").arg(nam.sysname); - if ( modifiers.tqcontains('v') ) + if ( modifiers.contains('v') ) supp += TQString(" %1").arg(nam.release); } - if( modifiers.tqcontains('p') ) + if( modifiers.contains('p') ) { // TODO: determine this value instead of hardcoding it... - supp += TQString::tqfromLatin1("; X11"); + supp += TQString::fromLatin1("; X11"); } - if( modifiers.tqcontains('m') ) + if( modifiers.contains('m') ) { supp += TQString("; %1").arg(nam.machine); } - if( modifiers.tqcontains('l') ) + if( modifiers.contains('l') ) { TQStringList languageList = KGlobal::locale()->languageList(); - TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 ) + if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::tqfromLatin1("en"); + (*it) = TQString::fromLatin1("en"); } if( languageList.count() ) supp += TQString("; %1").arg(languageList.join(", ")); diff --git a/kio/kio/kprotocolmanager.h b/kio/kio/kprotocolmanager.h index d4463eddd..ec59342af 100644 --- a/kio/kio/kprotocolmanager.h +++ b/kio/kio/kprotocolmanager.h @@ -302,8 +302,8 @@ public: static int maxCacheSize(); // Maximum cache size in Kb. /** - * The directory which tqcontains the cache files. - * @return the directory that tqcontains the cache files + * The directory which contains the cache files. + * @return the directory that contains the cache files */ static TQString cacheDir(); @@ -371,7 +371,7 @@ public: * It's usually the same, except that FTP, when handled by a proxy, * needs an HTTP ioslave. * - * When a proxy is to be used, proxy tqcontains the URL for the proxy. + * When a proxy is to be used, proxy contains the URL for the proxy. * @param url the url to check * @param proxy the URL of the proxy to use * @return the slave protocol (e.g. 'http'), can be null if unknown diff --git a/kio/kio/kremoteencoding.cpp b/kio/kio/kremoteencoding.cpp index 23fd0563d..632eeb8b2 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::tqfromLatin1(name); + return TQString::fromLatin1(name); #endif TQString result = codec->toUnicode(name); if (codec->fromUnicode(result) != name) // fallback in case of decoding failure - return TQString::tqfromLatin1(name); + return TQString::fromLatin1(name); return result; } diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index a48c8c449..9e51a2938 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -237,7 +237,7 @@ void KRun::shellQuote( TQString &_str ) if (_str.isEmpty()) // Don't create an explicit empty parameter return; TQChar q('\''); - _str.tqreplace(q, "'\\''").prepend(q).append(q); + _str.replace(q, "'\\''").prepend(q).append(q); } @@ -260,16 +260,16 @@ KRunMX1::expandEscapedMacro( const TQString &str, uint pos, TQStringList &ret ) uint option = str[pos + 1]; switch( option ) { case 'c': - ret << service.name().tqreplace( '%', "%%" ); + ret << service.name().replace( '%', "%%" ); break; case 'k': - ret << service.desktopEntryPath().tqreplace( '%', "%%" ); + ret << service.desktopEntryPath().replace( '%', "%%" ); break; case 'i': - ret << "-icon" << service.icon().tqreplace( '%', "%%" ); + ret << "-icon" << service.icon().replace( '%', "%%" ); break; case 'm': - ret << "-miniicon" << service.icon().tqreplace( '%', "%%" ); + ret << "-miniicon" << service.icon().replace( '%', "%%" ); break; case 'u': case 'U': @@ -388,13 +388,13 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List if (!re.search( exec )) { exec = re.cap( 1 ).stripWhiteSpace(); for (uint pos = 0; pos < exec.length(); ) { - TQChar c = exec.tqunicode()[pos]; + TQChar c = exec.unicode()[pos]; if (c != '\'' && c != '"') goto synerr; // what else can we do? after normal parsing the substs would be insecure - int pos2 = exec.tqfind( c, pos + 1 ) - 1; + int pos2 = exec.find( c, pos + 1 ) - 1; if (pos2 < 0) goto synerr; // quoting error - memcpy( (void *)(exec.tqunicode() + pos), exec.tqunicode() + pos + 1, (pos2 - pos) * sizeof(TQChar)); + memcpy( (void *)(exec.unicode() + pos), exec.unicode() + pos + 1, (pos2 - pos) * sizeof(TQChar)); pos = pos2; exec.remove( pos, 2 ); } @@ -543,9 +543,9 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath ) // Remove parameters and/or trailing spaces. TQStringList args = KShell::splitArgs( execLine ); for (TQStringList::ConstIterator it = args.begin(); it != args.end(); ++it) - if (!(*it).tqcontains('=')) + if (!(*it).contains('=')) // Remove path if wanted - return removePath ? (*it).mid((*it).tqfindRev('/') + 1) : *it; + return removePath ? (*it).mid((*it).findRev('/') + 1) : *it; return TQString::null; } @@ -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.tqfind("KDE") != categories.end() ) + if ( categories.find("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.tqfind( "KIO" ) == supportedProtocols.end() ) { + if ( supportedProtocols.find( "KIO" ) == supportedProtocols.end() ) { for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) { const KURL url = *it; - bool supported = url.isLocalFile() || supportedProtocols.tqfind( url.protocol().lower() ) != supportedProtocols.end(); + bool supported = url.isLocalFile() || supportedProtocols.find( 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.tqfindRev( '/' ); + int pos = bin.findRev( '/' ); 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.tqfind( '$' ); + int nDollarPos = aValue.find( '$' ); while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) { // there is at least one $ @@ -949,7 +949,7 @@ void KRun::init() } pclose(fs); } - aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, result ); + aValue.replace( nDollarPos, nEndPos-nDollarPos, result ); } else if( (aValue)[nDollarPos+1] != '$' ) { uint nEndPos = nDollarPos+1; // the next character is no $ @@ -975,7 +975,7 @@ void KRun::init() // !!! Sergey A. Sukiyazov <[email protected]> !!! // A environment variables may contain values in 8bit // locale cpecified encoding or in UTF8 encoding. - aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) ); + aValue.replace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) ); } else aValue.remove( nDollarPos, nEndPos-nDollarPos ); } else { @@ -983,7 +983,7 @@ void KRun::init() aValue.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = aValue.tqfind( '$', nDollarPos ); + nDollarPos = aValue.find( '$', nDollarPos ); } m_strURL = KURL(aValue); bypassErrorMessage = true; @@ -1280,7 +1280,7 @@ void KRun::slotStatResult( KIO::Job * job ) void KRun::slotScanMimeType( KIO::Job *, const TQString &mimetype ) { if ( mimetype.isEmpty() ) - kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't tqfind a mimetype! Probably a kioslave bug." << endl; + kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't find a mimetype! Probably a kioslave bug." << endl; foundMimeType( mimetype ); m_job = 0; } @@ -1380,7 +1380,7 @@ void KRun::foundMimeType( const TQString& type ) lst.append( m_strURL ); m_bFinished = KRun::run( *serv, lst, d->m_window, d->m_asn ); /// Note: the line above means that if that service failed, we'll - /// go to runURL to maybe tqfind another service, even though a dialog + /// go to runURL to maybe find another service, even though a dialog /// box was displayed. That's good if runURL tries another service, /// but it's not good if it tries the same one :} } @@ -1547,12 +1547,12 @@ KProcessRunner::slotProcessExited(KProcess * p) { // Often we get 1 (zsh, csh) or 127 (ksh, bash) because the binary doesn't exist. // We can't just rely on that, but it's a good hint. - // Before assuming its really so, we'll try to tqfind the binName + // Before assuming its really so, we'll try to find the binName // relatively to current directory, and then in the PATH. if ( !TQFile( binName ).exists() && KStandardDirs::findExe( binName ).isEmpty() ) { kapp->ref(); - KMessageBox::sorry( 0L, i18n("Could not tqfind the program '%1'").arg( binName ) ); + KMessageBox::sorry( 0L, i18n("Could not find the program '%1'").arg( binName ) ); kapp->deref(); } } diff --git a/kio/kio/krun.h b/kio/kio/krun.h index 3f2dd6108..17fa434e3 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 TQObject +class KIO_EXPORT KRun : public QObject { Q_OBJECT public: @@ -71,7 +71,7 @@ public: * * @param isLocalFile * If this parameter is set to @p false then @p url is - * examined to tqfind out whether it is a local URL or + * examined to find out whether it is a local URL or * not. This flag is just used to improve speed, since the * function KURL::isLocalFile is a bit slow. * @@ -98,7 +98,7 @@ public: * * @param isLocalFile * If this parameter is set to @p false then @p url is - * examined to tqfind out whether it is a local URL or + * examined to find out whether it is a local URL or * not. This flag is just used to improve speed, since the * function KURL::isLocalFile is a bit slow. * @@ -296,7 +296,7 @@ public: /** * Same as the other runCommand(), but it also takes the name of the - * binary, to display an error message in case it couldn't tqfind it. + * binary, to display an error message in case it couldn't find it. * * @param cmd must be a shell command. You must not append "&" * to it, since the function will do that for you. @@ -338,7 +338,7 @@ public: * If false, the arguments are going to be fed into a exec() kind * call. * If the arguments are intended for an exec() kind of call and - * the Exec line tqcontains shell commands then "/bin/sh -c" is added. + * the Exec line contains shell commands then "/bin/sh -c" is added. * @param tempFiles if true and _urls are local files, they will be deleted * when the application exits. * @return a list of arguments suitable for either system() or exec(). @@ -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 TQObject +class KIO_EXPORT KProcessRunner : public QObject { Q_OBJECT diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp index 7fba51ae2..defeae4a7 100644 --- a/kio/kio/ksambashare.cpp +++ b/kio/kio/ksambashare.cpp @@ -33,7 +33,7 @@ public: KSambaSharePrivate(); bool readSmbConf(); - bool tqfindSmbConf(); + bool findSmbConf(); bool load(); TQDict<bool> sharedPaths; @@ -49,20 +49,20 @@ KSambaSharePrivate::KSambaSharePrivate() #define FILESHARECONF "/etc/security/fileshare.conf" bool KSambaSharePrivate::load() { - if (!tqfindSmbConf()) + if (!findSmbConf()) return false; return readSmbConf(); } /** - * Try to tqfind the samba config file path + * Try to find the samba config file path * First tries the kconfig, then checks * several well-known paths * @return wether a smb.conf was found. **/ -bool KSambaSharePrivate::tqfindSmbConf() { - KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true); +bool KSambaSharePrivate::findSmbConf() { + KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); smbConf = config.readEntry("SMBCONF"); if ( TQFile::exists(smbConf) ) @@ -144,7 +144,7 @@ bool KSambaSharePrivate::readSmbConf() { } // parameter - int i = completeLine.tqfind('='); + int i = completeLine.find('='); if (i>-1) { @@ -203,7 +203,7 @@ bool KSambaShare::isDirectoryShared( const TQString & path ) const { if ( path[path.length()-1] != '/' ) fixedPath += '/'; - return d->sharedPaths.tqfind(fixedPath) != 0; + return d->sharedPaths.find(fixedPath) != 0; } TQStringList KSambaShare::sharedDirectories() const { diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h index d3991e4a4..bb5731eec 100644 --- a/kio/kio/kscan.h +++ b/kio/kio/kscan.h @@ -98,7 +98,7 @@ protected: * customize it with the usual KDialogBase flags. * * @param dialogFace the KDialogBase::DialogType - * @param buttonMask a ORed tqmask of all buttons (see + * @param buttonMask a ORed mask of all buttons (see * KDialogBase::ButtonCode) * @param parent the QWidget's parent, or 0 * @param name the name of the TQObject, can be 0 @@ -258,7 +258,7 @@ protected: * customize it with the usual KDialogBase flags. * * @param dialogFace the KDialogBase::DialogType - * @param buttonMask a ORed tqmask of all buttons (see + * @param buttonMask a ORed mask of all buttons (see * KDialogBase::ButtonCode) * @param parent the QWidget's parent, or 0 * @param name the name of the TQObject, can be 0 diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index 23ae54380..3af62f26f 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.tqfindRev('/'); + int i = m_strName.findRev('/'); m_strName = m_strName.mid(i+1); - i = m_strName.tqfindRev('.'); + i = m_strName.findRev('.'); if (i != -1) m_strName = m_strName.left(i); } @@ -189,10 +189,10 @@ KService::init( KDesktopFile *config ) } TQString name = entryPath(); - int pos = name.tqfindRev('/'); + int pos = name.findRev('/'); if (pos != -1) name = name.mid(pos+1); - pos = name.tqfind('.'); + pos = name.find('.'); if (pos != -1) name = name.left(pos); @@ -200,12 +200,12 @@ 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.tqfind(" "); + int space = m_strExec.find(" "); if (space==-1) m_strExec = KStandardDirs::findExe(m_strExec); else { const TQString command = m_strExec.left(space); - m_strExec.tqreplace(command,KStandardDirs::findExe(command)); + m_strExec.replace(command,KStandardDirs::findExe(command)); } } @@ -253,7 +253,7 @@ KService::init( KDesktopFile *config ) m_lstServiceTypes += config->readListEntry( "MimeType", ';' ); entryMap.remove("MimeType"); - if ( m_strType == "Application" && !m_lstServiceTypes.tqcontains("Application") ) + if ( m_strType == "Application" && !m_lstServiceTypes.contains("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 - TQ_INT8 def, term, dummy1, dummy2; - TQ_INT8 dst, initpref; + Q_INT8 def, term, dummy1, dummy2; + Q_INT8 dst, initpref; TQString dummyStr1, dummyStr2; int dummyI1, dummyI2; - TQ_UINT32 dummyUI32; + Q_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 ); - 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 + 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 TQString dummyStr1, dummyStr2; int dummyI1 = 0, dummyI2 = 0; - TQ_UINT32 dummyUI32 = 0; + Q_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 !! @@ -562,7 +562,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const { // No luck, let's ask KServiceTypeFactory what the type of this property // is supposed to be. - t = KServiceTypeFactory::self()->tqfindPropertyTypeByName(_name); + t = KServiceTypeFactory::self()->findPropertyTypeByName(_name); if (t == TQVariant::Invalid) { kdDebug(7012) << "Request for unknown property '" << _name << "'\n"; @@ -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.tqfind( _name ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { //kdDebug(7012) << "Property not found " << _name << endl; @@ -646,27 +646,27 @@ KService::List KService::allServices() KService::Ptr KService::serviceByName( const TQString& _name ) { - KService * s = KServiceFactory::self()->tqfindServiceByName( _name ); + KService * s = KServiceFactory::self()->findServiceByName( _name ); return KService::Ptr( s ); } KService::Ptr KService::serviceByDesktopPath( const TQString& _name ) { - KService * s = KServiceFactory::self()->tqfindServiceByDesktopPath( _name ); + KService * s = KServiceFactory::self()->findServiceByDesktopPath( _name ); return KService::Ptr( s ); } KService::Ptr KService::serviceByDesktopName( const TQString& _name ) { - KService * s = KServiceFactory::self()->tqfindServiceByDesktopName( _name.lower() ); + KService * s = KServiceFactory::self()->findServiceByDesktopName( _name.lower() ); if (!s && !_name.startsWith("kde-")) - s = KServiceFactory::self()->tqfindServiceByDesktopName( "kde-"+_name.lower() ); + s = KServiceFactory::self()->findServiceByDesktopName( "kde-"+_name.lower() ); return KService::Ptr( s ); } KService::Ptr KService::serviceByMenuId( const TQString& _name ) { - KService * s = KServiceFactory::self()->tqfindServiceByMenuId( _name ); + KService * s = KServiceFactory::self()->findServiceByMenuId( _name ); return KService::Ptr( s ); } @@ -684,7 +684,7 @@ KService::Ptr KService::serviceByStorageId( const TQString& _storageId ) return new KService(_storageId); TQString tmp = _storageId; - tmp = tmp.mid(tmp.tqfindRev('/')+1); // Strip dir + tmp = tmp.mid(tmp.findRev('/')+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.tqfind( "NoDisplay" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "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.tqfind( "OnlyShowIn" ); + it = m_mapProps.find( "OnlyShowIn" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString(); TQStringList aList = TQStringList::split(';', aValue); - if (!aList.tqcontains("KDE")) + if (!aList.contains("KDE")) return true; } - it = m_mapProps.tqfind( "NotShowIn" ); + it = m_mapProps.find( "NotShowIn" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString(); TQStringList aList = TQStringList::split(';', aValue); - if (aList.tqcontains("KDE")) + if (aList.contains("KDE")) return true; } @@ -758,7 +758,7 @@ TQString KService::untranslatedGenericName() const { } bool KService::SuSEunimportant() const { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "X-SuSE-Unimportant" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "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.tqfind( "X-KDE-ParentApp" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "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.tqfind( "%F" ) != -1 || m_strExec.tqfind( "%U" ) != -1 || - m_strExec.tqfind( "%N" ) != -1 || m_strExec.tqfind( "%D" ) != -1 ) + if ( m_strExec.find( "%F" ) != -1 || m_strExec.find( "%U" ) != -1 || + m_strExec.find( "%N" ) != -1 || m_strExec.find( "%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->tqcontains(result)) + if (reservedMenuIds && reservedMenuIds->contains(result)) continue; // Lookup service by menu-id diff --git a/kio/kio/kservice.h b/kio/kio/kservice.h index ed863ed55..c276e8369 100644 --- a/kio/kio/kservice.h +++ b/kio/kio/kservice.h @@ -104,7 +104,7 @@ public: TQString exec() const { return m_strExec; } /** * Returns the name of the service's library. - * @return the name of the library that tqcontains the services + * @return the name of the library that contains the services * implementation, * or TQString::null if not set */ @@ -125,7 +125,7 @@ public: TQString icon() const { return m_strIcon; } /** * Returns the pixmap that represents the icon. - * @return a pixmap for this service (tqfinds and loads icon()), + * @return a pixmap for this service (finds and loads icon()), * null if not set * @see icon() */ @@ -463,7 +463,7 @@ public: /** * Find a service by its storage-id or desktop-file path. This - * function will try very hard to tqfind a matching service. + * function will try very hard to find a matching service. * * @param _storageId the storage id or desktop-file path of the service * @return a pointer to the requested service or 0 if the service is diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp index 6480737cf..1f79deb19 100644 --- a/kio/kio/kservicefactory.cpp +++ b/kio/kio/kservicefactory.cpp @@ -40,7 +40,7 @@ KServiceFactory::KServiceFactory() if (m_str) { // Read Header - TQ_INT32 i; + Q_INT32 i; (*m_str) >> i; m_nameDictOffset = i; (*m_str) >> i; @@ -87,12 +87,12 @@ KServiceFactory * KServiceFactory::self() return _self; } -KService * KServiceFactory::tqfindServiceByName(const TQString &_name) +KService * KServiceFactory::findServiceByName(const TQString &_name) { if (!m_sycocaDict) return 0; // Error! // Warning : this assumes we're NOT building a database - // But since tqfindServiceByName isn't called in that case... + // But since findServiceByName isn't called in that case... // [ see KServiceTypeFactory for how to do it if needed ] int offset = m_sycocaDict->find_string( _name ); @@ -110,12 +110,12 @@ KService * KServiceFactory::tqfindServiceByName(const TQString &_name) return newService; } -KService * KServiceFactory::tqfindServiceByDesktopName(const TQString &_name) +KService * KServiceFactory::findServiceByDesktopName(const TQString &_name) { if (!m_nameDict) return 0; // Error! // Warning : this assumes we're NOT building a database - // But since tqfindServiceByName isn't called in that case... + // But since findServiceByName isn't called in that case... // [ see KServiceTypeFactory for how to do it if needed ] int offset = m_nameDict->find_string( _name ); @@ -133,12 +133,12 @@ KService * KServiceFactory::tqfindServiceByDesktopName(const TQString &_name) return newService; } -KService * KServiceFactory::tqfindServiceByDesktopPath(const TQString &_name) +KService * KServiceFactory::findServiceByDesktopPath(const TQString &_name) { if (!m_relNameDict) return 0; // Error! // Warning : this assumes we're NOT building a database - // But since tqfindServiceByName isn't called in that case... + // But since findServiceByName isn't called in that case... // [ see KServiceTypeFactory for how to do it if needed ] int offset = m_relNameDict->find_string( _name ); @@ -156,12 +156,12 @@ KService * KServiceFactory::tqfindServiceByDesktopPath(const TQString &_name) return newService; } -KService * KServiceFactory::tqfindServiceByMenuId(const TQString &_menuId) +KService * KServiceFactory::findServiceByMenuId(const TQString &_menuId) { if (!m_menuIdDict) return 0; // Error! // Warning : this assumes we're NOT building a database - // But since tqfindServiceByMenuId isn't called in that case... + // But since findServiceByMenuId isn't called in that case... // [ see KServiceTypeFactory for how to do it if needed ] int offset = m_menuIdDict->find_string( _menuId ); @@ -226,10 +226,10 @@ KService::List KServiceFactory::allInitServices() // Assume we're NOT building a database m_str->device()->at(m_initListOffset); - TQ_INT32 entryCount; + Q_INT32 entryCount; (*m_str) >> entryCount; - TQ_INT32 *offsetList = new TQ_INT32[entryCount]; + Q_INT32 *offsetList = new Q_INT32[entryCount]; for(int i = 0; i < entryCount; i++) { (*m_str) >> offsetList[i]; @@ -255,8 +255,8 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) // Jump to the offer list str->device()->at( m_offerListOffset ); - TQ_INT32 aServiceTypeOffset; - TQ_INT32 aServiceOffset; + Q_INT32 aServiceTypeOffset; + Q_INT32 aServiceOffset; // We might want to do a binary search instead of a linear search // since servicetype offsets are sorted. Bah. while (true) @@ -275,7 +275,7 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) list.append( KService::Ptr( serv ) ); // Restore position str->device()->at( savedPos ); - } else if ( aServiceTypeOffset > (TQ_INT32)serviceTypeOffset ) + } else if ( aServiceTypeOffset > (Q_INT32)serviceTypeOffset ) break; // too far } else diff --git a/kio/kio/kservicefactory.h b/kio/kio/kservicefactory.h index b52f30d5a..1a828364e 100644 --- a/kio/kio/kservicefactory.h +++ b/kio/kio/kservicefactory.h @@ -54,22 +54,22 @@ public: /** * Find a service (by name, e.g. "Terminal") */ - KService * tqfindServiceByName( const TQString &_name ); + KService * findServiceByName( const TQString &_name ); /** * Find a service (by desktop file name, e.g. "konsole") */ - KService * tqfindServiceByDesktopName( const TQString &_name ); + KService * findServiceByDesktopName( const TQString &_name ); /** * Find a service ( by desktop path, e.g. "System/konsole.desktop") */ - KService * tqfindServiceByDesktopPath( const TQString &_name ); + KService * findServiceByDesktopPath( const TQString &_name ); /** * Find a service ( by menu id, e.g. "kde-konsole.desktop") */ - KService * tqfindServiceByMenuId( const TQString &_menuId ); + KService * findServiceByMenuId( const TQString &_menuId ); /** * @return the services supporting the given service type diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp index d8d1ddd0b..f5d2970a9 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", ';').tqcontains("KDE")) + if (!config.readListEntry("OnlyShowIn", ';').contains("KDE")) d->m_bNoDisplay = true; } if (config.hasKey("NotShowIn")) { - if (config.readListEntry("NotShowIn", ';').tqcontains("KDE")) + if (config.readListEntry("NotShowIn", ';').contains("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.tqfindRev('/'); + int i = m_strCaption.findRev('/'); 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; - TQ_INT8 noDisplay; - TQ_INT8 _showEmptyMenu; - TQ_INT8 inlineHeader; - TQ_INT8 _inlineAlias; - TQ_INT8 _allowInline; + Q_INT8 noDisplay; + Q_INT8 _showEmptyMenu; + Q_INT8 inlineHeader; + Q_INT8 _inlineAlias; + Q_INT8 _allowInline; s >> m_strCaption >> m_strIcon >> m_strComment >> groupList >> m_strBaseGroupName >> m_childCount >> noDisplay >> d->suppressGenericNames >> d->directoryEntryPath >> @@ -255,14 +255,14 @@ void KServiceGroup::load( TQDataStream& s ) if (path[path.length()-1] == '/') { KServiceGroup *serviceGroup; - serviceGroup = KServiceGroupFactory::self()->tqfindGroupByDesktopPath(path, false); + serviceGroup = KServiceGroupFactory::self()->findGroupByDesktopPath(path, false); if (serviceGroup) m_serviceList.append( SPtr(serviceGroup) ); } else { KService *service; - service = KServiceFactory::self()->tqfindServiceByDesktopPath(path); + service = KServiceFactory::self()->findServiceByDesktopPath(path); if (service) m_serviceList.append( SPtr(service) ); } @@ -302,11 +302,11 @@ void KServiceGroup::save( TQDataStream& s ) (void) childCount(); - 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; + 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; s << m_strCaption << m_strIcon << m_strComment << groupList << m_strBaseGroupName << m_childCount << noDisplay << d->suppressGenericNames << d->directoryEntryPath << @@ -352,7 +352,7 @@ KServiceGroup::SuSEentries(bool sort, bool excludeNoDisplay, bool allowSeparator if (!m_bDeep) { group = - KServiceGroupFactory::self()->tqfindGroupByDesktopPath(relPath(), true); + KServiceGroupFactory::self()->findGroupByDesktopPath(relPath(), true); if (0 == group) // No guarantee that we still exist! return List(); @@ -491,7 +491,7 @@ KServiceGroup::SuSEsortEntries( KSortableValueList<SPtr,TQCString> slist, KSorta if (allowSeparators) needSeparator = true; } - else if ( item.tqcontains( ":O" ) ) + else if ( item.contains( ":O" ) ) { //todo parse attribute: TQString tmp( item ); @@ -657,7 +657,7 @@ void KServiceGroup::parseAttribute( const TQString &item , bool &showEmptyMenu, showInlineAlias = true; else if ( item == "NIA") //not inline alias! showInlineAlias = false; - else if( ( item ).tqcontains( "IL" )) //inline limite! + else if( ( item ).contains( "IL" )) //inline limite! { TQString tmp( item ); tmp = tmp.remove( "IL[" ); @@ -672,12 +672,12 @@ void KServiceGroup::parseAttribute( const TQString &item , bool &showEmptyMenu, kdDebug()<<" This attribute is not supported :"<<item<<endl; } -void KServiceGroup::setLayoutInfo(const TQStringList &tqlayout) +void KServiceGroup::setLayoutInfo(const TQStringList &layout) { - d->sortOrder = tqlayout; + d->sortOrder = layout; } -TQStringList KServiceGroup::tqlayoutInfo() const +TQStringList KServiceGroup::layoutInfo() const { return d->sortOrder; } @@ -685,26 +685,26 @@ TQStringList KServiceGroup::tqlayoutInfo() const KServiceGroup::Ptr KServiceGroup::baseGroup( const TQString & _baseGroupName ) { - return KServiceGroupFactory::self()->tqfindBaseGroup(_baseGroupName, true); + return KServiceGroupFactory::self()->findBaseGroup(_baseGroupName, true); } KServiceGroup::Ptr KServiceGroup::root() { - return KServiceGroupFactory::self()->tqfindGroupByDesktopPath("/", true); + return KServiceGroupFactory::self()->findGroupByDesktopPath("/", true); } KServiceGroup::Ptr KServiceGroup::group(const TQString &relPath) { if (relPath.isEmpty()) return root(); - return KServiceGroupFactory::self()->tqfindGroupByDesktopPath(relPath, true); + return KServiceGroupFactory::self()->findGroupByDesktopPath(relPath, true); } KServiceGroup::Ptr KServiceGroup::childGroup(const TQString &parent) { - return KServiceGroupFactory::self()->tqfindGroupByDesktopPath("#parent#"+parent, true); + return KServiceGroupFactory::self()->findGroupByDesktopPath("#parent#"+parent, true); } QString diff --git a/kio/kio/kservicegroup.h b/kio/kio/kservicegroup.h index ea923ff0d..69242e6ed 100644 --- a/kio/kio/kservicegroup.h +++ b/kio/kio/kservicegroup.h @@ -197,9 +197,9 @@ public: /** * @internal - * Sets information related to the tqlayout of services in this group. + * Sets information related to the layout of services in this group. */ - void setLayoutInfo(const TQStringList &tqlayout); + void setLayoutInfo(const TQStringList &layout); /** * Original API and feature kindly provided by SuSE @@ -209,9 +209,9 @@ public: /** * @internal - * Returns information related to the tqlayout of services in this group. + * Returns information related to the layout of services in this group. */ - TQStringList tqlayoutInfo() const; + TQStringList layoutInfo() const; /** * @internal diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp index 9a2ae33f2..9bca4dc63 100644 --- a/kio/kio/kservicegroupfactory.cpp +++ b/kio/kio/kservicegroupfactory.cpp @@ -36,7 +36,7 @@ KServiceGroupFactory::KServiceGroupFactory() if (m_str) { // Read Header - TQ_INT32 i; + Q_INT32 i; (*m_str) >> i; m_baseGroupDictOffset = i; @@ -66,12 +66,12 @@ KServiceGroupFactory * KServiceGroupFactory::self() return _self; } -KServiceGroup * KServiceGroupFactory::tqfindGroupByDesktopPath(const TQString &_name, bool deep) +KServiceGroup * KServiceGroupFactory::findGroupByDesktopPath(const TQString &_name, bool deep) { if (!m_sycocaDict) return 0; // Error! // Warning : this assumes we're NOT building a database - // But since tqfindServiceByName isn't called in that case... + // But since findServiceByName isn't called in that case... // [ see KServiceTypeFactory for how to do it if needed ] int offset = m_sycocaDict->find_string( _name ); @@ -89,12 +89,12 @@ KServiceGroup * KServiceGroupFactory::tqfindGroupByDesktopPath(const TQString &_ return newGroup; } -KServiceGroup * KServiceGroupFactory::tqfindBaseGroup(const TQString &_baseGroupName, bool deep) +KServiceGroup * KServiceGroupFactory::findBaseGroup(const TQString &_baseGroupName, bool deep) { if (!m_baseGroupDict) return 0; // Error! // Warning : this assumes we're NOT building a database - // But since tqfindServiceByName isn't called in that case... + // But since findServiceByName isn't called in that case... // [ see KServiceTypeFactory for how to do it if needed ] int offset = m_baseGroupDict->find_string( _baseGroupName ); diff --git a/kio/kio/kservicegroupfactory.h b/kio/kio/kservicegroupfactory.h index 352ca2d1c..b1131b398 100644 --- a/kio/kio/kservicegroupfactory.h +++ b/kio/kio/kservicegroupfactory.h @@ -52,12 +52,12 @@ public: /** * Find a group ( by desktop path, e.g. "Applications/Editors") */ - KServiceGroup * tqfindGroupByDesktopPath( const TQString &_name, bool deep = true ); + KServiceGroup * findGroupByDesktopPath( const TQString &_name, bool deep = true ); /** * Find a base group by name, e.g. "settings" */ - KServiceGroup * tqfindBaseGroup( const TQString &_baseGroupName, bool deep = true ); + KServiceGroup * findBaseGroup( const TQString &_baseGroupName, bool deep = true ); /** * @return the unique service group factory, creating it if necessary diff --git a/kio/kio/kservicetype.cpp b/kio/kio/kservicetype.cpp index 5a44210de..48693aceb 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).tqfind( "Property::" ) == 0 ) + if ( (*gIt).find( "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).tqfind( "PropertyDef::" ) == 0 ) + if( (*gIt).find( "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 ) { - TQ_INT8 b; + Q_INT8 b; _str >> m_strName >> m_strIcon >> m_strComment >> m_mapProps >> m_mapPropDefs >> b; m_bValid = b; - m_bDerived = m_mapProps.tqcontains("X-KDE-Derived"); + m_bDerived = m_mapProps.contains("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 - << (TQ_INT8)m_bValid; + << (Q_INT8)m_bValid; } KServiceType::~KServiceType() @@ -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.tqfind( _name ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name ); if ( it != m_mapProps.end() ) v = it.data(); } @@ -209,7 +209,7 @@ KServiceType::propertyNames() const TQVariant::Type KServiceType::propertyDef( const TQString& _name ) const { - TQMap<TQString,TQVariant::Type>::ConstIterator it = m_mapPropDefs.tqfind( _name ); + TQMap<TQString,TQVariant::Type>::ConstIterator it = m_mapPropDefs.find( _name ); if ( it == m_mapPropDefs.end() ) return TQVariant::Invalid; return it.data(); @@ -229,7 +229,7 @@ KServiceType::propertyDefNames() const KServiceType::Ptr KServiceType::serviceType( const TQString& _name ) { - KServiceType * p = KServiceTypeFactory::self()->tqfindServiceTypeByName( _name ); + KServiceType * p = KServiceTypeFactory::self()->findServiceTypeByName( _name ); return KServiceType::Ptr( p ); } @@ -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.tqfind(service->desktopEntryPath())) + if (dict.find(service->desktopEntryPath())) continue; dict.insert(service->desktopEntryPath(), service); lst.append(service); @@ -254,7 +254,7 @@ KService::List KServiceType::offers( const TQString& _servicetype ) KService::List lst; // Services associated directly with this servicetype (the normal case) - KServiceType::Ptr serv = KServiceTypeFactory::self()->tqfindServiceTypeByName( _servicetype ); + KServiceType::Ptr serv = KServiceTypeFactory::self()->findServiceTypeByName( _servicetype ); if ( serv ) addUnique(lst, dict, KServiceFactory::self()->offers( serv->offset() ), false); else @@ -270,7 +270,7 @@ KService::List KServiceType::offers( const TQString& _servicetype ) TQString parent = mime->parentMimeType(); if (parent.isEmpty()) break; - mime = dynamic_cast<KMimeType *>(KServiceTypeFactory::self()->tqfindServiceTypeByName( parent )); + mime = dynamic_cast<KMimeType *>(KServiceTypeFactory::self()->findServiceTypeByName( parent )); if (!mime) break; @@ -291,7 +291,7 @@ KService::List KServiceType::offers( const TQString& _servicetype ) && _servicetype.left(4) != "all/" ) { // Support for services associated with "all" - KServiceType * servAll = KServiceTypeFactory::self()->tqfindServiceTypeByName( "all/all" ); + KServiceType * servAll = KServiceTypeFactory::self()->findServiceTypeByName( "all/all" ); if ( servAll ) { addUnique(lst, dict, KServiceFactory::self()->offers( servAll->offset() ), true); @@ -303,7 +303,7 @@ KService::List KServiceType::offers( const TQString& _servicetype ) // Support for services associated with "allfiles" if ( _servicetype != "inode/directory" && _servicetype != "inode/directory-locked" ) { - KServiceType * servAllFiles = KServiceTypeFactory::self()->tqfindServiceTypeByName( "all/allfiles" ); + KServiceType * servAllFiles = KServiceTypeFactory::self()->findServiceTypeByName( "all/allfiles" ); if ( servAllFiles ) { addUnique(lst, dict, KServiceFactory::self()->offers( servAllFiles->offset() ), true); @@ -333,7 +333,7 @@ KServiceType::Ptr KServiceType::parentType() TQString parentSt = parentServiceType(); if (!parentSt.isEmpty()) { - d->parentType = KServiceTypeFactory::self()->tqfindServiceTypeByName( parentSt ); + d->parentType = KServiceTypeFactory::self()->findServiceTypeByName( parentSt ); if (!d->parentType) kdWarning(7009) << "'" << desktopEntryPath() << "' specifies undefined mimetype/servicetype '"<< parentSt << "'" << endl; } diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp index ac0a3d37c..8287bca44 100644 --- a/kio/kio/kservicetypefactory.cpp +++ b/kio/kio/kservicetypefactory.cpp @@ -39,7 +39,7 @@ KServiceTypeFactory::KServiceTypeFactory() if (m_str) { // Read Header - TQ_INT32 i,n; + Q_INT32 i,n; (*m_str) >> i; m_fastPatternOffset = i; (*m_str) >> i; @@ -77,7 +77,7 @@ KServiceTypeFactory * KServiceTypeFactory::self() return _self; } -KServiceType * KServiceTypeFactory::tqfindServiceTypeByName(const TQString &_name) +KServiceType * KServiceTypeFactory::findServiceTypeByName(const TQString &_name) { if (!m_sycocaDict) return 0L; // Error! assert (!KSycoca::self()->isBuilding()); @@ -95,14 +95,14 @@ KServiceType * KServiceTypeFactory::tqfindServiceTypeByName(const TQString &_nam return newServiceType; } -TQVariant::Type KServiceTypeFactory::tqfindPropertyTypeByName(const TQString &_name) +TQVariant::Type KServiceTypeFactory::findPropertyTypeByName(const TQString &_name) { if (!m_sycocaDict) return TQVariant::Invalid; // Error! assert (!KSycoca::self()->isBuilding()); - TQMapConstIterator<TQString,int> it = m_propertyTypeDict.tqfind(_name); + TQMapConstIterator<TQString,int> it = m_propertyTypeDict.find(_name); if (it != m_propertyTypeDict.end()) { return (TQVariant::Type)it.data(); } @@ -110,7 +110,7 @@ TQVariant::Type KServiceTypeFactory::tqfindPropertyTypeByName(const TQString &_n return TQVariant::Invalid; } -KMimeType * KServiceTypeFactory::tqfindFromPattern(const TQString &_filename, TQString *match) +KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQString *match) { // Assume we're NOT building a database if (!m_str) return 0; @@ -120,21 +120,21 @@ KMimeType * KServiceTypeFactory::tqfindFromPattern(const TQString &_filename, TQ str->device()->at( m_fastPatternOffset ); - TQ_INT32 nrOfEntries; + Q_INT32 nrOfEntries; (*str) >> nrOfEntries; - TQ_INT32 entrySize; + Q_INT32 entrySize; (*str) >> entrySize; - TQ_INT32 fastOffset = str->device()->at( ); + Q_INT32 fastOffset = str->device()->at( ); - TQ_INT32 matchingOffset = 0; + Q_INT32 matchingOffset = 0; // Let's go for a binary search in the "fast" pattern index - TQ_INT32 left = 0; - TQ_INT32 right = nrOfEntries - 1; - TQ_INT32 middle; + Q_INT32 left = 0; + Q_INT32 right = nrOfEntries - 1; + Q_INT32 middle; // Extract extension - int lastDot = _filename.tqfindRev('.'); + int lastDot = _filename.findRev('.'); int ext_len = _filename.length() - lastDot - 1; if (lastDot != -1 && ext_len <= 4) // if no '.', skip the extension lookup { @@ -169,7 +169,7 @@ KMimeType * KServiceTypeFactory::tqfindFromPattern(const TQString &_filename, TQ str->device()->at( m_otherPatternOffset ); TQString pattern; - TQ_INT32 mimetypeOffset; + Q_INT32 mimetypeOffset; while (true) { @@ -186,7 +186,7 @@ KMimeType * KServiceTypeFactory::tqfindFromPattern(const TQString &_filename, TQ TQStringList::const_iterator it = m_patterns.begin(); TQStringList::const_iterator end = m_patterns.end(); - TQValueVector<TQ_INT32>::const_iterator it_offset = m_pattern_offsets.begin(); + TQValueVector<Q_INT32>::const_iterator it_offset = m_pattern_offsets.begin(); for ( ; it != end; ++it, ++it_offset ) { diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h index ae7e56785..db64aa115 100644 --- a/kio/kio/kservicetypefactory.h +++ b/kio/kio/kservicetypefactory.h @@ -63,19 +63,19 @@ public: * Find a service type in the database file (allocates it) * Overloaded by KBuildServiceTypeFactory to return a memory one. */ - virtual KServiceType * tqfindServiceTypeByName(const TQString &_name); + virtual KServiceType * findServiceTypeByName(const TQString &_name); /** * Find a the property type of a named property. */ - TQVariant::Type tqfindPropertyTypeByName(const TQString &_name); + TQVariant::Type findPropertyTypeByName(const TQString &_name); /** * Find a mimetype from a filename (using the pattern list) * @param _filename filename to check. * @param match if provided, returns the pattern that matched. */ - KMimeType * tqfindFromPattern(const TQString &_filename, TQString *match = 0); + KMimeType * findFromPattern(const TQString &_filename, TQString *match = 0); /** * @return all mimetypes @@ -113,7 +113,7 @@ protected: private: TQStringList m_patterns; - TQValueVector<TQ_INT32> m_pattern_offsets; + TQValueVector<Q_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 b27e04054..2fb67a31f 100644 --- a/kio/kio/kshellcompletion.cpp +++ b/kio/kio/kshellcompletion.cpp @@ -217,33 +217,33 @@ bool KShellCompletion::quoteText(TQString *text, bool force, bool skip_last) con int pos = 0; if ( !force ) { - pos = text->tqfind( m_word_break_char ); + pos = text->find( m_word_break_char ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->tqfind( m_quote_char1 ); + pos = text->find( m_quote_char1 ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->tqfind( m_quote_char2 ); + pos = text->find( m_quote_char2 ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->tqfind( m_escape_char ); + pos = text->find( m_escape_char ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( force || (pos >= 0) ) { // Escape \ in the string - text->tqreplace( m_escape_char, + text->replace( m_escape_char, TQString( m_escape_char ) + m_escape_char ); // Escape " in the string - text->tqreplace( m_quote_char1, + text->replace( m_quote_char1, TQString( m_escape_char ) + m_quote_char1 ); // " at the beginning diff --git a/kio/kio/ktar.cpp b/kio/kio/ktar.cpp index 768d0bc63..0b77fff52 100644 --- a/kio/kio/ktar.cpp +++ b/kio/kio/ktar.cpp @@ -66,9 +66,9 @@ KTar::KTar( const TQString& filename, const TQString & _mimetype ) if ( mimetype.isEmpty() ) // Find out mimetype manually { if ( TQFile::exists( filename ) ) - mimetype = KMimeType::tqfindByFileContent( filename )->name(); + mimetype = KMimeType::findByFileContent( filename )->name(); else - mimetype = KMimeType::tqfindByPath( filename, 0, true )->name(); + mimetype = KMimeType::findByPath( filename, 0, true )->name(); kdDebug(7041) << "KTar::KTar mimetype = " << mimetype << endl; // Don't move to prepareDevice - the other constructor theoretically allows ANY filter @@ -137,7 +137,7 @@ void KTar::prepareDevice( const TQString & filename, // the file is completly extracted instead, // and we work on the extracted tar file. // This improves the extraction speed by the tar ioslave dramatically, - // if the archive file tqcontains many files. + // if the archive file contains many files. // This is because the tar ioslave extracts one file after the other and normally // has to walk through the decompression filter each time. // Which is in fact nearly as slow as a complete decompression for each file. @@ -185,9 +185,9 @@ void KTar::setOrigFileName( const TQCString & fileName ) d->origFileName = fileName; } -TQ_LONG KTar::readRawHeader(char *buffer) { +Q_LONG KTar::readRawHeader(char *buffer) { // Read header - TQ_LONG n = device()->readBlock( buffer, 0x200 ); + Q_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 @@ TQ_LONG KTar::readRawHeader(char *buffer) { } bool KTar::readLonglink(char *buffer,TQCString &longlink) { - TQ_LONG n = 0; + Q_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; } -TQ_LONG KTar::readHeader(char *buffer,TQString &name,TQString &symlink) { +Q_LONG KTar::readHeader(char *buffer,TQString &name,TQString &symlink) { name.truncate(0); symlink.truncate(0); while (true) { - TQ_LONG n = readRawHeader(buffer); + Q_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; } - TQ_LONG len = -1; + Q_LONG len = -1; while ( !filterDev->atEnd() && len != 0) { len = filterDev->readBlock(buffer.data(),buffer.size()); if ( len < 0 ) { // corrupted archive @@ -353,7 +353,7 @@ bool KTar::openArchive( int mode ) return false; // We'll use the permission and user/group of d->rootDir - // for any directory we emulate (see tqfindOrCreate) + // for any directory we emulate (see findOrCreate) //struct stat buf; //stat( m_filename, &buf ); @@ -372,7 +372,7 @@ bool KTar::openArchive( int mode ) TQString symlink; // Read header - TQ_LONG n = readHeader(buffer,name,symlink); + Q_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.tqfindRev( '/' ); + int pos = name.findRev( '/' ); if ( pos == -1 ) nm = name; else @@ -485,10 +485,10 @@ bool KTar::openArchive( int mode ) } else { - // In some tar files we can tqfind dir/./file => call cleanDirPath + // In some tar files we can find dir/./file => call cleanDirPath TQString path = TQDir::cleanDirPath( name.left( pos ) ); // Ensure container directory exists, create otherwise - KArchiveDirectory * d = tqfindOrCreate( path ); + KArchiveDirectory * d = findOrCreate( path ); d->addEntry( e ); } } @@ -534,7 +534,7 @@ bool KTar::KTarPrivate::writeBackTempFile( const TQString & filename ) { if ( forced ) static_cast<KFilterDev *>(dev)->setOrigFileName( origFileName ); TQByteArray buffer(8*1024); - TQ_LONG len; + Q_LONG len; while ( ! file->atEnd()) { len = file->readBlock(buffer.data(),buffer.size()); dev->writeBlock(buffer.data(),len); @@ -579,14 +579,14 @@ bool KTar::writeDir( const TQString& name, const TQString& user, const TQString& return false; } - // In some tar files we can tqfind dir/./ => call cleanDirPath + // In some tar files we can find dir/./ => call cleanDirPath TQString dirName ( TQDir::cleanDirPath( name ) ); // Need trailing '/' if ( dirName.right(1) != "/" ) dirName += "/"; - if ( d->dirList.tqcontains( dirName ) ) + if ( d->dirList.contains( dirName ) ) return true; // already there char buffer[ 0x201 ]; @@ -618,7 +618,7 @@ bool KTar::writeDir( const TQString& name, const TQString& user, const TQString& device()->writeBlock( buffer, 0x200 ); if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at(); - d->dirList.append( dirName ); // tqcontains trailing slash + d->dirList.append( dirName ); // contains trailing slash return true; // TODO if wanted, better error control #endif } @@ -633,7 +633,7 @@ bool KTar::prepareWriting( const TQString& name, const TQString& user, const TQS bool KTar::doneWriting( uint size ) { - // Write tqalignment + // Write alignment 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; - TQ_LONG nwritten = device()->writeBlock( buffer, 0x200 - rest ); + Q_LONG nwritten = device()->writeBlock( buffer, 0x200 - rest ); return nwritten == 0x200 - rest; } return true; @@ -699,7 +699,7 @@ void KTar::fillBuffer( char * buffer, strcpy( buffer + 0x88, s.data() ); buffer[ 0x93 ] = ' '; // space-terminate (no null after) - // spaces, tqreplaced by the check sum later + // spaces, replaced by the check sum later buffer[ 0x94 ] = 0x20; buffer[ 0x95 ] = 0x20; buffer[ 0x96 ] = 0x20; @@ -775,21 +775,21 @@ bool KTar::prepareWriting_impl(const TQString &name, const TQString &user, return false; } - // In some tar files we can tqfind dir/./file => call cleanDirPath + // In some tar files we can find dir/./file => call cleanDirPath TQString fileName ( TQDir::cleanDirPath( name ) ); /* // Create toplevel dirs // Commented out by David since it's not necessary, and if anybody thinks it is, - // he needs to implement a tqfindOrCreate equivalent in writeDir. + // he needs to implement a findOrCreate equivalent in writeDir. // But as KTar and the "tar" program both handle tar files without // dir entries, there's really no need for that TQString tmp ( fileName ); - int i = tmp.tqfindRev( '/' ); + int i = tmp.findRev( '/' ); if ( i != -1 ) { - TQString d = tmp.left( i + 1 ); // tqcontains trailing slash - if ( !m_dirList.tqcontains( d ) ) + TQString d = tmp.left( i + 1 ); // contains trailing slash + if ( !m_dirList.contains( d ) ) { tmp = tmp.mid( i + 1 ); writeDir( d, user, group ); // WARNING : this one doesn't create its toplevel dirs @@ -846,14 +846,14 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, return false; } - // In some tar files we can tqfind dir/./ => call cleanDirPath + // In some tar files we can find dir/./ => call cleanDirPath TQString dirName ( TQDir::cleanDirPath( name ) ); // Need trailing '/' if ( dirName.right(1) != "/" ) dirName += "/"; - if ( d->dirList.tqcontains( dirName ) ) + if ( d->dirList.contains( dirName ) ) return true; // already there char buffer[ 0x201 ]; @@ -884,7 +884,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, device()->writeBlock( buffer, 0x200 ); if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at(); - d->dirList.append( dirName ); // tqcontains trailing slash + d->dirList.append( dirName ); // contains trailing slash return true; // TODO if wanted, better error control } @@ -911,7 +911,7 @@ bool KTar::writeSymLink_impl(const TQString &name, const TQString &target, device()->flush(); - // In some tar files we can tqfind dir/./file => call cleanDirPath + // In some tar files we can find dir/./file => call cleanDirPath TQString fileName ( TQDir::cleanDirPath( name ) ); char buffer[ 0x201 ]; diff --git a/kio/kio/ktar.h b/kio/kio/ktar.h index 67f004a39..95c52a32c 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); - TQ_LONG readRawHeader(char *buffer); + Q_LONG readRawHeader(char *buffer); bool readLonglink(char *buffer,TQCString &longlink); - TQ_LONG readHeader(char *buffer,TQString &name,TQString &symlink); + Q_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 7f6e9d4af..e5bb734e6 100644 --- a/kio/kio/ktrader.h +++ b/kio/kio/ktrader.h @@ -27,7 +27,7 @@ * * Basically, it provides a way for an application to query * all KDE services (that is, applications and components) that match - * a specific set of requirements. This allows you to tqfind an + * a specific set of requirements. This allows you to find an * application in real-time without you having to hard-code the name * and/or path of the application. * @@ -82,7 +82,7 @@ * applications or components. * @author Torben Weis <[email protected]> */ -class KIO_EXPORT KTrader : public TQObject +class KIO_EXPORT KTrader : public QObject { Q_OBJECT public: diff --git a/kio/kio/ktraderparsetree.cpp b/kio/kio/ktraderparsetree.cpp index 969599db6..711ec5356 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.tqfind( c1.str ) != -1 ); + _context->b = ( c2.str.find( 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.tqfind( c1.str ) != c2.strSeq.end() ); + _context->b = ( c2.strSeq.find( 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.tqfind( m_strId ); + TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.find( 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.tqfind( m_strId ); + TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.find( 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.tqfind( _prop ); + TQMap<TQString,PreferencesMaxima>::Iterator it = maxima.find( _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 a2c4ff9d3..2c4c5b12e 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::tqfromLatin1( name ); + m_strName = TQString::fromLatin1( name ); m_dblPriority = pri; } @@ -171,32 +171,32 @@ TQString KURIFilterData::iconName() case KURIFilterData::EXECUTABLE: { TQString exeName = m_pURI.url(); - exeName = exeName.mid( exeName.tqfindRev( '/' ) + 1 ); // strip path if given + exeName = exeName.mid( exeName.findRev( '/' ) + 1 ); // strip path if given KService::Ptr service = KService::serviceByDesktopName( exeName ); - if (service && service->icon() != TQString::tqfromLatin1( "unknown" )) + if (service && service->icon() != TQString::fromLatin1( "unknown" )) m_strIconName = service->icon(); - // Try to tqfind an icon with the same name as the binary (useful for non-kde apps) + // 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::tqfromLatin1("exec"); + m_strIconName = TQString::fromLatin1("exec"); break; } case KURIFilterData::HELP: { - m_strIconName = TQString::tqfromLatin1("khelpcenter"); + m_strIconName = TQString::fromLatin1("khelpcenter"); break; } case KURIFilterData::SHELL: { - m_strIconName = TQString::tqfromLatin1("konsole"); + m_strIconName = TQString::fromLatin1("konsole"); break; } case KURIFilterData::ERROR: case KURIFilterData::BLOCKED: { - m_strIconName = TQString::tqfromLatin1("error"); + m_strIconName = TQString::fromLatin1("error"); break; } default: diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h index 0a6b01045..0960c1419 100644 --- a/kio/kio/kurifilter.h +++ b/kio/kio/kurifilter.h @@ -347,7 +347,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class KIO_EXPORT KURIFilterPlugin : public QObject { Q_OBJECT @@ -525,7 +525,7 @@ private: * * KURIFilter also allows richer data exchange through a simple * meta-object called @p KURIFilterData. Using this meta-object - * you can tqfind out more information about the URL you want to + * you can find out more information about the URL you want to * filter. See KURIFilterData for examples and details. * * @short Filters a given URL into its proper format whenever possible. @@ -550,7 +550,7 @@ public: * The given URL is filtered based on the specified list of filters. * If the list is empty all available filters would be used. * - * @param data object that tqcontains the URI to be filtered. + * @param data object that contains the URI to be filtered. * @param filters specify the list of filters to be used. * * @return a boolean indicating whether the URI has been changed @@ -631,7 +631,7 @@ protected: * A protected constructor. * * This constructor creates a KURIFilter and - * initializes all plugins it can tqfind by invoking + * initializes all plugins it can find by invoking * loadPlugins. */ KURIFilter(); diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 75a6fd106..88a566b5f 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -66,7 +66,7 @@ static bool expandEnv(TQString &); static TQString unescape(const TQString &text); -// Permission tqmask for files that are executable by +// Permission mask for files that are executable by // user, group or other #define MODE_EXE (S_IXUSR | S_IXGRP | S_IXOTH) @@ -330,7 +330,7 @@ public: // Is the initial string a URL, or just a path (whether absolute or relative) bool isURL() const { return m_isURL; } - void filter( bool tqreplace_user_dir, bool tqreplace_env ); + void filter( bool replace_user_dir, bool replace_env ); private: void init(const TQString &url, const TQString &cwd); @@ -363,9 +363,9 @@ void KURLCompletion::MyURL::init(const TQString &url, const TQString &cwd) // Special shortcuts for "man:" and "info:" if ( url_copy[0] == '#' ) { if ( url_copy[1] == '#' ) - url_copy.tqreplace( 0, 2, TQString("info:") ); + url_copy.replace( 0, 2, TQString("info:") ); else - url_copy.tqreplace( 0, 1, TQString("man:") ); + url_copy.replace( 0, 1, TQString("man:") ); } // Look for a protocol in 'url' @@ -414,11 +414,11 @@ KURLCompletion::MyURL::~MyURL() delete m_kurl; } -void KURLCompletion::MyURL::filter( bool tqreplace_user_dir, bool tqreplace_env ) +void KURLCompletion::MyURL::filter( bool replace_user_dir, bool replace_env ) { TQString d = dir() + file(); - if ( tqreplace_user_dir ) expandTilde( d ); - if ( tqreplace_env ) expandEnv( d ); + if ( replace_user_dir ) expandTilde( d ); + if ( replace_env ) expandEnv( d ); m_kurl->setPath( d ); } @@ -455,8 +455,8 @@ public: TQString cwd; // "current directory" = base dir for completion KURLCompletion::Mode mode; // ExeCompletion, FileCompletion, DirCompletion - bool tqreplace_env; - bool tqreplace_home; + bool replace_env; + bool replace_home; bool complete_url; // if true completing a URL (i.e. 'prepend' is a URL), otherwise a path KIO::ListJob *list_job; // kio job to list directories @@ -511,8 +511,8 @@ void KURLCompletion::init() d->cwd = TQDir::homeDirPath(); - d->tqreplace_home = true; - d->tqreplace_env = true; + d->replace_home = true; + d->replace_env = true; d->last_no_hidden = false; d->last_compl_type = 0; d->list_job = 0L; @@ -547,24 +547,24 @@ void KURLCompletion::setMode( Mode mode ) d->mode = mode; } -bool KURLCompletion::tqreplaceEnv() const +bool KURLCompletion::replaceEnv() const { - return d->tqreplace_env; + return d->replace_env; } -void KURLCompletion::setReplaceEnv( bool tqreplace ) +void KURLCompletion::setReplaceEnv( bool replace ) { - d->tqreplace_env = tqreplace; + d->replace_env = replace; } -bool KURLCompletion::tqreplaceHome() const +bool KURLCompletion::replaceHome() const { - return d->tqreplace_home; + return d->replace_home; } -void KURLCompletion::setReplaceHome( bool tqreplace ) +void KURLCompletion::setReplaceHome( bool replace ) { - d->tqreplace_home = tqreplace; + d->replace_home = replace; } /* @@ -592,16 +592,16 @@ TQString KURLCompletion::makeCompletion(const TQString &text) // Environment variables // - if ( d->tqreplace_env && envCompletion( url, &match ) ) + if ( d->replace_env && envCompletion( url, &match ) ) return match; // User directories // - if ( d->tqreplace_home && userCompletion( url, &match ) ) + if ( d->replace_home && userCompletion( url, &match ) ) return match; // Replace user directories and variables - url.filter( d->tqreplace_home, d->tqreplace_env ); + url.filter( d->replace_home, d->replace_env ); //kdDebug() << "Filtered: proto=" << url.protocol() // << ", dir=" << url.dir() @@ -786,7 +786,7 @@ bool KURLCompletion::envCompletion(const MyURL &url, TQString *match) while ( *env ) { TQString s = TQString::fromLocal8Bit( *env ); - int pos = s.tqfind('='); + int pos = s.find('='); if ( pos == -1 ) pos = s.length(); @@ -1370,23 +1370,23 @@ void KURLCompletion::customEvent(TQCustomEvent *e) } // static -TQString KURLCompletion::tqreplacedPath( const TQString& text, bool tqreplaceHome, bool tqreplaceEnv ) +TQString KURLCompletion::replacedPath( const TQString& text, bool replaceHome, bool replaceEnv ) { if ( text.isEmpty() ) return text; - MyURL url( text, TQString::null ); // no need to tqreplace something of our current cwd + MyURL url( text, TQString::null ); // no need to replace something of our current cwd if ( !url.kurl()->isLocalFile() ) return text; - url.filter( tqreplaceHome, tqreplaceEnv ); + url.filter( replaceHome, replaceEnv ); return url.dir() + url.file(); } -TQString KURLCompletion::tqreplacedPath( const TQString& text ) +TQString KURLCompletion::replacedPath( const TQString& text ) { - return tqreplacedPath( text, d->tqreplace_home, d->tqreplace_env ); + return replacedPath( text, d->replace_home, d->replace_env ); } ///////////////////////////////////////////////////////// @@ -1407,7 +1407,7 @@ static bool expandEnv( TQString &text ) bool expanded = false; - while ( (pos = text.tqfind('$', pos)) != -1 ) { + while ( (pos = text.find('$', 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.tqfind( ' ', pos+1 ); - int pos_tmp = text.tqfind( '/', pos+1 ); + int pos2 = text.find( ' ', pos+1 ); + int pos_tmp = text.find( '/', pos+1 ); if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) pos2 = pos_tmp; @@ -1439,7 +1439,7 @@ static bool expandEnv( TQString &text ) if ( !value.isEmpty() ) { expanded = true; - text.tqreplace( pos, len, value ); + text.replace( pos, len, value ); pos = pos + value.length(); } else { @@ -1467,8 +1467,8 @@ static bool expandTilde(TQString &text) // Find the end of the user name = next '/' or ' ' // - int pos2 = text.tqfind( ' ', 1 ); - int pos_tmp = text.tqfind( '/', 1 ); + int pos2 = text.find( ' ', 1 ); + int pos_tmp = text.find( '/', 1 ); if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) pos2 = pos_tmp; @@ -1483,12 +1483,12 @@ static bool expandTilde(TQString &text) TQString user = text.mid( 1, pos2-1 ); TQString dir; - // A single ~ is tqreplaced with $HOME + // A single ~ is replaced with $HOME // if ( user.isEmpty() ) { dir = TQDir::homeDirPath(); } - // ~user is tqreplaced with the dir from passwd + // ~user is replaced with the dir from passwd // else { struct passwd *pw = ::getpwnam( user.local8Bit() ); @@ -1501,7 +1501,7 @@ static bool expandTilde(TQString &text) if ( !dir.isEmpty() ) { expanded = true; - text.tqreplace(0, pos2, dir); + text.replace(0, pos2, dir); } } diff --git a/kio/kio/kurlcompletion.h b/kio/kio/kurlcompletion.h index d2759ae5d..a06d7dc4b 100644 --- a/kio/kio/kurlcompletion.h +++ b/kio/kio/kurlcompletion.h @@ -119,34 +119,34 @@ public: /** * Checks whether environment variables are completed and - * whether they are tqreplaced internally while tqfinding completions. + * whether they are replaced internally while finding completions. * Default is enabled. - * @return true if environment vvariables will be tqreplaced + * @return true if environment vvariables will be replaced */ - virtual bool tqreplaceEnv() const; + virtual bool replaceEnv() const; /** - * Enables/disables completion and tqreplacement (internally) of + * Enables/disables completion and replacement (internally) of * environment variables in URLs. Default is enabled. - * @param tqreplace true to tqreplace environment variables + * @param replace true to replace environment variables */ - virtual void setReplaceEnv( bool tqreplace ); + virtual void setReplaceEnv( bool replace ); /** * Returns whether ~username is completed and whether ~username - * is tqreplaced internally with the user's home directory while - * tqfinding completions. Default is enabled. - * @return true to tqreplace tilde with the home directory + * is replaced internally with the user's home directory while + * finding completions. Default is enabled. + * @return true to replace tilde with the home directory */ - virtual bool tqreplaceHome() const; + virtual bool replaceHome() const; /** - * Enables/disables completion of ~username and tqreplacement + * Enables/disables completion of ~username and replacement * (internally) of ~username with the user's home directory. * Default is enabled. - * @param tqreplace true to tqreplace tilde with the home directory + * @param replace true to replace tilde with the home directory */ - virtual void setReplaceHome( bool tqreplace ); + virtual void setReplaceHome( bool replace ); /** * Replaces username and/or environment variables, depending on the @@ -157,14 +157,14 @@ public: * @return the path or URL resulting from this operation. If you * want to convert it to a KURL, use KURL::fromPathOrURL. */ - TQString tqreplacedPath( const TQString& text ); + TQString replacedPath( const TQString& text ); /** * @internal I'll let ossi add a real one to KShell :) * @since 3.2 */ - static TQString tqreplacedPath( const TQString& text, - bool tqreplaceHome, bool tqreplaceEnv = true ); + static TQString replacedPath( const TQString& text, + bool replaceHome, bool replaceEnv = true ); class MyURL; protected: diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index 690b3ff96..b7ef68c76 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.tqfind( (*it)->desktopEntryPath() ) == serviceList.end() ) + if ( serviceList.find( (*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.tqfind( service->storageId() ); + TQMap<TQString,Service>::ConstIterator it = m_mapServices.find( 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.tqfind( service->storageId() ); + TQMap<TQString,Service>::ConstIterator it = m_mapServices.find( service->storageId() ); if ( it == m_mapServices.end() ) return 0; @@ -269,8 +269,8 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers() const //kdDebug(7014) << "KServiceTypeProfile::offers considering " << (*it)->name() << endl; if ( m_strGenericServiceType.isEmpty() || (*it)->hasServiceType( m_strGenericServiceType ) ) { - // Now look into the profile, to tqfind this service's preference. - TQMap<TQString,Service>::ConstIterator it2 = m_mapServices.tqfind( (*it)->storageId() ); + // Now look into the profile, to find this service's preference. + TQMap<TQString,Service>::ConstIterator it2 = m_mapServices.find( (*it)->storageId() ); if( it2 != m_mapServices.end() ) { diff --git a/kio/kio/kuserprofile.h b/kio/kio/kuserprofile.h index 1282d182b..061657625 100644 --- a/kio/kio/kuserprofile.h +++ b/kio/kio/kuserprofile.h @@ -106,7 +106,7 @@ private: * It consists of a list of services (service offers) for the service type * that is sorted by the user's preference. * KTrader uses KServiceTypeProfile to sort its results, so usually - * you can just use KTrader to tqfind the user's preferred service. + * you can just use KTrader to find the user's preferred service. * * @see KService * @see KServiceType diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp index 46bd39725..6f29bb264 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 TQ_UINT16 time = + const Q_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 TQ_UINT16 date = + const Q_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) { - TQ_UINT16 time = (uchar)buffer[0] | ( (uchar)buffer[1] << 8 ); + Q_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); - TQ_UINT16 date = (uchar)buffer[2] | ( (uchar)buffer[3] << 8 ); + Q_UINT16 date = (uchar)buffer[2] | ( (uchar)buffer[3] << 8 ); int y = ( date >> 9 ) + 1980; int o = ( date & 0x1ff ) >> 5; int d = ( date & 0x1f ); @@ -148,7 +148,7 @@ static bool parseExtTimestamp(const char *buffer, int size, bool islocal, buffer += 1; size -= 1; - if (flags & 1) { // tqcontains modification time + if (flags & 1) { // contains modification time if (size < 4) { kdDebug(7040) << "premature end of extended timestamp (#2)" << endl; return false; @@ -165,7 +165,7 @@ static bool parseExtTimestamp(const char *buffer, int size, bool islocal, return true; }/*end if*/ - if (flags & 2) { // tqcontains last access time + if (flags & 2) { // contains last access time if (size < 4) { kdDebug(7040) << "premature end of extended timestamp (#3)" << endl; return true; @@ -176,7 +176,7 @@ static bool parseExtTimestamp(const char *buffer, int size, bool islocal, size -= 4; }/*end if*/ - if (flags & 4) { // tqcontains creation time + if (flags & 4) { // contains creation time if (size < 4) { kdDebug(7040) << "premature end of extended timestamp (#4)" << endl; return true; @@ -234,7 +234,7 @@ static bool parseInfoZipUnixOld(const char *buffer, int size, bool islocal, */ static bool parseInfoZipUnixNew(const char *buffer, int size, bool islocal, ParseFileInfo &pfi) { - if (!islocal) { // tqcontains nothing in central field + if (!islocal) { // contains nothing in central field pfi.newinfounix = true; return true; }/*end if*/ @@ -417,7 +417,7 @@ bool KZip::openArchive( int mode ) uint offset = 0; // holds offset, where we read int n; - // tqcontains information gathered from the local file headers + // contains information gathered from the local file headers TQAsciiDict<ParseFileInfo> pfi_map(1009, true /*case sensitive */, true /*copy keys*/); pfi_map.setAutoDelete(true); @@ -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 ); - TQ_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8 + Q_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8 | (uchar)buffer[14] << 16 | (uchar)buffer[15] << 24; - TQ_LONG uncomp_size = (uchar)buffer[16] | (uchar)buffer[17] << 8 + Q_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; @@ -512,7 +512,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; // the file and we look for the signature 'PK\7\8'. if ( gpf & 8 ) { - // here we have to read through the compressed data to tqfind + // here we have to read through the compressed data to find // the next PKxx kdDebug(7040) << "trying to seek for next PK78" << endl; bool foundSignature = false; @@ -563,7 +563,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; else { // here we skip the compressed data and jump to the next header - kdDebug(7040) << "general purpose bit flag indicates, that local file header tqcontains valid size" << endl; + kdDebug(7040) << "general purpose bit flag indicates, that local file header contains valid size" << endl; // check if this could be a symbolic link if (compression_mode == NoCompression && uncomp_size <= max_path_len @@ -578,10 +578,10 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; } } else { - if ( compr_size > (TQ_LONG)dev->size() ) + if ( compr_size > (Q_LONG)dev->size() ) { // here we cannot trust the compressed size, so scan through the compressed - // data to tqfind the next header + // data to find the next header bool foundSignature = false; while (!foundSignature) @@ -736,7 +736,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; else Q_ASSERT(access & S_IFDIR); } - int pos = name.tqfindRev( '/' ); + int pos = name.findRev( '/' ); if ( pos == -1 ) entryName = name; else @@ -782,10 +782,10 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; } else { - // In some tar files we can tqfind dir/./file => call cleanDirPath + // In some tar files we can find dir/./file => call cleanDirPath TQString path = TQDir::cleanDirPath( name.left( pos ) ); // Ensure container directory exists, create otherwise - KArchiveDirectory * tdir = tqfindOrCreate( path ); + KArchiveDirectory * tdir = findOrCreate( path ); tdir->addEntry(entry); } } @@ -800,7 +800,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; else if ( startOfFile ) { // The file does not start with any ZIP header (e.g. self-extractable ZIP files) - // Therefore we need to tqfind the first PK\003\004 (local header) + // Therefore we need to find the first PK\003\004 (local header) kdDebug(7040) << "Try to skip start of file" << endl; startOfFile = false; bool foundSignature = false; @@ -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); - TQ_LONG centraldiroffset = device()->at(); + Q_LONG centraldiroffset = device()->at(); //kdDebug(7040) << "closearchive: centraldiroffset: " << centraldiroffset << endl; - TQ_LONG atbackup = centraldiroffset; + Q_LONG atbackup = centraldiroffset; TQPtrListIterator<KZipFileEntry> it( d->m_fileList ); for ( ; it.current() ; ++it ) @@ -994,7 +994,7 @@ bool KZip::closeArchive() if ( !ok ) return false; } - TQ_LONG centraldirendoffset = device()->at(); + Q_LONG centraldirendoffset = device()->at(); //kdDebug(7040) << "closearchive: centraldirendoffset: " << centraldirendoffset << endl; //kdDebug(7040) << "closearchive: device()->at(): " << device()->at() << endl; @@ -1133,13 +1133,13 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, // Find or create parent dir KArchiveDirectory* parentDir = rootDir(); TQString fileName( name ); - int i = name.tqfindRev( '/' ); + int i = name.findRev( '/' ); if ( i != -1 ) { TQString dir = name.left( i ); fileName = name.mid( i + 1 ); //kdDebug(7040) << "KZip::prepareWriting ensuring " << dir << " exists. fileName=" << fileName << endl; - parentDir = tqfindOrCreate( dir ); + parentDir = findOrCreate( dir ); } // construct a KZipFileEntry and add it to list @@ -1212,7 +1212,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, extfield[1] = 'T'; extfield[2] = 13; // data size extfield[3] = 0; - extfield[4] = 1 | 2 | 4; // tqcontains mtime, atime, ctime + extfield[4] = 1 | 2 | 4; // contains mtime, atime, ctime extfield[5] = char(mtime); extfield[6] = char(mtime >> 8); @@ -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); - TQ_LONG written = d->m_currentDev->writeBlock( c, i ); + Q_LONG written = d->m_currentDev->writeBlock( c, i ); //kdDebug(7040) << "KZip::writeData wrote " << i << " bytes." << endl; - bool ok = written == (TQ_LONG)i; + bool ok = written == (Q_LONG)i; if ( !ok ) abort(); return ok; @@ -1453,7 +1453,7 @@ TQIODevice* KZipFileEntry::device() const return filterDev; } - kdError() << "This zip file tqcontains files compressed with method " + kdError() << "This zip file contains files compressed with method " << encoding() <<", this method is currently not supported by KZip," <<" please use a command-line tool to handle this file." << endl; return 0L; diff --git a/kio/kio/kzip.h b/kio/kio/kzip.h index 26bfc71d3..291f827f8 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, TQ_LONG start, TQ_LONG uncompressedSize, - int encoding, TQ_LONG compressedSize) : + const TQString& path, Q_LONG start, Q_LONG uncompressedSize, + int encoding, Q_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; } - TQ_LONG compressedSize() const { return m_compressedSize; } + Q_LONG compressedSize() const { return m_compressedSize; } /// Only used when writing - void setCompressedSize(TQ_LONG compressedSize) { m_compressedSize = compressedSize; } + void setCompressedSize(Q_LONG compressedSize) { m_compressedSize = compressedSize; } /// Header start: only used when writing - void setHeaderStart(TQ_LONG headerstart) { m_headerStart = headerstart; } - TQ_LONG headerStart() const {return m_headerStart; } + void setHeaderStart(Q_LONG headerstart) { m_headerStart = headerstart; } + Q_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; - TQ_LONG m_compressedSize; - TQ_LONG m_headerStart; + Q_LONG m_compressedSize; + Q_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/lex.c b/kio/kio/lex.c index 012981d1c..4b8cb21f7 100644 --- a/kio/kio/lex.c +++ b/kio/kio/lex.c @@ -656,7 +656,7 @@ yy_match: } while ( yy_base[yy_current_state] != 96 ); -yy_tqfind_action: +yy_find_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ @@ -678,7 +678,7 @@ do_action: /* This label is used only to access EOF actions. */ *yy_cp = yy_hold_char; yy_cp = yy_last_accepting_cpos; yy_current_state = yy_last_accepting_state; - goto yy_tqfind_action; + goto yy_find_action; case 1: YY_RULE_SETUP @@ -873,7 +873,7 @@ case YY_STATE_EOF(INITIAL): else { yy_cp = yy_c_buf_p; - goto yy_tqfind_action; + goto yy_find_action; } } @@ -926,7 +926,7 @@ case YY_STATE_EOF(INITIAL): yy_cp = yy_c_buf_p; yy_bp = yytext_ptr + YY_MORE_ADJ; - goto yy_tqfind_action; + goto yy_find_action; } break; } diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 28bc23633..3998584e3 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.tqfind(item)); + d->items.remove(d->items.find(item)); } void MetaInfoJob::determineNextFile() diff --git a/kio/kio/metainfojob.h b/kio/kio/metainfojob.h index 742841d93..3b96713fb 100644 --- a/kio/kio/metainfojob.h +++ b/kio/kio/metainfojob.h @@ -53,7 +53,7 @@ namespace KIO { /** * Returns a list of all available metainfo plugins. The list - * tqcontains the basenames of the plugins' .desktop files (no path, + * contains the basenames of the plugins' .desktop files (no path, * no .desktop). * @return the list of available meta info plugins */ diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp index 696690a8c..5189b93d6 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->tqcontains(name)) + if (tmpfiles->contains(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::tqfromLatin1("unknown"); + m_mimetype = TQString::fromLatin1("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.tqfindRev('/'); + int pos = remoteTempFileName.findRev('/'); 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->tqmetaObject(); + TQMetaObject *meta = job->metaObject(); static const char dataSignal[] = "data(KIO::Job*,const TQByteArray&)"; - if ( meta->tqfindSignal( dataSignal ) != -1 ) { + if ( meta->findSignal( 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->tqfindSignal( redirSignal ) != -1 ) { + if ( meta->findSignal( redirSignal ) != -1 ) { connect( job, TQT_SIGNAL(redirection(KIO::Job*,const KURL&)), this, TQT_SLOT(slotRedirection(KIO::Job*, const KURL&)) ); } @@ -495,7 +495,7 @@ void NetAccess::enter_loop() TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); - tqApp->enter_loop(); + qApp->enter_loop(); qt_leave_modal(&dummy); } @@ -515,7 +515,7 @@ void NetAccess::slotResult( KIO::Job * job ) if ( m_metaData ) *m_metaData = job->metaData(); - tqApp->exit_loop(); + qApp->exit_loop(); } void NetAccess::slotData( KIO::Job*, const TQByteArray& data ) diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h index 3fb9103af..caeb7b985 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 TQObject +class KIO_EXPORT NetAccess : public QObject { Q_OBJECT @@ -92,7 +92,7 @@ public: * } * \endcode * - * Of course, your user interface will still process exposure/tqrepaint + * Of course, your user interface will still process exposure/repaint * events during the download. * * If the download fails, lastError() and lastErrorString() will be set. diff --git a/kio/kio/observer.cpp b/kio/kio/observer.cpp index b09b8b39a..2a468b1e6 100644 --- a/kio/kio/observer.cpp +++ b/kio/kio/observer.cpp @@ -101,7 +101,7 @@ void Observer::killJob( int progressId ) KIO::Job * job = m_dctJobs[ progressId ]; if (!job) { - kdWarning() << "Can't tqfind job to kill ! There is no job with progressId=" << progressId << " in this process" << endl; + kdWarning() << "Can't find job to kill ! There is no job with progressId=" << progressId << " in this process" << endl; return; } job->kill( false /* not quietly */ ); diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index 11257abdd..83434906b 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -37,7 +37,7 @@ using namespace KIO; struct PasswordDialog::PasswordDialogPrivate { - TQGridLayout *tqlayout; + TQGridLayout *layout; TQLineEdit* userEdit; KLineEdit* passEdit; TQLabel* userNameLabel; @@ -77,8 +77,8 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, KConfig* cfg = KGlobal::config(); KConfigGroupSaver saver( cfg, "Passwords" ); - d->tqlayout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint()); - d->tqlayout->addColSpacing(1, 5); + d->layout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint()); + d->layout->addColSpacing(1, 5); // Row 0: pixmap prompt TQLabel* lbl; @@ -87,69 +87,69 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, { lbl = new TQLabel( main ); lbl->setPixmap( pix ); - lbl->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter ); - lbl->setFixedSize( lbl->tqsizeHint() ); - d->tqlayout->addWidget( lbl, 0, 0, Qt::AlignLeft ); + lbl->setAlignment( Qt::AlignLeft|Qt::AlignVCenter ); + lbl->setFixedSize( lbl->sizeHint() ); + d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft ); } d->prompt = new TQLabel( main ); - d->prompt->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter|Qt::WordBreak ); - d->tqlayout->addWidget( d->prompt, 0, 2, Qt::AlignLeft ); + d->prompt->setAlignment( Qt::AlignLeft|Qt::AlignVCenter|Qt::WordBreak ); + d->layout->addWidget( d->prompt, 0, 2, Qt::AlignLeft ); if ( prompt.isEmpty() ) setPrompt( i18n( "You need to supply a username and a password" ) ); else setPrompt( prompt ); // Row 1: Row Spacer - d->tqlayout->addRowSpacing( 1, 7 ); + d->layout->addRowSpacing( 1, 7 ); // Row 2-3: Reserved for an additional comment // Row 4: Username field d->userNameLabel = new TQLabel( i18n("&Username:"), main ); - d->userNameLabel->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); - d->userNameLabel->setFixedSize( d->userNameLabel->tqsizeHint() ); + d->userNameLabel->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() ); d->userNameHBox = new TQHBox( main ); d->userEdit = new KLineEdit( d->userNameHBox ); - TQSize s = d->userEdit->tqsizeHint(); + TQSize s = d->userEdit->sizeHint(); d->userEdit->setFixedHeight( s.height() ); d->userEdit->setMinimumWidth( s.width() ); d->userNameLabel->setBuddy( d->userEdit ); - d->tqlayout->addWidget( d->userNameLabel, 4, 0 ); - d->tqlayout->addWidget( d->userNameHBox, 4, 2 ); + d->layout->addWidget( d->userNameLabel, 4, 0 ); + d->layout->addWidget( d->userNameHBox, 4, 2 ); // Row 5: Row spacer - d->tqlayout->addRowSpacing( 5, 4 ); + d->layout->addRowSpacing( 5, 4 ); // Row 6: Password field lbl = new TQLabel( i18n("&Password:"), main ); - lbl->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); - lbl->setFixedSize( lbl->tqsizeHint() ); + lbl->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + lbl->setFixedSize( lbl->sizeHint() ); 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->tqsizeHint(); + s = d->passEdit->sizeHint(); d->passEdit->setFixedHeight( s.height() ); d->passEdit->setMinimumWidth( s.width() ); lbl->setBuddy( d->passEdit ); - d->tqlayout->addWidget( lbl, 6, 0 ); - d->tqlayout->addWidget( hbox, 6, 2 ); + d->layout->addWidget( lbl, 6, 0 ); + d->layout->addWidget( hbox, 6, 2 ); if ( enableKeep ) { // Row 7: Add spacer - d->tqlayout->addRowSpacing( 7, 4 ); + d->layout->addRowSpacing( 7, 4 ); // Row 8: Keep Password hbox = new TQHBox( main ); d->keepCheckBox = new TQCheckBox( i18n("&Keep password"), hbox ); - d->keepCheckBox->setFixedSize( d->keepCheckBox->tqsizeHint() ); + d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() ); d->keep = cfg->readBoolEntry("Keep", false ); d->keepCheckBox->setChecked( d->keep ); connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); - d->tqlayout->addWidget( hbox, 8, 2 ); + d->layout->addWidget( hbox, 8, 2 ); } // Configure necessary key-bindings and connect necessar slots and signals @@ -165,7 +165,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->userEdit->setFocus(); d->userEditCombo = 0; -// setFixedSize( tqsizeHint() ); +// setFixedSize( sizeHint() ); } 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->tqtopLevelWidget()); + TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget()); pref_width = d.width() / 4; rt.setWidth(pref_width-10); @@ -239,14 +239,14 @@ void PasswordDialog::addCommentLine( const TQString& label, TQWidget *main = mainWidget(); TQLabel* lbl = new TQLabel( label, main); - lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignRight ); - lbl->setFixedSize( lbl->tqsizeHint() ); - d->tqlayout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); + lbl->setAlignment( Qt::AlignVCenter|Qt::AlignRight ); + lbl->setFixedSize( lbl->sizeHint() ); + d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); lbl = new TQLabel( comment, main); - lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak ); + lbl->setAlignment( Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak ); calculateLabelSize(lbl); - d->tqlayout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft ); - d->tqlayout->addRowSpacing( 3, 10 ); // Add a spacer + d->layout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft ); + d->layout->addRowSpacing( 3, 10 ); // Add a spacer d->nRow++; } @@ -304,11 +304,11 @@ 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->tqsizeHint(); + TQSize s = d->userEditCombo->sizeHint(); d->userEditCombo->setFixedHeight( s.height() ); d->userEditCombo->setMinimumWidth( s.width() ); d->userNameLabel->setBuddy( d->userEditCombo ); - d->tqlayout->addWidget( d->userNameHBox, 4, 2 ); + d->layout->addWidget( d->userNameHBox, 4, 2 ); } d->knownLogins = knownLogins; @@ -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.tqfind( userName ); + TQMap<TQString, TQString>::ConstIterator it = d->knownLogins.find( userName ); if ( it != d->knownLogins.end() ) setPassword( it.data() ); } diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp index 6a232d045..399350236 100644 --- a/kio/kio/paste.cpp +++ b/kio/kio/paste.cpp @@ -137,7 +137,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, if ( clipboard ) { data = TQApplication::clipboard()->data(); } - const TQByteArray ba = data->tqencodedData( chosenFormat ); + const TQByteArray ba = data->encodedData( chosenFormat ); return pasteDataAsyncTo( new_url, ba ); } #endif @@ -147,13 +147,13 @@ KIO_EXPORT bool KIO::isClipboardEmpty() { #ifndef QT_NO_MIMECLIPBOARD TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "text/uri-list" ) && data->tqencodedData( "text/uri-list" ).size() > 0 ) + if ( data->provides( "text/uri-list" ) && data->encodedData( "text/uri-list" ).size() > 0 ) return false; #else // Happens with some versions of Qt Embedded... :/ // Guess. TQString data = TQApplication::clipboard()->text(); - if(data.tqcontains("://")) + if(data.contains("://")) return false; #endif return true; @@ -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->tqencodedData( formats.first() ); + ba = data->encodedData( formats.first() ); } if ( ba.size() == 0 ) { diff --git a/kio/kio/paste.h b/kio/kio/paste.h index dceddad9e..a65e956e1 100644 --- a/kio/kio/paste.h +++ b/kio/kio/paste.h @@ -105,7 +105,7 @@ namespace KIO { bool clipboard = false ); /** - * Checks whether the clipboard tqcontains any URLs. + * Checks whether the clipboard contains any URLs. * @return true if not * Not used anymore, wrong method name, so it will disappear in KDE4. */ diff --git a/kio/kio/pastedialog.cpp b/kio/kio/pastedialog.cpp index dd9d947e8..480eaaba8 100644 --- a/kio/kio/pastedialog.cpp +++ b/kio/kio/pastedialog.cpp @@ -35,23 +35,23 @@ KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, : KDialogBase( parent, 0 /*name*/, true, caption, Ok|Cancel, Ok, true ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); m_label = new TQLabel( label, frame ); - tqlayout->addWidget( m_label ); + layout->addWidget( m_label ); m_lineEdit = new KLineEdit( value, frame ); - tqlayout->addWidget( m_lineEdit ); + layout->addWidget( m_lineEdit ); m_lineEdit->setFocus(); m_label->setBuddy( m_lineEdit ); - tqlayout->addWidget( new TQLabel( i18n( "Data format:" ), frame ) ); + layout->addWidget( new TQLabel( i18n( "Data format:" ), frame ) ); m_comboBox = new TQComboBox( frame ); m_comboBox->insertStringList( items ); - tqlayout->addWidget( m_comboBox ); + layout->addWidget( m_comboBox ); - tqlayout->addStretch(); + layout->addStretch(); //connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), // TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index 9939880b5..3802093c1 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 tqmaximumSize; + unsigned long maximumSize; // 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->tqcontains((*it)->desktopEntryName())) + if (!d->enabledPlugins || d->enabledPlugins->contains((*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.tqfind(it.current()->mimetype()); + TQMap<TQString, KService::Ptr>::ConstIterator plugin = mimeMap.find(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.tqfind(mimeType.tqreplace(TQRegExp("/.*"), "/*")); + plugin = mimeMap.find(mimeType.replace(TQRegExp("/.*"), "/*")); if (plugin == mimeMap.end()) { @@ -196,7 +196,7 @@ void PreviewJob::startPreview() TQString parentMimeType = mimeInfo->parentMimeType(); while (!parentMimeType.isEmpty()) { - plugin = mimeMap.tqfind(parentMimeType); + plugin = mimeMap.find(parentMimeType); if (plugin != mimeMap.end()) break; KMimeType::Ptr parentMimeInfo = KMimeType::mimeType(parentMimeType); @@ -215,10 +215,10 @@ void PreviewJob::startPreview() { if (textProperty.toBool()) { - plugin = mimeMap.tqfind("text/plain"); + plugin = mimeMap.find("text/plain"); if (plugin == mimeMap.end()) { - plugin = mimeMap.tqfind( "text/*" ); + plugin = mimeMap.find( "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->tqmaximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); + d->maximumSize = 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->tqmaximumSize && + if ( filesize_t((*it).m_long) > d->maximumSize && !d->ignoreMaximumSize && !d->currentItem.plugin->property("IgnoreMaximumSize").toBool() ) { @@ -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.tqcontains((*it)->desktopEntryName())) + if (!result.contains((*it)->desktopEntryName())) result.append((*it)->desktopEntryName()); return result; } diff --git a/kio/kio/previewjob.h b/kio/kio/previewjob.h index ea3875cd1..d7686505e 100644 --- a/kio/kio/previewjob.h +++ b/kio/kio/previewjob.h @@ -77,7 +77,7 @@ namespace KIO { /** * Returns a list of all available preview plugins. The list - * tqcontains the basenames of the plugins' .desktop files (no path, + * contains the basenames of the plugins' .desktop files (no path, * no .desktop). * @return the list of plugins */ diff --git a/kio/kio/progressbase.h b/kio/kio/progressbase.h index fce482fb8..d9e3d8f96 100644 --- a/kio/kio/progressbase.h +++ b/kio/kio/progressbase.h @@ -47,7 +47,7 @@ namespace KIO * Add your GUI code to the constructor and implemement those virtual * methods which you need in order to display progress. * -* E.g. tqStatusbarProgress only implements slotTotalSize(), +* E.g. StatusbarProgress only implements slotTotalSize(), * slotPercent() and slotSpeed(). * * Custom progress dialog will be used like this : diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index cca120266..fe830b2e3 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -317,11 +317,11 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, TQLabel *lb = new KSqueezedTextLabel( sentence1.arg(d->dest.pathOrURL()), this ); pLayout->addWidget(lb); } - TQHBoxLayout* tqlayout2 = new TQHBoxLayout(); - pLayout->addLayout( tqlayout2 ); + TQHBoxLayout* layout2 = new TQHBoxLayout(); + pLayout->addLayout( layout2 ); d->m_pLineEdit = new TQLineEdit( this ); - tqlayout2->addWidget( d->m_pLineEdit ); + layout2->addWidget( d->m_pLineEdit ); TQString fileName = d->dest.fileName(); d->m_pLineEdit->setText( KIO::decodeFileName( fileName ) ); if ( d->bRename || d->bOverwrite ) @@ -329,58 +329,58 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, TQT_SLOT(enableRenameButton(const TQString &))); if ( d->bSuggestNewName ) { - tqlayout2->addWidget( d->bSuggestNewName ); + layout2->addWidget( d->bSuggestNewName ); setTabOrder( d->m_pLineEdit, d->bSuggestNewName ); } KSeparator* separator = new KSeparator( this ); pLayout->addWidget( separator ); - TQHBoxLayout* tqlayout = new TQHBoxLayout(); - pLayout->addLayout( tqlayout ); + TQHBoxLayout* layout = new TQHBoxLayout(); + pLayout->addLayout( layout ); - tqlayout->addStretch(1); + layout->addStretch(1); if ( d->bRename ) { - tqlayout->addWidget( d->bRename ); + layout->addWidget( d->bRename ); setTabOrder( d->bRename, d->bCancel ); } if ( d->bSkip ) { - tqlayout->addWidget( d->bSkip ); + layout->addWidget( d->bSkip ); setTabOrder( d->bSkip, d->bCancel ); } if ( d->bAutoSkip ) { - tqlayout->addWidget( d->bAutoSkip ); + layout->addWidget( d->bAutoSkip ); setTabOrder( d->bAutoSkip, d->bCancel ); } if ( d->bOverwrite ) { - tqlayout->addWidget( d->bOverwrite ); + layout->addWidget( d->bOverwrite ); setTabOrder( d->bOverwrite, d->bCancel ); } if ( d->bOverwriteAll ) { - tqlayout->addWidget( d->bOverwriteAll ); + layout->addWidget( d->bOverwriteAll ); setTabOrder( d->bOverwriteAll, d->bCancel ); } if ( d->bResume ) { - tqlayout->addWidget( d->bResume ); + layout->addWidget( d->bResume ); setTabOrder( d->bResume, d->bCancel ); } if ( d->bResumeAll ) { - tqlayout->addWidget( d->bResumeAll ); + layout->addWidget( d->bResumeAll ); setTabOrder( d->bResumeAll, d->bCancel ); } d->bCancel->setDefault( true ); - tqlayout->addWidget( d->bCancel ); + layout->addWidget( d->bCancel ); - resize( tqsizeHint() ); + resize( sizeHint() ); } RenameDlg::~RenameDlg() @@ -440,13 +440,13 @@ TQString RenameDlg::suggestName(const KURL& baseURL, const TQString& oldName) TQString dotSuffix, suggestedName; TQString basename = oldName; - int index = basename.tqfind( '.' ); + int index = basename.find( '.' ); if ( index != -1 ) { dotSuffix = basename.mid( index ); basename.truncate( index ); } - int pos = basename.tqfindRev( '_' ); + int pos = basename.findRev( '_' ); if(pos != -1 ){ TQString tmp = basename.mid( pos+1 ); bool ok; @@ -456,7 +456,7 @@ TQString RenameDlg::suggestName(const KURL& baseURL, const TQString& oldName) } else { // yes there's already a number behind the _ so increment it by one - basename.tqreplace( pos+1, tmp.length(), TQString::number(number+1) ); + basename.replace( pos+1, tmp.length(), TQString::number(number+1) ); suggestedName = basename + dotSuffix; } } diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index eaa9af646..8ab080486 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 = tqfind(protocol); + ProtocolInfo *info = find(protocol); if (!info) { info = new ProtocolInfo; @@ -206,7 +206,7 @@ void Scheduler::_doJob(SimpleJob *job) { jobData->checkOnHold = checkOnHold; checkOnHold = false; } - extraJobData->tqreplace(job, jobData); + extraJobData->replace(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->tqfind(job); + JobData *jobData = extraJobData->find(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->tqfind(job); + JobData *jobData = extraJobData->find(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.tqfind(slave); + JobList *list = coSlaves.find(slave); if (list && list->removeRef(job)) break; // Job was found and removed. // Fall through to kill the slave as well! @@ -347,7 +347,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) // 2 times in a row. The protInfo->skipCount = 0; job = protInfo->joblist.at(0); - slave = tqfindIdleSlave(protInfo, job, dummy ); + slave = findIdleSlave(protInfo, job, dummy ); } else { @@ -357,7 +357,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) for(uint i = 0; (i < protInfo->joblist.count()) && (i < 10); i++) { job = protInfo->joblist.at(i); - slave = tqfindIdleSlave(protInfo, job, exact); + slave = findIdleSlave(protInfo, job, exact); if (!firstSlave) { firstJob = job; @@ -402,7 +402,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) // kdDebug(7006) << "scheduler: job started " << job << endl; - JobData *jobData = extraJobData->tqfind(job); + JobData *jobData = extraJobData->find(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->tqfind(job); + JobData *jobData = extraJobData->find(job); if (!jobData) { kdFatal(7006) << "BUG! startjobDirect(): No extraJobData for job!" @@ -428,7 +428,7 @@ bool Scheduler::startJobDirect() bool dummy; // Look for matching slave - Slave *slave = tqfindIdleSlave(protInfo, job, dummy); + Slave *slave = findIdleSlave(protInfo, job, dummy); if (!slave) { @@ -478,13 +478,13 @@ static Slave *searchIdleList(SlaveList *idleSlaves, const KURL &url, const TQStr return 0; } -Slave *Scheduler::tqfindIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) +Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) { Slave *slave = 0; - JobData *jobData = extraJobData->tqfind(job); + JobData *jobData = extraJobData->find(job); if (!jobData) { - kdFatal(7006) << "BUG! tqfindIdleSlave(): No extraJobData for job!" << endl; + kdFatal(7006) << "BUG! findIdleSlave(): No extraJobData for job!" << endl; return 0; } if (jobData->checkOnHold) @@ -504,7 +504,7 @@ Slave *Scheduler::tqfindIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) if ( bCanReuse ) { KIO::MetaData outgoing = tJob->outgoingMetaData(); - TQString resume = (!outgoing.tqcontains("resume")) ? TQString::null : outgoing["resume"]; + TQString resume = (!outgoing.contains("resume")) ? TQString::null : outgoing["resume"]; kdDebug(7006) << "Resume metadata is '" << resume << "'" << endl; bCanReuse = (resume.isEmpty() || resume == "0"); } @@ -543,8 +543,8 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL idleSlaves->append(slave); connect(slave, TQT_SIGNAL(slaveDied(KIO::Slave *)), TQT_SLOT(slotSlaveDied(KIO::Slave *))); - connect(slave, TQT_SIGNAL(slavetqStatus(pid_t,const TQCString &,const TQString &, bool)), - TQT_SLOT(slotSlavetqStatus(pid_t,const TQCString &, const TQString &, bool))); + connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), + TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); connect(slave,TQT_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), sessionData,TQT_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); @@ -564,7 +564,7 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL return slave; } -void Scheduler::slotSlavetqStatus(pid_t, const TQCString &, const TQString &, bool) +void Scheduler::slotSlaveStatus(pid_t, const TQCString &, const TQString &, bool) { } @@ -582,11 +582,11 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave) protInfo->activeSlaves.removeRef(slave); if (slave->isAlive()) { - JobList *list = coSlaves.tqfind(slave); + JobList *list = coSlaves.find(slave); if (list) { assert(slave->isConnected()); - assert(!coIdleSlaves->tqcontains(slave)); + assert(!coIdleSlaves->contains(slave)); coIdleSlaves->append(slave); if (!list->isEmpty()) coSlaveTimer.start(0, true); @@ -618,7 +618,7 @@ void Scheduler::slotSlaveDied(KIO::Slave *slave) urlOnHold = KURL(); } idleSlaves->removeRef(slave); - JobList *list = coSlaves.tqfind(slave); + JobList *list = coSlaves.find(slave); if (list) { // coSlave dies, kill jobs waiting in queue @@ -733,7 +733,7 @@ Scheduler::slotScheduleCoSlave() slave = nextSlave) { nextSlave = coIdleSlaves->next(); - JobList *list = coSlaves.tqfind(slave); + JobList *list = coSlaves.find(slave); assert(list); if (list && !list->isEmpty()) { @@ -741,7 +741,7 @@ Scheduler::slotScheduleCoSlave() coIdleSlaves->removeRef(slave); // kdDebug(7006) << "scheduler: job started " << job << endl; - assert(!coIdleSlaves->tqcontains(slave)); + assert(!coIdleSlaves->contains(slave)); KURL url =job->url(); TQString host = url.host(); @@ -775,7 +775,7 @@ Scheduler::slotSlaveConnected() disconnect(slave, TQT_SIGNAL(connected()), this, TQT_SLOT(slotSlaveConnected())); emit slaveConnected(slave); - assert(!coIdleSlaves->tqcontains(slave)); + assert(!coIdleSlaves->contains(slave)); coIdleSlaves->append(slave); coSlaveTimer.start(0, true); } @@ -784,7 +784,7 @@ void Scheduler::slotSlaveError(int errorNr, const TQString &errorMsg) { Slave *slave = (Slave *)sender(); - if (!slave->isConnected() || (coIdleSlaves->tqfind(slave) != -1)) + if (!slave->isConnected() || (coIdleSlaves->find(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.tqfind(slave); + JobList *list = coSlaves.find(slave); assert(list); if (!list) { @@ -814,7 +814,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job) return false; } - assert(list->tqcontains(job) == 0); + assert(list->contains(job) == 0); list->append(job); coSlaveTimer.start(0, true); // Start job on timer event @@ -837,7 +837,7 @@ Scheduler::_disconnectSlave(KIO::Slave *slave) } delete list; coIdleSlaves->removeRef(slave); - assert(!coIdleSlaves->tqcontains(slave)); + assert(!coIdleSlaves->contains(slave)); disconnect(slave, TQT_SIGNAL(connected()), this, TQT_SLOT(slotSlaveConnected())); disconnect(slave, TQT_SIGNAL(error(int, const TQString &)), @@ -866,7 +866,7 @@ Scheduler::_registerWindow(TQWidget *wid) return; TQObject *obj = static_cast<TQObject *>(wid); - if (!m_windowList.tqcontains(obj)) + if (!m_windowList.contains(obj)) { // We must store the window Id because by the time // the destroyed signal is emitted we can no longer @@ -890,7 +890,7 @@ Scheduler::slotUnregisterWindow(TQObject *obj) if (!obj) return; - TQMap<TQObject *, WId>::Iterator it = m_windowList.tqfind(obj); + TQMap<TQObject *, WId>::Iterator it = m_windowList.find(obj); if (it == m_windowList.end()) return; WId windowId = it.data(); diff --git a/kio/kio/scheduler.h b/kio/kio/scheduler.h index e90bf1f90..4a4f104ba 100644 --- a/kio/kio/scheduler.h +++ b/kio/kio/scheduler.h @@ -46,7 +46,7 @@ namespace KIO { * * <h3>1. Direct</h3> * This is the default. When you create a job the - * KIO::Scheduler will be notified and will tqfind either an existing + * KIO::Scheduler will be notified and will find either an existing * slave that is idle or it will create a new slave for the job. * * Example: @@ -288,7 +288,7 @@ namespace KIO { public slots: void slotSlaveDied(KIO::Slave *slave); - void slotSlavetqStatus(pid_t pid, const TQCString &protocol, + void slotSlaveStatus(pid_t pid, const TQCString &protocol, const TQString &host, bool connected); signals: void slaveConnected(KIO::Slave *slave); @@ -330,7 +330,7 @@ namespace KIO { void _publishSlaveOnHold(); void _registerWindow(TQWidget *wid); - Slave *tqfindIdleSlave(ProtocolInfo *protInfo, SimpleJob *job, bool &exact); + Slave *findIdleSlave(ProtocolInfo *protInfo, SimpleJob *job, bool &exact); Slave *createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL &url); diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index 2381bde91..258f03e2a 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.tqfind("http", 0, false) == 0 ) || - (proto.tqfind("webdav", 0, false) == 0) ) + if ( (proto.find("http", 0, false) == 0 ) || + (proto.find("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.tqfind( TQString::tqfromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if ( it != languageList.end() ) { - if ( languageList.tqcontains( english ) > 0 ) + if ( languageList.contains( english ) > 0 ) languageList.remove( it ); else (*it) = english; } - if ( !languageList.tqcontains( english ) ) + if ( !languageList.contains( english ) ) languageList.append( english ); d->language = languageList.join( ", " ); - d->charsets = TQString::tqfromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower(); + d->charsets = TQString::fromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower(); KProtocolManager::reparseConfiguration(); } diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h index 80433679c..408045260 100644 --- a/kio/kio/sessiondata.h +++ b/kio/kio/sessiondata.h @@ -32,7 +32,7 @@ class SlaveConfig; /** * @internal */ -class KIO_EXPORT SessionData : public TQObject +class KIO_EXPORT SessionData : public QObject { Q_OBJECT diff --git a/kio/kio/skipdlg.cpp b/kio/kio/skipdlg.cpp index b0aa662a0..f014b10d9 100644 --- a/kio/kio/skipdlg.cpp +++ b/kio/kio/skipdlg.cpp @@ -67,41 +67,41 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo connect(b2, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); } - TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 10, 0 ); - // vtqlayout->addStrut( 360 ); makes dlg at least that wide + TQVBoxLayout *vlayout = new TQVBoxLayout( this, 10, 0 ); + // vlayout->addStrut( 360 ); makes dlg at least that wide TQLabel * lb = new TQLabel( _error_text, this ); - lb->setFixedHeight( lb->tqsizeHint().height() ); - lb->setMinimumWidth( lb->tqsizeHint().width() ); - vtqlayout->addWidget( lb ); + lb->setFixedHeight( lb->sizeHint().height() ); + lb->setMinimumWidth( lb->sizeHint().width() ); + vlayout->addWidget( lb ); - vtqlayout->addSpacing( 10 ); + vlayout->addSpacing( 10 ); - TQHBoxLayout* tqlayout = new TQHBoxLayout(); - vtqlayout->addLayout( tqlayout ); + TQHBoxLayout* layout = new TQHBoxLayout(); + vlayout->addLayout( layout ); if ( b0 ) { b0->setDefault( true ); - b0->setFixedSize( b0->tqsizeHint() ); - tqlayout->addWidget( b0 ); - tqlayout->addSpacing( 5 ); + b0->setFixedSize( b0->sizeHint() ); + layout->addWidget( b0 ); + layout->addSpacing( 5 ); } if ( b1 ) { - b1->setFixedSize( b1->tqsizeHint() ); - tqlayout->addWidget( b1 ); - tqlayout->addSpacing( 5 ); + b1->setFixedSize( b1->sizeHint() ); + layout->addWidget( b1 ); + layout->addSpacing( 5 ); } if ( b2 ) { - b2->setFixedSize( b2->tqsizeHint() ); - tqlayout->addWidget( b2 ); - tqlayout->addSpacing( 5 ); + b2->setFixedSize( b2->sizeHint() ); + layout->addWidget( b2 ); + layout->addSpacing( 5 ); } - vtqlayout->addStretch( 10 ); - vtqlayout->activate(); - resize( tqsizeHint() ); + vlayout->addStretch( 10 ); + vlayout->activate(); + resize( sizeHint() ); } SkipDlg::~SkipDlg() diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index 4fbac8049..c1a701711 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::tqfromLatin1(".slave-socket")); + KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) { error_text = i18n("Unable to create io-slave: %1").arg(strerror(errno)); @@ -406,7 +406,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error TQString lib_path = KLibLoader::findLibrary(_name.latin1()); if (lib_path.isEmpty()) { - error_text = i18n("Can not tqfind io-slave for protocol '%1'.").arg(protocol); + error_text = i18n("Can not find io-slave for protocol '%1'.").arg(protocol); error = KIO::ERR_CANNOT_LAUNCH_PROCESS; return 0; } @@ -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::tqfromLatin1(".slave-socket")); + KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) return 0; diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index bd9a688a1..ad683a009 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -358,23 +358,23 @@ void SlaveBase::disconnectSlave() void SlaveBase::setMetaData(const TQString &key, const TQString &value) { - mOutgoingMetaData.tqreplace(key, value); + mOutgoingMetaData.replace(key, value); } TQString SlaveBase::metaData(const TQString &key) const { - if (mIncomingMetaData.tqcontains(key)) + if (mIncomingMetaData.contains(key)) return mIncomingMetaData[key]; - if (d->configData.tqcontains(key)) + if (d->configData.contains(key)) return d->configData[key]; return TQString::null; } bool SlaveBase::hasMetaData(const TQString &key) const { - if (mIncomingMetaData.tqcontains(key)) + if (mIncomingMetaData.contains(key)) return true; - if (d->configData.tqcontains(key)) + if (d->configData.contains(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 << (TQ_INT32) _errid << _text; + KIO_DATA << (Q_INT32) _errid << _text; m_pConnection->send( MSG_ERROR, data ); //reset @@ -468,10 +468,10 @@ void SlaveBase::needSubURLData() m_pConnection->send( MSG_NEED_SUBURL_DATA ); } -void SlaveBase::slavetqStatus( const TQString &host, bool connected ) +void SlaveBase::slaveStatus( const TQString &host, bool connected ) { pid_t pid = getpid(); - TQ_INT8 b = connected ? 1 : 0; + Q_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 << (TQ_UINT32) _bytes_per_second; + KIO_DATA << (Q_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 << (TQ_UINT32)list.count(); + KIO_DATA << (Q_UINT32)list.count(); UDSEntryListConstIterator it = list.begin(); UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) @@ -801,7 +801,7 @@ void SlaveBase::multiGet(const TQByteArray &) void SlaveBase::slave_status() -{ slavetqStatus( TQString::null, false ); } +{ slaveStatus( TQString::null, false ); } void SlaveBase::reparseConfiguration() { @@ -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 << (TQ_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName; + KIO_DATA << (Q_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; - TQ_INT8 iOverwrite, iResume; + Q_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: { - TQ_INT8 iOverwrite; + Q_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: { - TQ_INT8 iOverwrite; + Q_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; - TQ_INT8 iOverwrite; + Q_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: { - TQ_INT8 isFile; + Q_INT8 isFile; stream >> url >> isFile; del( url, isFile != 0); } break; diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h index 5060131ef..82370ce56 100644 --- a/kio/kio/slavebase.h +++ b/kio/kio/slavebase.h @@ -130,11 +130,11 @@ public: * empty if not connected) * @param connected Whether an actual network connection exists. **/ - void slavetqStatus(const TQString &host, bool connected); + void slaveStatus(const TQString &host, bool connected); /** * Call this from stat() to express details about an object, the - * UDSEntry customarily tqcontains the atoms describing file name, size, + * UDSEntry customarily contains the atoms describing file name, size, * mimetype, etc. * @param _entry The UDSEntry containing all of the object attributes. */ @@ -505,7 +505,7 @@ public: /** * Called to get the status of the slave. Slave should respond - * by calling slavetqStatus(...) + * by calling slaveStatus(...) */ virtual void slave_status(); @@ -618,10 +618,10 @@ public: * KIO::AuthInfo authInfo; * if ( openPassDlg( authInfo ) ) * { - * kdDebug() << TQString::tqfromLatin1("User: ") + * kdDebug() << TQString::fromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::tqfromLatin1("Password: ") - * << TQString::tqfromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::fromLatin1("Password: ") + * << TQString::fromLatin1("Not displayed here!") << endl; * } * \endcode * @@ -635,10 +635,10 @@ public: * TQString errorMsg = "You entered an incorrect password."; * if ( openPassDlg( authInfo, errorMsg ) ) * { - * kdDebug() << TQString::tqfromLatin1("User: ") + * kdDebug() << TQString::fromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::tqfromLatin1("Password: ") - * << TQString::tqfromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::fromLatin1("Password: ") + * << TQString::fromLatin1("Not displayed here!") << endl; * } * \endcode * diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index 826aeb50c..fe888c99c 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.tqfind(_protocol); + SlaveConfigProtocol *scp = protocol.find(_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.tqfind(_protocol); + SlaveConfigProtocol *scp = protocol.find(_protocol); if (!scp) scp = readProtocolConfig(_protocol); return scp; @@ -103,13 +103,13 @@ SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_pro void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigProtocol *scp, const TQString &host) { MetaData *metaData = new MetaData; - scp->host.tqreplace(host, metaData); + scp->host.replace(host, metaData); // Read stuff // Break host into domains TQString domain = host; - if (!domain.tqcontains('.')) + if (!domain.contains('.')) { // Host without domain. if (scp->configFile->hasGroup("<local>")) @@ -119,7 +119,7 @@ void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigPro int pos = 0; do { - pos = host.tqfindRev('.', pos-1); + pos = host.findRev('.', 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.tqfind(host); + MetaData *hostConfig = scp->host.find(host); if (!hostConfig) { d->readConfigProtocolHost(protocol, scp, host); - hostConfig = scp->host.tqfind(host); + hostConfig = scp->host.find(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.tqfind(host); + MetaData *hostConfig = scp->host.find(host); if (!hostConfig) { d->readConfigProtocolHost(protocol, scp, host); emit configNeeded(protocol, host); - hostConfig = scp->host.tqfind(host); + hostConfig = scp->host.find(host); assert(hostConfig); } config += *hostConfig; diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h index a7ded457d..1eaaa55e4 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 TQObject + class KIO_EXPORT SlaveConfig : public QObject { Q_OBJECT public: diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp index 61d42ba35..563aad17e 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. - TQ_UINT32 size = 0; + Q_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(); - TQ_UINT32 size; + Q_UINT32 size; s >> size; // On 32-bit platforms we send UDS_SIZE with UDS_SIZE_LARGE in front @@ -79,7 +79,7 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) // We do the same on 64-bit platforms in case we run in a mixed 32/64bit // environment. Q_LLONG msb = 0; - for(TQ_UINT32 i = 0; i < size; i++) + for(Q_UINT32 i = 0; i < size; i++) { KIO::UDSAtom a; s >> a; @@ -225,9 +225,9 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) TQDataStream stream( rawdata, IO_ReadOnly ); TQString str1; - TQ_INT32 i; - TQ_INT8 b; - TQ_UINT32 ul; + Q_INT32 i; + Q_INT8 b; + Q_UINT32 ul; switch( _cmd ) { case MSG_DATA: @@ -251,7 +251,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) break; case MSG_LIST_ENTRIES: { - TQ_UINT32 count; + Q_UINT32 count; stream >> count; UDSEntryList list; @@ -284,7 +284,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) pid_t pid; TQCString protocol; stream >> pid >> protocol >> str1 >> b; - emit slavetqStatus(pid, protocol, str1, (b != 0)); + emit slaveStatus(pid, protocol, str1, (b != 0)); } break; case MSG_CONNECTED: diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h index faaea16c4..5cca5dd77 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 TQObject +class KIO_EXPORT SlaveInterface : public QObject { Q_OBJECT @@ -121,7 +121,7 @@ signals: void error( int , const TQString & ); void connected(); void finished(); - void slavetqStatus(pid_t, const TQCString &, const TQString &, bool); + void slaveStatus(pid_t, const TQCString &, const TQString &, bool); void listEntries( const KIO::UDSEntryList& ); void statEntry( const KIO::UDSEntry& ); void needSubURLData(); @@ -252,7 +252,7 @@ private: inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a ) { - TQ_INT32 l; + Q_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 << (TQ_INT32) a.m_long; + s << (Q_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 1c038e724..910155799 100644 --- a/kio/kio/statusbarprogress.cpp +++ b/kio/kio/statusbarprogress.cpp @@ -32,7 +32,7 @@ namespace KIO { -tqStatusbarProgress::tqStatusbarProgress( TQWidget* parent, bool button ) +StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) : ProgressBase( parent ) { m_bShowButton = button; @@ -60,18 +60,18 @@ tqStatusbarProgress::tqStatusbarProgress( TQWidget* parent, bool button ) stack->addWidget( m_pProgressBar, 1 ); m_pLabel = new TQLabel( "", this ); - m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_pLabel->setAlignment( AlignHCenter | AlignVCenter ); m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); stack->addWidget( m_pLabel, 2 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); mode = None; setMode(); } -void tqStatusbarProgress::setJob( KIO::Job *job ) +void StatusbarProgress::setJob( KIO::Job *job ) { ProgressBase::setJob( job ); @@ -80,7 +80,7 @@ void tqStatusbarProgress::setJob( KIO::Job *job ) } -void tqStatusbarProgress::setMode() { +void StatusbarProgress::setMode() { switch ( mode ) { case None: if ( m_bShowButton ) { @@ -108,7 +108,7 @@ void tqStatusbarProgress::setMode() { } -void tqStatusbarProgress::slotClean() { +void StatusbarProgress::slotClean() { // we don't want to delete this widget, only clean m_pProgressBar->setValue( 0 ); m_pLabel->clear(); @@ -118,16 +118,16 @@ void tqStatusbarProgress::slotClean() { } -void tqStatusbarProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) { +void StatusbarProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) { m_iTotalSize = size; // size is measured in bytes } -void tqStatusbarProgress::slotPercent( KIO::Job*, unsigned long percent ) { +void StatusbarProgress::slotPercent( KIO::Job*, unsigned long percent ) { m_pProgressBar->setValue( percent ); } -void tqStatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) { +void StatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) { if ( speed == 0 ) { // spped is measured in bytes-per-second m_pLabel->setText( i18n( " Stalled ") ); } else { @@ -136,7 +136,7 @@ void tqStatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) { } -bool tqStatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) { +bool StatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) { if ( ! m_pJob ) { // don't react when there isn't any job doing IO return true; } @@ -159,7 +159,7 @@ bool tqStatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) { return false; } -void tqStatusbarProgress::virtual_hook( int id, void* data ) +void StatusbarProgress::virtual_hook( int id, void* data ) { ProgressBase::virtual_hook( id, data ); } } /* namespace */ diff --git a/kio/kio/statusbarprogress.h b/kio/kio/statusbarprogress.h index e4b25b509..6fb460283 100644 --- a/kio/kio/statusbarprogress.h +++ b/kio/kio/statusbarprogress.h @@ -40,12 +40,12 @@ class Job; * Instead of creating a separate window, this is only a widget that can be * easily embedded in a statusbar. * -* Usage of tqStatusbarProgress is little different. +* Usage of StatusbarProgress is little different. * This dialog will be a part of some application. * \code * // create a dialog -* tqStatusbarProgress *statusProgress; -* statusProgress = new tqStatusbarProgress( statusBar() ); +* StatusbarProgress *statusProgress; +* statusProgress = new StatusbarProgress( statusBar() ); * statusBar()->insertWidget( statusProgress, statusProgress->width() , 0 ); * ... * // create job and connect it to the progress @@ -57,20 +57,20 @@ class Job; * @short IO progress widget for embedding in a statusbar. * @author Matej Koss <[email protected]> */ -class KIO_EXPORT tqStatusbarProgress : public ProgressBase { +class KIO_EXPORT StatusbarProgress : public ProgressBase { Q_OBJECT public: /** - * Creates a new tqStatusbarProgress. + * Creates a new StatusbarProgress. * @param parent the parent of this widget * @param button true to add an abort button. The button will be * connected to ProgressBase::slotStop() */ - tqStatusbarProgress( TQWidget* parent, bool button = true ); - ~tqStatusbarProgress() {} + StatusbarProgress( TQWidget* parent, bool button = true ); + ~StatusbarProgress() {} /** * Sets the job to monitor. @@ -104,7 +104,7 @@ protected: protected: virtual void virtual_hook( int id, void* data ); private: - class tqStatusbarProgressPrivate* d; + class StatusbarProgressPrivate* d; }; } /* namespace */ diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp index 144aaa6b1..78093577d 100644 --- a/kio/kio/tcpslavebase.cpp +++ b/kio/kio/tcpslavebase.cpp @@ -223,7 +223,7 @@ if ((m_bIsSSL || d->usingTLS) && !d->useSSLTunneling) { // SSL CASE return -1; } - bytes = rc; // in case it tqcontains no \n + bytes = rc; // in case it contains no \n for (int i = 0; i < rc; i++) { if (tmpbuf[i] == '\n') { bytes = i+1; @@ -774,7 +774,7 @@ int TCPSlaveBase::verifyCertificate() } #endif if (!_IPmatchesCN && !d->militantSSL) { // force this if the user wants it - if (d->cc->getHostList(pc).tqcontains(ourHost)) { + if (d->cc->getHostList(pc).contains(ourHost)) { _IPmatchesCN = true; } } diff --git a/kio/kioexec/main.h b/kio/kioexec/main.h index 6a5dee65e..59f1cdac2 100644 --- a/kio/kioexec/main.h +++ b/kio/kioexec/main.h @@ -8,7 +8,7 @@ namespace KIO { class Job; } -class KIOExec : public TQObject +class KIOExec : public QObject { Q_OBJECT public: diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp index 20c59750b..42cbad3a4 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::tqfromLatin1( key ); + TQString str = TQString::fromLatin1( key ); if ( entryNumber > 1 ) str += "-" + TQString::number( entryNumber ); return str; @@ -107,7 +107,7 @@ static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const K return false; wallet->setFolder( KWallet::Wallet::PasswordFolder() ); // Before saving, check if there's already an entry with this login. - // If so, tqreplace it (with the new password). Otherwise, add a new entry. + // If so, replace it (with the new password). Otherwise, add a new entry. typedef TQMap<TQString,TQString> Map; int entryNumber = 1; Map map; @@ -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.tqfind( "login" ); + Map::ConstIterator it = map.find( "login" ); while ( it != end ) { if ( it.data() == info.username ) { break; // OK, overwrite this entry } - it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) ); + it = map.find( 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.tqfind( "login" ); + Map::ConstIterator it = map.find( "login" ); while ( it != end ) { //kdDebug(130) << "readFromWallet: found " << it.key() << "=" << it.data() << endl; - Map::ConstIterator pwdIter = map.tqfind( makeMapKey( "password", entryNumber ) ); + Map::ConstIterator pwdIter = map.find( makeMapKey( "password", entryNumber ) ); if ( pwdIter != end ) { if ( it.data() == username ) password = pwdIter.data(); knownLogins.insert( it.data(), pwdIter.data() ); } - it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) ); + it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) ); } //kdDebug(130) << knownLogins.count() << " known logins" << endl; @@ -214,7 +214,7 @@ KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long us return info; } - const AuthInfo *result = tqfindAuthInfoItem(key, info); + const AuthInfo *result = findAuthInfoItem(key, info); if (!result || result->isCanceled) { if (!result && @@ -320,7 +320,7 @@ KPasswdServer::processRequest() kdDebug(130) << "KPasswdServer::processRequest: User= " << info.username << ", Message= " << info.prompt << endl; - const AuthInfo *result = tqfindAuthInfoItem(request->key, request->info); + const AuthInfo *result = findAuthInfoItem(request->key, request->info); if (result && (request->seqNr < result->seqNr)) { @@ -464,7 +464,7 @@ KPasswdServer::processRequest() } else { - const AuthInfo *result = tqfindAuthInfoItem(waitRequest->key, waitRequest->info); + const AuthInfo *result = findAuthInfoItem(waitRequest->key, waitRequest->info); TQCString replyType; TQByteArray replyData; @@ -500,7 +500,7 @@ KPasswdServer::processRequest() TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info ) { if( !info.url.isValid() ) { - // Note that a null key will break tqfindAuthInfoItem later on... + // Note that a null key will break findAuthInfoItem later on... kdWarning(130) << "createCacheKey: invalid URL " << info.url << endl; return TQString::null; } @@ -539,9 +539,9 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i) } const KPasswdServer::AuthInfo * -KPasswdServer::tqfindAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) +KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) { - AuthInfoList *authList = m_authDict.tqfind(key); + AuthInfoList *authList = m_authDict.find(key); if (!authList) return 0; @@ -579,7 +579,7 @@ KPasswdServer::tqfindAuthInfoItem(const TQString &key, const KIO::AuthInfo &info void KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) { - AuthInfoList *authList = m_authDict.tqfind(key); + AuthInfoList *authList = m_authDict.find(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.tqfind(key); + AuthInfoList *authList = m_authDict.find(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.tqcontains(windowId)) + if (!current->windowList.contains(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.tqfind(windowId); + TQStringList *keysChanged = mWindowIdList.find(windowId); if (!keysChanged) { keysChanged = new TQStringList; mWindowIdList.insert(windowId, keysChanged); } - if (!keysChanged->tqcontains(key)) + if (!keysChanged->contains(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.tqfind(windowId); + TQStringList *keysChanged = mWindowIdList.find(windowId); if (!keysChanged) return; for(TQStringList::ConstIterator it = keysChanged->begin(); it != keysChanged->end(); ++it) { TQString key = *it; - AuthInfoList *authList = m_authDict.tqfind(key); + AuthInfoList *authList = m_authDict.find(key); if (!authList) continue; diff --git a/kio/kpasswdserver/kpasswdserver.h b/kio/kpasswdserver/kpasswdserver.h index ed86d5064..cf44681bf 100644 --- a/kio/kpasswdserver/kpasswdserver.h +++ b/kio/kpasswdserver/kpasswdserver.h @@ -61,12 +61,12 @@ protected: struct AuthInfo; TQString createCacheKey( const KIO::AuthInfo &info ); - const AuthInfo *tqfindAuthInfoItem(const TQString &key, const KIO::AuthInfo &info); + const AuthInfo *findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info); void removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info); void addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled); KIO::AuthInfo copyAuthInfo(const AuthInfo *); void updateAuthExpire(const TQString &key, const AuthInfo *, long windowId, bool keep); - int tqfindWalletEntry( const TQMap<TQString,TQString>& map, const TQString& username ); + int findWalletEntry( const TQMap<TQString,TQString>& map, const TQString& username ); bool openWallet( WId windowId ); struct AuthInfo { diff --git a/kio/kssl/keygenwizard.ui b/kio/kssl/keygenwizard.ui index 64bb82dde..1cecbd5fc 100644 --- a/kio/kssl/keygenwizard.ui +++ b/kio/kssl/keygenwizard.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>KGWizardPage1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -30,7 +30,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -41,6 +41,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kio/kssl/keygenwizard2.ui b/kio/kssl/keygenwizard2.ui index 1fb91cd4c..9512e4ba9 100644 --- a/kio/kssl/keygenwizard2.ui +++ b/kio/kssl/keygenwizard2.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>KGWizardPage2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ <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="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -73,6 +73,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc index b5c679d76..70d36cd8e 100644 --- a/kio/kssl/kopenssl.cc +++ b/kio/kssl/kopenssl.cc @@ -228,7 +228,7 @@ void KOpenSSLProxy::destroy() { #include <tqstring.h> #include <tqstringlist.h> -static TQString tqfindMostRecentLib(TQString dir, TQString name) +static TQString findMostRecentLib(TQString dir, TQString name) { // Grab all shared libraries in the directory TQString filter = "lib"+name+".so.*"; @@ -245,7 +245,7 @@ static TQString tqfindMostRecentLib(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.tqfind('.'); + uint endmaj = numberpart.find('.'); if (endmaj == -1) continue; bool ok; @@ -288,7 +288,7 @@ KConfig *cfg; #ifdef __OpenBSD__ { - TQString libname = tqfindMostRecentLib("/usr/lib" KDELIBSUFF, "crypto"); + TQString libname = findMostRecentLib("/usr/lib" KDELIBSUFF, "crypto"); if (!libname.isNull()) _cryptoLib = ll->globalLibrary(libname.latin1()); } @@ -369,7 +369,7 @@ KConfig *cfg; alib += "/"; alib += *shit; TQString tmpStr(alib.latin1()); - tmpStr.tqreplace(TQRegExp("\\(.*\\)"), ""); + tmpStr.replace(TQRegExp("\\(.*\\)"), ""); if (!access(tmpStr.latin1(), R_OK)) _cryptoLib = ll->globalLibrary(alib.latin1()); if (_cryptoLib) break; @@ -511,7 +511,7 @@ KConfig *cfg; #ifdef __OpenBSD__ { - TQString libname = tqfindMostRecentLib("/usr/lib", "ssl"); + TQString libname = findMostRecentLib("/usr/lib", "ssl"); if (!libname.isNull()) _sslLib = ll->globalLibrary(libname.latin1()); } @@ -527,7 +527,7 @@ KConfig *cfg; alib += "/"; alib += *shit; TQString tmpStr(alib.latin1()); - tmpStr.tqreplace(TQRegExp("\\(.*\\)"), ""); + tmpStr.replace(TQRegExp("\\(.*\\)"), ""); if (!access(tmpStr.latin1(), R_OK)) _sslLib = ll->globalLibrary(alib.latin1()); if (_sslLib) break; diff --git a/kio/kssl/kssl/StartCom.pem b/kio/kssl/kssl/StartCom.pem index 399902b03..a7c9b39a0 100644 --- a/kio/kssl/kssl/StartCom.pem +++ b/kio/kssl/kssl/StartCom.pem @@ -112,7 +112,7 @@ U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf -OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TQEceWzVI9ujPW3U3eCztKS5/C +OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM diff --git a/kio/kssl/kssl/SwissSign-Gold-G2.pem b/kio/kssl/kssl/SwissSign-Gold-G2.pem index bb9742074..d72118781 100644 --- a/kio/kssl/kssl/SwissSign-Gold-G2.pem +++ b/kio/kssl/kssl/SwissSign-Gold-G2.pem @@ -25,7 +25,7 @@ O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a 77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC -hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid3 +hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3 92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt diff --git a/kio/kssl/kssl/caroot/ca-bundle.crt b/kio/kssl/kssl/caroot/ca-bundle.crt index c9bb22213..ca5d292c9 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 -FUNtUvHI6NfaTQMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW +FUNtUvHI6NfaMOCYKqlbo8PRAQOBXX62CZXo2zJu/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 -hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid3 +hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3 92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt diff --git a/kio/kssl/kssl/cert_extract.c b/kio/kssl/kssl/cert_extract.c index a1563c3bc..095f810f4 100644 --- a/kio/kssl/kssl/cert_extract.c +++ b/kio/kssl/kssl/cert_extract.c @@ -22,7 +22,7 @@ ** ** Originally written and released under the GPL by ** Ariel Glenn from the AcIS R&D group at Columbia -** as the two sources tqfindoffset.c and dblist.c. See under +** as the two sources findoffset.c and dblist.c. See under ** http://www.columbia.edu/~ariel/good-certs/ for more details. ** ** Merged into one single program in August 1998 @@ -46,9 +46,9 @@ #include "openssl/asn1.h" #include "openssl/x509.h" -int tqfindoffset(char *dbname); +int findoffset(char *dbname); -int tqfindoffset(char *dbname) +int findoffset(char *dbname) { DB *db; DBT dkey, dvalue; @@ -100,7 +100,7 @@ int main(int argc, char **argv) int result; char oname[40]; int fout; - int tqfind; + int find; char *p; int ptag = 0, pclass, plen; X509 *mycert; @@ -113,7 +113,7 @@ int main(int argc, char **argv) } dbname = argv[1]; - offset = tqfindoffset(dbname); + offset = findoffset(dbname); if (offset == 0) { fprintf(stderr, "Could not determine cert offset in DB file '%s'\n", dbname); exit(1); @@ -126,7 +126,7 @@ int main(int argc, char **argv) fprintf(stderr, "Failed to open DB file '%s': %s\n", dbname, strerror(errno)); exit(1); } - if ((tqfind = open("cert.index", O_WRONLY | O_CREAT | O_TRUNC, 0755)) == -1) { + if ((find = open("cert.index", O_WRONLY | O_CREAT | O_TRUNC, 0755)) == -1) { fprintf(stderr, "Failed to open Index file '%s': %s\n", "cert-index", strerror(errno)); exit(1); } @@ -161,11 +161,11 @@ int main(int argc, char **argv) } write(fout, (char *) dvalue.data + offset - 1, plen); close(fout); - write(tqfind, oname, strlen(oname)); - write(tqfind, ": ", 2); + write(find, oname, strlen(oname)); + write(find, ": ", 2); shortname = (char *) dvalue.data + offset - 1 + plen; - write(tqfind, shortname, dvalue.size - plen - offset); - write(tqfind, "\n", 1); + write(find, shortname, dvalue.size - plen - offset); + write(find, "\n", 1); fprintf(stderr, "Extracted: %s (", oname); write(fileno(stderr), shortname, dvalue.size - plen - offset); fprintf(stderr, ")\n"); @@ -175,7 +175,7 @@ int main(int argc, char **argv) } } } - close(tqfind); + close(find); db->close(db); return (0); diff --git a/kio/kssl/kssl/certbundle_Makefile b/kio/kssl/kssl/certbundle_Makefile index 666eef93b..5a288f3b6 100644 --- a/kio/kssl/kssl/certbundle_Makefile +++ b/kio/kssl/kssl/certbundle_Makefile @@ -33,7 +33,7 @@ distclean: clean -rm -f cert.*.der cert.index dist: distclean - gtar --no-recursion -cvf - `tqfind * -depth -print | sort` |\ + gtar --no-recursion -cvf - `find * -depth -print | sort` |\ tardy --user_number=1000 --user_name=rse \ --group_number=1000 --group_name=en \ --prefix=certbundle-$(V) - |\ diff --git a/kio/kssl/kssl/ksslcalist b/kio/kssl/kssl/ksslcalist index c4423c874..a0761cf4a 100644 --- a/kio/kssl/kssl/ksslcalist +++ b/kio/kssl/kssl/ksslcalist @@ -432,7 +432,7 @@ email=true code=false [/C=US/O=VISA/OU=Visa International Service Association/CN=GP Root 3] -x509=MIIDgDCCAmigAwIBAgICAx8wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMxDTALBgNVBAoTBFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2aWNlIEFzc29jaWF0aW9uMRIwEAYDVQQDEwlHUCBSb290IDMwHhcNMDAwODE2MjMzNDAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xEjAQBgNVBAMTCUdQIFJvb3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrsQ7g06qNn33cJHxoQoh6pTpVMdOcM3GzGmNCr+hckmmejSRRkiY+TEi/vj9jOEASLhcDcL7wpmK+cQsXL0pbP9KXFLW5NjDiOsmoImdWRG6jtM5NJXcvnFUNtUvHI6NfaTQMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSWgO9oCUCUwrczSYPlya4tIDeQGD0gNtp5Oa+4V59672AqIYT4/6A5IdPYbVTHw2o8yFwfLkdyFGxVSwkGzY7FawvnB0c6fZJffQ+wXDNXg4M/HoSoeZCfl04i3HUiyG4v1tDLduEMV5fhJo8phFPy5Y6TykuKTDUCAwEAAaNCMEAwHQYDVR0OBBYEFKJcbg1lCMH3TlvJbfDQVhs5gkO7MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQADjVYIs6Gt/XNC2WcsbprPvx7ITfJN0tk3yThEja6JDO+MmStKk/VtrGZKP1dqEKWiGhOmLOpi54D5vf3k/9oRnzlYbfVD8vT9pr+dsauaRgff4fBbP/5dWUAGrBgIR0w8TEhGzojhqLaedaag934btsSN7fAqUxVK2ylPOVPnUlijvtzkkC21yc6Y/yyGoQigyM73gjkJDMHC1KmkKg4zgcc8cMswbaRWt5tcfAIivuUHfW0k0Sex1h0eXEc8vy5u+ByESOz14aCVEc3nMOtc8Cl7dYICBrLzkznSDqzfXyQTFTBD9VDUx4OgQzlPZTS9punO4XS+IN/SchZLiUZ2 +x509=MIIDgDCCAmigAwIBAgICAx8wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMxDTALBgNVBAoTBFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2aWNlIEFzc29jaWF0aW9uMRIwEAYDVQQDEwlHUCBSb290IDMwHhcNMDAwODE2MjMzNDAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xEjAQBgNVBAMTCUdQIFJvb3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrsQ7g06qNn33cJHxoQoh6pTpVMdOcM3GzGmNCr+hckmmejSRRkiY+TEi/vj9jOEASLhcDcL7wpmK+cQsXL0pbP9KXFLW5NjDiOsmoImdWRG6jtM5NJXcvnFUNtUvHI6NfaMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSWgO9oCUCUwrczSYPlya4tIDeQGD0gNtp5Oa+4V59672AqIYT4/6A5IdPYbVTHw2o8yFwfLkdyFGxVSwkGzY7FawvnB0c6fZJffQ+wXDNXg4M/HoSoeZCfl04i3HUiyG4v1tDLduEMV5fhJo8phFPy5Y6TykuKTDUCAwEAAaNCMEAwHQYDVR0OBBYEFKJcbg1lCMH3TlvJbfDQVhs5gkO7MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQADjVYIs6Gt/XNC2WcsbprPvx7ITfJN0tk3yThEja6JDO+MmStKk/VtrGZKP1dqEKWiGhOmLOpi54D5vf3k/9oRnzlYbfVD8vT9pr+dsauaRgff4fBbP/5dWUAGrBgIR0w8TEhGzojhqLaedaag934btsSN7fAqUxVK2ylPOVPnUlijvtzkkC21yc6Y/yyGoQigyM73gjkJDMHC1KmkKg4zgcc8cMswbaRWt5tcfAIivuUHfW0k0Sex1h0eXEc8vy5u+ByESOz14aCVEc3nMOtc8Cl7dYICBrLzkznSDqzfXyQTFTBD9VDUx4OgQzlPZTS9punO4XS+IN/SchZLiUZ2 site=true email=true code=false @@ -697,7 +697,7 @@ email=true code=true [/C=US/O=GeoTrust Inc./CN=GeoTrust Universal CA] -x509=MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTQjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRcaanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw= +x509=MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRcaanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw= site=true email=true code=true @@ -757,7 +757,7 @@ email=true code=true [/C=IL/O=StartCom Ltd./OU=Secure Digital Certificate Signing/CN=StartCom Certification Authority] -x509=MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+PwqyvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14= +x509=MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+PwqyvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14= site=true email=true code=false @@ -775,7 +775,7 @@ email=true code=true [/C=CH/O=SwissSign AG/CN=SwissSign Gold CA - G2] -x509=MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid392qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ +x509=MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ site=true email=true code=true diff --git a/kio/kssl/kssl/startssl.pem b/kio/kssl/kssl/startssl.pem index f441f5dac..960f2657b 100644 --- a/kio/kssl/kssl/startssl.pem +++ b/kio/kssl/kssl/startssl.pem @@ -8,7 +8,7 @@ U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf -OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TQEceWzVI9ujPW3U3eCztKS5/C +OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc index 511bd4021..21bff52b1 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 << TQ_INT8(r.ok?1:0) << r.choice << TQ_INT8(r.save?1:0) << TQ_INT8(r.send?1:0); + s << Q_INT8(r.ok?1:0) << r.choice << Q_INT8(r.save?1:0) << Q_INT8(r.send?1:0); return s; } TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r) { -TQ_INT8 tmp; +Q_INT8 tmp; s >> tmp; r.ok = (tmp == 1); s >> r.choice; s >> tmp; r.save = (tmp == 1); diff --git a/kio/kssl/ksslcertdlg.h b/kio/kssl/ksslcertdlg.h index 4d9b3c2c9..314ae677d 100644 --- a/kio/kssl/ksslcertdlg.h +++ b/kio/kssl/ksslcertdlg.h @@ -33,7 +33,7 @@ class TQPushButton; /** * KDE X.509 Certificate Dialog * - * This class is used to create and display a dialog which tqcontains the user's + * This class is used to create and display a dialog which contains the user's * X.509 certificates and allows the user to present it during SSL sessions. * * @author George Staikos <[email protected]> diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index d712c185c..285bb1d2d 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.tqfindRev('('); + int pos = k.findRev('('); 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::tqcurrentDateTime(); +return TQDateTime::currentDateTime(); #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::tqcurrentDateTime(); +return TQDateTime::currentDateTime(); #endif } diff --git a/kio/kssl/ksslcertificatecache.cc b/kio/kssl/ksslcertificatecache.cc index 226e21c71..eb4ff2d86 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 << (TQ_UINT32)p; + s << (Q_UINT32)p; return s; } TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p) { - TQ_UINT32 pd; + Q_UINT32 pd; s >> pd; p = (KSSLCertificateCache::KSSLCertificatePolicy) pd; return s; diff --git a/kio/kssl/ksslconnectioninfo.h b/kio/kssl/ksslconnectioninfo.h index 095e7c2b2..4d82c6ce2 100644 --- a/kio/kssl/ksslconnectioninfo.h +++ b/kio/kssl/ksslconnectioninfo.h @@ -30,7 +30,7 @@ class KSSL; /** * KDE SSL Connection Information * - * This class tqcontains the information about an SSL connection. It is + * This class contains the information about an SSL connection. It is * generally referenced through KSSL. * * @author George Staikos <[email protected]> diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index 6b0660ebc..70e8a094c 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -51,7 +51,7 @@ class KSSLInfoDlg::KSSLInfoDlgPrivate { private: friend class KSSLInfoDlg; bool m_secCon; - TQGridLayout *m_tqlayout; + TQGridLayout *m_layout; KComboBox *_chain; KSSLCertificate *_cert; KSSLCertificate::KSSLValidationList _cert_ksvl; @@ -76,15 +76,15 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na : KDialog(parent, name, modal, Qt::WDestructiveClose), d(new KSSLInfoDlgPrivate) { TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); d->m_secCon = secureConnection; - d->m_tqlayout = new TQGridLayout(topLayout, 3, 3, KDialog::spacingHint()); - d->m_tqlayout->setColStretch(1, 1); - d->m_tqlayout->setColStretch(2, 1); + d->m_layout = new TQGridLayout(topLayout, 3, 3, KDialog::spacingHint()); + d->m_layout->setColStretch(1, 1); + d->m_layout->setColStretch(2, 1); d->pixmap = new TQLabel(this); - d->m_tqlayout->addWidget(d->pixmap, 0, 0); + d->m_layout->addWidget(d->pixmap, 0, 0); d->info = new TQLabel(this); - d->m_tqlayout->addWidget(d->info, 0, 1); + d->m_layout->addWidget(d->info, 0, 1); if (KSSL::doesSSLWork()) { if (d->m_secCon) { @@ -98,7 +98,7 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na d->pixmap->setPixmap(BarIcon("decrypted")); d->info->setText(i18n("SSL support is not available in this build of KDE.")); } - d->m_tqlayout->addRowSpacing( 0, 50 ); // give minimum height to look better + d->m_layout->addRowSpacing( 0, 50 ); // give minimum height to look better TQHBoxLayout *buttonLayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); buttonLayout->addStretch( 1 ); @@ -175,15 +175,15 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert, const TQString& cipher, const TQString& cipherdesc, const TQString& sslversion, int usedbits, int bits, KSSLCertificate::KSSLValidation /*certState*/) { - // Needed to put the GUI stuff here to get the tqlayouting right + // Needed to put the GUI stuff here to get the layouting right d->_cert = cert; - TQGridLayout *tqlayout = new TQGridLayout(4, 2, KDialog::spacingHint()); + TQGridLayout *layout = new TQGridLayout(4, 2, KDialog::spacingHint()); - tqlayout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0); + layout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0); d->_chain = new KComboBox(this); - tqlayout->addMultiCellWidget(d->_chain, 1, 1, 0, 1); + layout->addMultiCellWidget(d->_chain, 1, 1, 0, 1); connect(d->_chain, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChain(int))); d->_chain->clear(); @@ -207,51 +207,51 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert, d->_chain->setCurrentItem(0); } else d->_chain->setEnabled(false); - tqlayout->addWidget(new TQLabel(i18n("Peer certificate:"), this), 2, 0); - tqlayout->addWidget(d->_subject = static_cast<KSSLCertBox*>(buildCertInfo(cert->getSubject())), 3, 0); - tqlayout->addWidget(new TQLabel(i18n("Issuer:"), this), 2, 1); - tqlayout->addWidget(d->_issuer = static_cast<KSSLCertBox*>(buildCertInfo(cert->getIssuer())), 3, 1); - d->m_tqlayout->addMultiCell(tqlayout, 1, 1, 0, 2); + layout->addWidget(new TQLabel(i18n("Peer certificate:"), this), 2, 0); + layout->addWidget(d->_subject = static_cast<KSSLCertBox*>(buildCertInfo(cert->getSubject())), 3, 0); + layout->addWidget(new TQLabel(i18n("Issuer:"), this), 2, 1); + layout->addWidget(d->_issuer = static_cast<KSSLCertBox*>(buildCertInfo(cert->getIssuer())), 3, 1); + d->m_layout->addMultiCell(layout, 1, 1, 0, 2); - tqlayout = new TQGridLayout(11, 2, KDialog::spacingHint()); - tqlayout->setColStretch(1, 1); + layout = new TQGridLayout(11, 2, KDialog::spacingHint()); + layout->setColStretch(1, 1); TQLabel *ipl = new TQLabel(i18n("IP address:"), this); - tqlayout->addWidget(ipl, 0, 0); + layout->addWidget(ipl, 0, 0); if (ip.isEmpty()) { ipl->hide(); } - tqlayout->addWidget(ipl = new TQLabel(ip, this), 0, 1); + layout->addWidget(ipl = new TQLabel(ip, this), 0, 1); if (ip.isEmpty()) { ipl->hide(); } - tqlayout->addWidget(new TQLabel(i18n("URL:"), this), 1, 0); + layout->addWidget(new TQLabel(i18n("URL:"), this), 1, 0); KSqueezedTextLabel *urlLabel = new KSqueezedTextLabel(url, this); - tqlayout->addWidget(urlLabel, 1, 1); - tqlayout->addWidget(new TQLabel(i18n("Certificate state:"), this), 2, 0); + layout->addWidget(urlLabel, 1, 1); + layout->addWidget(new TQLabel(i18n("Certificate state:"), this), 2, 0); - tqlayout->addWidget(d->_csl = new TQLabel("", this), 2, 1); + layout->addWidget(d->_csl = new TQLabel("", this), 2, 1); update(); - tqlayout->addWidget(new TQLabel(i18n("Valid from:"), this), 3, 0); - tqlayout->addWidget(d->_validFrom = new TQLabel("", this), 3, 1); - tqlayout->addWidget(new TQLabel(i18n("Valid until:"), this), 4, 0); - tqlayout->addWidget(d->_validUntil = new TQLabel("", this), 4, 1); - - tqlayout->addWidget(new TQLabel(i18n("Serial number:"), this), 5, 0); - tqlayout->addWidget(d->_serialNum = new TQLabel("", this), 5, 1); - tqlayout->addWidget(new TQLabel(i18n("MD5 digest:"), this), 6, 0); - tqlayout->addWidget(d->_digest = new TQLabel("", this), 6, 1); - - tqlayout->addWidget(new TQLabel(i18n("Cipher in use:"), this), 7, 0); - tqlayout->addWidget(new TQLabel(cipher, this), 7, 1); - tqlayout->addWidget(new TQLabel(i18n("Details:"), this), 8, 0); - tqlayout->addWidget(new TQLabel(cipherdesc.simplifyWhiteSpace(), this), 8, 1); - tqlayout->addWidget(new TQLabel(i18n("SSL version:"), this), 9, 0); - tqlayout->addWidget(new TQLabel(sslversion, this), 9, 1); - tqlayout->addWidget(new TQLabel(i18n("Cipher strength:"), this), 10, 0); - tqlayout->addWidget(new TQLabel(i18n("%1 bits used of a %2 bit cipher").arg(usedbits).arg(bits), this), 10, 1); - d->m_tqlayout->addMultiCell(tqlayout, 2, 2, 0, 2); + layout->addWidget(new TQLabel(i18n("Valid from:"), this), 3, 0); + layout->addWidget(d->_validFrom = new TQLabel("", this), 3, 1); + layout->addWidget(new TQLabel(i18n("Valid until:"), this), 4, 0); + layout->addWidget(d->_validUntil = new TQLabel("", this), 4, 1); + + layout->addWidget(new TQLabel(i18n("Serial number:"), this), 5, 0); + layout->addWidget(d->_serialNum = new TQLabel("", this), 5, 1); + layout->addWidget(new TQLabel(i18n("MD5 digest:"), this), 6, 0); + layout->addWidget(d->_digest = new TQLabel("", this), 6, 1); + + layout->addWidget(new TQLabel(i18n("Cipher in use:"), this), 7, 0); + layout->addWidget(new TQLabel(cipher, this), 7, 1); + layout->addWidget(new TQLabel(i18n("Details:"), this), 8, 0); + layout->addWidget(new TQLabel(cipherdesc.simplifyWhiteSpace(), this), 8, 1); + layout->addWidget(new TQLabel(i18n("SSL version:"), this), 9, 0); + layout->addWidget(new TQLabel(sslversion, this), 9, 1); + layout->addWidget(new TQLabel(i18n("Cipher strength:"), this), 10, 0); + layout->addWidget(new TQLabel(i18n("%1 bits used of a %2 bit cipher").arg(usedbits).arg(bits), this), 10, 1); + d->m_layout->addMultiCell(layout, 2, 2, 0, 2); displayCert(cert); } @@ -273,14 +273,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { d->_serialNum->setText(x->getSerialNumber()); cspl = d->_validFrom->palette(); - if (x->getQDTNotBefore() > TQDateTime::tqcurrentDateTime(Qt::UTC)) + if (x->getQDTNotBefore() > TQDateTime::currentDateTime(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::tqcurrentDateTime(Qt::UTC)) + if (x->getQDTNotAfter() < TQDateTime::currentDateTime(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::tqcurrentDateTime(Qt::UTC) && - x->getQDTNotBefore() < TQDateTime::tqcurrentDateTime(Qt::UTC)) { + if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) && + x->getQDTNotBefore() < TQDateTime::currentDateTime(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->tqsizeHint()); + d->_csl->setMinimumSize(d->_csl->sizeHint()); 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->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("OU")).isEmpty()) { label = new TQLabel(i18n("Organizational unit:"), _frame); - label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("L")).isEmpty()) { label = new TQLabel(i18n("Locality:"), _frame); - label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("ST")).isEmpty()) { label = new TQLabel(i18n("Federal State","State:"), _frame); - label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("C")).isEmpty()) { label = new TQLabel(i18n("Country:"), _frame); - label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("CN")).isEmpty()) { label = new TQLabel(i18n("Common name:"), _frame); - label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("Email")).isEmpty()) { label = new TQLabel(i18n("Email:"), _frame); - label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(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 c5075e049..d1c2d00fc 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::tqfromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); + d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); #endif } @@ -95,7 +95,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) { // Check for invalid characters if (TQRegExp("[^a-zA-Z0-9\\.\\*\\-]").search(cn) >= 0) { - kdDebug(7029) << "CN tqcontains invalid characters! Failing." << endl; + kdDebug(7029) << "CN contains invalid characters! Failing." << endl; return false; } @@ -117,7 +117,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) { if (rx.exactMatch(d->peerHost)) return d->peerHost == cn; - if (cn.tqcontains('*')) { + if (cn.contains('*')) { // First make sure that there are at least two valid parts // after the wildcard (*). TQStringList parts = TQStringList::split('.', cn, false); @@ -129,7 +129,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) { return false; // we don't allow *.root - that's bad } - if (parts[0].tqcontains('*') || parts[1].tqcontains('*')) { + if (parts[0].contains('*') || parts[1].contains('*')) { return false; } diff --git a/kio/kssl/ksslpeerinfo.h b/kio/kssl/ksslpeerinfo.h index dfd44fff5..bdcf91231 100644 --- a/kio/kssl/ksslpeerinfo.h +++ b/kio/kssl/ksslpeerinfo.h @@ -33,7 +33,7 @@ class KInetSocketAddress; /** * KDE SSL Peer Data * - * This class tqcontains data about the peer of an SSL connection. + * This class contains data about the peer of an SSL connection. * * @author George Staikos <[email protected]> * @see KSSL diff --git a/kio/kssl/ksslsession.h b/kio/kssl/ksslsession.h index 74ae5b7d6..202781418 100644 --- a/kio/kssl/ksslsession.h +++ b/kio/kssl/ksslsession.h @@ -32,7 +32,7 @@ class KSSLSessionPrivate; /** * KDE SSL Session Information * - * This class tqcontains data about an SSL session. + * This class contains data about an SSL session. * It is just used as a container that is taken from or passed to KSSL objects. * * @author George Staikos <[email protected]> diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index 55f34dd18..5a77b12bf 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.tqcontains(xx)) + if (!cipherList.contains(xx)) cipherList.prepend(xx); else delete xx; @@ -183,7 +183,7 @@ TQString KSSLSettings::getCipherList() { for (unsigned int i = 0; i < cipherList.count(); i++) { CipherNode *j = 0L; while ((j = cipherList.at(i)) != 0L) { - if (j->name.tqcontains("ADH-") || j->name.tqcontains("NULL-") || j->name.tqcontains("DES-CBC3-SHA") || j->name.tqcontains("FZA")) { + if (j->name.contains("ADH-") || j->name.contains("NULL-") || j->name.contains("DES-CBC3-SHA") || j->name.contains("FZA")) { cipherList.remove(j); } else { break; @@ -298,7 +298,7 @@ void KSSLSettings::save() { for (unsigned int i = 0; i < v2ciphers.count(); i++) { TQString ciphername; ciphername.sprintf("cipher_%s", v2ciphers[i].ascii()); - if (v2selectedciphers.tqcontains(v2ciphers[i])) { + if (v2selectedciphers.contains(v2ciphers[i])) { m_cfg->writeEntry(ciphername, true); } else m_cfg->writeEntry(ciphername, false); } @@ -307,7 +307,7 @@ void KSSLSettings::save() { for (unsigned int i = 0; i < v3ciphers.count(); i++) { TQString ciphername; ciphername.sprintf("cipher_%s", v3ciphers[i].ascii()); - if (v3selectedciphers.tqcontains(v3ciphers[i])) { + if (v3selectedciphers.contains(v3ciphers[i])) { m_cfg->writeEntry(ciphername, true); } else m_cfg->writeEntry(ciphername, false); } @@ -315,7 +315,7 @@ void KSSLSettings::save() { m_cfg->sync(); - // insure proper permissions -- tqcontains sensitive data + // insure proper permissions -- contains sensitive data TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); diff --git a/kio/kssl/ksslsettings.h b/kio/kssl/ksslsettings.h index e7e348196..44345937b 100644 --- a/kio/kssl/ksslsettings.h +++ b/kio/kssl/ksslsettings.h @@ -30,7 +30,7 @@ class KSSLSettingsPrivate; /** * KDE SSL Settings * - * This class tqcontains some of the SSL settings for easy use. + * This class contains some of the SSL settings for easy use. * * @author George Staikos <[email protected]> * @see KSSL diff --git a/kio/kssl/ksslx509map.cc b/kio/kssl/ksslx509map.cc index 222d187cb..7896fdfcf 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.tqreplace(key, value); + m_pairs.replace(key, value); } TQString KSSLX509Map::getValue(const TQString& key) const { - if (!m_pairs.tqcontains(key)) { + if (!m_pairs.contains(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.tqfind(tok, head); + tail = str.find(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.tqcontains(apair[0])) { + if (m_pairs.contains(apair[0])) { TQString oldValue = m_pairs[apair[0]]; oldValue += "\n"; oldValue += apair[1]; - m_pairs.tqreplace(apair[0], oldValue); + m_pairs.replace(apair[0], oldValue); } else { m_pairs.insert(apair[0], apair[1]); } @@ -894,7 +894,7 @@ # xmcd database file for kscd 0 string \#\ xmcd text/xmcd # SQLite database files -0 string **\ This\ file\ tqcontains\ an\ SQLite application/x-sqlite2 +0 string **\ This\ file\ contains\ an\ SQLite application/x-sqlite2 0 string SQLite\ format\ 3 application/x-sqlite3 #------------------------------------------------------------------------------ @@ -1062,4 +1062,4 @@ >160 string NAXIS\ \ \ =\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 2 image/fits >160 string NAXIS\ \ \ =\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3 image/fits -# kate: space-indent off; tqreplace-tabs off; +# kate: space-indent off; replace-tabs off; diff --git a/kio/misc/fileshareset b/kio/misc/fileshareset index a4f534593..4c921ba38 100755 --- a/kio/misc/fileshareset +++ b/kio/misc/fileshareset @@ -183,7 +183,7 @@ sub check { ################################################################################ package exports; -sub tqfind { +sub find { my ($exports, $mntpoint) = @_; foreach (@$exports) { $_->{mntpoint} eq $mntpoint and return $_; @@ -396,8 +396,8 @@ sub name_mangle { last A; } } - $_ or die "can't tqfind a unique name"; - # can't tqfind a unique name, dropping the last letter + $_ or die "can't find a unique name"; + # can't find a unique name, dropping the last letter s|(.*).|$1|; } } @@ -422,7 +422,7 @@ sub update_server { system('/etc/rc.d/rc.samba', $_) foreach 'stop', 'start'; } else { - print STDERR "Error: Can't tqfind the samba init script \n"; + print STDERR "Error: Can't find the samba init script \n"; } } exit 0; diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp index e9bc75dc1..b547f7e6b 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.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"; + 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"; else mMethod = TQCString(); return mMethod; } diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp index 0d8854eb5..096fc1f03 100644 --- a/kio/misc/kfile/fileprops.cpp +++ b/kio/misc/kfile/fileprops.cpp @@ -329,7 +329,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList, for ( ; (props = it.current()); ++it ) { TQString file = props->fileName() + " "; - TQString fileString = line.tqreplace( 3, file.length(), file ); + TQString fileString = line.replace( 3, file.length(), file ); cout << TQFile::encodeName( fileString ) << endl; if ( args->isSet( "listsupported" ) ) diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/kntlm/des.cpp index e1029a4ca..b6683ac34 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 TQ_UINT32 f (DES_KEY * key, TQ_UINT32 r, char *subkey); +static Q_UINT32 f (DES_KEY * key, Q_UINT32 r, char *subkey); /* Tables defined in the Data Encryption Standard documents */ @@ -211,8 +211,8 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/) for (j = 0; j < 56; j++) { /* convert pc1 to bits of key */ l = pc1[j] - 1; /* integer bit location */ - m = l & 07; /* tqfind bit */ - pc1m[j] = (user_key[l >> 3] & /* tqfind which key byte l is in */ + m = l & 07; /* find bit */ + pc1m[j] = (user_key[l >> 3] & /* find which key byte l is in */ bytebit[m]) /* and which bit of that byte */ ? 1 : 0; /* and store 1-bit result */ @@ -227,7 +227,7 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/) /* check bit that goes to kn[j] */ if (pcr[pc2[j] - 1]) { - /* tqmask it in if it's there */ + /* mask it in if it's there */ l = j % 6; dkey->kn[i][j / 6] |= bytebit[l] >> 2; } @@ -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) { - TQ_UINT32 left, right; + Q_UINT32 left, right; char *knp; - TQ_UINT32 work[2]; /* Working data storage */ + Q_UINT32 work[2]; /* Working data storage */ permute_ip (block, key, (unsigned char *) work); /* Initial Permutation */ left = KFromToBigEndian(work[0]); @@ -310,7 +310,7 @@ permute_ip (unsigned char *inblock, DES_KEY * key, unsigned char *outblock) ob = outblock; p = key->iperm[j][(*ib >> 4) & 0xf]; q = key->iperm[j + 1][*ib & 0xf]; - /* and each output byte, OR the tqmasks together */ + /* and each output byte, OR the masks together */ *ob++ |= *p++ | *q++; *ob++ |= *p++ | *q++; *ob++ |= *p++ | *q++; @@ -339,7 +339,7 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock) ob = outblock; p = key->fperm[j][(*ib >> 4) & 0xf]; q = key->fperm[j + 1][*ib & 0xf]; - /* and each output byte, OR the tqmasks together */ + /* and each output byte, OR the masks together */ *ob++ |= *p++ | *q++; *ob++ |= *p++ | *q++; *ob++ |= *p++ | *q++; @@ -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 TQ_UINT32 -f (DES_KEY * key, TQ_UINT32 r, char *subkey) +static Q_UINT32 +f (DES_KEY * key, Q_UINT32 r, char *subkey) { - TQ_UINT32 *spp; - TQ_UINT32 rval, rt; + Q_UINT32 *spp; + Q_UINT32 rval, rt; int er; #ifdef TRACE @@ -377,7 +377,7 @@ f (DES_KEY * key, TQ_UINT32 r, char *subkey) spp = &key->sp[7][0]; rval = spp[(er ^ *subkey--) & 0x3f]; spp -= 64; - rt = (TQ_UINT32) r >> 3; + rt = (Q_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; - TQ_UINT32 val; + Q_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 0f6f59dc9..1cb2f27e5 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]; - TQ_UINT32 sp[8][64]; + Q_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 db2b45b6c..a3eca3bdd 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 tqunicode ) +TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode ) { //watch for buffer overflows - TQ_UINT32 offset; - TQ_UINT16 len; - offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset); + Q_UINT32 offset; + Q_UINT16 len; + offset = KFromToLittleEndian((Q_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 tq TQString str; const char *c = buf.data() + offset; - if ( tqunicode ) { + if ( unicode ) { str = UnicodeLE2TQString( (TQChar*) c, len >> 1 ); } else { - str = TQString::tqfromLatin1( c, len ); + str = TQString::fromLatin1( c, len ); } return str; } @@ -56,9 +56,9 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tq TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf ) { TQByteArray ret; - TQ_UINT32 offset; - TQ_UINT16 len; - offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset); + Q_UINT32 offset; + Q_UINT16 len; + offset = KFromToLittleEndian((Q_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 tqunicode ) +void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode ) { TQByteArray tmp; - if ( tqunicode ) { + if ( unicode ) { 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 ) { - TQ_UINT32 offset; - TQ_UINT16 len, maxlen; + Q_UINT32 offset; + Q_UINT16 len, maxlen; offset = (buf.size() + 1) & 0xfffffffe; len = data.size(); maxlen = data.size(); - secbuf.offset = KFromToLittleEndian((TQ_UINT32)offset); + secbuf.offset = KFromToLittleEndian((Q_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, TQ_UINT32 flags ) +bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, Q_UINT32 flags ) { TQByteArray rbuf( sizeof(Negotiate) ); rbuf.fill( 0 ); memcpy( rbuf.data(), "NTLMSSP", 8 ); - ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)1 ); + ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (Q_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 tqunicode = false; + bool unicode = false; TQString dom; //challenge structure too small if ( chsize < 32 ) return false; - tqunicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode; + unicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode; if ( domain.isEmpty() ) - dom = getString( challenge, ch->targetName, tqunicode ); + dom = getString( challenge, ch->targetName, unicode ); else dom = domain; rbuf.fill( 0 ); memcpy( rbuf.data(), "NTLMSSP", 8 ); - ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)3 ); + ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (Q_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, tqunicode ); - addString( rbuf, ((Auth*) rbuf.data())->user, user, tqunicode ); + addString( rbuf, ((Auth*) rbuf.data())->domain, dom, unicode ); + addString( rbuf, ((Auth*) rbuf.data())->user, user, unicode ); if ( !workstation.isEmpty() ) - addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, tqunicode ); + addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, unicode ); 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, tqunicode; - tqunicode = QString2UnicodeLE( password ); + TQByteArray ret, unicode; + unicode = QString2UnicodeLE( password ); - KMD4 md4( tqunicode ); + KMD4 md4( unicode ); 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( (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->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->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 ) { - TQ_UINT8 ipad[64], opad[64]; + Q_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 tqunicode( target.length() * 2 ); + TQByteArray unicode( target.length() * 2 ); for ( uint i = 0; i < target.length(); i++ ) { - ((TQ_UINT16*)tqunicode.data())[ i ] = KFromToLittleEndian( target[i].tqunicode() ); + ((Q_UINT16*)unicode.data())[ i ] = KFromToLittleEndian( target[i].unicode() ); } - return tqunicode; + return unicode; } TQString KNTLM::UnicodeLE2TQString( const TQChar* data, uint len ) { TQString ret; for ( uint i = 0; i < len; i++ ) { - ret += KFromToLittleEndian( data[ i ].tqunicode() ); + ret += KFromToLittleEndian( data[ i ].unicode() ); } return ret; } diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h index 23f00aa2a..9be4ea357 100644 --- a/kio/misc/kntlm/kntlm.h +++ b/kio/misc/kntlm/kntlm.h @@ -33,7 +33,7 @@ * can be used for various servers which implements NTLM type authentication. * A comprehensive description of the NTLM authentication protocol can be found * at http://davenport.sourceforge.net/ntlm.html - * The class also tqcontains methods to create the LanManager and NT (MD4) hashes + * The class also contains methods to create the LanManager and NT (MD4) hashes * of a password. * This class doesn't maintain any state information, so all methods are static. */ @@ -70,9 +70,9 @@ public: typedef struct { - TQ_UINT16 len; - TQ_UINT16 maxlen; - TQ_UINT32 offset; + Q_UINT16 len; + Q_UINT16 maxlen; + Q_UINT32 offset; } SecBuf; /** @@ -81,8 +81,8 @@ public: typedef struct { char signature[8]; /* "NTLMSSP\0" */ - TQ_UINT32 msgType; /* 1 */ - TQ_UINT32 flags; + Q_UINT32 msgType; /* 1 */ + Q_UINT32 flags; SecBuf domain; SecBuf workstation; } Negotiate; @@ -93,11 +93,11 @@ public: typedef struct { char signature[8]; - TQ_UINT32 msgType; /* 2 */ + Q_UINT32 msgType; /* 2 */ SecBuf targetName; - TQ_UINT32 flags; - TQ_UINT8 challengeData[8]; - TQ_UINT32 context[2]; + Q_UINT32 flags; + Q_UINT8 challengeData[8]; + Q_UINT32 context[2]; SecBuf targetInfo; } Challenge; @@ -107,23 +107,23 @@ public: typedef struct { char signature[8]; - TQ_UINT32 msgType; /* 3 */ + Q_UINT32 msgType; /* 3 */ SecBuf lmResponse; SecBuf ntResponse; SecBuf domain; SecBuf user; SecBuf workstation; SecBuf sessionKey; - TQ_UINT32 flags; + Q_UINT32 flags; } Auth; typedef struct { - TQ_UINT32 signature; - TQ_UINT32 reserved; - TQ_UINT64 timestamp; - TQ_UINT8 challenge[8]; - TQ_UINT8 unknown[4]; + Q_UINT32 signature; + Q_UINT32 reserved; + Q_UINT64 timestamp; + Q_UINT8 challenge[8]; + Q_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, - TQ_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM ); + Q_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 tqunicode ); + static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode ); /** * 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 tqunicode = false ); + static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = 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 6f935237e..336321fd4 100644 --- a/kio/misc/kntlm/kswap.h +++ b/kio/misc/kntlm/kswap.h @@ -28,7 +28,7 @@ /** * \defgroup KSWAP Byte-swapping functions - * kswap.h tqcontains functions that will help converting + * kswap.h contains functions that will help converting * 16, 32 and 64 bit length data between little-endian and * big-endian representations. * @@ -47,52 +47,52 @@ #ifdef HAVE_BYTESWAP_H #include <byteswap.h> - 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 ); } + 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 ); } #else /* HAVE_BYTESWAP_H */ #ifdef WORDS_BIGENDIAN - inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) + inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return (((b) & 0x00ff) << 8 | ((b) & 0xff00) >> 8); } - inline TQ_INT16 KSWAP_16( TQ_INT16 b ) + inline Q_INT16 KSWAP_16( Q_INT16 b ) { - return ((((TQ_UINT16)b) & 0x00ff) << 8 | (((TQ_UINT16)b) & 0xff00) >> 8); + return ((((Q_UINT16)b) & 0x00ff) << 8 | (((Q_UINT16)b) & 0xff00) >> 8); } - inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) + inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return ((((b) & 0xff000000) >> 24) | (((b) & 0x00ff0000) >> 8) | \ (((b) & 0x0000ff00) << 8) | (((b) & 0x000000ff) << 24)); } - inline TQ_INT32 KSWAP_32( TQ_INT32 b ) + inline Q_INT32 KSWAP_32( Q_INT32 b ) { return - (((((TQ_UINT32)b) & 0xff000000) >> 24) | ((((TQ_UINT32)b) & 0x00ff0000) >> 8) | \ - ((((TQ_UINT32)b) & 0x0000ff00) << 8) | ((((TQ_UINT32)b) & 0x000000ff) << 24)); + (((((Q_UINT32)b) & 0xff000000) >> 24) | ((((Q_UINT32)b) & 0x00ff0000) >> 8) | \ + ((((Q_UINT32)b) & 0x0000ff00) << 8) | ((((Q_UINT32)b) & 0x000000ff) << 24)); } #else /* WORDS_BIGENDIAN */ #include <sys/types.h> #include <netinet/in.h> - 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); } + 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); } #endif - inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) + inline Q_UINT64 KSWAP_64( Q_UINT64 b ) { union { - TQ_UINT64 ll; - TQ_UINT32 l[2]; + Q_UINT64 ll; + Q_UINT32 l[2]; } w, r; w.ll = b; r.l[0] = KSWAP_32( w.l[1] ); @@ -100,13 +100,13 @@ return r.ll; } - inline TQ_INT64 KSWAP_64( TQ_INT64 b ) + inline Q_INT64 KSWAP_64( Q_INT64 b ) { union { - TQ_UINT64 ll; - TQ_UINT32 l[2]; + Q_UINT64 ll; + Q_UINT32 l[2]; } w, r; - w.ll = (TQ_UINT64) b; + w.ll = (Q_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 TQ_UINT16 KFromToBigEndian( TQ_UINT16 b ) +inline Q_UINT16 KFromToBigEndian( Q_UINT16 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -130,7 +130,7 @@ inline TQ_UINT16 KFromToBigEndian( TQ_UINT16 b ) * \ingroup KSWAP * Converts a 16 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len ) +inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -143,7 +143,7 @@ inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit unsigned value from/to big-endian byte order to/from the machine order. */ -inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b ) +inline Q_UINT32 KFromToBigEndian( Q_UINT32 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -156,7 +156,7 @@ inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b ) * \ingroup KSWAP * Converts a 32 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len ) +inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -169,7 +169,7 @@ inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit unsigned value from/to big-endian byte order to/from the machine order. */ -inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b ) +inline Q_UINT64 KFromToBigEndian( Q_UINT64 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -182,7 +182,7 @@ inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b ) * \ingroup KSWAP * Converts a 64 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len ) +inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -195,7 +195,7 @@ inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit signed value from/to big-endian byte order to/from the machine order. */ -inline TQ_INT16 KFromToBigEndian( TQ_INT16 b ) +inline Q_INT16 KFromToBigEndian( Q_INT16 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -208,7 +208,7 @@ inline TQ_INT16 KFromToBigEndian( TQ_INT16 b ) * \ingroup KSWAP * Converts a 16 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len ) +inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -221,7 +221,7 @@ inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit signed value from/to big-endian byte order to/from the machine order. */ -inline TQ_INT32 KFromToBigEndian( TQ_INT32 b ) +inline Q_INT32 KFromToBigEndian( Q_INT32 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -234,7 +234,7 @@ inline TQ_INT32 KFromToBigEndian( TQ_INT32 b ) * \ingroup KSWAP * Converts a 32 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len ) +inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -247,7 +247,7 @@ inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit signed value from/to big-endian byte order to/from the machine order. */ -inline TQ_INT64 KFromToBigEndian( TQ_INT64 b ) +inline Q_INT64 KFromToBigEndian( Q_INT64 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -260,7 +260,7 @@ inline TQ_INT64 KFromToBigEndian( TQ_INT64 b ) * \ingroup KSWAP * Converts a 64 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len ) +inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -273,7 +273,7 @@ inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b ) +inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -286,7 +286,7 @@ inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b ) * \ingroup KSWAP * Converts a 16 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len ) +inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -299,7 +299,7 @@ inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b ) +inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -312,7 +312,7 @@ inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b ) * \ingroup KSWAP * Converts a 32 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len ) +inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -325,7 +325,7 @@ inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b ) +inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -338,7 +338,7 @@ inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b ) * \ingroup KSWAP * Converts a 64 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len ) +inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -351,7 +351,7 @@ inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit signed value from/to little-endian byte order to/from the machine order. */ -inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b ) +inline Q_INT16 KFromToLittleEndian( Q_INT16 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -364,7 +364,7 @@ inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b ) * \ingroup KSWAP * Converts a 16 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len ) +inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -377,7 +377,7 @@ inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit signed value from/to little-endian byte order to/from the machine order. */ -inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b ) +inline Q_INT32 KFromToLittleEndian( Q_INT32 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -390,7 +390,7 @@ inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b ) * \ingroup KSWAP * Converts a 32 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len ) +inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -403,7 +403,7 @@ inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit signed value from/to little-endian byte order to/from the machine order. */ -inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b ) +inline Q_INT64 KFromToLittleEndian( Q_INT64 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -416,7 +416,7 @@ inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b ) * \ingroup KSWAP * Converts a 64 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( TQ_INT64 *out, TQ_INT64 *in, uint len ) +inline void KFromToLittleEndian( Q_INT64 *out, Q_INT64 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; diff --git a/kio/misc/kpac/README.wpad b/kio/misc/kpac/README.wpad index ed18a36b5..f63d25764 100644 --- a/kio/misc/kpac/README.wpad +++ b/kio/misc/kpac/README.wpad @@ -2,7 +2,7 @@ Web Proxy Auto Discovery (WPAD) =============================== This README is intended for network administrators who want to enable the -users on their network to fully automatically tqfind the proxy settings. +users on their network to fully automatically find the proxy settings. Automatic proxy discovery works in two steps: 1) Find a configuration script @@ -12,7 +12,7 @@ The configuration script is a "PAC" (JavaScript) file just as in plain Proxy Auto Configuration as described here: http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html -The WPAD part of the process (#1 above) described here is about how to tqfind +The WPAD part of the process (#1 above) described here is about how to find this script without having the users enter its URL into the proxy settings. (All they have to do in a WPAD-enabled network is to select "Automatically detected script file" in KDE's proxy setup. diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 193b46d98..7a84958f7 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -113,11 +113,11 @@ namespace KPAC void Discovery::failed() { - setError( i18n( "Could not tqfind a usable proxy configuration script" ) ); + setError( i18n( "Could not find a usable proxy configuration script" ) ); // If this is the first DNS query, initialize our host name or abort // on failure. Otherwise abort if the current domain (which was already - // queried for a host called "wpad" tqcontains a SOA record) + // queried for a host called "wpad" contains a SOA record) bool firstQuery = m_hostname.isEmpty(); if ( ( firstQuery && !initHostName() ) || ( !firstQuery && !checkDomain() ) ) @@ -126,7 +126,7 @@ namespace KPAC return; } - int dot = m_hostname.tqfind( '.' ); + int dot = m_hostname.find( '.' ); 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 82418882f..05d8569cc 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 TQObject + class Downloader : public QObject { Q_OBJECT public: diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp index f843dc045..6cba79db6 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.tqfind( ":/", len ) != len ) + if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len ) proxy.prepend("http://"); - BlackList::Iterator it = m_blackList.tqfind( proxy ); + BlackList::Iterator it = m_blackList.find( 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 752fb4cc5..55faef8a1 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.tqunicode(), s.length() * sizeof( UChar ) ); + std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) ); rep = Rep::create( data, s.length() ); } @@ -98,7 +98,7 @@ namespace virtual bool implementsCall() const { return true; } - static int tqfindString( const UString& s, const char* const* values ) + static int findString( const UString& s, const char* const* values ) { int index = 0; UString lower = s.toLower(); @@ -123,13 +123,13 @@ namespace }; // isPlainHostName( host ) - // @returns true if @p host doesn't tqcontains a domain part + // @returns true if @p host doesn't contains a domain part struct IsPlainHostName : public Function { virtual Value call( ExecState* exec, Object&, const List& args ) { if ( args.size() != 1 ) return Undefined(); - return Boolean( args[ 0 ].toString( exec ).tqfind( "." ) == -1 ); + return Boolean( args[ 0 ].toString( exec ).find( "." ) == -1 ); } }; @@ -154,7 +154,7 @@ namespace { if ( args.size() != 2 ) return Undefined(); UString host = args[ 0 ].toString( exec ).toLower(); - if ( host.tqfind( "." ) == -1 ) return Boolean( true ); + if ( host.find( "." ) == -1 ) return Boolean( true ); UString fqdn = args[ 1 ].toString( exec ).toLower(); return Boolean( host == fqdn ); } @@ -173,9 +173,9 @@ namespace } }; - // isInNet( host, subnet, tqmask ) + // isInNet( host, subnet, mask ) // @returns true if @p host is within the IP subnet - // specified via @p subnet and @p tqmask + // specified via @p subnet and @p mask struct IsInNet : public Function { virtual Value call( ExecState* exec, Object&, const List& args ) @@ -185,8 +185,8 @@ namespace { in_addr_t host = Address::resolve( args[ 0 ].toString( exec ) ); in_addr_t subnet = Address::parse( args[ 1 ].toString( exec ) ); - in_addr_t tqmask = Address::parse( args[ 2 ].toString( exec ) ); - return Boolean( ( host & tqmask ) == ( subnet & tqmask ) ); + in_addr_t mask = Address::parse( args[ 2 ].toString( exec ) ); + return Boolean( ( host & mask ) == ( subnet & mask ) ); } catch ( const Address::Error& ) { @@ -259,10 +259,10 @@ namespace if ( args.size() < 1 || args.size() > 3 ) return Undefined(); static const char* const days[] = { "sun", "mon", "tue", "wed", "thu", "fri", "sat", 0 }; - int d1 = tqfindString( args[ 0 ].toString( exec ), days ); + int d1 = findString( args[ 0 ].toString( exec ), days ); if ( d1 == -1 ) return Undefined(); - int d2 = tqfindString( args[ 1 ].toString( exec ), days ); + int d2 = findString( args[ 1 ].toString( exec ), days ); if ( d2 == -1 ) d2 = d1; return checkRange( getTime( exec, args )->tm_wday, d1, d2 ); } @@ -293,7 +293,7 @@ namespace int value = -1; if ( args[ i ].isA( NumberType ) ) value = args[ i ].toInteger( exec ); - else value = tqfindString( args[ i ].toString( exec ), months ); + else value = findString( args[ i ].toString( exec ), months ); if ( value >= 0 ) values.push_back( value ); else break; } @@ -441,16 +441,16 @@ namespace KPAC TQString Script::evaluate( const KURL& url ) { ExecState *exec = m_interpreter.globalExec(); - Value tqfindFunc = m_interpreter.globalObject().get( exec, "FindProxyForURL" ); - Object tqfindObj = Object::dynamicCast( tqfindFunc ); - if (!tqfindObj.isValid() || !tqfindObj.implementsCall()) + Value findFunc = m_interpreter.globalObject().get( exec, "FindProxyForURL" ); + Object findObj = Object::dynamicCast( findFunc ); + if (!findObj.isValid() || !findObj.implementsCall()) throw Error( "No such function FindProxyForURL" ); Object thisObj; List args; args.append(String(url.url())); args.append(String(url.host())); - Value retval = tqfindObj.call( exec, thisObj, args ); + Value retval = findObj.call( exec, thisObj, args ); if ( exec->hadException() ) { Value ex = exec->exception(); diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp index 4a4449ba2..d84e4c297 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::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">"); + fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">"); } else { struct passwd *p; p = getpwuid(getuid()); - fromaddr = TQString::tqfromLatin1(p->pw_name); + fromaddr = TQString::fromLatin1(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::tqfromLatin1("bugs.kde.org"); + server=TQString::fromLatin1("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::tqfromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient)); + sm->setMessageHeader(TQString::fromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient)); sm->setMessageBody(text); sm->sendMessage(); diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp index 4581d01d4..36a417b88 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.tqfind('<'); + int index = senderAddress.find('<'); if (index == -1) return; senderAddress = senderAddress.mid(index + 1); - index = senderAddress.tqfind('>'); + index = senderAddress.find('>'); if (index != -1) senderAddress = senderAddress.left(index); senderAddress = senderAddress.simplifyWhiteSpace(); while (1) { - index = senderAddress.tqfind(' '); + index = senderAddress.find(' '); if (index != -1) senderAddress = senderAddress.mid(index + 1); // take one side else break; } - index = senderAddress.tqfind('@'); + index = senderAddress.find('@'); 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::tqfromLatin1("helo %1\r\n").arg(domainName); + writeString = TQString::fromLatin1("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.tqfind('\n'); + nl = lineBuffer.find('\n'); if(nl == -1) return; lastLine = lineBuffer.left(nl); @@ -249,12 +249,12 @@ void SMTP::processLine(TQString *line) int i, stat; TQString tmpstr; - i = line->tqfind(' '); + i = line->find(' '); tmpstr = line->left(i); if(i > 3) kdDebug() << "warning: SMTP status code longer then 3 digits: " << tmpstr << endl; stat = tmpstr.toInt(); - serverState = (SMTPServertqStatus)stat; + serverState = (SMTPServerStatus)stat; lastState = state; kdDebug() << "smtp state: [" << stat << "][" << *line << "]" << endl; @@ -262,7 +262,7 @@ void SMTP::processLine(TQString *line) switch(stat){ case GREET: //220 state = IN; - writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName); + writeString = TQString::fromLatin1("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::tqfromLatin1("mail from: %1\r\n").arg(senderAddress); + writeString = TQString::fromLatin1("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::tqfromLatin1("rcpt to: %1\r\n").arg(recipientAddress); + writeString = TQString::fromLatin1("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::tqfromLatin1("data\r\n"); + writeString = TQString::fromLatin1("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::tqfromLatin1("Subject: %1\r\n").arg(messageSubject); + writeString = TQString::fromLatin1("Subject: %1\r\n").arg(messageSubject); writeString += messageHeader; writeString += "\r\n"; writeString += messageBody; - writeString += TQString::tqfromLatin1(".\r\n"); + writeString += TQString::fromLatin1(".\r\n"); kdDebug() << "out: " << writeString; write(sock->socket(), writeString.ascii(), writeString.length()); break; diff --git a/kio/misc/ksendbugmail/smtp.h b/kio/misc/ksendbugmail/smtp.h index b8e782cb9..707d20ae4 100644 --- a/kio/misc/ksendbugmail/smtp.h +++ b/kio/misc/ksendbugmail/smtp.h @@ -7,7 +7,7 @@ #include <tqtimer.h> #include <ksock.h> -/*int SMTPServertqStatus[] = { +/*int SMTPServerStatus[] = { 220, // greeting from server 221, // server acknolages goodbye 250, // command successful @@ -17,7 +17,7 @@ 0 // null }; -int SMTPClienttqStatus[] = { +int SMTPClientStatus[] = { 50, // not logged in yet. 100, // logged in, got 220 150, // sent helo, got 250 @@ -37,7 +37,7 @@ int SMTPClienttqStatus[] = { #define SMTP_READ_BUFFER_SIZE 256 -class SMTP:public TQObject +class SMTP:public QObject { Q_OBJECT public: @@ -66,7 +66,7 @@ public: READYDATA = 354, // server ready to receive data ERROR = 501, // error UNKNOWN = 550 // user unknown - }SMTPServertqStatus; + }SMTPServerStatus; typedef enum { INIT = 50, // not logged in yet @@ -79,7 +79,7 @@ public: QUIT = 400, // sent QUIT, got 221 OUT = 450, // finished, logged out CERROR = 500 // didn't finish, had error or connection drop - }SMTPClienttqStatus; + }SMTPClientStatus; typedef enum { NOERROR = 0, @@ -125,9 +125,9 @@ private: TQString messageSubject; TQString messageBody, messageHeader; - SMTPClienttqStatus state; - SMTPClienttqStatus lastState; - SMTPServertqStatus serverState; + SMTPClientStatus state; + SMTPClientStatus lastState; + SMTPServerStatus serverState; TQString domainName; diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index cd911de4a..9e8b85574 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::tqcurrentDateTime()) { + if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::currentDateTime()) { cfg->deleteGroup(*i); continue; } @@ -164,7 +164,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (node->permanent || - node->expires > TQDateTime::tqcurrentDateTime()) { + node->expires > TQDateTime::currentDateTime()) { // First convert to a binary format and then write the // kconfig entry write the (CN, policy, cert) to // KSimpleConfig @@ -194,7 +194,7 @@ KSSLCNode *node; cfg->sync(); - // insure proper permissions -- tqcontains sensitive data + // insure proper permissions -- contains sensitive data TQString cfgName(KGlobal::dirs()->findResource("config", "ksslpolicies")); if (!cfgName.isEmpty()) { @@ -239,7 +239,7 @@ TQStringList groups = cfg->groupList(); // remove it if it has expired if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < - TQDateTime::tqcurrentDateTime()) { + TQDateTime::currentDateTime()) { cfg->deleteGroup(*i); continue; } @@ -278,7 +278,7 @@ KSSLCNode *node; node->permanent = permanent; if (!permanent) { - node->expires = TQDateTime::tqcurrentDateTime(); + node->expires = TQDateTime::currentDateTime(); // FIXME: make this configurable node->expires = node->expires.addSecs(3600); } @@ -297,7 +297,7 @@ KSSLCNode *node; certList.prepend(n); if (!permanent) { - n->expires = TQDateTime::tqcurrentDateTime(); + n->expires = TQDateTime::currentDateTime(); n->expires = n->expires.addSecs(3600); } @@ -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::tqcurrentDateTime()) { + node->expires < TQDateTime::currentDateTime()) { 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::tqcurrentDateTime()) { + node->expires < TQDateTime::currentDateTime()) { 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::tqcurrentDateTime()) { + node->expires < TQDateTime::currentDateTime()) { 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::tqcurrentDateTime()) { + node->expires < TQDateTime::currentDateTime()) { 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::tqcurrentDateTime()) { + TQDateTime::currentDateTime()) { 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::tqcurrentDateTime()) { + TQDateTime::currentDateTime()) { 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::tqcurrentDateTime()) { + TQDateTime::currentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); searchRemoveCert(node->cert); @@ -572,7 +572,7 @@ KSSLCNode *node; return false; } - if (!node->hosts.tqcontains(host)) { + if (!node->hosts.contains(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::tqcurrentDateTime()) { + TQDateTime::currentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); searchRemoveCert(node->cert); @@ -623,8 +623,8 @@ void KSSLD::caVerifyUpdate() { return; cfg->setGroup(TQString::null); - TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); - TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); + Q_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); + Q_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.tqfind(email); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email); if (it == skEmail.end()) it = skEmail.insert(email, TQPtrVector<KSSLCertificate>()); TQPtrVector<KSSLCertificate> &elem = *it; - if (elem.tqfindRef(cert) == -1) { + if (elem.findRef(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.tqfind(static_cast<const TQString &>(*iter).lower()); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(static_cast<const TQString &>(*iter).lower()); if (it == skEmail.end()) break; TQPtrVector<KSSLCertificate> &elem = *it; - int n = elem.tqfindRef(cert); + int n = elem.findRef(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.tqfind(email.lower()); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(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.tqfind(key); + TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.find(key); kdDebug() << "Searching cert for " << key.latin1() << endl; diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui index e3fadec5d..ecf2d236f 100644 --- a/kio/misc/kwalletd/kbetterthankdialogbase.ui +++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KBetterThanKDialogBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>21</height> @@ -46,7 +46,7 @@ </spacer> <widget class="QLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -147,7 +147,7 @@ <slot access="protected">accept()</slot> <slot access="protected">reject()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp index d4c87bd28..c431ecf69 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.tqfind(id); + TQTimer *t = _timers.find(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.tqfind(id) != 0L) { + if (_timers.find(id) != 0L) { return; } @@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) { void KTimeout::resetTimer(int id, int timeout) { - TQTimer *t = _timers.tqfind(id); + TQTimer *t = _timers.find(id); if (t) { t->changeInterval(timeout); } diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 8df3ddb63..069575710 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.tqfind(rc) || rc == 0); + } while (_wallets.find(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().tqcontains(KWallet::Wallet::LocalWallet())) { + if (_firstUse && !wallets().contains(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].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { + if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { return -1; } _handles[appid].append(rc); - _wallets.tqfind(rc)->ref(); + _wallets.find(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.tqcontains(thisApp)) { + if (!apps.contains(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.tqcontains(thisApp)) { + if (!apps.contains(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.tqfind(handle); + w = _wallets.find(handle); reclose = true; } else { handle = it.currentKey(); @@ -710,14 +710,14 @@ int KWalletD::close(const TQString& wallet, bool force) { int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { if (w) { const TQString& wallet = w->walletName(); - assert(_passwords.tqcontains(wallet)); + assert(_passwords.contains(wallet)); if (w->refCount() == 0 || force) { - tqinvalidateHandle(handle); + invalidateHandle(handle); if (_closeIdle && _timeouts) { _timeouts->removeTimer(handle); } _wallets.remove(handle); - if (_passwords.tqcontains(wallet)) { + if (_passwords.contains(wallet)) { w->close(TQByteArray().duplicate(_passwords[wallet].data(), _passwords[wallet].length())); _passwords[wallet].fill(0); _passwords.remove(wallet); @@ -735,15 +735,15 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { int KWalletD::close(int handle, bool force) { TQCString appid = friendlyDCOPPeerName(); - KWallet::Backend *w = _wallets.tqfind(handle); - bool tqcontains = false; + KWallet::Backend *w = _wallets.find(handle); + bool contains = false; if (w) { // the handle is valid - if (_handles.tqcontains(appid)) { // we know this app - if (_handles[appid].tqcontains(handle)) { + if (_handles.contains(appid)) { // we know this app + if (_handles[appid].contains(handle)) { // the app owns this handle - _handles[appid].remove(_handles[appid].tqfind(handle)); - tqcontains = true; + _handles[appid].remove(_handles[appid].find(handle)); + contains = true; if (_handles[appid].isEmpty()) { _handles.remove(appid); } @@ -751,15 +751,15 @@ int KWalletD::close(int handle, bool force) { } // watch the side effect of the deref() - if ((tqcontains && w->deref() == 0 && !_leaveOpen) || force) { + if ((contains && w->deref() == 0 && !_leaveOpen) || force) { if (_closeIdle && _timeouts) { _timeouts->removeTimer(handle); } _wallets.remove(handle); if (force) { - tqinvalidateHandle(handle); + invalidateHandle(handle); } - if (_passwords.tqcontains(w->walletName())) { + if (_passwords.contains(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.tqfind(handle); + KWallet::Backend *rc = _wallets.find(handle); if (rc == 0 && ++_failed > 5) { _failed = 0; @@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke void KWalletD::slotAppUnregistered(const TQCString& app) { - if (_handles.tqcontains(app)) { + if (_handles.contains(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.tqfind(*i); + KWallet::Backend *w = _wallets.find(*i); if (w && !_leaveOpen && 0 == w->deref()) { close(w->walletName(), true); } @@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) { } -void KWalletD::tqinvalidateHandle(int handle) { +void KWalletD::invalidateHandle(int handle) { for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin(); i != _handles.end(); ++i) { @@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) { return 0L; } - KWallet::Backend *w = _wallets.tqfind(handle); + KWallet::Backend *w = _wallets.find(handle); if (w) { // the handle is valid - if (_handles.tqcontains(appid)) { // we know this app - if (_handles[appid].tqcontains(handle)) { + if (_handles.contains(appid)) { // we know this app + if (_handles[appid].contains(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().tqcontains(it.currentKey())) { + if (hit.data().contains(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].tqcontains(it.currentKey())) { + if (_handles[application].contains(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().tqcontains(wallet)) { + if (!wallets().contains(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().tqcontains(wallet)) { + if (!wallets().contains(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].tqcontains(TQString::fromLocal8Bit(app)); + return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app)); } bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) { - return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); + return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app)); } @@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() { if (!dc) { return ""; } - return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), ""); + return dc->senderId().replace(TQRegExp("-[0-9]+$"), ""); } void KWalletD::timedOut(int id) { - KWallet::Backend *w = _wallets.tqfind(id); + KWallet::Backend *w = _wallets.find(id); if (w) { closeWallet(w, id, true); } diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h index ba83b4efc..2aea371ba 100644 --- a/kio/misc/kwalletd/kwalletd.h +++ b/kio/misc/kwalletd/kwalletd.h @@ -161,7 +161,7 @@ class KWalletD : public KDEDModule { // Generate a new unique handle. int generateHandle(); // Invalidate a handle (remove it from the TQMap) - void tqinvalidateHandle(int handle); + void invalidateHandle(int handle); // Emit signals about closing wallets void doCloseSignals(int,const TQString&); void emitFolderUpdated(const TQString&, const TQString&); diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui index a6278e3e9..609508e11 100644 --- a/kio/misc/kwalletd/kwalletwizard.ui +++ b/kio/misc/kwalletd/kwalletwizard.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KWalletWizard</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -36,7 +36,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -58,7 +58,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -83,7 +83,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>21</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>31</height> @@ -209,7 +209,7 @@ </widget> <widget class="QLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -217,7 +217,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="text"> <string>Enter a new password:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -250,7 +250,7 @@ <property name="text"> <string>Verify password:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -261,7 +261,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -311,7 +311,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>51</height> @@ -328,7 +328,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>31</height> @@ -362,7 +362,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>70</height> @@ -376,7 +376,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -403,7 +403,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -417,7 +417,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>121</height> @@ -450,7 +450,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>51</height> @@ -541,5 +541,5 @@ <slot>setBasic()</slot> <slot access="private">destroy()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index 2f24779be..b1d060f21 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -126,7 +126,7 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent) :KDialogBase(KDialogBase::Plain,i18n("Configure Network Operation Window"),KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, KDialogBase::Ok, parent, "configprog", false) { - TQVBoxLayout *tqlayout=new TQVBoxLayout(plainPage(),spacingHint()); + TQVBoxLayout *layout=new TQVBoxLayout(plainPage(),spacingHint()); m_showSystemTrayCb=new TQCheckBox(i18n("Show system tray icon"), plainPage()); m_keepOpenCb=new TQCheckBox(i18n("Keep network operation window always open"), plainPage()); m_headerCb=new TQCheckBox(i18n("Show column headers"), plainPage()); @@ -150,14 +150,14 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent) m_items[ListProgress::TB_LOCAL_FILENAME] =new TQCheckListItem(m_columns, i18n("Local Filename"), TQCheckListItem::CheckBox); m_items[ListProgress::TB_OPERATION] =new TQCheckListItem(m_columns, i18n("Operation"), TQCheckListItem::CheckBox); - tqlayout->addWidget(m_showSystemTrayCb); - tqlayout->addWidget(m_keepOpenCb); - tqlayout->addWidget(m_headerCb); - tqlayout->addWidget(m_toolBarCb); - tqlayout->addWidget(m_statusBarCb); - tqlayout->addWidget(m_fixedWidthCb); - tqlayout->addWidget(label); - tqlayout->addWidget(m_columns); + layout->addWidget(m_showSystemTrayCb); + layout->addWidget(m_keepOpenCb); + layout->addWidget(m_headerCb); + layout->addWidget(m_toolBarCb); + layout->addWidget(m_statusBarCb); + layout->addWidget(m_fixedWidthCb); + layout->addWidget(label); + layout->addWidget(m_columns); } void ProgressConfigDialog::setChecked(int i, bool on) @@ -272,8 +272,8 @@ void ProgressItem::setPercent( unsigned long percent ) { void ProgressItem::setInfoMessage( const TQString & msg ) { TQString plainTextMsg(msg); - plainTextMsg.tqreplace( TQRegExp( "</?b>" ), TQString::null ); - plainTextMsg.tqreplace( TQRegExp( "<img.*>" ), TQString::null ); + plainTextMsg.replace( TQRegExp( "</?b>" ), TQString::null ); + plainTextMsg.replace( TQRegExp( "<img.*>" ), TQString::null ); setText( ListProgress::TB_PROGRESS, plainTextMsg ); defaultProgress->slotInfoMessage( 0, msg ); @@ -529,7 +529,7 @@ void ListProgress::applySettings() void ListProgress::readSettings() { KConfig config("uiserverrc"); - // read listview tqgeometry properties + // read listview geometry properties config.setGroup( "ProgressList" ); for ( int i = 0; i < TB_MAX; i++ ) { TQString tmps="Col"+TQString::number(i); @@ -562,7 +562,7 @@ void ListProgress::columnWidthChanged(int column) void ListProgress::writeSettings() { KConfig config("uiserverrc"); - // write listview tqgeometry properties + // write listview geometry properties config.setGroup( "ProgressList" ); for ( int i = 0; i < TB_MAX; i++ ) { if (!m_lpcc[i].enabled) { @@ -750,7 +750,7 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress ) TQListViewItemIterator it( listProgress ); for ( ; it.current(); ++it ) { - if ( it.current()->itemBelow() == 0L ) { // this will tqfind the end of list + if ( it.current()->itemBelow() == 0L ) { // this will find the end of list break; } } @@ -773,7 +773,7 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress ) } -ProgressItem* UIServer::tqfindItem( int id ) +ProgressItem* UIServer::findItem( int id ) { TQListViewItemIterator it( listProgress ); @@ -806,7 +806,7 @@ void UIServer::setItemVisible( ProgressItem * item, bool visible ) void UIServer::setJobVisible( int id, bool visible ) { kdDebug(7024) << "UIServer::setJobVisible id=" << id << " visible=" << visible << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); Q_ASSERT( item ); if ( item ) setItemVisible( item, visible ); @@ -815,7 +815,7 @@ void UIServer::setJobVisible( int id, bool visible ) void UIServer::jobFinished( int id ) { kdDebug(7024) << "UIServer::jobFinished id=" << id << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); // remove item from the list and delete the corresponding defaultprogress if ( item ) { @@ -834,7 +834,7 @@ void UIServer::totalSize64( int id, KIO::filesize_t size ) { // kdDebug(7024) << "UIServer::totalSize " << id << " " << KIO::number(size) << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setTotalSize( size ); } @@ -844,7 +844,7 @@ void UIServer::totalFiles( int id, unsigned long files ) { kdDebug(7024) << "UIServer::totalFiles " << id << " " << (unsigned int) files << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setTotalFiles( files ); } @@ -854,7 +854,7 @@ void UIServer::totalDirs( int id, unsigned long dirs ) { kdDebug(7024) << "UIServer::totalDirs " << id << " " << (unsigned int) dirs << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setTotalDirs( dirs ); } @@ -867,7 +867,7 @@ void UIServer::processedSize64( int id, KIO::filesize_t size ) { //kdDebug(7024) << "UIServer::processedSize " << id << " " << KIO::number(size) << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setProcessedSize( size ); } @@ -877,7 +877,7 @@ void UIServer::processedFiles( int id, unsigned long files ) { //kdDebug(7024) << "UIServer::processedFiles " << id << " " << (unsigned int) files << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setProcessedFiles( files ); } @@ -887,7 +887,7 @@ void UIServer::processedDirs( int id, unsigned long dirs ) { kdDebug(7024) << "UIServer::processedDirs " << id << " " << (unsigned int) dirs << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setProcessedDirs( dirs ); } @@ -897,7 +897,7 @@ void UIServer::percent( int id, unsigned long ipercent ) { //kdDebug(7024) << "UIServer::percent " << id << " " << (unsigned int) ipercent << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setPercent( ipercent ); } @@ -907,7 +907,7 @@ void UIServer::speed( int id, unsigned long bytes_per_second ) { //kdDebug(7024) << "UIServer::speed " << id << " " << (unsigned int) bytes_per_second << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setSpeed( bytes_per_second ); } @@ -917,7 +917,7 @@ void UIServer::infoMessage( int id, const TQString & msg ) { //kdDebug(7024) << "UIServer::infoMessage " << id << " " << msg << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setInfoMessage( msg ); } @@ -930,7 +930,7 @@ void UIServer::canResume64( int id, KIO::filesize_t offset ) { //kdDebug(7024) << "UIServer::canResume " << id << " " << offset << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setCanResume( offset ); } @@ -940,7 +940,7 @@ void UIServer::copying( int id, KURL from, KURL to ) { //kdDebug(7024) << "UIServer::copying " << id << " " << from.url() << " " << to.url() << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setCopying( from, to ); } @@ -950,7 +950,7 @@ void UIServer::moving( int id, KURL from, KURL to ) { //kdDebug(7024) << "UIServer::moving " << id << " " << from.url() << " " << to.url() << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setMoving( from, to ); } @@ -960,7 +960,7 @@ void UIServer::deleting( int id, KURL url ) { //kdDebug(7024) << "UIServer::deleting " << id << " " << url.url() << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setDeleting( url ); } @@ -970,7 +970,7 @@ void UIServer::transferring( int id, KURL url ) { //kdDebug(7024) << "UIServer::transferring " << id << " " << url.url() << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setTransferring( url ); } @@ -980,7 +980,7 @@ void UIServer::creatingDir( int id, KURL dir ) { kdDebug(7024) << "UIServer::creatingDir " << id << " " << dir.url() << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setCreatingDir( dir ); } @@ -990,7 +990,7 @@ void UIServer::stating( int id, KURL url ) { kdDebug(7024) << "UIServer::stating " << id << " " << url.url() << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setStating( url ); } @@ -1000,7 +1000,7 @@ void UIServer::mounting( int id, TQString dev, TQString point ) { kdDebug(7024) << "UIServer::mounting " << id << " " << dev << " " << point << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setMounting( dev, point ); } @@ -1010,7 +1010,7 @@ void UIServer::unmounting( int id, TQString point ) { kdDebug(7024) << "UIServer::unmounting " << id << " " << point << endl; - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) { item->setUnmounting( point ); } @@ -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.tqcontains("ssl_proxied") ? "" : meta["ssl_peer_ip"]; + TQString ip = meta.contains("ssl_proxied") ? "" : meta["ssl_peer_ip"]; kid->setup( x, ip, url, // the URL @@ -1278,7 +1278,7 @@ TQByteArray UIServer::open_RenameDlg64( int id, ) { // Hide existing dialog box if any - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) setItemVisible( item, false ); TQString newDest; @@ -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 << TQ_UINT8(result) << newDest; + stream << Q_UINT8(result) << newDest; if ( item && result != KIO::R_CANCEL ) setItemVisible( item, true ); return data; @@ -1302,7 +1302,7 @@ int UIServer::open_SkipDlg( int id, const TQString & error_text ) { // Hide existing dialog box if any - ProgressItem *item = tqfindItem( id ); + ProgressItem *item = findItem( id ); if ( item ) setItemVisible( item, false ); kdDebug(7024) << "Calling KIO::open_SkipDlg" << endl; diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h index 2cd6e5fbd..85e255a43 100644 --- a/kio/misc/uiserver.h +++ b/kio/misc/uiserver.h @@ -386,7 +386,7 @@ protected slots: protected: - ProgressItem* tqfindItem( int id ); + ProgressItem* findItem( int id ); virtual void resizeEvent(TQResizeEvent* e); virtual bool queryClose(); diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp index c75615145..0c8470a61 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.tqfind(key); + KIO::MetaData::Iterator it = attributes_expected.find(key); if (it != attributes_expected.end()) { testStrings(prefix,it.data(),value); // remove key from map @@ -59,7 +59,7 @@ public: } void sendMetaData() { - // check here if attributes_expected tqcontains any excess keys + // check here if attributes_expected contains any excess keys KIO::MetaData::ConstIterator it = attributes_expected.begin(); KIO::MetaData::ConstIterator end = attributes_expected.end(); for (; it != end; ++it) { @@ -92,9 +92,9 @@ private: // -- testcase related members TQString mime_type_expected; // expected mime type - /** tqcontains all attributes and values the testcase has to set */ + /** contains all attributes and values the testcase has to set */ KIO::MetaData attributes_expected; - /** tqcontains the content as it is expected to be returned */ + /** contains the content as it is expected to be returned */ TQByteArray content_expected; int passed; // # of passed tests int total; // # of total tests diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index 93b250075..9fe4b4c49 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::tqfromLatin1( "system" ) ) ) { + if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) { kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl; return; } diff --git a/kio/tests/jobtest.h b/kio/tests/jobtest.h index 83ec2da7c..533ffba8c 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 TQObject +class JobTest : public QObject { Q_OBJECT diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp index 0f9ac9e7a..58ae319b2 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::tqfromLatin1("staff"); -static const TQString s_group2 = TQString::tqfromLatin1("guest"); +static const TQString s_group1 = TQString::fromLatin1("staff"); +static const TQString s_group2 = TQString::fromLatin1("guest"); #else -static const TQString s_group1 = TQString::tqfromLatin1("audio"); -static const TQString s_group2 = TQString::tqfromLatin1("users"); +static const TQString s_group1 = TQString::fromLatin1("audio"); +static const TQString s_group2 = TQString::fromLatin1("users"); #endif -static const TQString s_testACL = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ntqmask::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( "tqmask::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( "tqmask::r-x\nother::r--\n" ); +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" ); KACLTest::KACLTest() :m_acl( s_testACL ) @@ -163,8 +163,8 @@ void KACLTest::testGetOthersPermissions() void KACLTest::testGetMaskPermissions() { bool exists = false; - unsigned short tqmask = m_acl.tqmaskPermissions( exists ); - check( "Mask permissions: ", TQString::number( tqmask ), "7" ); + unsigned short mask = m_acl.maskPermissions( exists ); + check( "Mask permissions: ", TQString::number( mask ), "7" ); check( "Mask permissions: ", exists, true ); } @@ -245,9 +245,9 @@ void KACLTest::testSettingExtended() KACL CharlesII( s_testACL ); CharlesII.setMaskPermissions( 7 ); // clearly bool dummy = false; - check( "setMaskPermissions: ", TQString::number( CharlesII.tqmaskPermissions( dummy ) ),"7" ); + check( "setMaskPermissions: ", TQString::number( CharlesII.maskPermissions( dummy ) ),"7" ); - const TQString expected( "user::rw-\nuser:root:rwx\nuser:bin:r--\ngroup::rw-\ntqmask::rwx\nother::r--\n" ); + const TQString expected( "user::rw-\nuser:root:rwx\nuser:bin:r--\ngroup::rw-\nmask::rwx\nother::r--\n" ); ACLUserPermissionsList users; ACLUserPermissions user = qMakePair( TQString( "root" ), ( unsigned short )7 ); @@ -265,8 +265,8 @@ void KACLTest::testSettingExtended() // groups, all and named - const TQString expected2 = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 + - TQString::tqfromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::tqfromLatin1(":r--\ntqmask::rwx\nother::r--\n" ); + 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" ); CharlesII.setACL( s_testACL ); // reset ACLGroupPermissionsList groups; ACLGroupPermissions group = qMakePair( s_group1, ( unsigned short )3 ); @@ -300,10 +300,10 @@ void KACLTest::testNewMask() { KACL CharlesII( "user::rw-\ngroup::rw-\nother::rw\n" ); bool dummy = false; - CharlesII.tqmaskPermissions( dummy ); - check( "tqmask exists: ", dummy, false ); + CharlesII.maskPermissions( dummy ); + check( "mask exists: ", dummy, false ); CharlesII.setMaskPermissions( 6 ); - check( "new tqmask set: ", TQString::number( CharlesII.tqmaskPermissions( dummy ) ), "6" ); - check( "tqmask exists now: ", dummy, true ); + check( "new mask set: ", TQString::number( CharlesII.maskPermissions( dummy ) ), "6" ); + check( "mask exists now: ", dummy, true ); } diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h index 9a76e6246..c3572d929 100644 --- a/kio/tests/kdcopcheck.h +++ b/kio/tests/kdcopcheck.h @@ -5,7 +5,7 @@ #include <tqstring.h> #include <tqobject.h> -class TestService : public TQObject +class TestService : public QObject { Q_OBJECT public: diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp index c2a642c1f..a831041e1 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::tqfromLatin1( "Starting..." ) ); + dlg->slotInfoMessage( 0L, TQString::fromLatin1( "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::tqfromLatin1( "Done." ) ); + dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) ); delete dlg; return 0; diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp index 73d526387..6137f5e71 100644 --- a/kio/tests/kdirlistertest.cpp +++ b/kio/tests/kdirlistertest.cpp @@ -36,18 +36,18 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) lister = new KDirLister( false /* true */ ); debug = new PrintSignals; - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); TQPushButton* startH = new TQPushButton( "Start listing $HOME", this ); TQPushButton* startR= new TQPushButton( "Start listing /", this ); TQPushButton* test = new TQPushButton( "Many", this ); TQPushButton* startT = new TQPushButton( "tarfile", this ); - tqlayout->addWidget( startH ); - tqlayout->addWidget( startR ); - tqlayout->addWidget( startT ); - tqlayout->addWidget( test ); - resize( tqlayout->tqsizeHint() ); + layout->addWidget( startH ); + layout->addWidget( startR ); + layout->addWidget( startT ); + layout->addWidget( test ); + resize( layout->sizeHint() ); 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 27a04ee47..6b1e831f5 100644 --- a/kio/tests/kdirlistertest.h +++ b/kio/tests/kdirlistertest.h @@ -31,7 +31,7 @@ using namespace std; -class PrintSignals : public TQObject +class PrintSignals : public QObject { Q_OBJECT public: diff --git a/kio/tests/kdirwatchunittest.cpp b/kio/tests/kdirwatchunittest.cpp index 870b85de9..1bd17edd6 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); - tqApp->processEvents(); + qApp->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); - tqApp->processEvents(); + qApp->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); - tqApp->processEvents(); + qApp->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); - tqApp->processEvents(); + qApp->processEvents(); } VERIFY (m_s[sigDirty] == m_signals[sigDirty] && diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index e183fa23c..0db23457d 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -129,39 +129,39 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) progressButtons->insert( rbProgressDefault, ProgressDefault ); hbLayout->addWidget( rbProgressDefault, 5 ); - rbProgresstqStatus = new TQRadioButton( "tqStatus", progressButtons ); - progressButtons->insert( rbProgresstqStatus, ProgresstqStatus ); - hbLayout->addWidget( rbProgresstqStatus, 5 ); + rbProgressStatus = new TQRadioButton( "Status", progressButtons ); + progressButtons->insert( rbProgressStatus, ProgressStatus ); + hbLayout->addWidget( rbProgressStatus, 5 ); progressButtons->setButton( pr ); changeProgressMode( pr ); // statusbar progress widget - statusProgress = new tqStatusbarProgress( statusBar() ); + statusProgress = new StatusbarProgress( statusBar() ); statusBar()->addWidget( statusProgress, 0, true ); // run & stop butons hbLayout = new TQHBoxLayout( topLayout, 15 ); pbStart = new TQPushButton( "&Start", main_widget ); - pbStart->setFixedSize( pbStart->tqsizeHint() ); + pbStart->setFixedSize( pbStart->sizeHint() ); connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); - pbStop->setFixedSize( pbStop->tqsizeHint() ); + pbStop->setFixedSize( pbStop->sizeHint() ); 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->tqsizeHint() ); + close->setFixedSize( close->sizeHint() ); connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); - main_widget->setMinimumSize( main_widget->tqsizeHint() ); + main_widget->setMinimumSize( main_widget->sizeHint() ); setCentralWidget( main_widget ); slave = 0; @@ -201,7 +201,7 @@ void KioslaveTest::changeOperation( int id ) { void KioslaveTest::changeProgressMode( int id ) { progressMode = id; - if ( progressMode == ProgresstqStatus ) { + if ( progressMode == ProgressStatus ) { statusBar()->show(); } else { statusBar()->hide(); @@ -306,7 +306,7 @@ void KioslaveTest::startJob() { connect( job, TQT_SIGNAL( canceled( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) ); - if (progressMode == ProgresstqStatus) { + if (progressMode == ProgressStatus) { statusProgress->setJob( job ); } @@ -537,15 +537,15 @@ int main(int argc, char **argv) { } else if ( tmps == "default") { pr = KioslaveTest::ProgressDefault; } else if ( tmps == "status") { - pr = KioslaveTest::ProgresstqStatus; + pr = KioslaveTest::ProgressStatus; } else KCmdLineArgs::usage("unknown progress mode"); args->clear(); // Free up memory KioslaveTest test( src, dest, op, pr ); test.show(); - // Bug in KTMW / Qt / tqlayouts ? - test.resize( test.tqsizeHint() ); + // Bug in KTMW / Qt / layouts ? + test.resize( test.sizeHint() ); app.setMainWidget(&test); app.exec(); diff --git a/kio/tests/kioslavetest.h b/kio/tests/kioslavetest.h index 1f99fbbdf..02fae7f23 100644 --- a/kio/tests/kioslavetest.h +++ b/kio/tests/kioslavetest.h @@ -35,7 +35,7 @@ public: enum Operations { List, ListRecursive, Stat, Get, Put, Copy, Move, Delete, Shred, Mkdir, Mimetype }; - enum ProgressModes { ProgressNone, ProgressDefault, ProgresstqStatus }; + enum ProgressModes { ProgressNone, ProgressDefault, ProgressStatus }; protected: @@ -70,7 +70,7 @@ protected: TQRadioButton *rbProgressNone; TQRadioButton *rbProgressDefault; - TQRadioButton *rbProgresstqStatus; + TQRadioButton *rbProgressStatus; TQPushButton *pbStart; TQPushButton *pbStop; @@ -97,7 +97,7 @@ private: KIO::Job *job; TQWidget *main_widget; - KIO::tqStatusbarProgress *statusProgress; + KIO::StatusbarProgress *statusProgress; int selectedOperation; int progressMode; diff --git a/kio/tests/kmfitest.cpp b/kio/tests/kmfitest.cpp index 83d5798a2..25e96759f 100644 --- a/kio/tests/kmfitest.cpp +++ b/kio/tests/kmfitest.cpp @@ -19,8 +19,8 @@ int main (int argc, char **argv) TQString file = TQFile::decodeName(argv[i]); qWarning("File: %s", file.local8Bit().data()); KMimeType::Ptr p; - p = KMimeType::tqfindByPath(file); - qWarning("Mime type (tqfindByPath): %s", p->name().latin1()); + p = KMimeType::findByPath(file); + qWarning("Mime type (findByPath): %s", p->name().latin1()); KFileMetaInfo meta(file, TQString::null, KFileMetaInfo::TechnicalInfo | KFileMetaInfo::ContentInfo); } diff --git a/kio/tests/kmimefromext.cpp b/kio/tests/kmimefromext.cpp index 4d2cbe67b..248407f95 100644 --- a/kio/tests/kmimefromext.cpp +++ b/kio/tests/kmimefromext.cpp @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) // The "true" here means only the filename will be looked at. // "Mime-magic" will not interfer. The file doesn't exist. // TODO: a cmd line parameter for controlling this bool ;) - KMimeType::Ptr mime = KMimeType::tqfindByPath( fileName, 0, true ); + KMimeType::Ptr mime = KMimeType::findByPath( fileName, 0, true ); if ( mime && mime->name() != KMimeType::defaultMimeType() ) printf( "%s\n", mime->name().latin1()); else diff --git a/kio/tests/kmimemagictest.cpp b/kio/tests/kmimemagictest.cpp index d6b500d1f..eb01137c9 100644 --- a/kio/tests/kmimemagictest.cpp +++ b/kio/tests/kmimemagictest.cpp @@ -34,14 +34,14 @@ int main( int argc, char** argv ) TQString file = TQString::fromLocal8Bit( argv[1] ); - KMimeMagicResult * result = KMimeMagic::self()->tqfindFileType( file ); + KMimeMagicResult * result = KMimeMagic::self()->findFileType( file ); if ( result->isValid() ) printf( "Found %s, accuracy %d\n", result->mimeType().latin1(), result->accuracy() ); else printf( "Invalid result\n"); - KMimeType::Format f = KMimeType::tqfindFormatByFileContent( file ); + KMimeType::Format f = KMimeType::findFormatByFileContent( file ); if (f.text) printf("Text\n"); else diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp index 65e60f99b..b0fe392f2 100644 --- a/kio/tests/kprotocolinfotest.cpp +++ b/kio/tests/kprotocolinfotest.cpp @@ -53,7 +53,7 @@ int main(int argc, char **argv) { TQStringList capabilities = KProtocolInfo::capabilities( "imap" ); kdDebug() << "kio_imap capabilities: " << capabilities << endl; - //assert(capabilities.tqcontains("ACL")); + //assert(capabilities.contains("ACL")); return 0; } diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp index a9fa8198a..4a4fcabb0 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::tqfromLatin1( "Office/%1.desktop" ).arg( instname ); + TQString desktopPath = TQString::fromLatin1( "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 667e6014d..8e4b023cb 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::tqfromLatin1( abs_path ) ); + m_filterData->setAbsolutePath( TQString::fromLatin1( abs_path ) ); kdDebug() << "Filtering: " << a << " with abs_path=" << abs_path << endl; } else @@ -97,8 +97,8 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType if ( expectedResult ) { // Hack for other locales than english, normalize google hosts to google.com - cmd = cmd.tqreplace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" ); - if ( cmd != TQString::tqfromLatin1( expectedResult ) ) + cmd = cmd.replace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" ); + if ( cmd != TQString::fromLatin1( expectedResult ) ) { kdError() << " Got " << cmd << " expected " << expectedResult << endl; ::exit(1); diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp index f5113f05b..612dab558 100644 --- a/kio/tests/kurlcompletiontest.cpp +++ b/kio/tests/kurlcompletiontest.cpp @@ -96,9 +96,9 @@ void KURLCompletionTest::testLocalRelativePath() waitForCompletion(); TQStringList comp1all = m_completion->allMatches(); assert( comp1all.count() == 2 ); - assert( comp1all.tqfind( "file1" ) != comp1all.end() ); - assert( comp1all.tqfind( "file#a" ) != comp1all.end() ); - TQString comp1 = m_completion->tqreplacedPath( "file1" ); // like KURLRequester does + assert( comp1all.find( "file1" ) != comp1all.end() ); + assert( comp1all.find( "file#a" ) != comp1all.end() ); + TQString comp1 = m_completion->replacedPath( "file1" ); // like KURLRequester does assert( comp1 == "file1" ); // Completion from relative path @@ -109,7 +109,7 @@ void KURLCompletionTest::testLocalRelativePath() kdDebug() << compall << endl; assert( compall.count() == 1 ); assert( compall.first() == "file#a" ); - TQString comp2 = m_completion->tqreplacedPath( compall.first() ); // like KURLRequester does + TQString comp2 = m_completion->replacedPath( compall.first() ); // like KURLRequester does assert( comp2 == "file#a" ); } @@ -124,7 +124,7 @@ void KURLCompletionTest::testLocalAbsolutePath() assert( compall.count() == 1 ); TQString comp = compall.first(); assert( comp == m_dir + "file#a" ); - comp = m_completion->tqreplacedPath( comp ); // like KURLRequester does + comp = m_completion->replacedPath( comp ); // like KURLRequester does assert( comp == m_dir + "file#a" ); } @@ -138,10 +138,10 @@ void KURLCompletionTest::testLocalURL() TQStringList comp1all = m_completion->allMatches(); kdDebug() << comp1all << endl; assert( comp1all.count() == 2 ); - assert( comp1all.tqfind( m_dirURL.url() + "file1" ) != comp1all.end() ); + assert( comp1all.find( m_dirURL.url() + "file1" ) != comp1all.end() ); TQString filehash = m_dirURL.url() + "file%23a"; - assert( comp1all.tqfind( filehash ) != comp1all.end() ); - TQString filehashPath = m_completion->tqreplacedPath( filehash ); // note that it returns a path!! + assert( comp1all.find( 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.cpp b/kio/tests/previewtest.cpp index f64cb75f9..f2b740224 100644 --- a/kio/tests/previewtest.cpp +++ b/kio/tests/previewtest.cpp @@ -14,16 +14,16 @@ PreviewTest::PreviewTest() :TQWidget() { - TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2); + TQGridLayout *layout = new TQGridLayout(this, 2, 2); m_url = new KLineEdit(this); m_url->setText("/home/malte/gore_bush.jpg"); - tqlayout->addWidget(m_url, 0, 0); + layout->addWidget(m_url, 0, 0); TQPushButton *btn = new TQPushButton("Generate", this); connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); - tqlayout->addWidget(btn, 0, 1); + layout->addWidget(btn, 0, 1); m_preview = new TQLabel(this); m_preview->setMinimumSize(400, 300); - tqlayout->addMultiCellWidget(m_preview, 1, 1, 0, 1); + layout->addMultiCellWidget(m_preview, 1, 1, 0, 1); } void PreviewTest::slotGenerate() diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp index 4b29e1815..d8ddae20a 100644 --- a/kio/tests/speed.cpp +++ b/kio/tests/speed.cpp @@ -87,7 +87,7 @@ int main(int argc, char **argv) { } else kdDebug() << mp << " is the mount point for device " << url.url() << endl; - mp = KIO::tqfindPathMountPoint(url.path()); + mp = KIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else @@ -95,7 +95,7 @@ int main(int argc, char **argv) { // SpeedTest test( url ); // app.exec(); - mp = KIO::tqfindPathMountPoint(url.path()); + mp = KIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else @@ -105,7 +105,7 @@ int main(int argc, char **argv) { url.setPath(TQDir::homeDirPath()); - mp = KIO::tqfindPathMountPoint(url.path()); + mp = KIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else @@ -113,7 +113,7 @@ int main(int argc, char **argv) { // SpeedTest test( url ); // app.exec(); - mp = KIO::tqfindPathMountPoint(url.path()); + mp = KIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else @@ -126,7 +126,7 @@ int main(int argc, char **argv) { else url = "file:" + TQDir::currentDirPath(); - mp = KIO::tqfindPathMountPoint(url.path()); + mp = KIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else |