diff options
Diffstat (limited to 'src/projects')
-rw-r--r-- | src/projects/base_k3baudiocdtextwidget.ui | 4 | ||||
-rw-r--r-- | src/projects/base_k3baudiotrackwidget.ui | 6 | ||||
-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/k3baudiodatasourceeditwidget.cpp | 4 | ||||
-rw-r--r-- | src/projects/k3baudioeditorwidget.cpp | 18 | ||||
-rw-r--r-- | src/projects/k3baudioeditorwidget.h | 4 | ||||
-rw-r--r-- | src/projects/k3bdataimagesettingswidget.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bdatapropertiesdialog.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bdataurladdingdialog.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bdataviewitem.cpp | 2 | ||||
-rw-r--r-- | src/projects/k3bfillstatusdisplay.cpp | 12 | ||||
-rw-r--r-- | src/projects/k3bfillstatusdisplay.h | 4 | ||||
-rw-r--r-- | src/projects/k3bvcdburndialog.cpp | 4 | ||||
-rw-r--r-- | src/projects/k3bvcdtrackdialog.cpp | 22 |
16 files changed, 46 insertions, 46 deletions
diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index 5c0cbaa..a15dc9d 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>0</height> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index 6c72962..a6b71d0 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>350</width> <height>50</height> @@ -257,7 +257,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>161</width> <height>20</height> @@ -276,7 +276,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>80</height> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index b78f7dc..1aeddd8 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>261</width> <height>21</height> diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui index 2688f4f..6f9c2b9 100644 --- a/src/projects/base_k3bdataimagesettings.ui +++ b/src/projects/base_k3bdataimagesettings.ui @@ -258,7 +258,7 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>0</height> diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui index 000a552..ba918e2 100644 --- a/src/projects/base_k3bdatavolumedescwidget.ui +++ b/src/projects/base_k3bdatavolumedescwidget.ui @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp index 4a6e722..438cd83 100644 --- a/src/projects/k3baudiodatasourceeditwidget.cpp +++ b/src/projects/k3baudiodatasourceeditwidget.cpp @@ -37,7 +37,7 @@ K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* parent, co TQLabel* startLabel = new TQLabel( i18n("Start Offset") + ":", this ); TQLabel* endLabel = new TQLabel( i18n("End Offset") + ":", this ); - endLabel->tqsetAlignment( TQt::AlignRight ); + endLabel->setAlignment( TQt::AlignRight ); TQGridLayout* grid = new TQGridLayout( this ); grid->setMargin( 0 ); @@ -101,7 +101,7 @@ void K3bAudioDataSourceEditWidget::loadSource( K3bAudioDataSource* source ) false, false, i18n("Used part of the audio source"), - tqcolorGroup().highlight() ); + colorGroup().highlight() ); m_editStartOffset->setMaxValue( source->originalLength().lba() ); m_editEndOffset->setMaxValue( source->originalLength().lba() ); diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index fe0be91..843d72e 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -177,9 +177,9 @@ K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* parent, const char* name ) m_draggedMarker(0) { d = new Private; - d->selectedRangeBrush = TQBrush(tqcolorGroup().highlight()); + d->selectedRangeBrush = TQBrush(colorGroup().highlight()); - tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); + setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); setFrameStyle( StyledPanel|Sunken ); setMouseTracking(true); setCursor( TQt::PointingHandCursor ); @@ -201,7 +201,7 @@ K3bAudioEditorWidget::~K3bAudioEditorWidget() } -TQSize K3bAudioEditorWidget::tqminimumSizeHint() const +TQSize K3bAudioEditorWidget::minimumSizeHint() const { constPolish(); // some fixed height minimum and enough space for a tickmark every minute @@ -215,9 +215,9 @@ TQSize K3bAudioEditorWidget::tqminimumSizeHint() const } -TQSize K3bAudioEditorWidget::tqsizeHint() const +TQSize K3bAudioEditorWidget::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -307,7 +307,7 @@ int K3bAudioEditorWidget::addRange( const K3b::Msf& start, const K3b::Msf& end, return -1; Range* r = new Range( m_idCnt++, start, end, startFixed, endFixed, toolTip, - brush.style() != TQBrush::NoBrush ? brush : TQBrush(tqcolorGroup().background()) ); + brush.style() != TQBrush::NoBrush ? brush : TQBrush(colorGroup().background()) ); d->ranges.inSort( r ); // only update the changed range @@ -433,7 +433,7 @@ void K3bAudioEditorWidget::setMaxNumberOfMarkers( int i ) int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const TQString& toolTip, const TQColor& color ) { if( pos < m_length ) { - Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : tqcolorGroup().foreground(), toolTip ); + Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : colorGroup().foreground(), toolTip ); m_markers.inSort( m ); return m->id; } @@ -488,7 +488,7 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p ) { // double buffering TQPixmap pix( contentsRect().size() ); - pix.fill( tqcolorGroup().base() ); + pix.fill( colorGroup().base() ); TQPainter pixP; pixP.tqbegin( &pix, TQT_TQOBJECT(this) ); @@ -497,7 +497,7 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p ) drawRect.setLeft( drawRect.left() + m_margin ); drawRect.setRight( drawRect.right() - m_margin ); - // from tqminimumSizeHint() + // from minimumSizeHint() // int neededHeight = fontMetrics().height() + 12 + 6; // drawRect.setTop( drawRect.top() + (drawRect.height() - neededHeight)/2 ); diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h index b2edfa2..0638a25 100644 --- a/src/projects/k3baudioeditorwidget.h +++ b/src/projects/k3baudioeditorwidget.h @@ -34,8 +34,8 @@ class K3bAudioEditorWidget : public TQFrame K3bAudioEditorWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioEditorWidget(); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; /** * For now the Editor has only one parameter: the length data. diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 88decbc..899993d 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -157,7 +157,7 @@ public: setMainWidget( w ); // give ourselves a reasonable size - TQSize s = tqsizeHint(); + TQSize s = sizeHint(); s.setWidth( TQMAX(s.width(), 300) ); resize( s ); } diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 6a3c057..2e8ec3a 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -168,7 +168,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge sortingBoxGrid->setMargin( marginHint() ); m_editSortWeight = new KLineEdit( sortingBox ); m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) ); - m_editSortWeight->tqsetAlignment( TQt::AlignRight ); + m_editSortWeight->setAlignment( TQt::AlignRight ); sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 ); sortingBoxGrid->setColStretch( 1, 1 ); diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 630d7f9..cf57b1d 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -96,7 +96,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren this, TQT_SLOT(slotDirSizeDone(bool)) ); // try to start with a reasonable size - resize( (int)( fontMetrics().width( caption() ) * 1.5 ), tqsizeHint().height() ); + resize( (int)( fontMetrics().width( caption() ) * 1.5 ), sizeHint().height() ); } diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index c60f5d7..ae5e7f6 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -182,7 +182,7 @@ void K3bDataDirViewItem::highlightIcon( bool b ) m_pixmap = *pixmap(0); if( b ) - setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->tqcolorGroup().highlight() ) ); + setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->colorGroup().highlight() ) ); else setPixmap( 0, m_pixmap ); } diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 30f10e6..d748dce 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -72,7 +72,7 @@ K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* p { d = new Private(); d->doc = doc; - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); } @@ -102,13 +102,13 @@ void K3bFillStatusDisplayWidget::setCdSize( const K3b::Msf& size ) } -TQSize K3bFillStatusDisplayWidget::tqsizeHint() const +TQSize K3bFillStatusDisplayWidget::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize K3bFillStatusDisplayWidget::tqminimumSizeHint() const +TQSize K3bFillStatusDisplayWidget::minimumSizeHint() const { int margin = 2; TQFontMetrics fm( font() ); @@ -127,7 +127,7 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) { // double buffer TQPixmap buffer( size() ); - buffer.fill( tqcolorGroup().base() ); + buffer.fill( colorGroup().base() ); TQPainter p; p.tqbegin( &buffer, TQT_TQOBJECT(this) ); p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) @@ -577,7 +577,7 @@ void K3bFillStatusDisplay::slotCustomSize() void K3bFillStatusDisplay::slotMenuButtonClicked() { - TQSize size = d->showDvdSizes ? d->dvdPopup->tqsizeHint() : d->popup->tqsizeHint(); + TQSize size = d->showDvdSizes ? d->dvdPopup->sizeHint() : d->popup->sizeHint(); slotPopupMenu( d->buttonMenu->mapToGlobal(TQPoint(d->buttonMenu->width(), 0)) + TQPoint(-1*size.width(), -1*size.height()) ); } diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index c1cc810..f219ec8 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -51,8 +51,8 @@ class K3bFillStatusDisplayWidget : public TQWidget K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent ); ~K3bFillStatusDisplayWidget(); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; const K3b::Msf& cdSize() const; diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 3f2434c..98354f9 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -311,7 +311,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() m_groupGaps->tqlayout() ->setMargin( marginHint() ); TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() ); - groupGapsLayout->tqsetAlignment( TQt::AlignTop ); + groupGapsLayout->setAlignment( TQt::AlignTop ); m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); @@ -407,7 +407,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() m_groupMisc->tqlayout() ->setMargin( marginHint() ); TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() ); - groupMiscLayout->tqsetAlignment( TQt::AlignTop ); + groupMiscLayout->setAlignment( TQt::AlignTop ); m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); m_spinRestriction = new TQSpinBox( m_groupMisc, "m_spinRestriction" ); diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index be140f7..bfac930 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -379,7 +379,7 @@ void K3bVcdTrackDialog::prepareGui() groupFileInfo->tqlayout() ->setMargin( 0 ); TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() ); - groupFileInfoLayout->tqsetAlignment( TQt::AlignTop ); + groupFileInfoLayout->setAlignment( TQt::AlignTop ); groupFileInfoLayout->setSpacing( spacingHint() ); groupFileInfoLayout->setMargin( marginHint() ); @@ -387,7 +387,7 @@ void K3bVcdTrackDialog::prepareGui() m_displayFileName = new KCutLabel( groupFileInfo ); m_displayFileName->setText( i18n( "Filename" ) ); - m_displayFileName->tqsetAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) ); + m_displayFileName->setAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) ); TQLabel* labelSize = new TQLabel( i18n( "Size:" ), groupFileInfo, "labelSize" ); TQLabel* labelLength = new TQLabel( i18n( "Length:" ), groupFileInfo, "labelLength" ); @@ -395,15 +395,15 @@ void K3bVcdTrackDialog::prepareGui() m_displaySize = new TQLabel( groupFileInfo, "m_displaySize" ); m_displaySize->setText( "0.0 MB" ); - m_displaySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_displaySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_displayLength = new TQLabel( groupFileInfo, "m_displayLength" ); m_displayLength->setText( "0:0:0" ); - m_displayLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_displayLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" ); m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) ); - m_muxrate->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_muxrate->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); TQFrame* fileInfoLine = new TQFrame( groupFileInfo ); fileInfoLine->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); @@ -443,7 +443,7 @@ void K3bVcdTrackDialog::setupPbcTab() TQWidget * w = new TQWidget( m_mainTabbed ); TQGridLayout* grid = new TQGridLayout( w ); - grid->tqsetAlignment( TQt::AlignTop ); + grid->setAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); @@ -467,7 +467,7 @@ void K3bVcdTrackDialog::setupPbcTab() m_groupPlay->tqlayout() ->setMargin( marginHint() ); TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() ); - groupPlayLayout->tqsetAlignment( TQt::AlignTop ); + groupPlayLayout->setAlignment( TQt::AlignTop ); TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); @@ -503,7 +503,7 @@ void K3bVcdTrackDialog::setupPbcTab() m_groupPbc->tqlayout() ->setMargin( marginHint() ); TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() ); - groupPbcLayout->tqsetAlignment( TQt::AlignTop ); + groupPbcLayout->setAlignment( TQt::AlignTop ); TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" ); TQLabel* labelPbc_next = new TQLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" ); @@ -553,7 +553,7 @@ void K3bVcdTrackDialog::setupPbcKeyTab() m_widgetnumkeys = new TQWidget( m_mainTabbed ); TQGridLayout* grid = new TQGridLayout( m_widgetnumkeys ); - grid->tqsetAlignment( TQt::AlignTop ); + grid->setAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); @@ -590,7 +590,7 @@ void K3bVcdTrackDialog::setupAudioTab() TQWidget * w = new TQWidget( m_mainTabbed ); TQGridLayout* grid = new TQGridLayout( w ); - grid->tqsetAlignment( TQt::AlignTop ); + grid->setAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); @@ -647,7 +647,7 @@ void K3bVcdTrackDialog::setupVideoTab() TQWidget * w = new TQWidget( m_mainTabbed ); TQGridLayout* grid = new TQGridLayout( w ); - grid->tqsetAlignment( TQt::AlignTop ); + grid->setAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); |