diff options
Diffstat (limited to 'libk3b/tools')
79 files changed, 1508 insertions, 1472 deletions
diff --git a/libk3b/tools/k3bactivepipe.cpp b/libk3b/tools/k3bactivepipe.cpp index 5a1e575..3761579 100644 --- a/libk3b/tools/k3bactivepipe.cpp +++ b/libk3b/tools/k3bactivepipe.cpp @@ -19,13 +19,13 @@ #include <kdebug.h> -#include <qthread.h> -#include <qiodevice.h> +#include <tqthread.h> +#include <tqiodevice.h> #include <unistd.h> -class K3bActivePipe::Private : public QThread +class K3bActivePipe::Private : public TQThread { public: Private( K3bActivePipe* pipe ) : @@ -108,17 +108,17 @@ public: K3bPipe pipeIn; K3bPipe pipeOut; - QIODevice* sourceIODevice; - QIODevice* sinkIODevice; + TQIODevice* sourceIODevice; + TQIODevice* sinkIODevice; bool closeWhenDone; bool closeFdToReadFrom; bool closeFdToWriteTo; - QByteArray buffer; + TQByteArray buffer; - Q_UINT64 bytesRead; - Q_UINT64 bytesWritten; + TQ_UINT64 bytesRead; + TQ_UINT64 bytesWritten; }; @@ -189,14 +189,14 @@ void K3bActivePipe::writeToFd( int fd, bool close ) } -void K3bActivePipe::readFromIODevice( QIODevice* dev ) +void K3bActivePipe::readFromIODevice( TQIODevice* dev ) { d->fdToReadFrom = -1; d->sourceIODevice = dev; } -void K3bActivePipe::writeToIODevice( QIODevice* dev ) +void K3bActivePipe::writeToIODevice( TQIODevice* dev ) { d->fdToWriteTo = -1; d->sinkIODevice = dev; @@ -243,13 +243,13 @@ bool K3bActivePipe::pumpSync() } -Q_UINT64 K3bActivePipe::bytesRead() const +TQ_UINT64 K3bActivePipe::bytesRead() const { return d->bytesRead; } -Q_UINT64 K3bActivePipe::bytesWritten() const +TQ_UINT64 K3bActivePipe::bytesWritten() const { return d->bytesWritten; } diff --git a/libk3b/tools/k3bactivepipe.h b/libk3b/tools/k3bactivepipe.h index 367646d..fc2a32d 100644 --- a/libk3b/tools/k3bactivepipe.h +++ b/libk3b/tools/k3bactivepipe.h @@ -16,12 +16,12 @@ #ifndef _K3B_ACTIVE_PIPE_H_ #define _K3B_ACTIVE_PIPE_H_ -#include <qcstring.h> +#include <tqcstring.h> #include <k3b_export.h> -class QIODevice; +class TQIODevice; /** @@ -74,18 +74,18 @@ class LIBK3B_EXPORT K3bActivePipe void writeToFd( int fd, bool close = false ); /** - * Read from a QIODevice instead of a file descriptor. + * Read from a TQIODevice instead of a file descriptor. * The device will be opened IO_ReadOnly and closed * afterwards. */ - void readFromIODevice( QIODevice* dev ); + void readFromIODevice( TQIODevice* dev ); /** - * Write to a QIODevice instead of a file descriptor. + * Write to a TQIODevice instead of a file descriptor. * The device will be opened IO_WriteOnly and closed * afterwards. */ - void writeToIODevice( QIODevice* dev ); + void writeToIODevice( TQIODevice* dev ); /** * The file descriptor to write into @@ -102,12 +102,12 @@ class LIBK3B_EXPORT K3bActivePipe /** * The number of bytes that have been read. */ - Q_UINT64 bytesRead() const; + TQ_UINT64 bytesRead() const; /** * The number of bytes that have been written. */ - Q_UINT64 bytesWritten() const; + TQ_UINT64 bytesWritten() const; protected: /** diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp index d222107..2f53629 100644 --- a/libk3b/tools/k3bbusywidget.cpp +++ b/libk3b/tools/k3bbusywidget.cpp @@ -15,19 +15,19 @@ #include "k3bbusywidget.h" -#include <qtimer.h> -#include <qpainter.h> +#include <tqtimer.h> +#include <tqpainter.h> #include <kglobalsettings.h> -K3bBusyWidget::K3bBusyWidget( QWidget* parent, const char* name ) - : QFrame( parent, name ) +K3bBusyWidget::K3bBusyWidget( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name ) { - m_busyTimer = new QTimer( this ); + m_busyTimer = new TQTimer( this ); m_iBusyPosition = 0; - connect( m_busyTimer, SIGNAL(timeout()), this, SLOT(animateBusy()) ); + connect( m_busyTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animateBusy()) ); m_bBusy = false; } @@ -68,21 +68,21 @@ void K3bBusyWidget::animateBusy() } -QSize K3bBusyWidget::sizeHint() const +TQSize K3bBusyWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -QSize K3bBusyWidget::minimumSizeHint() const +TQSize K3bBusyWidget::tqminimumSizeHint() const { - return QSize( 2*frameWidth() + 62, 10 ); + return TQSize( 2*frameWidth() + 62, 10 ); } -void K3bBusyWidget::drawContents( QPainter* p ) +void K3bBusyWidget::drawContents( TQPainter* p ) { - QRect rect = contentsRect(); + TQRect rect = contentsRect(); int squareSize = 8; diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h index 2a6934c..bc83c5e 100644 --- a/libk3b/tools/k3bbusywidget.h +++ b/libk3b/tools/k3bbusywidget.h @@ -17,28 +17,29 @@ #define K3B_BUSY_WIDGET_H -#include <qframe.h> +#include <tqframe.h> #include "k3b_export.h" -class QPainter; -class QTimer; +class TQPainter; +class TQTimer; -class LIBK3B_EXPORT K3bBusyWidget : public QFrame +class LIBK3B_EXPORT K3bBusyWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bBusyWidget( QWidget* parent = 0, const char* name = 0 ); + K3bBusyWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bBusyWidget(); void showBusy( bool b ); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; protected: - void drawContents( QPainter* p ); + void drawContents( TQPainter* p ); private slots: void animateBusy(); @@ -47,7 +48,7 @@ class LIBK3B_EXPORT K3bBusyWidget : public QFrame bool m_bBusy; int m_iBusyPosition; - QTimer* m_busyTimer; + TQTimer* m_busyTimer; }; diff --git a/libk3b/tools/k3bcdparanoialib.cpp b/libk3b/tools/k3bcdparanoialib.cpp index 5976941..c9339d1 100644 --- a/libk3b/tools/k3bcdparanoialib.cpp +++ b/libk3b/tools/k3bcdparanoialib.cpp @@ -25,8 +25,8 @@ #include <dlfcn.h> -#include <qfile.h> -#include <qmutex.h> +#include <tqfile.h> +#include <tqmutex.h> static bool s_haveLibCdio = false; @@ -189,7 +189,7 @@ class K3bCdparanoiaLibData long sector() const { return m_currentSector; } static K3bCdparanoiaLibData* data( K3bDevice::Device* dev ) { - QMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::const_iterator it = s_dataMap.find( dev ); + TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::const_iterator it = s_dataMap.tqfind( dev ); if( it == s_dataMap.constEnd() ) return new K3bCdparanoiaLibData( dev ); else @@ -198,7 +198,7 @@ class K3bCdparanoiaLibData static void freeAll() { // clean up all K3bCdparanoiaLibData instances - for( QMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::iterator it = s_dataMap.begin(); + for( TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::iterator it = s_dataMap.begin(); it != s_dataMap.end(); ++it ) delete it.data(); } @@ -207,7 +207,7 @@ class K3bCdparanoiaLibData // // We have exactly one instance of K3bCdparanoiaLibData per device // - static QMap<K3bDevice::Device*, K3bCdparanoiaLibData*> s_dataMap; + static TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*> s_dataMap; K3bDevice::Device* m_device; @@ -216,11 +216,11 @@ class K3bCdparanoiaLibData long m_currentSector; - QMutex mutex; + TQMutex mutex; }; -QMap<K3bDevice::Device*, K3bCdparanoiaLibData*> K3bCdparanoiaLibData::s_dataMap; +TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*> K3bCdparanoiaLibData::s_dataMap; bool K3bCdparanoiaLibData::paranoiaInit() { @@ -233,7 +233,7 @@ bool K3bCdparanoiaLibData::paranoiaInit() // the device here m_device->close(); - m_drive = cdda_cdda_identify( QFile::encodeName(m_device->blockDeviceName()), 0, 0 ); + m_drive = cdda_cdda_identify( TQFile::encodeName(m_device->blockDeviceName()), 0, 0 ); if( m_drive == 0 ) { mutex.unlock(); return false; @@ -710,7 +710,7 @@ char* K3bCdparanoiaLib::read( int* statusCode, unsigned int* track, bool littleE // d->updateParanoiaMode(); - Q_INT16* data = d->data->paranoiaRead( paranoiaCallback, d->maxRetries ); + TQ_INT16* data = d->data->paranoiaRead( paranoiaCallback, d->maxRetries ); char* charData = reinterpret_cast<char*>(data); diff --git a/libk3b/tools/k3bcdparanoialib.h b/libk3b/tools/k3bcdparanoialib.h index 70504de..bbeb19e 100644 --- a/libk3b/tools/k3bcdparanoialib.h +++ b/libk3b/tools/k3bcdparanoialib.h @@ -21,7 +21,7 @@ #define CD_FRAMESIZE_RAW 2352 -#include <qstring.h> +#include <tqstring.h> #include <sys/types.h> #include "k3b_export.h" @@ -76,7 +76,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib /** * This will read the Toc and initialize some stuff. - * It will also call paranoiaInit( const QString& ) + * It will also call paranoiaInit( const TQString& ) */ bool initParanoia( K3bDevice::Device* dev ); @@ -122,7 +122,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib */ int status() const; - enum Status { + enum tqStatus { S_OK, S_ERROR // to be extended with Jitter and stuff... diff --git a/libk3b/tools/k3bcdtextvalidator.cpp b/libk3b/tools/k3bcdtextvalidator.cpp index 8b3c97a..19e20d7 100644 --- a/libk3b/tools/k3bcdtextvalidator.cpp +++ b/libk3b/tools/k3bcdtextvalidator.cpp @@ -16,8 +16,8 @@ #include "k3bcdtextvalidator.h" -K3bCdTextValidator::K3bCdTextValidator(QObject *parent, const char *name) - : K3bLatin1Validator(parent, name) +K3bCdTextValidator::K3bCdTextValidator(TQObject *tqparent, const char *name) + : K3bLatin1Validator(tqparent, name) { } @@ -27,7 +27,7 @@ K3bCdTextValidator::~K3bCdTextValidator() } -QValidator::State K3bCdTextValidator::validate( QString& input, int& pos ) const +TQValidator::State K3bCdTextValidator::validate( TQString& input, int& pos ) const { if( input.length() > 160 ) return Invalid; diff --git a/libk3b/tools/k3bcdtextvalidator.h b/libk3b/tools/k3bcdtextvalidator.h index 48ada05..e2d3983 100644 --- a/libk3b/tools/k3bcdtextvalidator.h +++ b/libk3b/tools/k3bcdtextvalidator.h @@ -24,10 +24,10 @@ class LIBK3B_EXPORT K3bCdTextValidator : public K3bLatin1Validator { public: - K3bCdTextValidator(QObject *parent = 0, const char *name = 0); + K3bCdTextValidator(TQObject *tqparent = 0, const char *name = 0); ~K3bCdTextValidator(); - State validate( QString& input, int& pos ) const; + State validate( TQString& input, int& pos ) const; }; #endif diff --git a/libk3b/tools/k3bchecksumpipe.cpp b/libk3b/tools/k3bchecksumpipe.cpp index 21d308a..2e71e97 100644 --- a/libk3b/tools/k3bchecksumpipe.cpp +++ b/libk3b/tools/k3bchecksumpipe.cpp @@ -81,14 +81,14 @@ bool K3bChecksumPipe::open( Type type, bool closeWhenDone ) } -QCString K3bChecksumPipe::checksum() const +TQCString K3bChecksumPipe::checksum() const { switch( d->checksumType ) { case MD5: return d->md5.hexDigest(); } - return QCString(); + return TQCString(); } diff --git a/libk3b/tools/k3bchecksumpipe.h b/libk3b/tools/k3bchecksumpipe.h index 88adc74..f92d60f 100644 --- a/libk3b/tools/k3bchecksumpipe.h +++ b/libk3b/tools/k3bchecksumpipe.h @@ -53,7 +53,7 @@ class LIBK3B_EXPORT K3bChecksumPipe : public K3bActivePipe /** * Get the calculated checksum */ - QCString checksum() const; + TQCString checksum() const; protected: int write( char* data, int max ); diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp index d4f516b..c4b1d20 100644 --- a/libk3b/tools/k3bcutcombobox.cpp +++ b/libk3b/tools/k3bcutcombobox.cpp @@ -17,14 +17,14 @@ #include <k3bstringutils.h> -#include <qfontmetrics.h> -#include <qevent.h> -#include <qstringlist.h> -#include <qrect.h> -#include <qsize.h> -#include <qpixmap.h> -#include <qstyle.h> -#include <qsizepolicy.h> +#include <tqfontmetrics.h> +#include <tqevent.h> +#include <tqstringlist.h> +#include <tqrect.h> +#include <tqsize.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqsizepolicy.h> class K3bCutComboBox::Private @@ -34,23 +34,23 @@ public: method = CUT; } - QStringList originalItems; + TQStringList originalItems; int method; int width; }; -K3bCutComboBox::K3bCutComboBox( QWidget* parent, const char* name ) - : KComboBox( parent, name ) +K3bCutComboBox::K3bCutComboBox( TQWidget* tqparent, const char* name ) + : KComboBox( tqparent, name ) { d = new Private(); - // setSizePolicy( QSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() ); + // tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() ); } -K3bCutComboBox::K3bCutComboBox( int method, QWidget* parent, const char* name ) - : KComboBox( parent, name ) +K3bCutComboBox::K3bCutComboBox( int method, TQWidget* tqparent, const char* name ) + : KComboBox( tqparent, name ) { d = new Private(); d->method = method; @@ -70,9 +70,9 @@ void K3bCutComboBox::setMethod( int m ) } -QSize K3bCutComboBox::sizeHint() const +TQSize K3bCutComboBox::tqsizeHint() const { -// QSize s(KComboBox::sizeHint()); +// TQSize s(KComboBox::tqsizeHint()); // for( int i = 0; i < count(); i++ ) { // int w = fontMetrics().width(d->originalItems[i]) + @@ -81,16 +81,16 @@ QSize K3bCutComboBox::sizeHint() const // s.setWidth( w ); // } - return KComboBox::sizeHint(); + return KComboBox::tqsizeHint(); } -QSize K3bCutComboBox::minimumSizeHint() const +TQSize K3bCutComboBox::tqminimumSizeHint() const { - return KComboBox::minimumSizeHint(); + return KComboBox::tqminimumSizeHint(); } -void K3bCutComboBox::setCurrentText( const QString& s ) +void K3bCutComboBox::setCurrentText( const TQString& s ) { int i; for( i = 0; i < count(); i++ ) @@ -106,18 +106,18 @@ void K3bCutComboBox::setCurrentText( const QString& s ) } -void K3bCutComboBox::insertStringList( const QStringList&, int ) +void K3bCutComboBox::insertStringList( const TQStringList&, int ) { // FIXME } -void K3bCutComboBox::insertStrList( const QStrList&, int ) +void K3bCutComboBox::insertStrList( const TQStrList&, int ) { // FIXME } -void K3bCutComboBox::insertStrList( const QStrList*, int ) +void K3bCutComboBox::insertStrList( const TQStrList*, int ) { // FIXME } @@ -127,17 +127,17 @@ void K3bCutComboBox::insertStrList( const char**, int, int) // FIXME } -void K3bCutComboBox::insertItem( const QString& text, int index ) +void K3bCutComboBox::insertItem( const TQString& text, int index ) { - insertItem( QPixmap(), text, index ); + insertItem( TQPixmap(), text, index ); } -void K3bCutComboBox::insertItem( const QPixmap& pix, int i ) +void K3bCutComboBox::insertItem( const TQPixmap& pix, int i ) { insertItem( pix, "", i ); } -void K3bCutComboBox::insertItem( const QPixmap& pixmap, const QString& text, int index ) +void K3bCutComboBox::insertItem( const TQPixmap& pixmap, const TQString& text, int index ) { if( index != -1 ) d->originalItems.insert( d->originalItems.at(index), text ); @@ -158,34 +158,34 @@ void K3bCutComboBox::removeItem( int i ) KComboBox::removeItem( i ); } -void K3bCutComboBox::changeItem( const QString& s, int i ) +void K3bCutComboBox::changeItem( const TQString& s, int i ) { d->originalItems[i] = s; cutText(); } -void K3bCutComboBox::changeItem( const QPixmap& pix, const QString& s, int i ) +void K3bCutComboBox::changeItem( const TQPixmap& pix, const TQString& s, int i ) { KComboBox::changeItem( pix, i ); changeItem( s, i ); } -QString K3bCutComboBox::text( int i ) const +TQString K3bCutComboBox::text( int i ) const { if( i < (int)d->originalItems.count() ) return d->originalItems[i]; else - return QString::null; + return TQString(); } -QString K3bCutComboBox::currentText() const +TQString K3bCutComboBox::currentText() const { if( currentItem() < (int)d->originalItems.count() ) return d->originalItems[currentItem()]; else - return QString::null; + return TQString(); } @@ -195,7 +195,7 @@ void K3bCutComboBox::clear() d->originalItems.clear(); } -void K3bCutComboBox::resizeEvent( QResizeEvent* e ) +void K3bCutComboBox::resizeEvent( TQResizeEvent* e ) { cutText(); @@ -205,16 +205,16 @@ void K3bCutComboBox::resizeEvent( QResizeEvent* e ) void K3bCutComboBox::cutText() { - d->width = QStyle::visualRect( style().querySubControlMetrics(QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxEditField), this ).width(); + d->width = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxEditField), this ).width(); for( int i = 0; i < (int)d->originalItems.count(); ++i ) { int w = d->width; if ( pixmap(i) && !pixmap(i)->isNull() ) w -= ( pixmap(i)->width() + 4 ); - QString text; - if( d->method == SQUEEZE ) + TQString text; + if( d->method == STQUEEZE ) text = K3b::squeezeTextToWidth( fontMetrics(), d->originalItems[i], w ); else text = K3b::cutToWidth( fontMetrics(), d->originalItems[i], w ); diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h index 1c35e78..19e4ef7 100644 --- a/libk3b/tools/k3bcutcombobox.h +++ b/libk3b/tools/k3bcutcombobox.h @@ -19,7 +19,7 @@ #include <kcombobox.h> #include "k3b_export.h" -class QResizeEvent; +class TQResizeEvent; /** @@ -35,15 +35,16 @@ class QResizeEvent; class LIBK3B_EXPORT K3bCutComboBox : public KComboBox { Q_OBJECT + TQ_OBJECT public: - K3bCutComboBox( QWidget* parent = 0, const char* name = 0 ); - K3bCutComboBox( int method, QWidget* parent = 0, const char* name = 0 ); + K3bCutComboBox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bCutComboBox( int method, TQWidget* tqparent = 0, const char* name = 0 ); virtual ~K3bCutComboBox(); enum Method { CUT, - SQUEEZE + STQUEEZE }; /** @@ -53,35 +54,35 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox void setMethod( int ); /** reimplemeted */ - QSize sizeHint() const; + TQSize tqsizeHint() const; /** reimplemeted */ - QSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; /** reimplemeted */ - virtual void setCurrentText( const QString& ); + virtual void setCurrentText( const TQString& ); - void insertStringList( const QStringList &, int index=-1 ); - void insertStrList( const QStrList &, int index=-1 ); - void insertStrList( const QStrList *, int index=-1 ); + void insertStringList( const TQStringList &, int index=-1 ); + void insertStrList( const TQStrList &, int index=-1 ); + void insertStrList( const TQStrList *, int index=-1 ); void insertStrList( const char **, int numStrings=-1, int index=-1); - void insertItem( const QString &text, int index=-1 ); - void insertItem( const QPixmap &pixmap, int index=-1 ); - void insertItem( const QPixmap &pixmap, const QString &text, int index=-1 ); + void insertItem( const TQString &text, int index=-1 ); + void insertItem( const TQPixmap &pixmap, int index=-1 ); + void insertItem( const TQPixmap &pixmap, const TQString &text, int index=-1 ); void removeItem( int index ); - void changeItem( const QString &text, int index ); - void changeItem( const QPixmap &pixmap, const QString &text, int index ); + void changeItem( const TQString &text, int index ); + void changeItem( const TQPixmap &pixmap, const TQString &text, int index ); - QString text( int ) const; - QString currentText() const; + TQString text( int ) const; + TQString currentText() const; void clear(); protected: - void resizeEvent( QResizeEvent* e ); + void resizeEvent( TQResizeEvent* e ); void cutText(); private: diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp index 165b59d..e6ce8ce 100644 --- a/libk3b/tools/k3bdevicecombobox.cpp +++ b/libk3b/tools/k3bdevicecombobox.cpp @@ -20,26 +20,26 @@ #include <klocale.h> -#include <qmap.h> -#include <qptrvector.h> +#include <tqmap.h> +#include <tqptrvector.h> class K3bDeviceComboBox::Private { public: - QMap<QString, int> deviceIndexMap; - QPtrVector<K3bDevice::Device> devices; + TQMap<TQString, int> deviceIndexMap; + TQPtrVector<K3bDevice::Device> devices; }; -K3bDeviceComboBox::K3bDeviceComboBox( QWidget* parent, const char* name ) - : KComboBox( parent, name ) +K3bDeviceComboBox::K3bDeviceComboBox( TQWidget* tqparent, const char* name ) + : KComboBox( tqparent, name ) { d = new Private(); - connect( this, SIGNAL(activated(int)), - this, SLOT(slotActivated(int)) ); - connect( k3bcore->deviceManager(), SIGNAL(changed(K3bDevice::DeviceManager*)), - this, SLOT(slotDeviceManagerChanged(K3bDevice::DeviceManager*)) ); + connect( this, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotActivated(int)) ); + connect( k3bcore->deviceManager(), TQT_SIGNAL(changed(K3bDevice::DeviceManager*)), + this, TQT_SLOT(slotDeviceManagerChanged(K3bDevice::DeviceManager*)) ); } @@ -96,10 +96,10 @@ void K3bDeviceComboBox::addDevice( K3bDevice::Device* dev ) void K3bDeviceComboBox::removeDevice( K3bDevice::Device* dev ) { if( dev ) { - if( d->deviceIndexMap.contains(dev->devicename()) ) { + if( d->deviceIndexMap.tqcontains(dev->devicename()) ) { // let's make it easy and recreate the whole list K3bDevice::Device* selDev = selectedDevice(); - QPtrList<K3bDevice::Device> devices; + TQPtrList<K3bDevice::Device> devices; for( unsigned int i = 0; i < d->devices.size(); ++i ) devices.append( d->devices[i] ); @@ -114,19 +114,19 @@ void K3bDeviceComboBox::removeDevice( K3bDevice::Device* dev ) } -void K3bDeviceComboBox::addDevices( const QPtrList<K3bDevice::Device>& list ) +void K3bDeviceComboBox::addDevices( const TQPtrList<K3bDevice::Device>& list ) { - for( QPtrListIterator<K3bDevice::Device> it( list ); + for( TQPtrListIterator<K3bDevice::Device> it( list ); it.current(); ++it ) addDevice( it.current() ); } -void K3bDeviceComboBox::refreshDevices( const QPtrList<K3bDevice::Device>& list ) +void K3bDeviceComboBox::refreshDevices( const TQPtrList<K3bDevice::Device>& list ) { K3bDevice::Device* selDev = selectedDevice(); clear(); - if( !list.containsRef( selDev ) ) + if( !list.tqcontainsRef( selDev ) ) selDev = 0; addDevices( list ); setSelectedDevice( selDev ); @@ -136,7 +136,7 @@ void K3bDeviceComboBox::refreshDevices( const QPtrList<K3bDevice::Device>& list void K3bDeviceComboBox::setSelectedDevice( K3bDevice::Device* dev ) { if( dev ) { - if( d->deviceIndexMap.contains(dev->devicename()) ) { + if( d->deviceIndexMap.tqcontains(dev->devicename()) ) { setCurrentItem( d->deviceIndexMap[dev->devicename()] ); emit selectionChanged( dev ); } @@ -162,7 +162,7 @@ void K3bDeviceComboBox::slotDeviceManagerChanged( K3bDevice::DeviceManager* dm ) { unsigned int i = 0; while( i < d->devices.size() ) { - if( !dm->allDevices().containsRef( d->devices[i] ) ) { + if( !dm->allDevices().tqcontainsRef( d->devices[i] ) ) { removeDevice( d->devices[i] ); i = 0; } diff --git a/libk3b/tools/k3bdevicecombobox.h b/libk3b/tools/k3bdevicecombobox.h index 5a9cb85..51b93ce 100644 --- a/libk3b/tools/k3bdevicecombobox.h +++ b/libk3b/tools/k3bdevicecombobox.h @@ -34,9 +34,10 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDeviceComboBox : public KComboBox { Q_OBJECT + TQ_OBJECT public: - K3bDeviceComboBox( QWidget* parent = 0, const char* name = 0 ); + K3bDeviceComboBox( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDeviceComboBox(); K3bDevice::Device* selectedDevice() const; @@ -46,11 +47,11 @@ class LIBK3B_EXPORT K3bDeviceComboBox : public KComboBox public slots: void addDevice( K3bDevice::Device* ); - void addDevices( const QPtrList<K3bDevice::Device>& ); + void addDevices( const TQPtrList<K3bDevice::Device>& ); /** * Clears the device combo and tries to keep the current selection */ - void refreshDevices( const QPtrList<K3bDevice::Device>& ); + void refreshDevices( const TQPtrList<K3bDevice::Device>& ); void removeDevice( K3bDevice::Device* ); void setSelectedDevice( K3bDevice::Device* ); void clear(); diff --git a/libk3b/tools/k3bdevicehandler.cpp b/libk3b/tools/k3bdevicehandler.cpp index c77f1e6..92fd2ff 100644 --- a/libk3b/tools/k3bdevicehandler.cpp +++ b/libk3b/tools/k3bdevicehandler.cpp @@ -129,7 +129,7 @@ public: DiskInfo ngInfo; Toc toc; CdText cdText; - QByteArray cdTextRaw; + TQByteArray cdTextRaw; long long bufferCapacity; long long availableBufferCapacity; Device* dev; @@ -139,8 +139,8 @@ private: }; -K3bDevice::DeviceHandler::DeviceHandler( Device* dev, QObject* parent, const char* name ) - : K3bThreadJob( 0, parent, name ), +K3bDevice::DeviceHandler::DeviceHandler( Device* dev, TQObject* tqparent, const char* name ) + : K3bThreadJob( 0, tqparent, name ), m_selfDelete(false) { m_thread = new DeviceHandlerThread(); @@ -149,8 +149,8 @@ K3bDevice::DeviceHandler::DeviceHandler( Device* dev, QObject* parent, const cha } -K3bDevice::DeviceHandler::DeviceHandler( QObject* parent, const char* name ) - : K3bThreadJob( 0, parent, name ), +K3bDevice::DeviceHandler::DeviceHandler( TQObject* tqparent, const char* name ) + : K3bThreadJob( 0, tqparent, name ), m_selfDelete(false) { m_thread = new DeviceHandlerThread(); @@ -202,7 +202,7 @@ const K3bDevice::CdText& K3bDevice::DeviceHandler::cdText() const } -const QByteArray& K3bDevice::DeviceHandler::cdTextRaw() const +const TQByteArray& K3bDevice::DeviceHandler::cdTextRaw() const { return m_thread->cdTextRaw; } @@ -311,7 +311,7 @@ K3bDevice::DeviceHandler* K3bDevice::sendCommand( int command, Device* dev ) return new DeviceHandler( command, dev, "DeviceHandler" ); } -void K3bDevice::DeviceHandler::customEvent( QCustomEvent* e ) +void K3bDevice::DeviceHandler::customEvent( TQCustomEvent* e ) { K3bThreadJob::customEvent(e); diff --git a/libk3b/tools/k3bdevicehandler.h b/libk3b/tools/k3bdevicehandler.h index d5159a0..da26629 100644 --- a/libk3b/tools/k3bdevicehandler.h +++ b/libk3b/tools/k3bdevicehandler.h @@ -23,9 +23,9 @@ #include "k3bmsf.h" #include "k3bcdtext.h" #include "k3b_export.h" -#include <qcstring.h> +#include <tqcstring.h> -class QCustomEvent; +class TQCustomEvent; namespace K3bDevice @@ -47,10 +47,11 @@ namespace K3bDevice class LIBK3B_EXPORT DeviceHandler : public K3bThreadJob { Q_OBJECT + TQ_OBJECT public: - DeviceHandler( Device*, QObject* parent = 0, const char* name = 0 ); - DeviceHandler( QObject* parent = 0, const char* name = 0 ); + DeviceHandler( Device*, TQObject* tqparent = 0, const char* name = 0 ); + DeviceHandler( TQObject* tqparent = 0, const char* name = 0 ); /** * This constructor is used by the global "quick" methods and should not be used @@ -63,7 +64,7 @@ namespace K3bDevice const DiskInfo& diskInfo() const; const Toc& toc() const; const CdText& cdText() const; - const QByteArray& cdTextRaw() const; + const TQByteArray& cdTextRaw() const; K3b::Msf diskSize() const; K3b::Msf remainingSize() const; int tocType() const; @@ -164,7 +165,7 @@ namespace K3bDevice /** * reimplemented from K3bThreadJob for internal reasons */ - virtual void customEvent( QCustomEvent* ); + virtual void customEvent( TQCustomEvent* ); private: class DeviceHandlerThread; @@ -177,8 +178,8 @@ namespace K3bDevice * Usage: * \code * connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::MOUNT, dev ), - * SIGNAL(finished(DeviceHandler*)), - * this, SLOT(someSlot(DeviceHandler*)) ); + * TQT_SIGNAL(finished(DeviceHandler*)), + * this, TQT_SLOT(someSlot(DeviceHandler*)) ); * * void someSlot( DeviceHandler* dh ) { * if( dh->success() ) { diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp index d622457..c4e03ee 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.cpp +++ b/libk3b/tools/k3bdeviceselectiondialog.cpp @@ -21,11 +21,11 @@ #include <k3bcore.h> #include <k3bdevicemanager.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qstring.h> -#include <qframe.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqstring.h> +#include <tqframe.h> #include <klocale.h> @@ -37,23 +37,23 @@ public: }; -K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( QWidget* parent, +K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( TQWidget* tqparent, const char* name, - const QString& text, + const TQString& text, bool modal ) : KDialogBase( KDialogBase::Plain, i18n("Device Selection"), Ok|Cancel, Ok, - parent, + tqparent, name, modal ) { d = new Private(); - QGridLayout* lay = new QGridLayout( plainPage() ); + TQGridLayout* lay = new TQGridLayout( plainPage() ); - QLabel* label = new QLabel( text.isEmpty() ? i18n("Please select a device:") : text, plainPage() ); + TQLabel* label = new TQLabel( text.isEmpty() ? i18n("Please select a device:") : text, plainPage() ); d->comboDevices = new K3bDeviceComboBox( plainPage() ); // lay->setMargin( marginHint() ); @@ -76,7 +76,7 @@ void K3bDeviceSelectionDialog::addDevice( K3bDevice::Device* dev ) } -void K3bDeviceSelectionDialog::addDevices( const QPtrList<K3bDevice::Device>& list ) +void K3bDeviceSelectionDialog::addDevices( const TQPtrList<K3bDevice::Device>& list ) { d->comboDevices->addDevices( list ); } @@ -94,16 +94,16 @@ void K3bDeviceSelectionDialog::setSelectedDevice( K3bDevice::Device* dev ) } -K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( QWidget* parent, - const QPtrList<K3bDevice::Device>& devices, - const QString& text ) +K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, + const TQPtrList<K3bDevice::Device>& devices, + const TQString& text ) { if( devices.isEmpty() ) return 0; if( devices.count() == 1 ) return devices.getFirst(); - K3bDeviceSelectionDialog dlg( parent, 0, text ); + K3bDeviceSelectionDialog dlg( tqparent, 0, text ); dlg.addDevices( devices ); if( dlg.exec() == Accepted ) @@ -112,18 +112,18 @@ K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( QWidget* parent, return 0; } -K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( QWidget* parent, - const QString& text ) +K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, + const TQString& text ) { - return selectDevice( parent, k3bcore->deviceManager()->allDevices(), text ); + return selectDevice( tqparent, k3bcore->deviceManager()->allDevices(), text ); } -K3bDevice::Device* K3bDeviceSelectionDialog::selectWriter( QWidget* parent, const QString& text ) +K3bDevice::Device* K3bDeviceSelectionDialog::selectWriter( TQWidget* tqparent, const TQString& text ) { - return selectDevice( parent, k3bcore->deviceManager()->burningDevices(), text ); + return selectDevice( tqparent, k3bcore->deviceManager()->burningDevices(), text ); } diff --git a/libk3b/tools/k3bdeviceselectiondialog.h b/libk3b/tools/k3bdeviceselectiondialog.h index b61ce1e..5295408 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.h +++ b/libk3b/tools/k3bdeviceselectiondialog.h @@ -21,7 +21,7 @@ #include <kdialogbase.h> #include "k3b_export.h" -#include <qptrlist.h> +#include <tqptrlist.h> namespace K3bDevice { class Device; @@ -31,28 +31,29 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDeviceSelectionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bDeviceSelectionDialog( QWidget* parent = 0, + K3bDeviceSelectionDialog( TQWidget* tqparent = 0, const char* name = 0, - const QString& text = QString::null, + const TQString& text = TQString(), bool modal = false ); ~K3bDeviceSelectionDialog(); void addDevice( K3bDevice::Device* ); - void addDevices( const QPtrList<K3bDevice::Device>& ); + void addDevices( const TQPtrList<K3bDevice::Device>& ); void setSelectedDevice( K3bDevice::Device* ); K3bDevice::Device* selectedDevice() const; - static K3bDevice::Device* selectWriter( QWidget* parent, - const QString& text = QString::null ); - static K3bDevice::Device* selectDevice( QWidget* parent, - const QString& text = QString::null ); - static K3bDevice::Device* selectDevice( QWidget* parent, - const QPtrList<K3bDevice::Device>& devices, - const QString& text = QString::null ); + static K3bDevice::Device* selectWriter( TQWidget* tqparent, + const TQString& text = TQString() ); + static K3bDevice::Device* selectDevice( TQWidget* tqparent, + const TQString& text = TQString() ); + static K3bDevice::Device* selectDevice( TQWidget* tqparent, + const TQPtrList<K3bDevice::Device>& devices, + const TQString& text = TQString() ); private: class Private; diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp index ab9cb8a..51b28e8 100644 --- a/libk3b/tools/k3bdirsizejob.cpp +++ b/libk3b/tools/k3bdirsizejob.cpp @@ -23,8 +23,8 @@ #include <kdebug.h> #include <kglobal.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqfileinfo.h> +#include <tqdir.h> class K3bDirSizeJob::WorkThread : public K3bThread @@ -51,7 +51,7 @@ public: void run() { emitStarted(); - QStringList l; + TQStringList l; for( KURL::List::const_iterator it = urls.begin(); it != urls.end(); ++it ) { const KURL& url = *it; @@ -65,13 +65,13 @@ public: l.append( url.path() ); } - emitFinished( countFiles( l, QString() ) ); + emitFinished( countFiles( l, TQString() ) ); } - bool countDir( const QString& dir ) { - const QString& dot = KGlobal::staticQString( "." ); - const QString& dotdot = KGlobal::staticQString( ".." ); - QStringList l = QDir(dir).entryList( QDir::All|QDir::Hidden|QDir::System ); + bool countDir( const TQString& dir ) { + const TQString& dot = KGlobal::staticQString( "." ); + const TQString& dotdot = KGlobal::staticQString( ".." ); + TQStringList l = TQDir(dir).entryList( TQDir::All|TQDir::Hidden|TQDir::System ); l.remove( dot ); l.remove( dotdot ); @@ -79,21 +79,21 @@ public: } - bool countFiles( const QStringList& l, const QString& dir ) { - for( QStringList::const_iterator it = l.begin(); + bool countFiles( const TQStringList& l, const TQString& dir ) { + for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it ) { if( m_canceled ) return false; k3b_struct_stat s; - if( k3b_lstat( QFile::encodeName( dir + *it ), &s ) ) + if( k3b_lstat( TQFile::encodeName( dir + *it ), &s ) ) return false; if( S_ISLNK( s.st_mode ) ) { ++totalSymlinks; if( followSymlinks ) { - if( k3b_stat( QFile::encodeName( dir + *it ), &s ) ) + if( k3b_stat( TQFile::encodeName( dir + *it ), &s ) ) return false; } } @@ -131,8 +131,8 @@ private: }; -K3bDirSizeJob::K3bDirSizeJob( QObject* parent ) - : K3bThreadJob( new K3bSimpleJobHandler(), parent ) +K3bDirSizeJob::K3bDirSizeJob( TQObject* tqparent ) + : K3bThreadJob( new K3bSimpleJobHandler(), tqparent ) { d = new WorkThread; setThread( d ); diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h index d6a3e5a..82c54d5 100644 --- a/libk3b/tools/k3bdirsizejob.h +++ b/libk3b/tools/k3bdirsizejob.h @@ -31,9 +31,10 @@ class LIBK3B_EXPORT K3bDirSizeJob : public K3bThreadJob { Q_OBJECT + TQ_OBJECT public: - K3bDirSizeJob( QObject* parent = 0 ); + K3bDirSizeJob( TQObject* tqparent = 0 ); ~K3bDirSizeJob(); KIO::filesize_t totalSize() const; diff --git a/libk3b/tools/k3bexceptions.cpp b/libk3b/tools/k3bexceptions.cpp index 1d8806f..70c11e5 100644 --- a/libk3b/tools/k3bexceptions.cpp +++ b/libk3b/tools/k3bexceptions.cpp @@ -25,7 +25,7 @@ bool K3bExceptions::brokenDaoAudio( K3bDevice::Device* dev ) if( dev->vendor().upper().startsWith("HL-DT-ST") ) if( dev->description().upper().startsWith("RW/DVD GCC-4320B") || - dev->description().upper().contains("GCE-8520B") ) + dev->description().upper().tqcontains("GCE-8520B") ) return true; if( dev->vendor().upper().startsWith("PHILIPS") && @@ -35,7 +35,7 @@ bool K3bExceptions::brokenDaoAudio( K3bDevice::Device* dev ) if( dev->vendor().upper().startsWith("LITE-ON") ) if( dev->description().upper().startsWith("LTR-32123S") || dev->description().upper().startsWith("LTR-40125S") || - dev->description().upper().contains("LTC-48161H") || + dev->description().upper().tqcontains("LTC-48161H") || dev->description().upper().startsWith("DVDRW LDW-811S") ) return true; diff --git a/libk3b/tools/k3bfilesplitter.cpp b/libk3b/tools/k3bfilesplitter.cpp index af5b83f..7833f86 100644 --- a/libk3b/tools/k3bfilesplitter.cpp +++ b/libk3b/tools/k3bfilesplitter.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> -#include <qfile.h> +#include <tqfile.h> class K3bFileSplitter::Private @@ -28,11 +28,11 @@ public: : m_splitter( splitter ) { } - QString filename; - QFile file; + TQString filename; + TQFile file; int counter; - // QIODevice::Offset is too small on most compilations + // TQIODevice::Offset is too small on most compilations KIO::filesize_t maxFileSize; KIO::filesize_t currentOverallPos; @@ -47,14 +47,14 @@ public: } } - QString buildFileName( int counter ) { + TQString buildFileName( int counter ) { if( counter > 0 ) - return filename + '.' + QString::number(counter).rightJustify( 3, '0' ); + return filename + '.' + TQString::number(counter).rightJustify( 3, '0' ); else return filename; } - QString currentFileName() { + TQString currentFileName() { return buildFileName( counter ); } @@ -91,7 +91,7 @@ K3bFileSplitter::K3bFileSplitter() } -K3bFileSplitter::K3bFileSplitter( const QString& filename ) +K3bFileSplitter::K3bFileSplitter( const TQString& filename ) { d = new Private( this ); setName( filename ); @@ -104,13 +104,13 @@ K3bFileSplitter::~K3bFileSplitter() } -const QString& K3bFileSplitter::name() const +const TQString& K3bFileSplitter::name() const { return d->filename; } -void K3bFileSplitter::setName( const QString& filename ) +void K3bFileSplitter::setName( const TQString& filename ) { close(); d->maxFileSize = 0; @@ -155,21 +155,24 @@ void K3bFileSplitter::flush() d->file.flush(); } - -QIODevice::Offset K3bFileSplitter::size() const +#ifdef USE_QT4 +qint64 K3bFileSplitter::size() const +#else // USE_QT4 +TQIODevice::Offset K3bFileSplitter::size() const +#endif // USE_QT4 { // not implemented due to Offset size limitations return 0; } -QIODevice::Offset K3bFileSplitter::at() const +TQIODevice::Offset K3bFileSplitter::at() const { return d->currentOverallPos; } -bool K3bFileSplitter::at( QIODevice::Offset pos ) +bool K3bFileSplitter::at( TQIODevice::Offset pos ) { Q_UNUSED( pos ); // not implemented due to Offset size limitations @@ -179,13 +182,13 @@ bool K3bFileSplitter::at( QIODevice::Offset pos ) bool K3bFileSplitter::atEnd() const { - return d->file.atEnd() && !QFile::exists( d->buildFileName( d->counter+1 ) ); + return d->file.atEnd() && !TQFile::exists( d->buildFileName( d->counter+1 ) ); } -Q_LONG K3bFileSplitter::readBlock( char *data, Q_ULONG maxlen ) +TQ_LONG K3bFileSplitter::readBlock( char *data, TQ_ULONG maxlen ) { - Q_LONG r = d->file.readBlock( data, maxlen ); + TQ_LONG r = d->file.readBlock( data, maxlen ); if( r == 0 ) { if( atEnd() ) { return r; @@ -204,12 +207,12 @@ Q_LONG K3bFileSplitter::readBlock( char *data, Q_ULONG maxlen ) } -Q_LONG K3bFileSplitter::writeBlock( const char *data, Q_ULONG len ) +TQ_LONG K3bFileSplitter::writeBlock( const char *data, TQ_ULONG len ) { - // We cannot rely on QFile::at since it uses long on most copmpilations - Q_ULONG max = (Q_ULONG)QMIN( (KIO::filesize_t)len, d->maxFileSize - d->currentFilePos ); + // We cannot rely on TQFile::at since it uses long on most copmpilations + TQ_ULONG max = (TQ_ULONG)TQMIN( (KIO::filesize_t)len, d->maxFileSize - d->currentFilePos ); - Q_LONG r = d->file.writeBlock( data, max ); + TQ_LONG r = d->file.writeBlock( data, max ); if( r < 0 ) return r; @@ -218,7 +221,7 @@ Q_LONG K3bFileSplitter::writeBlock( const char *data, Q_ULONG len ) d->currentFilePos += r; // recursively call us - if( (Q_ULONG)r < len ) { + if( (TQ_ULONG)r < len ) { if( d->openNextFile() ) return r + writeBlock( data+r, len-r ); else @@ -296,8 +299,8 @@ int K3bFileSplitter::ungetch( int c ) void K3bFileSplitter::remove() { close(); - while( QFile::exists( d->buildFileName( d->counter ) ) ) - QFile::remove( d->buildFileName( d->counter++ ) ); + while( TQFile::exists( d->buildFileName( d->counter ) ) ) + TQFile::remove( d->buildFileName( d->counter++ ) ); } diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h index 22dcad9..40af5ab 100644 --- a/libk3b/tools/k3bfilesplitter.h +++ b/libk3b/tools/k3bfilesplitter.h @@ -16,8 +16,8 @@ #ifndef _K3B_FILE_SPLITTER_H_ #define _K3B_FILE_SPLITTER_H_ -#include <qiodevice.h> -#include <qstring.h> +#include <tqiodevice.h> +#include <tqstring.h> #include <kio/global.h> @@ -25,7 +25,7 @@ /** - * QFile replacement which splits + * TQFile replacement which splits * big files according to the underlying file system's * maximum file size. * @@ -39,11 +39,11 @@ * ... * </pre> */ -class LIBK3B_EXPORT K3bFileSplitter : public QIODevice +class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice { public: K3bFileSplitter(); - K3bFileSplitter( const QString& filename ); + K3bFileSplitter( const TQString& filename ); ~K3bFileSplitter(); /** @@ -55,14 +55,19 @@ class LIBK3B_EXPORT K3bFileSplitter : public QIODevice */ void setMaxFileSize( KIO::filesize_t size ); - const QString& name() const; + const TQString& name() const; - void setName( const QString& filename ); + void setName( const TQString& filename ); virtual bool open( int mode ); virtual void close(); +#ifdef USE_QT4 + inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); } + inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); } +#endif // USE_QT4 + /** * File descriptor to read from and write to. * Not implemented yet! @@ -74,7 +79,11 @@ class LIBK3B_EXPORT K3bFileSplitter : public QIODevice /** * Not implemented */ +#ifdef USE_QT4 + virtual qint64 size() const; +#else // USE_QT4 virtual Offset size() const; +#endif // USE_QT4 /** * Not implemented @@ -87,8 +96,8 @@ class LIBK3B_EXPORT K3bFileSplitter : public QIODevice virtual bool at( Offset ); virtual bool atEnd() const; - virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ); - virtual Q_LONG writeBlock( const char *data, Q_ULONG len ); + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ); virtual int getch(); virtual int putch( int ); virtual int ungetch( int ); diff --git a/libk3b/tools/k3bfilesysteminfo.cpp b/libk3b/tools/k3bfilesysteminfo.cpp index fe1eaf8..026643f 100644 --- a/libk3b/tools/k3bfilesysteminfo.cpp +++ b/libk3b/tools/k3bfilesysteminfo.cpp @@ -19,9 +19,9 @@ #include <k3bglobals.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> #include <kdebug.h> @@ -57,13 +57,13 @@ public: } FileSystemType type; - QString path; + TQString path; bool statDone; void stat() { struct statfs fs; - if( !::statfs( QFile::encodeName( QFileInfo(path).dirPath( true ) ), &fs ) ) { + if( !::statfs( TQFile::encodeName( TQFileInfo(path).dirPath( true ) ), &fs ) ) { switch( fs.f_type ) { case 0x4d44: // MS-DOS type = FS_FAT; @@ -86,7 +86,7 @@ K3bFileSystemInfo::K3bFileSystemInfo() } -K3bFileSystemInfo::K3bFileSystemInfo( const QString& path ) +K3bFileSystemInfo::K3bFileSystemInfo( const TQString& path ) { d = new Private; d->path = path; @@ -108,13 +108,13 @@ K3bFileSystemInfo::~K3bFileSystemInfo() } -QString K3bFileSystemInfo::path() const +TQString K3bFileSystemInfo::path() const { return d->path; } -void K3bFileSystemInfo::setPath( const QString& path ) +void K3bFileSystemInfo::setPath( const TQString& path ) { if( d->path != path ) { d->path = path; @@ -131,11 +131,11 @@ K3bFileSystemInfo::FileSystemType K3bFileSystemInfo::type() const } -QString K3bFileSystemInfo::fixupPath( const QString& path ) +TQString K3bFileSystemInfo::fixupPath( const TQString& path ) { - QString s = K3b::fixupPath( path ); + TQString s = K3b::fixupPath( path ); if( type() == K3bFileSystemInfo::FS_FAT ) - return s.replace( QRegExp("[\"\\?\\*/\\\\[\\]\\|\\=\\:;]"), "_" ); + return s.tqreplace( TQRegExp("[\"\\?\\*/\\\\[\\]\\|\\=\\:;]"), "_" ); else return s; } diff --git a/libk3b/tools/k3bfilesysteminfo.h b/libk3b/tools/k3bfilesysteminfo.h index be9995c..7a19115 100644 --- a/libk3b/tools/k3bfilesysteminfo.h +++ b/libk3b/tools/k3bfilesysteminfo.h @@ -18,18 +18,18 @@ #include <k3b_export.h> -#include <qstring.h> +#include <tqstring.h> class LIBK3B_EXPORT K3bFileSystemInfo { public: K3bFileSystemInfo(); - K3bFileSystemInfo( const QString& path ); + K3bFileSystemInfo( const TQString& path ); K3bFileSystemInfo( const K3bFileSystemInfo& ); ~K3bFileSystemInfo(); - QString path() const; - void setPath( const QString& path ); + TQString path() const; + void setPath( const TQString& path ); enum FileSystemType { FS_UNKNOWN, @@ -46,7 +46,7 @@ class LIBK3B_EXPORT K3bFileSystemInfo * For now it only replaces characters like * or [ * on FAT file systems. */ - QString fixupPath( const QString& ); + TQString fixupPath( const TQString& ); private: class Private; diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp index 19ac649..cb5b2b3 100644 --- a/libk3b/tools/k3bintmapcombobox.cpp +++ b/libk3b/tools/k3bintmapcombobox.cpp @@ -15,30 +15,30 @@ #include "k3bintmapcombobox.h" -#include <qwhatsthis.h> -#include <qmap.h> -#include <qvaluevector.h> +#include <tqwhatsthis.h> +#include <tqmap.h> +#include <tqvaluevector.h> class K3bIntMapComboBox::Private { public: - QMap<int, int> valueIndexMap; - QMap<int, QPair<int, QString> > indexValueDescriptionMap; + TQMap<int, int> valueIndexMap; + TQMap<int, TQPair<int, TQString> > indexValueDescriptionMap; - QString topWhatsThis; - QString bottomWhatsThis; + TQString topWhatsThis; + TQString bottomWhatsThis; }; -K3bIntMapComboBox::K3bIntMapComboBox( QWidget* parent, const char* name ) - : KComboBox( parent, name ) +K3bIntMapComboBox::K3bIntMapComboBox( TQWidget* tqparent, const char* name ) + : KComboBox( tqparent, name ) { d = new Private; - connect( this, SIGNAL(highlighted(int)), - this, SLOT(slotItemHighlighted(int)) ); - connect( this, SIGNAL(activated(int)), - this, SLOT(slotItemActivated(int)) ); + connect( this, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotItemHighlighted(int)) ); + connect( this, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotItemActivated(int)) ); } @@ -59,7 +59,7 @@ int K3bIntMapComboBox::selectedValue() const void K3bIntMapComboBox::setSelectedValue( int value ) { - if( d->valueIndexMap.contains( value ) ) + if( d->valueIndexMap.tqcontains( value ) ) KComboBox::setCurrentItem( d->valueIndexMap[value] ); } @@ -73,16 +73,16 @@ void K3bIntMapComboBox::clear() } -bool K3bIntMapComboBox::insertItem( int value, const QString& text, const QString& description, int index ) +bool K3bIntMapComboBox::insertItem( int value, const TQString& text, const TQString& description, int index ) { - if( d->valueIndexMap.contains( value ) ) + if( d->valueIndexMap.tqcontains( value ) ) return false; // FIXME: allow inserition at any index index = KComboBox::count(); d->valueIndexMap[value] = index; - d->indexValueDescriptionMap[index] = qMakePair<int, QString>( value, description ); + d->indexValueDescriptionMap[index] = tqMakePair<int, TQString>( value, description ); KComboBox::insertItem( text ); @@ -94,14 +94,14 @@ bool K3bIntMapComboBox::insertItem( int value, const QString& text, const QStrin void K3bIntMapComboBox::updateWhatsThis() { - QString ws( d->topWhatsThis ); + TQString ws( d->topWhatsThis ); for( unsigned int i = 0; i < d->indexValueDescriptionMap.count(); ++i ) { ws += "<p><b>" + KComboBox::text( i ) + "</b><br>"; ws += d->indexValueDescriptionMap[i].second; } ws += "<p>" + d->bottomWhatsThis; - QWhatsThis::add( this, ws ); + TQWhatsThis::add( this, ws ); } @@ -117,7 +117,7 @@ void K3bIntMapComboBox::slotItemActivated( int index ) } -void K3bIntMapComboBox::addGlobalWhatsThisText( const QString& top, const QString& bottom ) +void K3bIntMapComboBox::addGlobalWhatsThisText( const TQString& top, const TQString& bottom ) { d->topWhatsThis = top; d->bottomWhatsThis = bottom; diff --git a/libk3b/tools/k3bintmapcombobox.h b/libk3b/tools/k3bintmapcombobox.h index b0ae717..622c202 100644 --- a/libk3b/tools/k3bintmapcombobox.h +++ b/libk3b/tools/k3bintmapcombobox.h @@ -30,9 +30,10 @@ class LIBK3B_EXPORT K3bIntMapComboBox : public KComboBox { Q_OBJECT + TQ_OBJECT public: - K3bIntMapComboBox( QWidget* parent = 0, const char* name = 0 ); + K3bIntMapComboBox( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bIntMapComboBox(); int selectedValue() const; @@ -65,9 +66,9 @@ class LIBK3B_EXPORT K3bIntMapComboBox : public KComboBox * * \return true if the item could be inserted. False if the value had already been inserted. */ - bool insertItem( int value, const QString& text, const QString& description, int index = -1 ); + bool insertItem( int value, const TQString& text, const TQString& description, int index = -1 ); - void addGlobalWhatsThisText( const QString& top, const QString& bottom ); + void addGlobalWhatsThisText( const TQString& top, const TQString& bottom ); private slots: void slotItemActivated( int ); diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp index dabf719..ed38088 100644 --- a/libk3b/tools/k3bintvalidator.cpp +++ b/libk3b/tools/k3bintvalidator.cpp @@ -14,8 +14,8 @@ */ -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> #include "k3bintvalidator.h" @@ -24,15 +24,15 @@ #include <kdebug.h> -K3bIntValidator::K3bIntValidator ( QWidget * parent, const char * name ) - : QValidator(parent, name) +K3bIntValidator::K3bIntValidator ( TQWidget * tqparent, const char * name ) + : TQValidator(TQT_TQOBJECT(tqparent), name) { m_min = m_max = 0; } -K3bIntValidator::K3bIntValidator ( int bottom, int top, QWidget * parent, const char * name ) - : QValidator(parent, name) +K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * tqparent, const char * name ) + : TQValidator(TQT_TQOBJECT(tqparent), name) { m_min = bottom; m_max = top; @@ -44,11 +44,11 @@ K3bIntValidator::~K3bIntValidator () } -QValidator::State K3bIntValidator::validate ( QString &str, int & ) const +TQValidator::State K3bIntValidator::validate ( TQString &str, int & ) const { bool ok; int val = 0; - QString newStr; + TQString newStr; newStr = str.stripWhiteSpace(); newStr = newStr.upper(); @@ -70,7 +70,7 @@ QValidator::State K3bIntValidator::validate ( QString &str, int & ) const if( minus && m_min && m_min >= 0) ok = false; else - return QValidator::Acceptable; + return TQValidator::Acceptable; } val = newStr.toInt( &ok, hex ? 16 : 10 ); @@ -83,22 +83,22 @@ QValidator::State K3bIntValidator::validate ( QString &str, int & ) const } if( !ok ) - return QValidator::Invalid; + return TQValidator::Invalid; if( m_min && val > 0 && val < m_min ) - return QValidator::Acceptable; + return TQValidator::Acceptable; if( m_max && val < 0 && val > m_max ) - return QValidator::Acceptable; + return TQValidator::Acceptable; if( (m_max && val > m_max) || (m_min && val < m_min) ) - return QValidator::Invalid; + return TQValidator::Invalid; - return QValidator::Valid; + return TQValidator::Valid; } -void K3bIntValidator::fixup ( QString& ) const +void K3bIntValidator::fixup ( TQString& ) const { // TODO: remove preceding zeros } @@ -126,7 +126,7 @@ int K3bIntValidator::top () const } -int K3bIntValidator::toInt( const QString& s, bool* ok ) +int K3bIntValidator::toInt( const TQString& s, bool* ok ) { if( s.lower().startsWith( "0x" ) ) return s.right( s.length()-2 ).toInt( ok, 16 ); diff --git a/libk3b/tools/k3bintvalidator.h b/libk3b/tools/k3bintvalidator.h index 551d56a..0945f89 100644 --- a/libk3b/tools/k3bintvalidator.h +++ b/libk3b/tools/k3bintvalidator.h @@ -17,29 +17,29 @@ #ifndef _K3B_INT_VALIDATOR_H_ #define _K3B_INT_VALIDATOR_H_ -#include <qvalidator.h> +#include <tqvalidator.h> #include "k3b_export.h" -class QWidget; -class QString; +class TQWidget; +class TQString; /** - * QValidator for integers. + * TQValidator for integers. * - * It differs from QIntValidator and KIntValidator in the fact that + * It differs from TQIntValidator and KIntValidator in the fact that * it also accepts hex numbers prefixed with 0x. */ -class LIBK3B_EXPORT K3bIntValidator : public QValidator +class LIBK3B_EXPORT K3bIntValidator : public TQValidator { public: /** * Constuctor. Also sets the base value. */ - K3bIntValidator ( QWidget * parent, const char * name = 0 ); + K3bIntValidator ( TQWidget * tqparent, const char * name = 0 ); /** * Constructor. Also sets the minimum, maximum, and numeric base values. */ - K3bIntValidator ( int bottom, int top, QWidget * parent, const char * name = 0 ); + K3bIntValidator ( int bottom, int top, TQWidget * tqparent, const char * name = 0 ); /** * Destructs the validator. @@ -49,12 +49,12 @@ class LIBK3B_EXPORT K3bIntValidator : public QValidator /** * Validates the text, and return the result. Does not modify the parameters. */ - virtual State validate ( QString &, int & ) const; + virtual State validate ( TQString &, int & ) const; /** * Fixes the text if possible, providing a valid string. The parameter may be modified. */ - virtual void fixup ( QString & ) const; + virtual void fixup ( TQString & ) const; /** * Sets the minimum and maximum values allowed. @@ -74,7 +74,7 @@ class LIBK3B_EXPORT K3bIntValidator : public QValidator /** * If the string starts with 0x it's assumed to be a hex number. */ - static int toInt( const QString&, bool* ok = 0 ); + static int toInt( const TQString&, bool* ok = 0 ); private: int m_min; diff --git a/libk3b/tools/k3biso9660.cpp b/libk3b/tools/k3biso9660.cpp index 84edc4b..ded2ce9 100644 --- a/libk3b/tools/k3biso9660.cpp +++ b/libk3b/tools/k3biso9660.cpp @@ -23,10 +23,10 @@ #include "libisofs/isofs.h" -#include <qcstring.h> -#include <qdir.h> -#include <qfile.h> -#include <qptrlist.h> +#include <tqcstring.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqptrlist.h> #include <kdebug.h> @@ -43,7 +43,7 @@ int K3bIso9660::read_callback( char* buf, sector_t start, int len, void* udata ) int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata ) { K3bIso9660 *iso = static_cast<K3bIso9660*> (udata); - QString path, isoPath,user,group,symlink; + TQString path, isoPath,user,group,symlink; int i; int access; int time,cdate,adate; @@ -84,7 +84,7 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata ) if( !iso->plainIso9660() && ParseRR(idr,&rr) > 0 ) { iso->m_rr = true; if (!special) - path = QString::fromLocal8Bit( rr.name ); + path = TQString::fromLocal8Bit( rr.name ); symlink=rr.sl; access=rr.mode; time=0;//rr.st_mtime; @@ -105,7 +105,7 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata ) if (!special) { if( !iso->plainIso9660() && iso->jolietLevel() ) { for (i=0;i<(isonum_711(idr->name_len)-1);i+=2) { - QChar ch( be2me_16(*((ushort*)&(idr->name[i]))) ); + TQChar ch( be2me_16(*((ushort*)&(idr->name[i]))) ); if (ch==';') break; path+=ch; } @@ -115,7 +115,7 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata ) path = isoPath; // remove the version field - int pos = path.find( ';' ); + int pos = path.tqfind( ';' ); if( pos > 0 ) path.truncate( pos ); } @@ -146,15 +146,15 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata ) K3bIso9660Entry::K3bIso9660Entry( K3bIso9660* archive, - const QString& isoName, - const QString& name, + const TQString& isoName, + const TQString& name, int access, int date, int adate, int cdate, - const QString& user, - const QString& group, - const QString& symlink ) + const TQString& user, + const TQString& group, + const TQString& symlink ) : m_adate( adate ), m_cdate( cdate ), m_name( name ), @@ -179,15 +179,15 @@ K3bIso9660Entry::~K3bIso9660Entry() K3bIso9660File::K3bIso9660File( K3bIso9660* archive, - const QString& isoName, - const QString& name, + const TQString& isoName, + const TQString& name, int access, int date, int adate, int cdate, - const QString& user, - const QString& group, - const QString& symlink, + const TQString& user, + const TQString& group, + const TQString& symlink, unsigned int pos, unsigned int size ) : K3bIso9660Entry( archive, isoName, name, access, date, adate, cdate, user, group, symlink ), @@ -265,9 +265,9 @@ int K3bIso9660File::read( unsigned int pos, char* data, int maxlen ) const } -bool K3bIso9660File::copyTo( const QString& url ) const +bool K3bIso9660File::copyTo( const TQString& url ) const { - QFile of( url ); + TQFile of( url ); if( of.open( IO_WriteOnly ) ) { char buffer[2048*10]; unsigned int pos = 0; @@ -287,15 +287,15 @@ bool K3bIso9660File::copyTo( const QString& url ) const K3bIso9660Directory::K3bIso9660Directory( K3bIso9660* archive, - const QString& isoName, - const QString& name, + const TQString& isoName, + const TQString& name, int access, int date, int adate, int cdate, - const QString& user, - const QString& group, - const QString& symlink, + const TQString& user, + const TQString& group, + const TQString& symlink, unsigned int pos, unsigned int size ) : K3bIso9660Entry( archive, isoName, name, access, date, adate, cdate, user, group, symlink ), @@ -323,14 +323,14 @@ void K3bIso9660Directory::expand() } -QStringList K3bIso9660Directory::entries() const +TQStringList K3bIso9660Directory::entries() const { // create a fake const method to fool the user ;) const_cast<K3bIso9660Directory*>(this)->expand(); - QStringList l; + TQStringList l; - QDictIterator<K3bIso9660Entry> it( m_entries ); + TQDictIterator<K3bIso9660Entry> it( m_entries ); for( ; it.current(); ++it ) l.append( it.currentKey() ); @@ -338,14 +338,14 @@ QStringList K3bIso9660Directory::entries() const } -QStringList K3bIso9660Directory::iso9660Entries() const +TQStringList K3bIso9660Directory::iso9660Entries() const { // create a fake const method to fool the user ;) const_cast<K3bIso9660Directory*>(this)->expand(); - QStringList l; + TQStringList l; - QDictIterator<K3bIso9660Entry> it( m_iso9660Entries ); + TQDictIterator<K3bIso9660Entry> it( m_iso9660Entries ); for( ; it.current(); ++it ) l.append( it.currentKey() ); @@ -353,33 +353,33 @@ QStringList K3bIso9660Directory::iso9660Entries() const } -K3bIso9660Entry* K3bIso9660Directory::entry( const QString& n ) +K3bIso9660Entry* K3bIso9660Directory::entry( const TQString& n ) { if( n.isEmpty() ) return 0; expand(); - QString name(n); + TQString name(n); // trailing slash ? -> remove if( name.length() > 1 && name[name.length()-1] == '/' ) { name.truncate( name.length()-1 ); } - int pos = name.find( '/' ); + int pos = name.tqfind( '/' ); while( pos == 0 ) { if( name.length() > 1 ) { name = name.mid( 1 ); // remove leading slash - pos = name.find( '/' ); // look again + pos = name.tqfind( '/' ); // look again } else // "/" return this; } if ( pos != -1 ) { - QString left = name.left( pos ); - QString right = name.mid( pos + 1 ); + TQString left = name.left( pos ); + TQString right = name.mid( pos + 1 ); K3bIso9660Entry* e = m_entries[ left ]; if ( !e || !e->isDirectory() ) @@ -391,33 +391,33 @@ K3bIso9660Entry* K3bIso9660Directory::entry( const QString& n ) } -K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const QString& n ) +K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const TQString& n ) { if( n.isEmpty() ) return 0; expand(); - QString name(n); + TQString name(n); // trailing slash ? -> remove if( name.length() > 1 && name[name.length()-1] == '/' ) { name.truncate( name.length()-1 ); } - int pos = name.find( '/' ); + int pos = name.tqfind( '/' ); while( pos == 0 ) { if( name.length() > 1 ) { name = name.mid( 1 ); // remove leading slash - pos = name.find( '/' ); // look again + pos = name.tqfind( '/' ); // look again } else // "/" return this; } if ( pos != -1 ) { - QString left = name.left( pos ); - QString right = name.mid( pos + 1 ); + TQString left = name.left( pos ); + TQString right = name.mid( pos + 1 ); K3bIso9660Entry* e = m_iso9660Entries[ left ]; if ( !e || !e->isDirectory() ) @@ -429,13 +429,13 @@ K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const QString& n ) } -const K3bIso9660Entry* K3bIso9660Directory::entry( const QString& name ) const +const K3bIso9660Entry* K3bIso9660Directory::entry( const TQString& name ) const { return const_cast<K3bIso9660Directory*>(this)->entry( name ); } -const K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const QString& name ) const +const K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const TQString& name ) const { return const_cast<K3bIso9660Directory*>(this)->iso9660Entry( name ); } @@ -463,10 +463,10 @@ public: backend(0) { } - QPtrList<K3bIso9660Directory> elToritoDirs; - QPtrList<K3bIso9660Directory> jolietDirs; - QPtrList<K3bIso9660Directory> isoDirs; - QPtrList<K3bIso9660Directory> rrDirs; // RockRidge + TQPtrList<K3bIso9660Directory> elToritoDirs; + TQPtrList<K3bIso9660Directory> jolietDirs; + TQPtrList<K3bIso9660Directory> isoDirs; + TQPtrList<K3bIso9660Directory> rrDirs; // RockRidge K3bIso9660SimplePrimaryDescriptor primaryDesc; @@ -484,7 +484,7 @@ public: }; -K3bIso9660::K3bIso9660( const QString& filename ) +K3bIso9660::K3bIso9660( const TQString& filename ) : m_filename( filename ) { d = new Private(); @@ -553,12 +553,12 @@ void K3bIso9660::addBoot(struct el_torito_boot_descriptor* bootdesc) int i,size; boot_head boot; boot_entry *be; - QString path; + TQString path; K3bIso9660File *entry; entry=new K3bIso9660File( this, "Catalog", "Catalog", dirent->permissions() & ~S_IFDIR, dirent->date(), dirent->adate(), dirent->cdate(), - dirent->user(), dirent->group(), QString::null, + dirent->user(), dirent->group(), TQString(), isonum_731(bootdesc->boot_catalog), 2048 ); dirent->addEntry(entry); if (!ReadBootTable(&K3bIso9660::read_callback,isonum_731(bootdesc->boot_catalog),&boot,this)) { @@ -571,10 +571,10 @@ void K3bIso9660::addBoot(struct el_torito_boot_descriptor* bootdesc) isonum_721(((struct default_entry*) be->data)->seccount), this); path="Default Image"; - if (i>1) path += " (" + QString::number(i) + ")"; + if (i>1) path += " (" + TQString::number(i) + ")"; entry=new K3bIso9660File( this, path, path, dirent->permissions() & ~S_IFDIR, dirent->date(), dirent->adate(), dirent->cdate(), - dirent->user(), dirent->group(), QString::null, + dirent->user(), dirent->group(), TQString(), isonum_731(((struct default_entry*) be->data)->start), size<<9 ); dirent->addEntry(entry); be=be->next; @@ -624,7 +624,7 @@ bool K3bIso9660::open() return false; iso_vol_desc *desc; - QString path,tmp,uid,gid; + TQString path,tmp,uid,gid; k3b_struct_stat buf; int access,c_i,c_j; struct el_torito_boot_descriptor* bootdesc; @@ -633,7 +633,7 @@ bool K3bIso9660::open() /* We'll use the permission and user/group of the 'host' file except * in Rock Ridge, where the permissions are stored on the file system */ - if ( k3b_stat( QFile::encodeName(m_filename), &buf ) < 0 ) { + if ( k3b_stat( TQFile::encodeName(m_filename), &buf ) < 0 ) { /* defaults, if stat fails */ memset(&buf,0,sizeof(k3b_struct_stat)); buf.st_mode=0777; @@ -665,10 +665,10 @@ bool K3bIso9660::open() if( !memcmp( EL_TORITO_ID, bootdesc->system_id, ISODCL(8,39) ) ) { path="El Torito Boot"; if( c_b > 1 ) - path += " (" + QString::number(c_b) + ")"; + path += " (" + TQString::number(c_b) + ")"; dirent = new K3bIso9660Directory( this, path, path, access | S_IFDIR, - buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, QString::null ); + buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString() ); d->elToritoDirs.append( dirent ); addBoot(bootdesc); @@ -691,18 +691,18 @@ bool K3bIso9660::open() break; if (m_joliet) { - path = "Joliet level " + QString::number(m_joliet); + path = "Joliet level " + TQString::number(m_joliet); if( c_j > 1 ) - path += " (" + QString::number(c_j) + ")"; + path += " (" + TQString::number(c_j) + ")"; } else { - path = QString::fromLocal8Bit( primaryDesc->volume_id, 32 ); + path = TQString::fromLocal8Bit( primaryDesc->volume_id, 32 ); if( c_i > 1 ) - path += " (" + QString::number(c_i) + ")"; + path += " (" + TQString::number(c_i) + ")"; } dirent = new K3bIso9660Directory( this, path, path, access | S_IFDIR, - buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, QString::null ); + buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString() ); // expand the root entry ProcessDir( &K3bIso9660::read_callback, isonum_733(idr->extent),isonum_733(idr->size),&K3bIso9660::isofs_callback,this); @@ -740,12 +740,12 @@ bool K3bIso9660::isOpen() const void K3bIso9660::createSimplePrimaryDesc( struct iso_primary_descriptor* desc ) { - d->primaryDesc.volumeId = QString::fromLocal8Bit( desc->volume_id, 32 ).stripWhiteSpace(); - d->primaryDesc.systemId = QString::fromLocal8Bit( desc->system_id, 32 ).stripWhiteSpace(); - d->primaryDesc.volumeSetId = QString::fromLocal8Bit( desc->volume_set_id, 128 ).stripWhiteSpace(); - d->primaryDesc.publisherId = QString::fromLocal8Bit( desc->publisher_id, 128 ).stripWhiteSpace(); - d->primaryDesc.preparerId = QString::fromLocal8Bit( desc->preparer_id, 128 ).stripWhiteSpace(); - d->primaryDesc.applicationId = QString::fromLocal8Bit( desc->application_id, 128 ).stripWhiteSpace(); + d->primaryDesc.volumeId = TQString(TQString::fromLocal8Bit( desc->volume_id, 32 )).stripWhiteSpace(); + d->primaryDesc.systemId = TQString(TQString::fromLocal8Bit( desc->system_id, 32 )).stripWhiteSpace(); + d->primaryDesc.volumeSetId = TQString(TQString::fromLocal8Bit( desc->volume_set_id, 128 )).stripWhiteSpace(); + d->primaryDesc.publisherId = TQString(TQString::fromLocal8Bit( desc->publisher_id, 128 )).stripWhiteSpace(); + d->primaryDesc.preparerId = TQString(TQString::fromLocal8Bit( desc->preparer_id, 128 )).stripWhiteSpace(); + d->primaryDesc.applicationId = TQString(TQString::fromLocal8Bit( desc->application_id, 128 )).stripWhiteSpace(); d->primaryDesc.volumeSetSize = isonum_723(desc->volume_set_size); d->primaryDesc.volumeSetNumber = isonum_723(desc->volume_set_size); d->primaryDesc.logicalBlockSize = isonum_723(desc->logical_block_size); @@ -845,13 +845,13 @@ void K3bIso9660::debugEntry( const K3bIso9660Entry* entry, int depth ) const return; } - QString spacer; + TQString spacer; spacer.fill( ' ', depth*3 ); kdDebug() << spacer << "- " << entry->name() << " (" << entry->isoName() << ")" << endl; if( entry->isDirectory() ) { const K3bIso9660Directory* dir = dynamic_cast<const K3bIso9660Directory*>(entry); - QStringList entries = dir->entries(); - for( QStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { + TQStringList entries = dir->entries(); + for( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { debugEntry( dir->entry( *it ), depth+1 ); } } diff --git a/libk3b/tools/k3biso9660.h b/libk3b/tools/k3biso9660.h index 7fc52d9..246fb67 100644 --- a/libk3b/tools/k3biso9660.h +++ b/libk3b/tools/k3biso9660.h @@ -20,10 +20,10 @@ #include <sys/stat.h> #include <sys/types.h> -#include <qdatetime.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qdict.h> +#include <tqdatetime.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqdict.h> #include "k3b_export.h" @@ -54,12 +54,12 @@ class LIBK3B_EXPORT K3bIso9660SimplePrimaryDescriptor */ K3bIso9660SimplePrimaryDescriptor(); - QString volumeId; - QString systemId; - QString volumeSetId; - QString publisherId; - QString preparerId; - QString applicationId; + TQString volumeId; + TQString systemId; + TQString volumeSetId; + TQString publisherId; + TQString preparerId; + TQString applicationId; int volumeSetSize; int volumeSetNumber; long logicalBlockSize; @@ -81,15 +81,15 @@ class LIBK3B_EXPORT K3bIso9660Entry { public: K3bIso9660Entry( K3bIso9660* archive, - const QString& isoName, - const QString& name, + const TQString& isoName, + const TQString& name, int access, int date, int adate, int cdate, - const QString& user, - const QString& group, - const QString& symlink ); + const TQString& user, + const TQString& group, + const TQString& symlink ); virtual ~K3bIso9660Entry(); int adate() const { return m_adate; } @@ -99,7 +99,7 @@ class LIBK3B_EXPORT K3bIso9660Entry * Creation date of the file. * @return the creation date */ - QDateTime datetime() const; + TQDateTime datetime() const; /** * Creation date of the file. @@ -111,12 +111,12 @@ class LIBK3B_EXPORT K3bIso9660Entry * Name of the file without path. * @return The file name without path. */ - const QString& name() const { return m_name; } + const TQString& name() const { return m_name; } /** * \return The raw name as saved in the ISO9660 tree */ - const QString& isoName() const { return m_isoName; } + const TQString& isoName() const { return m_isoName; } /** * The permissions and mode flags as returned by the stat() function @@ -129,19 +129,19 @@ class LIBK3B_EXPORT K3bIso9660Entry * User who created the file. * @return the owner of the file */ - const QString& user() const { return m_user; } + const TQString& user() const { return m_user; } /** * Group of the user who created the file. * @return the group of the file */ - const QString& group() const { return m_group; } + const TQString& group() const { return m_group; } /** * Symlink if there is one. - * @return the symlink, or QString::null + * @return the symlink, or TQString() */ - const QString& symlink() const { return m_symlink; } + const TQString& symlink() const { return m_symlink; } /** * Checks whether the entry is a file. @@ -160,13 +160,13 @@ class LIBK3B_EXPORT K3bIso9660Entry private: int m_adate; int m_cdate; - QString m_name; - QString m_isoName; + TQString m_name; + TQString m_isoName; int m_date; mode_t m_access; - QString m_user; - QString m_group; - QString m_symlink; + TQString m_user; + TQString m_group; + TQString m_symlink; K3bIso9660* m_archive; }; @@ -175,15 +175,15 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry { public: K3bIso9660Directory( K3bIso9660* archive, - const QString& isoName, - const QString& name, + const TQString& isoName, + const TQString& name, int access, int date, int adate, int cdate, - const QString& user, - const QString& group, - const QString& symlink, + const TQString& user, + const TQString& group, + const TQString& symlink, unsigned int pos = 0, unsigned int size = 0 ); ~K3bIso9660Directory(); @@ -192,28 +192,28 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry * Returns a list of sub-entries. * @return the names of all entries in this directory (filenames, no path). */ - QStringList entries() const; + TQStringList entries() const; /** * Returns the entry with the given name. * @param name may be "test1", "mydir/test3", "mydir/mysubdir/test3", etc. * @return a pointer to the entry in the directory. */ - K3bIso9660Entry* entry( const QString& name ); + K3bIso9660Entry* entry( const TQString& name ); /** * Returns the entry with the given name. * @param name may be "test1", "mydir/test3", "mydir/mysubdir/test3", etc. * @return a pointer to the entry in the directory. */ - const K3bIso9660Entry* entry( const QString& name ) const; + const K3bIso9660Entry* entry( const TQString& name ) const; /** * Returns a list of sub-entries. * Searches for Iso9660 names. * @return the names of all entries in this directory (filenames, no path). */ - QStringList iso9660Entries() const; + TQStringList iso9660Entries() const; /** * Returns the entry with the given name. @@ -221,7 +221,7 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry * @param name may be "test1", "mydir/test3", "mydir/mysubdir/test3", etc. * @return a pointer to the entry in the directory. */ - K3bIso9660Entry* iso9660Entry( const QString& name ); + K3bIso9660Entry* iso9660Entry( const TQString& name ); /** * Returns the entry with the given name. @@ -229,7 +229,7 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry * @param name may be "test1", "mydir/test3", "mydir/mysubdir/test3", etc. * @return a pointer to the entry in the directory. */ - const K3bIso9660Entry* iso9660Entry( const QString& name ) const; + const K3bIso9660Entry* iso9660Entry( const TQString& name ) const; /** * @internal @@ -246,8 +246,8 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry private: void expand(); - QDict<K3bIso9660Entry> m_entries; - QDict<K3bIso9660Entry> m_iso9660Entries; + TQDict<K3bIso9660Entry> m_entries; + TQDict<K3bIso9660Entry> m_iso9660Entries; bool m_bExpanded; unsigned int m_startSector; @@ -262,15 +262,15 @@ class LIBK3B_EXPORT K3bIso9660File : public K3bIso9660Entry * @param pos start sector */ K3bIso9660File( K3bIso9660* archive, - const QString& isoName, - const QString& name, + const TQString& isoName, + const TQString& name, int access, int date, int adate, int cdate, - const QString& user, - const QString& group, - const QString& symlink, + const TQString& user, + const TQString& group, + const TQString& symlink, unsigned int pos, unsigned int size ); ~K3bIso9660File(); @@ -304,7 +304,7 @@ class LIBK3B_EXPORT K3bIso9660File : public K3bIso9660Entry /** * Copy this file to a url. */ - bool copyTo( const QString& url ) const; + bool copyTo( const TQString& url ) const; private: char m_algo[2]; @@ -323,8 +323,8 @@ class LIBK3B_EXPORT K3bIso9660File : public K3bIso9660Entry * A lot has been changed and bugfixed. * The API has been improved to be useful. * - * Due to the stupid Qt which does not support large files as default - * we cannot use QIODevice with DVDs! That's why we have our own + * Due to the stupid TQt which does not support large files as default + * we cannot use TQIODevice with DVDs! That's why we have our own * reading code which is not allowed by KArchive (which is limited to int * by the way... who the hell designed this?) * I also removed the KArchive inheritance because of the named reasons. @@ -344,7 +344,7 @@ class LIBK3B_EXPORT K3bIso9660 * * @param filename is a local path (e.g. "/home/weis/myfile.tgz") */ - K3bIso9660( const QString& filename ); + K3bIso9660( const TQString& filename ); /** * Special case which always reads the TOC from the specified sector @@ -406,9 +406,9 @@ class LIBK3B_EXPORT K3bIso9660 /** * The name of the os file, as passed to the constructor - * Null if you did not use the QString constructor. + * Null if you did not use the TQString constructor. */ - const QString& fileName() { return m_filename; } + const TQString& fileName() { return m_filename; } const K3bIso9660Directory* firstJolietDirEntry() const; const K3bIso9660Directory* firstRRDirEntry() const; @@ -444,7 +444,7 @@ class LIBK3B_EXPORT K3bIso9660 friend class K3bIso9660Directory; private: - QString m_filename; + TQString m_filename; class Private; Private * d; diff --git a/libk3b/tools/k3biso9660backend.cpp b/libk3b/tools/k3biso9660backend.cpp index aacc079..e03d66d 100644 --- a/libk3b/tools/k3biso9660backend.cpp +++ b/libk3b/tools/k3biso9660backend.cpp @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include <qfile.h> +#include <tqfile.h> #include <k3bdevice.h> @@ -78,7 +78,7 @@ int K3bIso9660DeviceBackend::read( unsigned int sector, char* data, int len ) int sectorsRead = 0; int retries = 10; // TODO: no fixed value while( retries ) { - int read = QMIN(len-sectorsRead, maxReadSectors); + int read = TQMIN(len-sectorsRead, maxReadSectors); if( !m_device->read10( (unsigned char*)(data+sectorsRead*2048), read*2048, sector+sectorsRead, @@ -102,7 +102,7 @@ int K3bIso9660DeviceBackend::read( unsigned int sector, char* data, int len ) // K3bIso9660FileBackend ----------------------------------- // -K3bIso9660FileBackend::K3bIso9660FileBackend( const QString& filename ) +K3bIso9660FileBackend::K3bIso9660FileBackend( const TQString& filename ) : m_filename( filename ), m_fd( -1 ), m_closeFd( true ) @@ -132,7 +132,7 @@ bool K3bIso9660FileBackend::open() if( m_fd > 0 ) return true; else { - m_fd = ::open( QFile::encodeName( m_filename ), O_RDONLY|O_LARGEFILE ); + m_fd = ::open( TQFile::encodeName( m_filename ), O_RDONLY|O_LARGEFILE ); return ( m_fd > 0 ); } } diff --git a/libk3b/tools/k3biso9660backend.h b/libk3b/tools/k3biso9660backend.h index 78937e5..82a6ac1 100644 --- a/libk3b/tools/k3biso9660backend.h +++ b/libk3b/tools/k3biso9660backend.h @@ -16,7 +16,7 @@ #ifndef _K3B_ISO9660_BACKEND_H_ #define _K3B_ISO9660_BACKEND_H_ -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" @@ -60,7 +60,7 @@ class K3bIso9660DeviceBackend : public K3bIso9660Backend class K3bIso9660FileBackend : public K3bIso9660Backend { public: - LIBK3B_EXPORT K3bIso9660FileBackend( const QString& filename ); + LIBK3B_EXPORT K3bIso9660FileBackend( const TQString& filename ); K3bIso9660FileBackend( int fd ); ~K3bIso9660FileBackend(); @@ -70,7 +70,7 @@ class K3bIso9660FileBackend : public K3bIso9660Backend int read( unsigned int sector, char* data, int len ); private: - QString m_filename; + TQString m_filename; int m_fd; bool m_closeFd; }; diff --git a/libk3b/tools/k3blibdvdcss.cpp b/libk3b/tools/k3blibdvdcss.cpp index 0a8d1f0..5baf8b4 100644 --- a/libk3b/tools/k3blibdvdcss.cpp +++ b/libk3b/tools/k3blibdvdcss.cpp @@ -21,10 +21,10 @@ #include <k3biso9660.h> #include <k3biso9660backend.h> -#include <qfile.h> -#include <qcstring.h> -#include <qvaluevector.h> -#include <qpair.h> +#include <tqfile.h> +#include <tqcstring.h> +#include <tqvaluevector.h> +#include <tqpair.h> #include <dlfcn.h> @@ -54,7 +54,7 @@ public: dvdcss_t dvd; K3bDevice::Device* device; - QValueVector< QPair<int,int> > titleOffsets; + TQValueVector< TQPair<int,int> > titleOffsets; int currentSector; bool currentSectorInTitle; }; @@ -82,7 +82,7 @@ bool K3bLibDvdCss::open( K3bDevice::Device* dev ) { d->device = dev; dev->close(); - d->dvd = k3b_dvdcss_open( const_cast<char*>( QFile::encodeName(dev->blockDeviceName()).data() ) ); + d->dvd = k3b_dvdcss_open( const_cast<char*>( TQFile::encodeName(dev->blockDeviceName()).data() ) ); d->currentSector = 0; d->currentSectorInTitle = false; return ( d->dvd != 0 ); @@ -216,7 +216,7 @@ bool K3bLibDvdCss::crackAllKeys() int title = 0; for( ; title < 100; ++title ) { - QString filename; + TQString filename; // first we get the menu vob if( title == 0 ) @@ -226,7 +226,7 @@ bool K3bLibDvdCss::crackAllKeys() const K3bIso9660File* file = dynamic_cast<const K3bIso9660File*>( dir->entry( filename ) ); if( file && file->size() > 0 ) { - d->titleOffsets.append( qMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) ); + d->titleOffsets.append( tqMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) ); kdDebug() << "(K3bLibDvdCss) Get key for /" << filename << " at " << file->startSector() << endl; if( seek( (int)file->startSector(), DVDCSS_SEEK_KEY ) < 0 ) { kdDebug() << "(K3bLibDvdCss) unable to seek to " << file->startSector() << endl; @@ -235,7 +235,7 @@ bool K3bLibDvdCss::crackAllKeys() } if( title > 0 ) { - QPair<int,int> p; + TQPair<int,int> p; int vob = 1; for( ; vob < 100; ++vob ) { filename.sprintf( "VIDEO_TS/VTS_%02d_%d.VOB", title, vob ); diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index 34a3aa0..72ccd73 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -19,25 +19,25 @@ #include "k3bmsfedit.h" -#include <qstringlist.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qheader.h> -#include <qrect.h> -#include <qpushbutton.h> -#include <qiconset.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qevent.h> -#include <qvalidator.h> -#include <qfont.h> -#include <qpalette.h> -#include <qstyle.h> -#include <qapplication.h> -#include <qprogressbar.h> -#include <qimage.h> +#include <tqstringlist.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqheader.h> +#include <tqrect.h> +#include <tqpushbutton.h> +#include <tqiconset.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqevent.h> +#include <tqvalidator.h> +#include <tqfont.h> +#include <tqpalette.h> +#include <tqstyle.h> +#include <tqapplication.h> +#include <tqprogressbar.h> +#include <tqimage.h> #include <kpixmapeffect.h> @@ -77,14 +77,14 @@ public: bool button; int editorType; - QStringList comboItems; + TQStringList comboItems; bool comboEditable; bool fontSet; bool backgroundColorSet; bool foregroundColorSet; - QFont font; - QColor backgroundColor; - QColor foregroundColor; + TQFont font; + TQColor backgroundColor; + TQColor foregroundColor; ColumnInfo* next; bool showProgress; @@ -92,75 +92,75 @@ public: int totalProgressSteps; int margin; - QValidator* validator; + TQValidator* validator; }; -K3bListViewItem::K3bListViewItem(QListView *parent) - : KListViewItem( parent ) +K3bListViewItem::K3bListViewItem(TQListView *tqparent) + : KListViewItem( tqparent ) { init(); } -K3bListViewItem::K3bListViewItem(QListViewItem *parent) - : KListViewItem( parent ) +K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent) + : KListViewItem( tqparent ) { init(); } -K3bListViewItem::K3bListViewItem(QListView *parent, QListViewItem *after) - : KListViewItem( parent, after ) +K3bListViewItem::K3bListViewItem(TQListView *tqparent, TQListViewItem *after) + : KListViewItem( tqparent, after ) { init(); } -K3bListViewItem::K3bListViewItem(QListViewItem *parent, QListViewItem *after) - : KListViewItem( parent, after ) +K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after) + : KListViewItem( tqparent, after ) { init(); } -K3bListViewItem::K3bListViewItem(QListView *parent, - const QString& s1, const QString& s2, - const QString& s3, const QString& s4, - const QString& s5, const QString& s6, - const QString& s7, const QString& s8) - : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) +K3bListViewItem::K3bListViewItem(TQListView *tqparent, + const TQString& s1, const TQString& s2, + const TQString& s3, const TQString& s4, + const TQString& s5, const TQString& s6, + const TQString& s7, const TQString& s8) + : KListViewItem( tqparent, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(QListViewItem *parent, - const QString& s1, const QString& s2, - const QString& s3, const QString& s4, - const QString& s5, const QString& s6, - const QString& s7, const QString& s8) - : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) +K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, + const TQString& s1, const TQString& s2, + const TQString& s3, const TQString& s4, + const TQString& s5, const TQString& s6, + const TQString& s7, const TQString& s8) + : KListViewItem( tqparent, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(QListView *parent, QListViewItem *after, - const QString& s1, const QString& s2, - const QString& s3, const QString& s4, - const QString& s5, const QString& s6, - const QString& s7, const QString& s8) - : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) +K3bListViewItem::K3bListViewItem(TQListView *tqparent, TQListViewItem *after, + const TQString& s1, const TQString& s2, + const TQString& s3, const TQString& s4, + const TQString& s5, const TQString& s6, + const TQString& s7, const TQString& s8) + : KListViewItem( tqparent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(QListViewItem *parent, QListViewItem *after, - const QString& s1, const QString& s2, - const QString& s3, const QString& s4, - const QString& s5, const QString& s6, - const QString& s7, const QString& s8) - : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) +K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after, + const TQString& s1, const TQString& s2, + const TQString& s3, const TQString& s4, + const TQString& s5, const TQString& s6, + const TQString& s7, const TQString& s8) + : KListViewItem( tqparent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } @@ -184,13 +184,13 @@ void K3bListViewItem::init() } -int K3bListViewItem::width( const QFontMetrics& fm, const QListView* lv, int c ) const +int K3bListViewItem::width( const TQFontMetrics& fm, const TQListView* lv, int c ) const { return KListViewItem::width( fm, lv, c ) + getColumnInfo(c)->margin*2; } -void K3bListViewItem::setEditor( int column, int editor, const QStringList& cs ) +void K3bListViewItem::setEditor( int column, int editor, const TQStringList& cs ) { ColumnInfo* colInfo = getColumnInfo(column); @@ -200,13 +200,13 @@ void K3bListViewItem::setEditor( int column, int editor, const QStringList& cs ) } -void K3bListViewItem::setValidator( int column, QValidator* v ) +void K3bListViewItem::setValidator( int column, TQValidator* v ) { getColumnInfo(column)->validator = v; } -QValidator* K3bListViewItem::validator( int col ) const +TQValidator* K3bListViewItem::validator( int col ) const { return getColumnInfo(col)->validator; } @@ -252,14 +252,14 @@ bool K3bListViewItem::needButton( int col ) const } -const QStringList& K3bListViewItem::comboStrings( int col ) const +const TQStringList& K3bListViewItem::comboStrings( int col ) const { ColumnInfo* info = getColumnInfo( col ); return info->comboItems; } -void K3bListViewItem::setFont( int col, const QFont& f ) +void K3bListViewItem::setFont( int col, const TQFont& f ) { ColumnInfo* info = getColumnInfo( col ); info->fontSet = true; @@ -267,21 +267,21 @@ void K3bListViewItem::setFont( int col, const QFont& f ) } -void K3bListViewItem::setBackgroundColor( int col, const QColor& c ) +void K3bListViewItem::setBackgroundColor( int col, const TQColor& c ) { ColumnInfo* info = getColumnInfo( col ); info->backgroundColorSet = true; info->backgroundColor = c; - repaint(); + tqrepaint(); } -void K3bListViewItem::setForegroundColor( int col, const QColor& c ) +void K3bListViewItem::setForegroundColor( int col, const TQColor& c ) { ColumnInfo* info = getColumnInfo( col ); info->foregroundColorSet = true; info->foregroundColor = c; - repaint(); + tqrepaint(); } @@ -299,7 +299,7 @@ void K3bListViewItem::setProgress( int col, int p ) setDisplayProgressBar( col, true ); if( info->progressValue != p ) { info->progressValue = p; - repaint(); + tqrepaint(); } } @@ -309,7 +309,7 @@ void K3bListViewItem::setTotalSteps( int col, int steps ) ColumnInfo* info = getColumnInfo( col ); info->totalProgressSteps = steps; - repaint(); + tqrepaint(); } @@ -318,14 +318,14 @@ void K3bListViewItem::setMarginHorizontal( int col, int margin ) ColumnInfo* info = getColumnInfo( col ); info->margin = margin; - repaint(); + tqrepaint(); } void K3bListViewItem::setMarginVertical( int margin ) { m_vMargin = margin; - repaint(); + tqrepaint(); } @@ -349,36 +349,36 @@ void K3bListViewItem::setup() } -void K3bListViewItem::paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ) +void K3bListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ) { ColumnInfo* info = getColumnInfo( col ); p->save(); - QFont oldFont( p->font() ); - QFont newFont = info->fontSet ? info->font : oldFont; + TQFont oldFont( p->font() ); + TQFont newFont = info->fontSet ? info->font : oldFont; p->setFont( newFont ); - QColorGroup cgh(cg); + TQColorGroup cgh(cg); if( info->foregroundColorSet ) - cgh.setColor( QColorGroup::Text, info->foregroundColor ); + cgh.setColor( TQColorGroup::Text, info->foregroundColor ); if( info->backgroundColorSet ) - cgh.setColor( QColorGroup::Base, info->backgroundColor ); + cgh.setColor( TQColorGroup::Base, info->backgroundColor ); - // in case this is the selected row has a margin we need to repaint the selection bar + // in case this is the selected row has a margin we need to tqrepaint the selection bar if( isSelected() && (col == 0 || listView()->allColumnsShowFocus()) && info->margin > 0 ) { p->fillRect( 0, 0, info->margin, height(), - cgh.brush( QColorGroup::Highlight ) ); + cgh.brush( TQColorGroup::Highlight ) ); p->fillRect( width-info->margin, 0, info->margin, height(), - cgh.brush( QColorGroup::Highlight ) ); + cgh.brush( TQColorGroup::Highlight ) ); } else { // in case we use the KListView alternate color stuff p->fillRect( 0, 0, info->margin, height(), - cgh.brush( QColorGroup::Base ) ); + cgh.brush( TQColorGroup::Base ) ); p->fillRect( width-info->margin, 0, info->margin, height(), - cgh.brush( QColorGroup::Base ) ); + cgh.brush( TQColorGroup::Base ) ); } // FIXME: the margin (we can only translate horizontally since height() is used for painting) @@ -395,39 +395,39 @@ void K3bListViewItem::paintCell( QPainter* p, const QColorGroup& cg, int col, in } -void K3bListViewItem::paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ) +void K3bListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ) { - QListViewItem::paintCell( p, cg, col, width, align ); + TQListViewItem::paintCell( p, cg, col, width, align ); } -void K3bListViewItem::paintProgressBar( QPainter* p, const QColorGroup& cgh, int col, int width ) +void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, int col, int width ) { ColumnInfo* info = getColumnInfo( col ); - QStyle::SFlags flags = QStyle::Style_Default; + TQStyle::SFlags flags = TQStyle::Style_Default; if( listView()->isEnabled() ) - flags |= QStyle::Style_Enabled; + flags |= TQStyle::Style_Enabled; if( listView()->hasFocus() ) - flags |= QStyle::Style_HasFocus; + flags |= TQStyle::Style_HasFocus; - // FIXME: the QPainter is translated so 0, m_vMargin is the upper left of our paint rect - QRect r( 0, m_vMargin, width, height()-2*m_vMargin ); + // FIXME: the TQPainter is translated so 0, m_vMargin is the upper left of our paint rect + TQRect r( 0, m_vMargin, width, height()-2*m_vMargin ); // create the double buffer pixmap - static QPixmap *doubleBuffer = 0; + static TQPixmap *doubleBuffer = 0; if( !doubleBuffer ) - doubleBuffer = new QPixmap; + doubleBuffer = new TQPixmap; doubleBuffer->resize( width, height() ); - QPainter dbPainter( doubleBuffer ); + TQPainter dbPainter( doubleBuffer ); - // clear the background (we cannot use paintEmptyArea since it's protected in QListView) + // clear the background (we cannot use paintEmptyArea since it's protected in TQListView) if( K3bListView* lv = dynamic_cast<K3bListView*>(listView()) ) lv->paintEmptyArea( &dbPainter, r ); else dbPainter.fillRect( 0, 0, width, height(), - cgh.brush( QPalette::backgroundRoleFromMode(listView()->viewport()->backgroundMode()) ) ); + cgh.brush( TQPalette::backgroundRoleFromMode(listView()->viewport()->backgroundMode()) ) ); // we want a little additional margin r.setLeft( r.left()+1 ); @@ -437,19 +437,19 @@ void K3bListViewItem::paintProgressBar( QPainter* p, const QColorGroup& cgh, int // this might be a stupid hack but most styles do not reimplement drawPrimitive PE_ProgressBarChunk // so this way the user is happy.... - static QProgressBar* s_dummyProgressBar = 0; + static TQProgressBar* s_dummyProgressBar = 0; if( !s_dummyProgressBar ) { - s_dummyProgressBar = new QProgressBar(); + s_dummyProgressBar = new TQProgressBar(); } s_dummyProgressBar->setTotalSteps( info->totalProgressSteps ); s_dummyProgressBar->setProgress( info->progressValue ); - // some styles use the widget's geometry + // some styles use the widget's tqgeometry s_dummyProgressBar->setGeometry( r ); - listView()->style().drawControl(QStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); - listView()->style().drawControl(QStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags ); + listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); + listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags ); // now we really paint the progress in the listview p->drawPixmap( 0, 0, *doubleBuffer ); @@ -461,29 +461,29 @@ void K3bListViewItem::paintProgressBar( QPainter* p, const QColorGroup& cgh, int -K3bCheckListViewItem::K3bCheckListViewItem(QListView *parent) - : K3bListViewItem( parent ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListView *tqparent) + : K3bListViewItem( tqparent ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(QListViewItem *parent) - : K3bListViewItem( parent ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *tqparent) + : K3bListViewItem( tqparent ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(QListView *parent, QListViewItem *after) - : K3bListViewItem( parent, after ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListView *tqparent, TQListViewItem *after) + : K3bListViewItem( tqparent, after ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(QListViewItem *parent, QListViewItem *after) - : K3bListViewItem( parent, after ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *tqparent, TQListViewItem *after) + : K3bListViewItem( tqparent, after ), m_checked(false) { } @@ -498,29 +498,29 @@ bool K3bCheckListViewItem::isChecked() const void K3bCheckListViewItem::setChecked( bool checked ) { m_checked = checked; - repaint(); + tqrepaint(); } -void K3bCheckListViewItem::paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ) +void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ) { K3bListViewItem::paintK3bCell( p, cg, col, width, align ); if( col == 0 ) { if( m_checked ) { - QRect r( 0, marginVertical(), width, /*listView()->style().pixelMetric( QStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() ); + TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() ); - QStyle::SFlags flags = QStyle::Style_Default; + TQStyle::SFlags flags = TQStyle::Style_Default; if( listView()->isEnabled() ) - flags |= QStyle::Style_Enabled; + flags |= TQStyle::Style_Enabled; if( listView()->hasFocus() ) - flags |= QStyle::Style_HasFocus; + flags |= TQStyle::Style_HasFocus; if( isChecked() ) - flags |= QStyle::Style_On; + flags |= TQStyle::Style_On; else - flags |= QStyle::Style_Off; + flags |= TQStyle::Style_Off; - listView()->style().drawPrimitive( QStyle::PE_CheckMark, p, r, cg, flags ); + listView()->tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags ); } } } @@ -540,20 +540,20 @@ void K3bCheckListViewItem::paintK3bCell( QPainter* p, const QColorGroup& cg, int class K3bListView::Private { public: - QLineEdit* spinBoxLineEdit; - QLineEdit* msfEditLineEdit; + TQLineEdit* spinBoxLineEdit; + TQLineEdit* msfEditLineEdit; }; -K3bListView::K3bListView( QWidget* parent, const char* name ) - : KListView( parent, name ), +K3bListView::K3bListView( TQWidget* tqparent, const char* name ) + : KListView( tqparent, name ), m_noItemVMargin( 20 ), m_noItemHMargin( 20 ) { d = new Private; - connect( header(), SIGNAL( sizeChange( int, int, int ) ), - this, SLOT( updateEditorSize() ) ); + connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), + this, TQT_SLOT( updateEditorSize() ) ); m_editorButton = 0; m_editorComboBox = 0; @@ -572,7 +572,7 @@ K3bListView::~K3bListView() } -QWidget* K3bListView::editor( K3bListViewItem::EditorType t ) const +TQWidget* K3bListView::editor( K3bListViewItem::EditorType t ) const { switch( t ) { case K3bListViewItem::COMBO: @@ -666,16 +666,16 @@ void K3bListView::showEditor( K3bListViewItem* item, int col ) void K3bListView::placeEditor( K3bListViewItem* item, int col ) { ensureItemVisible( item ); - QRect r = itemRect( item ); + TQRect r = tqitemRect( item ); - r.setX( contentsToViewport( QPoint(header()->sectionPos( col ), 0) ).x() ); + r.setX( contentsToViewport( TQPoint(header()->sectionPos( col ), 0) ).x() ); r.setWidth( header()->sectionSize( col ) - 1 ); // check if the column is fully visible if( visibleWidth() < r.right() ) r.setRight(visibleWidth()); - r = QRect( viewportToContents( r.topLeft() ), r.size() ); + r = TQRect( viewportToContents( r.topLeft() ), r.size() ); if( item->pixmap( col ) ) { r.setX( r.x() + item->pixmap(col)->width() ); @@ -697,9 +697,9 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col ) moveChild( m_editorButton, r.right(), r.y() ); } - if( QWidget* editor = prepareEditor( item, col ) ) { + if( TQWidget* editor = prepareEditor( item, col ) ) { editor->resize( r.size() ); - // editor->resize( QSize( r.width(), editor->minimumSizeHint().height() ) ); + // editor->resize( TQSize( r.width(), editor->tqminimumSizeHint().height() ) ); moveChild( editor, r.x(), r.y() ); } } @@ -708,9 +708,9 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col ) void K3bListView::prepareButton( K3bListViewItem*, int ) { if( !m_editorButton ) { - m_editorButton = new QPushButton( viewport() ); - connect( m_editorButton, SIGNAL(clicked()), - this, SLOT(slotEditorButtonClicked()) ); + m_editorButton = new TQPushButton( viewport() ); + connect( m_editorButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotEditorButtonClicked()) ); } // TODO: do some useful things @@ -718,14 +718,14 @@ void K3bListView::prepareButton( K3bListViewItem*, int ) } -QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) +TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) { switch( item->editorType(col) ) { case K3bListViewItem::COMBO: if( !m_editorComboBox ) { - m_editorComboBox = new QComboBox( viewport() ); - connect( m_editorComboBox, SIGNAL(activated(const QString&)), - this, SLOT(slotEditorComboBoxActivated(const QString&)) ); + m_editorComboBox = new TQComboBox( viewport() ); + connect( m_editorComboBox, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotEditorComboBoxActivated(const TQString&)) ); m_editorComboBox->installEventFilter( this ); } m_editorComboBox->clear(); @@ -734,7 +734,7 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) } else { m_editorComboBox->insertStringList( item->comboStrings(col) ); - int current = item->comboStrings(col).findIndex( item->text(col) ); + int current = item->comboStrings(col).tqfindIndex( item->text(col) ); if( current != -1 ) m_editorComboBox->setCurrentItem( current ); } @@ -742,17 +742,17 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::LINE: { if( !m_editorLineEdit ) { - m_editorLineEdit = new QLineEdit( viewport() ); - m_editorLineEdit->setFrameStyle( QFrame::Box | QFrame::Plain ); + m_editorLineEdit = new TQLineEdit( viewport() ); + m_editorLineEdit->setFrameStyle( TQFrame::Box | TQFrame::Plain ); m_editorLineEdit->setLineWidth(1); m_editorLineEdit->installEventFilter( this ); } - QString txt = item->text( col ); + TQString txt = item->text( col ); m_editorLineEdit->setText( txt ); // select the edit text (handle extensions while doing so) - int pos = txt.findRev( '.' ); + int pos = txt.tqfindRev( '.' ); if( pos > 0 ) m_editorLineEdit->setSelection( 0, pos ); else @@ -762,16 +762,16 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) } // - // A QSpinBox (and thus also a K3bMsfEdit) uses a QLineEdit), thus - // we have to use this QLineEdit as the actual object to dead with + // A TQSpinBox (and thus also a K3bMsfEdit) uses a TQLineEdit), thus + // we have to use this TQLineEdit as the actual object to dead with // case K3bListViewItem::SPIN: if( !m_editorSpinBox ) { - m_editorSpinBox = new QSpinBox( viewport() ); - d->spinBoxLineEdit = static_cast<QLineEdit*>( m_editorSpinBox->child( 0, "QLineEdit" ) ); - connect( m_editorSpinBox, SIGNAL(valueChanged(int)), - this, SLOT(slotEditorSpinBoxValueChanged(int)) ); + m_editorSpinBox = new TQSpinBox( viewport() ); + d->spinBoxLineEdit = static_cast<TQLineEdit*>(TQT_TQWIDGET( m_editorSpinBox->child( 0, TQLINEEDIT_OBJECT_NAME_STRING ) )); + connect( m_editorSpinBox, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotEditorSpinBoxValueChanged(int)) ); // m_editorSpinBox->installEventFilter( this ); d->spinBoxLineEdit->installEventFilter( this ); } @@ -782,9 +782,9 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::MSF: if( !m_editorMsfEdit ) { m_editorMsfEdit = new K3bMsfEdit( viewport() ); - d->msfEditLineEdit = static_cast<QLineEdit*>( m_editorMsfEdit->child( 0, "QLineEdit" ) ); - connect( m_editorMsfEdit, SIGNAL(valueChanged(int)), - this, SLOT(slotEditorMsfEditValueChanged(int)) ); + d->msfEditLineEdit = static_cast<TQLineEdit*>(TQT_TQWIDGET( m_editorMsfEdit->child( 0, TQLINEEDIT_OBJECT_NAME_STRING ) )); + connect( m_editorMsfEdit, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotEditorMsfEditValueChanged(int)) ); // m_editorMsfEdit->installEventFilter( this ); d->msfEditLineEdit->installEventFilter( this ); } @@ -796,13 +796,13 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) } } -void K3bListView::setCurrentItem( QListViewItem* i ) +void K3bListView::setCurrentItem( TQListViewItem* i ) { if( !i || i == currentItem() ) return; // I cannot remember why I did this here exactly. However, it resets the - // m_lastClickedItem and thus invalidates the editing. + // m_lastClickedItem and thus tqinvalidates the editing. // doRename(); // hideEditor(); // m_currentEditItem = 0; @@ -810,64 +810,64 @@ void K3bListView::setCurrentItem( QListViewItem* i ) } -void K3bListView::setNoItemText( const QString& text ) +void K3bListView::setNoItemText( const TQString& text ) { m_noItemText = text; triggerUpdate(); } -void K3bListView::viewportPaintEvent( QPaintEvent* e ) +void K3bListView::viewportPaintEvent( TQPaintEvent* e ) { KListView::viewportPaintEvent( e ); } // FIXME: move this to viewportPaintEvent -void K3bListView::drawContentsOffset( QPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ) +void K3bListView::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ) { KListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); if( childCount() == 0 && !m_noItemText.isEmpty()) { - p->setPen( Qt::darkGray ); + p->setPen( TQt::darkGray ); - QStringList lines = QStringList::split( "\n", m_noItemText ); + TQStringList lines = TQStringList::split( "\n", m_noItemText ); int xpos = m_noItemHMargin; int ypos = m_noItemVMargin + p->fontMetrics().height(); - QStringList::Iterator end ( lines.end() ); - for( QStringList::Iterator str = lines.begin(); str != end; ++str ) { + TQStringList::Iterator end ( lines.end() ); + for( TQStringList::Iterator str = lines.begin(); str != end; ++str ) { p->drawText( xpos, ypos, *str ); ypos += p->fontMetrics().lineSpacing(); } } } -void K3bListView::paintEmptyArea( QPainter* p, const QRect& rect ) +void K3bListView::paintEmptyArea( TQPainter* p, const TQRect& rect ) { KListView::paintEmptyArea( p, rect ); // if( childCount() == 0 && !m_noItemText.isEmpty()) { -// QPainter pp( viewport() ); +// TQPainter pp( viewport() ); // pp.fillRect( viewport()->rect(), viewport()->paletteBackgroundColor() ); // pp.end(); -// p->setPen( Qt::darkGray ); +// p->setPen( TQt::darkGray ); -// QStringList lines = QStringList::split( "\n", m_noItemText ); +// TQStringList lines = TQStringList::split( "\n", m_noItemText ); // int xpos = m_noItemHMargin; // int ypos = m_noItemVMargin + p->fontMetrics().height(); -// for( QStringList::Iterator str = lines.begin(); str != lines.end(); str++ ) { +// for( TQStringList::Iterator str = lines.begin(); str != lines.end(); str++ ) { // p->drawText( xpos, ypos, *str ); // ypos += p->fontMetrics().lineSpacing(); // } // } } -void K3bListView::resizeEvent( QResizeEvent* e ) +void K3bListView::resizeEvent( TQResizeEvent* e ) { KListView::resizeEvent( e ); updateEditorSize(); @@ -898,7 +898,7 @@ void K3bListView::slotEditorLineEditReturnPressed() } -void K3bListView::slotEditorComboBoxActivated( const QString& ) +void K3bListView::slotEditorComboBoxActivated( const TQString& ) { doRename(); // if( renameItem( m_currentEditItem, m_currentEditColumn, str ) ) { @@ -918,9 +918,9 @@ void K3bListView::slotEditorComboBoxActivated( const QString& ) void K3bListView::slotEditorSpinBoxValueChanged( int ) { -// if( renameItem( m_currentEditItem, m_currentEditColumn, QString::number(value) ) ) { -// m_currentEditItem->setText( m_currentEditColumn, QString::number(value) ); -// emit itemRenamed( m_currentEditItem, QString::number(value), m_currentEditColumn ); +// if( renameItem( m_currentEditItem, m_currentEditColumn, TQString::number(value) ) ) { +// m_currentEditItem->setText( m_currentEditColumn, TQString::number(value) ); +// emit itemRenamed( m_currentEditItem, TQString::number(value), m_currentEditColumn ); // } // else // m_editorSpinBox->setValue( m_currentEditItem->text( m_currentEditColumn ).toInt() ); @@ -930,9 +930,9 @@ void K3bListView::slotEditorSpinBoxValueChanged( int ) void K3bListView::slotEditorMsfEditValueChanged( int ) { // FIXME: do we always need to update the value. Isn't it enough to do it at the end? -// if( renameItem( m_currentEditItem, m_currentEditColumn, QString::number(value) ) ) { -// m_currentEditItem->setText( m_currentEditColumn, QString::number(value) ); -// emit itemRenamed( m_currentEditItem, QString::number(value), m_currentEditColumn ); +// if( renameItem( m_currentEditItem, m_currentEditColumn, TQString::number(value) ) ) { +// m_currentEditItem->setText( m_currentEditColumn, TQString::number(value) ); +// emit itemRenamed( m_currentEditItem, TQString::number(value), m_currentEditColumn ); // } // else // m_editorMsfEdit->setText( m_currentEditItem->text( m_currentEditColumn ) ); @@ -942,7 +942,7 @@ void K3bListView::slotEditorMsfEditValueChanged( int ) bool K3bListView::doRename() { if( m_currentEditItem ) { - QString newValue; + TQString newValue; switch( m_currentEditItem->editorType( m_currentEditColumn ) ) { case K3bListViewItem::COMBO: newValue = m_editorComboBox->currentText(); @@ -951,10 +951,10 @@ bool K3bListView::doRename() newValue = m_editorLineEdit->text(); break; case K3bListViewItem::SPIN: - newValue = QString::number(m_editorSpinBox->value()); + newValue = TQString::number(m_editorSpinBox->value()); break; case K3bListViewItem::MSF: - newValue = QString::number(m_editorMsfEdit->value()); + newValue = TQString::number(m_editorMsfEdit->value()); break; } @@ -997,7 +997,7 @@ void K3bListView::slotEditorButtonClicked() } -bool K3bListView::renameItem( K3bListViewItem* item, int col, const QString& text ) +bool K3bListView::renameItem( K3bListViewItem* item, int col, const TQString& text ) { Q_UNUSED(item); Q_UNUSED(col); @@ -1012,14 +1012,14 @@ void K3bListView::slotEditorButtonClicked( K3bListViewItem* item, int col ) } -bool K3bListView::eventFilter( QObject* o, QEvent* e ) +bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) { - if( e->type() == QEvent::KeyPress ) { - QKeyEvent* ke = static_cast<QKeyEvent*>(e); + if( e->type() == TQEvent::KeyPress ) { + TQKeyEvent* ke = TQT_TQKEYEVENT(e); if( ke->key() == Key_Tab ) { - if( o == m_editorLineEdit || - o == d->msfEditLineEdit || - o == d->spinBoxLineEdit ) { + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { K3bListViewItem* lastEditItem = m_currentEditItem; doRename(); @@ -1059,9 +1059,9 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e ) } if( ke->key() == Key_Return || ke->key() == Key_Enter ) { - if( o == m_editorLineEdit || - o == d->msfEditLineEdit || - o == d->spinBoxLineEdit ) { + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { K3bListViewItem* lastEditItem = m_currentEditItem; doRename(); @@ -1079,9 +1079,9 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e ) } } else if( ke->key() == Key_Escape ) { - if( o == m_editorLineEdit || - o == d->msfEditLineEdit || - o == d->spinBoxLineEdit ) { + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { hideEditor(); // keep the focus here @@ -1092,13 +1092,13 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e ) } } - else if( e->type() == QEvent::MouseButtonPress && o == viewport() ) { + else if( e->type() == TQEvent::MouseButtonPress && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { // first let's grab the focus viewport()->setFocus(); - QMouseEvent* me = static_cast<QMouseEvent*>( e ); - QListViewItem* item = itemAt( me->pos() ); + TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQListViewItem* item = itemAt( me->pos() ); int col = header()->sectionAt( me->pos().x() ); if( K3bCheckListViewItem* ci = dynamic_cast<K3bCheckListViewItem*>( item ) ) { if( col == 0 ) { @@ -1108,7 +1108,7 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e ) } } - if( me->button() == QMouseEvent::LeftButton ) { + if( me->button() == Qt::LeftButton ) { if( item != m_currentEditItem || m_currentEditColumn != col ) { doRename(); if( K3bListViewItem* k3bItem = dynamic_cast<K3bListViewItem*>(item) ) { @@ -1137,13 +1137,13 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e ) } } - else if( e->type() == QEvent::FocusOut ) { - if( o == m_editorLineEdit || - o == d->msfEditLineEdit || - o == d->spinBoxLineEdit || - o == m_editorComboBox ) { - // make sure we did not lose the focus to one of the edit widgets' children - if( !qApp->focusWidget() || qApp->focusWidget()->parentWidget() != o ) { + else if( e->type() == TQEvent::FocusOut ) { + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) || + TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) { + // make sure we did not lose the focus to one of the edit widgets' tqchildren + if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->tqparentWidget()) != TQT_BASE_OBJECT(o) ) { doRename(); hideEditor(); } @@ -1154,27 +1154,27 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e ) } -void K3bListView::setK3bBackgroundPixmap( const QPixmap& pix, int pos ) +void K3bListView::setK3bBackgroundPixmap( const TQPixmap& pix, int pos ) { m_backgroundPixmap = pix; m_backgroundPixmapPosition = pos; } -void K3bListView::viewportResizeEvent( QResizeEvent* e ) +void K3bListView::viewportResizeEvent( TQResizeEvent* e ) { if( !m_backgroundPixmap.isNull() ) { - QSize size = viewport()->size().expandedTo( QSize( contentsWidth(), contentsHeight() ) ); + TQSize size = viewport()->size().expandedTo( TQSize( contentsWidth(), contentsHeight() ) ); - QPixmap bgPix( size ); + TQPixmap bgPix( size ); // FIXME: let the user specify the color - bgPix.fill( colorGroup().base() ); + bgPix.fill( tqcolorGroup().base() ); if( bgPix.width() < m_backgroundPixmap.width() || bgPix.height() < m_backgroundPixmap.height() ) { - QPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), QImage::ScaleMin ) ); + TQPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), TQ_ScaleMin ) ); if( m_backgroundPixmapPosition == TOP_LEFT ) bitBlt( &bgPix, 0, 0, &newBgPix, 0, 0, @@ -1206,28 +1206,28 @@ void K3bListView::viewportResizeEvent( QResizeEvent* e ) } -QListViewItem* K3bListView::parentItem( QListViewItem* item ) +TQListViewItem* K3bListView::tqparentItem( TQListViewItem* item ) { if( !item ) return 0; - if( item->parent() ) - return item->parent(); + if( item->tqparent() ) + return item->tqparent(); else - return K3bListView::parentItem( item->itemAbove() ); + return K3bListView::tqparentItem( item->itemAbove() ); } -KPixmap K3bListView::createDragPixmap( const QPtrList<QListViewItem>& items ) +KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items ) { // // Create drag pixmap. - // If there are too many items fade the pixmap using the mask + // If there are too many items fade the pixmap using the tqmask // always fade invisible items // int width = header()->width(); int height = 0; - for( QPtrListIterator<QListViewItem> it( items ); *it; ++it ) { - QRect r = itemRect( *it ); + for( TQPtrListIterator<TQListViewItem> it( items ); *it; ++it ) { + TQRect r = tqitemRect( *it ); if( r.isValid() ) { height += ( *it )->height(); @@ -1244,25 +1244,25 @@ KPixmap K3bListView::createDragPixmap( const QPtrList<QListViewItem>& items ) KPixmap pix; pix.resize( width, height ); - pix.fill( Qt::white ); - // QBitmap mask( width, bottom-top ); + pix.fill( TQt::white ); + // TQBitmap tqmask( width, bottom-top ); // now paint all the visible items into the pixmap // FIXME: only paint the visible items - QPainter p( &pix ); - for( QListViewItemIterator it( this ); *it; ++it ) { - QListViewItem* item = *it; + TQPainter p( &pix ); + for( TQListViewItemIterator it( this ); *it; ++it ) { + TQListViewItem* item = *it; // FIXME: items on other than the top level have a smaller first column // the same goes for all items if root is decorated bool alreadyDrawing = false; - QRect r = itemRect( item ); + TQRect r = tqitemRect( item ); if( r.isValid() ) { - if( items.containsRef( item ) ) { + if( items.tqcontainsRef( item ) ) { // paint all columns int x = 0; for( int i = 0; i < columns(); ++i ) { - item->paintCell( &p, colorGroup(), i, columnWidth( i ), columnAlignment( i ) ); + item->paintCell( &p, tqcolorGroup(), i, columnWidth( i ), columnAlignment( i ) ); p.translate( columnWidth( i ), 0 ); x += columnWidth( i ); } @@ -1274,13 +1274,13 @@ KPixmap K3bListView::createDragPixmap( const QPtrList<QListViewItem>& items ) else if( alreadyDrawing ) p.translate( 0, item->height() ); - if( p.worldMatrix().dy() >= pix.height() ) + if( p.tqworldMatrix().dy() >= pix.height() ) break; } } // make it a little lighter - KPixmapEffect::fade( pix, 0.3, Qt::white ); + KPixmapEffect::fade( pix, 0.3, TQt::white ); // FIXME: fade the pixmap at the right side if the items are longer than width diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h index f8eb2ad..9f470ed 100644 --- a/libk3b/tools/k3blistview.h +++ b/libk3b/tools/k3blistview.h @@ -20,20 +20,20 @@ #include <klistview.h> #include "k3b_export.h" -#include <qptrvector.h> -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqptrvector.h> +#include <tqptrlist.h> +#include <tqstringlist.h> #include <kpixmap.h> -class QPainter; -class QPushButton; -class QIconSet; -class QResizeEvent; -class QComboBox; -class QSpinBox; -class QLineEdit; -class QEvent; -class QValidator; +class TQPainter; +class TQPushButton; +class TQIconSet; +class TQResizeEvent; +class TQComboBox; +class TQSpinBox; +class TQLineEdit; +class TQEvent; +class TQValidator; class K3bMsfEdit; class K3bListView; @@ -42,34 +42,34 @@ class K3bListView; class LIBK3B_EXPORT K3bListViewItem : public KListViewItem { public: - K3bListViewItem(QListView *parent); - K3bListViewItem(QListViewItem *parent); - K3bListViewItem(QListView *parent, QListViewItem *after); - K3bListViewItem(QListViewItem *parent, QListViewItem *after); - - K3bListViewItem(QListView *parent, - const QString&, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null); - - K3bListViewItem(QListViewItem *parent, - const QString&, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null); - - K3bListViewItem(QListView *parent, QListViewItem *after, - const QString&, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null); - - K3bListViewItem(QListViewItem *parent, QListViewItem *after, - const QString&, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null, - const QString& = QString::null, const QString& = QString::null); + K3bListViewItem(TQListView *tqparent); + K3bListViewItem(TQListViewItem *tqparent); + K3bListViewItem(TQListView *tqparent, TQListViewItem *after); + K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after); + + K3bListViewItem(TQListView *tqparent, + const TQString&, const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString()); + + K3bListViewItem(TQListViewItem *tqparent, + const TQString&, const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString()); + + K3bListViewItem(TQListView *tqparent, TQListViewItem *after, + const TQString&, const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString()); + + K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after, + const TQString&, const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString(), + const TQString& = TQString(), const TQString& = TQString()); virtual ~K3bListViewItem(); @@ -78,23 +78,23 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem */ void setup(); - virtual int width( const QFontMetrics& fm, const QListView* lv, int c ) const; + virtual int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const; - void setEditor( int col, int type, const QStringList& = QStringList() ); + void setEditor( int col, int type, const TQStringList& = TQStringList() ); void setButton( int col, bool ); - void setValidator( int col, QValidator* v ); - QValidator* validator( int col ) const; + void setValidator( int col, TQValidator* v ); + TQValidator* validator( int col ) const; int editorType( int col ) const; bool needButton( int col ) const; - const QStringList& comboStrings( int col ) const; + const TQStringList& comboStrings( int col ) const; enum EditorType { NONE, COMBO, LINE, SPIN, MSF }; - void setFont( int col, const QFont& f ); - void setBackgroundColor( int col, const QColor& ); - void setForegroundColor( int col, const QColor& ); + void setFont( int col, const TQFont& f ); + void setBackgroundColor( int col, const TQColor& ); + void setForegroundColor( int col, const TQColor& ); void setDisplayProgressBar( int col, bool ); void setProgress( int, int ); @@ -116,12 +116,12 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem /** * Do not reimplement this but paintK3bCell to use the margin and background stuff. */ - virtual void paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ); + virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ); - virtual void paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ); + virtual void paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ); private: - void paintProgressBar( QPainter* p, const QColorGroup& cgh, int col, int width ); + void paintProgressBar( TQPainter* p, const TQColorGroup& cgh, int col, int width ); class ColumnInfo; mutable ColumnInfo* m_columns; @@ -136,16 +136,16 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem class LIBK3B_EXPORT K3bCheckListViewItem : public K3bListViewItem { public: - K3bCheckListViewItem(QListView *parent); - K3bCheckListViewItem(QListViewItem *parent); - K3bCheckListViewItem(QListView *parent, QListViewItem *after); - K3bCheckListViewItem(QListViewItem *parent, QListViewItem *after); + K3bCheckListViewItem(TQListView *tqparent); + K3bCheckListViewItem(TQListViewItem *tqparent); + K3bCheckListViewItem(TQListView *tqparent, TQListViewItem *after); + K3bCheckListViewItem(TQListViewItem *tqparent, TQListViewItem *after); virtual bool isChecked() const; virtual void setChecked( bool checked ); protected: - virtual void paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ); + virtual void paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ); private: bool m_checked; @@ -158,16 +158,17 @@ class LIBK3B_EXPORT K3bListView : public KListView friend class K3bListViewItem; Q_OBJECT + TQ_OBJECT public: - K3bListView (QWidget *parent = 0, const char *name = 0); + K3bListView (TQWidget *tqparent = 0, const char *name = 0); virtual ~K3bListView(); - virtual void setCurrentItem( QListViewItem* ); + virtual void setCurrentItem( TQListViewItem* ); K3bListViewItem* currentlyEditedItem() const { return m_currentEditItem; } - QWidget* editor( K3bListViewItem::EditorType ) const; + TQWidget* editor( K3bListViewItem::EditorType ) const; enum BgPixPosition { TOP_LEFT, @@ -178,25 +179,25 @@ class LIBK3B_EXPORT K3bListView : public KListView * This will set a background pixmap which is not tiled. * @param pos position on the viewport. */ - void setK3bBackgroundPixmap( const QPixmap&, int pos = CENTER ); + void setK3bBackgroundPixmap( const TQPixmap&, int pos = CENTER ); /** * Create a faded pixmap showing the items. */ - KPixmap createDragPixmap( const QPtrList<QListViewItem>& items ); + KPixmap createDragPixmap( const TQPtrList<TQListViewItem>& items ); /** * Searches for the first item above @p i which is one level higher. * For 1st level items this will always be the listview's root item. */ - static QListViewItem* parentItem( QListViewItem* i ); + static TQListViewItem* tqparentItem( TQListViewItem* i ); signals: void editorButtonClicked( K3bListViewItem*, int ); public slots: - void setNoItemText( const QString& ); - // void setNoItemPixmap( const QPixmap& ); + void setNoItemText( const TQString& ); + // void setNoItemPixmap( const TQPixmap& ); void setNoItemVerticalMargin( int i ) { m_noItemVMargin = i; } void setNoItemHorizontalMargin( int i ) { m_noItemHMargin = i; } void setDoubleClickForEdit( bool b ) { m_doubleClickForEdit = b; } @@ -208,7 +209,7 @@ class LIBK3B_EXPORT K3bListView : public KListView private slots: void updateEditorSize(); virtual void slotEditorLineEditReturnPressed(); - virtual void slotEditorComboBoxActivated( const QString& ); + virtual void slotEditorComboBoxActivated( const TQString& ); virtual void slotEditorSpinBoxValueChanged( int ); virtual void slotEditorMsfEditValueChanged( int ); virtual void slotEditorButtonClicked(); @@ -223,7 +224,7 @@ class LIBK3B_EXPORT K3bListView : public KListView * * FIXME: should be called something like mayRename */ - virtual bool renameItem( K3bListViewItem*, int, const QString& ); + virtual bool renameItem( K3bListViewItem*, int, const TQString& ); /** * default impl just emits signal @@ -236,9 +237,9 @@ class LIBK3B_EXPORT K3bListView : public KListView * calls KListView::drawContentsOffset * and paints a the noItemText if no item is in the list */ - virtual void drawContentsOffset ( QPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ); - virtual void resizeEvent( QResizeEvent* ); - virtual void paintEmptyArea( QPainter*, const QRect& rect ); + virtual void drawContentsOffset ( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ); + virtual void resizeEvent( TQResizeEvent* ); + virtual void paintEmptyArea( TQPainter*, const TQRect& rect ); /** * Reimplemented for internal reasons. @@ -247,7 +248,7 @@ class LIBK3B_EXPORT K3bListView : public KListView * * The API is unaffected. */ - virtual void viewportResizeEvent( QResizeEvent* ); + virtual void viewportResizeEvent( TQResizeEvent* ); /** * Reimplemented for internal reasons. @@ -256,20 +257,20 @@ class LIBK3B_EXPORT K3bListView : public KListView * * The API is unaffected. */ - virtual void viewportPaintEvent(QPaintEvent*); + virtual void viewportPaintEvent(TQPaintEvent*); - virtual bool eventFilter( QObject*, QEvent* ); + virtual bool eventFilter( TQObject*, TQEvent* ); K3bListViewItem* currentEditItem() const { return m_currentEditItem; } int currentEditColumn() const { return m_currentEditColumn; } private: - QWidget* prepareEditor( K3bListViewItem* item, int col ); + TQWidget* prepareEditor( K3bListViewItem* item, int col ); void prepareButton( K3bListViewItem* item, int col ); bool doRename(); - QString m_noItemText; - // QPixmap m_noItemPixmap; + TQString m_noItemText; + // TQPixmap m_noItemPixmap; int m_noItemVMargin; int m_noItemHMargin; @@ -277,15 +278,15 @@ class LIBK3B_EXPORT K3bListView : public KListView int m_currentEditColumn; bool m_doubleClickForEdit; - QListViewItem* m_lastClickedItem; + TQListViewItem* m_lastClickedItem; - QPushButton* m_editorButton; - QComboBox* m_editorComboBox; - QSpinBox* m_editorSpinBox; - QLineEdit* m_editorLineEdit; + TQPushButton* m_editorButton; + TQComboBox* m_editorComboBox; + TQSpinBox* m_editorSpinBox; + TQLineEdit* m_editorLineEdit; K3bMsfEdit* m_editorMsfEdit; - QPixmap m_backgroundPixmap; + TQPixmap m_backgroundPixmap; int m_backgroundPixmapPosition; class Private; diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp index 1c729b6..b1bcf71 100644 --- a/libk3b/tools/k3blistviewitemanimator.cpp +++ b/libk3b/tools/k3blistviewitemanimator.cpp @@ -15,22 +15,22 @@ #include "k3blistviewitemanimator.h" -#include <qtimer.h> -#include <qlistview.h> +#include <tqtimer.h> +#include <tqlistview.h> #include <kpixmap.h> #include <kpixmapeffect.h> -K3bListViewItemAnimator::K3bListViewItemAnimator( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bListViewItemAnimator::K3bListViewItemAnimator( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { init(); } -K3bListViewItemAnimator::K3bListViewItemAnimator( QListViewItem* item, int col, QObject* parent, const char* name ) - : QObject( parent, name ) +K3bListViewItemAnimator::K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { init(); setItem( item, col ); @@ -42,7 +42,7 @@ K3bListViewItemAnimator::~K3bListViewItemAnimator() } -QListViewItem* K3bListViewItemAnimator::item() const +TQListViewItem* K3bListViewItemAnimator::item() const { return m_item; } @@ -52,8 +52,8 @@ void K3bListViewItemAnimator::init() { m_item = 0; m_column = 0; - m_timer = new QTimer( this ); - connect( m_timer, SIGNAL(timeout()), this, SLOT(slotAnimate()) ); + m_timer = new TQTimer( this ); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimate()) ); } @@ -75,17 +75,17 @@ void K3bListViewItemAnimator::stop() } -void K3bListViewItemAnimator::setItem( QListViewItem* item, int col ) +void K3bListViewItemAnimator::setItem( TQListViewItem* item, int col ) { m_item = item; m_column = col; m_pixmap = *item->pixmap(col); - m_fadeColor = item->listView()->colorGroup().base(); + m_fadeColor = item->listView()->tqcolorGroup().base(); start(); } -void K3bListViewItemAnimator::setPixmap( const QPixmap& p ) +void K3bListViewItemAnimator::setPixmap( const TQPixmap& p ) { m_pixmap = p; start(); @@ -99,7 +99,7 @@ void K3bListViewItemAnimator::setColumn( int col ) } -void K3bListViewItemAnimator::setFadeColor( const QColor& c ) +void K3bListViewItemAnimator::setFadeColor( const TQColor& c ) { m_fadeColor = c; start(); diff --git a/libk3b/tools/k3blistviewitemanimator.h b/libk3b/tools/k3blistviewitemanimator.h index 200079a..660ee98 100644 --- a/libk3b/tools/k3blistviewitemanimator.h +++ b/libk3b/tools/k3blistviewitemanimator.h @@ -16,48 +16,49 @@ #ifndef _K3B_LISTVIEWITEM_ANIMATOR_H_ #define _K3B_LISTVIEWITEM_ANIMATOR_H_ -#include <qobject.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqpixmap.h> #include "k3b_export.h" -class QListViewItem; -class QTimer; +class TQListViewItem; +class TQTimer; /** * Fades an icon on a listview item in and out. */ -class LIBK3B_EXPORT K3bListViewItemAnimator : public QObject +class LIBK3B_EXPORT K3bListViewItemAnimator : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bListViewItemAnimator( QObject* parent = 0, const char* name = 0 ); + K3bListViewItemAnimator( TQObject* tqparent = 0, const char* name = 0 ); /** * Will use the items pixmap. */ - K3bListViewItemAnimator( QListViewItem* item, int col, QObject* parent = 0, const char* name = 0 ); + K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* tqparent = 0, const char* name = 0 ); ~K3bListViewItemAnimator(); - QListViewItem* item() const; + TQListViewItem* item() const; public slots: void start(); void stop(); - void setItem( QListViewItem*, int col ); + void setItem( TQListViewItem*, int col ); /** * Default is the pixmap from the item. */ - void setPixmap( const QPixmap& ); + void setPixmap( const TQPixmap& ); void setColumn( int col ); /** * Default is the base color of the listview. */ - void setFadeColor( const QColor& ); + void setFadeColor( const TQColor& ); private slots: void slotAnimate(); @@ -67,12 +68,12 @@ class LIBK3B_EXPORT K3bListViewItemAnimator : public QObject int m_animationStep; bool m_animationBack; - QPixmap m_pixmap; - QColor m_fadeColor; - QListViewItem* m_item; + TQPixmap m_pixmap; + TQColor m_fadeColor; + TQListViewItem* m_item; int m_column; - QTimer* m_timer; + TQTimer* m_timer; }; #endif diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index 2679f33..7c46eea 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -25,9 +25,9 @@ #include <kdebug.h> #include <kio/netaccess.h> -#include <qtimer.h> -#include <qcstring.h> -#include <qsocketnotifier.h> +#include <tqtimer.h> +#include <tqcstring.h> +#include <tqsocketnotifier.h> #include <unistd.h> @@ -47,11 +47,11 @@ public: KMD5 md5; K3bFileSplitter file; - QTimer timer; - QString filename; + TQTimer timer; + TQString filename; int fileDes; K3bDevice::Device* device; - QSocketNotifier* fdNotifier; + TQSocketNotifier* fdNotifier; bool finished; char* data; @@ -68,13 +68,13 @@ public: }; -K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ) +K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ) { d = new K3bMd5JobPrivate; d->data = new char[K3bMd5JobPrivate::BUFFERSIZE]; - connect( &d->timer, SIGNAL(timeout()), - this, SLOT(slotUpdate()) ); + connect( &d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotUpdate()) ); } @@ -96,15 +96,15 @@ void K3bMd5Job::start() d->imageSize = d->isoFile->size(); } else if( !d->filename.isEmpty() ) { - if( !QFile::exists( d->filename ) ) { - emit infoMessage( i18n("Could not find file %1").arg(d->filename), ERROR ); + if( !TQFile::exists( d->filename ) ) { + emit infoMessage( i18n("Could not find file %1").tqarg(d->filename), ERROR ); jobFinished(false); return; } d->file.setName( d->filename ); if( !d->file.open( IO_ReadOnly ) ) { - emit infoMessage( i18n("Could not open file %1").arg(d->filename), ERROR ); + emit infoMessage( i18n("Could not open file %1").tqarg(d->filename), ERROR ); jobFinished(false); return; } @@ -132,10 +132,10 @@ void K3bMd5Job::start() void K3bMd5Job::setupFdNotifier() { - // the QSocketNotifier will fire once the fd is closed + // the TQSocketNotifier will fire once the fd is closed delete d->fdNotifier; - d->fdNotifier = new QSocketNotifier( d->fileDes, QSocketNotifier::Read, this ); - connect( d->fdNotifier, SIGNAL(activated(int)), this, SLOT(slotUpdate()) ); + d->fdNotifier = new TQSocketNotifier( d->fileDes, TQSocketNotifier::Read, this ); + connect( d->fdNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdate()) ); d->fdNotifier->setEnabled( true ); } @@ -151,7 +151,7 @@ void K3bMd5Job::cancel() } -void K3bMd5Job::setFile( const QString& filename ) +void K3bMd5Job::setFile( const TQString& filename ) { d->filename = filename; d->isoFile = 0; @@ -200,11 +200,11 @@ void K3bMd5Job::slotUpdate() // determine bytes to read unsigned int readSize = K3bMd5JobPrivate::BUFFERSIZE; if( d->maxSize > 0 ) - readSize = QMIN( readSize, d->maxSize - d->readData ); + readSize = TQMIN( readSize, d->maxSize - d->readData ); if( readSize <= 0 ) { // kdDebug() << "(K3bMd5Job) reached max size of " << d->maxSize << ". Stopping." << endl; - emit debuggingOutput( "K3bMd5Job", QString("Reached max read of %1. Stopping after %2 bytes.").arg(d->maxSize).arg(d->readData) ); + emit debuggingOutput( "K3bMd5Job", TQString("Reached max read of %1. Stopping after %2 bytes.").tqarg(d->maxSize).tqarg(d->readData) ); stopAll(); emit percent( 100 ); jobFinished(true); @@ -228,13 +228,13 @@ void K3bMd5Job::slotUpdate() // Only the last sector may not be used completely. // unsigned long sector = d->readData/2048; - unsigned int sectorCnt = QMAX( readSize/2048, 1 ); + unsigned int sectorCnt = TQMAX( readSize/2048, 1 ); read = -1; if( d->device->read10( reinterpret_cast<unsigned char*>(d->data), sectorCnt*2048, sector, sectorCnt ) ) - read = QMIN( readSize, sectorCnt*2048 ); + read = TQMIN( readSize, sectorCnt*2048 ); } // @@ -252,13 +252,13 @@ void K3bMd5Job::slotUpdate() } if( read < 0 ) { - emit infoMessage( i18n("Error while reading from file %1").arg(d->filename), ERROR ); + emit infoMessage( i18n("Error while reading from file %1").tqarg(d->filename), ERROR ); stopAll(); jobFinished(false); } else if( read == 0 ) { // kdDebug() << "(K3bMd5Job) read all data. Total size: " << d->readData << ". Stopping." << endl; - emit debuggingOutput( "K3bMd5Job", QString("All data read. Stopping after %1 bytes.").arg(d->readData) ); + emit debuggingOutput( "K3bMd5Job", TQString("All data read. Stopping after %1 bytes.").tqarg(d->readData) ); stopAll(); emit percent( 100 ); jobFinished(true); @@ -282,7 +282,7 @@ void K3bMd5Job::slotUpdate() } -QCString K3bMd5Job::hexDigest() +TQCString K3bMd5Job::hexDigest() { if( d->finished ) return d->md5.hexDigest(); @@ -291,7 +291,7 @@ QCString K3bMd5Job::hexDigest() } -QCString K3bMd5Job::base64Digest() +TQCString K3bMd5Job::base64Digest() { if( d->finished ) return d->md5.base64Digest(); @@ -303,7 +303,7 @@ QCString K3bMd5Job::base64Digest() void K3bMd5Job::stop() { - emit debuggingOutput( "K3bMd5Job", QString("Stopped manually after %1 bytes.").arg(d->readData) ); + emit debuggingOutput( "K3bMd5Job", TQString("Stopped manually after %1 bytes.").tqarg(d->readData) ); stopAll(); jobFinished( true ); } diff --git a/libk3b/tools/k3bmd5job.h b/libk3b/tools/k3bmd5job.h index cd64795..8c487a2 100644 --- a/libk3b/tools/k3bmd5job.h +++ b/libk3b/tools/k3bmd5job.h @@ -18,7 +18,7 @@ #define _K3B_MD5_JOB_H_ #include <k3bjob.h> -#include <qcstring.h> +#include <tqcstring.h> #include "k3b_export.h" namespace K3bDevice { @@ -31,20 +31,21 @@ class K3bIso9660File; class LIBK3B_EXPORT K3bMd5Job : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bMd5Job( K3bJobHandler* jh , QObject* parent = 0, const char* name = 0 ); + K3bMd5Job( K3bJobHandler* jh , TQObject* tqparent = 0, const char* name = 0 ); ~K3bMd5Job(); - QCString hexDigest(); - QCString base64Digest(); + TQCString hexDigest(); + TQCString base64Digest(); public slots: void start(); void stop(); void cancel(); - // FIXME: read from QIODevice and thus add K3bFileSplitter support + // FIXME: read from TQIODevice and thus add K3bFileSplitter support /** * read from a file. @@ -53,7 +54,7 @@ class LIBK3B_EXPORT K3bMd5Job : public K3bJob * images. In the future this will be changed with the introduction * of a setIODevice method. */ - void setFile( const QString& filename ); + void setFile( const TQString& filename ); /** * read from an iso9660 file diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index 13ad0a3..47ecbfd 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -18,31 +18,31 @@ #include "k3bmsfedit.h" #include "k3bglobals.h" -#include <qstringlist.h> -#include <qlineedit.h> -#include <qstyle.h> -#include <qfontmetrics.h> -#include <qapplication.h> +#include <tqstringlist.h> +#include <tqlineedit.h> +#include <tqstyle.h> +#include <tqfontmetrics.h> +#include <tqapplication.h> -K3bMsfValidator::K3bMsfValidator( QObject* parent, const char* name ) - : QRegExpValidator( K3b::Msf::regExp(), parent, name ) +K3bMsfValidator::K3bMsfValidator( TQObject* tqparent, const char* name ) + : TQRegExpValidator( K3b::Msf::regExp(), tqparent, name ) { } -K3bMsfEdit::K3bMsfEdit( QWidget* parent, const char* name ) - : QSpinBox( parent, name ) +K3bMsfEdit::K3bMsfEdit( TQWidget* tqparent, const char* name ) + : TQSpinBox( tqparent, name ) { - setValidator( new K3bMsfValidator( this ) ); + setValidator( new K3bMsfValidator( TQT_TQOBJECT(this) ) ); setMinValue( 0 ); // some very high value (10000 minutes) setMaxValue( 10000*60*75 ); - connect( this, SIGNAL(valueChanged(int)), - this, SLOT(slotValueChanged(int)) ); + connect( this, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotValueChanged(int)) ); } @@ -50,24 +50,24 @@ K3bMsfEdit::~K3bMsfEdit() {} -QSize K3bMsfEdit::sizeHint() const +TQSize K3bMsfEdit::tqsizeHint() const { - // more or less copied from QSpinBox + // more or less copied from TQSpinBox constPolish(); - QSize sz = editor()->sizeHint(); + TQSize sz = editor()->tqsizeHint(); int h = sz.height(); - QFontMetrics fm( font() ); + TQFontMetrics fm( font() ); int w = fm.width( "00:00:00" ); int wx = fm.width( ' ' )*2; - int frame = style().pixelMetric( QStyle::PM_SpinBoxFrameWidth ); - return style().sizeFromContents(QStyle::CT_SpinBox, this, - QSize( w + wx + downRect().width() + frame*2, + int frame = tqstyle().tqpixelMetric( TQStyle::PM_SpinBoxFrameWidth ); + return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this, + TQSize( w + wx + downRect().width() + frame*2, h + frame*2). - expandedTo( QApplication::globalStrut() )); + expandedTo( TQApplication::globalStrut() )); } -QString K3bMsfEdit::mapValueToText( int value ) +TQString K3bMsfEdit::mapValueToText( int value ) { return K3b::framesToString( value, true ); } @@ -91,7 +91,7 @@ int K3bMsfEdit::mapTextToValue( bool* ok ) } -void K3bMsfEdit::setText( const QString& str ) +void K3bMsfEdit::setText( const TQString& str ) { bool ok; editor()->setText( str ); @@ -112,7 +112,7 @@ void K3bMsfEdit::setLineWidth( int v ) void K3bMsfEdit::setValue( int v ) { int i = editor()->cursorPosition(); - QSpinBox::setValue( v ); + TQSpinBox::setValue( v ); editor()->setCursorPosition( i ); } @@ -131,10 +131,10 @@ int K3bMsfEdit::currentStepValue() const int val = 1; // look if we are currently editing minutes or seconds - QString text = editor()->text(); + TQString text = editor()->text(); if( text.length() == 8 ) { text = text.mid( editor()->cursorPosition() ); - int num = text.contains( ':' ); + int num = text.tqcontains( ':' ); if( num == 1 ) val = 75; else if( num == 2 ) diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h index c573910..984c674 100644 --- a/libk3b/tools/k3bmsfedit.h +++ b/libk3b/tools/k3bmsfedit.h @@ -18,29 +18,30 @@ #define K3B_MSF_EDIT_H -#include <qspinbox.h> -#include <qstring.h> -#include <qvalidator.h> +#include <tqspinbox.h> +#include <tqstring.h> +#include <tqvalidator.h> #include <k3bmsf.h> #include "k3b_export.h" -class K3bMsfValidator : public QRegExpValidator +class K3bMsfValidator : public TQRegExpValidator { public: - K3bMsfValidator( QObject* parent = 0, const char* name = 0 ); + K3bMsfValidator( TQObject* tqparent = 0, const char* name = 0 ); }; -class LIBK3B_EXPORT K3bMsfEdit : public QSpinBox +class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: - K3bMsfEdit( QWidget* parent = 0, const char* name = 0 ); + K3bMsfEdit( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMsfEdit(); - QSize sizeHint() const; + TQSize tqsizeHint() const; void setFrameStyle( int style ); void setLineWidth(int); @@ -52,13 +53,13 @@ class LIBK3B_EXPORT K3bMsfEdit : public QSpinBox public slots: void setValue( int v ); - void setText( const QString& ); + void setText( const TQString& ); void setMsfValue( const K3b::Msf& ); void stepUp(); void stepDown(); protected: - QString mapValueToText( int ); + TQString mapValueToText( int ); int mapTextToValue( bool* ok ); int currentStepValue() const; diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp index 4c12554..e4cc364 100644 --- a/libk3b/tools/k3bmultichoicedialog.cpp +++ b/libk3b/tools/k3bmultichoicedialog.cpp @@ -21,12 +21,12 @@ #include <kapplication.h> #include <kiconloader.h> -#include <qlayout.h> -#include <qsignalmapper.h> -#include <qptrlist.h> -#include <qlabel.h> -#include <qhbox.h> -#include <qmessagebox.h> +#include <tqlayout.h> +#include <tqsignalmapper.h> +#include <tqptrlist.h> +#include <tqlabel.h> +#include <tqhbox.h> +#include <tqmessagebox.h> class K3bMultiChoiceDialog::Private @@ -37,71 +37,71 @@ public: buttonLayout(0) { } - QSignalMapper* mapper; - QPtrList<KPushButton> buttons; - QHBoxLayout* buttonLayout; + TQSignalMapper* mapper; + TQPtrList<KPushButton> buttons; + TQHBoxLayout* buttonLayout; bool buttonClicked; }; // from kmessagebox.cpp -static QPixmap themedMessageBoxIcon(QMessageBox::Icon icon) +static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon) { - QString icon_name; + TQString icon_name; switch(icon) { - case QMessageBox::NoIcon: - return QPixmap(); + case TQMessageBox::NoIcon: + return TQPixmap(); break; - case QMessageBox::Information: + case TQMessageBox::Information: icon_name = "messagebox_info"; break; - case QMessageBox::Warning: + case TQMessageBox::Warning: icon_name = "messagebox_warning"; break; - case QMessageBox::Critical: + case TQMessageBox::Critical: icon_name = "messagebox_critical"; break; default: break; } - QPixmap ret = KApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQPixmap ret = KApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); if (ret.isNull()) - return QMessageBox::standardIcon(icon); + return TQMessageBox::standardIcon(icon); else return ret; } -K3bMultiChoiceDialog::K3bMultiChoiceDialog( const QString& caption, - const QString& text, - QMessageBox::Icon icon, - QWidget* parent, const char* name ) - : KDialog( parent, name ) +K3bMultiChoiceDialog::K3bMultiChoiceDialog( const TQString& caption, + const TQString& text, + TQMessageBox::Icon icon, + TQWidget* tqparent, const char* name ) + : KDialog( tqparent, name ) { d = new Private(); - d->mapper = new QSignalMapper( this ); - connect( d->mapper, SIGNAL(mapped(int)), this, SLOT(done(int)) ); + d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); + connect( d->mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(done(int)) ); setCaption( caption ); - QGridLayout* mainGrid = new QGridLayout( this ); + TQGridLayout* mainGrid = new TQGridLayout( this ); mainGrid->setSpacing( spacingHint() ); mainGrid->setMargin( marginHint() ); - QHBox* contents = new QHBox( this ); + TQHBox* contents = new TQHBox( this ); contents->setSpacing( KDialog::spacingHint()*2 ); contents->setMargin( 0 ); - QLabel* pixLabel = new QLabel( contents ); + TQLabel* pixLabel = new TQLabel( contents ); pixLabel->setPixmap( themedMessageBoxIcon( icon ) ); pixLabel->setScaledContents( false ); - QLabel* label = new K3bRichTextLabel( text, contents ); + TQLabel* label = new K3bRichTextLabel( text, contents ); contents->setStretchFactor( label, 1 ); - d->buttonLayout = new QHBoxLayout; + d->buttonLayout = new TQHBoxLayout; d->buttonLayout->setSpacing( spacingHint() ); d->buttonLayout->setMargin( 0 ); @@ -126,8 +126,8 @@ int K3bMultiChoiceDialog::addButton( const KGuiItem& b ) KPushButton* button = new KPushButton( b, this ); d->buttonLayout->add( button ); d->buttons.append(button); - d->mapper->setMapping( button, d->buttons.count() ); - connect( button, SIGNAL(clicked()), d->mapper, SLOT(map()) ); + d->mapper->setMapping( TQT_TQOBJECT(button), d->buttons.count() ); + connect( button, TQT_SIGNAL(clicked()), d->mapper, TQT_SLOT(map()) ); return d->buttons.count(); } @@ -146,7 +146,7 @@ int K3bMultiChoiceDialog::exec() } -void K3bMultiChoiceDialog::closeEvent( QCloseEvent* e ) +void K3bMultiChoiceDialog::closeEvent( TQCloseEvent* e ) { // make sure the dialog can only be closed by the buttons // otherwise we may get an undefined return value in exec @@ -158,10 +158,10 @@ void K3bMultiChoiceDialog::closeEvent( QCloseEvent* e ) } -int K3bMultiChoiceDialog::choose( const QString& caption, - const QString& text, - QMessageBox::Icon icon, - QWidget* parent, +int K3bMultiChoiceDialog::choose( const TQString& caption, + const TQString& text, + TQMessageBox::Icon icon, + TQWidget* tqparent, const char* name, int buttonCount, const KGuiItem& b1, @@ -171,7 +171,7 @@ int K3bMultiChoiceDialog::choose( const QString& caption, const KGuiItem& b5, const KGuiItem& b6 ) { - K3bMultiChoiceDialog dlg( caption, text, icon, parent, name ); + K3bMultiChoiceDialog dlg( caption, text, icon, tqparent, name ); dlg.addButton( b1 ); if( buttonCount > 1 ) dlg.addButton( b2 ); diff --git a/libk3b/tools/k3bmultichoicedialog.h b/libk3b/tools/k3bmultichoicedialog.h index f293fef..be0748a 100644 --- a/libk3b/tools/k3bmultichoicedialog.h +++ b/libk3b/tools/k3bmultichoicedialog.h @@ -20,20 +20,21 @@ #include <kstdguiitem.h> #include "k3b_export.h" -#include <qmessagebox.h> +#include <tqmessagebox.h> -class QCloseEvent; +class TQCloseEvent; class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: - K3bMultiChoiceDialog( const QString& caption, - const QString& text, - QMessageBox::Icon = QMessageBox::Information, - QWidget* parent = 0, const char* name = 0 ); + K3bMultiChoiceDialog( const TQString& caption, + const TQString& text, + TQMessageBox::Icon = TQMessageBox::Information, + TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMultiChoiceDialog(); /** @@ -41,10 +42,10 @@ class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog */ int addButton( const KGuiItem& ); - static int choose( const QString& caption, - const QString& text, - QMessageBox::Icon = QMessageBox::Information, - QWidget* parent = 0, + static int choose( const TQString& caption, + const TQString& text, + TQMessageBox::Icon = TQMessageBox::Information, + TQWidget* tqparent = 0, const char* name = 0, int buttonCount = 2, const KGuiItem& b1 = KStdGuiItem::yes(), @@ -64,7 +65,7 @@ class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog void slotButtonClicked( int ); private: - void closeEvent( QCloseEvent* ); + void closeEvent( TQCloseEvent* ); class Private; Private* d; diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp index 69a81f5..e0e5a05 100644 --- a/libk3b/tools/k3bprogressdialog.cpp +++ b/libk3b/tools/k3bprogressdialog.cpp @@ -17,29 +17,29 @@ #include <k3bbusywidget.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qframe.h> -#include <qwidgetstack.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqwidgetstack.h> #include <klocale.h> #include <kprogress.h> -K3bProgressDialog::K3bProgressDialog( const QString& text, - QWidget* parent, - const QString& caption, +K3bProgressDialog::K3bProgressDialog( const TQString& text, + TQWidget* tqparent, + const TQString& caption, const char* name ) - : KDialogBase( parent, name, true, caption, Cancel|Ok, Ok, true ) + : KDialogBase( tqparent, name, true, caption, Cancel|Ok, Ok, true ) { - QFrame* main = makeMainWidget(); - QGridLayout* mainLayout = new QGridLayout( main ); + TQFrame* main = makeMainWidget(); + TQGridLayout* mainLayout = new TQGridLayout( main ); mainLayout->setMargin( marginHint() ); mainLayout->setSpacing( spacingHint() ); - m_label = new QLabel( text, main ); - m_stack = new QWidgetStack( main ); + m_label = new TQLabel( text, main ); + m_stack = new TQWidgetStack( main ); m_progressBar = new KProgress( m_stack ); m_busyWidget = new K3bBusyWidget( m_stack ); m_stack->addWidget( m_progressBar ); @@ -71,7 +71,7 @@ int K3bProgressDialog::exec( bool progress ) } -void K3bProgressDialog::setText( const QString& text ) +void K3bProgressDialog::setText( const TQString& text ) { m_label->setText( text ); } diff --git a/libk3b/tools/k3bprogressdialog.h b/libk3b/tools/k3bprogressdialog.h index 32a0544..5ff9ad8 100644 --- a/libk3b/tools/k3bprogressdialog.h +++ b/libk3b/tools/k3bprogressdialog.h @@ -21,9 +21,9 @@ #include "k3b_export.h" class K3bBusyWidget; -class QLabel; +class TQLabel; class KProgress; -class QWidgetStack; +class TQWidgetStack; /** @@ -34,18 +34,19 @@ class QWidgetStack; class LIBK3B_EXPORT K3bProgressDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bProgressDialog( const QString& text = QString::null, - QWidget* parent = 0, - const QString& caption = QString::null, + K3bProgressDialog( const TQString& text = TQString(), + TQWidget* tqparent = 0, + const TQString& caption = TQString(), const char* name = 0 ); ~K3bProgressDialog(); int exec( bool showProgress ); public slots: - void setText( const QString& ); + void setText( const TQString& ); void slotFinished( bool success ); void setProgress( int p ); @@ -53,8 +54,8 @@ class LIBK3B_EXPORT K3bProgressDialog : public KDialogBase void slotCancel(); private: - QLabel* m_label; - QWidgetStack* m_stack; + TQLabel* m_label; + TQWidgetStack* m_stack; K3bBusyWidget* m_busyWidget; KProgress* m_progressBar; }; diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index 11425ad..43ac0a3 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -15,9 +15,9 @@ #include "k3bpushbutton.h" -#include <qtimer.h> -#include <qpopupmenu.h> -#include <qevent.h> +#include <tqtimer.h> +#include <tqpopupmenu.h> +#include <tqevent.h> #include <kglobalsettings.h> #include <kapplication.h> @@ -31,39 +31,39 @@ public: : popupTimer(0) { } - QTimer* popupTimer; - QPoint mousePressPos; + TQTimer* popupTimer; + TQPoint mousePressPos; }; -K3bPushButton::K3bPushButton( QWidget* parent, const char* name ) - : KPushButton( parent, name ) +K3bPushButton::K3bPushButton( TQWidget* tqparent, const char* name ) + : KPushButton( tqparent, name ) { d = new Private(); installEventFilter(this); } -K3bPushButton::K3bPushButton( const QString& text, QWidget* parent, const char* name ) - : KPushButton( text, parent, name ) +K3bPushButton::K3bPushButton( const TQString& text, TQWidget* tqparent, const char* name ) + : KPushButton( text, tqparent, name ) { d = new Private(); installEventFilter(this); } -K3bPushButton::K3bPushButton( const QIconSet& icon, const QString& text, - QWidget* parent, const char* name ) - : KPushButton( icon, text, parent, name ) +K3bPushButton::K3bPushButton( const TQIconSet& icon, const TQString& text, + TQWidget* tqparent, const char* name ) + : KPushButton( icon, text, tqparent, name ) { d = new Private(); installEventFilter(this); } -K3bPushButton::K3bPushButton( const KGuiItem& item, QWidget* parent, const char* name ) - : KPushButton( item, parent, name ) +K3bPushButton::K3bPushButton( const KGuiItem& item, TQWidget* tqparent, const char* name ) + : KPushButton( item, tqparent, name ) { d = new Private(); installEventFilter(this); @@ -76,35 +76,35 @@ K3bPushButton::~K3bPushButton() } -void K3bPushButton::setDelayedPopupMenu( QPopupMenu* popup ) +void K3bPushButton::setDelayedPopupMenu( TQPopupMenu* popup ) { if( !d->popupTimer ) { - d->popupTimer = new QTimer( this ); - connect( d->popupTimer, SIGNAL(timeout()), this, SLOT(slotDelayedPopup()) ); + d->popupTimer = new TQTimer( this ); + connect( d->popupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedPopup()) ); } setPopup( popup ); // we need to do the popup handling ourselves so we cheat a little - // QPushButton connects a popup slot to the pressed signal which we disconnect here + // TQPushButton connects a popup slot to the pressed signal which we disconnect here disconnect( this ); } -bool K3bPushButton::eventFilter( QObject* o, QEvent* ev ) +bool K3bPushButton::eventFilter( TQObject* o, TQEvent* ev ) { if( dynamic_cast<K3bPushButton*>(o) == this ) { // Popup the menu when the left mousebutton is pressed and the mouse // is moved by a small distance. if( popup() ) { - if( ev->type() == QEvent::MouseButtonPress ) { - QMouseEvent* mev = static_cast<QMouseEvent*>(ev); + if( ev->type() == TQEvent::MouseButtonPress ) { + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); d->mousePressPos = mev->pos(); - d->popupTimer->start( QApplication::startDragTime() ); + d->popupTimer->start( TQApplication::startDragTime() ); } - else if( ev->type() == QEvent::MouseMove ) { - QMouseEvent* mev = static_cast<QMouseEvent*>(ev); + else if( ev->type() == TQEvent::MouseMove ) { + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if( ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { d->popupTimer->stop(); slotDelayedPopup(); @@ -124,11 +124,11 @@ void K3bPushButton::slotDelayedPopup() if( isDown() ) { // popup the menu. - // this has been taken from the QPushButton code - if( mapToGlobal( QPoint( 0, rect().bottom() ) ).y() + popup()->sizeHint().height() <= qApp->desktop()->height() ) + // this has been taken from the TQPushButton code + if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->tqsizeHint().height() <= tqApp->desktop()->height() ) popup()->exec( mapToGlobal( rect().bottomLeft() ) ); else - popup()->exec( mapToGlobal( rect().topLeft() - QPoint( 0, popup()->sizeHint().height() ) ) ); + popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->tqsizeHint().height() ) ) ); setDown( false ); } } diff --git a/libk3b/tools/k3bpushbutton.h b/libk3b/tools/k3bpushbutton.h index 1369af3..523cefe 100644 --- a/libk3b/tools/k3bpushbutton.h +++ b/libk3b/tools/k3bpushbutton.h @@ -26,29 +26,30 @@ class LIBK3B_EXPORT K3bPushButton : public KPushButton { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. */ - K3bPushButton( QWidget* parent = 0, const char* name = 0 ); + K3bPushButton( TQWidget* tqparent = 0, const char* name = 0 ); /** * Constructor, that sets the button-text to @p text */ - K3bPushButton( const QString& text, QWidget* parent = 0, const char* name = 0 ); + K3bPushButton( const TQString& text, TQWidget* tqparent = 0, const char* name = 0 ); /** * Constructor, that sets an icon and the button-text to @p text */ - K3bPushButton( const QIconSet& icon, const QString& text, - QWidget* parent = 0, const char* name = 0 ); + K3bPushButton( const TQIconSet& icon, const TQString& text, + TQWidget* tqparent = 0, const char* name = 0 ); /** * Constructor that takes a KGuiItem for the text, the icon, the tooltip * and the what's this help */ - K3bPushButton( const KGuiItem& item, QWidget* parent = 0, const char* name = 0 ); + K3bPushButton( const KGuiItem& item, TQWidget* tqparent = 0, const char* name = 0 ); /** * Destructs the button. @@ -59,10 +60,10 @@ class LIBK3B_EXPORT K3bPushButton : public KPushButton * The popup menu will show if the button is pressed down for about half a second * or if the mouse is moved while pressed just like the KToolBarButton. */ - void setDelayedPopupMenu( QPopupMenu* ); + void setDelayedPopupMenu( TQPopupMenu* ); protected: - virtual bool eventFilter( QObject*, QEvent* ); + virtual bool eventFilter( TQObject*, TQEvent* ); private slots: void slotDelayedPopup(); diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp index 08fbece..5315dcd 100644 --- a/libk3b/tools/k3bradioaction.cpp +++ b/libk3b/tools/k3bradioaction.cpp @@ -17,57 +17,57 @@ #include <ktoolbarbutton.h> -K3bRadioAction::K3bRadioAction( const QString& text, const KShortcut& cut, - QObject* parent, const char* name ) - : KToggleAction( text, cut, parent, name ), +K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, + TQObject* tqparent, const char* name ) + : KToggleAction( text, cut, tqparent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, - QObject* parent, const char* name ) - : KToggleAction( text, cut, receiver, slot, parent, name ), +K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, + TQObject* tqparent, const char* name ) + : KToggleAction( text, cut, receiver, slot, tqparent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( const QString& text, const QIconSet& pix, +K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - QObject* parent, const char* name ) - : KToggleAction( text, pix, cut, parent, name ), + TQObject* tqparent, const char* name ) + : KToggleAction( text, pix, cut, tqparent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( const QString& text, const QString& pix, +K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, - QObject* parent, const char* name ) - : KToggleAction( text, pix, cut, parent, name ), + TQObject* tqparent, const char* name ) + : KToggleAction( text, pix, cut, tqparent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( const QString& text, const QIconSet& pix, +K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, - QObject* parent, const char* name ) - : KToggleAction( text, pix, cut, receiver, slot, parent, name ), + const TQObject* receiver, const char* slot, + TQObject* tqparent, const char* name ) + : KToggleAction( text, pix, cut, receiver, slot, tqparent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( const QString& text, const QString& pix, +K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, - QObject* parent, const char* name ) - : KToggleAction( text, pix, cut, receiver, slot, parent, name ), + const TQObject* receiver, const char* slot, + TQObject* tqparent, const char* name ) + : KToggleAction( text, pix, cut, receiver, slot, tqparent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( QObject* parent, const char* name ) - : KToggleAction( parent, name ), +K3bRadioAction::K3bRadioAction( TQObject* tqparent, const char* name ) + : KToggleAction( tqparent, name ), m_alwaysEmit(false) { } @@ -78,12 +78,12 @@ void K3bRadioAction::slotActivated() if( m_alwaysEmit ) emit activated(); - const QObject *senderObj = sender(); + const TQObject *senderObj = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); - if ( !senderObj || !::qt_cast<const KToolBarButton *>( senderObj ) ) + if ( !senderObj || !::tqqt_cast<const KToolBarButton *>( senderObj ) ) return; - const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( senderObj ) )->on( true ); + const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); return; } diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h index 104b598..d65b3f5 100644 --- a/libk3b/tools/k3bradioaction.h +++ b/libk3b/tools/k3bradioaction.h @@ -29,6 +29,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: /** @@ -38,72 +39,72 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param parent This action's parent. + * @param tqparent This action's tqparent. * @param name An internal name for this action. */ - K3bRadioAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0, const char* name = 0 ); + K3bRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The SLOT to invoke to execute this action. - * @param parent This action's parent. + * @param receiver The SLOT's tqparent. + * @param slot The TQT_SLOT to invoke to execute this action. + * @param tqparent This action's tqparent. * @param name An internal name for this action. */ - K3bRadioAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); + K3bRadioAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param parent This action's parent. + * @param tqparent This action's tqparent. * @param name An internal name for this action. */ - K3bRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(), - QObject* parent = 0, const char* name = 0 ); + K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), + TQObject* tqparent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param parent This action's parent. + * @param tqparent This action's tqparent. * @param name An internal name for this action. */ - K3bRadioAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(), - QObject* parent = 0, const char* name = 0 ); + K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), + TQObject* tqparent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The SLOT to invoke to execute this action. - * @param parent This action's parent. + * @param receiver The SLOT's tqparent. + * @param slot The TQT_SLOT to invoke to execute this action. + * @param tqparent This action's tqparent. * @param name An internal name for this action. */ - K3bRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); + K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The SLOT to invoke to execute this action. - * @param parent This action's parent. + * @param receiver The SLOT's tqparent. + * @param slot The TQT_SLOT to invoke to execute this action. + * @param tqparent This action's tqparent. * @param name An internal name for this action. */ - K3bRadioAction( const QString& text, const QString& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, - QObject* parent, const char* name = 0 ); + K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, + TQObject* tqparent, const char* name = 0 ); /** - * @param parent This action's parent. + * @param tqparent This action's tqparent. * @param name An internal name for this action. */ - K3bRadioAction( QObject* parent = 0, const char* name = 0 ); + K3bRadioAction( TQObject* tqparent = 0, const char* name = 0 ); /** * @param b if true the action will always emit the activated signal diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp index 747bba1..af6c471 100644 --- a/libk3b/tools/k3brichtextlabel.cpp +++ b/libk3b/tools/k3brichtextlabel.cpp @@ -15,37 +15,37 @@ #include "k3brichtextlabel.h" -#include <qtooltip.h> -#include <qstylesheet.h> -#include <qsimplerichtext.h> +#include <tqtooltip.h> +#include <tqstylesheet.h> +#include <tqsimplerichtext.h> #include <kglobalsettings.h> -static QString qrichtextify( const QString& text ) +static TQString qrichtextify( const TQString& text ) { if ( text.isEmpty() || text[0] == '<' ) return text; - QStringList lines = QStringList::split('\n', text); - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + TQStringList lines = TQStringList::split('\n', text); + for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { - *it = QStyleSheet::convertFromPlainText( *it, QStyleSheetItem::WhiteSpaceNormal ); + *it = TQStyleSheet::convertFromPlainText( *it, TQStyleSheetItem::WhiteSpaceNormal ); } - return lines.join(QString::null); + return lines.join(TQString()); } -K3bRichTextLabel::K3bRichTextLabel( const QString &text , QWidget *parent, const char *name ) - : QLabel ( parent, name ) { - m_defaultWidth = QMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - setAlignment( Qt::WordBreak ); +K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name ) + : TQLabel ( tqparent, name ) { + m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); + tqsetAlignment( TQt::WordBreak ); setText(text); } -K3bRichTextLabel::K3bRichTextLabel( QWidget *parent, const char *name ) - : QLabel ( parent, name ) { - m_defaultWidth = QMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - setAlignment( Qt::WordBreak ); +K3bRichTextLabel::K3bRichTextLabel( TQWidget *tqparent, const char *name ) + : TQLabel ( tqparent, name ) { + m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); + tqsetAlignment( TQt::WordBreak ); } void K3bRichTextLabel::setDefaultWidth(int defaultWidth) @@ -54,17 +54,17 @@ void K3bRichTextLabel::setDefaultWidth(int defaultWidth) updateGeometry(); } -QSizePolicy K3bRichTextLabel::sizePolicy() const +TQSizePolicy K3bRichTextLabel::sizePolicy() const { - return QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum, false); + return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -QSize K3bRichTextLabel::minimumSizeHint() const +TQSize K3bRichTextLabel::tqminimumSizeHint() const { - QString qt_text = qrichtextify( text() ); + TQString qt_text = qrichtextify( text() ); int pref_width = 0; int pref_height = 0; - QSimpleRichText rt(qt_text, font()); + TQSimpleRichText rt(qt_text, font()); pref_width = m_defaultWidth; rt.setWidth(pref_width); int used_width = rt.widthUsed(); @@ -91,16 +91,16 @@ QSize K3bRichTextLabel::minimumSizeHint() const pref_width = used_width; } - return QSize(pref_width, rt.height()); + return TQSize(pref_width, rt.height()); } -QSize K3bRichTextLabel::sizeHint() const +TQSize K3bRichTextLabel::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -void K3bRichTextLabel::setText( const QString &text ) { - QLabel::setText(text); +void K3bRichTextLabel::setText( const TQString &text ) { + TQLabel::setText(text); } void K3bRichTextLabel::virtual_hook( int, void* ) diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index 0a25395..3f1c407 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -16,38 +16,39 @@ #ifndef K3BRICHTEXTLABEL_H #define K3BRICHTEXTLABEL_H -#include <qlabel.h> +#include <tqlabel.h> #include <k3b_export.h> /** - * @short A replacement for QLabel that supports richtext and proper layout management + * @short A replacement for TQLabel that supports richtext and proper tqlayout management * * @author Waldo Bastian <bastian@kde.org> */ /* - * QLabel + * TQLabel */ -class LIBK3B_EXPORT K3bRichTextLabel : public QLabel { +class LIBK3B_EXPORT K3bRichTextLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. */ - K3bRichTextLabel( QWidget *parent, const char *name = 0 ); - K3bRichTextLabel( const QString &text, QWidget *parent, const char *name = 0 ); + K3bRichTextLabel( TQWidget *tqparent, const char *name = 0 ); + K3bRichTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 ); int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual QSize minimumSizeHint() const; - virtual QSize sizeHint() const; - QSizePolicy sizePolicy() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; + TQSizePolicy sizePolicy() const; public slots: - void setText( const QString & ); + void setText( const TQString & ); protected: int m_defaultWidth; diff --git a/libk3b/tools/k3bsignalwaiter.cpp b/libk3b/tools/k3bsignalwaiter.cpp index fcee2e0..50284c4 100644 --- a/libk3b/tools/k3bsignalwaiter.cpp +++ b/libk3b/tools/k3bsignalwaiter.cpp @@ -16,12 +16,12 @@ #include "k3bsignalwaiter.h" #include "k3bjob.h" -#include <qeventloop.h> -#include <qapplication.h> +#include <tqeventloop.h> +#include <tqapplication.h> K3bSignalWaiter::K3bSignalWaiter() - : QObject(), + : TQObject(), m_inLoop(true) { } @@ -32,13 +32,13 @@ K3bSignalWaiter::~K3bSignalWaiter() } -void K3bSignalWaiter::waitForSignal( QObject* o, const char* signal ) +void K3bSignalWaiter::waitForSignal( TQObject* o, const char* signal ) { K3bSignalWaiter w; connect( o, signal, - &w, SLOT(slotSignal()) ); + &w, TQT_SLOT(slotSignal()) ); - QApplication::eventLoop()->enterLoop(); + TQApplication::eventLoop()->enterLoop(); } @@ -47,7 +47,7 @@ void K3bSignalWaiter::waitForJob( K3bJob* job ) if( !job->active() ) return; - waitForSignal( job, SIGNAL(finished(bool)) ); + waitForSignal( job, TQT_SIGNAL(finished(bool)) ); } @@ -55,7 +55,7 @@ void K3bSignalWaiter::slotSignal() { if( m_inLoop ) { m_inLoop = false; - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); } } diff --git a/libk3b/tools/k3bsignalwaiter.h b/libk3b/tools/k3bsignalwaiter.h index 19876b4..f85e296 100644 --- a/libk3b/tools/k3bsignalwaiter.h +++ b/libk3b/tools/k3bsignalwaiter.h @@ -16,21 +16,22 @@ #ifndef _K3B_SIGNAL_WAITER_H_ #define _K3B_SIGNAL_WAITER_H_ -#include <qobject.h> +#include <tqobject.h> #include <k3b_export.h> class K3bJob; -class K3bSignalWaiter : public QObject +class K3bSignalWaiter : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Use this to syncroneously wait for a signal. */ - LIBK3B_EXPORT static void waitForSignal( QObject* o, const char* signal ); + LIBK3B_EXPORT static void waitForSignal( TQObject* o, const char* signal ); /** * Use this to syncroneously wait for a job to finish. diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp index 8a6ab00..ebc9666 100644 --- a/libk3b/tools/k3bstdguiitems.cpp +++ b/libk3b/tools/k3bstdguiitems.cpp @@ -15,45 +15,45 @@ #include "k3bstdguiitems.h" -#include <qcheckbox.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qpalette.h> +#include <tqcheckbox.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqpalette.h> #include <klocale.h> -QCheckBox* K3bStdGuiItems::simulateCheckbox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Simulate"), parent, name ); - QWhatsThis::add( c, i18n("<p>If this option is checked K3b will perform all writing steps with the " + TQCheckBox* c = new TQCheckBox( i18n("Simulate"), tqparent, name ); + TQWhatsThis::add( c, i18n("<p>If this option is checked K3b will perform all writing steps with the " "laser turned off." "<p>This is useful, for example, to test a higher writing speed " "or whether your system is able to write on-the-fly." "<p><b>Caution:</b> DVD+R(W) does not support simulated writing.") ); - QToolTip::add( c, i18n("Only simulate the writing process") ); + TQToolTip::add( c, i18n("Only simulate the writing process") ); return c; } -QCheckBox* K3bStdGuiItems::daoCheckbox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::daoCheckbox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Disk at once"), parent, name ); - QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will write the CD in 'disk at once' mode as " + TQCheckBox* c = new TQCheckBox( i18n("Disk at once"), tqparent, name ); + TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will write the CD in 'disk at once' mode as " "compared to 'track at once' (TAO)." "<p>It is always recommended to use DAO where possible." "<p><b>Caution:</b> Track pregaps with a length other than 2 seconds are only supported " "in DAO mode.") ); - QToolTip::add( c, i18n("Write in disk at once mode") ); + TQToolTip::add( c, i18n("Write in disk at once mode") ); return c; } -QCheckBox* K3bStdGuiItems::burnproofCheckbox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::burnproofCheckbox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Use Burnfree"), parent, name ); - QToolTip::add( c, i18n("Enable Burnfree (or Just Link) to avoid buffer underruns") ); - QWhatsThis::add( c, i18n("<p>If this option is checked, K3b enables <em>Burnfree</em> " + TQCheckBox* c = new TQCheckBox( i18n("Use Burnfree"), tqparent, name ); + TQToolTip::add( c, i18n("Enable Burnfree (or Just Link) to avoid buffer underruns") ); + TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b enables <em>Burnfree</em> " "(or <em>Just Link</em>). This is " "a feature of the CD writer which avoids buffer underruns." "<p>Without <em>burnfree</em>, if the writer cannot get any more " @@ -70,57 +70,57 @@ QCheckBox* K3bStdGuiItems::burnproofCheckbox( QWidget* parent, const char* name return c; } -QCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Only create image"), parent, name ); - QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will only create an " + TQCheckBox* c = new TQCheckBox( i18n("Only create image"), tqparent, name ); + TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will only create an " "image and not do any actual writing." "<p>The image can later be written to a CD/DVD with most current writing " "programs (including K3b of course).") ); - QToolTip::add( c, i18n("Only create an image") ); + TQToolTip::add( c, i18n("Only create an image") ); return c; } -QCheckBox* K3bStdGuiItems::createCacheImageCheckbox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::createCacheImageCheckbox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Create image"), parent, name ); - QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will create an image before writing " + TQCheckBox* c = new TQCheckBox( i18n("Create image"), tqparent, name ); + TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will create an image before writing " "the files to the CD/DVD. Otherwise the data will be written <em>on-the-fly</em>, " "i.e. no intermediate image will be created." "<p><b>Caution:</b> Although writing on-the-fly should work on most systems, make sure " "the data is sent to the writer fast enough.") + i18n("<p>It is recommended to try a simulation first.") ); - QToolTip::add( c, i18n("Cache the data to be written on the harddisk") ); + TQToolTip::add( c, i18n("Cache the data to be written on the harddisk") ); return c; } -QCheckBox* K3bStdGuiItems::removeImagesCheckbox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::removeImagesCheckbox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Remove image"), parent, name ); - QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will remove any created images after the " + TQCheckBox* c = new TQCheckBox( i18n("Remove image"), tqparent, name ); + TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will remove any created images after the " "writing has finished." "<p>Uncheck this if you want to keep the images.") ); - QToolTip::add( c, i18n("Remove images from disk when finished") ); + TQToolTip::add( c, i18n("Remove images from disk when finished") ); return c; } -QCheckBox* K3bStdGuiItems::onTheFlyCheckbox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::onTheFlyCheckbox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("On the fly"), parent, name ); - QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will not create an image first but write " + TQCheckBox* c = new TQCheckBox( i18n("On the fly"), tqparent, name ); + TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will not create an image first but write " "the files directly to the CD/DVD." "<p><b>Caution:</b> Although this should work on most systems, make sure " "the data is sent to the writer fast enough.") + i18n("<p>It is recommended to try a simulation first.") ); - QToolTip::add( c, i18n("Write files directly to CD/DVD without creating an image") ); + TQToolTip::add( c, i18n("Write files directly to CD/DVD without creating an image") ); return c; } -QCheckBox* K3bStdGuiItems::cdTextCheckbox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::cdTextCheckbox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Write CD-TEXT"), parent, name ); - QToolTip::add( c, i18n("Create CD-TEXT entries") ); - QWhatsThis::add( c, i18n("<p>If this option is checked K3b uses some otherwise-unused space on the audio " + TQCheckBox* c = new TQCheckBox( i18n("Write CD-TEXT"), tqparent, name ); + TQToolTip::add( c, i18n("Create CD-TEXT entries") ); + TQWhatsThis::add( c, i18n("<p>If this option is checked K3b uses some otherwise-unused space on the audio " "CD to store additional information, like the artist or the CD title." "<p>CD-TEXT is an extension to the audio CD standard introduced by Sony." "<p>CD-TEXT will only be usable on CD players that support this extension " @@ -131,16 +131,16 @@ QCheckBox* K3bStdGuiItems::cdTextCheckbox( QWidget* parent, const char* name ) } -QComboBox* K3bStdGuiItems::paranoiaModeComboBox( QWidget* parent, const char* name ) +TQComboBox* K3bStdGuiItems::paranoiaModeComboBox( TQWidget* tqparent, const char* name ) { - QComboBox* c = new QComboBox( parent, name ); + TQComboBox* c = new TQComboBox( tqparent, name ); c->insertItem( "0" ); c->insertItem( "1" ); c->insertItem( "2" ); c->insertItem( "3" ); c->setCurrentItem( 3 ); - QToolTip::add( c, i18n("Set the paranoia level for reading audio CDs") ); - QWhatsThis::add( c, i18n("<p>Sets the correction mode for digital audio extraction." + TQToolTip::add( c, i18n("Set the paranoia level for reading audio CDs") ); + TQWhatsThis::add( c, i18n("<p>Sets the correction mode for digital audio extraction." "<ul><li>0: No checking, data is copied directly from the drive. " "<li>1: Perform overlapped reading to avoid jitter.</li>" "<li>2: Like 1 but with additional checks of the read audio data.</li>" @@ -150,22 +150,22 @@ QComboBox* K3bStdGuiItems::paranoiaModeComboBox( QWidget* parent, const char* na } -QCheckBox* K3bStdGuiItems::startMultisessionCheckBox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::startMultisessionCheckBox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Start multisession CD"), parent, name ); - QToolTip::add( c, i18n("Do not close the disk to allow additional sessions to be added later") ); - QWhatsThis::add( c, i18n("<p>If this option is checked K3b will not close the CD, and will write " + TQCheckBox* c = new TQCheckBox( i18n("Start multisession CD"), tqparent, name ); + TQToolTip::add( c, i18n("Do not close the disk to allow additional sessions to be added later") ); + TQWhatsThis::add( c, i18n("<p>If this option is checked K3b will not close the CD, and will write " "a temporary table of contents.</p>" "<p>This allows further sessions to be appended to the CD later.</p>") ); return c; } -QCheckBox* K3bStdGuiItems::normalizeCheckBox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::normalizeCheckBox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Normalize volume levels"), parent, name ); - QToolTip::add( c, i18n("Adjust the volume levels of all tracks") ); - QWhatsThis::add( c, i18n("<p>If this option is checked K3b will adjust the volume of all tracks " + TQCheckBox* c = new TQCheckBox( i18n("Normalize volume levels"), tqparent, name ); + TQToolTip::add( c, i18n("Adjust the volume levels of all tracks") ); + TQWhatsThis::add( c, i18n("<p>If this option is checked K3b will adjust the volume of all tracks " "to a standard level. This is useful for things like creating mixes, " "where different recording levels on different albums can cause the volume " "to vary greatly from song to song." @@ -175,11 +175,11 @@ QCheckBox* K3bStdGuiItems::normalizeCheckBox( QWidget* parent, const char* name } -QCheckBox* K3bStdGuiItems::verifyCheckBox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::verifyCheckBox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Verify written data"), parent, name ); - QToolTip::add( c, i18n("Compare original with written data") ); - QWhatsThis::add( c, i18n("<p>If this option is checked, then after successfully " + TQCheckBox* c = new TQCheckBox( i18n("Verify written data"), tqparent, name ); + TQToolTip::add( c, i18n("Compare original with written data") ); + TQWhatsThis::add( c, i18n("<p>If this option is checked, then after successfully " "writing the disk K3b will compare the original source data " "with the written data to verify that the disk has been written " "correctly.") ); @@ -187,11 +187,11 @@ QCheckBox* K3bStdGuiItems::verifyCheckBox( QWidget* parent, const char* name ) } -QCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( QWidget* parent, const char* name ) +TQCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( TQWidget* tqparent, const char* name ) { - QCheckBox* c = new QCheckBox( i18n("Ignore read errors"), parent, name ); - QToolTip::add( c, i18n("Skip unreadable audio sectors") ); - QWhatsThis::add( c, i18n("<p>If this option is checked and K3b is not able to read an " + TQCheckBox* c = new TQCheckBox( i18n("Ignore read errors"), tqparent, name ); + TQToolTip::add( c, i18n("Skip unreadable audio sectors") ); + TQWhatsThis::add( c, i18n("<p>If this option is checked and K3b is not able to read an " "audio sector from the source CD it will be replaced with zeros " "on the resulting copy." "<p>Since audio CD Player are able to interpolate small errors " @@ -200,16 +200,16 @@ QCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( QWidget* parent, const } -QFrame* K3bStdGuiItems::horizontalLine( QWidget* parent, const char* name ) +TQFrame* K3bStdGuiItems::horizontalLine( TQWidget* tqparent, const char* name ) { - QFrame* line = new QFrame( parent, name ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame* line = new TQFrame( tqparent, name ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); return line; } -QFrame* K3bStdGuiItems::verticalLine( QWidget* parent, const char* name ) +TQFrame* K3bStdGuiItems::verticalLine( TQWidget* tqparent, const char* name ) { - QFrame* line = new QFrame( parent, name ); - line->setFrameStyle( QFrame::VLine | QFrame::Sunken ); + TQFrame* line = new TQFrame( tqparent, name ); + line->setFrameStyle( TQFrame::VLine | TQFrame::Sunken ); return line; } diff --git a/libk3b/tools/k3bstdguiitems.h b/libk3b/tools/k3bstdguiitems.h index e118b6a..c90aaf8 100644 --- a/libk3b/tools/k3bstdguiitems.h +++ b/libk3b/tools/k3bstdguiitems.h @@ -17,29 +17,29 @@ #define K3B_STD_GUIITEMS_H #include "k3b_export.h" -class QWidget; -class QCheckBox; -class QComboBox; -class QFrame; +class TQWidget; +class TQCheckBox; +class TQComboBox; +class TQFrame; namespace K3bStdGuiItems { - LIBK3B_EXPORT QCheckBox* simulateCheckbox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* daoCheckbox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* burnproofCheckbox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* onlyCreateImagesCheckbox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* createCacheImageCheckbox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* removeImagesCheckbox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* onTheFlyCheckbox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* cdTextCheckbox( QWidget* parent = 0, const char* name = 0); - LIBK3B_EXPORT QComboBox* paranoiaModeComboBox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* startMultisessionCheckBox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* normalizeCheckBox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* verifyCheckBox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QCheckBox* ignoreAudioReadErrorsCheckBox( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QFrame* horizontalLine( QWidget* parent = 0, const char* name = 0 ); - LIBK3B_EXPORT QFrame* verticalLine( QWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* simulateCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* daoCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* burnproofCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* onlyCreateImagesCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* createCacheImageCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* removeImagesCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* onTheFlyCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* cdTextCheckbox( TQWidget* tqparent = 0, const char* name = 0); + LIBK3B_EXPORT TQComboBox* paranoiaModeComboBox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* startMultisessionCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* normalizeCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* verifyCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* ignoreAudioReadErrorsCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQFrame* horizontalLine( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQFrame* verticalLine( TQWidget* tqparent = 0, const char* name = 0 ); } #endif diff --git a/libk3b/tools/k3bstringutils.cpp b/libk3b/tools/k3bstringutils.cpp index 198bb9e..f0212b7 100644 --- a/libk3b/tools/k3bstringutils.cpp +++ b/libk3b/tools/k3bstringutils.cpp @@ -15,14 +15,14 @@ #include "k3bstringutils.h" -#include <qfontmetrics.h> +#include <tqfontmetrics.h> #include <kdebug.h> -QString K3b::cutToWidth( const QFontMetrics& fm, const QString& fullText, int cutWidth ) +TQString K3b::cutToWidth( const TQFontMetrics& fm, const TQString& fullText, int cutWidth ) { - QString squeezedText = "..."; + TQString squeezedText = "..."; int squeezedWidth = fm.width(squeezedText); int textWidth = fm.width(fullText); @@ -65,12 +65,12 @@ QString K3b::cutToWidth( const QFontMetrics& fm, const QString& fullText, int cu // from KSqueezedTextLabel -QString K3b::squeezeTextToWidth( const QFontMetrics& fm, const QString& fullText, int cutWidth ) +TQString K3b::squeezeTextToWidth( const TQFontMetrics& fm, const TQString& fullText, int cutWidth ) { int textWidth = fm.width(fullText); if (textWidth > cutWidth) { // start with the dots only - QString squeezedText = "..."; + TQString squeezedText = "..."; int squeezedWidth = fm.width(squeezedText); // estimate how many letters we can add to the dots on both sides diff --git a/libk3b/tools/k3bstringutils.h b/libk3b/tools/k3bstringutils.h index 05cfd32..94c8f6f 100644 --- a/libk3b/tools/k3bstringutils.h +++ b/libk3b/tools/k3bstringutils.h @@ -17,9 +17,9 @@ #ifndef _K3B_STRING_UTILS_H_ #define _K3B_STRING_UTILS_H_ -#include <qstring.h> +#include <tqstring.h> -class QFontMetrics; +class TQFontMetrics; namespace K3b { @@ -27,13 +27,13 @@ namespace K3b * Cuts the text at the end. * Example: "some long text" -> "some lo..." */ - QString cutToWidth( const QFontMetrics&, const QString&, int ); + TQString cutToWidth( const TQFontMetrics&, const TQString&, int ); /** * squeezes the text. * Example: "some long text" -> "some...ext" */ - QString squeezeTextToWidth( const QFontMetrics& fm, const QString& fullText, int cutWidth ); + TQString squeezeTextToWidth( const TQFontMetrics& fm, const TQString& fullText, int cutWidth ); } #endif diff --git a/libk3b/tools/k3btempfile.cpp b/libk3b/tools/k3btempfile.cpp index 635be40..18ad803 100644 --- a/libk3b/tools/k3btempfile.cpp +++ b/libk3b/tools/k3btempfile.cpp @@ -19,15 +19,15 @@ #include <kstandarddirs.h> -static inline QString defaultTempDir() +static inline TQString defaultTempDir() { // we need a world-readable temp dir // FIXME: check if the default is world-readable -// QStringList dirs = KGlobal::dirs()->resourceDirs( "tmp" ); -// for( QStringList::const_iterator it = dirs.begin(); +// TQStringList dirs = KGlobal::dirs()->resourceDirs( "tmp" ); +// for( TQStringList::const_iterator it = dirs.begin(); // it != dirs.end(); ++it ) { -// const QString& dir = *it; +// const TQString& dir = *it; // } @@ -36,8 +36,8 @@ static inline QString defaultTempDir() } -K3bTempFile::K3bTempFile( const QString& filePrefix, - const QString& fileExtension, +K3bTempFile::K3bTempFile( const TQString& filePrefix, + const TQString& fileExtension, int mode ) : KTempFile( filePrefix.isEmpty() ? defaultTempDir() : filePrefix, fileExtension, diff --git a/libk3b/tools/k3btempfile.h b/libk3b/tools/k3btempfile.h index 41a8756..4b18164 100644 --- a/libk3b/tools/k3btempfile.h +++ b/libk3b/tools/k3btempfile.h @@ -34,8 +34,8 @@ class LIBK3B_EXPORT K3bTempFile : public KTempFile { public: - K3bTempFile( const QString& filePrefix = QString::null, - const QString& fileExtension = QString::null, + K3bTempFile( const TQString& filePrefix = TQString(), + const TQString& fileExtension = TQString(), int mode = 0600 ); ~K3bTempFile(); }; diff --git a/libk3b/tools/k3bthreadwidget.cpp b/libk3b/tools/k3bthreadwidget.cpp index ea82101..efbe2fa 100644 --- a/libk3b/tools/k3bthreadwidget.cpp +++ b/libk3b/tools/k3bthreadwidget.cpp @@ -17,9 +17,9 @@ #include "k3bdeviceselectiondialog.h" #include <k3bdevice.h> -#include <qevent.h> -#include <qapplication.h> -#include <qwaitcondition.h> +#include <tqevent.h> +#include <tqapplication.h> +#include <tqwaitcondition.h> class K3bThreadWidget::Data @@ -27,27 +27,27 @@ class K3bThreadWidget::Data public: int id; void* data; - QWaitCondition con; + TQWaitCondition con; }; -class K3bThreadWidget::DeviceSelectionEvent : public QCustomEvent +class K3bThreadWidget::DeviceSelectionEvent : public TQCustomEvent { public: - DeviceSelectionEvent( QWidget* parent, const QString& text, int id ) - : QCustomEvent( QEvent::User + 22 ), - m_parent(parent), + DeviceSelectionEvent( TQWidget* tqparent, const TQString& text, int id ) + : TQCustomEvent( TQEvent::User + 22 ), + m_parent(tqparent), m_text(text), m_id(id) { } - QWidget* parent() const { return m_parent; } - const QString& text() const { return m_text; } + TQWidget* tqparent() const { return m_parent; } + const TQString& text() const { return m_text; } int id() const { return m_id; } private: - QWidget* m_parent; - QString m_text; + TQWidget* m_parent; + TQString m_text; int m_id; }; @@ -56,7 +56,7 @@ K3bThreadWidget* K3bThreadWidget::s_instance = 0; K3bThreadWidget::K3bThreadWidget() - : QObject(), + : TQObject(), m_idCounter(1) { m_dataMap.setAutoDelete(true); @@ -102,15 +102,15 @@ K3bThreadWidget* K3bThreadWidget::instance() // static -K3bDevice::Device* K3bThreadWidget::selectDevice( QWidget* parent, - const QString& text ) +K3bDevice::Device* K3bThreadWidget::selectDevice( TQWidget* tqparent, + const TQString& text ) { // request a new data set Data* data = K3bThreadWidget::instance()->data( K3bThreadWidget::instance()->getNewId() ); // inform the instance about the request - QApplication::postEvent( K3bThreadWidget::instance(), - new K3bThreadWidget::DeviceSelectionEvent( parent, text, data->id ) ); + TQApplication::postEvent( K3bThreadWidget::instance(), + new K3bThreadWidget::DeviceSelectionEvent( tqparent, text, data->id ) ); // wait for the result to be ready data->con.wait(); @@ -124,11 +124,11 @@ K3bDevice::Device* K3bThreadWidget::selectDevice( QWidget* parent, } -void K3bThreadWidget::customEvent( QCustomEvent* e ) +void K3bThreadWidget::customEvent( TQCustomEvent* e ) { if( DeviceSelectionEvent* dse = dynamic_cast<DeviceSelectionEvent*>(e) ) { // create dialog - K3bDevice::Device* dev = K3bDeviceSelectionDialog::selectDevice( dse->parent(), dse->text() ); + K3bDevice::Device* dev = K3bDeviceSelectionDialog::selectDevice( dse->tqparent(), dse->text() ); // return it to the thread Data* dat = data( dse->id() ); diff --git a/libk3b/tools/k3bthreadwidget.h b/libk3b/tools/k3bthreadwidget.h index b3fedb2..1b514c2 100644 --- a/libk3b/tools/k3bthreadwidget.h +++ b/libk3b/tools/k3bthreadwidget.h @@ -16,11 +16,11 @@ #ifndef _K3B_THREAD_WIDGET_H_ #define _K3B_THREAD_WIDGET_H_ -#include <qobject.h> -#include <qintdict.h> +#include <tqobject.h> +#include <tqintdict.h> -class QCustomEvent; +class TQCustomEvent; namespace K3bDevice { class Device; } @@ -32,9 +32,10 @@ namespace K3bDevice { * Since the calling thread cannot create the K3bThreadWidget by himself there exists * exactly one instance created by K3bCore which is used by all threads. */ -class K3bThreadWidget : public QObject +class K3bThreadWidget : public TQObject { Q_OBJECT + TQ_OBJECT public: ~K3bThreadWidget(); @@ -44,14 +45,14 @@ class K3bThreadWidget : public QObject /** * Call this from a thread to show a device selection dialog. */ - static K3bDevice::Device* selectDevice( QWidget* parent, - const QString& text = QString::null ); + static K3bDevice::Device* selectDevice( TQWidget* tqparent, + const TQString& text = TQString() ); protected: /** * communication between the threads */ - void customEvent( QCustomEvent* ); + void customEvent( TQCustomEvent* ); private: /** @@ -70,7 +71,7 @@ class K3bThreadWidget : public QObject Data* data( int id ); int m_idCounter; - QIntDict<Data> m_dataMap; + TQIntDict<Data> m_dataMap; static K3bThreadWidget* s_instance; }; diff --git a/libk3b/tools/k3bthroughputestimator.cpp b/libk3b/tools/k3bthroughputestimator.cpp index aa52478..d6183b3 100644 --- a/libk3b/tools/k3bthroughputestimator.cpp +++ b/libk3b/tools/k3bthroughputestimator.cpp @@ -16,7 +16,7 @@ #include "k3bthroughputestimator.h" -#include <qdatetime.h> +#include <tqdatetime.h> #include <kdebug.h> @@ -27,9 +27,9 @@ public: : started(false) { } - QTime firstDataTime; + TQTime firstDataTime; unsigned long firstData; - QTime lastDataTime; + TQTime lastDataTime; unsigned long lastData; int lastThroughput; @@ -38,8 +38,8 @@ public: }; -K3bThroughputEstimator::K3bThroughputEstimator( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bThroughputEstimator::K3bThroughputEstimator( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); } diff --git a/libk3b/tools/k3bthroughputestimator.h b/libk3b/tools/k3bthroughputestimator.h index aed71e0..52d3272 100644 --- a/libk3b/tools/k3bthroughputestimator.h +++ b/libk3b/tools/k3bthroughputestimator.h @@ -16,7 +16,7 @@ #ifndef _K3B_THROUGHPUT_ESTIMATOR_H_ #define _K3B_THROUGHPUT_ESTIMATOR_H_ -#include <qobject.h> +#include <tqobject.h> /** @@ -25,12 +25,13 @@ * the already written data in KB. The class will emit throughput signals * whenever the throughput changes. */ -class K3bThroughputEstimator : public QObject +class K3bThroughputEstimator : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bThroughputEstimator( QObject* parent = 0, const char* name = 0 ); + K3bThroughputEstimator( TQObject* tqparent = 0, const char* name = 0 ); ~K3bThroughputEstimator(); int average() const; diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp index 9e1f18b..ef21e17 100644 --- a/libk3b/tools/k3btitlelabel.cpp +++ b/libk3b/tools/k3btitlelabel.cpp @@ -17,11 +17,11 @@ #include <k3bstringutils.h> -#include <qpainter.h> -#include <qevent.h> -#include <qfontmetrics.h> -#include <qfont.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqevent.h> +#include <tqfontmetrics.h> +#include <tqfont.h> +#include <tqtooltip.h> class K3bTitleLabel::Private @@ -30,18 +30,18 @@ public: Private() { titleLength = subTitleLength = 0; margin = 2; - alignment = Qt::AlignLeft; + tqalignment = TQt::AlignLeft; cachedMinimumWidth = 0; titleBaseLine = 0; } - QString title; - QString subTitle; + TQString title; + TQString subTitle; - QString displayTitle; - QString displaySubTitle; + TQString displayTitle; + TQString displaySubTitle; - int alignment; + int tqalignment; int titleLength; int subTitleLength; @@ -55,36 +55,36 @@ public: }; -class K3bTitleLabel::ToolTip : public QToolTip +class K3bTitleLabel::ToolTip : public TQToolTip { public: ToolTip( K3bTitleLabel* label ) - : QToolTip( label ), + : TQToolTip( label ), m_label(label) { } - void maybeTip( const QPoint &pos ) { - QRect r = m_label->contentsRect(); + void maybeTip( const TQPoint &pos ) { + TQRect r = m_label->contentsRect(); int neededWidth = m_label->d->displayTitleLength; if( !m_label->d->displaySubTitle.isEmpty() ) neededWidth += m_label->d->displaySubTitleLength + 5; int startPos = 0; - if( m_label->d->alignment & Qt::AlignHCenter ) + if( m_label->d->tqalignment & TQt::AlignHCenter ) startPos = r.left() + ( r.width() - 2*m_label->d->margin - neededWidth ) / 2; - else if( m_label->d->alignment & Qt::AlignRight ) + else if( m_label->d->tqalignment & TQt::AlignRight ) startPos = r.right() - m_label->d->margin - neededWidth; else startPos = r.left() + m_label->d->margin; - QRect titleTipRect( startPos, 0, m_label->d->displayTitleLength, m_label->height() ); - QRect subTitleTipRect( startPos + m_label->d->displayTitleLength, 0, m_label->d->displaySubTitleLength, m_label->height() ); + TQRect titleTipRect( startPos, 0, m_label->d->displayTitleLength, m_label->height() ); + TQRect subTitleTipRect( startPos + m_label->d->displayTitleLength, 0, m_label->d->displaySubTitleLength, m_label->height() ); - if( titleTipRect.contains( pos ) && + if( titleTipRect.tqcontains( pos ) && m_label->d->displayTitle != m_label->d->title ) tip( titleTipRect, m_label->d->title ); - else if( subTitleTipRect.contains( pos ) && + else if( subTitleTipRect.tqcontains( pos ) && m_label->d->displaySubTitle != m_label->d->subTitle ) tip( subTitleTipRect, m_label->d->subTitle ); } @@ -94,8 +94,8 @@ public: -K3bTitleLabel::K3bTitleLabel( QWidget* parent, const char* name ) - : QFrame( parent, name ) +K3bTitleLabel::K3bTitleLabel( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name ) { d = new Private(); m_toolTip = new ToolTip( this ); @@ -109,7 +109,7 @@ K3bTitleLabel::~K3bTitleLabel() } -void K3bTitleLabel::setTitle( const QString& title, const QString& subTitle ) +void K3bTitleLabel::setTitle( const TQString& title, const TQString& subTitle ) { d->title = title; d->subTitle = subTitle; @@ -118,7 +118,7 @@ void K3bTitleLabel::setTitle( const QString& title, const QString& subTitle ) } -void K3bTitleLabel::setSubTitle( const QString& subTitle ) +void K3bTitleLabel::setSubTitle( const TQString& subTitle ) { d->subTitle = subTitle; updatePositioning(); @@ -126,38 +126,38 @@ void K3bTitleLabel::setSubTitle( const QString& subTitle ) } -void K3bTitleLabel::setAlignment( int align ) +void K3bTitleLabel::tqsetAlignment( int align ) { - d->alignment = align; + d->tqalignment = align; update(); } -QSize K3bTitleLabel::sizeHint() const +TQSize K3bTitleLabel::tqsizeHint() const { - return QSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine ); + return TQSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine ); } -QSize K3bTitleLabel::minimumSizeHint() const +TQSize K3bTitleLabel::tqminimumSizeHint() const { - return QSize( d->cachedMinimumWidth, d->titleBaseLine ); + return TQSize( d->cachedMinimumWidth, d->titleBaseLine ); } -void K3bTitleLabel::resizeEvent( QResizeEvent* e ) +void K3bTitleLabel::resizeEvent( TQResizeEvent* e ) { - QFrame::resizeEvent( e ); + TQFrame::resizeEvent( e ); updatePositioning(); update(); } -void K3bTitleLabel::drawContents( QPainter* p ) +void K3bTitleLabel::drawContents( TQPainter* p ) { p->save(); - QRect r = contentsRect(); + TQRect r = contentsRect(); p->eraseRect( r ); - QFont f(font()); + TQFont f(font()); f.setBold(true); f.setPointSize( f.pointSize() + 2 ); @@ -168,9 +168,9 @@ void K3bTitleLabel::drawContents( QPainter* p ) neededWidth += d->displaySubTitleLength + 5; int startPos = 0; - if( d->alignment & Qt::AlignHCenter ) + if( d->tqalignment & TQt::AlignHCenter ) startPos = r.left() + ( r.width() - 2*d->margin - neededWidth ) / 2; - else if( d->alignment & Qt::AlignRight ) + else if( d->tqalignment & TQt::AlignRight ) startPos = r.right() - d->margin - neededWidth; else startPos = r.left() + d->margin; @@ -199,14 +199,14 @@ void K3bTitleLabel::setMargin( int m ) void K3bTitleLabel::updatePositioning() { - QFont f(font()); + TQFont f(font()); f.setBold(true); f.setPointSize( f.pointSize() + 2 ); - QFontMetrics titleFm(f); + TQFontMetrics titleFm(f); f.setBold(false); f.setPointSize( f.pointSize() - 4 ); - QFontMetrics subTitleFm(f); + TQFontMetrics subTitleFm(f); d->titleBaseLine = contentsRect().height()/2 + titleFm.height()/2 - titleFm.descent(); d->titleLength = titleFm.width( d->title ); @@ -246,12 +246,12 @@ void K3bTitleLabel::updatePositioning() // d->cachedMinimumWidth = 2*d->margin; - QString cutTitle = d->title; + TQString cutTitle = d->title; if( cutTitle.length() > 2 ) { cutTitle.truncate( 2 ); cutTitle += "..."; } - QString cutSubTitle = d->subTitle; + TQString cutSubTitle = d->subTitle; if( cutSubTitle.length() > 2 ) { cutSubTitle.truncate( 2 ); cutSubTitle += "..."; diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h index ba1044d..d725592 100644 --- a/libk3b/tools/k3btitlelabel.h +++ b/libk3b/tools/k3btitlelabel.h @@ -17,22 +17,23 @@ #ifndef _K3B_TITLE_LABEL_H_ #define _K3B_TITLE_LABEL_H_ -#include <qframe.h> +#include <tqframe.h> #include "k3b_export.h" -class QPainter; -class QResizeEvent; +class TQPainter; +class TQResizeEvent; -class LIBK3B_EXPORT K3bTitleLabel : public QFrame +class LIBK3B_EXPORT K3bTitleLabel : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bTitleLabel( QWidget* parent = 0, const char* name = 0 ); + K3bTitleLabel( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bTitleLabel(); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; public slots: /** @@ -40,20 +41,20 @@ class LIBK3B_EXPORT K3bTitleLabel : public QFrame */ void setMargin( int ); - void setTitle( const QString& title, const QString& subTitle = QString::null ); - void setSubTitle( const QString& subTitle ); + void setTitle( const TQString& title, const TQString& subTitle = TQString() ); + void setSubTitle( const TQString& subTitle ); /** - * The title label only supports alignments left, hcenter, and right + * The title label only supports tqalignments left, hcenter, and right * - * Default alignment is left. + * Default tqalignment is left. */ // FIXME: honor right-to-left languages - void setAlignment( int align ); + void tqsetAlignment( int align ); protected: - void resizeEvent( QResizeEvent* ); - void drawContents( QPainter* p ); + void resizeEvent( TQResizeEvent* ); + void drawContents( TQPainter* p ); private: void updatePositioning(); diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index b08dfc8..2adf274 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -20,78 +20,79 @@ #include <ktoolbarbutton.h> #include <kiconloader.h> -#include <qtoolbutton.h> -#include <qsizepolicy.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qlabel.h> -#include <qvbox.h> -#include <qstyle.h> -#include <qpainter.h> -#include <qevent.h> -#include <qobjectlist.h> +#include <tqtoolbutton.h> +#include <tqsizepolicy.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqstyle.h> +#include <tqpainter.h> +#include <tqevent.h> +#include <tqobjectlist.h> /** * internal class. Do not use! */ -class K3bToolBoxSeparator : public QWidget +class K3bToolBoxSeparator : public TQWidget { // Q_OBJECT + TQ_OBJECT public: - K3bToolBoxSeparator( K3bToolBox* parent ); + K3bToolBoxSeparator( K3bToolBox* tqparent ); - QSize sizeHint() const; + TQSize tqsizeHint() const; protected: - void paintEvent( QPaintEvent * ); + void paintEvent( TQPaintEvent * ); }; -K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent ) - : QWidget( parent ) +K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* tqparent ) + : TQWidget( tqparent ) { - setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); } -QSize K3bToolBoxSeparator::sizeHint() const +TQSize K3bToolBoxSeparator::tqsizeHint() const { - int extent = style().pixelMetric( QStyle::PM_DockWindowSeparatorExtent, + int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - return QSize( extent, 0 ); + return TQSize( extent, 0 ); } -void K3bToolBoxSeparator::paintEvent( QPaintEvent* ) +void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) { - QPainter p( this ); - QStyle::SFlags flags = QStyle::Style_Default|QStyle::Style_Horizontal; + TQPainter p( this ); + TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal; - style().drawPrimitive( QStyle::PE_DockWindowSeparator, &p, rect(), - colorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), + tqcolorGroup(), flags ); } -K3bToolBoxButton::K3bToolBoxButton( KAction* action, QWidget* parent ) - : QToolButton( parent ), +K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* tqparent ) + : TQToolButton( tqparent ), m_popupMenu(0) { - setSizePolicy( QSizePolicy(QSizePolicy::Fixed, sizePolicy().verData()) ); + tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); setAutoRaise( true ); setIconSet( action->iconSet() ); setTextLabel( action->text() ); setEnabled( action->isEnabled() ); - QWhatsThis::add( this, action->whatsThis() ); + TQWhatsThis::add( this, action->whatsThis() ); if( action->toolTip().isEmpty() ) - QToolTip::add( this, action->text() ); + TQToolTip::add( this, action->text() ); else - QToolTip::add( this, action->toolTip() ); + TQToolTip::add( this, action->toolTip() ); // if( KToggleAction* ta = dynamic_cast<KToggleAction*>( action ) ) { // setToggleButton( true ); @@ -100,33 +101,33 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, QWidget* parent ) // if( ta->isChecked() ) // toggle(); -// connect( ta, SIGNAL(toggled(bool)), this, SLOT(toggle()) ); -// connect( this, SIGNAL(toggled(bool)), ta, SLOT(setChecked(bool)) ); +// connect( ta, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggle()) ); +// connect( this, TQT_SIGNAL(toggled(bool)), ta, TQT_SLOT(setChecked(bool)) ); // } // else if( KActionMenu* am = dynamic_cast<KActionMenu*>( action ) ) { m_popupMenu = am->popupMenu(); - connect( this, SIGNAL(pressed()), this, SLOT(slotPopupActivated()) ); + connect( this, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotPopupActivated()) ); setPopup( m_popupMenu ); } else { - connect( this, SIGNAL(clicked()), action, SLOT(activate()) ); + connect( this, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); } - connect( action, SIGNAL(enabled(bool)), this, SLOT(setEnabled(bool)) ); + connect( action, TQT_SIGNAL(enabled(bool)), this, TQT_SLOT(setEnabled(bool)) ); } -K3bToolBoxButton::K3bToolBoxButton( const QString& text, const QString& icon, - const QString& tooltip, const QString& whatsthis, - QObject* receiver, const char* slot, - QWidget* parent ) - : QToolButton( parent ), +K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon, + const TQString& tooltip, const TQString& whatsthis, + TQObject* receiver, const char* slot, + TQWidget* tqparent ) + : TQToolButton( tqparent ), m_popupMenu(0) { - setSizePolicy( QSizePolicy(QSizePolicy::Fixed, sizePolicy().verData()) ); + tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); setAutoRaise( true ); setTextLabel( text ); @@ -136,11 +137,11 @@ K3bToolBoxButton::K3bToolBoxButton( const QString& text, const QString& icon, else setIconSet( SmallIconSet( icon ) ); - QWhatsThis::add( this, whatsthis ); - QToolTip::add( this, tooltip ); + TQWhatsThis::add( this, whatsthis ); + TQToolTip::add( this, tooltip ); if( receiver && slot ) - connect( this, SIGNAL(clicked()), receiver, slot ); + connect( this, TQT_SIGNAL(clicked()), receiver, slot ); } @@ -151,9 +152,9 @@ void K3bToolBoxButton::slotPopupActivated() } -void K3bToolBoxButton::resizeEvent( QResizeEvent* e ) +void K3bToolBoxButton::resizeEvent( TQResizeEvent* e ) { - QToolButton::resizeEvent( e ); + TQToolButton::resizeEvent( e ); // force icon-only buttons to be square if( e->oldSize().height() != e->size().height() && @@ -167,12 +168,12 @@ void K3bToolBoxButton::resizeEvent( QResizeEvent* e ) -K3bToolBox::K3bToolBox( QWidget* parent, const char* name ) - : QFrame( parent, name ) +K3bToolBox::K3bToolBox( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name ) { - setSizePolicy( QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed) ); + tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) ); - m_mainLayout = new QGridLayout( this ); + m_mainLayout = new TQGridLayout( this ); m_mainLayout->setMargin( 1 ); m_mainLayout->setSpacing( 0 ); } @@ -190,7 +191,7 @@ K3bToolBoxButton* K3bToolBox::addButton( KAction* action, bool forceText ) K3bToolBoxButton* b = new K3bToolBoxButton( action, this ); if( forceText ) { b->setUsesTextLabel( true ); - b->setTextPosition( QToolButton::BesideIcon ); + b->setTextPosition( TQToolButton::BesideIcon ); } addWidget( b ); return b; @@ -200,15 +201,15 @@ K3bToolBoxButton* K3bToolBox::addButton( KAction* action, bool forceText ) } -K3bToolBoxButton* K3bToolBox::addButton( const QString& text, const QString& icon, - const QString& tooltip, const QString& whatsthis, - QObject* receiver, const char* slot, +K3bToolBoxButton* K3bToolBox::addButton( const TQString& text, const TQString& icon, + const TQString& tooltip, const TQString& whatsthis, + TQObject* receiver, const char* slot, bool forceText ) { K3bToolBoxButton* b = new K3bToolBoxButton( text, icon, tooltip, whatsthis, receiver, slot, this ); if( forceText ) { b->setUsesTextLabel( true ); - b->setTextPosition( QToolButton::BesideIcon ); + b->setTextPosition( TQToolButton::BesideIcon ); } addWidget( b ); return b; @@ -234,29 +235,29 @@ void K3bToolBox::addSeparator() void K3bToolBox::addStretch() { // add an empty widget - addWidget( new QWidget( this ) ); + addWidget( new TQWidget( this ) ); m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 ); } -void K3bToolBox::addLabel( const QString& text ) +void K3bToolBox::addLabel( const TQString& text ) { - QLabel* label = new QLabel( text, this ); - label->setSizePolicy( QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed) ); + TQLabel* label = new TQLabel( text, this ); + label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); addWidget( label ); } -void K3bToolBox::addWidget( QWidget* w ) +void K3bToolBox::addWidget( TQWidget* w ) { - w->reparent( this, QPoint() ); + w->reparent( this, TQPoint() ); m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 0 ); m_mainLayout->addWidget( w, 0, m_mainLayout->numCols()-1 ); - if( w->sizePolicy().horData() == QSizePolicy::Fixed || w->sizePolicy().horData() == QSizePolicy::Maximum ) + if( w->tqsizePolicy().horData() == TQSizePolicy::Fixed || w->tqsizePolicy().horData() == TQSizePolicy::Maximum ) m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 ); else { m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 1 ); @@ -282,10 +283,10 @@ void K3bToolBox::clear() { // we do not want to delete the widgets from the widgetactions becasue they // might be used afterwards - for( QPtrListIterator<QWidget> it( m_doNotDeleteWidgets ); it.current(); ++it ) - it.current()->reparent( 0L, QPoint() ); + for( TQPtrListIterator<TQWidget> it( m_doNotDeleteWidgets ); it.current(); ++it ) + it.current()->reparent( 0L, TQPoint() ); - for( QObjectListIterator it2( *children() ); it2.current(); ++it2 ) + for( TQObjectListIterator it2( childrenListObject() ); it2.current(); ++it2 ) if( it2.current()->isWidgetType() ) delete it2.current(); } diff --git a/libk3b/tools/k3btoolbox.h b/libk3b/tools/k3btoolbox.h index 828fca1..b93346b 100644 --- a/libk3b/tools/k3btoolbox.h +++ b/libk3b/tools/k3btoolbox.h @@ -16,56 +16,58 @@ #ifndef K3B_TOOLBOX_H #define K3B_TOOLBOX_H -#include <qframe.h> -#include <qstring.h> -#include <qtoolbutton.h> -#include <qptrlist.h> +#include <tqframe.h> +#include <tqstring.h> +#include <tqtoolbutton.h> +#include <tqptrlist.h> #include "k3b_export.h" class KAction; class KToggleAction; class KWidgetAction; -class QGridLayout; -class QPopupMenu; -class QResizeEvent; +class TQGridLayout; +class TQPopupMenu; +class TQResizeEvent; /** * internal class. Do not use! */ -class LIBK3B_EXPORT K3bToolBoxButton : public QToolButton +class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton { Q_OBJECT + TQ_OBJECT public: - K3bToolBoxButton( KAction*, QWidget* parent ); - K3bToolBoxButton( const QString& text, const QString& icon, - const QString& tooltip, const QString& whatsthis, - QObject* receiver, const char* slot, - QWidget* parent ); + K3bToolBoxButton( KAction*, TQWidget* tqparent ); + K3bToolBoxButton( const TQString& text, const TQString& icon, + const TQString& tooltip, const TQString& whatsthis, + TQObject* receiver, const char* slot, + TQWidget* tqparent ); private slots: void slotPopupActivated(); protected: - void resizeEvent( QResizeEvent* ); + void resizeEvent( TQResizeEvent* ); private: - QPopupMenu* m_popupMenu; + TQPopupMenu* m_popupMenu; }; -class LIBK3B_EXPORT K3bToolBox : public QFrame +class LIBK3B_EXPORT K3bToolBox : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bToolBox( QWidget* parent = 0, const char* name = 0 ); + K3bToolBox( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bToolBox(); - K3bToolBoxButton* addButton( const QString& text, const QString& icon, - const QString& tooltip = QString::null, const QString& whatsthis = QString::null, - QObject* receiver = 0, const char* slot = 0, + K3bToolBoxButton* addButton( const TQString& text, const TQString& icon, + const TQString& tooltip = TQString(), const TQString& whatsthis = TQString(), + TQObject* receiver = 0, const char* slot = 0, bool forceTextLabel = false ); K3bToolBoxButton* addButton( KAction*, bool forceTextLabel = false ); K3bToolBoxButton* addToggleButton( KToggleAction* ); @@ -76,8 +78,8 @@ class LIBK3B_EXPORT K3bToolBox : public QFrame * and destroy it on destruction. Becasue of this it is not fitted * for WidgetActions. */ - void addWidget( QWidget* ); - void addLabel( const QString& ); + void addWidget( TQWidget* ); + void addLabel( const TQString& ); void addSpacing(); void addSeparator(); void addStretch(); @@ -85,8 +87,8 @@ class LIBK3B_EXPORT K3bToolBox : public QFrame void clear(); protected: - QGridLayout* m_mainLayout; - QPtrList<QWidget> m_doNotDeleteWidgets; + TQGridLayout* m_mainLayout; + TQPtrList<TQWidget> m_doNotDeleteWidgets; }; diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index 2e3e468..6f63c63 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -15,9 +15,9 @@ #include "k3btoolbutton.h" -#include <qstyle.h> -#include <qpainter.h> -#include <qevent.h> +#include <tqstyle.h> +#include <tqpainter.h> +#include <tqevent.h> #include <kglobalsettings.h> #include <kapplication.h> @@ -26,13 +26,13 @@ class K3bToolButton::Private { public: - QPoint mousePressPos; + TQPoint mousePressPos; bool instantMenu; }; -K3bToolButton::K3bToolButton( QWidget* parent ) - : QToolButton( parent ) +K3bToolButton::K3bToolButton( TQWidget* tqparent ) + : TQToolButton( tqparent ) { d = new Private; d->instantMenu = false; @@ -52,38 +52,38 @@ void K3bToolButton::setInstantMenu( bool b ) } -void K3bToolButton::drawButton( QPainter* p ) +void K3bToolButton::drawButton( TQPainter* p ) { - QToolButton::drawButton( p ); + TQToolButton::drawButton( p ); // // code below comes from ktoolbarbutton.cpp from the kdelibs sources // see the file for copyright information // - if( QToolButton::popup() ) { - QStyle::SFlags arrowFlags = QStyle::Style_Default; + if( TQToolButton::popup() ) { + TQStyle::SFlags arrowFlags = TQStyle::Style_Default; if( isDown() ) - arrowFlags |= QStyle::Style_Down; + arrowFlags |= TQStyle::Style_Down; if( isEnabled() ) - arrowFlags |= QStyle::Style_Enabled; + arrowFlags |= TQStyle::Style_Enabled; - style().drawPrimitive(QStyle::PE_ArrowDown, p, - QRect(width()-7, height()-7, 7, 7), colorGroup(), - arrowFlags, QStyleOption() ); + tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, + TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(), + arrowFlags, TQStyleOption() ); } } -bool K3bToolButton::eventFilter( QObject* o, QEvent* ev ) +bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev ) { if( dynamic_cast<K3bToolButton*>(o) == this ) { // Popup the menu when the left mousebutton is pressed and the mouse // is moved by a small distance. - if( QToolButton::popup() ) { - if( ev->type() == QEvent::MouseButtonPress ) { - QMouseEvent* mev = static_cast<QMouseEvent*>(ev); + if( TQToolButton::popup() ) { + if( ev->type() == TQEvent::MouseButtonPress ) { + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if( d->instantMenu ) { setDown(true); @@ -94,8 +94,8 @@ bool K3bToolButton::eventFilter( QObject* o, QEvent* ev ) d->mousePressPos = mev->pos(); } } - else if( ev->type() == QEvent::MouseMove ) { - QMouseEvent* mev = static_cast<QMouseEvent*>(ev); + else if( ev->type() == TQEvent::MouseMove ) { + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if( !d->instantMenu && ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { openPopup(); @@ -105,5 +105,5 @@ bool K3bToolButton::eventFilter( QObject* o, QEvent* ev ) } } - return QToolButton::eventFilter( o, ev ); + return TQToolButton::eventFilter( o, ev ); } diff --git a/libk3b/tools/k3btoolbutton.h b/libk3b/tools/k3btoolbutton.h index fe96e4c..707801f 100644 --- a/libk3b/tools/k3btoolbutton.h +++ b/libk3b/tools/k3btoolbutton.h @@ -18,29 +18,29 @@ #include "k3b_export.h" -#include <qtoolbutton.h> +#include <tqtoolbutton.h> -class QPainter; -class QEvent; +class TQPainter; +class TQEvent; /** - * the K3bToolButton is an enhanced QToolButton which adds two functionalities: + * the K3bToolButton is an enhanced TQToolButton which adds two functionalities: * <li>A delayed popup menu is shown immiadetely once the mouse is dragged downwards * much like the KToolBarButton * <li>If a popup menu is set a little arrow indicates this. */ -class LIBK3B_EXPORT K3bToolButton : public QToolButton +class LIBK3B_EXPORT K3bToolButton : public TQToolButton { public: - K3bToolButton( QWidget* parent = 0 ); + K3bToolButton( TQWidget* tqparent = 0 ); ~K3bToolButton(); void setInstantMenu( bool ); protected: - virtual void drawButton( QPainter* ); - virtual bool eventFilter( QObject*, QEvent* ); + virtual void drawButton( TQPainter* ); + virtual bool eventFilter( TQObject*, TQEvent* ); private: class Private; diff --git a/libk3b/tools/k3bvalidators.cpp b/libk3b/tools/k3bvalidators.cpp index 9252fdd..b8a6e65 100644 --- a/libk3b/tools/k3bvalidators.cpp +++ b/libk3b/tools/k3bvalidators.cpp @@ -19,14 +19,14 @@ #include <ctype.h> -K3bCharValidator::K3bCharValidator( QObject* parent, const char* name ) - : QValidator( parent, name ), +K3bCharValidator::K3bCharValidator( TQObject* tqparent, const char* name ) + : TQValidator( tqparent, name ), m_replaceChar( '_' ) { } -QValidator::State K3bCharValidator::validate( QString& s, int& pos ) const +TQValidator::State K3bCharValidator::validate( TQString& s, int& pos ) const { Q_UNUSED(pos); @@ -40,7 +40,7 @@ QValidator::State K3bCharValidator::validate( QString& s, int& pos ) const } -void K3bCharValidator::fixup( QString& s ) const +void K3bCharValidator::fixup( TQString& s ) const { for( unsigned int i = 0; i < s.length(); ++i ) { if( validateChar( s[i] ) != Acceptable ) @@ -49,13 +49,13 @@ void K3bCharValidator::fixup( QString& s ) const } -K3bLatin1Validator::K3bLatin1Validator( QObject* parent, const char* name ) - : K3bCharValidator( parent, name ) +K3bLatin1Validator::K3bLatin1Validator( TQObject* tqparent, const char* name ) + : K3bCharValidator( tqparent, name ) { } -QValidator::State K3bLatin1Validator::validateChar( const QChar& c ) const +TQValidator::State K3bLatin1Validator::validateChar( const TQChar& c ) const { if( !c.latin1() ) return Invalid; @@ -64,13 +64,13 @@ QValidator::State K3bLatin1Validator::validateChar( const QChar& c ) const } -K3bAsciiValidator::K3bAsciiValidator( QObject* parent, const char* name ) - : K3bLatin1Validator( parent, name ) +K3bAsciiValidator::K3bAsciiValidator( TQObject* tqparent, const char* name ) + : K3bLatin1Validator( tqparent, name ) { } -QValidator::State K3bAsciiValidator::validateChar( const QChar& c ) const +TQValidator::State K3bAsciiValidator::validateChar( const TQChar& c ) const { if( K3bLatin1Validator::validateChar( c ) == Invalid ) return Invalid; @@ -82,21 +82,21 @@ QValidator::State K3bAsciiValidator::validateChar( const QChar& c ) const -K3bValidator::K3bValidator( QObject* parent, const char* name ) - : QRegExpValidator( parent, name ), +K3bValidator::K3bValidator( TQObject* tqparent, const char* name ) + : TQRegExpValidator( tqparent, name ), m_replaceChar('_') { } -K3bValidator::K3bValidator( const QRegExp& rx, QObject* parent, const char* name ) - : QRegExpValidator( rx, parent, name ), +K3bValidator::K3bValidator( const TQRegExp& rx, TQObject* tqparent, const char* name ) + : TQRegExpValidator( rx, tqparent, name ), m_replaceChar('_') { } -void K3bValidator::fixup( QString& input ) const +void K3bValidator::fixup( TQString& input ) const { for( unsigned int i = 0; i < input.length(); ++i ) if( !regExp().exactMatch( input.mid(i, 1) ) ) @@ -104,9 +104,9 @@ void K3bValidator::fixup( QString& input ) const } -QString K3bValidators::fixup( const QString& input, const QRegExp& rx, const QChar& replaceChar ) +TQString K3bValidators::fixup( const TQString& input, const TQRegExp& rx, const TQChar& replaceChar ) { - QString s; + TQString s; for( unsigned int i = 0; i < input.length(); ++i ) if( rx.exactMatch( input.mid(i, 1) ) ) s += input[i]; @@ -116,39 +116,39 @@ QString K3bValidators::fixup( const QString& input, const QRegExp& rx, const QCh } -K3bValidator* K3bValidators::isrcValidator( QObject* parent, const char* name ) +K3bValidator* K3bValidators::isrcValidator( TQObject* tqparent, const char* name ) { - return new K3bValidator( QRegExp("^[A-Z\\d]{2,2}-[A-Z\\d]{3,3}-\\d{2,2}-\\d{5,5}$"), parent, name ); + return new K3bValidator( TQRegExp("^[A-Z\\d]{2,2}-[A-Z\\d]{3,3}-\\d{2,2}-\\d{5,5}$"), tqparent, name ); } -K3bValidator* K3bValidators::iso9660Validator( bool allowEmpty, QObject* parent, const char* name ) +K3bValidator* K3bValidators::iso9660Validator( bool allowEmpty, TQObject* tqparent, const char* name ) { if( allowEmpty ) - return new K3bValidator( QRegExp( "[^/]*" ), parent, name ); + return new K3bValidator( TQRegExp( "[^/]*" ), tqparent, name ); else - return new K3bValidator( QRegExp( "[^/]+" ), parent, name ); + return new K3bValidator( TQRegExp( "[^/]+" ), tqparent, name ); } -K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, QObject* parent, const char* name ) +K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, TQObject* tqparent, const char* name ) { - QRegExp rx; + TQRegExp rx; switch ( type ) { case Iso646_d: if ( AllowLowerCase ) - rx = QRegExp( "[a-zA-Z0-9_]*" ); + rx = TQRegExp( "[a-zA-Z0-9_]*" ); else - rx = QRegExp( "[A-Z0-9_]*" ); + rx = TQRegExp( "[A-Z0-9_]*" ); break; case Iso646_a: default: if ( AllowLowerCase ) - rx = QRegExp( "[a-zA-Z0-9!\"\\s%&'\\(\\)\\*\\+,\\-\\./:;<=>\\?_]*" ); + rx = TQRegExp( "[a-zA-Z0-9!\"\\s%&'\\(\\)\\*\\+,\\-\\./:;<=>\\?_]*" ); else - rx = QRegExp( "[A-Z0-9!\"\\s%&'\\(\\)\\*\\+,\\-\\./:;<=>\\?_]*" ); + rx = TQRegExp( "[A-Z0-9!\"\\s%&'\\(\\)\\*\\+,\\-\\./:;<=>\\?_]*" ); break; } - return new K3bValidator( rx, parent, name ); + return new K3bValidator( rx, tqparent, name ); } diff --git a/libk3b/tools/k3bvalidators.h b/libk3b/tools/k3bvalidators.h index 89c6397..d391cb9 100644 --- a/libk3b/tools/k3bvalidators.h +++ b/libk3b/tools/k3bvalidators.h @@ -16,74 +16,74 @@ #ifndef _K3B_VALIDATORS_H_ #define _K3B_VALIDATORS_H_ -#include <qvalidator.h> +#include <tqvalidator.h> #include "k3b_export.h" /** * Simple validator that validates a string char by char */ -class LIBK3B_EXPORT K3bCharValidator : public QValidator +class LIBK3B_EXPORT K3bCharValidator : public TQValidator { public: - K3bCharValidator( QObject* parent = 0, const char* name = 0 ); + K3bCharValidator( TQObject* tqparent = 0, const char* name = 0 ); - virtual State validateChar( const QChar& ) const = 0; + virtual State validateChar( const TQChar& ) const = 0; - virtual State validate( QString& s, int& pos ) const; + virtual State validate( TQString& s, int& pos ) const; /** * Replaces all invalid chars with the repplace char */ - virtual void fixup( QString& ) const; + virtual void fixup( TQString& ) const; /** * Default to '_' */ - void setReplaceChar( const QChar& c ) { m_replaceChar = c; } + void setReplaceChar( const TQChar& c ) { m_replaceChar = c; } private: - QChar m_replaceChar; + TQChar m_replaceChar; }; class LIBK3B_EXPORT K3bLatin1Validator : public K3bCharValidator { public: - K3bLatin1Validator( QObject* parent = 0, const char* name = 0 ); + K3bLatin1Validator( TQObject* tqparent = 0, const char* name = 0 ); - virtual State validateChar( const QChar& ) const; + virtual State validateChar( const TQChar& ) const; }; class LIBK3B_EXPORT K3bAsciiValidator : public K3bLatin1Validator { public: - K3bAsciiValidator( QObject* parent = 0, const char* name = 0 ); + K3bAsciiValidator( TQObject* tqparent = 0, const char* name = 0 ); - virtual State validateChar( const QChar& ) const; + virtual State validateChar( const TQChar& ) const; }; /** - * The K3bValidator extends QRegExpValidator with a fixup method + * The K3bValidator extends TQRegExpValidator with a fixup method * that just replaces all characters that are not allowed with the - * replace character. It only makes sense for QRegExps that simply + * replace character. It only makes sense for TQRegExps that simply * allow or forbid some characters. */ -class LIBK3B_EXPORT K3bValidator : public QRegExpValidator +class LIBK3B_EXPORT K3bValidator : public TQRegExpValidator { public: - K3bValidator( QObject* parent, const char * name = 0 ); - K3bValidator( const QRegExp& rx, QObject* parent, const char* name = 0 ); + K3bValidator( TQObject* tqparent, const char * name = 0 ); + K3bValidator( const TQRegExp& rx, TQObject* tqparent, const char* name = 0 ); - void setReplaceChar( const QChar& s ) { m_replaceChar = s; } - const QChar& replaceChar() const { return m_replaceChar; } + void setReplaceChar( const TQChar& s ) { m_replaceChar = s; } + const TQChar& replaceChar() const { return m_replaceChar; } - virtual void fixup( QString& ) const; + virtual void fixup( TQString& ) const; private: - QChar m_replaceChar; + TQChar m_replaceChar; }; @@ -91,10 +91,10 @@ namespace K3bValidators { /** * just replaces all characters that are not allowed with the - * replace character. It only makes sense for QRegExps that simply + * replace character. It only makes sense for TQRegExps that simply * allow or forbid some characters. */ - LIBK3B_EXPORT QString fixup( const QString&, const QRegExp&, const QChar& replaceChar = '_' ); + LIBK3B_EXPORT TQString fixup( const TQString&, const TQRegExp&, const TQChar& replaceChar = '_' ); /** * Validates an ISRC code of the form "CCOOOYYSSSSS" where: @@ -105,13 +105,13 @@ namespace K3bValidators * <li>S: serial number (digits)</li> * </ul> */ - LIBK3B_EXPORT K3bValidator* isrcValidator( QObject* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT K3bValidator* isrcValidator( TQObject* tqparent = 0, const char* name = 0 ); /** * This needs to be replaced by something better in the future... * Even the name sucks! */ - LIBK3B_EXPORT K3bValidator* iso9660Validator( bool allowEmpty = true, QObject* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT K3bValidator* iso9660Validator( bool allowEmpty = true, TQObject* tqparent = 0, const char* name = 0 ); /** * (1) d-characters are: A-Z, 0-9, _ (see ISO-9660:1988, Annex A, Table 15) @@ -125,7 +125,7 @@ namespace K3bValidators LIBK3B_EXPORT K3bValidator* iso646Validator( int type = Iso646_a, bool AllowLowerCase = false, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); } #endif diff --git a/libk3b/tools/k3bwavefilewriter.cpp b/libk3b/tools/k3bwavefilewriter.cpp index 36267c2..31ad6e0 100644 --- a/libk3b/tools/k3bwavefilewriter.cpp +++ b/libk3b/tools/k3bwavefilewriter.cpp @@ -29,7 +29,7 @@ K3bWaveFileWriter::~K3bWaveFileWriter() } -bool K3bWaveFileWriter::open( const QString& filename ) +bool K3bWaveFileWriter::open( const TQString& filename ) { close(); @@ -65,7 +65,7 @@ void K3bWaveFileWriter::close() } } - m_filename = QString::null; + m_filename = TQString(); } @@ -75,7 +75,7 @@ bool K3bWaveFileWriter::isOpen() } -const QString& K3bWaveFileWriter::filename() const +const TQString& K3bWaveFileWriter::filename() const { return m_filename; } @@ -135,8 +135,8 @@ void K3bWaveFileWriter::updateHeader() m_outputFile.flush(); - Q_INT32 dataSize( m_outputFile.at() - 44 ); - Q_INT32 wavSize(dataSize + 44 - 8); + TQ_INT32 dataSize( m_outputFile.at() - 44 ); + TQ_INT32 wavSize(dataSize + 44 - 8); char c[4]; // jump to the wavSize position in the header diff --git a/libk3b/tools/k3bwavefilewriter.h b/libk3b/tools/k3bwavefilewriter.h index e5394a5..a6fc97a 100644 --- a/libk3b/tools/k3bwavefilewriter.h +++ b/libk3b/tools/k3bwavefilewriter.h @@ -17,9 +17,9 @@ #ifndef K3BWAVEFILEWRITER_H #define K3BWAVEFILEWRITER_H -#include <qstring.h> -#include <qfile.h> -#include <qdatastream.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqdatastream.h> #include "k3b_export.h" /** * @author Sebastian Trueg @@ -39,10 +39,10 @@ class LIBK3B_EXPORT K3bWaveFileWriter * open a new wave file. * closes any opened file. */ - bool open( const QString& filename ); + bool open( const TQString& filename ); bool isOpen(); - const QString& filename() const; + const TQString& filename() const; /** * closes the file. @@ -70,9 +70,9 @@ class LIBK3B_EXPORT K3bWaveFileWriter void updateHeader(); void padTo2352(); - QFile m_outputFile; - QDataStream m_outputStream; - QString m_filename; + TQFile m_outputFile; + TQDataStream m_outputStream; + TQString m_filename; }; #endif diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp index accbe17..d06c887 100644 --- a/libk3b/tools/kcutlabel.cpp +++ b/libk3b/tools/kcutlabel.cpp @@ -18,34 +18,34 @@ #include <k3bstringutils.h> -#include <qtooltip.h> -#include <qstringlist.h> +#include <tqtooltip.h> +#include <tqstringlist.h> #include <kdebug.h> -KCutLabel::KCutLabel( const QString &text , QWidget *parent, const char *name ) - : QLabel ( parent, name ), +KCutLabel::KCutLabel( const TQString &text , TQWidget *tqparent, const char *name ) + : TQLabel ( tqparent, name ), m_minChars(1) { - QSizePolicy myLabelSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); - setSizePolicy(myLabelSizePolicy); + TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + tqsetSizePolicy(myLabelSizePolicy); m_fullText = text; cutTextToLabel(); } -KCutLabel::KCutLabel( QWidget *parent, const char *name ) - : QLabel ( parent, name ), +KCutLabel::KCutLabel( TQWidget *tqparent, const char *name ) + : TQLabel ( tqparent, name ), m_minChars(1) { - QSizePolicy myLabelSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); - setSizePolicy(myLabelSizePolicy); + TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + tqsetSizePolicy(myLabelSizePolicy); } -QSize KCutLabel::minimumSizeHint() const +TQSize KCutLabel::tqminimumSizeHint() const { - QSize sh = QLabel::minimumSizeHint(); + TQSize sh = TQLabel::tqminimumSizeHint(); if( m_minChars == 0 ) sh.setWidth(-1); else if( m_minChars < (int)m_fullText.length() ) - sh.setWidth( QMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ), + sh.setWidth( TQMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ), fontMetrics().width( m_fullText ) ) ); return sh; @@ -59,19 +59,19 @@ void KCutLabel::setMinimumVisibleText( int i ) } -void KCutLabel::resizeEvent( QResizeEvent * ) +void KCutLabel::resizeEvent( TQResizeEvent * ) { cutTextToLabel(); } -void KCutLabel::setText( const QString &text ) +void KCutLabel::setText( const TQString &text ) { m_fullText = text; cutTextToLabel(); } -const QString& KCutLabel::fullText() const +const TQString& KCutLabel::fullText() const { return m_fullText; } @@ -79,36 +79,36 @@ const QString& KCutLabel::fullText() const void KCutLabel::cutTextToLabel() { - QToolTip::remove( this ); - QToolTip::hide(); - - if( m_fullText.contains( "\n" ) ) { - QString newText; - QStringList lines = QStringList::split( "\n", m_fullText ); - for( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) { - QString squeezedText = K3b::cutToWidth( fontMetrics(), + TQToolTip::remove( this ); + TQToolTip::hide(); + + if( m_fullText.tqcontains( "\n" ) ) { + TQString newText; + TQStringList lines = TQStringList::split( "\n", m_fullText ); + for( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) { + TQString squeezedText = K3b::cutToWidth( fontMetrics(), *it, - QMAX( size().width(), - QMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ), + TQMAX( size().width(), + TQMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ), fontMetrics().width( m_fullText ) ) ) ); newText += squeezedText; newText += "\n"; if( squeezedText != *it ) - QToolTip::add( this, m_fullText ); + TQToolTip::add( this, m_fullText ); } newText.truncate( newText.length() - 1 ); // get rid of the last newline - QLabel::setText( newText ); + TQLabel::setText( newText ); } else { - QString squeezedText = K3b::cutToWidth( fontMetrics(), + TQString squeezedText = K3b::cutToWidth( fontMetrics(), m_fullText, - QMAX( size().width(), - QMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ), + TQMAX( size().width(), + TQMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ), fontMetrics().width( m_fullText ) ) ) ); - QLabel::setText( squeezedText ); + TQLabel::setText( squeezedText ); if( squeezedText != m_fullText ) - QToolTip::add( this, m_fullText ); + TQToolTip::add( this, m_fullText ); } } diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h index 6cf459c..5df44b3 100644 --- a/libk3b/tools/kcutlabel.h +++ b/libk3b/tools/kcutlabel.h @@ -17,33 +17,34 @@ #ifndef KCUTLABEL_H #define KCUTLABEL_H -#include <qlabel.h> +#include <tqlabel.h> #include "k3b_export.h" /* - * @ref QLabel + * @ref TQLabel */ -class LIBK3B_EXPORT KCutLabel : public QLabel +class LIBK3B_EXPORT KCutLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. */ - KCutLabel( QWidget *parent = 0, const char *name = 0); - KCutLabel( const QString &text, QWidget *parent = 0, const char *name = 0 ); + KCutLabel( TQWidget *tqparent = 0, const char *name = 0); + KCutLabel( const TQString &text, TQWidget *tqparent = 0, const char *name = 0 ); - virtual QSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * \return the full text while text() returns the cut text */ - const QString& fullText() const; + const TQString& fullText() const; public slots: - void setText( const QString & ); + void setText( const TQString & ); /** * \param i the number of characters that have to be visible. Default is 1. @@ -54,14 +55,14 @@ class LIBK3B_EXPORT KCutLabel : public QLabel /** * used when widget is resized */ - void resizeEvent( QResizeEvent * ); + void resizeEvent( TQResizeEvent * ); /** * does the dirty work */ void cutTextToLabel(); private: - QString m_fullText; + TQString m_fullText; int m_minChars; }; diff --git a/libk3b/tools/libisofs/COPYING b/libk3b/tools/libisofs/COPYING index 9fe1a71..3f277a2 100644 --- a/libk3b/tools/libisofs/COPYING +++ b/libk3b/tools/libisofs/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/libk3b/tools/libisofs/iso_fs.h b/libk3b/tools/libisofs/iso_fs.h index 43353b0..b726b9f 100644 --- a/libk3b/tools/libisofs/iso_fs.h +++ b/libk3b/tools/libisofs/iso_fs.h @@ -131,13 +131,13 @@ struct hs_primary_descriptor { char root_directory_record [ISODCL (181, 214)]; /* 9.1 */ }; -/* We use this to help us look up the parent inode numbers. */ +/* We use this to help us look up the tqparent inode numbers. */ struct iso_path_table{ char name_len[1]; /* 711 */ char ext_attr_length[1]; /* 711 */ char extent[4]; /* 731 */ - char parent[2]; /* 721 */ + char tqparent[2]; /* 721 */ char name[1]; }; diff --git a/libk3b/tools/libisofs/isofs.h b/libk3b/tools/libisofs/isofs.h index f284903..6f2fe2d 100644 --- a/libk3b/tools/libisofs/isofs.h +++ b/libk3b/tools/libisofs/isofs.h @@ -43,7 +43,7 @@ typedef struct _rr_entry { int serno; int dev_major; int dev_minor; - int pl; /* parent location */ + int pl; /* tqparent location */ int cl; /* child location */ int re; /* relocated */ char z_algo[2]; /* zizofs algorithm */ @@ -60,7 +60,7 @@ typedef struct _iso_vol_desc { typedef struct _boot_entry { struct _boot_entry *next; struct _boot_entry *prev; - struct _boot_entry *parent; + struct _boot_entry *tqparent; struct _boot_entry *child; char data[32]; } boot_entry; |