TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename old tq methods that no longer need a unique name

Browse Source 
(cherry picked from commit 09c8631832)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 6abafdc300
commit be2dabe850
121 changed files with 269 additions and 269 deletions
Show Stats Download Patch File Download Diff File

4
k3bsetup/base_k3bsetup2.ui
Unescape View File

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

2
libk3b/cddb/k3bcddb.cpp
Unescape View File

@ -187,7 +187,7 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s )
} }
m_httpQuery->setServer( server, port ); 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; return m_httpQuery;
} }

2
libk3b/cddb/k3bcddbmultientriesdialog.cpp
Unescape View File

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

2
libk3b/core/k3bdefaultexternalprograms.cpp
Unescape View File

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

2
libk3b/core/k3bglobals.cpp
Unescape View File

@ -169,7 +169,7 @@ TQString K3b::findUniqueFilePrefix( const TQString& _prefix, const TQString& pat
TQString K3b::findTempFile( const TQString& ending, const TQString& d ) 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) );
} }

2
libk3b/core/k3bjob.h
Unescape View File

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

2
libk3b/core/k3bprogressinfoevent.h
Unescape View File

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

2
libk3b/jobs/k3baudiocuefilewritingjob.cpp
Unescape View File

@ -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(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(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(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(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );

2
libk3b/jobs/k3bbinimagewritingjob.cpp
Unescape View File

@ -148,7 +148,7 @@ bool K3bBinImageWritingJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(copyPercent(int)) ); 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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(writerFinished(bool)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(writerFinished(bool)) );

2
libk3b/jobs/k3bcdcopyjob.cpp
Unescape View File

@ -713,7 +713,7 @@ bool K3bCdCopyJob::writeNextSession()
connect( d->cdrecordWriter, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); 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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); connect( d->cdrecordWriter, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

2
libk3b/jobs/k3bclonejob.cpp
Unescape View File

@ -180,7 +180,7 @@ void K3bCloneJob::prepareWriter()
connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); 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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

2
libk3b/jobs/k3bdvdcopyjob.cpp
Unescape View File

@ -434,7 +434,7 @@ void K3bDvdCopyJob::prepareWriter()
connect( d->writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) ); 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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( d->writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); connect( d->writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

2
libk3b/jobs/k3biso9660imagewritingjob.cpp
Unescape View File

@ -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(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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) );

4
libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
Unescape View File

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

2
libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
Unescape View File

@ -70,7 +70,7 @@ bool K3bAudioCdTrackDrag::decode( const TQMimeSource* e,
K3bDevice::Toc& toc, TQValueList<int>& trackNumbers, K3bDevice::Toc& toc, TQValueList<int>& trackNumbers,
K3bCddbResultEntry& cddb, K3bDevice::Device** dev ) 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 ); TQDataStream s( data, IO_ReadOnly );

2
libk3b/projects/audiocd/k3baudiodoc.cpp
Unescape View File

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

2
libk3b/projects/audiocd/k3baudiojob.cpp
Unescape View File

@ -568,7 +568,7 @@ bool K3bAudioJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); 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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

2
libk3b/projects/datacd/k3bdatadoc.cpp
Unescape View File

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

2
libk3b/projects/datacd/k3bdatajob.cpp
Unescape View File

@ -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(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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) ); connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) );

6
libk3b/projects/k3bgrowisofshandler.cpp
Unescape View File

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

2
libk3b/projects/k3bgrowisofshandler.h
Unescape View File

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

2
libk3b/projects/k3binffilewriter.cpp
Unescape View File

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

2
libk3b/projects/k3btocfilewriter.cpp
Unescape View File

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

2
libk3b/projects/mixedcd/k3bmixedjob.cpp
Unescape View File

@ -696,7 +696,7 @@ bool K3bMixedJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); 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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );

2
libk3b/projects/movixcd/k3bmovixjob.cpp
Unescape View File

@ -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(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(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(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(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(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_dataJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); connect( m_dataJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );

2
libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
Unescape View File

@ -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(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(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(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(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(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
connect( m_dvdJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); connect( m_dvdJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );

2
libk3b/projects/videocd/k3bvcdjob.cpp
Unescape View File

@ -438,7 +438,7 @@ bool K3bVcdJob::prepareWriterJob()
connect( m_writerJob, TQT_SIGNAL( subPercent( int ) ), this, TQT_SIGNAL( subPercent( int ) ) ); 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( 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( 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( 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( writeSpeed( int, int ) ), this, TQT_SIGNAL( writeSpeed( int, int ) ) );
connect( m_writerJob, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotWriterJobFinished( bool ) ) ); connect( m_writerJob, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotWriterJobFinished( bool ) ) );

6
libk3b/tools/k3bbusywidget.cpp
Unescape View File

@ -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 ); return TQSize( 2*frameWidth() + 62, 10 );
} }

4
libk3b/tools/k3bbusywidget.h
Unescape View File

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

2
libk3b/tools/k3bcdparanoialib.h
Unescape View File

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

14
libk3b/tools/k3bcutcombobox.cpp
Unescape View File

@ -45,7 +45,7 @@ K3bCutComboBox::K3bCutComboBox( TQWidget* parent, const char* name )
: KComboBox( parent, name ) : KComboBox( parent, name )
{ {
d = new Private(); 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++ ) { // for( int i = 0; i < count(); i++ ) {
// int w = fontMetrics().width(d->originalItems[i]) + // int w = fontMetrics().width(d->originalItems[i]) +
@ -81,12 +81,12 @@ TQSize K3bCutComboBox::tqsizeHint() const
// s.setWidth( w ); // 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() 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(); TQStyle::SC_ComboBoxEditField), this ).width();
for( int i = 0; i < (int)d->originalItems.count(); ++i ) { for( int i = 0; i < (int)d->originalItems.count(); ++i ) {

4
libk3b/tools/k3bcutcombobox.h
Unescape View File

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

22
libk3b/tools/k3blistview.cpp
Unescape View File

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

2
libk3b/tools/k3blistviewitemanimator.cpp
Unescape View File

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

6
libk3b/tools/k3bmsfedit.cpp
Unescape View File

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

2
libk3b/tools/k3bmsfedit.h
Unescape View File

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

4
libk3b/tools/k3bpushbutton.cpp
Unescape View File

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

10
libk3b/tools/k3brichtextlabel.cpp
Unescape View File

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

4
libk3b/tools/k3brichtextlabel.h
Unescape View File

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

6
libk3b/tools/k3btitlelabel.cpp
Unescape View File

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

6
libk3b/tools/k3btitlelabel.h
Unescape View File

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

20
libk3b/tools/k3btoolbox.cpp
Unescape View File

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

2
libk3b/tools/k3btoolbutton.cpp
Unescape View File

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

8
libk3b/tools/kcutlabel.cpp
Unescape View File

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

2
libk3b/tools/kcutlabel.h
Unescape View File

@ -36,7 +36,7 @@ class LIBK3B_EXPORT KCutLabel : public TQLabel
KCutLabel( TQWidget *parent = 0, const char *name = 0); KCutLabel( TQWidget *parent = 0, const char *name = 0);
KCutLabel( const TQString &text, 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 * \return the full text while text() returns the cut text

2
libk3b/videodvd/k3bvideodvd.cpp
Unescape View File

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

4
libk3bdevice/k3bcdtext.cpp
Unescape View File

@ -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) ); char* nextNullPos = (char*)::memchr( nullPos+1, '\0', 11 - (nullPos - (char*)pack[i].data) );
TQString txtstr; TQString txtstr;
if( nextNullPos ) // take all chars up to the next null 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) 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 // a tab character means to use the same as for the previous track

6
libk3bdevice/k3bdevice.cpp
Unescape View File

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

2
libk3bdevice/k3bdevice.h
Unescape View File

@ -558,7 +558,7 @@ namespace K3bDevice
* if true is returned dataLen specifies the actual length of *data which needs to be * if true is returned dataLen specifies the actual length of *data which needs to be
* deleted after using. * 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. * Read a single feature.

2
libk3bdevice/k3bdevice_mmc.cpp
Unescape View File

@ -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]; unsigned char header[2048];
::memset( header, 0, 2048 ); ::memset( header, 0, 2048 );

2
libk3bdevice/k3bdevicemanager.cpp
Unescape View File

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

2
libk3bdevice/k3bmmc.h
Unescape View File

@ -214,7 +214,7 @@ namespace K3bDevice
/** /**
* Based on the cdrecord struct cd_mode_page_2A * 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 #ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN

2
plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui vendored
Unescape View File

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

6
plugins/encoder/lame/base_k3blameencodersettingswidget.ui
Unescape View File

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

4
plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
Unescape View File

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

6
plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
Unescape View File

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

4
plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui
Unescape View File

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

16
src/k3b.cpp
Unescape View File

@ -181,8 +181,8 @@ K3bMainWindow::K3bMainWindow()
// FIXME: now make sure the welcome screen is displayed completely // FIXME: now make sure the welcome screen is displayed completely
resize( 780, 550 ); resize( 780, 550 );
// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->tqsizeHint() ) ); // getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->sizeHint() ) );
// m_dirTreeDock->resize( TQSize( m_dirTreeDock->tqsizeHint().width(), m_dirTreeDock->height() ) ); // m_dirTreeDock->resize( TQSize( m_dirTreeDock->sizeHint().width(), m_dirTreeDock->height() ) );
readOptions(); readOptions();
} }
@ -198,7 +198,7 @@ K3bMainWindow::~K3bMainWindow()
void K3bMainWindow::showEvent( TQShowEvent* e ) void K3bMainWindow::showEvent( TQShowEvent* e )
{ {
slotCheckDockWidgettqStatus(); slotCheckDockWidgetStatus();
KDockMainWindow::showEvent( e ); KDockMainWindow::showEvent( e );
} }
@ -398,7 +398,7 @@ void K3bMainWindow::initView()
m_documentHeader = new K3bThemedHeader( d->documentHull ); m_documentHeader = new K3bThemedHeader( d->documentHull );
m_documentHeader->setTitle( i18n("Current Projects") ); m_documentHeader->setTitle( i18n("Current Projects") );
m_documentHeader->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); m_documentHeader->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_documentHeader->setLeftPixmap( K3bTheme::PROJECT_LEFT ); m_documentHeader->setLeftPixmap( K3bTheme::PROJECT_LEFT );
m_documentHeader->setRightPixmap( K3bTheme::PROJECT_RIGHT ); m_documentHeader->setRightPixmap( K3bTheme::PROJECT_RIGHT );
@ -609,7 +609,7 @@ void K3bMainWindow::readOptions()
m_dirView->readConfig( config() ); m_dirView->readConfig( config() );
slotViewDocumentHeader(); slotViewDocumentHeader();
slotCheckDockWidgettqStatus(); slotCheckDockWidgetStatus();
} }
@ -1364,14 +1364,14 @@ void K3bMainWindow::slotDvdCopy()
void K3bMainWindow::slotShowDirTreeView() void K3bMainWindow::slotShowDirTreeView()
{ {
m_dirTreeDock->changeHideShowState(); m_dirTreeDock->changeHideShowState();
slotCheckDockWidgettqStatus(); slotCheckDockWidgetStatus();
} }
void K3bMainWindow::slotShowContentsView() void K3bMainWindow::slotShowContentsView()
{ {
m_contentsDock->changeHideShowState(); m_contentsDock->changeHideShowState();
slotCheckDockWidgettqStatus(); slotCheckDockWidgetStatus();
} }
@ -1402,7 +1402,7 @@ void K3bMainWindow::slotContentsDockHidden()
} }
void K3bMainWindow::slotCheckDockWidgettqStatus() void K3bMainWindow::slotCheckDockWidgetStatus()
{ {
actionViewContentsView->setChecked( m_contentsDock->isVisible() ); actionViewContentsView->setChecked( m_contentsDock->isVisible() );
actionViewDirTreeView->setChecked( m_dirTreeDock->isVisible() ); actionViewDirTreeView->setChecked( m_dirTreeDock->isVisible() );

2
src/k3b.h
Unescape View File

@ -215,7 +215,7 @@ class K3bMainWindow : public KParts::DockMainWindow
void slotViewDocumentHeader(); void slotViewDocumentHeader();
void slotCheckDockWidgettqStatus(); void slotCheckDockWidgetStatus();
/** changes the statusbar contents for the standard label permanently, used to indicate current actions. /** changes the statusbar contents for the standard label permanently, used to indicate current actions.
* @param text the text that is displayed in the statusbar * @param text the text that is displayed in the statusbar

4
src/k3baudioplayer.cpp
Unescape View File

@ -169,8 +169,8 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
m_viewPlayList = new K3bPlayListView( this ); m_viewPlayList = new K3bPlayListView( this );
m_labelOverallTime->tqsetAlignment( AlignHCenter | AlignVCenter ); m_labelOverallTime->setAlignment( AlignHCenter | AlignVCenter );
m_labelCurrentTime->tqsetAlignment( AlignHCenter | AlignVCenter ); m_labelCurrentTime->setAlignment( AlignHCenter | AlignVCenter );
m_labelOverallTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain ); m_labelOverallTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );
m_labelCurrentTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain ); m_labelCurrentTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );
m_labelFilename->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain ); m_labelFilename->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );

6
src/k3bburnprogressdialog.cpp
Unescape View File

@ -38,7 +38,7 @@ K3bBurnProgressDialog::K3bBurnProgressDialog( TQWidget *parent, const char *name
: K3bJobProgressDialog(parent,name, showSubProgress, modal, wf) : K3bJobProgressDialog(parent,name, showSubProgress, modal, wf)
{ {
m_labelWritingSpeed = new TQLabel( m_frameExtraInfo, "m_labelWritingSpeed" ); m_labelWritingSpeed = new TQLabel( m_frameExtraInfo, "m_labelWritingSpeed" );
// m_labelWritingSpeed->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); // m_labelWritingSpeed->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_frameExtraInfoLayout->addWidget( m_labelWritingSpeed, 2, 0 ); m_frameExtraInfoLayout->addWidget( m_labelWritingSpeed, 2, 0 );
m_frameExtraInfoLayout->addWidget( new TQLabel( i18n("Estimated writing speed:"), m_frameExtraInfo ), 1, 0 ); m_frameExtraInfoLayout->addWidget( new TQLabel( i18n("Estimated writing speed:"), m_frameExtraInfo ), 1, 0 );
@ -83,7 +83,7 @@ void K3bBurnProgressDialog::setBurnJob( K3bBurnJob* burnJob )
K3bJobProgressDialog::setJob(burnJob); K3bJobProgressDialog::setJob(burnJob);
if( burnJob ) { if( burnJob ) {
connect( burnJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SLOT(slotBuffertqStatus(int)) ); connect( burnJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SLOT(slotBufferStatus(int)) );
connect( burnJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) ); connect( burnJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) );
connect( burnJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SLOT(slotWriteSpeed(int, int)) ); connect( burnJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SLOT(slotWriteSpeed(int, int)) );
connect( burnJob, TQT_SIGNAL(burning(bool)), m_progressWritingBuffer, TQT_SLOT(setEnabled(bool)) ); connect( burnJob, TQT_SIGNAL(burning(bool)), m_progressWritingBuffer, TQT_SLOT(setEnabled(bool)) );
@ -112,7 +112,7 @@ void K3bBurnProgressDialog::slotFinished( bool success )
} }
void K3bBurnProgressDialog::slotBuffertqStatus( int b ) void K3bBurnProgressDialog::slotBufferStatus( int b )
{ {
m_progressWritingBuffer->setFormat( "%p%" ); m_progressWritingBuffer->setFormat( "%p%" );
m_progressWritingBuffer->setValue( b ); m_progressWritingBuffer->setValue( b );

2
src/k3bburnprogressdialog.h
Unescape View File

@ -42,7 +42,7 @@ class K3bBurnProgressDialog : public K3bJobProgressDialog {
protected slots: protected slots:
void slotWriteSpeed( int, int ); void slotWriteSpeed( int, int );
void slotBuffertqStatus( int ); void slotBufferStatus( int );
void slotDeviceBuffer( int ); void slotDeviceBuffer( int );
void slotFinished(bool); void slotFinished(bool);

2
src/k3bdiskinfoview.cpp
Unescape View File

@ -350,7 +350,7 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
if( info.isDvdMedia() ) if( info.isDvdMedia() )
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new KListViewItem( atipItem, atipChild,
i18n("Media ID:"), i18n("Media ID:"),
!info.mediaId().isEmpty() ? TQString::tqfromLatin1( info.mediaId() ) : i18n("unknown") ); !info.mediaId().isEmpty() ? TQString::fromLatin1( info.mediaId() ) : i18n("unknown") );
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new KListViewItem( atipItem, atipChild,

4
src/k3bemptydiscwaiter.cpp
Unescape View File

@ -95,10 +95,10 @@ K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* par
// setup the gui // setup the gui
// ----------------------------- // -----------------------------
d->labelRequest = new TQLabel( plainPage() ); d->labelRequest = new TQLabel( plainPage() );
d->labelRequest->tqsetAlignment( TQt::AlignLeft | TQt::AlignVCenter ); d->labelRequest->setAlignment( TQt::AlignLeft | TQt::AlignVCenter );
d->labelFoundMedia = new TQLabel( plainPage() ); d->labelFoundMedia = new TQLabel( plainPage() );
d->pixLabel = new TQLabel( plainPage() ); d->pixLabel = new TQLabel( plainPage() );
d->pixLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop ); d->pixLabel->setAlignment( TQt::AlignHCenter | TQt::AlignTop );
TQFont f( d->labelFoundMedia->font() ); TQFont f( d->labelFoundMedia->font() );
f.setBold(true); f.setBold(true);

16
src/k3bfiletreecombobox.cpp
Unescape View File

@ -154,8 +154,8 @@ void K3bFileTreeComboBox::popup()
// code mainly from qcombobox.cpp // code mainly from qcombobox.cpp
m_fileTreeView->triggerUpdate(); m_fileTreeView->triggerUpdate();
int w = TQMAX( m_fileTreeView->tqsizeHint().width(), width() ); int w = TQMAX( m_fileTreeView->sizeHint().width(), width() );
int h = m_fileTreeView->tqsizeHint().height(); int h = m_fileTreeView->sizeHint().height();
TQRect screen = TQApplication::desktop()->availableGeometry( this ); TQRect screen = TQApplication::desktop()->availableGeometry( this );
int sx = screen.x(); // screen pos int sx = screen.x(); // screen pos
int sy = screen.y(); int sy = screen.y();
@ -276,7 +276,7 @@ bool K3bFileTreeComboBox::eventFilter( TQObject* o, TQEvent* e )
if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).contains( me->pos() ) ) { if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).contains( me->pos() ) ) {
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow); TQStyle::SC_ComboBoxArrow);
arrowRect = TQStyle::tqvisualRect(arrowRect, this); arrowRect = TQStyle::visualRect(arrowRect, this);
// Correction for motif style, where arrow is smaller // Correction for motif style, where arrow is smaller
// and thus has a rect that doesn't fit the button. // and thus has a rect that doesn't fit the button.
@ -310,7 +310,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e )
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow); TQStyle::SC_ComboBoxArrow);
arrowRect = TQStyle::tqvisualRect(arrowRect, this); arrowRect = TQStyle::visualRect(arrowRect, this);
// Correction for motif style, where arrow is smaller // Correction for motif style, where arrow is smaller
// and thus has a rect that doesn't fit the button. // and thus has a rect that doesn't fit the button.
@ -339,7 +339,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
// we only need this since there is no way to change the status of the arrow-button // we only need this since there is no way to change the status of the arrow-button
TQPainter p( this ); TQPainter p( this );
const TQColorGroup & g = tqcolorGroup(); const TQColorGroup & g = colorGroup();
p.setPen(g.text()); p.setPen(g.text());
TQStyle::SFlags flags = TQStyle::Style_Default; TQStyle::SFlags flags = TQStyle::Style_Default;
@ -356,7 +356,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
// bool reverse = TQApplication::reverseLayout(); // bool reverse = TQApplication::reverseLayout();
tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All, flags, TQStyle::SC_All,
(d->poppedUp ? (d->poppedUp ?
TQStyle::SC_ComboBoxArrow : TQStyle::SC_ComboBoxArrow :
@ -364,7 +364,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField ); TQStyle::SC_ComboBoxEditField );
re = TQStyle::tqvisualRect(re, this); re = TQStyle::visualRect(re, this);
p.setClipRect( re ); p.setClipRect( re );
// TQListBoxItem * item = listBox()->item( 0 ); // TQListBoxItem * item = listBox()->item( 0 );
@ -380,7 +380,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
const TQPixmap *pix = item->pixmap(); const TQPixmap *pix = item->pixmap();
if ( pix ) { if ( pix ) {
p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(), p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(),
tqcolorGroup().brush( TQColorGroup::Base ) ); colorGroup().brush( TQColorGroup::Base ) );
p.drawPixmap( re.x() + 2, re.y() + p.drawPixmap( re.x() + 2, re.y() +
( re.height() - pix->height() ) / 2, *pix ); ( re.height() - pix->height() ) / 2, *pix );
} }

8
src/k3bfiletreeview.cpp
Unescape View File

@ -238,7 +238,7 @@ void K3bDeviceBranchViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, i
textheight++; textheight++;
if ( textheight < height() ) { if ( textheight < height() ) {
int w = listView()->treeStepSize() / 2; int w = listView()->treeStepSize() / 2;
listView()->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, listView(), listView()->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, listView(),
TQRect( 0, textheight, w + 1, height() - textheight + 1 ), cg, TQRect( 0, textheight, w + 1, height() - textheight + 1 ), cg,
TQStyle::Style_Enabled, TQStyle::Style_Enabled,
TQStyle::SC_ListViewExpand, TQStyle::SC_ListViewExpand,
@ -343,7 +343,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
lay->addMultiCellWidget( label, 0, 0, 0, 1 ); lay->addMultiCellWidget( label, 0, 0, 0, 1 );
label = new TQLabel( details, tooltip ); label = new TQLabel( details, tooltip );
label->setMargin( 9 ); label->setMargin( 9 );
label->tqsetAlignment( Qt::Vertical ); label->setAlignment( Qt::Vertical );
lay->addMultiCellWidget( label, 1, 2, 0, 0 ); lay->addMultiCellWidget( label, 1, 2, 0, 0 );
label = new TQLabel( tooltip ); label = new TQLabel( tooltip );
lay->addWidget( label, 2, 1 ); lay->addWidget( label, 2, 1 );
@ -374,7 +374,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
} }
// the tooltip will take care of deleting the widget // the tooltip will take care of deleting the widget
tip( m_view->tqitemRect( item ), tooltip ); tip( m_view->itemRect( item ), tooltip );
} }
@ -722,7 +722,7 @@ void K3bFileTreeView::updateMinimumWidth()
} }
// width of the items + scrollbar width + the frame + a little eyecandy spacing // width of the items + scrollbar width + the frame + a little eyecandy spacing
setMinimumWidth( w + verticalScrollBar()->tqsizeHint().width() + 2*frameWidth() + 2 ); setMinimumWidth( w + verticalScrollBar()->sizeHint().width() + 2*frameWidth() + 2 );
} }
#include "k3bfiletreeview.moc" #include "k3bfiletreeview.moc"

2
src/k3bflatbutton.cpp
Unescape View File

@ -139,7 +139,7 @@ void K3bFlatButton::setHover( bool b )
} }
TQSize K3bFlatButton::tqsizeHint() const TQSize K3bFlatButton::sizeHint() const
{ {
// height: pixmap + 5 spacing + font height + frame width // height: pixmap + 5 spacing + font height + frame width
// width: max( pixmap, text) + frame width // width: max( pixmap, text) + frame width

2
src/k3bflatbutton.h
Unescape View File

@ -41,7 +41,7 @@ class K3bFlatButton : public TQFrame
~K3bFlatButton(); ~K3bFlatButton();
TQSize tqsizeHint() const; TQSize sizeHint() const;
public slots: public slots:
void setColors( const TQColor& fore, const TQColor& back ); void setColors( const TQColor& fore, const TQColor& back );

4
src/k3binteractiondialog.cpp
Unescape View File

@ -200,9 +200,9 @@ void K3bInteractionDialog::show()
} }
TQSize K3bInteractionDialog::tqsizeHint() const TQSize K3bInteractionDialog::sizeHint() const
{ {
TQSize s = KDialog::tqsizeHint(); TQSize s = KDialog::sizeHint();
// I want the dialogs to look good. // I want the dialogs to look good.
// That means their height should never outgrow their width // That means their height should never outgrow their width
if( s.height() > s.width() ) if( s.height() > s.width() )

2
src/k3binteractiondialog.h
Unescape View File

@ -105,7 +105,7 @@ class K3bInteractionDialog : public KDialog
CANCEL_BUTTON = 4 CANCEL_BUTTON = 4
}; };
TQSize tqsizeHint() const; TQSize sizeHint() const;
const TQString& configGroup() const { return m_configGroup; } const TQString& configGroup() const { return m_configGroup; }

2
src/k3bjobinterface.cpp
Unescape View File

@ -49,7 +49,7 @@ void K3bJobInterface::setJob( K3bJob* job )
connect( m_job, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) ); connect( m_job, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) );
if( m_job->inherits( "K3bBurnJob" ) ) { if( m_job->inherits( "K3bBurnJob" ) ) {
connect( m_job, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SLOT(slotBuffer(int)) ); connect( m_job, TQT_SIGNAL(bufferStatus(int)), this, TQT_SLOT(slotBuffer(int)) );
connect( m_job, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) ); connect( m_job, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) );
} }

18
src/k3bjobprogressdialog.cpp
Unescape View File

@ -131,7 +131,7 @@ void K3bJobProgressDialog::setupGUI()
headerLayout->addWidget( m_pixLabel ); headerLayout->addWidget( m_pixLabel );
TQFrame* frame4 = new TQFrame( headerFrame, "frame4" ); TQFrame* frame4 = new TQFrame( headerFrame, "frame4" );
frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame4->sizePolicy().hasHeightForWidth() ) ); frame4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame4->sizePolicy().hasHeightForWidth() ) );
frame4->setFrameShape( TQFrame::NoFrame ); frame4->setFrameShape( TQFrame::NoFrame );
frame4->setFrameShadow( TQFrame::Raised ); frame4->setFrameShadow( TQFrame::Raised );
TQVBoxLayout* frame4Layout = new TQVBoxLayout( frame4, 6, 3, "frame4Layout"); TQVBoxLayout* frame4Layout = new TQVBoxLayout( frame4, 6, 3, "frame4Layout");
@ -142,12 +142,12 @@ void K3bJobProgressDialog::setupGUI()
m_labelJob_font.setPointSize( m_labelJob_font.pointSize() + 2 ); m_labelJob_font.setPointSize( m_labelJob_font.pointSize() + 2 );
m_labelJob_font.setBold( true ); m_labelJob_font.setBold( true );
m_labelJob->setFont( m_labelJob_font ); m_labelJob->setFont( m_labelJob_font );
m_labelJob->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelJob->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
frame4Layout->addWidget( m_labelJob ); frame4Layout->addWidget( m_labelJob );
m_labelJobDetails = new K3bThemedLabel( frame4 ); m_labelJobDetails = new K3bThemedLabel( frame4 );
m_labelJobDetails->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelJobDetails->sizePolicy().hasHeightForWidth() ) ); m_labelJobDetails->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelJobDetails->sizePolicy().hasHeightForWidth() ) );
m_labelJobDetails->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelJobDetails->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
frame4Layout->addWidget( m_labelJobDetails ); frame4Layout->addWidget( m_labelJobDetails );
headerLayout->addWidget( frame4 ); headerLayout->addWidget( frame4 );
@ -177,7 +177,7 @@ void K3bJobProgressDialog::setupGUI()
progressHeaderLayout->setSpacing( 0 ); progressHeaderLayout->setSpacing( 0 );
TQFrame* frame5 = new TQFrame( progressHeaderFrame, "frame5" ); TQFrame* frame5 = new TQFrame( progressHeaderFrame, "frame5" );
frame5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame5->sizePolicy().hasHeightForWidth() ) ); frame5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame5->sizePolicy().hasHeightForWidth() ) );
frame5->setFrameShape( TQFrame::NoFrame ); frame5->setFrameShape( TQFrame::NoFrame );
frame5->setFrameShadow( TQFrame::Raised ); frame5->setFrameShadow( TQFrame::Raised );
TQVBoxLayout* frame5Layout = new TQVBoxLayout( frame5, 6, 3, "frame5Layout"); TQVBoxLayout* frame5Layout = new TQVBoxLayout( frame5, 6, 3, "frame5Layout");
@ -190,7 +190,7 @@ void K3bJobProgressDialog::setupGUI()
frame5Layout->addWidget( m_labelTask ); frame5Layout->addWidget( m_labelTask );
m_labelElapsedTime = new K3bThemedLabel( frame5 ); m_labelElapsedTime = new K3bThemedLabel( frame5 );
m_labelElapsedTime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelElapsedTime->sizePolicy().hasHeightForWidth() ) ); m_labelElapsedTime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelElapsedTime->sizePolicy().hasHeightForWidth() ) );
frame5Layout->addWidget( m_labelElapsedTime ); frame5Layout->addWidget( m_labelElapsedTime );
progressHeaderLayout->addWidget( frame5 ); progressHeaderLayout->addWidget( frame5 );
@ -204,7 +204,7 @@ void K3bJobProgressDialog::setupGUI()
tqlayout3->addWidget( m_labelSubTask ); tqlayout3->addWidget( m_labelSubTask );
m_labelSubProcessedSize = new TQLabel( this, "m_labelSubProcessedSize" ); m_labelSubProcessedSize = new TQLabel( this, "m_labelSubProcessedSize" );
m_labelSubProcessedSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelSubProcessedSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
tqlayout3->addWidget( m_labelSubProcessedSize ); tqlayout3->addWidget( m_labelSubProcessedSize );
mainLayout->addLayout( tqlayout3 ); mainLayout->addLayout( tqlayout3 );
@ -217,7 +217,7 @@ void K3bJobProgressDialog::setupGUI()
tqlayout4->addWidget( textLabel5 ); tqlayout4->addWidget( textLabel5 );
m_labelProcessedSize = new TQLabel( this, "m_labelProcessedSize" ); m_labelProcessedSize = new TQLabel( this, "m_labelProcessedSize" );
m_labelProcessedSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelProcessedSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
tqlayout4->addWidget( m_labelProcessedSize ); tqlayout4->addWidget( m_labelProcessedSize );
mainLayout->addLayout( tqlayout4 ); mainLayout->addLayout( tqlayout4 );
@ -579,7 +579,7 @@ void K3bJobProgressDialog::keyPressEvent( TQKeyEvent *e )
} }
TQSize K3bJobProgressDialog::tqsizeHint() const TQSize K3bJobProgressDialog::sizeHint() const
{ {
TQSize s = tqlayout()->totalSizeHint(); TQSize s = tqlayout()->totalSizeHint();
if( s.width() < s.height() ) if( s.width() < s.height() )

2
src/k3bjobprogressdialog.h
Unescape View File

@ -79,7 +79,7 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler
*/ */
int startJob( K3bJob* job = 0 ); int startJob( K3bJob* job = 0 );
TQSize tqsizeHint() const; TQSize sizeHint() const;
/** /**
* @reimplemented from K3bJobHandler * @reimplemented from K3bJobHandler

2
src/k3bmediaselectioncombobox.cpp
Unescape View File

@ -64,7 +64,7 @@ void K3bMediaSelectionComboBox::ToolTip::maybeTip( const TQPoint& pos )
int index = m_box->listBox()->index( item ); int index = m_box->listBox()->index( item );
if( K3bDevice::Device* dev = m_box->deviceAt( index ) ) { if( K3bDevice::Device* dev = m_box->deviceAt( index ) ) {
tip( m_box->listBox()->tqitemRect( item ), tip( m_box->listBox()->itemRect( item ),
m_box->mediumToolTip( k3bappcore->mediaCache()->medium( dev ) ) ); m_box->mediumToolTip( k3bappcore->mediaCache()->medium( dev ) ) );
} }
} }

6
src/k3bminibutton.cpp
Unescape View File

@ -37,7 +37,7 @@ K3bMiniButton::~K3bMiniButton()
void K3bMiniButton::drawButton( TQPainter* p ) void K3bMiniButton::drawButton( TQPainter* p )
{ {
p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) ); p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() ); p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
if( m_mouseOver && !isDown() ){ if( m_mouseOver && !isDown() ){
p->setPen( white ); p->setPen( white );
@ -45,12 +45,12 @@ void K3bMiniButton::drawButton( TQPainter* p )
p->lineTo( 0, 0 ); p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 ); p->lineTo( width() - 1, 0 );
p->setPen( tqcolorGroup().dark() ); p->setPen( colorGroup().dark() );
p->lineTo( width() - 1, height() - 1 ); p->lineTo( width() - 1, height() - 1 );
p->lineTo( 0, height() - 1 ); p->lineTo( 0, height() - 1 );
} }
if( isOn() || isDown() ){ if( isOn() || isDown() ){
p->setPen( tqcolorGroup().dark() ); p->setPen( colorGroup().dark() );
p->moveTo( 0, height() - 1 ); p->moveTo( 0, height() - 1 );
p->lineTo( 0, 0 ); p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 ); p->lineTo( width() - 1, 0 );

4
src/k3bpassivepopup.cpp
Unescape View File

@ -116,7 +116,7 @@ K3bPassivePopup::K3bPassivePopup( TQWidget* parent )
d->titleLabel = new TQLabel( this ); d->titleLabel = new TQLabel( this );
d->titleLabel->setMargin( 5 ); d->titleLabel->setMargin( 5 );
d->titleLabel->tqsetAlignment( TQt::AlignCenter ); d->titleLabel->setAlignment( TQt::AlignCenter );
TQFont fnt( d->titleLabel->font() ); TQFont fnt( d->titleLabel->font() );
fnt.setBold( true ); fnt.setBold( true );
d->titleLabel->setFont( fnt ); d->titleLabel->setFont( fnt );
@ -124,7 +124,7 @@ K3bPassivePopup::K3bPassivePopup( TQWidget* parent )
d->messageLabel = new KActiveLabel( this ); d->messageLabel = new KActiveLabel( this );
d->pixmapLabel = new TQLabel( this ); d->pixmapLabel = new TQLabel( this );
d->pixmapLabel->tqsetAlignment( TQt::AlignTop ); d->pixmapLabel->setAlignment( TQt::AlignTop );
d->timeoutWidget = new K3bTimeoutWidget( this ); d->timeoutWidget = new K3bTimeoutWidget( this );
connect( d->timeoutWidget, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClose()) ); connect( d->timeoutWidget, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClose()) );

4
src/k3bsplash.cpp
Unescape View File

@ -47,7 +47,7 @@ K3bSplash::K3bSplash( TQWidget* parent, const char* name )
copyrightLabel->setMargin( 5 ); copyrightLabel->setMargin( 5 );
copyrightLabel->setPaletteBackgroundColor( black ); copyrightLabel->setPaletteBackgroundColor( black );
copyrightLabel->setPaletteForegroundColor( white ); copyrightLabel->setPaletteForegroundColor( white );
copyrightLabel->tqsetAlignment( AlignRight ); copyrightLabel->setAlignment( AlignRight );
TQLabel* picLabel = new TQLabel( this ); TQLabel* picLabel = new TQLabel( this );
if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
@ -62,7 +62,7 @@ K3bSplash::K3bSplash( TQWidget* parent, const char* name )
// Set tqgeometry, with support for Xinerama systems // Set tqgeometry, with support for Xinerama systems
TQRect r; TQRect r;
r.setSize(tqsizeHint()); r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen(); int ps = TQApplication::desktop()->primaryScreen();
r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() ); r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
setGeometry(r); setGeometry(r);

4
src/k3btempdirselectionwidget.cpp
Unescape View File

@ -56,7 +56,7 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const ch
freeTempSpaceBox->setSpacing( KDialog::spacingHint() ); freeTempSpaceBox->setSpacing( KDialog::spacingHint() );
(void)new TQLabel( i18n( "Free space in temporary directory:" ), freeTempSpaceBox, "TextLabel2" ); (void)new TQLabel( i18n( "Free space in temporary directory:" ), freeTempSpaceBox, "TextLabel2" );
m_labelFreeSpace = new TQLabel( " ",freeTempSpaceBox, "m_labelFreeSpace" ); m_labelFreeSpace = new TQLabel( " ",freeTempSpaceBox, "m_labelFreeSpace" );
m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
connect( m_editDirectory, TQT_SIGNAL(openFileDialog(KURLRequester*)), connect( m_editDirectory, TQT_SIGNAL(openFileDialog(KURLRequester*)),
@ -212,7 +212,7 @@ void K3bTempDirSelectionWidget::setNeededSize( KIO::filesize_t bytes )
cdSizeBox->setSpacing( KDialog::spacingHint() ); cdSizeBox->setSpacing( KDialog::spacingHint() );
(void)new TQLabel( i18n( "Size of project:" ), cdSizeBox, "TextLabel4" ); (void)new TQLabel( i18n( "Size of project:" ), cdSizeBox, "TextLabel4" );
m_labelCdSize = new TQLabel( KIO::convertSize(bytes), cdSizeBox, "m_labelCdSize" ); m_labelCdSize = new TQLabel( KIO::convertSize(bytes), cdSizeBox, "m_labelCdSize" );
m_labelCdSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelCdSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
} }
m_labelCdSize->setText( KIO::convertSize(bytes) ); m_labelCdSize->setText( KIO::convertSize(bytes) );
} }

4
src/k3bthemedheader.cpp
Unescape View File

@ -71,9 +71,9 @@ void K3bThemedHeader::setRightPixmap( K3bTheme::PixmapType p )
} }
void K3bThemedHeader::tqsetAlignment( int align ) void K3bThemedHeader::setAlignment( int align )
{ {
m_titleLabel->tqsetAlignment( align ); m_titleLabel->setAlignment( align );
} }

2
src/k3bthemedheader.h
Unescape View File

@ -36,7 +36,7 @@ class K3bThemedHeader : public TQFrame
public slots: public slots:
void setTitle( const TQString& title, const TQString& subtitle = TQString() ); void setTitle( const TQString& title, const TQString& subtitle = TQString() );
void setSubTitle( const TQString& subtitle ); void setSubTitle( const TQString& subtitle );
void tqsetAlignment( int ); void setAlignment( int );
void setLeftPixmap( K3bTheme::PixmapType ); void setLeftPixmap( K3bTheme::PixmapType );
void setRightPixmap( K3bTheme::PixmapType ); void setRightPixmap( K3bTheme::PixmapType );

8
src/k3btimeoutwidget.cpp
Unescape View File

@ -88,13 +88,13 @@ void K3bTimeoutWidget::timeStep()
} }
TQSize K3bTimeoutWidget::tqsizeHint() const TQSize K3bTimeoutWidget::sizeHint() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
TQSize K3bTimeoutWidget::tqminimumSizeHint() const TQSize K3bTimeoutWidget::minimumSizeHint() const
{ {
int fw = fontMetrics().width( TQString::number( d->timeout/1000 ) ); int fw = fontMetrics().width( TQString::number( d->timeout/1000 ) );
int fh = fontMetrics().height(); int fh = fontMetrics().height();
@ -128,7 +128,7 @@ void K3bTimeoutWidget::paintEvent( TQPaintEvent* )
} }
TQRect r; TQRect r;
r.setSize( tqminimumSizeHint() ); r.setSize( minimumSizeHint() );
r.moveCenter( rect().center() ); r.moveCenter( rect().center() );
p.drawArc( r, 0, 360*16 ); p.drawArc( r, 0, 360*16 );

4
src/k3btimeoutwidget.h
Unescape View File

@ -31,8 +31,8 @@ class K3bTimeoutWidget : public TQWidget
K3bTimeoutWidget( TQWidget* parent ); K3bTimeoutWidget( TQWidget* parent );
~K3bTimeoutWidget(); ~K3bTimeoutWidget();
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
public slots: public slots:
void setTimeout( int msecs ); void setTimeout( int msecs );

12
src/k3bwelcomewidget.cpp
Unescape View File

@ -182,9 +182,9 @@ void K3bWelcomeWidget::Display::rebuildGui()
// determine the needed button size (since all buttons should be equal in size // determine the needed button size (since all buttons should be equal in size
// we use the max of all sizes) // we use the max of all sizes)
m_buttonSize = m_buttons.first()->tqsizeHint(); m_buttonSize = m_buttons.first()->sizeHint();
for( TQPtrListIterator<K3bFlatButton> it( m_buttons ); it.current(); ++it ) { for( TQPtrListIterator<K3bFlatButton> it( m_buttons ); it.current(); ++it ) {
m_buttonSize = m_buttonSize.expandedTo( it.current()->tqsizeHint() ); m_buttonSize = m_buttonSize.expandedTo( it.current()->sizeHint() );
} }
repositionButtons(); repositionButtons();
@ -249,7 +249,7 @@ int K3bWelcomeWidget::Display::heightForWidth( int w ) const
} }
TQSize K3bWelcomeWidget::Display::tqminimumSizeHint() const TQSize K3bWelcomeWidget::Display::minimumSizeHint() const
{ {
TQSize size( TQMAX(40+m_header->widthUsed(), 40+m_buttonSize.width()), TQSize size( TQMAX(40+m_header->widthUsed(), 40+m_buttonSize.width()),
20 + m_header->height() + 20 + 10 + m_buttonSize.height() + 10 + m_infoText->height() + 20 ); 20 + m_header->height() + 20 + 10 + m_buttonSize.height() + 10 + m_infoText->height() + 20 );
@ -309,7 +309,7 @@ void K3bWelcomeWidget::Display::paintEvent( TQPaintEvent* )
p.drawRect( 10, 10, width()-20, height()-20 ); p.drawRect( 10, 10, width()-20, height()-20 );
// draw the header text // draw the header text
TQColorGroup grp( tqcolorGroup() ); TQColorGroup grp( colorGroup() );
grp.setColor( TQColorGroup::Text, theme->foregroundColor() ); grp.setColor( TQColorGroup::Text, theme->foregroundColor() );
int pos = 20; int pos = 20;
pos += TQMAX( (width()-40-m_header->widthUsed())/2, 0 ); pos += TQMAX( (width()-40-m_header->widthUsed())/2, 0 );
@ -415,7 +415,7 @@ void K3bWelcomeWidget::showEvent( TQShowEvent* e )
void K3bWelcomeWidget::fixSize() void K3bWelcomeWidget::fixSize()
{ {
TQSize s = contentsRect().size(); TQSize s = contentsRect().size();
s.setWidth( TQMAX( main->tqminimumSizeHint().width(), s.width() ) ); s.setWidth( TQMAX( main->minimumSizeHint().width(), s.width() ) );
s.setHeight( TQMAX( main->heightForWidth(s.width()), s.height() ) ); s.setHeight( TQMAX( main->heightForWidth(s.width()), s.height() ) );
main->resize( s ); main->resize( s );
@ -443,7 +443,7 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e )
int r = 0; int r = 0;
int removeAction = 0; int removeAction = 0;
TQWidget* widgetAtPos = viewport()->tqchildAt(e->pos()); TQWidget* widgetAtPos = viewport()->childAt(e->pos());
if( widgetAtPos && widgetAtPos->inherits( "K3bFlatButton" ) ) { if( widgetAtPos && widgetAtPos->inherits( "K3bFlatButton" ) ) {
KPopupMenu pop; KPopupMenu pop;
removeAction = pop.insertItem( SmallIcon("remove"), i18n("Remove Button") ); removeAction = pop.insertItem( SmallIcon("remove"), i18n("Remove Button") );

2
src/k3bwelcomewidget.h
Unescape View File

@ -76,7 +76,7 @@ class K3bWelcomeWidget::Display : public TQWidget
Display( K3bWelcomeWidget* parent ); Display( K3bWelcomeWidget* parent );
~Display(); ~Display();
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
TQSizePolicy sizePolicy () const; TQSizePolicy sizePolicy () const;
int heightForWidth ( int w ) const; int heightForWidth ( int w ) const;

4
src/k3bwriterselectionwidget.cpp
Unescape View File

@ -125,7 +125,7 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char
groupWriter->tqlayout()->setMargin( 0 ); groupWriter->tqlayout()->setMargin( 0 );
TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->tqlayout() ); TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->tqlayout() );
groupWriterLayout->tqsetAlignment( TQt::AlignTop ); groupWriterLayout->setAlignment( TQt::AlignTop );
groupWriterLayout->setSpacing( KDialog::spacingHint() ); groupWriterLayout->setSpacing( KDialog::spacingHint() );
groupWriterLayout->setMargin( KDialog::marginHint() ); groupWriterLayout->setMargin( KDialog::marginHint() );
@ -150,7 +150,7 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char
TQGridLayout* mainLayout = new TQGridLayout( this ); TQGridLayout* mainLayout = new TQGridLayout( this );
mainLayout->tqsetAlignment( TQt::AlignTop ); mainLayout->setAlignment( TQt::AlignTop );
mainLayout->setSpacing( KDialog::spacingHint() ); mainLayout->setSpacing( KDialog::spacingHint() );
mainLayout->setMargin( 0 ); mainLayout->setMargin( 0 );

6
src/misc/k3bcdimagewritingdialog.cpp
Unescape View File

@ -238,7 +238,7 @@ void K3bCdImageWritingDialog::setupGui()
TQWidget* optionTab = new TQWidget( d->optionTabbed ); TQWidget* optionTab = new TQWidget( d->optionTabbed );
TQGridLayout* optionTabLayout = new TQGridLayout( optionTab ); TQGridLayout* optionTabLayout = new TQGridLayout( optionTab );
optionTabLayout->tqsetAlignment( TQt::AlignTop ); optionTabLayout->setAlignment( TQt::AlignTop );
optionTabLayout->setSpacing( spacingHint() ); optionTabLayout->setSpacing( spacingHint() );
optionTabLayout->setMargin( marginHint() ); optionTabLayout->setMargin( marginHint() );
@ -293,7 +293,7 @@ void K3bCdImageWritingDialog::setupGui()
// advanced --------------------------------- // advanced ---------------------------------
d->advancedTab = new TQWidget( d->optionTabbed ); d->advancedTab = new TQWidget( d->optionTabbed );
TQGridLayout* advancedTabLayout = new TQGridLayout( d->advancedTab ); TQGridLayout* advancedTabLayout = new TQGridLayout( d->advancedTab );
advancedTabLayout->tqsetAlignment( TQt::AlignTop ); advancedTabLayout->setAlignment( TQt::AlignTop );
advancedTabLayout->setSpacing( spacingHint() ); advancedTabLayout->setSpacing( spacingHint() );
advancedTabLayout->setMargin( marginHint() ); advancedTabLayout->setMargin( marginHint() );
@ -816,7 +816,7 @@ void K3bCdImageWritingDialog::toggleAll()
item->setForegroundColor( 1, item->setForegroundColor( 1,
currentImageType() != d->foundImageType currentImageType() != d->foundImageType
? TQt::red ? TQt::red
: m_infoView->tqcolorGroup().foreground() ); : m_infoView->colorGroup().foreground() );
} }

2
src/misc/k3bisoimagewritingdialog.cpp
Unescape View File

@ -181,7 +181,7 @@ void K3bIsoImageWritingDialog::setupGui()
TQWidget* optionTab = new TQWidget( optionTabbed ); TQWidget* optionTab = new TQWidget( optionTabbed );
TQGridLayout* optionTabLayout = new TQGridLayout( optionTab ); TQGridLayout* optionTabLayout = new TQGridLayout( optionTab );
optionTabLayout->tqsetAlignment( TQt::AlignTop ); optionTabLayout->setAlignment( TQt::AlignTop );
optionTabLayout->setSpacing( spacingHint() ); optionTabLayout->setSpacing( spacingHint() );
optionTabLayout->setMargin( marginHint() ); optionTabLayout->setMargin( marginHint() );

6
src/option/base_k3bcddboptiontab.ui
Unescape View File

@ -195,7 +195,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>51</height> <height>51</height>
@ -394,7 +394,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -491,7 +491,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>151</height> <height>151</height>

2
src/option/base_k3bmiscoptiontab.ui
Unescape View File

@ -241,7 +241,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>0</height> <height>0</height>

2
src/option/base_k3bpluginoptiontab.ui
Unescape View File

@ -38,7 +38,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>411</width> <width>411</width>
<height>21</height> <height>21</height>

2
src/option/base_k3bthemeoptiontab.ui
Unescape View File

@ -172,7 +172,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>161</width> <width>161</width>
<height>2</height> <height>2</height>

2
src/option/k3bburningoptiontab.cpp
Unescape View File

@ -54,7 +54,7 @@ K3bBurningOptionTab::~K3bBurningOptionTab()
void K3bBurningOptionTab::setupGui() void K3bBurningOptionTab::setupGui()
{ {
TQGridLayout* groupAdvancedLayout = new TQGridLayout( this ); TQGridLayout* groupAdvancedLayout = new TQGridLayout( this );
groupAdvancedLayout->tqsetAlignment( TQt::AlignTop ); groupAdvancedLayout->setAlignment( TQt::AlignTop );
groupAdvancedLayout->setSpacing( KDialog::spacingHint() ); groupAdvancedLayout->setSpacing( KDialog::spacingHint() );
groupAdvancedLayout->setMargin( 0 ); groupAdvancedLayout->setMargin( 0 );

2
src/option/k3bdeviceoptiontab.cpp
Unescape View File

@ -43,7 +43,7 @@ K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* parent, const char* name )
// Info Label // Info Label
// ------------------------------------------------ // ------------------------------------------------
m_labelDevicesInfo = new TQLabel( this, "m_labelDevicesInfo" ); m_labelDevicesInfo = new TQLabel( this, "m_labelDevicesInfo" );
m_labelDevicesInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); m_labelDevicesInfo->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
m_labelDevicesInfo->setText( i18n( "K3b tries to detect all your devices properly. " m_labelDevicesInfo->setText( i18n( "K3b tries to detect all your devices properly. "
"You can add devices that have not been detected and change " "You can add devices that have not been detected and change "
"the black values by clicking in the list. If K3b is unable " "the black values by clicking in the list. If K3b is unable "

2
src/option/k3bexternalbinoptiontab.cpp
Unescape View File

@ -52,7 +52,7 @@ K3bExternalBinOptionTab::K3bExternalBinOptionTab( K3bExternalBinManager* manager
m_labelInfo->setText( i18n( "Specify the paths to the external programs that K3b needs to work properly, " m_labelInfo->setText( i18n( "Specify the paths to the external programs that K3b needs to work properly, "
"or press \"Search\" to let K3b search for the programs." ) ); "or press \"Search\" to let K3b search for the programs." ) );
m_labelInfo->setScaledContents( false ); m_labelInfo->setScaledContents( false );
m_labelInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); m_labelInfo->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
frameLayout->addWidget( m_labelInfo, 0, 0 ); frameLayout->addWidget( m_labelInfo, 0, 0 );
} }

4
src/projects/base_k3baudiocdtextwidget.ui
Unescape View File

@ -151,7 +151,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -178,7 +178,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>0</height> <height>0</height>

6
src/projects/base_k3baudiotrackwidget.ui
Unescape View File

@ -176,7 +176,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>350</width> <width>350</width>
<height>50</height> <height>50</height>
@ -257,7 +257,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>161</width> <width>161</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>80</height> <height>80</height>

2
src/projects/base_k3bbootimageview.ui
Unescape View File

@ -270,7 +270,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>261</width> <width>261</width>
<height>21</height> <height>21</height>

2
src/projects/base_k3bdataimagesettings.ui
Unescape View File

@ -258,7 +258,7 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>0</height> <height>0</height>

2
src/projects/base_k3bdatavolumedescwidget.ui
Unescape View File

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

4
src/projects/k3baudiodatasourceeditwidget.cpp
Unescape View File

@ -37,7 +37,7 @@ K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* parent, co
TQLabel* startLabel = new TQLabel( i18n("Start Offset") + ":", this ); TQLabel* startLabel = new TQLabel( i18n("Start Offset") + ":", this );
TQLabel* endLabel = new TQLabel( i18n("End Offset") + ":", this ); TQLabel* endLabel = new TQLabel( i18n("End Offset") + ":", this );
endLabel->tqsetAlignment( TQt::AlignRight ); endLabel->setAlignment( TQt::AlignRight );
TQGridLayout* grid = new TQGridLayout( this ); TQGridLayout* grid = new TQGridLayout( this );
grid->setMargin( 0 ); grid->setMargin( 0 );
@ -101,7 +101,7 @@ void K3bAudioDataSourceEditWidget::loadSource( K3bAudioDataSource* source )
false, false,
false, false,
i18n("Used part of the audio source"), i18n("Used part of the audio source"),
tqcolorGroup().highlight() ); colorGroup().highlight() );
m_editStartOffset->setMaxValue( source->originalLength().lba() ); m_editStartOffset->setMaxValue( source->originalLength().lba() );
m_editEndOffset->setMaxValue( source->originalLength().lba() ); m_editEndOffset->setMaxValue( source->originalLength().lba() );

18
src/projects/k3baudioeditorwidget.cpp
Unescape View File

@ -177,9 +177,9 @@ K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* parent, const char* name )
m_draggedMarker(0) m_draggedMarker(0)
{ {
d = new Private; d = new Private;
d->selectedRangeBrush = TQBrush(tqcolorGroup().highlight()); d->selectedRangeBrush = TQBrush(colorGroup().highlight());
tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum );
setFrameStyle( StyledPanel|Sunken ); setFrameStyle( StyledPanel|Sunken );
setMouseTracking(true); setMouseTracking(true);
setCursor( TQt::PointingHandCursor ); setCursor( TQt::PointingHandCursor );
@ -201,7 +201,7 @@ K3bAudioEditorWidget::~K3bAudioEditorWidget()
} }
TQSize K3bAudioEditorWidget::tqminimumSizeHint() const TQSize K3bAudioEditorWidget::minimumSizeHint() const
{ {
constPolish(); constPolish();
// some fixed height minimum and enough space for a tickmark every minute // some fixed height minimum and enough space for a tickmark every minute
@ -215,9 +215,9 @@ TQSize K3bAudioEditorWidget::tqminimumSizeHint() const
} }
TQSize K3bAudioEditorWidget::tqsizeHint() const TQSize K3bAudioEditorWidget::sizeHint() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
@ -307,7 +307,7 @@ int K3bAudioEditorWidget::addRange( const K3b::Msf& start, const K3b::Msf& end,
return -1; return -1;
Range* r = new Range( m_idCnt++, start, end, startFixed, endFixed, toolTip, Range* r = new Range( m_idCnt++, start, end, startFixed, endFixed, toolTip,
brush.style() != TQBrush::NoBrush ? brush : TQBrush(tqcolorGroup().background()) ); brush.style() != TQBrush::NoBrush ? brush : TQBrush(colorGroup().background()) );
d->ranges.inSort( r ); d->ranges.inSort( r );
// only update the changed range // only update the changed range
@ -433,7 +433,7 @@ void K3bAudioEditorWidget::setMaxNumberOfMarkers( int i )
int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const TQString& toolTip, const TQColor& color ) int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const TQString& toolTip, const TQColor& color )
{ {
if( pos < m_length ) { if( pos < m_length ) {
Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : tqcolorGroup().foreground(), toolTip ); Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : colorGroup().foreground(), toolTip );
m_markers.inSort( m ); m_markers.inSort( m );
return m->id; return m->id;
} }
@ -488,7 +488,7 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p )
{ {
// double buffering // double buffering
TQPixmap pix( contentsRect().size() ); TQPixmap pix( contentsRect().size() );
pix.fill( tqcolorGroup().base() ); pix.fill( colorGroup().base() );
TQPainter pixP; TQPainter pixP;
pixP.tqbegin( &pix, TQT_TQOBJECT(this) ); pixP.tqbegin( &pix, TQT_TQOBJECT(this) );
@ -497,7 +497,7 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p )
drawRect.setLeft( drawRect.left() + m_margin ); drawRect.setLeft( drawRect.left() + m_margin );
drawRect.setRight( drawRect.right() - m_margin ); drawRect.setRight( drawRect.right() - m_margin );
// from tqminimumSizeHint() // from minimumSizeHint()
// int neededHeight = fontMetrics().height() + 12 + 6; // int neededHeight = fontMetrics().height() + 12 + 6;
// drawRect.setTop( drawRect.top() + (drawRect.height() - neededHeight)/2 ); // drawRect.setTop( drawRect.top() + (drawRect.height() - neededHeight)/2 );

4
src/projects/k3baudioeditorwidget.h
Unescape View File

@ -34,8 +34,8 @@ class K3bAudioEditorWidget : public TQFrame
K3bAudioEditorWidget( TQWidget* parent = 0, const char* name = 0 ); K3bAudioEditorWidget( TQWidget* parent = 0, const char* name = 0 );
~K3bAudioEditorWidget(); ~K3bAudioEditorWidget();
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
/** /**
* For now the Editor has only one parameter: the length data. * For now the Editor has only one parameter: the length data.

2
src/projects/k3bdataimagesettingswidget.cpp
Unescape View File

@ -157,7 +157,7 @@ public:
setMainWidget( w ); setMainWidget( w );
// give ourselves a reasonable size // give ourselves a reasonable size
TQSize s = tqsizeHint(); TQSize s = sizeHint();
s.setWidth( TQMAX(s.width(), 300) ); s.setWidth( TQMAX(s.width(), 300) );
resize( s ); resize( s );
} }

2
src/projects/k3bdatapropertiesdialog.cpp
Unescape View File

@ -168,7 +168,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
sortingBoxGrid->setMargin( marginHint() ); sortingBoxGrid->setMargin( marginHint() );
m_editSortWeight = new KLineEdit( sortingBox ); m_editSortWeight = new KLineEdit( sortingBox );
m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) ); m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) );
m_editSortWeight->tqsetAlignment( TQt::AlignRight ); m_editSortWeight->setAlignment( TQt::AlignRight );
sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 );
sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 ); sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 );
sortingBoxGrid->setColStretch( 1, 1 ); sortingBoxGrid->setColStretch( 1, 1 );

2
src/projects/k3bdataurladdingdialog.cpp
Unescape View File

@ -96,7 +96,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren
this, TQT_SLOT(slotDirSizeDone(bool)) ); this, TQT_SLOT(slotDirSizeDone(bool)) );
// try to start with a reasonable size // try to start with a reasonable size
resize( (int)( fontMetrics().width( caption() ) * 1.5 ), tqsizeHint().height() ); resize( (int)( fontMetrics().width( caption() ) * 1.5 ), sizeHint().height() );
} }

2
src/projects/k3bdataviewitem.cpp
Unescape View File

@ -182,7 +182,7 @@ void K3bDataDirViewItem::highlightIcon( bool b )
m_pixmap = *pixmap(0); m_pixmap = *pixmap(0);
if( b ) if( b )
setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->tqcolorGroup().highlight() ) ); setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->colorGroup().highlight() ) );
else else
setPixmap( 0, m_pixmap ); setPixmap( 0, m_pixmap );
} }

12
src/projects/k3bfillstatusdisplay.cpp
Unescape View File

@ -72,7 +72,7 @@ K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* p
{ {
d = new Private(); d = new Private();
d->doc = doc; d->doc = doc;
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) );
} }
@ -102,13 +102,13 @@ void K3bFillStatusDisplayWidget::setCdSize( const K3b::Msf& size )
} }
TQSize K3bFillStatusDisplayWidget::tqsizeHint() const TQSize K3bFillStatusDisplayWidget::sizeHint() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
TQSize K3bFillStatusDisplayWidget::tqminimumSizeHint() const TQSize K3bFillStatusDisplayWidget::minimumSizeHint() const
{ {
int margin = 2; int margin = 2;
TQFontMetrics fm( font() ); TQFontMetrics fm( font() );
@ -127,7 +127,7 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
{ {
// double buffer // double buffer
TQPixmap buffer( size() ); TQPixmap buffer( size() );
buffer.fill( tqcolorGroup().base() ); buffer.fill( colorGroup().base() );
TQPainter p; TQPainter p;
p.tqbegin( &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) p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color)
@ -577,7 +577,7 @@ void K3bFillStatusDisplay::slotCustomSize()
void K3bFillStatusDisplay::slotMenuButtonClicked() void K3bFillStatusDisplay::slotMenuButtonClicked()
{ {
TQSize size = d->showDvdSizes ? d->dvdPopup->tqsizeHint() : d->popup->tqsizeHint(); TQSize size = d->showDvdSizes ? d->dvdPopup->sizeHint() : d->popup->sizeHint();
slotPopupMenu( d->buttonMenu->mapToGlobal(TQPoint(d->buttonMenu->width(), 0)) + slotPopupMenu( d->buttonMenu->mapToGlobal(TQPoint(d->buttonMenu->width(), 0)) +
TQPoint(-1*size.width(), -1*size.height()) ); TQPoint(-1*size.width(), -1*size.height()) );
} }

4
src/projects/k3bfillstatusdisplay.h
Unescape View File

@ -51,8 +51,8 @@ class K3bFillStatusDisplayWidget : public TQWidget
K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent ); K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent );
~K3bFillStatusDisplayWidget(); ~K3bFillStatusDisplayWidget();
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
const K3b::Msf& cdSize() const; const K3b::Msf& cdSize() const;

4
src/projects/k3bvcdburndialog.cpp
Unescape View File

@ -311,7 +311,7 @@ void K3bVcdBurnDialog::setupAdvancedTab()
m_groupGaps->tqlayout() ->setMargin( marginHint() ); m_groupGaps->tqlayout() ->setMargin( marginHint() );
TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() ); TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() );
groupGapsLayout->tqsetAlignment( TQt::AlignTop ); groupGapsLayout->setAlignment( TQt::AlignTop );
m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps );
@ -407,7 +407,7 @@ void K3bVcdBurnDialog::setupAdvancedTab()
m_groupMisc->tqlayout() ->setMargin( marginHint() ); m_groupMisc->tqlayout() ->setMargin( marginHint() );
TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() ); TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() );
groupMiscLayout->tqsetAlignment( TQt::AlignTop ); groupMiscLayout->setAlignment( TQt::AlignTop );
m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" );
m_spinRestriction = new TQSpinBox( m_groupMisc, "m_spinRestriction" ); m_spinRestriction = new TQSpinBox( m_groupMisc, "m_spinRestriction" );

22
src/projects/k3bvcdtrackdialog.cpp
Unescape View File

@ -379,7 +379,7 @@ void K3bVcdTrackDialog::prepareGui()
groupFileInfo->tqlayout() ->setMargin( 0 ); groupFileInfo->tqlayout() ->setMargin( 0 );
TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() ); TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() );
groupFileInfoLayout->tqsetAlignment( TQt::AlignTop ); groupFileInfoLayout->setAlignment( TQt::AlignTop );
groupFileInfoLayout->setSpacing( spacingHint() ); groupFileInfoLayout->setSpacing( spacingHint() );
groupFileInfoLayout->setMargin( marginHint() ); groupFileInfoLayout->setMargin( marginHint() );
@ -387,7 +387,7 @@ void K3bVcdTrackDialog::prepareGui()
m_displayFileName = new KCutLabel( groupFileInfo ); m_displayFileName = new KCutLabel( groupFileInfo );
m_displayFileName->setText( i18n( "Filename" ) ); m_displayFileName->setText( i18n( "Filename" ) );
m_displayFileName->tqsetAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) ); m_displayFileName->setAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) );
TQLabel* labelSize = new TQLabel( i18n( "Size:" ), groupFileInfo, "labelSize" ); TQLabel* labelSize = new TQLabel( i18n( "Size:" ), groupFileInfo, "labelSize" );
TQLabel* labelLength = new TQLabel( i18n( "Length:" ), groupFileInfo, "labelLength" ); TQLabel* labelLength = new TQLabel( i18n( "Length:" ), groupFileInfo, "labelLength" );
@ -395,15 +395,15 @@ void K3bVcdTrackDialog::prepareGui()
m_displaySize = new TQLabel( groupFileInfo, "m_displaySize" ); m_displaySize = new TQLabel( groupFileInfo, "m_displaySize" );
m_displaySize->setText( "0.0 MB" ); m_displaySize->setText( "0.0 MB" );
m_displaySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_displaySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_displayLength = new TQLabel( groupFileInfo, "m_displayLength" ); m_displayLength = new TQLabel( groupFileInfo, "m_displayLength" );
m_displayLength->setText( "0:0:0" ); m_displayLength->setText( "0:0:0" );
m_displayLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_displayLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" ); m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" );
m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) ); m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) );
m_muxrate->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_muxrate->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
TQFrame* fileInfoLine = new TQFrame( groupFileInfo ); TQFrame* fileInfoLine = new TQFrame( groupFileInfo );
fileInfoLine->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); fileInfoLine->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
@ -443,7 +443,7 @@ void K3bVcdTrackDialog::setupPbcTab()
TQWidget * w = new TQWidget( m_mainTabbed ); TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w ); TQGridLayout* grid = new TQGridLayout( w );
grid->tqsetAlignment( TQt::AlignTop ); grid->setAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() ); grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() ); grid->setMargin( marginHint() );
@ -467,7 +467,7 @@ void K3bVcdTrackDialog::setupPbcTab()
m_groupPlay->tqlayout() ->setMargin( marginHint() ); m_groupPlay->tqlayout() ->setMargin( marginHint() );
TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() ); TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() );
groupPlayLayout->tqsetAlignment( TQt::AlignTop ); groupPlayLayout->setAlignment( TQt::AlignTop );
TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" );
@ -503,7 +503,7 @@ void K3bVcdTrackDialog::setupPbcTab()
m_groupPbc->tqlayout() ->setMargin( marginHint() ); m_groupPbc->tqlayout() ->setMargin( marginHint() );
TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() ); TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() );
groupPbcLayout->tqsetAlignment( TQt::AlignTop ); groupPbcLayout->setAlignment( TQt::AlignTop );
TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" ); TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" );
TQLabel* labelPbc_next = new TQLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" ); TQLabel* labelPbc_next = new TQLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" );
@ -553,7 +553,7 @@ void K3bVcdTrackDialog::setupPbcKeyTab()
m_widgetnumkeys = new TQWidget( m_mainTabbed ); m_widgetnumkeys = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( m_widgetnumkeys ); TQGridLayout* grid = new TQGridLayout( m_widgetnumkeys );
grid->tqsetAlignment( TQt::AlignTop ); grid->setAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() ); grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() ); grid->setMargin( marginHint() );
@ -590,7 +590,7 @@ void K3bVcdTrackDialog::setupAudioTab()
TQWidget * w = new TQWidget( m_mainTabbed ); TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w ); TQGridLayout* grid = new TQGridLayout( w );
grid->tqsetAlignment( TQt::AlignTop ); grid->setAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() ); grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() ); grid->setMargin( marginHint() );
@ -647,7 +647,7 @@ void K3bVcdTrackDialog::setupVideoTab()
TQWidget * w = new TQWidget( m_mainTabbed ); TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w ); TQGridLayout* grid = new TQGridLayout( w );
grid->tqsetAlignment( TQt::AlignTop ); grid->setAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() ); grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() ); grid->setMargin( marginHint() );

4
src/rip/base_k3baudiorippingoptionwidget.ui
Unescape View File

@ -99,7 +99,7 @@ which can be used with programs like xmms or noatun.
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -164,7 +164,7 @@ file will contain all tracks one after the other.
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

2
src/rip/base_k3bcddbpatternwidget.ui
Unescape View File

@ -123,7 +123,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>2</height> <height>2</height>

8
src/rip/k3baudiocdview.cpp
Unescape View File

@ -111,7 +111,7 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name )
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
toolBoxLayout->addItem( spacer ); toolBoxLayout->addItem( spacer );
m_labelLength = new TQLabel( mainWidget() ); m_labelLength = new TQLabel( mainWidget() );
m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
toolBoxLayout->addWidget( m_labelLength ); toolBoxLayout->addWidget( m_labelLength );
@ -359,7 +359,7 @@ void K3bAudioCdView::slotEditTrackCddb()
grid->setRowStretch( 4, 1 ); grid->setRowStretch( 4, 1 );
d.setMainWidget(w); d.setMainWidget(w);
d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() ); d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
if( d.exec() == TQDialog::Accepted ) { if( d.exec() == TQDialog::Accepted ) {
m_cddbInfo.titles[a->trackNumber-1] = editTitle->text(); m_cddbInfo.titles[a->trackNumber-1] = editTitle->text();
@ -415,7 +415,7 @@ void K3bAudioCdView::slotEditAlbumCddb()
grid->setRowStretch( 7, 1 ); grid->setRowStretch( 7, 1 );
d.setMainWidget(w); d.setMainWidget(w);
d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() ); d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
if( d.exec() == TQDialog::Accepted ) { if( d.exec() == TQDialog::Accepted ) {
m_cddbInfo.cdTitle = editTitle->text(); m_cddbInfo.cdTitle = editTitle->text();
@ -584,7 +584,7 @@ void K3bAudioCdView::showBusyLabel( bool b )
// the themed label is a cut label, thus its size hint is // the themed label is a cut label, thus its size hint is
// based on the cut text, we force it to be full // based on the cut text, we force it to be full
m_busyInfoLabel->resize( width(), height() ); m_busyInfoLabel->resize( width(), height() );
m_busyInfoLabel->resize( m_busyInfoLabel->tqsizeHint() ); m_busyInfoLabel->resize( m_busyInfoLabel->sizeHint() );
int x = (width() - m_busyInfoLabel->width())/2; int x = (width() - m_busyInfoLabel->width())/2;
int y = (height() - m_busyInfoLabel->height())/2; int y = (height() - m_busyInfoLabel->height())/2;
TQRect r( TQPoint( x, y ), m_busyInfoLabel->size() ); TQRect r( TQPoint( x, y ), m_busyInfoLabel->size() );

4
src/rip/k3bpatternparser.cpp
Unescape View File

@ -171,7 +171,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
dir.append( s ); // I think it makes more sense to allow empty comments dir.append( s ); // I think it makes more sense to allow empty comments
break; break;
case DATE: case DATE:
dir.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ); dir.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
break; break;
default: default:
dir.append( pattern.mid(i, len) ); dir.append( pattern.mid(i, len) );
@ -247,7 +247,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s = entry.cdExtInfo; s = entry.cdExtInfo;
break; break;
case DATE: case DATE:
s = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ); s = KGlobal::locale()->formatDate( TQDate::currentDate() );
break; break;
default: // we must never get here, default: // we must never get here,
break; // all choices should be covered break; // all choices should be covered

6
src/rip/k3bvideocdrippingdialog.cpp
Unescape View File

@ -77,7 +77,7 @@ void K3bVideoCdRippingDialog::setupGui()
groupDirectory->tqlayout() ->setMargin( KDialog::marginHint() ); groupDirectory->tqlayout() ->setMargin( KDialog::marginHint() );
TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->tqlayout() ); TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->tqlayout() );
groupDirectoryLayout->tqsetAlignment( TQt::AlignTop ); groupDirectoryLayout->setAlignment( TQt::AlignTop );
TQLabel* rippathLabel = new TQLabel( i18n( "Rip files to:" ), groupDirectory ); TQLabel* rippathLabel = new TQLabel( i18n( "Rip files to:" ), groupDirectory );
m_editDirectory = new KURLRequester( groupDirectory, "m_editDirectory" ); m_editDirectory = new KURLRequester( groupDirectory, "m_editDirectory" );
@ -90,13 +90,13 @@ void K3bVideoCdRippingDialog::setupGui()
freeSpaceBox->setSpacing( KDialog::spacingHint() ); freeSpaceBox->setSpacing( KDialog::spacingHint() );
( void ) new TQLabel( i18n( "Free space in directory:" ), freeSpaceBox, "FreeSpaceLabel" ); ( void ) new TQLabel( i18n( "Free space in directory:" ), freeSpaceBox, "FreeSpaceLabel" );
m_labelFreeSpace = new TQLabel( " ", freeSpaceBox, "m_labelFreeSpace" ); m_labelFreeSpace = new TQLabel( " ", freeSpaceBox, "m_labelFreeSpace" );
m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
TQHBox* necessarySizeBox = new TQHBox( groupDirectory ); TQHBox* necessarySizeBox = new TQHBox( groupDirectory );
necessarySizeBox->setSpacing( KDialog::spacingHint() ); necessarySizeBox->setSpacing( KDialog::spacingHint() );
( void ) new TQLabel( i18n( "Necessary storage size:" ), necessarySizeBox, "StorSize" ); ( void ) new TQLabel( i18n( "Necessary storage size:" ), necessarySizeBox, "StorSize" );
m_labelNecessarySize = new TQLabel( " ", necessarySizeBox, "m_labelNecessarySize" ); m_labelNecessarySize = new TQLabel( " ", necessarySizeBox, "m_labelNecessarySize" );
m_labelNecessarySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelNecessarySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
groupDirectoryLayout->addWidget( rippathLabel, 0, 0 ); groupDirectoryLayout->addWidget( rippathLabel, 0, 0 );

2
src/rip/k3bvideocdview.cpp
Unescape View File

@ -153,7 +153,7 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name )
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
toolBoxLayout->addItem( spacer ); toolBoxLayout->addItem( spacer );
m_labelLength = new TQLabel( mainWidget() ); m_labelLength = new TQLabel( mainWidget() );
m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
toolBoxLayout->addWidget( m_labelLength ); toolBoxLayout->addWidget( m_labelLength );
// the track view // the track view

6
src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
Unescape View File

@ -372,7 +372,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -560,7 +560,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>5</width> <width>5</width>
<height>1</height> <height>1</height>
@ -663,7 +663,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>1</height> <height>1</height>

4
src/rip/videodvd/k3bvideodvdrippingdialog.cpp
Unescape View File

@ -233,7 +233,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
if( m_dvd[*it-1].audioStream(i).format() == K3bVideoDVD::AUDIO_FORMAT_DTS ) { if( m_dvd[*it-1].audioStream(i).format() == K3bVideoDVD::AUDIO_FORMAT_DTS ) {
// width of the radio button from TQCheckListItem::paintCell // width of the radio button from TQCheckListItem::paintCell
int buttonSize = tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4; int buttonSize = tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4;
int spaceWidth = fontMetrics().width( ' ' ); int spaceWidth = fontMetrics().width( ' ' );
int numSpaces = buttonSize/spaceWidth; int numSpaces = buttonSize/spaceWidth;
asI = new TQListViewItem( titleItem, asI, TQString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" ); asI = new TQListViewItem( titleItem, asI, TQString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" );
@ -471,7 +471,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
f.append( "16:9" ); f.append( "16:9" );
break; break;
case PATTERN_CURRENT_DATE: case PATTERN_CURRENT_DATE:
f.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ); f.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
break; break;
default: default:
f.append( pattern[i-1] ); f.append( pattern[i-1] );

2
src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
Unescape View File

@ -300,7 +300,7 @@ public:
return; return;
int col = m_view->header()->sectionAt( contentsPos.x() ); int col = m_view->header()->sectionAt( contentsPos.x() );
TQRect r = m_view->tqitemRect( item ); TQRect r = m_view->itemRect( item );
int headerPos = m_view->header()->sectionPos( col ); int headerPos = m_view->header()->sectionPos( col );
r.setLeft( headerPos ); r.setLeft( headerPos );
r.setRight( headerPos + m_view->header()->sectionSize( col ) ); r.setRight( headerPos + m_view->header()->sectionSize( col ) );

2
src/rip/videodvd/k3bvideodvdrippingview.cpp
Unescape View File

@ -54,7 +54,7 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
toolBoxLayout->addItem( spacer ); toolBoxLayout->addItem( spacer );
m_labelLength = new TQLabel( mainWidget() ); m_labelLength = new TQLabel( mainWidget() );
m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
toolBoxLayout->addWidget( m_labelLength ); toolBoxLayout->addWidget( m_labelLength );

4
src/rip/videodvd/k3bvideodvdrippingwidget.cpp
Unescape View File

@ -351,8 +351,8 @@ void K3bVideoDVDRippingWidget::slotCustomPictureSize()
spinHeight->setSpecialValueText( i18n("Auto") ); spinHeight->setSpecialValueText( i18n("Auto") );
TQLabel* labelW = new TQLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() ); TQLabel* labelW = new TQLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() );
TQLabel* labelH = new TQLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() ); TQLabel* labelH = new TQLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() );
labelW->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter ); labelW->setAlignment( TQt::AlignRight|TQt::AlignVCenter );
labelH->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter ); labelH->setAlignment( TQt::AlignRight|TQt::AlignVCenter );
TQGridLayout* grid = new TQGridLayout( dlg.plainPage() ); TQGridLayout* grid = new TQGridLayout( dlg.plainPage() );
grid->setMargin( 0 ); grid->setMargin( 0 );

Write Preview
Loading…
Cancel
Save