summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libk3b/tools/k3bintmapcombobox.cpp2
-rw-r--r--libk3b/tools/k3blibdvdcss.cpp2
-rw-r--r--libk3b/tools/k3blistview.cpp2
-rw-r--r--libk3b/tools/k3bmsfedit.cpp2
-rw-r--r--libk3b/tools/k3btoolbox.cpp2
-rw-r--r--libk3b/tools/k3btoolbutton.cpp2
-rw-r--r--plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp2
-rw-r--r--src/projects/k3bdataurladdingdialog.cpp8
-rw-r--r--src/rip/k3baudioprojectconvertingdialog.cpp2
-rw-r--r--src/rip/k3baudiorippingdialog.cpp2
10 files changed, 13 insertions, 13 deletions
diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp
index 3dd9731..c78280e 100644
--- a/libk3b/tools/k3bintmapcombobox.cpp
+++ b/libk3b/tools/k3bintmapcombobox.cpp
@@ -82,7 +82,7 @@ bool K3bIntMapComboBox::insertItem( int value, const TQString& text, const TQStr
index = KComboBox::count();
d->valueIndexMap[value] = index;
- d->indexValueDescriptionMap[index] = tqMakePair<int, TQString>( value, description );
+ d->indexValueDescriptionMap[index] = qMakePair<int, TQString>( value, description );
KComboBox::insertItem( text );
diff --git a/libk3b/tools/k3blibdvdcss.cpp b/libk3b/tools/k3blibdvdcss.cpp
index 5baf8b4..bb0e375 100644
--- a/libk3b/tools/k3blibdvdcss.cpp
+++ b/libk3b/tools/k3blibdvdcss.cpp
@@ -226,7 +226,7 @@ bool K3bLibDvdCss::crackAllKeys()
const K3bIso9660File* file = dynamic_cast<const K3bIso9660File*>( dir->entry( filename ) );
if( file && file->size() > 0 ) {
- d->titleOffsets.append( tqMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) );
+ d->titleOffsets.append( qMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) );
kdDebug() << "(K3bLibDvdCss) Get key for /" << filename << " at " << file->startSector() << endl;
if( seek( (int)file->startSector(), DVDCSS_SEEK_KEY ) < 0 ) {
kdDebug() << "(K3bLibDvdCss) unable to seek to " << file->startSector() << endl;
diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp
index 20acae5..335bd8d 100644
--- a/libk3b/tools/k3blistview.cpp
+++ b/libk3b/tools/k3blistview.cpp
@@ -520,7 +520,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i
else
flags |= TQStyle::Style_Off;
- listView()->style().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags );
+ listView()->style().drawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags );
}
}
}
diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp
index 07ed77d..0e467dc 100644
--- a/libk3b/tools/k3bmsfedit.cpp
+++ b/libk3b/tools/k3bmsfedit.cpp
@@ -60,7 +60,7 @@ TQSize K3bMsfEdit::sizeHint() const
int w = fm.width( "00:00:00" );
int wx = fm.width( ' ' )*2;
int frame = style().pixelMetric( TQStyle::PM_SpinBoxFrameWidth );
- return style().tqsizeFromContents(TQStyle::CT_SpinBox, this,
+ return style().sizeFromContents(TQStyle::CT_SpinBox, this,
TQSize( w + wx + downRect().width() + frame*2,
h + frame*2).
expandedTo( TQApplication::globalStrut() ));
diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp
index c6a5df2..b7fa687 100644
--- a/libk3b/tools/k3btoolbox.cpp
+++ b/libk3b/tools/k3btoolbox.cpp
@@ -71,7 +71,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* )
TQPainter p( this );
TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal;
- style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
+ style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
colorGroup(), flags );
}
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index cdc26b9..65e8c51 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -68,7 +68,7 @@ void K3bToolButton::drawButton( TQPainter* p )
if( isEnabled() )
arrowFlags |= TQStyle::Style_Enabled;
- style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
+ style().drawPrimitive(TQStyle::PE_ArrowDown, p,
TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
index 41d9cbb..218dca7 100644
--- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
+++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
@@ -215,7 +215,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewIt
TQCheckListItem::CheckBox );
fileViewItem->setText(1, item->k3bName() );
fileViewItem->setOn(true);
- d->renamableItems.append( tqMakePair( (K3bFileItem*)item, fileViewItem ) );
+ d->renamableItems.append( qMakePair( (K3bFileItem*)item, fileViewItem ) );
}
}
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index b110a6d..df5c1aa 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -141,7 +141,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls,
K3bDataUrlAddingDialog dlg( dir->doc(), parent );
dlg.m_urls = urls;
for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it )
- dlg.m_urlQueue.append( tqMakePair( K3b::convertToLocalUrl(*it), dir ) );
+ dlg.m_urlQueue.append( qMakePair( K3b::convertToLocalUrl(*it), dir ) );
dlg.slotAddUrls();
int ret = TQDialog::Accepted;
@@ -226,7 +226,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& item
dlg.m_copyItems = copy;
for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) {
- dlg.m_items.append( tqMakePair( *it, dir ) );
+ dlg.m_items.append( qMakePair( *it, dir ) );
++dlg.m_totalFiles;
if( (*it)->isDir() ) {
dlg.m_totalFiles += static_cast<K3bDirItem*>( *it )->numFiles();
@@ -568,7 +568,7 @@ void K3bDataUrlAddingDialog::slotAddUrls()
dlist.remove( dotdot );
for( TQStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) {
- m_urlQueue.append( tqMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) );
+ m_urlQueue.append( qMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) );
}
}
else {
@@ -625,7 +625,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
if( oldItem->isDir() && item->isDir() ) {
const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children();
for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it )
- m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) );
+ m_items.append( qMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) );
// FIXME: we need to remove the old dir item
}
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index 748f6fc..f386b80 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -175,7 +175,7 @@ void K3bAudioProjectConvertingDialog::slotStartClicked()
int i = 0;
K3bAudioTrack* track = m_doc->firstTrack();
while( track ) {
- tracksToRip.append( tqMakePair( i+1, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) );
+ tracksToRip.append( qMakePair( i+1, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) );
++i;
track = track->next();
}
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index e3116ab..335a757 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -250,7 +250,7 @@ void K3bAudioRippingDialog::slotStartClicked()
unsigned int i = 0;
for( TQValueList<int>::const_iterator trackIt = m_trackNumbers.begin();
trackIt != m_trackNumbers.end(); ++trackIt ) {
- tracksToRip.append( tqMakePair( *trackIt, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) );
+ tracksToRip.append( qMakePair( *trackIt, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) );
++i;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 06:50:17 +0000