From 85723d544dd6aad9b2d0974dfe91ece438f03dfb Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libk3b/projects/datacd/k3bdatadoc.cpp | 2 +- libk3b/projects/datacd/k3bdataitem.cpp | 10 +++++----- libk3b/projects/datacd/k3bdiritem.cpp | 4 ++-- libk3b/projects/datacd/k3bdiritem.h | 2 +- libk3b/projects/datacd/k3bfileitem.cpp | 2 +- libk3b/projects/datacd/k3bsessionimportitem.cpp | 2 +- libk3b/projects/datacd/k3bspecialdataitem.h | 2 +- libk3b/projects/k3bcuefileparser.cpp | 16 ++++++++-------- libk3b/projects/movixcd/k3bmovixfileitem.cpp | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) (limited to 'libk3b/projects') diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index 44b6214..17680d3 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -944,7 +944,7 @@ void K3bDataDoc::itemAddedToDir( K3bDirItem*, K3bDataItem* item ) void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent ) { if( !item || !newParent ) { - kdDebug() << "(K3bDataDoc) item or tqparentitem was NULL while moving." << endl; + kdDebug() << "(K3bDataDoc) item or parentitem was NULL while moving." << endl; return; } diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp index ff6aa61..4e53a8d 100644 --- a/libk3b/projects/datacd/k3bdataitem.cpp +++ b/libk3b/projects/datacd/k3bdataitem.cpp @@ -186,14 +186,14 @@ TQString K3bDataItem::iso9660Path() const K3bDataItem* K3bDataItem::nextSibling() const { K3bDataItem* item = const_cast(this); // urg, but we know that we don't mess with it, so... - K3bDirItem* tqparentItem = getParent(); + K3bDirItem* parentItem = getParent(); - while( tqparentItem ) { - if( K3bDataItem* i = tqparentItem->nextChild( item ) ) + while( parentItem ) { + if( K3bDataItem* i = parentItem->nextChild( item ) ) return i; - item = tqparentItem; - tqparentItem = item->getParent(); + item = parentItem; + parentItem = item->getParent(); } return 0; diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp index c36595e..b44037f 100644 --- a/libk3b/projects/datacd/k3bdiritem.cpp +++ b/libk3b/projects/datacd/k3bdiritem.cpp @@ -25,8 +25,8 @@ #include -K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* tqparentDir) - : K3bDataItem( doc, tqparentDir ), +K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* parentDir) + : K3bDataItem( doc, parentDir ), m_size(0), m_followSymlinksSize(0), m_blocks(0), diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index 61b6c8a..75fc20e 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -34,7 +34,7 @@ class K3bDataDoc; class LIBK3B_EXPORT K3bDirItem : public K3bDataItem { public: - K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* tqparentDir = 0 ); + K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 ); /** * Default copy constructor. Copies the dir including all tqchildren. However, none of the diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp index cc71b3a..337aad8 100644 --- a/libk3b/projects/datacd/k3bfileitem.cpp +++ b/libk3b/projects/datacd/k3bfileitem.cpp @@ -171,7 +171,7 @@ K3bFileItem::K3bFileItem( const K3bFileItem& item ) K3bFileItem::~K3bFileItem() { - // remove this from tqparentdir + // remove this from parentdir take(); } diff --git a/libk3b/projects/datacd/k3bsessionimportitem.cpp b/libk3b/projects/datacd/k3bsessionimportitem.cpp index 9173d5e..92b52e4 100644 --- a/libk3b/projects/datacd/k3bsessionimportitem.cpp +++ b/libk3b/projects/datacd/k3bsessionimportitem.cpp @@ -47,7 +47,7 @@ K3bSessionImportItem::~K3bSessionImportItem() if( m_replaceItem ) m_replaceItem->setReplacedItemFromOldSession(0); - // remove this from tqparentdir + // remove this from parentdir if( tqparent() ) tqparent()->takeDataItem( this ); } diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h index e2efa6c..c8b7937 100644 --- a/libk3b/projects/datacd/k3bspecialdataitem.h +++ b/libk3b/projects/datacd/k3bspecialdataitem.h @@ -47,7 +47,7 @@ class K3bSpecialDataItem : public K3bDataItem } ~K3bSpecialDataItem() { - // remove this from tqparentdir + // remove this from parentdir if( tqparent() ) tqparent()->takeDataItem( this ); } diff --git a/libk3b/projects/k3bcuefileparser.cpp b/libk3b/projects/k3bcuefileparser.cpp index 7e00c5a..6c54c57 100644 --- a/libk3b/projects/k3bcuefileparser.cpp +++ b/libk3b/projects/k3bcuefileparser.cpp @@ -408,15 +408,15 @@ bool K3bCueFileParser::findImageFileName( const TQString& dataFile ) } // try the filename in the cue's directory - if( TQFileInfo( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) { - setImageFilename( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ); + if( TQFileInfo( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) { + setImageFilename( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) ); kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; return true; } // try the filename ignoring case - if( TQFileInfo( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ).isFile() ) { - setImageFilename( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ); + if( TQFileInfo( K3b::parentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ).isFile() ) { + setImageFilename( K3b::parentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ); kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; return true; } @@ -435,21 +435,21 @@ bool K3bCueFileParser::findImageFileName( const TQString& dataFile ) // Search for another one having the same filename as the cue but a different extension // - TQDir tqparentDir( K3b::tqparentDir(filename()) ); + TQDir parentDir( K3b::parentDir(filename()) ); TQString filenamePrefix = filename().section( '/', -1 ); filenamePrefix.truncate( filenamePrefix.length() - 3 ); // remove cue extension - kdDebug() << "(K3bCueFileParser) checking folder " << tqparentDir.path() << " for files: " << filenamePrefix << "*" << endl; + kdDebug() << "(K3bCueFileParser) checking folder " << parentDir.path() << " for files: " << filenamePrefix << "*" << endl; // // we cannot use the nameFilter in TQDir because of the spaces that may occur in filenames // - TQStringList possibleImageFiles = tqparentDir.entryList( TQDir::Files ); + TQStringList possibleImageFiles = parentDir.entryList( TQDir::Files ); int cnt = 0; for( TQStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) { if( (*it).lower() == TQString(dataFile.section( '/', -1 )).lower() || (*it).startsWith( filenamePrefix ) && !(*it).endsWith( "cue" ) ) { ++cnt; - setImageFilename( K3b::tqparentDir(filename()) + *it ); + setImageFilename( K3b::parentDir(filename()) + *it ); } } diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.cpp b/libk3b/projects/movixcd/k3bmovixfileitem.cpp index ccc387f..b281bd4 100644 --- a/libk3b/projects/movixcd/k3bmovixfileitem.cpp +++ b/libk3b/projects/movixcd/k3bmovixfileitem.cpp @@ -36,7 +36,7 @@ K3bMovixFileItem::~K3bMovixFileItem() if( m_subTitleItem ) m_doc->removeSubTitleItem( this ); - // remove this from tqparentdir + // remove this from parentdir // it is important to do it here and not // rely on the K3bFileItem destructor becasue // otherwise the doc is not informed early enough -- cgit v1.2.3