summaryrefslogtreecommitdiffstats
path: root/libk3b
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b')
-rw-r--r--libk3b/core/k3bglobals.cpp2
-rw-r--r--libk3b/core/k3bglobals.h2
-rw-r--r--libk3b/core/k3bjob.h2
-rw-r--r--libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp2
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.cpp2
-rw-r--r--libk3b/projects/datacd/k3bdataitem.cpp10
-rw-r--r--libk3b/projects/datacd/k3bdiritem.cpp4
-rw-r--r--libk3b/projects/datacd/k3bdiritem.h2
-rw-r--r--libk3b/projects/datacd/k3bfileitem.cpp2
-rw-r--r--libk3b/projects/datacd/k3bsessionimportitem.cpp2
-rw-r--r--libk3b/projects/datacd/k3bspecialdataitem.h2
-rw-r--r--libk3b/projects/k3bcuefileparser.cpp16
-rw-r--r--libk3b/projects/movixcd/k3bmovixfileitem.cpp2
-rw-r--r--libk3b/tools/k3blistview.cpp8
-rw-r--r--libk3b/tools/k3blistview.h2
-rw-r--r--libk3b/tools/k3btitlelabel.h2
16 files changed, 31 insertions, 31 deletions
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index f5a9e29..401950e 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -189,7 +189,7 @@ TQString K3b::prepareDir( const TQString& dir )
}
-TQString K3b::tqparentDir( const TQString& path )
+TQString K3b::parentDir( const TQString& path )
{
TQString tqparent = path;
if( path[path.length()-1] == '/' )
diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h
index 56f7f1b..6554d7d 100644
--- a/libk3b/core/k3bglobals.h
+++ b/libk3b/core/k3bglobals.h
@@ -166,7 +166,7 @@ namespace K3b
*
* Example: /usr/share/doc -> /usr/share/
*/
- TQString tqparentDir( const TQString& path );
+ TQString parentDir( const TQString& path );
/**
* For now this just replaces multiple occurrences of / with a single /
diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h
index c35118a..b64b85b 100644
--- a/libk3b/core/k3bjob.h
+++ b/libk3b/core/k3bjob.h
@@ -207,7 +207,7 @@ class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler
* \param hdl the handler of the job. This allows for some user interaction without
* specifying any details (like the GUI).
* The job handler can also be another job. In that case this job is a sub job
- * and will be part of the tqparents running sub jobs.
+ * and will be part of the parents running sub jobs.
*
* \see runningSubJobs()
* \see numRunningSubJobs()
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
index 08fbb59..5cbddfa 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -521,7 +521,7 @@ TQString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitle
"volunteer programmers after the OpenDivX source was closed in July 2001.")
+ "<br>"
+ i18n("XviD features MPEG-4 Advanced Profile settings such as b-frames, global "
- "and quarter pixel motion compensation, lumi tqmasking, trellis quantization, and "
+ "and quarter pixel motion compensation, lumi masking, trellis quantization, and "
"H.263, MPEG and custom quantization matrices.")
+ "<br>"
+ i18n("XviD is a primary competitor of DivX (XviD being DivX spelled backwards). "
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<K3bDataItem*>(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 <kdebug.h>
-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
diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp
index 72ccd73..f88fd45 100644
--- a/libk3b/tools/k3blistview.cpp
+++ b/libk3b/tools/k3blistview.cpp
@@ -802,7 +802,7 @@ void K3bListView::setCurrentItem( TQListViewItem* i )
return;
// I cannot remember why I did this here exactly. However, it resets the
- // m_lastClickedItem and thus tqinvalidates the editing.
+ // m_lastClickedItem and thus invalidates the editing.
// doRename();
// hideEditor();
// m_currentEditItem = 0;
@@ -1143,7 +1143,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) {
// make sure we did not lose the focus to one of the edit widgets' tqchildren
- if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->tqparentWidget()) != TQT_BASE_OBJECT(o) ) {
+ if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
doRename();
hideEditor();
}
@@ -1206,14 +1206,14 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e )
}
-TQListViewItem* K3bListView::tqparentItem( TQListViewItem* item )
+TQListViewItem* K3bListView::parentItem( TQListViewItem* item )
{
if( !item )
return 0;
if( item->tqparent() )
return item->tqparent();
else
- return K3bListView::tqparentItem( item->itemAbove() );
+ return K3bListView::parentItem( item->itemAbove() );
}
diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h
index 9f470ed..03daf00 100644
--- a/libk3b/tools/k3blistview.h
+++ b/libk3b/tools/k3blistview.h
@@ -190,7 +190,7 @@ class LIBK3B_EXPORT K3bListView : public KListView
* Searches for the first item above @p i which is one level higher.
* For 1st level items this will always be the listview's root item.
*/
- static TQListViewItem* tqparentItem( TQListViewItem* i );
+ static TQListViewItem* parentItem( TQListViewItem* i );
signals:
void editorButtonClicked( K3bListViewItem*, int );
diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h
index d725592..3547a5c 100644
--- a/libk3b/tools/k3btitlelabel.h
+++ b/libk3b/tools/k3btitlelabel.h
@@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
void setSubTitle( const TQString& subTitle );
/**
- * The title label only supports tqalignments left, hcenter, and right
+ * The title label only supports alignments left, hcenter, and right
*
* Default tqalignment is left.
*/
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 06:45:08 +0000