diff options
Diffstat (limited to 'libk3b/tools')
41 files changed, 107 insertions, 169 deletions
diff --git a/libk3b/tools/Makefile.am b/libk3b/tools/Makefile.am deleted file mode 100644 index d48a295..0000000 --- a/libk3b/tools/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -AM_CPPFLAGS= -I$(srcdir)/../../src \ - -I$(srcdir)/../core \ - -I$(srcdir)/../../libk3bdevice \ - -I$(srcdir)/.. \ - $(all_includes) - -noinst_LTLIBRARIES = libk3btools.la - -libk3btools_la_LIBADD = libisofs/libisofs.la - -libk3btools_la_LDFLAGS = $(all_libraries) - -libk3btools_la_SOURCES = k3bwavefilewriter.cpp k3bbusywidget.cpp k3bdeviceselectiondialog.cpp \ - k3bmd5job.cpp k3btitlelabel.cpp k3bcutcombobox.cpp \ - k3bstringutils.cpp k3bdevicecombobox.cpp kcutlabel.cpp \ - k3bstdguiitems.cpp k3bvalidators.cpp k3bthroughputestimator.cpp \ - k3biso9660.cpp k3bmultichoicedialog.cpp k3bdevicehandler.cpp \ - k3bcdparanoialib.cpp k3blistview.cpp k3bmsfedit.cpp \ - k3bcdtextvalidator.cpp k3bintvalidator.cpp k3bexceptions.cpp \ - k3bprogressdialog.cpp k3btoolbox.cpp k3bpushbutton.cpp \ - k3blistviewitemanimator.cpp k3bthreadwidget.cpp k3bradioaction.cpp \ - k3bsignalwaiter.cpp k3blibdvdcss.cpp k3biso9660backend.cpp \ - k3bpipe.cpp k3bchecksumpipe.cpp k3btoolbutton.cpp \ - k3bintmapcombobox.cpp k3bdirsizejob.cpp k3brichtextlabel.cpp \ - k3btempfile.cpp k3bactivepipe.cpp k3bfilesplitter.cpp \ - k3bfilesysteminfo.cpp - -include_HEADERS = k3bwavefilewriter.h k3bbusywidget.h k3bdeviceselectiondialog.h \ - k3bmd5job.h k3bcutcombobox.h k3bstringutils.h \ - k3bdevicecombobox.h kcutlabel.h k3bstdguiitems.h \ - k3bvalidators.h k3bthroughputestimator.h k3biso9660.h \ - k3bmultichoicedialog.h k3bdevicehandler.h k3bcdparanoialib.h \ - k3blistview.h k3bmsfedit.h k3bcdtextvalidator.h \ - k3bintvalidator.h k3bexceptions.h k3bprogressdialog.h \ - k3btoolbox.h k3bpushbutton.h k3blistviewitemanimator.h \ - k3bthreadwidget.h k3bradioaction.h k3bsignalwaiter.h \ - k3biso9660backend.h k3bpipe.h k3bdirsizejob.h \ - k3bchecksumpipe.h k3btoolbutton.h k3bintmapcombobox.h \ - k3brichtextlabel.h k3btempfile.h k3bactivepipe.h \ - k3bfilesplitter.h k3bfilesysteminfo.h - -METASOURCES = AUTO - -SUBDIRS = libisofs diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp index f9e7bc3..8eba682 100644 --- a/libk3b/tools/k3bbusywidget.cpp +++ b/libk3b/tools/k3bbusywidget.cpp @@ -27,7 +27,7 @@ K3bBusyWidget::K3bBusyWidget( TQWidget* parent, const char* name ) m_busyTimer = new TQTimer( this ); m_iBusyPosition = 0; - connect( m_busyTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animateBusy()) ); + connect( m_busyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animateBusy()) ); m_bBusy = false; } diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h index 740afef..88efba4 100644 --- a/libk3b/tools/k3bbusywidget.h +++ b/libk3b/tools/k3bbusywidget.h @@ -26,7 +26,7 @@ class TQTimer; class LIBK3B_EXPORT K3bBusyWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h index bfa7509..2a74db9 100644 --- a/libk3b/tools/k3bcutcombobox.h +++ b/libk3b/tools/k3bcutcombobox.h @@ -34,7 +34,7 @@ class TQResizeEvent; */ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp index 0ca6075..28b7a23 100644 --- a/libk3b/tools/k3bdevicecombobox.cpp +++ b/libk3b/tools/k3bdevicecombobox.cpp @@ -36,10 +36,10 @@ K3bDeviceComboBox::K3bDeviceComboBox( TQWidget* parent, const char* name ) : KComboBox( parent, name ) { d = new Private(); - 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*)) ); + connect( this, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotActivated(int)) ); + connect( k3bcore->deviceManager(), TQ_SIGNAL(changed(K3bDevice::DeviceManager*)), + this, TQ_SLOT(slotDeviceManagerChanged(K3bDevice::DeviceManager*)) ); } diff --git a/libk3b/tools/k3bdevicecombobox.h b/libk3b/tools/k3bdevicecombobox.h index 577bd1e..7efffd8 100644 --- a/libk3b/tools/k3bdevicecombobox.h +++ b/libk3b/tools/k3bdevicecombobox.h @@ -33,7 +33,7 @@ namespace K3bDevice { */ class LIBK3B_EXPORT K3bDeviceComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bdevicehandler.h b/libk3b/tools/k3bdevicehandler.h index bdba4f0..4752b17 100644 --- a/libk3b/tools/k3bdevicehandler.h +++ b/libk3b/tools/k3bdevicehandler.h @@ -46,7 +46,7 @@ namespace K3bDevice */ class LIBK3B_EXPORT DeviceHandler : public K3bThreadJob { - Q_OBJECT + TQ_OBJECT public: @@ -178,8 +178,8 @@ namespace K3bDevice * Usage: * \code * connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::MOUNT, dev ), - * TQT_SIGNAL(finished(DeviceHandler*)), - * this, TQT_SLOT(someSlot(DeviceHandler*)) ); + * TQ_SIGNAL(finished(DeviceHandler*)), + * this, TQ_SLOT(someSlot(DeviceHandler*)) ); * * void someSlot( DeviceHandler* dh ) { * if( dh->success() ) { diff --git a/libk3b/tools/k3bdeviceselectiondialog.h b/libk3b/tools/k3bdeviceselectiondialog.h index 390f55e..e4497b7 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.h +++ b/libk3b/tools/k3bdeviceselectiondialog.h @@ -30,7 +30,7 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDeviceSelectionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h index b33ce5b..86e270a 100644 --- a/libk3b/tools/k3bdirsizejob.h +++ b/libk3b/tools/k3bdirsizejob.h @@ -30,7 +30,7 @@ */ class LIBK3B_EXPORT K3bDirSizeJob : public K3bThreadJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bfilesplitter.cpp b/libk3b/tools/k3bfilesplitter.cpp index a4f0553..965d510 100644 --- a/libk3b/tools/k3bfilesplitter.cpp +++ b/libk3b/tools/k3bfilesplitter.cpp @@ -155,11 +155,7 @@ void K3bFileSplitter::flush() d->file.flush(); } -#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; diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h index 7aaf25e..d7e26cf 100644 --- a/libk3b/tools/k3bfilesplitter.h +++ b/libk3b/tools/k3bfilesplitter.h @@ -63,11 +63,6 @@ class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice 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! @@ -79,11 +74,7 @@ class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice /** * Not implemented */ -#ifdef USE_QT4 - virtual qint64 size() const; -#else // USE_QT4 virtual Offset size() const; -#endif // USE_QT4 /** * Not implemented diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp index 3dd9731..29bd238 100644 --- a/libk3b/tools/k3bintmapcombobox.cpp +++ b/libk3b/tools/k3bintmapcombobox.cpp @@ -35,10 +35,10 @@ K3bIntMapComboBox::K3bIntMapComboBox( TQWidget* parent, const char* name ) : KComboBox( parent, name ) { d = new Private; - connect( this, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotItemHighlighted(int)) ); - connect( this, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotItemActivated(int)) ); + connect( this, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotItemHighlighted(int)) ); + connect( this, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotItemActivated(int)) ); } @@ -82,7 +82,7 @@ bool K3bIntMapComboBox::insertItem( int value, const TQString& text, const TQStr index = KComboBox::count(); d->valueIndexMap[value] = index; - d->indexValueDescriptionMap[index] = tqMakePair<int, TQString>( value, description ); + d->indexValueDescriptionMap[index] = qMakePair<int, TQString>( value, description ); KComboBox::insertItem( text ); diff --git a/libk3b/tools/k3bintmapcombobox.h b/libk3b/tools/k3bintmapcombobox.h index 0b17c00..6775aa0 100644 --- a/libk3b/tools/k3bintmapcombobox.h +++ b/libk3b/tools/k3bintmapcombobox.h @@ -29,7 +29,7 @@ */ class LIBK3B_EXPORT K3bIntMapComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp index a4d20d4..77e499c 100644 --- a/libk3b/tools/k3bintvalidator.cpp +++ b/libk3b/tools/k3bintvalidator.cpp @@ -25,14 +25,14 @@ K3bIntValidator::K3bIntValidator ( TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { m_min = m_max = 0; } K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { m_min = bottom; m_max = top; diff --git a/libk3b/tools/k3blibdvdcss.cpp b/libk3b/tools/k3blibdvdcss.cpp index 5baf8b4..bb0e375 100644 --- a/libk3b/tools/k3blibdvdcss.cpp +++ b/libk3b/tools/k3blibdvdcss.cpp @@ -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( tqMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) ); + d->titleOffsets.append( qMakePair( (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; diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index 552c218..8d22df8 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -520,7 +520,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i else flags |= TQStyle::Style_Off; - listView()->style().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags ); + listView()->style().drawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags ); } } } @@ -552,8 +552,8 @@ K3bListView::K3bListView( TQWidget* parent, const char* name ) { d = new Private; - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); m_editorButton = 0; m_editorComboBox = 0; @@ -709,8 +709,8 @@ void K3bListView::prepareButton( K3bListViewItem*, int ) { if( !m_editorButton ) { m_editorButton = new TQPushButton( viewport() ); - connect( m_editorButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditorButtonClicked()) ); + connect( m_editorButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditorButtonClicked()) ); } // TODO: do some useful things @@ -724,8 +724,8 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::COMBO: if( !m_editorComboBox ) { m_editorComboBox = new TQComboBox( viewport() ); - connect( m_editorComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotEditorComboBoxActivated(const TQString&)) ); + connect( m_editorComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotEditorComboBoxActivated(const TQString&)) ); m_editorComboBox->installEventFilter( this ); } m_editorComboBox->clear(); @@ -769,9 +769,9 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::SPIN: if( !m_editorSpinBox ) { 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)) ); + d->spinBoxLineEdit = static_cast<TQLineEdit*>( m_editorSpinBox->child( 0, "TQLineEdit" ) ); + connect( m_editorSpinBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotEditorSpinBoxValueChanged(int)) ); // m_editorSpinBox->installEventFilter( this ); d->spinBoxLineEdit->installEventFilter( this ); } @@ -782,9 +782,9 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::MSF: if( !m_editorMsfEdit ) { m_editorMsfEdit = new K3bMsfEdit( viewport() ); - 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)) ); + d->msfEditLineEdit = static_cast<TQLineEdit*>( m_editorMsfEdit->child( 0, "TQLineEdit" ) ); + connect( m_editorMsfEdit, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotEditorMsfEditValueChanged(int)) ); // m_editorMsfEdit->installEventFilter( this ); d->msfEditLineEdit->installEventFilter( this ); } @@ -1015,11 +1015,11 @@ void K3bListView::slotEditorButtonClicked( K3bListViewItem* item, int col ) bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::KeyPress ) { - TQKeyEvent* ke = TQT_TQKEYEVENT(e); + TQKeyEvent* ke = static_cast<TQKeyEvent*>(e); if( ke->key() == Key_Tab ) { - 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) ) { + if( o == m_editorLineEdit || + o == d->msfEditLineEdit || + o == d->spinBoxLineEdit ) { K3bListViewItem* lastEditItem = m_currentEditItem; doRename(); @@ -1059,9 +1059,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } if( ke->key() == Key_Return || ke->key() == Key_Enter ) { - 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) ) { + if( o == m_editorLineEdit || + o == d->msfEditLineEdit || + o == d->spinBoxLineEdit ) { K3bListViewItem* lastEditItem = m_currentEditItem; doRename(); @@ -1079,9 +1079,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } } else if( ke->key() == Key_Escape ) { - 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) ) { + if( o == m_editorLineEdit || + o == d->msfEditLineEdit || + o == d->spinBoxLineEdit ) { hideEditor(); // keep the focus here @@ -1092,12 +1092,12 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } } - else if( e->type() == TQEvent::MouseButtonPress && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { + else if( e->type() == TQEvent::MouseButtonPress && o == viewport() ) { // first let's grab the focus viewport()->setFocus(); - TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* me = static_cast<TQMouseEvent*>( e ); TQListViewItem* item = itemAt( me->pos() ); int col = header()->sectionAt( me->pos().x() ); if( K3bCheckListViewItem* ci = dynamic_cast<K3bCheckListViewItem*>( item ) ) { @@ -1108,7 +1108,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } } - if( me->button() == Qt::LeftButton ) { + if( me->button() == TQt::LeftButton ) { if( item != m_currentEditItem || m_currentEditColumn != col ) { doRename(); if( K3bListViewItem* k3bItem = dynamic_cast<K3bListViewItem*>(item) ) { @@ -1138,12 +1138,12 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } 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) ) { + 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( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) { + if( !tqApp->focusWidget() || tqApp->focusWidget()->parentWidget() != o ) { doRename(); hideEditor(); } @@ -1174,7 +1174,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e ) if( bgPix.width() < m_backgroundPixmap.width() || bgPix.height() < m_backgroundPixmap.height() ) { - TQPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), TQ_ScaleMin ) ); + TQPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), TQImage::ScaleMin ) ); if( m_backgroundPixmapPosition == TOP_LEFT ) bitBlt( &bgPix, 0, 0, &newBgPix, 0, 0, diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h index b29f594..6f654be 100644 --- a/libk3b/tools/k3blistview.h +++ b/libk3b/tools/k3blistview.h @@ -157,7 +157,7 @@ class LIBK3B_EXPORT K3bListView : public TDEListView { friend class K3bListViewItem; - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp index 8bb5f69..a5ebf21 100644 --- a/libk3b/tools/k3blistviewitemanimator.cpp +++ b/libk3b/tools/k3blistviewitemanimator.cpp @@ -53,7 +53,7 @@ void K3bListViewItemAnimator::init() m_item = 0; m_column = 0; m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimate()) ); } diff --git a/libk3b/tools/k3blistviewitemanimator.h b/libk3b/tools/k3blistviewitemanimator.h index 68c60dd..e095d7e 100644 --- a/libk3b/tools/k3blistviewitemanimator.h +++ b/libk3b/tools/k3blistviewitemanimator.h @@ -29,7 +29,7 @@ class TQTimer; */ class LIBK3B_EXPORT K3bListViewItemAnimator : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index 39eff96..e1384de 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -73,8 +73,8 @@ K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, TQObject* parent, const char* name ) { d = new K3bMd5JobPrivate; d->data = new char[K3bMd5JobPrivate::BUFFERSIZE]; - connect( &d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdate()) ); + connect( &d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdate()) ); } @@ -135,7 +135,7 @@ void K3bMd5Job::setupFdNotifier() // the TQSocketNotifier will fire once the fd is closed delete d->fdNotifier; d->fdNotifier = new TQSocketNotifier( d->fileDes, TQSocketNotifier::Read, this ); - connect( d->fdNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdate()) ); + connect( d->fdNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdate()) ); d->fdNotifier->setEnabled( true ); } diff --git a/libk3b/tools/k3bmd5job.h b/libk3b/tools/k3bmd5job.h index b2cf948..6079e77 100644 --- a/libk3b/tools/k3bmd5job.h +++ b/libk3b/tools/k3bmd5job.h @@ -30,7 +30,7 @@ class K3bIso9660File; class LIBK3B_EXPORT K3bMd5Job : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index 07ed77d..7926e97 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -36,13 +36,13 @@ K3bMsfValidator::K3bMsfValidator( TQObject* parent, const char* name ) K3bMsfEdit::K3bMsfEdit( TQWidget* parent, const char* name ) : TQSpinBox( parent, name ) { - setValidator( new K3bMsfValidator( TQT_TQOBJECT(this) ) ); + setValidator( new K3bMsfValidator( this ) ); setMinValue( 0 ); // some very high value (10000 minutes) setMaxValue( 10000*60*75 ); - connect( this, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValueChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValueChanged(int)) ); } @@ -60,7 +60,7 @@ TQSize K3bMsfEdit::sizeHint() const int w = fm.width( "00:00:00" ); int wx = fm.width( ' ' )*2; int frame = style().pixelMetric( TQStyle::PM_SpinBoxFrameWidth ); - return style().tqsizeFromContents(TQStyle::CT_SpinBox, this, + return style().sizeFromContents(TQStyle::CT_SpinBox, this, TQSize( w + wx + downRect().width() + frame*2, h + frame*2). expandedTo( TQApplication::globalStrut() )); diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h index f80827a..b71f194 100644 --- a/libk3b/tools/k3bmsfedit.h +++ b/libk3b/tools/k3bmsfedit.h @@ -34,7 +34,7 @@ class K3bMsfValidator : public TQRegExpValidator class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp index c502d95..de4cb22 100644 --- a/libk3b/tools/k3bmultichoicedialog.cpp +++ b/libk3b/tools/k3bmultichoicedialog.cpp @@ -82,8 +82,8 @@ K3bMultiChoiceDialog::K3bMultiChoiceDialog( const TQString& caption, : KDialog( parent, name ) { d = new Private(); - d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( d->mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(done(int)) ); + d->mapper = new TQSignalMapper( this ); + connect( d->mapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(done(int)) ); setCaption( caption ); @@ -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( TQT_TQOBJECT(button), d->buttons.count() ); - connect( button, TQT_SIGNAL(clicked()), d->mapper, TQT_SLOT(map()) ); + d->mapper->setMapping( button, d->buttons.count() ); + connect( button, TQ_SIGNAL(clicked()), d->mapper, TQ_SLOT(map()) ); return d->buttons.count(); } diff --git a/libk3b/tools/k3bmultichoicedialog.h b/libk3b/tools/k3bmultichoicedialog.h index 02709e6..ab63420 100644 --- a/libk3b/tools/k3bmultichoicedialog.h +++ b/libk3b/tools/k3bmultichoicedialog.h @@ -27,7 +27,7 @@ class TQCloseEvent; class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bprogressdialog.h b/libk3b/tools/k3bprogressdialog.h index cb0f989..581ade1 100644 --- a/libk3b/tools/k3bprogressdialog.h +++ b/libk3b/tools/k3bprogressdialog.h @@ -33,7 +33,7 @@ class TQWidgetStack; */ class LIBK3B_EXPORT K3bProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index 780a338..d7e6b89 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -80,7 +80,7 @@ void K3bPushButton::setDelayedPopupMenu( TQPopupMenu* popup ) { if( !d->popupTimer ) { d->popupTimer = new TQTimer( this ); - connect( d->popupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedPopup()) ); + connect( d->popupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayedPopup()) ); } setPopup( popup ); @@ -99,12 +99,12 @@ bool K3bPushButton::eventFilter( TQObject* o, TQEvent* ev ) // is moved by a small distance. if( popup() ) { if( ev->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); d->mousePressPos = mev->pos(); d->popupTimer->start( TQApplication::startDragTime() ); } else if( ev->type() == TQEvent::MouseMove ) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if( ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { d->popupTimer->stop(); slotDelayedPopup(); diff --git a/libk3b/tools/k3bpushbutton.h b/libk3b/tools/k3bpushbutton.h index 13a8fec..8673b6a 100644 --- a/libk3b/tools/k3bpushbutton.h +++ b/libk3b/tools/k3bpushbutton.h @@ -25,7 +25,7 @@ */ class LIBK3B_EXPORT K3bPushButton : public KPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp index d19f579..164f413 100644 --- a/libk3b/tools/k3bradioaction.cpp +++ b/libk3b/tools/k3bradioaction.cpp @@ -78,12 +78,12 @@ void K3bRadioAction::slotActivated() if( m_alwaysEmit ) emit activated(); - const TQObject *senderObj = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); + const TQObject *senderObj = sender(); - if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) ) + if ( !senderObj || !::tqt_cast<const TDEToolBarButton *>( senderObj ) ) return; - const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); + const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( senderObj ) )->on( true ); return; } diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h index 1932efb..f554c0e 100644 --- a/libk3b/tools/k3bradioaction.h +++ b/libk3b/tools/k3bradioaction.h @@ -28,7 +28,7 @@ */ class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: @@ -47,8 +47,8 @@ class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The TQ_SLOT's parent. + * @param slot The TQ_SLOT to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -79,8 +79,8 @@ class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction * @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 TQT_SLOT to invoke to execute this action. + * @param receiver The TQ_SLOT's parent. + * @param slot The TQ_SLOT to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -91,8 +91,8 @@ class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction * @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 TQT_SLOT to invoke to execute this action. + * @param receiver The TQ_SLOT's parent. + * @param slot The TQ_SLOT to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index c015763..c72e26f 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -30,7 +30,7 @@ * TQLabel */ class LIBK3B_EXPORT K3bRichTextLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bsignalwaiter.cpp b/libk3b/tools/k3bsignalwaiter.cpp index 50284c4..359ddcf 100644 --- a/libk3b/tools/k3bsignalwaiter.cpp +++ b/libk3b/tools/k3bsignalwaiter.cpp @@ -36,7 +36,7 @@ void K3bSignalWaiter::waitForSignal( TQObject* o, const char* signal ) { K3bSignalWaiter w; connect( o, signal, - &w, TQT_SLOT(slotSignal()) ); + &w, TQ_SLOT(slotSignal()) ); TQApplication::eventLoop()->enterLoop(); } @@ -47,7 +47,7 @@ void K3bSignalWaiter::waitForJob( K3bJob* job ) if( !job->active() ) return; - waitForSignal( job, TQT_SIGNAL(finished(bool)) ); + waitForSignal( job, TQ_SIGNAL(finished(bool)) ); } diff --git a/libk3b/tools/k3bsignalwaiter.h b/libk3b/tools/k3bsignalwaiter.h index e81b0de..29e605a 100644 --- a/libk3b/tools/k3bsignalwaiter.h +++ b/libk3b/tools/k3bsignalwaiter.h @@ -24,7 +24,7 @@ class K3bJob; class K3bSignalWaiter : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bthreadwidget.h b/libk3b/tools/k3bthreadwidget.h index 89fefda..5ac5c3e 100644 --- a/libk3b/tools/k3bthreadwidget.h +++ b/libk3b/tools/k3bthreadwidget.h @@ -34,7 +34,7 @@ namespace K3bDevice { */ class K3bThreadWidget : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bthroughputestimator.h b/libk3b/tools/k3bthroughputestimator.h index c143b2f..0b43d44 100644 --- a/libk3b/tools/k3bthroughputestimator.h +++ b/libk3b/tools/k3bthroughputestimator.h @@ -27,7 +27,7 @@ */ class K3bThroughputEstimator : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h index d19d82d..811d081 100644 --- a/libk3b/tools/k3btitlelabel.h +++ b/libk3b/tools/k3btitlelabel.h @@ -25,7 +25,7 @@ class TQResizeEvent; class LIBK3B_EXPORT K3bTitleLabel : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index 8b00f51..a9467f2 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -38,7 +38,7 @@ */ class K3bToolBoxSeparator : public TQWidget { - // Q_OBJECT + // TQ_OBJECT public: @@ -71,7 +71,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), + style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), colorGroup(), flags ); } @@ -101,22 +101,22 @@ K3bToolBoxButton::K3bToolBoxButton( TDEAction* action, TQWidget* parent ) // if( ta->isChecked() ) // toggle(); -// connect( ta, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggle()) ); -// connect( this, TQT_SIGNAL(toggled(bool)), ta, TQT_SLOT(setChecked(bool)) ); +// connect( ta, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggle()) ); +// connect( this, TQ_SIGNAL(toggled(bool)), ta, TQ_SLOT(setChecked(bool)) ); // } // else if( TDEActionMenu* am = dynamic_cast<TDEActionMenu*>( action ) ) { m_popupMenu = am->popupMenu(); - connect( this, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotPopupActivated()) ); + connect( this, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotPopupActivated()) ); setPopup( m_popupMenu ); } else { - connect( this, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); + connect( this, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); } - connect( action, TQT_SIGNAL(enabled(bool)), this, TQT_SLOT(setEnabled(bool)) ); + connect( action, TQ_SIGNAL(enabled(bool)), this, TQ_SLOT(setEnabled(bool)) ); } @@ -141,7 +141,7 @@ K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon, TQToolTip::add( this, tooltip ); if( receiver && slot ) - connect( this, TQT_SIGNAL(clicked()), receiver, slot ); + connect( this, TQ_SIGNAL(clicked()), receiver, slot ); } diff --git a/libk3b/tools/k3btoolbox.h b/libk3b/tools/k3btoolbox.h index 45621c1..bab55a8 100644 --- a/libk3b/tools/k3btoolbox.h +++ b/libk3b/tools/k3btoolbox.h @@ -35,7 +35,7 @@ class TQResizeEvent; */ class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton { - Q_OBJECT + TQ_OBJECT public: @@ -58,7 +58,7 @@ class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton class LIBK3B_EXPORT K3bToolBox : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index cdc26b9..3544ad6 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -68,7 +68,7 @@ void K3bToolButton::drawButton( TQPainter* p ) if( isEnabled() ) arrowFlags |= TQStyle::Style_Enabled; - style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, + style().drawPrimitive(TQStyle::PE_ArrowDown, p, TQRect(width()-7, height()-7, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } @@ -83,7 +83,7 @@ bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev ) // is moved by a small distance. if( TQToolButton::popup() ) { if( ev->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if( d->instantMenu ) { setDown(true); @@ -95,7 +95,7 @@ bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev ) } } else if( ev->type() == TQEvent::MouseMove ) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if( !d->instantMenu && ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { openPopup(); diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h index 670951f..d6d6b57 100644 --- a/libk3b/tools/kcutlabel.h +++ b/libk3b/tools/kcutlabel.h @@ -26,7 +26,7 @@ */ class LIBK3B_EXPORT KCutLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/libisofs/Makefile.am b/libk3b/tools/libisofs/Makefile.am deleted file mode 100644 index cd5594c..0000000 --- a/libk3b/tools/libisofs/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -AM_CPPFLAGS= $(all_includes) - -noinst_LTLIBRARIES = libisofs.la - -libisofs_la_SOURCES = isofs.cpp |