diff options
Diffstat (limited to 'src/projects')
51 files changed, 268 insertions, 268 deletions
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 17bb26f..5961ea3 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>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui index c0e2556..ba6cff3 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>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -62,7 +62,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -184,7 +184,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -235,7 +235,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index 4010416..5c0cbaa 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>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -96,7 +96,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -135,7 +135,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>0</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index ce969da..6c72962 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>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>350</width> <height>50</height> @@ -217,7 +217,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>80</height> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 3d5b488..b78f7dc 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>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> @@ -190,7 +190,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> @@ -246,7 +246,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>261</width> <height>21</height> @@ -281,7 +281,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui index d1444a9..2688f4f 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>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -258,7 +258,7 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui index 75b5d0a..000a552 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>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="text"> <string>Volume set &number:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -231,7 +231,7 @@ </widget> <widget class="TQLayoutWidget" row="11" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -260,7 +260,7 @@ </widget> <widget class="TQLayoutWidget" row="9" column="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -289,7 +289,7 @@ </widget> <widget class="TQLayoutWidget" row="10" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui index 293ca92..c0bb2fe 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>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -239,10 +239,10 @@ <cstring>m_comboKeyboardLayout</cstring> </property> <property name="toolTip" stdset="0"> - <string>Select the layout of the keyboard</string> + <string>Select the tqlayout of the keyboard</string> </property> <property name="whatsThis" stdset="0"> - <string><p>The keyboard layout selected here will be used for the eMovix commands like controlling the media player.</string> + <string><p>The keyboard tqlayout selected here will be used for the eMovix commands like controlling the media player.</string> </property> </widget> </grid> diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 1d3fbd3..0634caa 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -37,7 +37,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtabwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvariant.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -63,7 +63,7 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, cons setTitle( i18n("Audio Project"), i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)", - m_doc->numOfTracks() ).arg(m_doc->length().toString()) ); + m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp index 5f5610c..a1dff26 100644 --- a/src/projects/k3baudiocdtextwidget.cpp +++ b/src/projects/k3baudiocdtextwidget.cpp @@ -24,7 +24,7 @@ #include <tqtoolbutton.h> #include <tqpushbutton.h> #include <tqptrlist.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <klineedit.h> diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp index e32d24d..4a6e722 100644 --- a/src/projects/k3baudiodatasourceeditwidget.cpp +++ b/src/projects/k3baudiodatasourceeditwidget.cpp @@ -19,7 +19,7 @@ #include <k3baudiodatasource.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqtooltip.h> @@ -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->setAlignment( TQt::AlignRight ); + endLabel->tqsetAlignment( 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"), - colorGroup().highlight() ); + tqcolorGroup().highlight() ); m_editStartOffset->setMaxValue( source->originalLength().lba() ); m_editEndOffset->setMaxValue( source->originalLength().lba() ); diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index 2f0b7a5..6609d00 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()->palette().disabled().foreground() ); + setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); // smaller filename f = listView()->font(); @@ -89,7 +89,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const TQString& text ) bool K3bAudioDataSourceViewItem::animate() { if( source()->length() == 0 && source()->isValid() ) { - TQString icon = TQString( "kde%1" ).arg( m_animationCounter ); + TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter ); setPixmap( 4, SmallIcon( icon ) ); m_animationCounter++; if ( m_animationCounter > 6 ) diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index ed17c01..fe0be91 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -125,7 +125,7 @@ protected: if( m ) { r.setLeft( p.x() - 1 ); r.setRight( p.x() + 1 ); - tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").arg(m->toolTip).arg(m->pos.toString()) ); + tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").tqarg(m->toolTip).tqarg(m->pos.toString()) ); } else { Range* range = m_editorWidget->findRange( p ); @@ -134,8 +134,8 @@ protected: r.setRight( m_editorWidget->msfToPos( range->end ) ); tip( r, range->toolTip.isEmpty() - ? TQString("%1 - %2").arg(range->start.toString()).arg(range->end.toString()) - : TQString("%1 (%2 - %3)").arg(range->toolTip).arg(range->start.toString()).arg(range->end.toString()) ); + ? TQString("%1 - %2").tqarg(range->start.toString()).tqarg(range->end.toString()) + : TQString("%1 (%2 - %3)").tqarg(range->toolTip).tqarg(range->start.toString()).tqarg(range->end.toString()) ); } } } @@ -177,9 +177,9 @@ K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* parent, const char* name ) m_draggedMarker(0) { d = new Private; - d->selectedRangeBrush = TQBrush(colorGroup().highlight()); + d->selectedRangeBrush = TQBrush(tqcolorGroup().highlight()); - setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); + tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); setFrameStyle( StyledPanel|Sunken ); setMouseTracking(true); setCursor( TQt::PointingHandCursor ); @@ -201,7 +201,7 @@ K3bAudioEditorWidget::~K3bAudioEditorWidget() } -TQSize K3bAudioEditorWidget::minimumSizeHint() const +TQSize K3bAudioEditorWidget::tqminimumSizeHint() const { constPolish(); // some fixed height minimum and enough space for a tickmark every minute @@ -215,9 +215,9 @@ TQSize K3bAudioEditorWidget::minimumSizeHint() const } -TQSize K3bAudioEditorWidget::sizeHint() const +TQSize K3bAudioEditorWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -263,7 +263,7 @@ bool K3bAudioEditorWidget::allowOverlappingRanges() const void K3bAudioEditorWidget::enableRangeSelection( bool b ) { d->rangeSelectionEnabled = b; - repaint( false ); + tqrepaint( false ); } @@ -283,7 +283,7 @@ void K3bAudioEditorWidget::setSelectedRange( K3bAudioEditorWidget::Range* r ) { d->selectedRange = r; if( rangeSelectedEnabled() ) { - repaint( false ); + tqrepaint( false ); emit selectedRangeChanged( d->selectedRange ? d->selectedRange->id : 0 ); } } @@ -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(colorGroup().background()) ); + brush.style() != TQBrush::NoBrush ? brush : TQBrush(tqcolorGroup().background()) ); d->ranges.inSort( r ); // only update the changed range @@ -356,7 +356,7 @@ bool K3bAudioEditorWidget::modifyRange( int identifier, const K3b::Msf& start, c if( !d->allowOverlappingRanges ) fixupOverlappingRanges( range ); - repaint( false ); + tqrepaint( false ); return true; } @@ -372,7 +372,7 @@ bool K3bAudioEditorWidget::removeRange( int identifier ) emit rangeRemoved( identifier ); - // repaint only the part of the range + // tqrepaint only the part of the range TQRect rect = contentsRect(); rect.setLeft( msfToPos( range->start ) ); rect.setRight( msfToPos( range->end ) ); @@ -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 : colorGroup().foreground(), toolTip ); + Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : tqcolorGroup().foreground(), toolTip ); m_markers.inSort( m ); return m->id; } @@ -488,16 +488,16 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p ) { // double buffering TQPixmap pix( contentsRect().size() ); - pix.fill( colorGroup().base() ); + pix.fill( tqcolorGroup().base() ); TQPainter pixP; - pixP.begin( &pix, TQT_TQOBJECT(this) ); + pixP.tqbegin( &pix, TQT_TQOBJECT(this) ); TQRect drawRect( contentsRect() ); drawRect.setLeft( drawRect.left() + m_margin ); drawRect.setRight( drawRect.right() - m_margin ); - // from minimumSizeHint() + // from tqminimumSizeHint() // int neededHeight = fontMetrics().height() + 12 + 6; // drawRect.setTop( drawRect.top() + (drawRect.height() - neededHeight)/2 ); @@ -690,11 +690,11 @@ void K3bAudioEditorWidget::mouseReleaseEvent( TQMouseEvent* e ) // if( m_draggedRange ) { fixupOverlappingRanges( m_draggedRange ); - repaint( false ); + tqrepaint( false ); } else if( d->movedRange ) { fixupOverlappingRanges( d->movedRange ); - repaint( false ); + tqrepaint( false ); } } @@ -739,13 +739,13 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e ) emit rangeChanged( m_draggedRange->id, m_draggedRange->start, m_draggedRange->end ); - repaint( false ); + tqrepaint( false ); } else if( m_draggedMarker ) { m_draggedMarker->pos = posToMsf( e->pos().x() ); emit markerMoved( m_draggedMarker->id, m_draggedMarker->pos ); - repaint( false ); + tqrepaint( false ); } else if( d->movedRange ) { int diff = posToMsf( e->pos().x() ).lba() - d->lastMovePosition.lba(); @@ -763,7 +763,7 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e ) emit rangeChanged( d->movedRange->id, d->movedRange->start, d->movedRange->end ); - repaint( false ); + tqrepaint( false ); } } else if( findRangeEdge( e->pos() ) || findMarker( e->pos() ) ) diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h index 0638a25..b2edfa2 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 sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; /** * For now the Editor has only one parameter: the length data. diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index fe99b56..5e5ca7e 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -30,7 +30,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqfileinfo.h> #include <tqtimer.h> #include <tqdir.h> @@ -104,7 +104,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, dlg.m_trackAfter = afterTrack; dlg.m_parentTrack = parentTrack; dlg.m_sourceAfter = afterSource; - dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").arg(doc->URL().fileName()) ); + dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) ); dlg.m_busyWidget->showBusy(true); TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) ); @@ -113,23 +113,23 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, TQString message; if( !dlg.m_unreadableFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("Insufficient permissions to read the following files") ) - .arg( dlg.m_unreadableFiles.join( "<br>" ) ); + .tqarg( i18n("Insufficient permissions to read the following files") ) + .tqarg( dlg.m_unreadableFiles.join( "<br>" ) ); if( !dlg.m_notFoundFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("Unable to find the following files") ) - .arg( dlg.m_notFoundFiles.join( "<br>" ) ); + .tqarg( i18n("Unable to find the following files") ) + .tqarg( dlg.m_notFoundFiles.join( "<br>" ) ); if( !dlg.m_nonLocalFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("No non-local files supported") ) - .arg( dlg.m_unreadableFiles.join( "<br>" ) ); + .tqarg( i18n("No non-local files supported") ) + .tqarg( dlg.m_unreadableFiles.join( "<br>" ) ); if( !dlg.m_unsupportedFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br><i>%2</i><br>%3") - .arg( i18n("Unable to handle the following files due to an unsupported format" ) ) - .arg( i18n("You may manually convert these audio files to wave using another " + .tqarg( i18n("Unable to handle the following files due to an unsupported format" ) ) + .tqarg( i18n("You may manually convert these audio files to wave using another " "application supporting the audio format and then add the wave files " "to the K3b project.") ) - .arg( dlg.m_unsupportedFiles.join( "<br>" ) ); + .tqarg( dlg.m_unsupportedFiles.join( "<br>" ) ); if( !message.isEmpty() ) KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); @@ -162,7 +162,7 @@ void K3bAudioTrackAddingDialog::slotAddUrls() } } - m_infoLabel->setText( i18n("Analysing file '%1'...").arg( url.fileName() ) ); + m_infoLabel->setText( i18n("Analysing file '%1'...").tqarg( url.fileName() ) ); if( !url.isLocalFile() ) { valid = false; diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp index 2572f30..bdfb9f0 100644 --- a/src/projects/k3baudiotrackdialog.cpp +++ b/src/projects/k3baudiotrackdialog.cpp @@ -14,9 +14,9 @@ */ -#include <textedit.h> +#include <tqtextedit.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqframe.h> #include <tqcheckbox.h> diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index c73342c..adc1e41 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -185,9 +185,9 @@ void K3bAudioTrackPlayer::playTrack( K3bAudioTrack* track ) // we show the currently playing track as a tooltip on the slider TQToolTip::remove( d->seekSlider ); TQToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3") - .arg(track->trackNumber()) - .arg(track->artist()) - .arg(track->title()) ); + .tqarg(track->trackNumber()) + .tqarg(track->artist()) + .tqarg(track->title()) ); d->seekSlider->setMaxValue( track->length().totalFrames() ); m_currentTrack = track; d->paused = true; diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index f75b8da..6a987e6 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqframe.h> -#include <layout.h> +#include <tqlayout.h> K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* parent, const char* name ) @@ -42,19 +42,19 @@ K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidg m_msfEditStart = new K3bMsfEdit( frame ); m_msfEditEnd = new K3bMsfEdit( frame ); - TQGridLayout* layout = new TQGridLayout( frame ); - layout->setMargin( 0 ); - layout->setSpacing( spacingHint() ); + TQGridLayout* tqlayout = new TQGridLayout( frame ); + tqlayout->setMargin( 0 ); + tqlayout->setSpacing( spacingHint() ); // FIXME: After the string freeze replace the text with a better one explaning how to use this dialog - layout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."), + tqlayout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."), frame ), 0, 0, 0, 3 ); - 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 ); + 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 ); m_editorWidget->setAllowOverlappingRanges( false ); m_editorWidget->enableRangeSelection( true ); diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp index 6c1b8a8..0bf23ec 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.cpp +++ b/src/projects/k3baudiotracktrmlookupdialog.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqframe.h> #include <tqeventloop.h> @@ -122,7 +122,7 @@ void K3bAudioTrackTRMLookupDialog::slotTrackFinished( K3bAudioTrack* track, bool { if( !success ) K3bPassivePopup::showPopup( i18n("Track %1 was not found in the MusicBrainz database.") - .arg( track->trackNumber()), + .tqarg( track->trackNumber()), i18n("Audio Project") ); } diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 4c21d0b..23f3478 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -46,7 +46,7 @@ #include <tqevent.h> #include <tqpixmap.h> #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqvaluelist.h> @@ -487,7 +487,7 @@ void K3bAudioTrackView::slotTrackChanged( K3bAudioTrack* track ) item->showSources(true); // the length might have changed - item->repaint(); + item->tqrepaint(); // FIXME: only do this if the position really changed // move the item if the position has changed diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 67483ad..24d6f48 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()->palette().disabled().foreground() ); + setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); // smaller filename f = listView()->font(); @@ -194,7 +194,7 @@ bool K3bAudioTrackViewItem::animate() item = item->nextSibling(); } if( animate ) { - TQString icon = TQString( "kde%1" ).arg( m_animationCounter ); + TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter ); setPixmap( 4, SmallIcon( icon ) ); m_animationCounter++; if ( m_animationCounter > 6 ) diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index 187b542..c0019b9 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -38,7 +38,7 @@ #include <k3bprojectplugin.h> // QT-includes -#include <layout.h> +#include <tqlayout.h> #include <tqstring.h> // KDE-includes diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index cf2f086..92b4c87 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -61,7 +61,7 @@ public: return i18n("None"); } else if( col == 1 ) - return TQString( "%1 KB" ).arg( m_image->size()/1024 ); + return TQString( "%1 KB" ).tqarg( m_image->size()/1024 ); else if( col == 2 ) return m_image->localPath(); else diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp index 1697523..782d898 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.cpp +++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp @@ -24,7 +24,7 @@ #include <tqwhatsthis.h> #include <tqpoint.h> #include <tqpainter.h> -#include <palette.h> +#include <tqpalette.h> #include <tqvalidator.h> #include <tqregexp.h> @@ -130,7 +130,7 @@ public: protected: void stateChange( bool on ) { - // enable or disable all children + // enable or disable all tqchildren TQListViewItem* item = firstChild(); while( item ) { if( PrivateCheckViewItem* pi = dynamic_cast<PrivateCheckViewItem*>(item) ) @@ -205,13 +205,13 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget i18n("ISO Level") ); m_radioIsoLevel3 = new TQCheckListItem( m_isoLevelController, - i18n("Level %1").arg(3), + i18n("Level %1").tqarg(3), TQCheckListItem::RadioButton ); m_radioIsoLevel2 = new TQCheckListItem( m_isoLevelController, - i18n("Level %1").arg(2), + i18n("Level %1").tqarg(2), TQCheckListItem::RadioButton ); m_radioIsoLevel1 = new TQCheckListItem( m_isoLevelController, - i18n("Level %1").arg(1), + i18n("Level %1").tqarg(1), TQCheckListItem::RadioButton ); m_isoLevelController->setOpen(true); diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index 0d3cc44..2b4375f 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -39,7 +39,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvariant.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -69,7 +69,7 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c { prepareGui(); - setTitle( i18n("Data Project"), i18n("Size: %1").arg( KIO::convertSize(_doc->size()) ) ); + setTitle( i18n("Data Project"), i18n("Size: %1").tqarg( KIO::convertSize(_doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); @@ -181,7 +181,7 @@ void K3bDataBurnDialog::slotStartClicked() if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 04c6cb9..6164aa2 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -249,7 +249,7 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item ) // we don't get removedInfo for the child items // so we need to remove them here - TQPtrListIterator<K3bDataItem> it( dirItem->children() ); + TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); for( ; it.current(); ++it ) { if( it.current()->isDir() ) slotDataItemRemoved( it.current() ); @@ -374,9 +374,9 @@ void K3bDataDirTreeView::slotProperties() if( viewItem && currentItem() != root() ) { K3bDataPropertiesDialog d( viewItem->dataItem(), this ); if( d.exec() ) { - repaint(); + tqrepaint(); if( m_fileView ) - m_fileView->repaint(); + m_fileView->tqrepaint(); } } else @@ -499,7 +499,7 @@ void K3bDataDirTreeView::slotDocChanged() // avoid flicker if( d->lastUpdateVolumeId != m_doc->isoOptions().volumeID() ) { d->lastUpdateVolumeId = m_doc->isoOptions().volumeID(); - root()->repaint(); + root()->tqrepaint(); } } diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index afe94a3..b29f8ad 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -165,7 +165,7 @@ void K3bDataFileView::checkForNewItems() hideEditor(); // add items that are not there yet - for( TQPtrListIterator<K3bDataItem> it( m_currentDir->children() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( m_currentDir->tqchildren() ); it.current(); ++it ) { if( !m_itemMap.contains( it.current() ) ) { slotItemAdded( it.current() ); } diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 837f9b5..88decbc 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -26,7 +26,7 @@ #include <tqcombobox.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> -#include <layout.h> +#include <tqlayout.h> #include <kmessagebox.h> #include <klocale.h> @@ -157,7 +157,7 @@ public: setMainWidget( w ); // give ourselves a reasonable size - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); s.setWidth( TQMAX(s.width(), 300) ); resize( s ); } @@ -171,7 +171,7 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const : base_K3bDataImageSettings( parent, name ), m_fileSystemOptionsShown(true) { - layout()->setMargin( KDialog::marginHint() ); + tqlayout()->setMargin( KDialog::marginHint() ); m_customFsDlg = new CustomFilesystemsDialog( this ); m_volDescDlg = new VolumeDescDialog( this ); @@ -268,7 +268,7 @@ void K3bDataImageSettingsWidget::slotFilesystemsChanged() if( s.isEmpty() ) m_comboFilesystems->changeItem( i18n("Custom (ISO9660 only)"), FS_CUSTOM ); else - m_comboFilesystems->changeItem( i18n("Custom (%1)").arg( s.join(", ") ), FS_CUSTOM ); + m_comboFilesystems->changeItem( i18n("Custom (%1)").tqarg( s.join(", ") ), FS_CUSTOM ); // see if any of the presets is loaded m_comboFilesystems->setCurrentItem( FS_CUSTOM ); diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 05de7ee..6a3c057 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -22,7 +22,7 @@ #include <k3bvalidators.h> #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqframe.h> #include <tqcheckbox.h> @@ -94,7 +94,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) ); labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) ); if( fileItem->isSymLink() ) - m_labelType->setText( i18n("Link to %1").arg(kFileItem.mimeComment()) ); + m_labelType->setText( i18n("Link to %1").tqarg(kFileItem.mimeComment()) ); else m_labelType->setText( kFileItem.mimeComment() ); m_labelLocalName->setText( kFileItem.name() ); @@ -136,7 +136,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge if( location.isEmpty() ) location = "/"; m_labelLocation->setText( location ); - extraInfoLabel->setText( TQString( "(%1)" ).arg(dataItem->extraInfo()) ); + extraInfoLabel->setText( TQString( "(%1)" ).tqarg(dataItem->extraInfo()) ); if( dataItem->extraInfo().isEmpty() ) extraInfoLabel->hide(); @@ -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->setAlignment( TQt::AlignRight ); + m_editSortWeight->tqsetAlignment( TQt::AlignRight ); sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 ); sortingBoxGrid->setColStretch( 1, 1 ); @@ -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 layout " + "<p>This option is useful in order to optimize the data tqlayout " "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/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 6e63076..630d7f9 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -20,7 +20,7 @@ #include <tqtimer.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqdir.h> #include <tqfileinfo.h> @@ -57,7 +57,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent, const char* name ) : KDialogBase( Plain, - i18n("Adding files to project '%1'").arg(doc->URL().fileName()), + i18n("Adding files to project '%1'").tqarg(doc->URL().fileName()), Cancel, Cancel, parent, @@ -84,7 +84,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren m_counterLabel = new TQLabel( page ); m_infoLabel = new KSqueezedTextLabel( i18n("Adding files to project '%1'") - .arg(doc->URL().fileName()) + "...", page ); + .tqarg(doc->URL().fileName()) + "...", page ); m_progressWidget = new KProgress( 0, page ); grid->addWidget( m_counterLabel, 0, 1 ); @@ -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 ), sizeHint().height() ); + resize( (int)( fontMetrics().width( caption() ) * 1.5 ), tqsizeHint().height() ); } @@ -169,29 +169,29 @@ TQString K3bDataUrlAddingDialog::resultMessage() const TQString message; if( !m_unreadableFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("Insufficient permissions to read the following files") ) - .arg( m_unreadableFiles.join( "<br>" ) ); + .tqarg( i18n("Insufficient permissions to read the following files") ) + .tqarg( m_unreadableFiles.join( "<br>" ) ); if( !m_notFoundFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("Unable to find the following files") ) - .arg( m_notFoundFiles.join( "<br>" ) ); + .tqarg( i18n("Unable to find the following files") ) + .tqarg( m_notFoundFiles.join( "<br>" ) ); if( !m_nonLocalFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("No non-local files supported") ) - .arg( m_unreadableFiles.join( "<br>" ) ); + .tqarg( i18n("No non-local files supported") ) + .tqarg( m_unreadableFiles.join( "<br>" ) ); if( !m_tooBigFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("It is not possible to add files bigger than %1").arg(KIO::convertSize(0xFFFFFFFF)) ) - .arg( m_tooBigFiles.join( "<br>" ) ); + .tqarg( i18n("It is not possible to add files bigger than %1").tqarg(KIO::convertSize(0xFFFFFFFF)) ) + .tqarg( m_tooBigFiles.join( "<br>" ) ); if( !m_mkisofsLimitationRenamedFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("Some filenames had to be modified due to limitations in mkisofs") ) - .arg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) ); + .tqarg( i18n("Some filenames had to be modified due to limitations in mkisofs") ) + .tqarg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) ); if( !m_invalidFilenameEncodingFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("The following filenames have an invalid encoding. You may fix this " + .tqarg( i18n("The following filenames have an invalid encoding. You may fix this " "with the convmv tool") ) - .arg( m_invalidFilenameEncodingFiles.join( "<br>" ) ); + .tqarg( m_invalidFilenameEncodingFiles.join( "<br>" ) ); return message; } @@ -222,7 +222,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& item return 0; K3bDataUrlAddingDialog dlg( dir->doc(), parent ); - dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").arg(dir->doc()->URL().fileName()) ); + dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").tqarg(dir->doc()->URL().fileName()) ); dlg.m_copyItems = copy; for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { @@ -283,9 +283,9 @@ void K3bDataUrlAddingDialog::slotAddUrls() #if 0 m_infoLabel->setText( url.path() ); if( m_totalFiles == 0 ) - m_counterLabel->setText( TQString("(%1)").arg(m_filesHandled) ); + m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) ); else - m_counterLabel->setText( TQString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) ); + m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); #endif // @@ -425,8 +425,8 @@ void K3bDataUrlAddingDialog::slotAddUrls() switch( K3bMultiChoiceDialog::choose( i18n("File already exists"), i18n("<p>File <em>%1</em> already exists in " "project folder <em>%2</em>.") - .arg(newName) - .arg('/' + dir->k3bPath()), + .tqarg(newName) + .tqarg('/' + dir->k3bPath()), TQMessageBox::Warning, this, 0, @@ -493,8 +493,8 @@ void K3bDataUrlAddingDialog::slotAddUrls() "K3b project cannot be resolved." "<p><b>If you do not intend to enable the option <em>follow symbolic links</em> you may safely " "ignore this warning and choose to add the link to the project.</b>") - .arg(absFilePath) - .arg(resolved ), + .tqarg(absFilePath) + .tqarg(resolved ), TQMessageBox::Warning, this, 0, @@ -603,9 +603,9 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() ++m_filesHandled; m_infoLabel->setText( item->k3bPath() ); if( m_totalFiles == 0 ) - m_counterLabel->setText( TQString("(%1)").arg(m_filesHandled) ); + m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) ); else - m_counterLabel->setText( TQString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) ); + m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); if( dir == item->parent() ) { @@ -623,7 +623,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() // reuse an existing dir: move all child items into the old dir // if( oldItem->isDir() && item->isDir() ) { - const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children(); + const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->tqchildren(); for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); @@ -661,8 +661,8 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() switch( K3bMultiChoiceDialog::choose( i18n("File already exists"), i18n("<p>File <em>%1</em> already exists in " "project folder <em>%2</em>.") - .arg( item->k3bName() ) - .arg("/" + dir->k3bPath()), + .tqarg( item->k3bName() ) + .tqarg("/" + dir->k3bPath()), TQMessageBox::Warning, this, 0, diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index e7c0bf4..1ac59f8 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -43,7 +43,7 @@ #include <tqpixmap.h> #include <tqsplitter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqdragobject.h> #include <tqheader.h> #include <tqptrlist.h> diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 49fe587..c60f5d7 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -31,7 +31,7 @@ #include <kpixmap.h> #include <tqpainter.h> -#include <palette.h> +#include <tqpalette.h> #include <tqfileinfo.h> @@ -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()->palette().disabled().foreground() ); + _cg.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().foreground() ); } if( column == 0 ) { @@ -182,7 +182,7 @@ void K3bDataDirViewItem::highlightIcon( bool b ) m_pixmap = *pixmap(0); if( b ) - setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->colorGroup().highlight() ) ); + setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->tqcolorGroup().highlight() ) ); else setPixmap( 0, m_pixmap ); } @@ -228,7 +228,7 @@ TQString K3bDataFileViewItem::text( int index ) const comment = m_pMimeType->name(); if( m_fileItem->isSymLink() ) - return i18n("Link to %1").arg(comment); + return i18n("Link to %1").tqarg(comment); else return comment; } diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index 4cff97e..17ee516 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -33,7 +33,7 @@ #include <kio/global.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> @@ -50,7 +50,7 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char { prepareGui(); - setTitle( i18n("DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) ); + setTitle( i18n("DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); @@ -283,7 +283,7 @@ void K3bDvdBurnDialog::slotStartClicked() if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked diff --git a/src/projects/k3bencodingconverter.cpp b/src/projects/k3bencodingconverter.cpp index 273e664..9fa2a79 100644 --- a/src/projects/k3bencodingconverter.cpp +++ b/src/projects/k3bencodingconverter.cpp @@ -18,7 +18,7 @@ #include "k3bencodingconverter.h" #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <kdebug.h> diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index bad58df..30f10e6 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -35,7 +35,7 @@ #include <tqvalidator.h> #include <tqtoolbutton.h> #include <tqtooltip.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <tqtimer.h> @@ -72,7 +72,7 @@ K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* p { d = new Private(); d->doc = doc; - setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); } @@ -102,13 +102,13 @@ void K3bFillStatusDisplayWidget::setCdSize( const K3b::Msf& size ) } -TQSize K3bFillStatusDisplayWidget::sizeHint() const +TQSize K3bFillStatusDisplayWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -TQSize K3bFillStatusDisplayWidget::minimumSizeHint() const +TQSize K3bFillStatusDisplayWidget::tqminimumSizeHint() const { int margin = 2; TQFontMetrics fm( font() ); @@ -127,9 +127,9 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) { // double buffer TQPixmap buffer( size() ); - buffer.fill( colorGroup().base() ); + buffer.fill( tqcolorGroup().base() ); TQPainter p; - p.begin( &buffer, TQT_TQOBJECT(this) ); + 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) long long docSize; @@ -199,16 +199,16 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) TQString overSizeText; if( d->cdSize.mode1Bytes() >= d->doc->size() ) overSizeText = i18n("Available: %1 of %2") - .arg( d->showTime - ? i18n("%1 min").arg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false)) + .tqarg( d->showTime + ? i18n("%1 min").tqarg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false)) : KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) ) - .arg( d->showTime - ? i18n("%1 min").arg(K3b::Msf( cdSize*60*75 ).toString(false)) + .tqarg( d->showTime + ? i18n("%1 min").tqarg(K3b::Msf( cdSize*60*75 ).toString(false)) : KIO::convertSizeFromKB( cdSize * 1024 ) ); else overSizeText = i18n("Capacity exceeded by %1") - .arg( d->showTime - ? i18n("%1 min").arg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false)) + .tqarg( d->showTime + ? i18n("%1 min").tqarg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false)) : KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) ); // ==================================================================================== @@ -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* 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 ); + 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 ); setupPopupMenu(); @@ -388,11 +388,11 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), d->actionCollection, "fillstatus_auto" ); - d->action74Min = new KRadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), + d->action74Min = new KRadioAction( i18n("%1 MB").tqarg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), d->actionCollection, "fillstatus_74minutes" ); - d->action80Min = new KRadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), + d->action80Min = new KRadioAction( i18n("%1 MB").tqarg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), d->actionCollection, "fillstatus_80minutes" ); - d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), + d->action100Min = new KRadioAction( i18n("%1 MB").tqarg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); @@ -460,9 +460,9 @@ void K3bFillStatusDisplay::showSize() { d->actionShowMegs->setChecked( true ); - d->action74Min->setText( i18n("%1 MB").arg(650) ); - d->action80Min->setText( i18n("%1 MB").arg(700) ); - d->action100Min->setText( i18n("%1 MB").arg(880) ); + d->action74Min->setText( i18n("%1 MB").tqarg(650) ); + d->action80Min->setText( i18n("%1 MB").tqarg(700) ); + d->action100Min->setText( i18n("%1 MB").tqarg(880) ); d->showTime = false; d->displayWidget->setShowTime(false); @@ -548,7 +548,7 @@ void K3bFillStatusDisplay::slotCustomSize() i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, " "and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>" " respectively."), - d->showDvdSizes ? TQString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) : + d->showDvdSizes ? TQString("4%14%2").tqarg(KGlobal::locale()->decimalSymbol()).tqarg(gbS) : (d->showTime ? TQString("74")+minS : TQString("650")+mbS), &ok, this, (const char*)0, new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) ); @@ -577,7 +577,7 @@ void K3bFillStatusDisplay::slotCustomSize() void K3bFillStatusDisplay::slotMenuButtonClicked() { - TQSize size = d->showDvdSizes ? d->dvdPopup->sizeHint() : d->popup->sizeHint(); + TQSize size = d->showDvdSizes ? d->dvdPopup->tqsizeHint() : d->popup->tqsizeHint(); 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 f219ec8..c1cc810 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 sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; const K3b::Msf& cdSize() const; diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 6584201..2053e32 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -44,7 +44,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvariant.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -66,7 +66,7 @@ K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, cons setTitle( i18n("Mixed Project"), i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)", - m_doc->numOfTracks()).arg(m_doc->length().toString()) ); + m_doc->numOfTracks()).tqarg(m_doc->length().toString()) ); m_checkOnlyCreateImage->hide(); diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp index dd644b5..c19bd28 100644 --- a/src/projects/k3bmixeddirtreeview.cpp +++ b/src/projects/k3bmixeddirtreeview.cpp @@ -42,7 +42,7 @@ public: TQString text( int col ) const { if( col == 0 ) - return i18n("Audio Tracks") + TQString(" (%1)").arg(m_doc->audioDoc()->numOfTracks()); + return i18n("Audio Tracks") + TQString(" (%1)").tqarg(m_doc->audioDoc()->numOfTracks()); else return TQString(); } @@ -97,7 +97,7 @@ void K3bMixedDirTreeView::slotSelectionChanged( TQListViewItem* i ) void K3bMixedDirTreeView::slotNewAudioTracks() { // update the tracknumber - m_audioRootItem->repaint(); + m_audioRootItem->tqrepaint(); } #include "k3bmixeddirtreeview.moc" diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp index 436c4c0..8d1b939 100644 --- a/src/projects/k3bmixedview.cpp +++ b/src/projects/k3bmixedview.cpp @@ -33,7 +33,7 @@ #include <tqwidgetstack.h> #include <tqsplitter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvaluelist.h> #include <kdialog.h> diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index fd99cad..4a49d4f 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -38,7 +38,7 @@ #include <kconfig.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqfileinfo.h> @@ -52,7 +52,7 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, cons m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); setTitle( i18n("eMovix CD Project"), - i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) ); + i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); addPage( m_movixOptionsWidget, i18n("eMovix") ); @@ -226,7 +226,7 @@ void K3bMovixBurnDialog::slotStartClicked() if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) != KMessageBox::Continue ) return; diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index 0dbd3d9..9cc5617 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqfileinfo.h> @@ -54,7 +54,7 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* par m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); setTitle( i18n("eMovix DVD Project"), - i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) ); + i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); addPage( m_movixOptionsWidget, i18n("eMovix") ); @@ -193,7 +193,7 @@ void K3bMovixDvdBurnDialog::slotStartClicked() if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) != KMessageBox::Continue ) return; diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 44136b5..e43dfd5 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -84,7 +84,7 @@ TQString K3bMovixFileViewItem::text( int col ) const case 2: { if( fileItem()->isSymLink() ) - return i18n("Link to %1").arg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " "; + return i18n("Link to %1").tqarg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " "; else return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " "; } @@ -139,7 +139,7 @@ TQString K3bMovixSubTitleViewItem::text( int c ) const case 2: { if( fileItem()->subTitleItem()->isSymLink() ) - return i18n("Link to %1").arg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment()); + return i18n("Link to %1").tqarg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment()); else return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment(); } diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 0733c70..58c6ba7 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -33,7 +33,7 @@ #include <kmessagebox.h> #include <kurl.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqlineedit.h> diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index d39b88c..2074cd2 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -188,7 +188,7 @@ void K3bMusicBrainzJob::start() m_trmThread->track = m_tracks.first(); emit infoMessage( i18n("Generating fingerprint for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_trmJob->start(); } @@ -215,7 +215,7 @@ void K3bMusicBrainzJob::slotTrmJobFinished( bool success ) // now query musicbrainz m_mbThread->setSignature( m_trmThread->signature() ); emit infoMessage( i18n("Querying MusicBrainz for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_mbJob->start(); } else { @@ -253,8 +253,8 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) if( resultStringsUnique.count() > 1 ) s = KInputDialog::getItem( i18n("MusicBrainz Query"), i18n("Found multiple matches for track %1 (%2). Please select one.") - .arg(m_tracks.current()->trackNumber()) - .arg(m_tracks.current()->firstSource()->sourceComment()), + .tqarg(m_tracks.current()->trackNumber()) + .tqarg(m_tracks.current()->firstSource()->sourceComment()), resultStringsUnique, 0, false, @@ -273,7 +273,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) // query next track if( m_tracks.next() ) { emit infoMessage( i18n("Generating fingerprint for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_trmThread->track = m_tracks.current(); m_trmJob->start(); } diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index e231ed7..66bd61a 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -31,7 +31,7 @@ #include <tqpushbutton.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvbox.h> #include <tqcheckbox.h> #include <tqtabwidget.h> @@ -199,10 +199,10 @@ void K3bProjectBurnDialog::slotStartClicked() // TQString tempDir = m_tempDirSelectionWidget->tempDirectory(); if( !TQFile::exists( tempDir ) ) { - if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( tempDir ) ) + if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( tempDir ) ) == KMessageBox::Yes ) { if( !KStandardDirs::makeDir( tempDir ) ) { - KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( tempDir ) ); + KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( tempDir ) ); return; } } @@ -269,9 +269,9 @@ void K3bProjectBurnDialog::prepareGui() m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); - m_optionGroup->layout()->setMargin(0); - m_optionGroup->layout()->setSpacing(0); - m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->layout() ); + m_optionGroup->tqlayout()->setMargin(0); + m_optionGroup->tqlayout()->setSpacing(0); + m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->tqlayout() ); m_optionGroupLayout->setMargin( KDialog::marginHint() ); m_optionGroupLayout->setSpacing( KDialog::spacingHint() ); diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 4c29b62..3f2434c 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -20,7 +20,7 @@ #include <tqradiobutton.h> #include <tqlabel.h> #include <tqlineedit.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqgrid.h> @@ -69,7 +69,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha } setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)", - m_vcdDoc->tracks() ->count() ).arg( KIO::convertSize( m_vcdDoc->size() ) ) ); + m_vcdDoc->tracks() ->count() ).tqarg( KIO::convertSize( m_vcdDoc->size() ) ) ); const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" ); if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) ) @@ -95,13 +95,13 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha // ToolTips // ------------------------------------------------------------------------- TQToolTip::add - ( m_radioVcd11, i18n( "Select Video CD type %1" ).arg( "(VCD 1.1)" ) ); + ( m_radioVcd11, i18n( "Select Video CD type %1" ).tqarg( "(VCD 1.1)" ) ); TQToolTip::add - ( m_radioVcd20, i18n( "Select Video CD type %1" ).arg( "(VCD 2.0)" ) ); + ( m_radioVcd20, i18n( "Select Video CD type %1" ).tqarg( "(VCD 2.0)" ) ); TQToolTip::add - ( m_radioSvcd10, i18n( "Select Video CD type %1" ).arg( "(SVCD 1.0)" ) ); + ( m_radioSvcd10, i18n( "Select Video CD type %1" ).tqarg( "(SVCD 1.0)" ) ); TQToolTip::add - ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).arg( "(HQ-VCD 1.0)" ) ); + ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).tqarg( "(HQ-VCD 1.0)" ) ); TQToolTip::add ( m_checkAutoDetect, i18n( "Automatic video type recognition." ) ); TQToolTip::add @@ -231,7 +231,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha ( m_editCdiCfg, i18n( "<p>Configuration parameters only available for VideoCD 2.0" "<p>The engine works perfectly well when used as-is." "<p>You have the option to configure the VCD application." - "<p>You can adapt the color and/or the shape of the cursor and lots more." ) ); + "<p>You can adapt the color and/or the tqshape of the cursor and lots more." ) ); TQWhatsThis::add @@ -307,11 +307,11 @@ void K3bVcdBurnDialog::setupAdvancedTab() // -------------------------------------------- gaps & margins group ---- m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); - m_groupGaps->layout() ->setSpacing( spacingHint() ); - m_groupGaps->layout() ->setMargin( marginHint() ); + m_groupGaps->tqlayout() ->setSpacing( spacingHint() ); + m_groupGaps->tqlayout() ->setMargin( marginHint() ); - TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->layout() ); - groupGapsLayout->setAlignment( TQt::AlignTop ); + TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() ); + groupGapsLayout->tqsetAlignment( TQt::AlignTop ); m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); @@ -403,11 +403,11 @@ void K3bVcdBurnDialog::setupAdvancedTab() // ------------------------------------------------------- misc group ---- m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); - m_groupMisc->layout() ->setSpacing( spacingHint() ); - m_groupMisc->layout() ->setMargin( marginHint() ); + m_groupMisc->tqlayout() ->setSpacing( spacingHint() ); + m_groupMisc->tqlayout() ->setMargin( marginHint() ); - TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->layout() ); - groupMiscLayout->setAlignment( TQt::AlignTop ); + TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() ); + groupMiscLayout->tqsetAlignment( TQt::AlignTop ); m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); m_spinRestriction = new TQSpinBox( m_groupMisc, "m_spinRestriction" ); @@ -451,7 +451,7 @@ void K3bVcdBurnDialog::setupVideoCdTab() m_checkNonCompliant->setEnabled( false ); m_checkNonCompliant->setChecked( false ); - m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).arg( "VCD 3.0" ), m_groupOptions ); + m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).tqarg( "VCD 3.0" ), m_groupOptions ); // Only available on SVCD Type m_checkVCD30interpretation->setEnabled( false ); m_checkVCD30interpretation->setChecked( false ); @@ -580,7 +580,7 @@ void K3bVcdBurnDialog::slotStartClicked() { if ( TQFile::exists( vcdDoc() ->vcdImage() ) ) { - if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).arg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") ) + if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).tqarg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") ) != KMessageBox::Continue ) return ; } @@ -895,7 +895,7 @@ void K3bVcdBurnDialog::saveCdiConfig() int i = m_editCdiCfg->numLines(); for ( int j = 0; j < i; j++ ) - s << TQString( "%1" ).arg( m_editCdiCfg->textLine( j ) ) << "\n"; + s << TQString( "%1" ).tqarg( m_editCdiCfg->textLine( j ) ) << "\n"; cdi.close(); diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index 19f49fb..3232384 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -198,7 +198,7 @@ void K3bVcdListView::showPropertiesDialog() TQPtrList<K3bVcdTrack> tracks = *m_doc->tracks(); K3bVcdTrackDialog d( m_doc, tracks, selected, this ); if ( d.exec() ) { - repaint(); + tqrepaint(); } } else { m_view->slotProperties(); diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 62f2137..be140f7 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -22,7 +22,7 @@ #include <tqhbox.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqmultilineedit.h> #include <tqpixmap.h> #include <tqradiobutton.h> @@ -70,7 +70,7 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& t m_displayFileName->setText( selectedTrack->fileName() ); m_displayLength->setText( selectedTrack->duration() ); m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) ); - m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) ); + m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( selectedTrack->muxrate() ) ); if ( selectedTrack->isSegment() ) m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) ); @@ -93,7 +93,7 @@ void K3bVcdTrackDialog::slotOk() void K3bVcdTrackDialog::setPbcTrack( K3bVcdTrack* selected, K3bCutComboBox* box, int which ) { // TODO: Unset Userdefined on default settings - kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).arg( box->currentItem() ).arg( m_tracks.count() ) << endl; + kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).tqarg( box->currentItem() ).tqarg( m_tracks.count() ) << endl; int count = m_tracks.count(); @@ -375,11 +375,11 @@ void K3bVcdTrackDialog::prepareGui() // FILE-INFO BOX /////////////////////////////////////////////////// TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); - groupFileInfo->layout() ->setSpacing( 0 ); - groupFileInfo->layout() ->setMargin( 0 ); + groupFileInfo->tqlayout() ->setSpacing( 0 ); + groupFileInfo->tqlayout() ->setMargin( 0 ); - TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->layout() ); - groupFileInfoLayout->setAlignment( TQt::AlignTop ); + TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() ); + groupFileInfoLayout->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) ); + m_displayFileName->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_displaySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_displayLength = new TQLabel( groupFileInfo, "m_displayLength" ); m_displayLength->setText( "0:0:0" ); - m_displayLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_displayLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" ); - m_muxrate->setText( i18n( "%1 bit/s" ).arg( 0 ) ); - m_muxrate->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) ); + m_muxrate->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); TQFrame* fileInfoLine = new TQFrame( groupFileInfo ); fileInfoLine->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); @@ -443,15 +443,15 @@ void K3bVcdTrackDialog::setupPbcTab() TQWidget * w = new TQWidget( m_mainTabbed ); TQGridLayout* grid = new TQGridLayout( w ); - grid->setAlignment( TQt::AlignTop ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); ////////////////////////////////////////////////////////////////////////////////////////// TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); - groupOptions->layout() ->setSpacing( spacingHint() ); - groupOptions->layout() ->setMargin( marginHint() ); + groupOptions->tqlayout() ->setSpacing( spacingHint() ); + groupOptions->tqlayout() ->setMargin( marginHint() ); m_check_pbc = new TQCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" ); @@ -463,11 +463,11 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); - m_groupPlay->layout() ->setSpacing( spacingHint() ); - m_groupPlay->layout() ->setMargin( marginHint() ); + m_groupPlay->tqlayout() ->setSpacing( spacingHint() ); + m_groupPlay->tqlayout() ->setMargin( marginHint() ); - TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->layout() ); - groupPlayLayout->setAlignment( TQt::AlignTop ); + TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() ); + groupPlayLayout->tqsetAlignment( TQt::AlignTop ); TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); @@ -499,11 +499,11 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); - m_groupPbc->layout() ->setSpacing( spacingHint() ); - m_groupPbc->layout() ->setMargin( marginHint() ); + m_groupPbc->tqlayout() ->setSpacing( spacingHint() ); + m_groupPbc->tqlayout() ->setMargin( marginHint() ); - TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->layout() ); - groupPbcLayout->setAlignment( TQt::AlignTop ); + TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() ); + groupPbcLayout->tqsetAlignment( 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,14 +553,14 @@ void K3bVcdTrackDialog::setupPbcKeyTab() m_widgetnumkeys = new TQWidget( m_mainTabbed ); TQGridLayout* grid = new TQGridLayout( m_widgetnumkeys ); - grid->setAlignment( TQt::AlignTop ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); m_groupKey->setEnabled( false ); - m_groupKey->layout() ->setSpacing( spacingHint() ); - m_groupKey->layout() ->setMargin( marginHint() ); + m_groupKey->tqlayout() ->setSpacing( spacingHint() ); + m_groupKey->tqlayout() ->setMargin( marginHint() ); m_list_keys = new K3bListView( m_groupKey, "m_list_keys" ); m_list_keys->setAllColumnsShowFocus( true ); @@ -590,7 +590,7 @@ void K3bVcdTrackDialog::setupAudioTab() TQWidget * w = new TQWidget( m_mainTabbed ); TQGridLayout* grid = new TQGridLayout( w ); - grid->setAlignment( TQt::AlignTop ); + grid->tqsetAlignment( 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->setAlignment( TQt::AlignTop ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); @@ -744,9 +744,9 @@ TQString K3bVcdTrackDialog::displayName( K3bVcdTrack * track ) return i18n( "ItSelf" ); if ( track->isSegment() ) - return i18n( "Segment-%1 - %2" ).arg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() ); + return i18n( "Segment-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() ); - return i18n( "Sequence-%1 - %2" ).arg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() ); + return i18n( "Sequence-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() ); } void K3bVcdTrackDialog::slotPlayTimeChanged( int value ) diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index da5ca89..2a42495 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -14,7 +14,7 @@ */ // QT-includes -#include <layout.h> +#include <tqlayout.h> #include <tqstring.h> diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp index e37fabd..c5adefb 100644 --- a/src/projects/k3bvideodvdburndialog.cpp +++ b/src/projects/k3bvideodvdburndialog.cpp @@ -32,7 +32,7 @@ #include <kio/global.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> @@ -46,7 +46,7 @@ K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *par { prepareGui(); - setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) ); + setTitle( i18n("Video DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); @@ -181,7 +181,7 @@ void K3bVideoDvdBurnDialog::slotStartClicked() if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index 46c71e5..fbd3a91 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -15,7 +15,7 @@ // include files for TQt -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -87,7 +87,7 @@ K3bView::~K3bView() void K3bView::setMainWidget( TQWidget* w ) { - static_cast<TQGridLayout*>(layout())->addMultiCellWidget( w, 1, 1, 0, 1 ); + static_cast<TQGridLayout*>(tqlayout())->addMultiCellWidget( w, 1, 1, 0, 1 ); } |