diff options
Diffstat (limited to 'src/projects')
-rw-r--r-- | src/projects/base_k3badvanceddataimagesettings.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3baudiocdtextallfieldswidget.ui | 10 | ||||
-rw-r--r-- | src/projects/base_k3baudiocdtextwidget.ui | 6 | ||||
-rw-r--r-- | src/projects/base_k3baudiotrackwidget.ui | 4 | ||||
-rw-r--r-- | src/projects/base_k3bbootimageview.ui | 8 | ||||
-rw-r--r-- | src/projects/base_k3bdataimagesettings.ui | 2 | ||||
-rw-r--r-- | src/projects/base_k3bdatavolumedescwidget.ui | 8 | ||||
-rw-r--r-- | src/projects/base_k3bmovixoptionswidget.ui | 6 | ||||
-rw-r--r-- | src/projects/k3baudiodatasourceviewitem.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3baudiotracksplitdialog.cpp | 20 | ||||
-rw-r--r-- | src/projects/k3baudiotrackviewitem.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bdataimagesettingswidget.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bdatapropertiesdialog.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bdataviewitem.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bfillstatusdisplay.cpp | 12 | ||||
-rw-r--r-- | src/projects/k3bprojectburndialog.cpp | 6 | ||||
-rw-r--r-- | src/projects/k3bvcdburndialog.cpp | 12 | ||||
-rw-r--r-- | src/projects/k3bvcdtrackdialog.cpp | 26 | ||||
-rw-r--r-- | src/projects/k3bview.cpp | 2 |
19 files changed, 67 insertions, 67 deletions
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 5961ea3..17bb26f 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -129,7 +129,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui index ba6cff3..c0e2556 100644 --- a/src/projects/base_k3baudiocdtextallfieldswidget.ui +++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui @@ -25,7 +25,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -62,7 +62,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -184,7 +184,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -235,7 +235,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index a15dc9d..4010416 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -96,7 +96,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -135,7 +135,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index a6b71d0..ce969da 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -217,7 +217,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 1aeddd8..3d5b488 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -14,7 +14,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -190,7 +190,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -246,7 +246,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -281,7 +281,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui index 6f9c2b9..d1444a9 100644 --- a/src/projects/base_k3bdataimagesettings.ui +++ b/src/projects/base_k3bdataimagesettings.ui @@ -89,7 +89,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui index ee29467..75b5d0a 100644 --- a/src/projects/base_k3bdatavolumedescwidget.ui +++ b/src/projects/base_k3bdatavolumedescwidget.ui @@ -107,7 +107,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ </widget> <widget class="TQLayoutWidget" row="11" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -260,7 +260,7 @@ </widget> <widget class="TQLayoutWidget" row="9" column="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -289,7 +289,7 @@ </widget> <widget class="TQLayoutWidget" row="10" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui index c0bb2fe..293ca92 100644 --- a/src/projects/base_k3bmovixoptionswidget.ui +++ b/src/projects/base_k3bmovixoptionswidget.ui @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -239,10 +239,10 @@ <cstring>m_comboKeyboardLayout</cstring> </property> <property name="toolTip" stdset="0"> - <string>Select the tqlayout of the keyboard</string> + <string>Select the layout of the keyboard</string> </property> <property name="whatsThis" stdset="0"> - <string><p>The keyboard tqlayout selected here will be used for the eMovix commands like controlling the media player.</string> + <string><p>The keyboard layout selected here will be used for the eMovix commands like controlling the media player.</string> </property> </widget> </grid> diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index 04371b1..2f0b7a5 100644 --- a/src/projects/k3baudiodatasourceviewitem.cpp +++ b/src/projects/k3baudiodatasourceviewitem.cpp @@ -39,7 +39,7 @@ K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* p // setMarginVertical( 2 ); // gray out filename - setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); + setForegroundColor( 5, listView()->palette().disabled().foreground() ); // smaller filename f = listView()->font(); diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 6a987e6..b57ab32 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -42,19 +42,19 @@ K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidg m_msfEditStart = new K3bMsfEdit( frame ); m_msfEditEnd = new K3bMsfEdit( frame ); - TQGridLayout* tqlayout = new TQGridLayout( frame ); - tqlayout->setMargin( 0 ); - tqlayout->setSpacing( spacingHint() ); + TQGridLayout* layout = new TQGridLayout( frame ); + layout->setMargin( 0 ); + layout->setSpacing( spacingHint() ); // FIXME: After the string freeze replace the text with a better one explaning how to use this dialog - tqlayout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."), + layout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."), frame ), 0, 0, 0, 3 ); - tqlayout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 ); - tqlayout->addWidget( m_msfEditStart, 2, 1 ); - tqlayout->addWidget( new TQLabel( " - ", frame ), 2, 2 ); - tqlayout->addWidget( m_msfEditEnd, 2, 3 ); - tqlayout->addWidget( new TQLabel( i18n("Split track at:"), frame ), 2, 0 ); - tqlayout->setColStretch( 0, 1 ); + layout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 ); + layout->addWidget( m_msfEditStart, 2, 1 ); + layout->addWidget( new TQLabel( " - ", frame ), 2, 2 ); + layout->addWidget( m_msfEditEnd, 2, 3 ); + layout->addWidget( new TQLabel( i18n("Split track at:"), frame ), 2, 0 ); + layout->setColStretch( 0, 1 ); m_editorWidget->setAllowOverlappingRanges( false ); m_editorWidget->enableRangeSelection( true ); diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 3027eac..67483ad 100644 --- a/src/projects/k3baudiotrackviewitem.cpp +++ b/src/projects/k3baudiotrackviewitem.cpp @@ -57,7 +57,7 @@ K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent, setFont( 3, f ); // gray out filename - setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); + setForegroundColor( 5, listView()->palette().disabled().foreground() ); // smaller filename f = listView()->font(); diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 918ebdf..ced699c 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -171,7 +171,7 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const : base_K3bDataImageSettings( parent, name ), m_fileSystemOptionsShown(true) { - tqlayout()->setMargin( KDialog::marginHint() ); + layout()->setMargin( KDialog::marginHint() ); m_customFsDlg = new CustomFilesystemsDialog( this ); m_volDescDlg = new VolumeDescDialog( this ); diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index b1a5794..67c6602 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -215,7 +215,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge "in the ISO9660 filesystem. A higher weighting means that the " "file will be located closer to the beginning of the image " "(and the disk)." - "<p>This option is useful in order to optimize the data tqlayout " + "<p>This option is useful in order to optimize the data layout " "on a CD/DVD." "<p><b>Caution:</b> This does not sort the order of the file " "names that appear in the ISO9660 directory." diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 475d411..414fe6d 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -65,7 +65,7 @@ void K3bDataViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int colum TQColorGroup _cg = cg; if( !dataItem()->isRemoveable() && dataItem()->doc()->root() != dataItem() ) { - _cg.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().foreground() ); + _cg.setColor( TQColorGroup::Text, listView()->palette().disabled().foreground() ); } if( column == 0 ) { diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 967e1d0..e71db6e 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -346,12 +346,12 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const // TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); // connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->setSpacing(5); - tqlayout->setMargin(frameWidth()); - tqlayout->addWidget( d->displayWidget, 0, 0 ); - // tqlayout->addWidget( d->buttonMenu, 0, 1 ); - tqlayout->setColStretch( 0, 1 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->setSpacing(5); + layout->setMargin(frameWidth()); + layout->addWidget( d->displayWidget, 0, 0 ); + // layout->addWidget( d->buttonMenu, 0, 1 ); + layout->setColStretch( 0, 1 ); setupPopupMenu(); diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index f66ea9b..d486f23 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -269,9 +269,9 @@ void K3bProjectBurnDialog::prepareGui() m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); - m_optionGroup->tqlayout()->setMargin(0); - m_optionGroup->tqlayout()->setSpacing(0); - m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->tqlayout() ); + m_optionGroup->layout()->setMargin(0); + m_optionGroup->layout()->setSpacing(0); + m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->layout() ); m_optionGroupLayout->setMargin( KDialog::marginHint() ); m_optionGroupLayout->setSpacing( KDialog::spacingHint() ); diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 199b578..1d6d8a9 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -307,10 +307,10 @@ void K3bVcdBurnDialog::setupAdvancedTab() // -------------------------------------------- gaps & margins group ---- m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); - m_groupGaps->tqlayout() ->setSpacing( spacingHint() ); - m_groupGaps->tqlayout() ->setMargin( marginHint() ); + m_groupGaps->layout() ->setSpacing( spacingHint() ); + m_groupGaps->layout() ->setMargin( marginHint() ); - TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() ); + TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->layout() ); groupGapsLayout->setAlignment( TQt::AlignTop ); m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); @@ -403,10 +403,10 @@ void K3bVcdBurnDialog::setupAdvancedTab() // ------------------------------------------------------- misc group ---- m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); - m_groupMisc->tqlayout() ->setSpacing( spacingHint() ); - m_groupMisc->tqlayout() ->setMargin( marginHint() ); + m_groupMisc->layout() ->setSpacing( spacingHint() ); + m_groupMisc->layout() ->setMargin( marginHint() ); - TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() ); + TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->layout() ); groupMiscLayout->setAlignment( TQt::AlignTop ); m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 5a13991..09a1340 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -375,10 +375,10 @@ void K3bVcdTrackDialog::prepareGui() // FILE-INFO BOX /////////////////////////////////////////////////// TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); - groupFileInfo->tqlayout() ->setSpacing( 0 ); - groupFileInfo->tqlayout() ->setMargin( 0 ); + groupFileInfo->layout() ->setSpacing( 0 ); + groupFileInfo->layout() ->setMargin( 0 ); - TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() ); + TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->layout() ); groupFileInfoLayout->setAlignment( TQt::AlignTop ); groupFileInfoLayout->setSpacing( spacingHint() ); groupFileInfoLayout->setMargin( marginHint() ); @@ -450,8 +450,8 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); - groupOptions->tqlayout() ->setSpacing( spacingHint() ); - groupOptions->tqlayout() ->setMargin( marginHint() ); + groupOptions->layout() ->setSpacing( spacingHint() ); + groupOptions->layout() ->setMargin( marginHint() ); m_check_pbc = new TQCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" ); @@ -463,10 +463,10 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); - m_groupPlay->tqlayout() ->setSpacing( spacingHint() ); - m_groupPlay->tqlayout() ->setMargin( marginHint() ); + m_groupPlay->layout() ->setSpacing( spacingHint() ); + m_groupPlay->layout() ->setMargin( marginHint() ); - TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() ); + TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->layout() ); groupPlayLayout->setAlignment( TQt::AlignTop ); TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); @@ -499,10 +499,10 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); - m_groupPbc->tqlayout() ->setSpacing( spacingHint() ); - m_groupPbc->tqlayout() ->setMargin( marginHint() ); + m_groupPbc->layout() ->setSpacing( spacingHint() ); + m_groupPbc->layout() ->setMargin( marginHint() ); - TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() ); + TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->layout() ); groupPbcLayout->setAlignment( TQt::AlignTop ); TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" ); @@ -559,8 +559,8 @@ void K3bVcdTrackDialog::setupPbcKeyTab() m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); m_groupKey->setEnabled( false ); - m_groupKey->tqlayout() ->setSpacing( spacingHint() ); - m_groupKey->tqlayout() ->setMargin( marginHint() ); + m_groupKey->layout() ->setSpacing( spacingHint() ); + m_groupKey->layout() ->setMargin( marginHint() ); m_list_keys = new K3bListView( m_groupKey, "m_list_keys" ); m_list_keys->setAllColumnsShowFocus( true ); diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index fbd3a91..bddc819 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -87,7 +87,7 @@ K3bView::~K3bView() void K3bView::setMainWidget( TQWidget* w ) { - static_cast<TQGridLayout*>(tqlayout())->addMultiCellWidget( w, 1, 1, 0, 1 ); + static_cast<TQGridLayout*>(layout())->addMultiCellWidget( w, 1, 1, 0, 1 ); } |