diff options
Diffstat (limited to 'libk3b/projects/movixcd')
-rw-r--r-- | libk3b/projects/movixcd/k3bmovixdoc.cpp | 20 | ||||
-rw-r--r-- | libk3b/projects/movixcd/k3bmovixdocpreparer.cpp | 6 | ||||
-rw-r--r-- | libk3b/projects/movixcd/k3bmovixfileitem.cpp | 2 | ||||
-rw-r--r-- | libk3b/projects/movixcd/k3bmovixprogram.cpp | 14 |
4 files changed, 21 insertions, 21 deletions
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index 5b5ea82..d73e39a 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -121,7 +121,7 @@ bool K3bMovixDoc::loadDocumentData( TQDomElement* rootElem ) TQDomNodeList nodes = rootElem->childNodes(); if( nodes.item(0).nodeName() != "general" ) { - kdDebug() << "(K3bMovixDoc) could not tqfind 'general' section." << endl; + kdDebug() << "(K3bMovixDoc) could not find 'general' section." << endl; return false; } if( !readGeneralDocumentData( nodes.item(0).toElement() ) ) @@ -131,7 +131,7 @@ bool K3bMovixDoc::loadDocumentData( TQDomElement* rootElem ) // parse options // ----------------------------------------------------------------- if( nodes.item(1).nodeName() != "data_options" ) { - kdDebug() << "(K3bMovixDoc) could not tqfind 'data_options' section." << endl; + kdDebug() << "(K3bMovixDoc) could not find 'data_options' section." << endl; return false; } if( !loadDocumentDataOptions( nodes.item(1).toElement() ) ) @@ -143,7 +143,7 @@ bool K3bMovixDoc::loadDocumentData( TQDomElement* rootElem ) // parse header // ----------------------------------------------------------------- if( nodes.item(2).nodeName() != "data_header" ) { - kdDebug() << "(K3bMovixDoc) could not tqfind 'data_header' section." << endl; + kdDebug() << "(K3bMovixDoc) could not find 'data_header' section." << endl; return false; } if( !loadDocumentDataHeader( nodes.item(2).toElement() ) ) @@ -155,7 +155,7 @@ bool K3bMovixDoc::loadDocumentData( TQDomElement* rootElem ) // parse movix options // ----------------------------------------------------------------- if( nodes.item(3).nodeName() != "movix_options" ) { - kdDebug() << "(K3bMovixDoc) could not tqfind 'movix_options' section." << endl; + kdDebug() << "(K3bMovixDoc) could not find 'movix_options' section." << endl; return false; } @@ -203,7 +203,7 @@ bool K3bMovixDoc::loadDocumentData( TQDomElement* rootElem ) // parse files // ----------------------------------------------------------------- if( nodes.item(4).nodeName() != "movix_files" ) { - kdDebug() << "(K3bMovixDoc) could not tqfind 'movix_files' section." << endl; + kdDebug() << "(K3bMovixDoc) could not find 'movix_files' section." << endl; return false; } @@ -370,7 +370,7 @@ void K3bMovixDoc::slotDataItemRemoved( K3bDataItem* item ) { // check if it's a movix item if( K3bMovixFileItem* fi = dynamic_cast<K3bMovixFileItem*>(item) ) - if( m_movixFiles.tqcontainsRef( fi ) ) { + if( m_movixFiles.containsRef( fi ) ) { emit movixItemRemoved( fi ); m_movixFiles.removeRef( fi ); setModified(true); @@ -380,7 +380,7 @@ void K3bMovixDoc::slotDataItemRemoved( K3bDataItem* item ) int K3bMovixDoc::indexOf( K3bMovixFileItem* item ) { - return m_movixFiles.tqfindRef(item)+1; + return m_movixFiles.findRef(item)+1; } @@ -390,12 +390,12 @@ void K3bMovixDoc::moveMovixItem( K3bMovixFileItem* item, K3bMovixFileItem* itemA return; // set the current item to track - m_movixFiles.tqfindRef( item ); + m_movixFiles.findRef( item ); // take the current item item = m_movixFiles.take(); - // if after == 0 tqfindRef returnes -1 - int pos = m_movixFiles.tqfindRef( itemAfter ); + // if after == 0 findRef returnes -1 + int pos = m_movixFiles.findRef( itemAfter ); m_movixFiles.insert( pos+1, item ); emit newMovixFileItems(); diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 04afd83..38d8f81 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -204,7 +204,7 @@ bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const TQString& originalPath if( TQTextStream* s = d->isolinuxConfigFile->textStream() ) { - // now open the default isolinux.cfg and copy everything except the first line which tqcontains + // now open the default isolinux.cfg and copy everything except the first line which contains // the default boot label TQFile f( originalPath ); if( f.open( IO_ReadOnly ) ) { @@ -464,7 +464,7 @@ K3bDirItem* K3bMovixDocPreparer::createDir( const TQString& docPath ) TQStringList docPathSections = TQStringList::split( '/', docPath ); K3bDirItem* dir = d->doc->root(); for( TQStringList::iterator it = docPathSections.begin(); it != docPathSections.end(); ++it ) { - K3bDataItem* next = dir->tqfind( *it ); + K3bDataItem* next = dir->find( *it ); if( !next ) dir = new K3bDirItem( *it, d->doc, dir ); else if( next->isDir() ) @@ -480,7 +480,7 @@ K3bDirItem* K3bMovixDocPreparer::createDir( const TQString& docPath ) K3bDirItem* delDir = dir; while( delDir->tqparent() != d->doc->root() ) delDir = delDir->tqparent(); - if( d->newMovixItems.tqfindRef( delDir ) == -1 ) + if( d->newMovixItems.findRef( delDir ) == -1 ) d->newMovixItems.append( delDir ); } diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.cpp b/libk3b/projects/movixcd/k3bmovixfileitem.cpp index b281bd4..5242061 100644 --- a/libk3b/projects/movixcd/k3bmovixfileitem.cpp +++ b/libk3b/projects/movixcd/k3bmovixfileitem.cpp @@ -60,7 +60,7 @@ TQString K3bMovixFileItem::subTitleFileName( const TQString& name ) { // remove ending from k3bName TQString subName = name; - int pos = subName.tqfindRev("."); + int pos = subName.findRev("."); if( pos > 0 ) subName.truncate( pos ); subName += ".sub"; diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp index 522e700..4c609db 100644 --- a/libk3b/projects/movixcd/k3bmovixprogram.cpp +++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp @@ -79,7 +79,7 @@ bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const TQString& path ) TQStringList files = bin->files(); for( TQStringList::iterator it = files.begin(); it != files.end(); ++it ) { - if( (*it).tqcontains( "isolinux.cfg" ) ) { + if( (*it).contains( "isolinux.cfg" ) ) { bin->m_supportedBootLabels = determineSupportedBootLabels( TQStringList::split( " ", *it )[1] ); break; } @@ -105,22 +105,22 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const TQString& path ) // TQDir dir( bin->movixDataDir() ); TQStringList subdirs = dir.entryList( TQDir::Dirs ); - if( !subdirs.tqcontains( "boot-messages" ) ) { + if( !subdirs.contains( "boot-messages" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'boot-messages'" << endl; delete bin; return false; } - if( !subdirs.tqcontains( "isolinux" ) ) { + if( !subdirs.contains( "isolinux" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'isolinux'" << endl; delete bin; return false; } - if( !subdirs.tqcontains( "movix" ) ) { + if( !subdirs.contains( "movix" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'movix'" << endl; delete bin; return false; } - if( !subdirs.tqcontains( "mplayer-fonts" ) ) { + if( !subdirs.contains( "mplayer-fonts" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'mplayer-fonts'" << endl; delete bin; return false; @@ -241,7 +241,7 @@ TQString K3bMovixBin::subtitleFontDir( const TQString& font ) const { if( font == i18n("none" ) ) return ""; - else if( m_supportedSubtitleFonts.tqcontains( font ) ) + else if( m_supportedSubtitleFonts.contains( font ) ) return path + "/mplayer-fonts/" + font; else return ""; @@ -252,7 +252,7 @@ TQString K3bMovixBin::languageDir( const TQString& lang ) const { if( lang == i18n("default") ) return languageDir( "en" ); - else if( m_supportedLanguages.tqcontains( lang ) ) + else if( m_supportedLanguages.contains( lang ) ) return path + "/boot-messages/" + lang; else return ""; |