Rename old tq methods that no longer need a unique name

pull/1/head
Timothy Pearson 12 years ago
parent 650b58e8e6
commit 09c8631832

@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@ -202,7 +202,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>40</width>
<height>20</height>

@ -187,7 +187,7 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s )
}
m_httpQuery->setServer( server, port );
m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::tqfromLatin1("/~cddb/cddb.cgi") );
m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::fromLatin1("/~cddb/cddb.cgi") );
return m_httpQuery;
}

@ -35,7 +35,7 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const ch
tqlayout->setMargin( 0 );
TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame );
infoLabel->tqsetAlignment( WordBreak );
infoLabel->setAlignment( WordBreak );
m_listBox = new KListBox( frame, "list_box");

@ -186,7 +186,7 @@ bool K3bCdrecordProgram::scan( const TQString& p )
endPos = out.output().find( "\n", pos );
// cdrecord does not use local encoding for the copyright statement but plain latin1
bin->copyright = TQString::tqfromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace();
bin->copyright = TQString::fromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace();
}
else {
kdDebug() << "(K3bCdrecordProgram) could not start " << path << endl;

@ -169,7 +169,7 @@ TQString K3b::findUniqueFilePrefix( const TQString& _prefix, const TQString& pat
TQString K3b::findTempFile( const TQString& ending, const TQString& d )
{
return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::tqfromLatin1(".") + ending) );
return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::fromLatin1(".") + ending) );
}

@ -285,7 +285,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob
void setWritingApp( int w ) { m_writeMethod = w; }
signals:
void buffertqStatus( int );
void bufferStatus( int );
void deviceBuffer( int );

@ -69,7 +69,7 @@ class K3bProgressInfoEvent : public TQCustomEvent
NewTask,
NewSubTask,
DebuggingOutput,
BuffertqStatus,
BufferStatus,
WriteSpeed,
NextTrack
};

@ -76,7 +76,7 @@ K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObjec
connect( m_audioJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_audioJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_audioJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) );
connect( m_audioJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_audioJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_audioJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );

@ -148,7 +148,7 @@ bool K3bBinImageWritingJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(copyPercent(int)) );
connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(copySubPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(writerFinished(bool)) );

@ -713,7 +713,7 @@ bool K3bCdCopyJob::writeNextSession()
connect( d->cdrecordWriter, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWritingNextTrack(int, int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

@ -180,7 +180,7 @@ void K3bCloneJob::prepareWriter()
connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

@ -434,7 +434,7 @@ void K3bDvdCopyJob::prepareWriter()
connect( d->writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) );
connect( d->writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
connect( d->writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( d->writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( d->writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( d->writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

@ -424,7 +424,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) );
connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) );

@ -566,7 +566,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
return false;
return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) );
return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) );
}
@ -577,7 +577,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
return false;
return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) );
return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) );
}
#include "k3bvideodvdtitletranscodingjob.moc"

@ -70,7 +70,7 @@ bool K3bAudioCdTrackDrag::decode( const TQMimeSource* e,
K3bDevice::Toc& toc, TQValueList<int>& trackNumbers,
K3bCddbResultEntry& cddb, K3bDevice::Device** dev )
{
TQByteArray data = e->tqencodedData( "k3b/audio_track_drag" );
TQByteArray data = e->encodedData( "k3b/audio_track_drag" );
TQDataStream s( data, IO_ReadOnly );

@ -263,7 +263,7 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist )
TQTextStream t( &f );
char buf[7];
t.readRawBytes( buf, 7 );
if( TQString::tqfromLatin1( buf, 7 ) != "#EXTM3U" )
if( TQString::fromLatin1( buf, 7 ) != "#EXTM3U" )
return false;
// skip the first line

@ -568,7 +568,7 @@ bool K3bAudioJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

@ -263,7 +263,7 @@ K3b::Msf K3bDataDoc::burningLength() const
TQString K3bDataDoc::typeString() const
{
return TQString::tqfromLatin1("data");
return TQString::fromLatin1("data");
}

@ -547,7 +547,7 @@ void K3bDataJob::setWriterJob( K3bAbstractWriter* writer )
connect( m_writerJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) );

@ -65,7 +65,7 @@ void K3bGrowisofsHandler::reset( K3bDevice::Device* dev, bool dao )
void K3bGrowisofsHandler::handleStart()
{
// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBuffertqStatus()) );
// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBufferStatus()) );
}
@ -295,7 +295,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode )
}
void K3bGrowisofsHandler::slotCheckBuffertqStatus()
void K3bGrowisofsHandler::slotCheckBufferStatus()
{
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::BUFFER_CAPACITY, m_device ),
TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
@ -308,7 +308,7 @@ void K3bGrowisofsHandler::slotCheckBufferStatusDone( K3bDevice::DeviceHandler* d
{
if( dh->success() && dh->bufferCapacity() > 0 ) {
emit deviceBuffer( 100 * (dh->bufferCapacity() - dh->availableBufferCapacity() ) / dh->bufferCapacity() );
TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBuffertqStatus()) );
TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBufferStatus()) );
}
else {
kdDebug() << "(K3bGrowisofsHandler) stopping buffer check." << endl;

@ -73,7 +73,7 @@ class K3bGrowisofsHandler : public TQObject
void flushingCache();
private slots:
void slotCheckBuffertqStatus();
void slotCheckBufferStatus();
void slotCheckBufferStatusDone( K3bDevice::DeviceHandler* );
private:

@ -60,7 +60,7 @@ bool K3bInfFileWriter::save( TQTextStream& s )
// ----------------------
// header
s << "# Cdrecord-Inf-File written by K3b " << k3bcore->version()
<< ", " << TQDateTime::tqcurrentDateTime().toString() << endl
<< ", " << TQDateTime::currentDateTime().toString() << endl
<< "#" << endl;
s << "ISRC=\t\t" << m_isrc << endl;

@ -157,7 +157,7 @@ void K3bTocFileWriter::writeHeader( TQTextStream& t )
{
// little comment
t << "// TOC-file to use with cdrdao created by K3b " << k3bcore->version()
<< ", " << TQDateTime::tqcurrentDateTime().toString() << endl << endl;
<< ", " << TQDateTime::currentDateTime().toString() << endl << endl;
t << "// " << m_toc.count() << " tracks" << endl;
if( m_toc.back().session() > 0 ) {

@ -696,7 +696,7 @@ bool K3bMixedJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

@ -39,7 +39,7 @@ K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* parent
connect( m_dataJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_dataJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_dataJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
connect( m_dataJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_dataJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_dataJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_dataJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_dataJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );

@ -39,7 +39,7 @@ K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject
connect( m_dvdJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_dvdJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_dvdJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
connect( m_dvdJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
connect( m_dvdJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_dvdJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_dvdJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
connect( m_dvdJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );

@ -438,7 +438,7 @@ bool K3bVcdJob::prepareWriterJob()
connect( m_writerJob, TQT_SIGNAL( subPercent( int ) ), this, TQT_SIGNAL( subPercent( int ) ) );
connect( m_writerJob, TQT_SIGNAL( processedSubSize( int, int ) ), this, TQT_SIGNAL( processedSubSize( int, int ) ) );
connect( m_writerJob, TQT_SIGNAL( nextTrack( int, int ) ), this, TQT_SLOT( slotWriterNextTrack( int, int ) ) );
connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( buffertqStatus( int ) ) );
connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( bufferStatus( int ) ) );
connect( m_writerJob, TQT_SIGNAL( deviceBuffer( int ) ), this, TQT_SIGNAL( deviceBuffer( int ) ) );
connect( m_writerJob, TQT_SIGNAL( writeSpeed( int, int ) ), this, TQT_SIGNAL( writeSpeed( int, int ) ) );
connect( m_writerJob, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotWriterJobFinished( bool ) ) );

@ -68,13 +68,13 @@ void K3bBusyWidget::animateBusy()
}
TQSize K3bBusyWidget::tqsizeHint() const
TQSize K3bBusyWidget::sizeHint() const
{
return tqminimumSizeHint();
return minimumSizeHint();
}
TQSize K3bBusyWidget::tqminimumSizeHint() const
TQSize K3bBusyWidget::minimumSizeHint() const
{
return TQSize( 2*frameWidth() + 62, 10 );
}

@ -35,8 +35,8 @@ class LIBK3B_EXPORT K3bBusyWidget : public TQFrame
void showBusy( bool b );
TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const;
TQSize sizeHint() const;
TQSize minimumSizeHint() const;
protected:
void drawContents( TQPainter* p );

@ -122,7 +122,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib
*/
int status() const;
enum tqStatus {
enum Status {
S_OK,
S_ERROR
// to be extended with Jitter and stuff...

@ -45,7 +45,7 @@ K3bCutComboBox::K3bCutComboBox( TQWidget* parent, const char* name )
: KComboBox( parent, name )
{
d = new Private();
// tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() );
// setSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() );
}
@ -70,9 +70,9 @@ void K3bCutComboBox::setMethod( int m )
}
TQSize K3bCutComboBox::tqsizeHint() const
TQSize K3bCutComboBox::sizeHint() const
{
// TQSize s(KComboBox::tqsizeHint());
// TQSize s(KComboBox::sizeHint());
// for( int i = 0; i < count(); i++ ) {
// int w = fontMetrics().width(d->originalItems[i]) +
@ -81,12 +81,12 @@ TQSize K3bCutComboBox::tqsizeHint() const
// s.setWidth( w );
// }
return KComboBox::tqsizeHint();
return KComboBox::sizeHint();
}
TQSize K3bCutComboBox::tqminimumSizeHint() const
TQSize K3bCutComboBox::minimumSizeHint() const
{
return KComboBox::tqminimumSizeHint();
return KComboBox::minimumSizeHint();
}
@ -205,7 +205,7 @@ void K3bCutComboBox::resizeEvent( TQResizeEvent* e )
void K3bCutComboBox::cutText()
{
d->width = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this,
d->width = TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField), this ).width();
for( int i = 0; i < (int)d->originalItems.count(); ++i ) {

@ -54,10 +54,10 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox
void setMethod( int );
/** reimplemeted */
TQSize tqsizeHint() const;
TQSize sizeHint() const;
/** reimplemeted */
TQSize tqminimumSizeHint() const;
TQSize minimumSizeHint() const;
/** reimplemeted */
virtual void setCurrentText( const TQString& );

@ -448,8 +448,8 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i
// some styles use the widget's tqgeometry
s_dummyProgressBar->setGeometry( r );
listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
// now we really paint the progress in the listview
p->drawPixmap( 0, 0, *doubleBuffer );
@ -508,7 +508,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i
if( col == 0 ) {
if( m_checked ) {
TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
TQStyle::SFlags flags = TQStyle::Style_Default;
if( listView()->isEnabled() )
@ -666,7 +666,7 @@ void K3bListView::showEditor( K3bListViewItem* item, int col )
void K3bListView::placeEditor( K3bListViewItem* item, int col )
{
ensureItemVisible( item );
TQRect r = tqitemRect( item );
TQRect r = itemRect( item );
r.setX( contentsToViewport( TQPoint(header()->sectionPos( col ), 0) ).x() );
r.setWidth( header()->sectionSize( col ) - 1 );
@ -699,7 +699,7 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col )
if( TQWidget* editor = prepareEditor( item, col ) ) {
editor->resize( r.size() );
// editor->resize( TQSize( r.width(), editor->tqminimumSizeHint().height() ) );
// editor->resize( TQSize( r.width(), editor->minimumSizeHint().height() ) );
moveChild( editor, r.x(), r.y() );
}
}
@ -1143,7 +1143,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) {
// make sure we did not lose the focus to one of the edit widgets' tqchildren
if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
if( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
doRename();
hideEditor();
}
@ -1170,7 +1170,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e )
TQPixmap bgPix( size );
// FIXME: let the user specify the color
bgPix.fill( tqcolorGroup().base() );
bgPix.fill( colorGroup().base() );
if( bgPix.width() < m_backgroundPixmap.width() ||
bgPix.height() < m_backgroundPixmap.height() ) {
@ -1227,7 +1227,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
int width = header()->width();
int height = 0;
for( TQPtrListIterator<TQListViewItem> it( items ); *it; ++it ) {
TQRect r = tqitemRect( *it );
TQRect r = itemRect( *it );
if( r.isValid() ) {
height += ( *it )->height();
@ -1256,13 +1256,13 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
// FIXME: items on other than the top level have a smaller first column
// the same goes for all items if root is decorated
bool alreadyDrawing = false;
TQRect r = tqitemRect( item );
TQRect r = itemRect( item );
if( r.isValid() ) {
if( items.containsRef( item ) ) {
// paint all columns
int x = 0;
for( int i = 0; i < columns(); ++i ) {
item->paintCell( &p, tqcolorGroup(), i, columnWidth( i ), columnAlignment( i ) );
item->paintCell( &p, colorGroup(), i, columnWidth( i ), columnAlignment( i ) );
p.translate( columnWidth( i ), 0 );
x += columnWidth( i );
}
@ -1274,7 +1274,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
else if( alreadyDrawing )
p.translate( 0, item->height() );
if( p.tqworldMatrix().dy() >= pix.height() )
if( p.worldMatrix().dy() >= pix.height() )
break;
}
}

@ -80,7 +80,7 @@ void K3bListViewItemAnimator::setItem( TQListViewItem* item, int col )
m_item = item;
m_column = col;
m_pixmap = *item->pixmap(col);
m_fadeColor = item->listView()->tqcolorGroup().base();
m_fadeColor = item->listView()->colorGroup().base();
start();
}

@ -50,16 +50,16 @@ K3bMsfEdit::~K3bMsfEdit()
{}
TQSize K3bMsfEdit::tqsizeHint() const
TQSize K3bMsfEdit::sizeHint() const
{
// more or less copied from TQSpinBox
constPolish();
TQSize sz = editor()->tqsizeHint();
TQSize sz = editor()->sizeHint();
int h = sz.height();
TQFontMetrics fm( font() );
int w = fm.width( "00:00:00" );
int wx = fm.width( ' ' )*2;
int frame = tqstyle().tqpixelMetric( TQStyle::PM_SpinBoxFrameWidth );
int frame = tqstyle().pixelMetric( TQStyle::PM_SpinBoxFrameWidth );
return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this,
TQSize( w + wx + downRect().width() + frame*2,
h + frame*2).

@ -41,7 +41,7 @@ class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox
K3bMsfEdit( TQWidget* parent = 0, const char* name = 0 );
~K3bMsfEdit();
TQSize tqsizeHint() const;
TQSize sizeHint() const;
void setFrameStyle( int style );
void setLineWidth(int);

@ -125,10 +125,10 @@ void K3bPushButton::slotDelayedPopup()
if( isDown() ) {
// popup the menu.
// this has been taken from the TQPushButton code
if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->tqsizeHint().height() <= tqApp->desktop()->height() )
if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->sizeHint().height() <= tqApp->desktop()->height() )
popup()->exec( mapToGlobal( rect().bottomLeft() ) );
else
popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->tqsizeHint().height() ) ) );
popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->sizeHint().height() ) ) );
setDown( false );
}
}

@ -38,14 +38,14 @@ static TQString qrichtextify( const TQString& text )
K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
tqsetAlignment( TQt::WordBreak );
setAlignment( TQt::WordBreak );
setText(text);
}
K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
tqsetAlignment( TQt::WordBreak );
setAlignment( TQt::WordBreak );
}
void K3bRichTextLabel::setDefaultWidth(int defaultWidth)
@ -59,7 +59,7 @@ TQSizePolicy K3bRichTextLabel::sizePolicy() const
return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
}
TQSize K3bRichTextLabel::tqminimumSizeHint() const
TQSize K3bRichTextLabel::minimumSizeHint() const
{
TQString qt_text = qrichtextify( text() );
int pref_width = 0;
@ -94,9 +94,9 @@ TQSize K3bRichTextLabel::tqminimumSizeHint() const
return TQSize(pref_width, rt.height());
}
TQSize K3bRichTextLabel::tqsizeHint() const
TQSize K3bRichTextLabel::sizeHint() const
{
return tqminimumSizeHint();
return minimumSizeHint();
}
void K3bRichTextLabel::setText( const TQString &text ) {

@ -43,8 +43,8 @@ public:
int defaultWidth() const { return m_defaultWidth; }
void setDefaultWidth(int defaultWidth);
virtual TQSize tqminimumSizeHint() const;
virtual TQSize tqsizeHint() const;
virtual TQSize minimumSizeHint() const;
virtual TQSize sizeHint() const;
TQSizePolicy sizePolicy() const;
public slots:

@ -126,19 +126,19 @@ void K3bTitleLabel::setSubTitle( const TQString& subTitle )
}
void K3bTitleLabel::tqsetAlignment( int align )
void K3bTitleLabel::setAlignment( int align )
{
d->tqalignment = align;
update();
}
TQSize K3bTitleLabel::tqsizeHint() const
TQSize K3bTitleLabel::sizeHint() const
{
return TQSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine );
}
TQSize K3bTitleLabel::tqminimumSizeHint() const
TQSize K3bTitleLabel::minimumSizeHint() const
{
return TQSize( d->cachedMinimumWidth, d->titleBaseLine );
}

@ -32,8 +32,8 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
K3bTitleLabel( TQWidget* parent = 0, const char* name = 0 );
~K3bTitleLabel();
TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const;
TQSize sizeHint() const;
TQSize minimumSizeHint() const;
public slots:
/**
@ -50,7 +50,7 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
* Default tqalignment is left.
*/
// FIXME: honor right-to-left languages
void tqsetAlignment( int align );
void setAlignment( int align );
protected:
void resizeEvent( TQResizeEvent* );

@ -44,7 +44,7 @@ class K3bToolBoxSeparator : public TQWidget
public:
K3bToolBoxSeparator( K3bToolBox* parent );
TQSize tqsizeHint() const;
TQSize sizeHint() const;
protected:
void paintEvent( TQPaintEvent * );
@ -54,13 +54,13 @@ class K3bToolBoxSeparator : public TQWidget
K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent )
: TQWidget( parent )
{
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
}
TQSize K3bToolBoxSeparator::tqsizeHint() const
TQSize K3bToolBoxSeparator::sizeHint() const
{
int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
return TQSize( extent, 0 );
}
@ -72,7 +72,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* )
TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
tqcolorGroup(), flags );
colorGroup(), flags );
}
@ -81,7 +81,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent )
: TQToolButton( parent ),
m_popupMenu(0)
{
tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) );
setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) );
setAutoRaise( true );
setIconSet( action->iconSet() );
@ -127,7 +127,7 @@ K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon,
: TQToolButton( parent ),
m_popupMenu(0)
{
tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) );
setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) );
setAutoRaise( true );
setTextLabel( text );
@ -171,7 +171,7 @@ void K3bToolBoxButton::resizeEvent( TQResizeEvent* e )
K3bToolBox::K3bToolBox( TQWidget* parent, const char* name )
: TQFrame( parent, name )
{
tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) );
setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) );
m_mainLayout = new TQGridLayout( this );
m_mainLayout->setMargin( 1 );
@ -243,7 +243,7 @@ void K3bToolBox::addStretch()
void K3bToolBox::addLabel( const TQString& text )
{
TQLabel* label = new TQLabel( text, this );
label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
label->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
addWidget( label );
}
@ -257,7 +257,7 @@ void K3bToolBox::addWidget( TQWidget* w )
m_mainLayout->addWidget( w, 0, m_mainLayout->numCols()-1 );
if( w->tqsizePolicy().horData() == TQSizePolicy::Fixed || w->tqsizePolicy().horData() == TQSizePolicy::Maximum )
if( w->sizePolicy().horData() == TQSizePolicy::Fixed || w->sizePolicy().horData() == TQSizePolicy::Maximum )
m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 );
else {
m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 1 );

@ -69,7 +69,7 @@ void K3bToolButton::drawButton( TQPainter* p )
arrowFlags |= TQStyle::Style_Enabled;
tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(),
TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
}

@ -27,7 +27,7 @@ KCutLabel::KCutLabel( const TQString &text , TQWidget *parent, const char *name
: TQLabel ( parent, name ),
m_minChars(1) {
TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
tqsetSizePolicy(myLabelSizePolicy);
setSizePolicy(myLabelSizePolicy);
m_fullText = text;
cutTextToLabel();
}
@ -36,12 +36,12 @@ KCutLabel::KCutLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ),
m_minChars(1) {
TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
tqsetSizePolicy(myLabelSizePolicy);
setSizePolicy(myLabelSizePolicy);
}
TQSize KCutLabel::tqminimumSizeHint() const
TQSize KCutLabel::minimumSizeHint() const
{
TQSize sh = TQLabel::tqminimumSizeHint();
TQSize sh = TQLabel::minimumSizeHint();
if( m_minChars == 0 )
sh.setWidth(-1);
else if( m_minChars < (int)m_fullText.length() )

@ -36,7 +36,7 @@ class LIBK3B_EXPORT KCutLabel : public TQLabel
KCutLabel( TQWidget *parent = 0, const char *name = 0);
KCutLabel( const TQString &text, TQWidget *parent = 0, const char *name = 0 );
virtual TQSize tqminimumSizeHint() const;
virtual TQSize minimumSizeHint() const;
/**
* \return the full text while text() returns the cut text

@ -77,7 +77,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
DVDClose( dvdReaderT );
return false;
}
m_volumeIdentifier = TQString::tqfromLatin1( v, 32 );
m_volumeIdentifier = TQString::fromLatin1( v, 32 );
//
// Open the VMG info

@ -202,9 +202,9 @@ void K3bDevice::CdText::setRawPackData( const unsigned char* data, int len )
char* nextNullPos = (char*)::memchr( nullPos+1, '\0', 11 - (nullPos - (char*)pack[i].data) );
TQString txtstr;
if( nextNullPos ) // take all chars up to the next null
txtstr = TQString::tqfromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 );
txtstr = TQString::fromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 );
else // take all chars to the end of the pack data (12 bytes)
txtstr = TQString::tqfromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) );
txtstr = TQString::fromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) );
//
// a tab character means to use the same as for the previous track

@ -240,9 +240,9 @@ bool K3bDevice::Device::init( bool bCheckWritingModes )
return false;
}
else {
m_vendor = TQString::tqfromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace();
m_description = TQString::tqfromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace();
m_version = TQString::tqfromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace();
m_vendor = TQString::fromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace();
m_description = TQString::fromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace();
m_version = TQString::fromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace();
}
if( m_vendor.isEmpty() )

@ -558,7 +558,7 @@ namespace K3bDevice
* if true is returned dataLen specifies the actual length of *data which needs to be
* deleted after using.
*/
bool mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const;
bool mechanismStatus( unsigned char** data, unsigned int& dataLen ) const;
/**
* Read a single feature.

@ -626,7 +626,7 @@ bool K3bDevice::Device::readTocPmaAtip( unsigned char** data, unsigned int& data
}
bool K3bDevice::Device::mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const
bool K3bDevice::Device::mechanismStatus( unsigned char** data, unsigned int& dataLen ) const
{
unsigned char header[2048];
::memset( header, 0, 2048 );

@ -896,7 +896,7 @@ TQString K3bDevice::DeviceManager::resolveSymLink( const TQString& path )
return path;
}
return TQString::tqfromLatin1( resolved );
return TQString::fromLatin1( resolved );
}

@ -214,7 +214,7 @@ namespace K3bDevice
/**
* Based on the cdrecord struct cd_mode_page_2A
* MM Capabilities and Mechanical tqStatus Page
* MM Capabilities and Mechanical Status Page
*/
#ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN

@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>71</width>
<height>20</height>

@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -259,7 +259,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>5</height>

@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>

@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@ -219,7 +219,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>250</width>
<height>16</height>

@ -181,8 +181,8 @@ K3bMainWindow::K3bMainWindow()
// FIXME: now make sure the welcome screen is displayed completely
resize( 780, 550 );
// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->tqsizeHint() ) );
// m_dirTreeDock->resize( TQSize( m_dirTreeDock->tqsizeHint().width(), m_dirTreeDock->height() ) );
// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->sizeHint() ) );
// m_dirTreeDock->resize( TQSize( m_dirTreeDock->sizeHint().width(), m_dirTreeDock->height() ) );