diff options
Diffstat (limited to 'src/projects')
-rw-r--r-- | src/projects/base_k3badvanceddataimagesettings.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3baudiocdtextallfieldswidget.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3baudiocdtextwidget.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3baudiotrackwidget.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3bbootimageview.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3bdataimagesettings.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3bdatavolumedescwidget.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3bmovixoptionswidget.ui | 2 | ||||
-rw-r--r-- | src/projects/k3baudiotrackaddingdialog.cpp | 4 | ||||
-rw-r--r-- | src/projects/k3baudiotrackaddingdialog.h | 2 | ||||
-rw-r--r-- | src/projects/k3baudiotrackview.cpp | 4 | ||||
-rw-r--r-- | src/projects/k3bdatadirtreeview.cpp | 14 | ||||
-rw-r--r-- | src/projects/k3bdatafileview.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bdataurladdingdialog.cpp | 4 | ||||
-rw-r--r-- | src/projects/k3bdataview.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bfillstatusdisplay.cpp | 8 | ||||
-rw-r--r-- | src/projects/k3bprojectburndialog.cpp | 4 |
17 files changed, 30 insertions, 30 deletions
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index c236ab8..5961ea3 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -184,7 +184,7 @@ <tabstop>m_checkRockRidge</tabstop> <tabstop>m_checkJoliet</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui index c8d647d..ba6cff3 100644 --- a/src/projects/base_k3baudiocdtextallfieldswidget.ui +++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui @@ -261,7 +261,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index 7478a3e..5c0cbaa 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -214,7 +214,7 @@ <slot access="protected" specifier="pure virtual">slotCopyComposer()</slot> <slot access="protected" specifier="pure virtual">slotCopySongwriter()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index 4641369..6c72962 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -322,7 +322,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <tabstop>m_checkPreemphasis</tabstop> <tabstop>m_checkCopyPermitted</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index f7fab2e..b78f7dc 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -387,7 +387,7 @@ <Q_SLOTS> <slot access="protected">slotOptionsChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui index 2b0e7f3..2688f4f 100644 --- a/src/projects/base_k3bdataimagesettings.ui +++ b/src/projects/base_k3bdataimagesettings.ui @@ -270,5 +270,5 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string> <tabstops> <tabstop>m_editReplace</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui index 74b9681..000a552 100644 --- a/src/projects/base_k3bdatavolumedescwidget.ui +++ b/src/projects/base_k3bdatavolumedescwidget.ui @@ -366,5 +366,5 @@ <tabstop>m_editSystem</tabstop> <tabstop>m_editApplication</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui index 28b093d..c0bb2fe 100644 --- a/src/projects/base_k3bmovixoptionswidget.ui +++ b/src/projects/base_k3bmovixoptionswidget.ui @@ -326,7 +326,7 @@ <slot>setDisabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index 1e540e2..6894732 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -91,7 +91,7 @@ K3bAudioTrackAddingDialog::~K3bAudioTrackAddingDialog() int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, K3bAudioDoc* doc, K3bAudioTrack* afterTrack, - K3bAudioTrack* tqparentTrack, + K3bAudioTrack* parentTrack, K3bAudioDataSource* afterSource, TQWidget* tqparent ) { @@ -102,7 +102,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, dlg.m_urls = extractUrlList( urls ); dlg.m_doc = doc; dlg.m_trackAfter = afterTrack; - dlg.m_parentTrack = tqparentTrack; + dlg.m_parentTrack = parentTrack; dlg.m_sourceAfter = afterSource; dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) ); diff --git a/src/projects/k3baudiotrackaddingdialog.h b/src/projects/k3baudiotrackaddingdialog.h index 3482771..9fa5485 100644 --- a/src/projects/k3baudiotrackaddingdialog.h +++ b/src/projects/k3baudiotrackaddingdialog.h @@ -66,7 +66,7 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler static int addUrls( const KURL::List& urls, K3bAudioDoc* doc, K3bAudioTrack* afterTrack = 0, - K3bAudioTrack* tqparentTrack = 0, + K3bAudioTrack* parentTrack = 0, K3bAudioDataSource* afterSource = 0, TQWidget* tqparent = 0 ); diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index fcf546c..8f6c475 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -208,8 +208,8 @@ TQDragObject* K3bAudioTrackView::dragObject() TQListViewItem* item = *it; // we simply ignore open track items to not include files twice // we also don't want the invisible source items - TQListViewItem* tqparentItem = K3bListView::tqparentItem(item); - if( !item->isOpen() && ( !tqparentItem || tqparentItem->isOpen() ) ) { + TQListViewItem* parentItem = K3bListView::parentItem(item); + if( !item->isOpen() && ( !parentItem || parentItem->isOpen() ) ) { if( K3bAudioDataSourceViewItem* sourceItem = dynamic_cast<K3bAudioDataSourceViewItem*>( item ) ) { if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( sourceItem->source() ) ) urls.append( KURL::fromPathOrURL(file->filename()) ); diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 558e0cf..1ec11e6 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -231,8 +231,8 @@ void K3bDataDirTreeView::slotItemAdded( K3bDataItem* item ) // should only be emitted once for every item // K3bDirItem* dirItem = static_cast<K3bDirItem*>( item ); - K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()]; - K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem ); + K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } } @@ -456,18 +456,18 @@ void K3bDataDirTreeView::checkForNewItems() TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.tqfind( dirItem ); if( itDirItem == m_itemMap.end() ) { - K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()]; - K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem ); + K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } else { // check if tqparent still correct (to get moved items) K3bDataDirViewItem* dirViewItem = itDirItem.data(); - K3bDataDirViewItem* tqparentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent(); + K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent(); K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->tqparent()]; - if( dirParentViewItem != tqparentViewItem ) { + if( dirParentViewItem != parentViewItem ) { // reparent it - tqparentViewItem->takeItem( dirViewItem ); + parentViewItem->takeItem( dirViewItem ); dirParentViewItem->insertItem( dirViewItem ); } } diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 9030759..3777ac7 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -330,7 +330,7 @@ void K3bDataFileView::setupActions() m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), - actionCollection(), "tqparent_dir" ); + actionCollection(), "parent_dir" ); m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), actionCollection(), "open" ); diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 1a645ff..772c13c 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -763,7 +763,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles() { if( m_iAddHiddenFiles == 0 ) { // FIXME: the isVisible() stuff makes the static addUrls method not return (same below) - if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/, + if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/, i18n("Do you also want to add hidden files?"), i18n("Hidden Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes ) m_iAddHiddenFiles = 1; @@ -778,7 +778,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles() bool K3bDataUrlAddingDialog::addSystemFiles() { if( m_iAddSystemFiles == 0 ) { - if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/, + if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/, i18n("Do you also want to add system files " "(FIFOs, sockets, device files, and broken symlinks)?"), i18n("System Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes ) diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index f4d9749..9aaa2b3 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -92,7 +92,7 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *tqparent, const char *name ) toolBox()->addButton( actionClearSession ); toolBox()->addButton( actionEditBootImages ); toolBox()->addSeparator(); - toolBox()->addButton( m_dataFileView->actionCollection()->action("tqparent_dir") ); + toolBox()->addButton( m_dataFileView->actionCollection()->action("parent_dir") ); toolBox()->addSeparator(); addPluginButtons( K3bProjectPlugin::DATA_CD ); diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index b52782c..4d9f543 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -285,7 +285,7 @@ public: } void maybeTip( const TQPoint& ) { - tip( tqparentWidget()->rect(), + tip( parentWidget()->rect(), KIO::convertSize( m_doc->size() ) + " (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " + m_doc->length().toString(false) + " " + i18n("min") + @@ -597,7 +597,7 @@ void K3bFillStatusDisplay::slotDetermineSize() bool canceled = false; K3bDevice::Device* dev = K3bMediaSelectionDialog::selectMedium( d->showDvdSizes ? K3bDevice::MEDIA_WRITABLE_DVD : K3bDevice::MEDIA_WRITABLE_CD, K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE, - tqparentWidget(), + parentWidget(), TQString(), TQString(), &canceled ); if( dev ) { @@ -608,10 +608,10 @@ void K3bFillStatusDisplay::slotDetermineSize() update(); } else - KMessageBox::error( tqparentWidget(), i18n("Medium is not empty.") ); + KMessageBox::error( parentWidget(), i18n("Medium is not empty.") ); } else if( !canceled ) - KMessageBox::error( tqparentWidget(), i18n("No usable medium found.") ); + KMessageBox::error( parentWidget(), i18n("No usable medium found.") ); } diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index 419e3a3..5390e4c 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -223,9 +223,9 @@ void K3bProjectBurnDialog::slotStartClicked() K3bJobProgressDialog* dlg = 0; if( m_checkOnlyCreateImage && m_checkOnlyCreateImage->isChecked() ) - dlg = new K3bJobProgressDialog( tqparentWidget() ); + dlg = new K3bJobProgressDialog( parentWidget() ); else - dlg = new K3bBurnProgressDialog( tqparentWidget() ); + dlg = new K3bBurnProgressDialog( parentWidget() ); m_job = m_doc->newBurnJob( dlg ); |