diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 19:21:21 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 19:21:21 +0000 |
| commit | d8cc8bdfa7fa624a526d5aa1626974e1444cb799 (patch) | |
| tree | f295f1c545b319963d5357af79fe08991d8141d9 | |
| parent | 2a39a080579fb52a2599c02b2939795385b89093 (diff) | |
| download | k3b-d8cc8bdfa7fa624a526d5aa1626974e1444cb799.tar.gz k3b-d8cc8bdfa7fa624a526d5aa1626974e1444cb799.zip | |
TQt4 port k3b
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
695 files changed, 15363 insertions, 15065 deletions
diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui index 05af5fd..002b43f 100644 --- a/k3bsetup/base_k3bsetup2.ui +++ b/k3bsetup/base_k3bsetup2.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>base_K3bSetup2</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,15 +19,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -38,15 +38,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkUseBurningGroup</cstring> </property> @@ -58,7 +58,7 @@ <p>Otherwise all users on the system have access to the devices and to all K3b functionality.</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editBurningGroup</cstring> </property> @@ -71,9 +71,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -89,14 +89,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>10</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -104,7 +104,7 @@ <string>Users allowed to burn (separated by space):</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editUsers</cstring> </property> @@ -116,7 +116,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -127,7 +127,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -184,9 +184,9 @@ <cstring>m_viewDevices</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -202,14 +202,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonAddDevice</cstring> </property> @@ -221,7 +221,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -232,11 +232,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -247,7 +247,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -317,7 +317,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -339,7 +339,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -370,7 +370,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistview.h</includehint> diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp index 37c23a1..95cdf9e 100644 --- a/k3bsetup/k3bsetup2.cpp +++ b/k3bsetup/k3bsetup2.cpp @@ -15,16 +15,16 @@ #include <config.h> -#include <qlayout.h> -#include <qmap.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qscrollview.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqmap.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqscrollview.h> +#include <tqtimer.h> #include <klocale.h> #include <kglobal.h> @@ -95,19 +95,19 @@ public: bool changesNeeded; - QMap<QCheckListItem*, QString> listDeviceMap; - QMap<QString, QCheckListItem*> deviceListMap; + TQMap<TQCheckListItem*, TQString> listDeviceMap; + TQMap<TQString, TQCheckListItem*> deviceListMap; - QMap<QCheckListItem*, K3bExternalBin*> listBinMap; - QMap<K3bExternalBin*, QCheckListItem*> binListMap; + TQMap<TQCheckListItem*, K3bExternalBin*> listBinMap; + TQMap<K3bExternalBin*, TQCheckListItem*> binListMap; KConfig* config; }; -K3bSetup2::K3bSetup2( QWidget *parent, const char *, const QStringList& ) - : KCModule( parent, "k3bsetup" ) +K3bSetup2::K3bSetup2( TQWidget *tqparent, const char *, const TQStringList& ) + : KCModule( tqparent, "k3bsetup" ) { d = new Private(); d->config = new KConfig( "k3bsetup2rc" ); @@ -120,7 +120,7 @@ K3bSetup2::K3bSetup2( QWidget *parent, const char *, const QStringList& ) setButtons( KCModule::Apply|KCModule::Cancel|KCModule::Ok|KCModule::Default ); - QHBoxLayout* box = new QHBoxLayout( this ); + TQHBoxLayout* box = new TQHBoxLayout( this ); box->setAutoAdd(true); box->setMargin(0); box->setSpacing( KDialog::spacingHint() ); @@ -144,14 +144,14 @@ K3bSetup2::K3bSetup2( QWidget *parent, const char *, const QStringList& ) w->textLabel2->hide(); - connect( w->m_checkUseBurningGroup, SIGNAL(toggled(bool)), - this, SLOT(updateViews()) ); - connect( w->m_editBurningGroup, SIGNAL(textChanged(const QString&)), - this, SLOT(updateViews()) ); - connect( w->m_editSearchPath, SIGNAL(changed()), - this, SLOT(slotSearchPrograms()) ); - connect( w->m_buttonAddDevice, SIGNAL(clicked()), - this, SLOT(slotAddDevice()) ); + connect( w->m_checkUseBurningGroup, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(updateViews()) ); + connect( w->m_editBurningGroup, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(updateViews()) ); + connect( w->m_editSearchPath, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotSearchPrograms()) ); + connect( w->m_buttonAddDevice, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddDevice()) ); d->externalBinManager = new K3bExternalBinManager( this ); @@ -171,7 +171,7 @@ K3bSetup2::K3bSetup2( QWidget *parent, const char *, const QStringList& ) // This is a hack to work around a kcm bug which makes the faulty assumption that // every module starts without anything to apply // - QTimer::singleShot( 0, this, SLOT(updateViews()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(updateViews()) ); if( getuid() != 0 || !d->config->checkConfigFilesWritable( true ) ) makeReadOnly(); @@ -200,33 +200,33 @@ void K3bSetup2::updateViews() void K3bSetup2::updatePrograms() { // first save which were checked - QMap<K3bExternalBin*, bool> checkMap; - QListViewItemIterator listIt( w->m_viewPrograms ); + TQMap<K3bExternalBin*, bool> checkMap; + TQListViewItemIterator listIt( w->m_viewPrograms ); for( ; listIt.current(); ++listIt ) - checkMap.insert( d->listBinMap[(QCheckListItem*)*listIt], ((QCheckListItem*)*listIt)->isOn() ); + checkMap.insert( d->listBinMap[(TQCheckListItem*)*listIt], ((TQCheckListItem*)*listIt)->isOn() ); w->m_viewPrograms->clear(); d->binListMap.clear(); d->listBinMap.clear(); // load programs - const QMap<QString, K3bExternalProgram*>& map = d->externalBinManager->programs(); - for( QMap<QString, K3bExternalProgram*>::const_iterator it = map.begin(); it != map.end(); ++it ) { + const TQMap<TQString, K3bExternalProgram*>& map = d->externalBinManager->programs(); + for( TQMap<TQString, K3bExternalProgram*>::const_iterator it = map.begin(); it != map.end(); ++it ) { K3bExternalProgram* p = it.data(); - QPtrListIterator<K3bExternalBin> binIt( p->bins() ); + TQPtrListIterator<K3bExternalBin> binIt( p->bins() ); for( ; binIt.current(); ++binIt ) { K3bExternalBin* b = *binIt; - QFileInfo fi( b->path ); - // we need the uid bit which is not supported by QFileInfo + TQFileInfo fi( b->path ); + // we need the uid bit which is not supported by TQFileInfo struct stat s; - if( ::stat( QFile::encodeName(b->path), &s ) ) { + if( ::stat( TQFile::encodeName(b->path), &s ) ) { kdDebug() << "(K3bSetup2) unable to stat " << b->path << endl; } else { // create a checkviewitem - QCheckListItem* bi = new QCheckListItem( w->m_viewPrograms, b->name(), QCheckListItem::CheckBox ); + TQCheckListItem* bi = new TQCheckListItem( w->m_viewPrograms, b->name(), TQCheckListItem::CheckBox ); bi->setText( 1, b->version ); bi->setText( 2, b->path ); @@ -234,11 +234,11 @@ void K3bSetup2::updatePrograms() d->binListMap.insert( b, bi ); // check the item on first insertion or if it was checked before - bi->setOn( checkMap.contains(b) ? checkMap[b] : true ); + bi->setOn( checkMap.tqcontains(b) ? checkMap[b] : true ); int perm = s.st_mode & 0007777; - QString wantedGroup("root"); + TQString wantedGroup("root"); if( w->m_checkUseBurningGroup->isChecked() ) wantedGroup = burningGroup(); @@ -256,11 +256,11 @@ void K3bSetup2::updatePrograms() wantedPerm = 0000755; } - bi->setText( 3, QString::number( perm, 8 ).rightJustify( 4, '0' ) + " " + fi.owner() + "." + fi.group() ); + bi->setText( 3, TQString::number( perm, 8 ).rightJustify( 4, '0' ) + " " + fi.owner() + "." + fi.group() ); if( perm != wantedPerm || fi.owner() != "root" || fi.group() != wantedGroup ) { - bi->setText( 4, QString("%1 root.%2").arg(wantedPerm,0,8).arg(wantedGroup) ); + bi->setText( 4, TQString("%1 root.%2").tqarg(wantedPerm,0,8).tqarg(wantedGroup) ); if( bi->isOn() ) d->changesNeeded = true; } @@ -275,45 +275,45 @@ void K3bSetup2::updatePrograms() void K3bSetup2::updateDevices() { // first save which were checked - QMap<QString, bool> checkMap; - QListViewItemIterator listIt( w->m_viewDevices ); + TQMap<TQString, bool> checkMap; + TQListViewItemIterator listIt( w->m_viewDevices ); for( ; listIt.current(); ++listIt ) - checkMap.insert( d->listDeviceMap[(QCheckListItem*)*listIt], ((QCheckListItem*)*listIt)->isOn() ); + checkMap.insert( d->listDeviceMap[(TQCheckListItem*)*listIt], ((TQCheckListItem*)*listIt)->isOn() ); w->m_viewDevices->clear(); d->listDeviceMap.clear(); d->deviceListMap.clear(); - QPtrListIterator<K3bDevice::Device> it( d->deviceManager->allDevices() ); + TQPtrListIterator<K3bDevice::Device> it( d->deviceManager->allDevices() ); for( ; it.current(); ++it ) { K3bDevice::Device* device = *it; // check the item on first insertion or if it was checked before - QCheckListItem* item = createDeviceItem( device->blockDeviceName() ); - item->setOn( checkMap.contains(device->blockDeviceName()) ? checkMap[device->blockDeviceName()] : true ); + TQCheckListItem* item = createDeviceItem( device->blockDeviceName() ); + item->setOn( checkMap.tqcontains(device->blockDeviceName()) ? checkMap[device->blockDeviceName()] : true ); item->setText( 0, device->vendor() + " " + device->description() ); if( !device->genericDevice().isEmpty() ) { - QCheckListItem* item = createDeviceItem( device->genericDevice() ); - item->setOn( checkMap.contains(device->genericDevice()) ? checkMap[device->genericDevice()] : true ); + TQCheckListItem* item = createDeviceItem( device->genericDevice() ); + item->setOn( checkMap.tqcontains(device->genericDevice()) ? checkMap[device->genericDevice()] : true ); item->setText( 0, device->vendor() + " " + device->description() + " (" + i18n("Generic SCSI Device") + ")" ); } } } -QCheckListItem* K3bSetup2::createDeviceItem( const QString& deviceNode ) +TQCheckListItem* K3bSetup2::createDeviceItem( const TQString& deviceNode ) { - QFileInfo fi( deviceNode ); + TQFileInfo fi( deviceNode ); struct stat s; - if( ::stat( QFile::encodeName(deviceNode), &s ) ) { + if( ::stat( TQFile::encodeName(deviceNode), &s ) ) { kdDebug() << "(K3bSetup2) unable to stat " << deviceNode << endl; return 0; } else { // create a checkviewitem - QCheckListItem* bi = new QCheckListItem( w->m_viewDevices, + TQCheckListItem* bi = new TQCheckListItem( w->m_viewDevices, deviceNode, - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); d->listDeviceMap.insert( bi, deviceNode ); d->deviceListMap.insert( deviceNode, bi ); @@ -322,7 +322,7 @@ QCheckListItem* K3bSetup2::createDeviceItem( const QString& deviceNode ) int perm = s.st_mode & 0000777; - bi->setText( 2, QString::number( perm, 8 ).rightJustify( 3, '0' ) + " " + fi.owner() + "." + fi.group() ); + bi->setText( 2, TQString::number( perm, 8 ).rightJustify( 3, '0' ) + " " + fi.owner() + "." + fi.group() ); if( w->m_checkUseBurningGroup->isChecked() ) { // we ignore the device's owner here if( perm != 0000660 || @@ -383,7 +383,7 @@ void K3bSetup2::defaults() // This is a hack to work around a kcm bug which makes the faulty assumption that // every module defaults to a state where nothing is to be applied // - QTimer::singleShot( 0, this, SLOT(updateViews()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(updateViews()) ); } @@ -405,30 +405,30 @@ void K3bSetup2::save() // TODO: create the group if it's not there g = getgrnam( burningGroup().local8Bit() ); if( !g ) { - KMessageBox::error( this, i18n("There is no group %1.").arg(burningGroup()) ); + KMessageBox::error( this, i18n("There is no group %1.").tqarg(burningGroup()) ); return; } } // save the device permissions - QListViewItemIterator listIt( w->m_viewDevices ); + TQListViewItemIterator listIt( w->m_viewDevices ); for( ; listIt.current(); ++listIt ) { - QCheckListItem* checkItem = (QCheckListItem*)listIt.current(); + TQCheckListItem* checkItem = (TQCheckListItem*)listIt.current(); if( checkItem->isOn() ) { - QString dev = d->listDeviceMap[checkItem]; + TQString dev = d->listDeviceMap[checkItem]; if( w->m_checkUseBurningGroup->isChecked() ) { - if( ::chmod( QFile::encodeName(dev), S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP ) ) + if( ::chmod( TQFile::encodeName(dev), S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP ) ) success = false; - if( ::chown( QFile::encodeName(dev), (gid_t)-1, g->gr_gid ) ) + if( ::chown( TQFile::encodeName(dev), (gid_t)-1, g->gr_gid ) ) success = false; } else { - if( ::chmod( QFile::encodeName(dev), S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH ) ) + if( ::chmod( TQFile::encodeName(dev), S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH ) ) success = false; } } @@ -436,17 +436,17 @@ void K3bSetup2::save() // save the program permissions - listIt = QListViewItemIterator( w->m_viewPrograms ); + listIt = TQListViewItemIterator( w->m_viewPrograms ); for( ; listIt.current(); ++listIt ) { - QCheckListItem* checkItem = (QCheckListItem*)listIt.current(); + TQCheckListItem* checkItem = (TQCheckListItem*)listIt.current(); if( checkItem->isOn() ) { K3bExternalBin* bin = d->listBinMap[checkItem]; if( w->m_checkUseBurningGroup->isChecked() ) { - if( ::chown( QFile::encodeName(bin->path), (gid_t)0, g->gr_gid ) ) + if( ::chown( TQFile::encodeName(bin->path), (gid_t)0, g->gr_gid ) ) success = false; int perm = 0; @@ -455,11 +455,11 @@ void K3bSetup2::save() else perm = S_IRWXU|S_IXGRP|S_IRGRP; - if( ::chmod( QFile::encodeName(bin->path), perm ) ) + if( ::chmod( TQFile::encodeName(bin->path), perm ) ) success = false; } else { - if( ::chown( QFile::encodeName(bin->path), 0, 0 ) ) + if( ::chown( TQFile::encodeName(bin->path), 0, 0 ) ) success = false; int perm = 0; @@ -468,7 +468,7 @@ void K3bSetup2::save() else perm = S_IRWXU|S_IXGRP|S_IRGRP|S_IXOTH|S_IROTH; - if( ::chmod( QFile::encodeName(bin->path), perm ) ) + if( ::chmod( TQFile::encodeName(bin->path), perm ) ) success = false; } } @@ -490,7 +490,7 @@ void K3bSetup2::save() } -QString K3bSetup2::quickHelp() const +TQString K3bSetup2::quickHelp() const { return i18n("<h2>K3bSetup 2</h2>" "<p>This simple setup assistant is able to set the permissions needed by K3b in order to " @@ -504,10 +504,10 @@ QString K3bSetup2::quickHelp() const } -QString K3bSetup2::burningGroup() const +TQString K3bSetup2::burningGroup() const { - QString g = w->m_editBurningGroup->text(); - return g.isEmpty() ? QString("burning") : g; + TQString g = w->m_editBurningGroup->text(); + return g.isEmpty() ? TQString("burning") : g; } @@ -524,7 +524,7 @@ void K3bSetup2::slotSearchPrograms() void K3bSetup2::slotAddDevice() { bool ok; - QString newDevicename = KInputDialog::getText( i18n("Location of New Drive"), + TQString newDevicename = KInputDialog::getText( i18n("Location of New Drive"), i18n("Please enter the device name where K3b should search\n" "for a new drive (example: /dev/mebecdrom):"), "/dev/", &ok, this ); @@ -536,7 +536,7 @@ void K3bSetup2::slotAddDevice() emit changed( d->changesNeeded ); } else - KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename), + KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename), i18n("Error"), false ); } } @@ -553,7 +553,7 @@ void K3bSetup2::makeReadOnly() } -typedef KGenericFactory<K3bSetup2, QWidget> K3bSetup2Factory; +typedef KGenericFactory<K3bSetup2, TQWidget> K3bSetup2Factory; K_EXPORT_COMPONENT_FACTORY( kcm_k3bsetup2, K3bSetup2Factory("k3bsetup") ) diff --git a/k3bsetup/k3bsetup2.h b/k3bsetup/k3bsetup2.h index ea86664..6576640 100644 --- a/k3bsetup/k3bsetup2.h +++ b/k3bsetup/k3bsetup2.h @@ -22,18 +22,19 @@ class base_K3bSetup2; -class QCheckListItem; +class TQCheckListItem; class K3bSetup2: public KCModule { Q_OBJECT + TQ_OBJECT public: - K3bSetup2( QWidget* parent = 0, const char* name = 0, const QStringList& args = QStringList() ); + K3bSetup2( TQWidget* tqparent = 0, const char* name = 0, const TQStringList& args = TQStringList() ); ~K3bSetup2(); - QString quickHelp() const; + TQString quickHelp() const; const KAboutData* aboutData() { return m_aboutData; }; void load(); @@ -50,9 +51,9 @@ class K3bSetup2: public KCModule private: void updatePrograms(); void updateDevices(); - QString burningGroup() const; + TQString burningGroup() const; void makeReadOnly(); - QCheckListItem* createDeviceItem( const QString& deviceNode ); + TQCheckListItem* createDeviceItem( const TQString& deviceNode ); class Private; Private* d; diff --git a/kfile-plugins/k3bproject/Makefile.am b/kfile-plugins/k3bproject/Makefile.am index d229c41..2586e19 100644 --- a/kfile-plugins/k3bproject/Makefile.am +++ b/kfile-plugins/k3bproject/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = kfile_k3bprojectfileplugin.h kde_module_LTLIBRARIES = kfile_k3b.la kfile_k3b_la_SOURCES = kfile_k3bprojectfileplugin.cpp -kfile_k3b_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) kfile_k3b_la_LIBADD = $(LIB_KIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp index b868c94..197d9e5 100644 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp +++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp @@ -24,24 +24,24 @@ #include <kgenericfactory.h> -#include <qtextstream.h> -#include <qdom.h> -#include <qfile.h> +#include <tqtextstream.h> +#include <tqdom.h> +#include <tqfile.h> K_EXPORT_COMPONENT_FACTORY(kfile_k3b, KGenericFactory<K3bProjectFilePlugin>("kfile_k3b")) -K3bProjectFilePlugin::K3bProjectFilePlugin( QObject *parent, const char *name, - const QStringList &args) - : KFilePlugin(parent, name, args) +K3bProjectFilePlugin::K3bProjectFilePlugin( TQObject *tqparent, const char *name, + const TQStringList &args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-k3b" ); KFileMimeTypeInfo::GroupInfo* group = addGroupInfo( info, "General", i18n("General") ); - addItemInfo( group, "documenttype", i18n("Document Type"), QVariant::String ); + addItemInfo( group, "documenttype", i18n("Document Type"), TQVariant::String ); } @@ -54,12 +54,12 @@ bool K3bProjectFilePlugin::readInfo( KFileMetaInfo& info, uint /*what*/) // open the file bool success = false; - QDomDocument xmlDoc; + TQDomDocument xmlDoc; // try opening a store KoStore* store = KoStore::createStore( info.url().path(), KoStore::Read ); if( store && !store->bad() && store->open( "maindata.xml" ) ) { - QIODevice* dev = store->device(); + TQIODevice* dev = store->device(); dev->open( IO_ReadOnly ); if( xmlDoc.setContent( dev ) ) success = true; @@ -93,7 +93,7 @@ bool K3bProjectFilePlugin::readInfo( KFileMetaInfo& info, uint /*what*/) success = false; } - QString stringType; + TQString stringType; switch( type ) { case K3bDoc::AUDIO: stringType = i18n("Audio CD"); diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h index c90b678..a8b2b13 100644 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h +++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h @@ -21,14 +21,15 @@ */ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class K3bProjectFilePlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - K3bProjectFilePlugin( QObject *parent, const char *name, const QStringList& args ); + K3bProjectFilePlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kioslaves/videodvd/videodvd.cpp b/kioslaves/videodvd/videodvd.cpp index b453037..48eac77 100644 --- a/kioslaves/videodvd/videodvd.cpp +++ b/kioslaves/videodvd/videodvd.cpp @@ -15,10 +15,10 @@ #include <config.h> -#include <qcstring.h> -#include <qdatetime.h> -#include <qbitarray.h> -#include <qptrlist.h> +#include <tqcstring.h> +#include <tqdatetime.h> +#include <tqbitarray.h> +#include <tqptrlist.h> #include <kdebug.h> #include <kinstance.h> @@ -67,7 +67,7 @@ extern "C" K3bDevice::DeviceManager* kio_videodvdProtocol::s_deviceManager = 0; int kio_videodvdProtocol::s_instanceCnt = 0; -kio_videodvdProtocol::kio_videodvdProtocol(const QCString &pool_socket, const QCString &app_socket) +kio_videodvdProtocol::kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("kio_videodvd", pool_socket, app_socket) { kdDebug() << "kio_videodvdProtocol::kio_videodvdProtocol()" << endl; @@ -150,16 +150,16 @@ KIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) c // FIXME: remember the iso instance for quicker something and search for the videodvd // in the available devices. -K3bIso9660* kio_videodvdProtocol::openIso( const KURL& url, QString& plainIsoPath ) +K3bIso9660* kio_videodvdProtocol::openIso( const KURL& url, TQString& plainIsoPath ) { // get the volume id from the url - QString volumeId = url.path().section( '/', 1, 1 ); + TQString volumeId = url.path().section( '/', 1, 1 ); kdDebug() << "(kio_videodvdProtocol) searching for Video dvd: " << volumeId << endl; // now search the devices for this volume id // FIXME: use the cache created in listVideoDVDs - for( QPtrListIterator<K3bDevice::Device> it( s_deviceManager->dvdReader() ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( s_deviceManager->dvdReader() ); *it; ++it ) { K3bDevice::Device* dev = *it; K3bDevice::DiskInfo di = dev->diskInfo(); @@ -187,7 +187,7 @@ void kio_videodvdProtocol::get(const KURL& url ) { kdDebug() << "kio_videodvd::get(const KURL& url)" << endl ; - QString isoPath; + TQString isoPath; if( K3bIso9660* iso = openIso( url, isoPath ) ) { const K3bIso9660Entry* e = iso->firstIsoDirEntry()->entry( isoPath ); @@ -195,7 +195,7 @@ void kio_videodvdProtocol::get(const KURL& url ) { const K3bIso9660File* file = static_cast<const K3bIso9660File*>( e ); totalSize( file->size() ); - QByteArray buffer( 10*2048 ); + TQByteArray buffer( 10*2048 ); int read = 0; int cnt = 0; KIO::filesize_t totalRead = 0; @@ -214,7 +214,7 @@ void kio_videodvdProtocol::get(const KURL& url ) delete iso; - data(QByteArray()); // empty array means we're done sending the data + data(TQByteArray()); // empty array means we're done sending the data if( read == 0 ) finished(); @@ -233,7 +233,7 @@ void kio_videodvdProtocol::listDir( const KURL& url ) listVideoDVDs(); } else { - QString isoPath; + TQString isoPath; K3bIso9660* iso = openIso( url, isoPath ); if( iso ) { const K3bIso9660Directory* mainDir = iso->firstIsoDirEntry(); @@ -241,11 +241,11 @@ void kio_videodvdProtocol::listDir( const KURL& url ) if( e ) { if( e->isDirectory() ) { const K3bIso9660Directory* dir = static_cast<const K3bIso9660Directory*>(e); - QStringList el = dir->entries(); + TQStringList el = dir->entries(); el.remove( "." ); el.remove( ".." ); UDSEntryList udsl; - for( QStringList::const_iterator it = el.begin(); it != el.end(); ++it ) + for( TQStringList::const_iterator it = el.begin(); it != el.end(); ++it ) udsl.append( createUDSEntry( dir->entry( *it ) ) ); listEntries( udsl ); finished(); @@ -269,7 +269,7 @@ void kio_videodvdProtocol::listVideoDVDs() { int cnt = 0; - for( QPtrListIterator<K3bDevice::Device> it( s_deviceManager->dvdReader() ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( s_deviceManager->dvdReader() ); *it; ++it ) { K3bDevice::Device* dev = *it; K3bDevice::DiskInfo di = dev->diskInfo(); @@ -346,7 +346,7 @@ void kio_videodvdProtocol::stat( const KURL& url ) finished(); } else { - QString isoPath; + TQString isoPath; K3bIso9660* iso = openIso( url, isoPath ); if( iso ) { const K3bIso9660Entry* e = iso->firstIsoDirEntry()->entry( isoPath ); @@ -371,7 +371,7 @@ void kio_videodvdProtocol::mimetype( const KURL& url ) return; } - QString isoPath; + TQString isoPath; K3bIso9660* iso = openIso( url, isoPath ); if( iso ) { @@ -388,13 +388,13 @@ void kio_videodvdProtocol::mimetype( const KURL& url ) { // send some data const K3bIso9660File* file = static_cast<const K3bIso9660File*>( e ); - QByteArray buffer( 10*2048 ); + TQByteArray buffer( 10*2048 ); int read = file->read( 0, buffer.data(), buffer.size() ); if( read > 0 ) { buffer.resize( read ); data(buffer); - data(QByteArray()); + data(TQByteArray()); finished(); // FIXME: do we need to emit finished() after emitting the end of data()? } diff --git a/kioslaves/videodvd/videodvd.h b/kioslaves/videodvd/videodvd.h index e27e54f..8885c9a 100644 --- a/kioslaves/videodvd/videodvd.h +++ b/kioslaves/videodvd/videodvd.h @@ -17,14 +17,14 @@ #ifndef _videodvd_H_ #define _videodvd_H_ -#include <qstring.h> -#include <qcstring.h> +#include <tqstring.h> +#include <tqcstring.h> #include <kurl.h> #include <kio/global.h> #include <kio/slavebase.h> -class QCString; +class TQCString; class K3bIso9660Entry; class K3bIso9660; namespace K3bDevice @@ -35,7 +35,7 @@ namespace K3bDevice class kio_videodvdProtocol : public KIO::SlaveBase { public: - kio_videodvdProtocol(const QCString &pool_socket, const QCString &app_socket); + kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket); ~kio_videodvdProtocol(); void mimetype( const KURL& url ); @@ -44,7 +44,7 @@ public: void listDir( const KURL& url ); private: - K3bIso9660* openIso( const KURL&, QString& plainIsoPath ); + K3bIso9660* openIso( const KURL&, TQString& plainIsoPath ); KIO::UDSEntry createUDSEntry( const K3bIso9660Entry* e ) const; void listVideoDVDs(); diff --git a/libk3b/Makefile.am b/libk3b/Makefile.am index 4c74f7d..84efe35 100644 --- a/libk3b/Makefile.am +++ b/libk3b/Makefile.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS = $(all_includes) + if include_videodvdrip VIDEODVDDIR = videodvd VIDEODVDLIB = videodvd/libvideodvd.la diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index a0e4fe1..d0131e8 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -15,10 +15,10 @@ -#include <qstring.h> -#include <qvaluelist.h> -#include <qstringlist.h> -#include <qtimer.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> +#include <tqtimer.h> #include <klocale.h> #include <kconfig.h> @@ -36,8 +36,8 @@ #include "k3bcddbmultientriesdialog.h" -K3bCddb::K3bCddb( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bCddb::K3bCddb( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { m_httpQuery = 0; m_cddbpQuery = 0; @@ -61,8 +61,8 @@ void K3bCddb::readConfig( KConfig* c ) m_bLocalCddbQuery = c->readBoolEntry( "use local cddb query", false ); // old config <= 0.7.3 - QStringList cddbpServer = c->readListEntry( "cddbp server" ); - QStringList httpServer = c->readListEntry( "http server" ); + TQStringList cddbpServer = c->readListEntry( "cddbp server" ); + TQStringList httpServer = c->readListEntry( "http server" ); // new config m_cddbServer = c->readListEntry( "cddb server" ); @@ -77,12 +77,12 @@ void K3bCddb::readConfig( KConfig* c ) // old config <= 0.7.3 if( !httpServer.isEmpty() ) { - for( QStringList::iterator it = httpServer.begin(); it != httpServer.end(); ++it ) { + for( TQStringList::iterator it = httpServer.begin(); it != httpServer.end(); ++it ) { m_cddbServer.append( "Http " + *it ); } } if( !cddbpServer.isEmpty() ) { - for( QStringList::iterator it = cddbpServer.begin(); it != cddbpServer.end(); ++it ) { + for( TQStringList::iterator it = cddbpServer.begin(); it != cddbpServer.end(); ++it ) { m_cddbServer.append( "Cddbp " + *it ); } } @@ -98,14 +98,14 @@ void K3bCddb::query( const K3bDevice::Toc& toc ) if( m_bLocalCddbQuery ) { m_iCurrentQueriedLocalDir = 0; - QTimer::singleShot( 0, this, SLOT(localQuery()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(localQuery()) ); } else if( m_bRemoteCddbQuery ) { m_iCurrentQueriedServer = 0; - QTimer::singleShot( 0, this, SLOT(remoteQuery()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(remoteQuery()) ); } else { - QTimer::singleShot( 0, this, SLOT(slotNoEntry()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotNoEntry()) ); } } @@ -141,7 +141,7 @@ void K3bCddb::slotQueryFinished( K3bCddbQuery* query ) m_lastResult = m_lastUsedQuery->result(); // make sure the result has the requested discid since otherwise local saving does not make much sense - m_lastResult.discid = QString::number( m_toc.discId(), 16 ).rightJustify( 8, '0' ); + m_lastResult.discid = TQString::number( m_toc.discId(), 16 ).rightJustify( 8, '0' ); emit queryFinished( K3bCddbQuery::SUCCESS ); } @@ -169,37 +169,37 @@ void K3bCddb::slotQueryFinished( K3bCddbQuery* query ) } -K3bCddbQuery* K3bCddb::getQuery( const QString& s ) +K3bCddbQuery* K3bCddb::getQuery( const TQString& s ) { - QStringList buf = QStringList::split( ":", s.mid( s.find(" ")+1 ) ); - QString server = buf[0]; + TQStringList buf = TQStringList::split( ":", s.mid( s.tqfind(" ")+1 ) ); + TQString server = buf[0]; int port = buf[1].toInt(); if( s.startsWith("Http") ) { if( !m_httpQuery ) { m_httpQuery = new K3bCddbHttpQuery( this ); - connect( m_httpQuery, SIGNAL(infoMessage(const QString&)), - this, SIGNAL(infoMessage(const QString&)) ); - connect( m_httpQuery, SIGNAL(queryFinished(K3bCddbQuery*)), - this, SLOT(slotQueryFinished(K3bCddbQuery*)) ); - connect( m_httpQuery, SIGNAL(inexactMatches(K3bCddbQuery*)), - this, SLOT(slotMultibleMatches(K3bCddbQuery*)) ); + connect( m_httpQuery, TQT_SIGNAL(infoMessage(const TQString&)), + this, TQT_SIGNAL(infoMessage(const TQString&)) ); + connect( m_httpQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)), + this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) ); + connect( m_httpQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)), + this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); } m_httpQuery->setServer( server, port ); - m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : QString::fromLatin1("/~cddb/cddb.cgi") ); + m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::tqfromLatin1("/~cddb/cddb.cgi") ); return m_httpQuery; } else { if( !m_cddbpQuery ) { m_cddbpQuery = new K3bCddbpQuery( this ); - connect( m_cddbpQuery, SIGNAL(infoMessage(const QString&)), - this, SIGNAL(infoMessage(const QString&)) ); - connect( m_cddbpQuery, SIGNAL(queryFinished(K3bCddbQuery*)), - this, SLOT(slotQueryFinished(K3bCddbQuery*)) ); - connect( m_cddbpQuery, SIGNAL(inexactMatches(K3bCddbQuery*)), - this, SLOT(slotMultibleMatches(K3bCddbQuery*)) ); + connect( m_cddbpQuery, TQT_SIGNAL(infoMessage(const TQString&)), + this, TQT_SIGNAL(infoMessage(const TQString&)) ); + connect( m_cddbpQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)), + this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) ); + connect( m_cddbpQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)), + this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); } m_cddbpQuery->setServer( server, port ); @@ -213,12 +213,12 @@ void K3bCddb::localQuery() { if( !m_localQuery ) { m_localQuery = new K3bCddbLocalQuery( this ); - connect( m_localQuery, SIGNAL(infoMessage(const QString&)), - this, SIGNAL(infoMessage(const QString&)) ); - connect( m_localQuery, SIGNAL(queryFinished(K3bCddbQuery*)), - this, SLOT(slotQueryFinished(K3bCddbQuery*)) ); - connect( m_localQuery, SIGNAL(inexactMatches(K3bCddbQuery*)), - this, SLOT(slotMultibleMatches(K3bCddbQuery*)) ); + connect( m_localQuery, TQT_SIGNAL(infoMessage(const TQString&)), + this, TQT_SIGNAL(infoMessage(const TQString&)) ); + connect( m_localQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)), + this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) ); + connect( m_localQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)), + this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); } m_localQuery->setCddbDir( m_localCddbDirs[m_iCurrentQueriedLocalDir] ); @@ -227,7 +227,7 @@ void K3bCddb::localQuery() } -QString K3bCddb::errorString() const +TQString K3bCddb::errorString() const { if( !m_lastUsedQuery ) return "no query"; @@ -241,7 +241,7 @@ QString K3bCddb::errorString() const return i18n("Error while connecting to host."); case K3bCddbQuery::WORKING: return i18n("Working..."); - case K3bCddbQuery::QUERY_ERROR: + case K3bCddbQuery::TQUERY_ERROR: case K3bCddbQuery::READ_ERROR: case K3bCddbQuery::FAILURE: default: @@ -261,8 +261,8 @@ void K3bCddb::saveEntry( const K3bCddbResultEntry& entry ) { if( !m_localSubmit ) { m_localSubmit = new K3bCddbLocalSubmit( this ); - connect( m_localSubmit, SIGNAL(submitFinished(K3bCddbSubmit*)), - this, SLOT(slotSubmitFinished(K3bCddbSubmit*)) ); + connect( m_localSubmit, TQT_SIGNAL(submitFinished(K3bCddbSubmit*)), + this, TQT_SLOT(slotSubmitFinished(K3bCddbSubmit*)) ); } m_localSubmit->setCddbDir( m_localCddbDirs[0] ); diff --git a/libk3b/cddb/k3bcddb.h b/libk3b/cddb/k3bcddb.h index 86b67c5..b7e5a47 100644 --- a/libk3b/cddb/k3bcddb.h +++ b/libk3b/cddb/k3bcddb.h @@ -17,9 +17,9 @@ #ifndef K3BCDDB_H #define K3BCDDB_H -#include <qstring.h> -#include <qstringlist.h> -#include <qobject.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqobject.h> #include <k3btoc.h> @@ -35,15 +35,16 @@ class K3bCddbSubmit; class K3bCddbLocalSubmit; -class LIBK3B_EXPORT K3bCddb : public QObject +class LIBK3B_EXPORT K3bCddb : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bCddb( QObject* parent = 0, const char* name = 0 ); + K3bCddb( TQObject* tqparent = 0, const char* name = 0 ); ~K3bCddb(); - QString errorString() const; + TQString errorString() const; /** * Do NOT call this before queryResult has @@ -60,7 +61,7 @@ class LIBK3B_EXPORT K3bCddb : public QObject signals: void queryFinished( int error ); void submitFinished( bool success ); - void infoMessage( const QString& ); + void infoMessage( const TQString& ); private slots: void localQuery(); @@ -71,7 +72,7 @@ class LIBK3B_EXPORT K3bCddb : public QObject void slotNoEntry(); private: - K3bCddbQuery* getQuery( const QString& ); + K3bCddbQuery* getQuery( const TQString& ); K3bCddbHttpQuery* m_httpQuery; K3bCddbpQuery* m_cddbpQuery; @@ -86,13 +87,13 @@ class LIBK3B_EXPORT K3bCddb : public QObject K3bCddbResultEntry m_lastResult; // config - QStringList m_cddbServer; - QString m_proxyServer; + TQStringList m_cddbServer; + TQString m_proxyServer; int m_proxyPort; - QString m_cgiPath; + TQString m_cgiPath; bool m_bUseProxyServer; bool m_bUseKdeSettings; - QStringList m_localCddbDirs; + TQStringList m_localCddbDirs; bool m_bSaveCddbEntriesLocally; bool m_bUseManualCgiPath; bool m_bRemoteCddbQuery; diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index a453c3e..c21460f 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -19,9 +19,9 @@ #include "k3bcddbresult.h" -#include <qstringlist.h> -#include <qregexp.h> -#include <qtextstream.h> +#include <tqstringlist.h> +#include <tqregexp.h> +#include <tqtextstream.h> #include <klocale.h> #include <kdebug.h> @@ -29,8 +29,8 @@ #include <kio/job.h> -K3bCddbHttpQuery::K3bCddbHttpQuery( QObject* parent, const char* name ) - : K3bCddbQuery( parent, name ) +K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* tqparent, const char* name ) + : K3bCddbQuery( tqparent, name ) { m_server = "freedb.org"; m_port = 80; @@ -46,7 +46,7 @@ K3bCddbHttpQuery::~K3bCddbHttpQuery() void K3bCddbHttpQuery::doQuery() { setError( WORKING ); - m_state = QUERY; + m_state = TQUERY; performCommand( queryString() ); } @@ -58,11 +58,11 @@ void K3bCddbHttpQuery::doMatchQuery() m_state = READ; m_parsingBuffer.truncate(0); - performCommand( QString( "cddb read %1 %2").arg( header().category ).arg( header().discid ) ); + performCommand( TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ) ); } -void K3bCddbHttpQuery::performCommand( const QString& cmd ) +void K3bCddbHttpQuery::performCommand( const TQString& cmd ) { KURL url; url.setProtocol( "http" ); @@ -82,23 +82,23 @@ void K3bCddbHttpQuery::performCommand( const QString& cmd ) if( !job ) { setError( CONNECTION_ERROR ); - emit infoMessage( i18n("Could not connect to host %1").arg(m_server) ); + emit infoMessage( i18n("Could not connect to host %1").tqarg(m_server) ); emitQueryFinished(); return; } - connect( job, SIGNAL(data(KIO::Job*, const QByteArray&)), - SLOT(slotData(KIO::Job*, const QByteArray&)) ); - connect( job, SIGNAL(result(KIO::Job*)), - SLOT(slotResult(KIO::Job*)) ); + connect( job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(KIO::Job*, const TQByteArray&)) ); + connect( job, TQT_SIGNAL(result(KIO::Job*)), + TQT_SLOT(slotResult(KIO::Job*)) ); } -void K3bCddbHttpQuery::slotData( KIO::Job*, const QByteArray& data ) +void K3bCddbHttpQuery::slotData( KIO::Job*, const TQByteArray& data ) { if( data.size() ) { - QDataStream stream( m_data, IO_WriteOnly | IO_Append ); + TQDataStream stream( m_data, IO_WriteOnly | IO_Append ); stream.writeRawBytes( data.data(), data.size() ); } } @@ -113,16 +113,16 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job ) return; } - QStringList lines = QStringList::split( "\n", QString::fromUtf8( m_data.data(), m_data.size() ) ); + TQStringList lines = TQStringList::split( "\n", TQString::fromUtf8( m_data.data(), m_data.size() ) ); - for( QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it ) { - QString line = *it; + for( TQStringList::const_iterator it = lines.begin(); it != lines.end(); ++it ) { + TQString line = *it; // kdDebug() << "(K3bCddbHttpQuery) line: " << line << endl; switch( m_state ) { - case QUERY: + case TQUERY: if( getCode( line ) == 200 ) { // parse exact match and send a read command K3bCddbResultHeader header; @@ -137,7 +137,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job ) emit infoMessage( i18n("Found multiple exact matches") ); - m_state = QUERY_DATA; + m_state = TQUERY_DATA; } else if( getCode( line ) == 211 ) { @@ -145,7 +145,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job ) emit infoMessage( i18n("Found inexact matches") ); - m_state = QUERY_DATA; + m_state = TQUERY_DATA; } else if( getCode( line ) == 202 ) { @@ -160,14 +160,14 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job ) else { kdDebug() << "(K3bCddbHttpQuery) Error while querying: " << line << endl; emit infoMessage( i18n("Error while querying") ); - setError(QUERY_ERROR); + setError(TQUERY_ERROR); m_state = FINISHED; emitQueryFinished(); return; } break; - case QUERY_DATA: + case TQUERY_DATA: if( line.startsWith( "." ) ) { // finished query // go on reading @@ -212,7 +212,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job ) kdDebug() << "(K3bCddbHttpQuery query finished." << endl; - QTextStream strStream( m_parsingBuffer, IO_ReadOnly ); + TQTextStream strStream( m_parsingBuffer, IO_ReadOnly ); parseEntry( strStream, result() ); setError(SUCCESS); diff --git a/libk3b/cddb/k3bcddbhttpquery.h b/libk3b/cddb/k3bcddbhttpquery.h index b1e544e..12a275e 100644 --- a/libk3b/cddb/k3bcddbhttpquery.h +++ b/libk3b/cddb/k3bcddbhttpquery.h @@ -14,13 +14,13 @@ */ -#ifndef K3BCDDB_HTTP_QUERY_H -#define K3BCDDB_HTTP_QUERY_H +#ifndef K3BCDDB_HTTP_TQUERY_H +#define K3BCDDB_HTTP_TQUERY_H #include "k3bcddbquery.h" #include "k3bcddbresult.h" -#include <qvaluelist.h> +#include <tqvaluelist.h> namespace KIO { class Job; @@ -29,35 +29,36 @@ namespace KIO { class K3bCddbHttpQuery : public K3bCddbQuery { Q_OBJECT + TQ_OBJECT public: - K3bCddbHttpQuery( QObject* parent = 0, const char* name = 0 ); + K3bCddbHttpQuery( TQObject* tqparent = 0, const char* name = 0 ); ~K3bCddbHttpQuery(); public slots: - void setServer( const QString& s, int port = 80 ) { m_server = s; m_port = port; } - void setCgiPath( const QString& p ) { m_cgiPath = p; } + void setServer( const TQString& s, int port = 80 ) { m_server = s; m_port = port; } + void setCgiPath( const TQString& p ) { m_cgiPath = p; } protected slots: void doQuery(); void doMatchQuery(); void slotResult( KIO::Job* ); - void slotData( KIO::Job*, const QByteArray& data ); + void slotData( KIO::Job*, const TQByteArray& data ); private: - void performCommand( const QString& ); + void performCommand( const TQString& ); - enum State { QUERY, QUERY_DATA, READ, READ_DATA, FINISHED }; + enum State { TQUERY, TQUERY_DATA, READ, READ_DATA, FINISHED }; int m_state; - QString m_server; + TQString m_server; int m_port; - QString m_cgiPath; + TQString m_cgiPath; - QString m_currentlyConnectingServer; + TQString m_currentlyConnectingServer; - QByteArray m_data; - QString m_parsingBuffer; + TQByteArray m_data; + TQString m_parsingBuffer; }; #endif diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp index b3a1264..f70b6d8 100644 --- a/libk3b/cddb/k3bcddblocalquery.cpp +++ b/libk3b/cddb/k3bcddblocalquery.cpp @@ -16,17 +16,17 @@ #include "k3bcddblocalquery.h" -#include <qdir.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kapplication.h> #include <klocale.h> #include <kdebug.h> -K3bCddbLocalQuery::K3bCddbLocalQuery( QObject* parent , const char* name ) - : K3bCddbQuery( parent, name ) +K3bCddbLocalQuery::K3bCddbLocalQuery( TQObject* tqparent , const char* name ) + : K3bCddbQuery( tqparent, name ) { } @@ -38,33 +38,33 @@ K3bCddbLocalQuery::~K3bCddbLocalQuery() void K3bCddbLocalQuery::doQuery() { - emit infoMessage( i18n("Searching entry in %1").arg( m_cddbDir ) ); + emit infoMessage( i18n("Searching entry in %1").tqarg( m_cddbDir ) ); kapp->processEvents(); //BAD! - QString path = preparePath( m_cddbDir ); + TQString path = preparePath( m_cddbDir ); kdDebug() << "(K3bCddbLocalQuery) searching in dir " << path << " for " - << QString::number( toc().discId(), 16 ).rightJustify( 8, '0' ) << endl; + << TQString::number( toc().discId(), 16 ).rightJustify( 8, '0' ) << endl; - for( QStringList::const_iterator it = categories().begin(); + for( TQStringList::const_iterator it = categories().begin(); it != categories().end(); ++it ) { - QString file = path + *it + "/" + QString::number( toc().discId(), 16 ).rightJustify( 8, '0' ); + TQString file = path + *it + "/" + TQString::number( toc().discId(), 16 ).rightJustify( 8, '0' ); - if( QFile::exists( file ) ) { + if( TQFile::exists( file ) ) { // found file - QFile f( file ); + TQFile f( file ); if( !f.open( IO_ReadOnly ) ) { kdDebug() << "(K3bCddbLocalQuery) Could not open file" << endl; } else { - QTextStream t( &f ); + TQTextStream t( &f ); K3bCddbResultEntry entry; parseEntry( t, entry ); K3bCddbResultHeader header; - header.discid = QString::number( toc().discId(), 16 ).rightJustify( 8, '0' ); + header.discid = TQString::number( toc().discId(), 16 ).rightJustify( 8, '0' ); header.category = *it; header.title = entry.cdTitle; header.artist = entry.cdArtist; @@ -94,15 +94,15 @@ void K3bCddbLocalQuery::doQuery() void K3bCddbLocalQuery::doMatchQuery() { - QString path = preparePath( m_cddbDir ) + header().category + "/" + header().discid; + TQString path = preparePath( m_cddbDir ) + header().category + "/" + header().discid; - QFile f( path ); + TQFile f( path ); if( !f.open( IO_ReadOnly ) ) { kdDebug() << "(K3bCddbLocalQuery) Could not open file" << endl; setError( READ_ERROR ); } else { - QTextStream t( &f ); + TQTextStream t( &f ); parseEntry( t, result() ); result().discid = header().discid; @@ -113,13 +113,13 @@ void K3bCddbLocalQuery::doMatchQuery() } -QString K3bCddbLocalQuery::preparePath( const QString& p ) +TQString K3bCddbLocalQuery::preparePath( const TQString& p ) { - QString path = p; + TQString path = p; if( path.startsWith( "~" ) ) - path.replace( 0, 1, QDir::homeDirPath() ); + path.tqreplace( 0, 1, TQDir::homeDirPath() ); else if( !path.startsWith( "/" ) ) - path.prepend( QDir::homeDirPath() ); + path.prepend( TQDir::homeDirPath() ); if( path[path.length()-1] != '/' ) path.append( "/" ); diff --git a/libk3b/cddb/k3bcddblocalquery.h b/libk3b/cddb/k3bcddblocalquery.h index d68d379..f373698 100644 --- a/libk3b/cddb/k3bcddblocalquery.h +++ b/libk3b/cddb/k3bcddblocalquery.h @@ -15,34 +15,35 @@ -#ifndef K3BCDDB_LOCAL_QUERY_H -#define K3BCDDB_LOCAL_QUERY_H +#ifndef K3BCDDB_LOCAL_TQUERY_H +#define K3BCDDB_LOCAL_TQUERY_H #include "k3bcddbquery.h" #include "k3bcddbresult.h" -#include <qstring.h> +#include <tqstring.h> class K3bCddbLocalQuery : public K3bCddbQuery { Q_OBJECT + TQ_OBJECT public: - K3bCddbLocalQuery( QObject* parent = 0, const char* name = 0 ); + K3bCddbLocalQuery( TQObject* tqparent = 0, const char* name = 0 ); ~K3bCddbLocalQuery(); public slots: - void setCddbDir( const QString& dir ) { m_cddbDir = dir; } + void setCddbDir( const TQString& dir ) { m_cddbDir = dir; } protected: void doQuery(); void doMatchQuery(); private: - QString preparePath( const QString& p ); + TQString preparePath( const TQString& p ); - QString m_cddbDir; + TQString m_cddbDir; }; #endif diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp index f2d1e69..ed1fdcb 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.cpp +++ b/libk3b/cddb/k3bcddblocalsubmit.cpp @@ -17,16 +17,16 @@ #include "k3bcddblocalsubmit.h" -#include <qdir.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kdebug.h> #include <klocale.h> -K3bCddbLocalSubmit::K3bCddbLocalSubmit( QObject* parent, const char* name ) - : K3bCddbSubmit( parent, name ) +K3bCddbLocalSubmit::K3bCddbLocalSubmit( TQObject* tqparent, const char* name ) + : K3bCddbSubmit( tqparent, name ) { } @@ -38,29 +38,29 @@ K3bCddbLocalSubmit::~K3bCddbLocalSubmit() void K3bCddbLocalSubmit::doSubmit() { - QString path = m_cddbDir; + TQString path = m_cddbDir; if( path.startsWith( "~" ) ) - path.replace( 0, 1, QDir::homeDirPath() + "/" ); + path.tqreplace( 0, 1, TQDir::homeDirPath() + "/" ); else if( !path.startsWith( "/" ) ) - path.prepend( QDir::homeDirPath() + "/" ); + path.prepend( TQDir::homeDirPath() + "/" ); if( path[path.length()-1] != '/' ) path.append( "/" ); - if( !QFile::exists( path ) && !QDir().mkdir( path ) ) { + if( !TQFile::exists( path ) && !TQDir().mkdir( path ) ) { kdDebug() << "(K3bCddbLocalSubmit) could not create directory: " << path << endl; setError( IO_ERROR ); emit submitFinished( this ); return; } - if( QFile::exists( path ) ) { + if( TQFile::exists( path ) ) { // if the category dir does not exists // create it path += resultEntry().category; - if( !QFile::exists( path ) ) { - if( !QDir().mkdir( path ) ) { + if( !TQFile::exists( path ) ) { + if( !TQDir().mkdir( path ) ) { kdDebug() << "(K3bCddbLocalSubmit) could not create directory: " << path << endl; setError( IO_ERROR ); emit submitFinished( this ); @@ -70,7 +70,7 @@ void K3bCddbLocalSubmit::doSubmit() // we always overwrite existing entries path += "/" + resultEntry().discid; - QFile entryFile( path ); + TQFile entryFile( path ); if( entryFile.exists() ) { kdDebug() << "(K3bCddbLocalSubmit) file already exists: " << path << endl; } @@ -82,8 +82,8 @@ void K3bCddbLocalSubmit::doSubmit() } else { kdDebug() << "(K3bCddbLocalSubmit) creating file: " << path << endl; - QTextStream entryStream( &entryFile ); - entryStream.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream entryStream( &entryFile ); + entryStream.setEncoding( TQTextStream::UnicodeUTF8 ); entryStream << resultEntry().rawData; entryFile.close(); @@ -94,7 +94,7 @@ void K3bCddbLocalSubmit::doSubmit() else { kdDebug() << "(K3bCddbLocalSubmit) could not find directory: " << path << endl; setError( IO_ERROR ); - emit infoMessage( i18n("Could not find directory: %1").arg(path) ); + emit infoMessage( i18n("Could not find directory: %1").tqarg(path) ); emit submitFinished( this ); } } diff --git a/libk3b/cddb/k3bcddblocalsubmit.h b/libk3b/cddb/k3bcddblocalsubmit.h index 8b7ea91..88f127c 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.h +++ b/libk3b/cddb/k3bcddblocalsubmit.h @@ -19,25 +19,26 @@ #include "k3bcddbsubmit.h" -#include <qstring.h> +#include <tqstring.h> class K3bCddbLocalSubmit : public K3bCddbSubmit { Q_OBJECT + TQ_OBJECT public: - K3bCddbLocalSubmit( QObject* parent = 0, const char* name = 0 ); + K3bCddbLocalSubmit( TQObject* tqparent = 0, const char* name = 0 ); ~K3bCddbLocalSubmit(); public slots: - void setCddbDir( const QString& dir ) { m_cddbDir = dir; } + void setCddbDir( const TQString& dir ) { m_cddbDir = dir; } protected slots: void doSubmit(); private: - QString m_cddbDir; + TQString m_cddbDir; }; #endif diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp index 094176a..df5a938 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp +++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp @@ -16,42 +16,42 @@ #include "k3bcddbmultientriesdialog.h" -#include <qlayout.h> -#include <qframe.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqlabel.h> #include <klistbox.h> #include <klocale.h> -K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( QWidget* parent, const char* name ) - : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name ) +K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* tqparent, const char* name ) + : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, tqparent, name ) { - QFrame* frame = plainPage(); - QVBoxLayout* layout = new QVBoxLayout( frame ); - layout->setAutoAdd( true ); - layout->setSpacing( spacingHint() ); - layout->setMargin( 0 ); + TQFrame* frame = plainPage(); + TQVBoxLayout* tqlayout = new TQVBoxLayout( frame ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( spacingHint() ); + tqlayout->setMargin( 0 ); - QLabel* infoLabel = new QLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame ); - infoLabel->setAlignment( WordBreak ); + TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame ); + infoLabel->tqsetAlignment( WordBreak ); m_listBox = new KListBox( frame, "list_box"); setMinimumSize( 280, 200 ); } -K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* query, QWidget* parent ) +K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* query, TQWidget* tqparent ) { - K3bCddbMultiEntriesDialog d( parent ); + K3bCddbMultiEntriesDialog d( tqparent ); - const QValueList<K3bCddbResultHeader> headers = query->getInexactMatches(); + const TQValueList<K3bCddbResultHeader> headers = query->getInexactMatches(); int i = 1; - for( QValueListConstIterator<K3bCddbResultHeader> it = headers.begin(); + for( TQValueListConstIterator<K3bCddbResultHeader> it = headers.begin(); it != headers.end(); ++it ) { - d.m_listBox->insertItem( QString::number(i) + " " + + d.m_listBox->insertItem( TQString::number(i) + " " + (*it).artist + " - " + (*it).title + " (" + (*it).category + ")" ); @@ -60,7 +60,7 @@ K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* qu d.m_listBox->setSelected( 0, true ); - if( d.exec() == QDialog::Accepted ) + if( d.exec() == TQDialog::Accepted ) return headers[ d.m_listBox->currentItem() >= 0 ? d.m_listBox->currentItem() : 0 ]; else return K3bCddbResultHeader(); diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.h b/libk3b/cddb/k3bcddbmultientriesdialog.h index 15cc6f8..43c409e 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.h +++ b/libk3b/cddb/k3bcddbmultientriesdialog.h @@ -23,7 +23,7 @@ #include "k3bcddbresult.h" -class QStringList; +class TQStringList; class KListBox; /** @@ -32,14 +32,15 @@ class KListBox; class K3bCddbMultiEntriesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ~K3bCddbMultiEntriesDialog(); - static K3bCddbResultHeader selectCddbEntry( K3bCddbQuery* query, QWidget* parent = 0 ); + static K3bCddbResultHeader selectCddbEntry( K3bCddbQuery* query, TQWidget* tqparent = 0 ); protected: - K3bCddbMultiEntriesDialog( QWidget* parent = 0, const char* name = 0); + K3bCddbMultiEntriesDialog( TQWidget* tqparent = 0, const char* name = 0); private: KListBox *m_listBox; diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp index fefc8e4..15f3e18 100644 --- a/libk3b/cddb/k3bcddbpquery.cpp +++ b/libk3b/cddb/k3bcddbpquery.cpp @@ -15,9 +15,9 @@ #include "k3bcddbpquery.h" -#include <qstringlist.h> -#include <qsocket.h> -#include <qtextstream.h> +#include <tqstringlist.h> +#include <tqsocket.h> +#include <tqtextstream.h> #include <klocale.h> #include <kdebug.h> @@ -25,18 +25,18 @@ -K3bCddbpQuery::K3bCddbpQuery( QObject* parent, const char* name ) - :K3bCddbQuery( parent, name ) +K3bCddbpQuery::K3bCddbpQuery( TQObject* tqparent, const char* name ) + :K3bCddbQuery( tqparent, name ) { - m_socket = new QSocket( this ); + m_socket = new TQSocket( this ); m_stream.setDevice( m_socket ); - m_stream.setEncoding( QTextStream::UnicodeUTF8 ); + m_stream.setEncoding( TQTextStream::UnicodeUTF8 ); - connect( m_socket, SIGNAL(connected()), this, SLOT(slotConnected()) ); - connect( m_socket, SIGNAL(hostFound()), this, SLOT(slotHostFound()) ); - connect( m_socket, SIGNAL(connectionClosed()), this, SLOT(slotConnectionClosed()) ); - connect( m_socket, SIGNAL(error(int)), this, SLOT(slotError(int)) ); - connect( m_socket, SIGNAL(readyRead()), this, SLOT(slotReadyRead()) ); + connect( m_socket, TQT_SIGNAL(connected()), this, TQT_SLOT(slotConnected()) ); + connect( m_socket, TQT_SIGNAL(hostFound()), this, TQT_SLOT(slotHostFound()) ); + connect( m_socket, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotConnectionClosed()) ); + connect( m_socket, TQT_SIGNAL(error(int)), this, TQT_SLOT(slotError(int)) ); + connect( m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()) ); } @@ -54,7 +54,7 @@ void K3bCddbpQuery::doQuery() // connect to the server m_socket->connectToHost( m_server, m_port ); - emit infoMessage( i18n("Searching %1 on port %2").arg(m_server).arg(m_port) ); + emit infoMessage( i18n("Searching %1 on port %2").tqarg(m_server).tqarg(m_port) ); } @@ -63,7 +63,7 @@ void K3bCddbpQuery::doMatchQuery() // we should still be connected // TODO: check this - QString read = QString( "cddb read %1 %2").arg( header().category ).arg( header().discid ); + TQString read = TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ); m_state = READ; m_parsingBuffer = ""; @@ -95,7 +95,7 @@ void K3bCddbpQuery::slotConnectionClosed() void K3bCddbpQuery::cddbpQuit() { - m_state = QUIT; + m_state = TQUIT; m_stream << "quit" << endl << flush; } @@ -103,7 +103,7 @@ void K3bCddbpQuery::cddbpQuit() void K3bCddbpQuery::slotReadyRead() { while( m_socket->canReadLine() ) { - QString line = m_stream.readLine(); + TQString line = m_stream.readLine(); // kdDebug() << "(K3bCddbpQuery) line: " << line << endl; @@ -146,13 +146,13 @@ void K3bCddbpQuery::slotReadyRead() } // just ignore the reply since it's not important for the functionality - m_state = QUERY; + m_state = TQUERY; m_stream << queryString() << endl << flush; break; } - case QUERY: + case TQUERY: if( getCode( line ) == 200 ) { // parse exact match and send a read command K3bCddbResultHeader header; @@ -169,7 +169,7 @@ void K3bCddbpQuery::slotReadyRead() emit infoMessage( i18n("Found multiple exact matches") ); - m_state = QUERY_DATA; + m_state = TQUERY_DATA; } else if( getCode( line ) == 211 ) { @@ -177,7 +177,7 @@ void K3bCddbpQuery::slotReadyRead() emit infoMessage( i18n("Found inexact matches") ); - m_state = QUERY_DATA; + m_state = TQUERY_DATA; } else if( getCode( line ) == 202 ) { @@ -190,12 +190,12 @@ void K3bCddbpQuery::slotReadyRead() else { kdDebug() << "(K3bCddbpQuery) Error while querying: " << line << endl; emit infoMessage( i18n("Error while querying") ); - setError( QUERY_ERROR ); + setError( TQUERY_ERROR ); cddbpQuit(); } break; - case QUERY_DATA: + case TQUERY_DATA: if( line.startsWith( "." ) ) { // finished query // go on reading @@ -234,7 +234,7 @@ void K3bCddbpQuery::slotReadyRead() kdDebug() << "(K3bCddbpQuery) query finished." << endl; - QTextStream strStream( m_parsingBuffer, IO_ReadOnly ); + TQTextStream strStream( m_parsingBuffer, IO_ReadOnly ); parseEntry( strStream, result() ); setError( SUCCESS ); @@ -246,7 +246,7 @@ void K3bCddbpQuery::slotReadyRead() } break; - case QUIT: + case TQUIT: // no parsing needed break; } @@ -257,17 +257,17 @@ void K3bCddbpQuery::slotReadyRead() void K3bCddbpQuery::slotError( int e ) { switch(e) { - case QSocket::ErrConnectionRefused: - kdDebug() << i18n("Connection to %1 refused").arg( m_server ) << endl; - emit infoMessage( i18n("Connection to %1 refused").arg( m_server ) ); + case TQSocket::ErrConnectionRefused: + kdDebug() << i18n("Connection to %1 refused").tqarg( m_server ) << endl; + emit infoMessage( i18n("Connection to %1 refused").tqarg( m_server ) ); break; - case QSocket::ErrHostNotFound: - kdDebug() << i18n("Could not find host %1").arg( m_server ) << endl; - emit infoMessage( i18n("Could not find host %1").arg( m_server ) ); + case TQSocket::ErrHostNotFound: + kdDebug() << i18n("Could not find host %1").tqarg( m_server ) << endl; + emit infoMessage( i18n("Could not find host %1").tqarg( m_server ) ); break; - case QSocket::ErrSocketRead: - kdDebug() << i18n("Error while reading from %1").arg( m_server ) << endl; - emit infoMessage( i18n("Error while reading from %1").arg( m_server ) ); + case TQSocket::ErrSocketRead: + kdDebug() << i18n("Error while reading from %1").tqarg( m_server ) << endl; + emit infoMessage( i18n("Error while reading from %1").tqarg( m_server ) ); break; } diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h index 78fe5df..423cad1 100644 --- a/libk3b/cddb/k3bcddbpquery.h +++ b/libk3b/cddb/k3bcddbpquery.h @@ -13,28 +13,29 @@ */ -#ifndef K3BCDDBP_QUERY_H -#define K3BCDDBP_QUERY_H +#ifndef K3BCDDBP_TQUERY_H +#define K3BCDDBP_TQUERY_H #include "k3bcddbquery.h" #include "k3bcddbresult.h" -#include <qstring.h> -#include <qvaluelist.h> -#include <qtextstream.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqtextstream.h> -class QSocket; +class TQSocket; class K3bCddbpQuery : public K3bCddbQuery { Q_OBJECT + TQ_OBJECT public: - K3bCddbpQuery( QObject* parent = 0, const char* name = 0 ); + K3bCddbpQuery( TQObject* tqparent = 0, const char* name = 0 ); ~K3bCddbpQuery(); public slots: - void setServer( const QString& s, int port = 8080 ) { m_server = s; m_port = port; } + void setServer( const TQString& s, int port = 8080 ) { m_server = s; m_port = port; } protected slots: void slotHostFound(); @@ -47,16 +48,16 @@ class K3bCddbpQuery : public K3bCddbQuery private: void cddbpQuit(); - enum State { GREETING, HANDSHAKE, PROTO, QUERY, QUERY_DATA, READ, READ_DATA, QUIT }; + enum State { GREETING, HANDSHAKE, PROTO, TQUERY, TQUERY_DATA, READ, READ_DATA, TQUIT }; int m_state; - QString m_server; + TQString m_server; int m_port; - QSocket* m_socket; - QTextStream m_stream; + TQSocket* m_socket; + TQTextStream m_stream; - QString m_parsingBuffer; + TQString m_parsingBuffer; }; #endif diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp index 783f9a4..6cf8eb0 100644 --- a/libk3b/cddb/k3bcddbquery.cpp +++ b/libk3b/cddb/k3bcddbquery.cpp @@ -25,18 +25,18 @@ #include <klocale.h> -#include <qtextstream.h> -#include <qstringlist.h> -#include <qregexp.h> -#include <qtimer.h> +#include <tqtextstream.h> +#include <tqstringlist.h> +#include <tqregexp.h> +#include <tqtimer.h> #include <stdlib.h> -K3bCddbQuery::K3bCddbQuery( QObject* parent, const char* name ) - : QObject(parent, name) +K3bCddbQuery::K3bCddbQuery( TQObject* tqparent, const char* name ) + : TQObject(tqparent, name) { m_bQueryFinishedEmited = false; } @@ -53,7 +53,7 @@ void K3bCddbQuery::query( const K3bDevice::Toc& toc ) m_toc = toc; m_inexactMatches.clear(); - QTimer::singleShot( 0, this, SLOT(doQuery()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(doQuery()) ); } @@ -64,26 +64,26 @@ void K3bCddbQuery::queryMatch( const K3bCddbResultHeader& header ) m_result.category = header.category; m_result.discid = header.discid; - QTimer::singleShot( 0, this, SLOT(doMatchQuery()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(doMatchQuery()) ); } -const QStringList& K3bCddbQuery::categories() +const TQStringList& K3bCddbQuery::categories() { - static QStringList s_cat = QStringList::split( ",", "rock,blues,misc,classical," + static TQStringList s_cat = TQStringList::split( ",", "rock,blues,misc,classical," "country,data,folk,jazz,newage,reggae,soundtrack" ); return s_cat; } -bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry ) +bool K3bCddbQuery::parseEntry( TQTextStream& stream, K3bCddbResultEntry& entry ) { entry.rawData = ""; - stream.setEncoding( QTextStream::UnicodeUTF8 ); + stream.setEncoding( TQTextStream::UnicodeUTF8 ); // parse data - QString line; + TQString line; while( !(line = stream.readLine()).isNull() ) { entry.rawData.append(line + "\n"); @@ -94,7 +94,7 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry ) } else if( line.startsWith( "DYEAR" ) ) { - QString year = line.mid( 6 ); + TQString year = line.mid( 6 ); if( year.length() == 4 ) entry.year = year.toInt(); } @@ -108,7 +108,7 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry ) } else if( line.startsWith( "TTITLE" ) ) { - int eqSgnPos = line.find( "=" ); + int eqSgnPos = line.tqfind( "=" ); bool ok; uint trackNum = (uint)line.mid( 6, eqSgnPos - 6 ).toInt( &ok ); if( !ok ) @@ -129,7 +129,7 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry ) } else if( line.startsWith( "EXTT" ) ) { - int eqSgnPos = line.find( "=" ); + int eqSgnPos = line.tqfind( "=" ); bool ok; uint trackNum = (uint)line.mid( 4, eqSgnPos - 4 ).toInt( &ok ); if( !ok ) @@ -157,8 +157,8 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry ) // now split the titles in the last added match // if no " / " delimiter is present title and artist are the same // ------------------------------------------------------------------- - QString fullTitle = entry.cdTitle; - int splitPos = fullTitle.find( " / " ); + TQString fullTitle = entry.cdTitle; + int splitPos = fullTitle.tqfind( " / " ); if( splitPos < 0 ) entry.cdArtist = fullTitle; else { @@ -168,10 +168,10 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry ) } - for( QStringList::iterator it = entry.titles.begin(); + for( TQStringList::iterator it = entry.titles.begin(); it != entry.titles.end(); ++it ) { - QString fullTitle = *it; - int splitPos = fullTitle.find( " / " ); + TQString fullTitle = *it; + int splitPos = fullTitle.tqfind( " / " ); if( splitPos < 0 ) entry.artists.append( entry.cdArtist ); else { @@ -183,31 +183,31 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry ) // replace all "\\n" with "\n" - for( QStringList::iterator it = entry.titles.begin(); + for( TQStringList::iterator it = entry.titles.begin(); it != entry.titles.end(); ++it ) { - (*it).replace( "\\\\\\\\n", "\\n" ); + (*it).tqreplace( "\\\\\\\\n", "\\n" ); } - for( QStringList::iterator it = entry.artists.begin(); + for( TQStringList::iterator it = entry.artists.begin(); it != entry.artists.end(); ++it ) { - (*it).replace( "\\\\\\\\n", "\\n" ); + (*it).tqreplace( "\\\\\\\\n", "\\n" ); } - for( QStringList::iterator it = entry.extInfos.begin(); + for( TQStringList::iterator it = entry.extInfos.begin(); it != entry.extInfos.end(); ++it ) { - (*it).replace( "\\\\\\\\n", "\\n" ); + (*it).tqreplace( "\\\\\\\\n", "\\n" ); } - entry.cdTitle.replace( "\\\\\\\\n", "\\n" ); - entry.cdArtist.replace( "\\\\\\\\n", "\\n" ); - entry.cdExtInfo.replace( "\\\\\\\\n", "\\n" ); - entry.genre.replace( "\\\\\\\\n", "\\n" ); + entry.cdTitle.tqreplace( "\\\\\\\\n", "\\n" ); + entry.cdArtist.tqreplace( "\\\\\\\\n", "\\n" ); + entry.cdExtInfo.tqreplace( "\\\\\\\\n", "\\n" ); + entry.genre.tqreplace( "\\\\\\\\n", "\\n" ); return true; } -int K3bCddbQuery::getCode( const QString& line ) +int K3bCddbQuery::getCode( const TQString& line ) { bool ok; int code = line.left( 3 ).toInt( &ok ); @@ -217,44 +217,44 @@ int K3bCddbQuery::getCode( const QString& line ) } -QString K3bCddbQuery::handshakeString() const +TQString K3bCddbQuery::handshakeString() const { - QString user( getenv("USER") ); - QString host( getenv("HOST") ); + TQString user( getenv("USER") ); + TQString host( getenv("HOST") ); if( user.isEmpty() ) user = "kde-user"; if( host.isEmpty() ) host = "kde-host"; - return QString("%1 %2 K3b %3").arg(user).arg(host).arg(kapp->aboutData()->version()); + return TQString("%1 %2 K3b %3").tqarg(user).tqarg(host).tqarg(kapp->aboutData()->version()); } -QString K3bCddbQuery::queryString() const +TQString K3bCddbQuery::queryString() const { - QString query = "cddb query " - + QString::number( m_toc.discId(), 16 ).rightJustify( 8, '0' ) + TQString query = "cddb query " + + TQString::number( m_toc.discId(), 16 ).rightJustify( 8, '0' ) + " " - + QString::number( (unsigned int)m_toc.count() ); + + TQString::number( (unsigned int)m_toc.count() ); for( K3bDevice::Toc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) { - query.append( QString( " %1" ).arg( (*it).firstSector().lba() ) ); + query.append( TQString( " %1" ).tqarg( (*it).firstSector().lba() ) ); } - query.append( QString( " %1" ).arg( m_toc.length().lba() / 75 ) ); + query.append( TQString( " %1" ).tqarg( m_toc.length().lba() / 75 ) ); return query; } -bool K3bCddbQuery::parseMatchHeader( const QString& line, K3bCddbResultHeader& header ) +bool K3bCddbQuery::parseMatchHeader( const TQString& line, K3bCddbResultHeader& header ) { // format: category id title // where title could be artist and title splitted with a / header.category = line.section( ' ', 0, 0 ); header.discid = line.section( ' ', 1, 1 ); header.title = line.mid( header.category.length() + header.discid.length() + 2 ); - int slashPos = header.title.find( "/" ); + int slashPos = header.title.tqfind( "/" ); if( slashPos > 0 ) { header.artist = header.title.left(slashPos).stripWhiteSpace(); header.title = header.title.mid( slashPos+1 ).stripWhiteSpace(); diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h index 569e882..eebc4cb 100644 --- a/libk3b/cddb/k3bcddbquery.h +++ b/libk3b/cddb/k3bcddbquery.h @@ -14,12 +14,12 @@ */ -#ifndef K3BCDDB_QUERY_H -#define K3BCDDB_QUERY_H +#ifndef K3BCDDB_TQUERY_H +#define K3BCDDB_TQUERY_H -#include <qobject.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqtextstream.h> #include "k3bcddbresult.h" @@ -27,12 +27,13 @@ #include "k3b_export.h" -class LIBK3B_EXPORT K3bCddbQuery : public QObject +class LIBK3B_EXPORT K3bCddbQuery : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bCddbQuery( QObject* parent = 0, const char* name = 0 ); + K3bCddbQuery( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bCddbQuery(); void query( const K3bDevice::Toc& ); @@ -48,15 +49,15 @@ class LIBK3B_EXPORT K3bCddbQuery : public QObject * After emitting the signal inexactMatches one has to choose one * of these entries and query it with queryInexactMatch */ - const QValueList<K3bCddbResultHeader>& getInexactMatches() const { return m_inexactMatches; } + const TQValueList<K3bCddbResultHeader>& getInexactMatches() const { return m_inexactMatches; } - static const QStringList& categories(); + static const TQStringList& categories(); enum Error { SUCCESS = 0, CANCELED, NO_ENTRY_FOUND, CONNECTION_ERROR, - QUERY_ERROR, + TQUERY_ERROR, READ_ERROR, FAILURE, WORKING }; @@ -76,7 +77,7 @@ class LIBK3B_EXPORT K3bCddbQuery : public QObject */ void inexactMatches( K3bCddbQuery* ); - void infoMessage( const QString& ); + void infoMessage( const TQString& ); protected slots: virtual void doQuery() = 0; @@ -88,11 +89,11 @@ class LIBK3B_EXPORT K3bCddbQuery : public QObject K3bCddbResultEntry& result() { return m_result; } void setError( int e ) { m_error = e; } - bool parseEntry( QTextStream&, K3bCddbResultEntry& ); - int getCode( const QString& ); - QString handshakeString() const; - QString queryString() const; - bool parseMatchHeader( const QString& line, K3bCddbResultHeader& header ); + bool parseEntry( TQTextStream&, K3bCddbResultEntry& ); + int getCode( const TQString& ); + TQString handshakeString() const; + TQString queryString() const; + bool parseMatchHeader( const TQString& line, K3bCddbResultHeader& header ); /** * since I'm not quite sure when the socket will emit connectionClosed @@ -101,7 +102,7 @@ class LIBK3B_EXPORT K3bCddbQuery : public QObject */ void emitQueryFinished(); - QValueList<K3bCddbResultHeader> m_inexactMatches; + TQValueList<K3bCddbResultHeader> m_inexactMatches; private: K3bDevice::Toc m_toc; diff --git a/libk3b/cddb/k3bcddbresult.h b/libk3b/cddb/k3bcddbresult.h index 46dcb9a..9486bff 100644 --- a/libk3b/cddb/k3bcddbresult.h +++ b/libk3b/cddb/k3bcddbresult.h @@ -19,17 +19,17 @@ #define K3B_CDDB_RESULT_H -#include <qstringlist.h> +#include <tqstringlist.h> #include "k3b_export.h" class LIBK3B_EXPORT K3bCddbResultHeader { public: - QString category; - QString title; - QString artist; - QString discid; + TQString category; + TQString title; + TQString artist; + TQString discid; }; @@ -42,20 +42,20 @@ class LIBK3B_EXPORT K3bCddbResultEntry year(0) { } - QStringList titles; - QStringList artists; - QStringList extInfos; + TQStringList titles; + TQStringList artists; + TQStringList extInfos; - QString cdTitle; - QString cdArtist; - QString cdExtInfo; + TQString cdTitle; + TQString cdArtist; + TQString cdExtInfo; - QString genre; - QString category; + TQString genre; + TQString category; int year; - QString discid; + TQString discid; - QString rawData; + TQString rawData; }; @@ -71,7 +71,7 @@ class LIBK3B_EXPORT K3bCddbResult int foundEntries() const; private: - QValueList<K3bCddbResultEntry> m_entries; + TQValueList<K3bCddbResultEntry> m_entries; K3bCddbResultEntry m_emptyEntry; }; diff --git a/libk3b/cddb/k3bcddbsubmit.cpp b/libk3b/cddb/k3bcddbsubmit.cpp index a04dbcb..01aa7f8 100644 --- a/libk3b/cddb/k3bcddbsubmit.cpp +++ b/libk3b/cddb/k3bcddbsubmit.cpp @@ -16,11 +16,11 @@ #include "k3bcddbsubmit.h" -#include <qtimer.h> +#include <tqtimer.h> -K3bCddbSubmit::K3bCddbSubmit( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bCddbSubmit::K3bCddbSubmit( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { } @@ -37,7 +37,7 @@ void K3bCddbSubmit::submit( const K3bCddbResultEntry& entry ) if( m_resultEntry.rawData.isEmpty() ) createDataStream( m_resultEntry ); - QTimer::singleShot( 0, this, SLOT(doSubmit()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(doSubmit()) ); } @@ -45,7 +45,7 @@ void K3bCddbSubmit::createDataStream( K3bCddbResultEntry& entry ) { entry.rawData.truncate(0); - QTextStream ts( &entry.rawData, IO_WriteOnly ); + TQTextStream ts( &entry.rawData, IO_WriteOnly ); ts << "#" << endl << "# Submitted via: K3b" << endl diff --git a/libk3b/cddb/k3bcddbsubmit.h b/libk3b/cddb/k3bcddbsubmit.h index ff57101..cb9906f 100644 --- a/libk3b/cddb/k3bcddbsubmit.h +++ b/libk3b/cddb/k3bcddbsubmit.h @@ -17,19 +17,20 @@ #ifndef K3BCDDB_SUBMIT_H #define K3BCDDB_SUBMIT_H -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> #include "k3bcddbresult.h" -class K3bCddbSubmit : public QObject +class K3bCddbSubmit : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bCddbSubmit( QObject* parent = 0, const char* name = 0 ); + K3bCddbSubmit( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bCddbSubmit(); int error() const { return m_error; } @@ -40,7 +41,7 @@ class K3bCddbSubmit : public QObject void submit( const K3bCddbResultEntry& ); signals: - void infoMessage( const QString& ); + void infoMessage( const TQString& ); void submitFinished( K3bCddbSubmit* ); protected slots: diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index c10fec0..38d3c07 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -37,14 +37,14 @@ #include <kstandarddirs.h> #include <kapplication.h> -#include <qptrlist.h> -#include <qthread.h> -#include <qmutex.h> +#include <tqptrlist.h> +#include <tqthread.h> +#include <tqmutex.h> -static Qt::HANDLE s_guiThreadHandle = QThread::currentThread(); +static TQt::HANDLE s_guiThreadHandle = TQThread::currentThread(); -// We cannot use QWaitCondition here since the event might be handled faster +// We cannot use TQWaitCondition here since the event might be handled faster // than the thread starts the waiting class DeviceBlockingEventDoneCondition { public: @@ -69,15 +69,15 @@ public: } private: - QMutex m_doneMutex; + TQMutex m_doneMutex; bool m_done; }; -class DeviceBlockingEvent : public QCustomEvent +class DeviceBlockingEvent : public TQCustomEvent { public: DeviceBlockingEvent( bool block_, K3bDevice::Device* dev, DeviceBlockingEventDoneCondition* cond_, bool* success_ ) - : QCustomEvent( QEvent::User + 33 ), + : TQCustomEvent( TQEvent::User + 33 ), block(block_), device(dev), cond(cond_), @@ -111,8 +111,8 @@ public: K3bPluginManager* pluginManager; K3bGlobalSettings* globalSettings; - QValueList<K3bJob*> runningJobs; - QValueList<K3bDevice::Device*> blockedDevices; + TQValueList<K3bJob*> runningJobs; + TQValueList<K3bDevice::Device*> blockedDevices; }; @@ -121,8 +121,8 @@ K3bCore* K3bCore::s_k3bCore = 0; -K3bCore::K3bCore( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bCore::K3bCore( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); @@ -205,11 +205,11 @@ void K3bCore::init() externalBinManager()->search(); #ifdef HAVE_HAL - connect( K3bDevice::HalConnection::instance(), SIGNAL(deviceAdded(const QString&)), - deviceManager(), SLOT(addDevice(const QString&)) ); - connect( K3bDevice::HalConnection::instance(), SIGNAL(deviceRemoved(const QString&)), - deviceManager(), SLOT(removeDevice(const QString&)) ); - QStringList devList = K3bDevice::HalConnection::instance()->devices(); + connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)), + deviceManager(), TQT_SLOT(addDevice(const TQString&)) ); + connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)), + deviceManager(), TQT_SLOT(removeDevice(const TQString&)) ); + TQStringList devList = K3bDevice::HalConnection::instance()->devices(); if( devList.isEmpty() ) deviceManager()->scanBus(); else @@ -257,7 +257,7 @@ void K3bCore::readSettings( KConfig* cnf ) if( !c ) c = config(); - QString oldGrp = c->group(); + TQString oldGrp = c->group(); globalSettings()->readSettings( c ); deviceManager()->readConfig( c ); @@ -273,7 +273,7 @@ void K3bCore::saveSettings( KConfig* cnf ) if( !c ) c = config(); - QString oldGrp = c->group(); + TQString oldGrp = c->group(); c->setGroup( "General Options" ); c->writeEntry( "config version", version() ); @@ -310,7 +310,7 @@ bool K3bCore::jobsRunning() const } -const QValueList<K3bJob*>& K3bCore::runningJobs() const +const TQValueList<K3bJob*>& K3bCore::runningJobs() const { return d->runningJobs; } @@ -318,13 +318,13 @@ const QValueList<K3bJob*>& K3bCore::runningJobs() const bool K3bCore::blockDevice( K3bDevice::Device* dev ) { - if( QThread::currentThread() == s_guiThreadHandle ) { + if( TQThread::currentThread() == s_guiThreadHandle ) { return internalBlockDevice( dev ); } else { bool success = false; DeviceBlockingEventDoneCondition w; - QApplication::postEvent( this, new DeviceBlockingEvent( true, dev, &w, &success ) ); + TQApplication::postEvent( this, new DeviceBlockingEvent( true, dev, &w, &success ) ); w.wait(); return success; } @@ -333,12 +333,12 @@ bool K3bCore::blockDevice( K3bDevice::Device* dev ) void K3bCore::unblockDevice( K3bDevice::Device* dev ) { - if( QThread::currentThread() == s_guiThreadHandle ) { + if( TQThread::currentThread() == s_guiThreadHandle ) { internalUnblockDevice( dev ); } else { DeviceBlockingEventDoneCondition w; - QApplication::postEvent( this, new DeviceBlockingEvent( false, dev, &w, 0 ) ); + TQApplication::postEvent( this, new DeviceBlockingEvent( false, dev, &w, 0 ) ); w.wait(); } } @@ -346,7 +346,7 @@ void K3bCore::unblockDevice( K3bDevice::Device* dev ) bool K3bCore::internalBlockDevice( K3bDevice::Device* dev ) { - if( !d->blockedDevices.contains( dev ) ) { + if( !d->blockedDevices.tqcontains( dev ) ) { d->blockedDevices.append( dev ); return true; } @@ -361,7 +361,7 @@ void K3bCore::internalUnblockDevice( K3bDevice::Device* dev ) } -void K3bCore::customEvent( QCustomEvent* e ) +void K3bCore::customEvent( TQCustomEvent* e ) { if( DeviceBlockingEvent* de = dynamic_cast<DeviceBlockingEvent*>(e) ) { if( de->block ) diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h index ce73e32..f97430c 100644 --- a/libk3b/core/k3bcore.h +++ b/libk3b/core/k3bcore.h @@ -17,8 +17,8 @@ #ifndef _K3B_CORE_H_ #define _K3B_CORE_H_ -#include <qobject.h> -#include <qvaluelist.h> +#include <tqobject.h> +#include <tqvaluelist.h> #include "k3b_export.h" @@ -36,7 +36,7 @@ class K3bJob; class K3bBurnJob; class K3bGlobalSettings; class K3bPluginManager; -class QCustomEvent; +class TQCustomEvent; namespace K3bDevice { @@ -52,19 +52,20 @@ namespace K3bDevice { * This is the heart of the K3b system. Every plugin may use this * to get the information it needs. */ -class LIBK3B_EXPORT K3bCore : public QObject +class LIBK3B_EXPORT K3bCore : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Although K3bCore is a singlelton it's constructor is not private to make inheritance * possible. Just make sure to only create one instance. */ - K3bCore( QObject* parent = 0, const char* name = 0 ); + K3bCore( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bCore(); - const QValueList<K3bJob*>& runningJobs() const; + const TQValueList<K3bJob*>& runningJobs() const; /** * Equals to !runningJobs().isEmpty() @@ -169,7 +170,7 @@ class LIBK3B_EXPORT K3bCore : public QObject virtual void initDeviceManager(); virtual void initPluginManager(); - virtual void customEvent( QCustomEvent* e ); + virtual void customEvent( TQCustomEvent* e ); private: class Private; diff --git a/libk3b/core/k3bdataevent.h b/libk3b/core/k3bdataevent.h index b6a4334..c88bfaa 100644 --- a/libk3b/core/k3bdataevent.h +++ b/libk3b/core/k3bdataevent.h @@ -16,23 +16,23 @@ #ifndef K3B_DATA_EVENT_H #define K3B_DATA_EVENT_H -#include <qevent.h> +#include <tqevent.h> /** * Custom event class for posting events corresponding to the * K3bJob signals. This is useful for a threaded job since * in that case it's not possible to emit signals that directly - * change the GUI (see QThread docu). + * change the GUI (see TQThread docu). */ -class K3bDataEvent : public QCustomEvent +class K3bDataEvent : public TQCustomEvent { public: // make sure we get not in the way of K3bProgressInfoEvent - static const int EVENT_TYPE = QEvent::User + 100; + static const int EVENT_TYPE = TQEvent::User + 100; K3bDataEvent( const char* data, int len ) - : QCustomEvent( EVENT_TYPE ), + : TQCustomEvent( EVENT_TYPE ), m_data(data), m_length(len) {} diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp index b654d22..94ff212 100644 --- a/libk3b/core/k3bdefaultexternalprograms.cpp +++ b/libk3b/core/k3bdefaultexternalprograms.cpp @@ -18,12 +18,12 @@ #include "k3bexternalbinmanager.h" #include <k3bglobals.h> -#include <qfile.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qobject.h> -#include <qregexp.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqobject.h> +#include <tqregexp.h> +#include <tqtextstream.h> #include <k3bprocess.h> #include <kdebug.h> @@ -92,18 +92,18 @@ K3bCdrecordProgram::K3bCdrecordProgram( bool dvdPro ) // But since it may be that someone manually installed cdrecord // replacing the wrapper we check if cdrecord is a script. // -static QString& debianWeirdnessHack( QString& path ) +static TQString& debianWeirdnessHack( TQString& path ) { - if( QFile::exists( path + ".mmap" ) ) { + if( TQFile::exists( path + ".mmap" ) ) { kdDebug() << "(K3bCdrecordProgram) checking for Debian cdrecord wrapper script." << endl; - if( QFileInfo( path ).size() < 1024 ) { + if( TQFileInfo( path ).size() < 1024 ) { kdDebug() << "(K3bCdrecordProgram) Debian Wrapper script size fits. Checking file." << endl; - QFile f( path ); + TQFile f( path ); f.open( IO_ReadOnly ); - QString s = QTextStream( &f ).read(); - if( s.contains( "cdrecord.mmap" ) && s.contains( "cdrecord.shm" ) ) { + TQString s = TQTextStream( &f ).read(); + if( s.tqcontains( "cdrecord.mmap" ) && s.tqcontains( "cdrecord.shm" ) ) { kdDebug() << "(K3bCdrecordProgram) Found Debian Wrapper script." << endl; - QString ext; + TQString ext; if( K3b::kernelVersion().versionString().left(3) > "2.2" ) ext = ".mmap"; else @@ -120,23 +120,23 @@ static QString& debianWeirdnessHack( QString& path ) } -bool K3bCdrecordProgram::scan( const QString& p ) +bool K3bCdrecordProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; bool wodim = false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); - if( QFile::exists( path + "wodim" ) ) { + if( TQFile::exists( path + "wodim" ) ) { wodim = true; path += "wodim"; } - else if( QFile::exists( path + "cdrecord" ) ) { + else if( TQFile::exists( path + "cdrecord" ) ) { path += "cdrecord"; } else @@ -155,23 +155,23 @@ bool K3bCdrecordProgram::scan( const QString& p ) if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { int pos = -1; if( wodim ) { - pos = out.output().find( "Wodim" ); + pos = out.output().tqfind( "Wodim" ); } else if( m_dvdPro ) { - pos = out.output().find( "Cdrecord-ProDVD" ); + pos = out.output().tqfind( "Cdrecord-ProDVD" ); } else { - pos = out.output().find( "Cdrecord" ); + pos = out.output().tqfind( "Cdrecord" ); } if( pos < 0 ) return false; - pos = out.output().find( QRegExp("[0-9]"), pos ); + pos = out.output().tqfind( TQRegExp("[0-9]"), pos ); if( pos < 0 ) return false; - int endPos = out.output().find( QRegExp("\\s"), pos+1 ); + int endPos = out.output().tqfind( TQRegExp("\\s"), pos+1 ); if( endPos < 0 ) return false; @@ -182,11 +182,11 @@ bool K3bCdrecordProgram::scan( const QString& p ) if( wodim ) bin->addFeature( "wodim" ); - pos = out.output().find( "Copyright") + 14; - endPos = out.output().find( "\n", pos ); + pos = out.output().tqfind( "Copyright") + 14; + endPos = out.output().tqfind( "\n", pos ); // cdrecord does not use local encoding for the copyright statement but plain latin1 - bin->copyright = QString::fromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace(); + bin->copyright = TQString::tqfromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace(); } else { kdDebug() << "(K3bCdrecordProgram) could not start " << path << endl; @@ -195,7 +195,7 @@ bool K3bCdrecordProgram::scan( const QString& p ) if( !m_dvdPro && bin->version.suffix().endsWith( "-dvd" ) ) { bin->addFeature( "dvd-patch" ); - bin->version = QString(bin->version.versionString()).remove("-dvd"); + bin->version = TQString(bin->version.versionString()).remove("-dvd"); } // probe features @@ -203,17 +203,17 @@ bool K3bCdrecordProgram::scan( const QString& p ) out.setProcess( &fp ); fp << path << "-help"; if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { - if( out.output().contains( "gracetime" ) ) + if( out.output().tqcontains( "gracetime" ) ) bin->addFeature( "gracetime" ); - if( out.output().contains( "-overburn" ) ) + if( out.output().tqcontains( "-overburn" ) ) bin->addFeature( "overburn" ); - if( out.output().contains( "-text" ) ) + if( out.output().tqcontains( "-text" ) ) bin->addFeature( "cdtext" ); - if( out.output().contains( "-clone" ) ) + if( out.output().tqcontains( "-clone" ) ) bin->addFeature( "clone" ); - if( out.output().contains( "-tao" ) ) + if( out.output().tqcontains( "-tao" ) ) bin->addFeature( "tao" ); - if( out.output().contains( "cuefile=" ) && + if( out.output().tqcontains( "cuefile=" ) && ( wodim || bin->version > K3bVersion( 2, 1, -1, "a14") ) ) // cuefile handling was still buggy in a14 bin->addFeature( "cuefile" ); @@ -222,14 +222,14 @@ bool K3bCdrecordProgram::scan( const QString& p ) // just double-checked and the help page is proper but there is no harm in having // two checks) // and the version check does not handle versions like 2.01-dvd properly - if( out.output().contains( "-xamix" ) || + if( out.output().tqcontains( "-xamix" ) || bin->version >= K3bVersion( 2, 1, -1, "a12" ) || wodim ) bin->addFeature( "xamix" ); // check if we run cdrecord as root struct stat s; - if( !::stat( QFile::encodeName(path), &s ) ) { + if( !::stat( TQFile::encodeName(path), &s ) ) { if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) bin->addFeature( "suidroot" ); } @@ -271,23 +271,23 @@ K3bMkisofsProgram::K3bMkisofsProgram() { } -bool K3bMkisofsProgram::scan( const QString& p ) +bool K3bMkisofsProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; bool genisoimage = false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); - if( QFile::exists( path + "genisoimage" ) ) { + if( TQFile::exists( path + "genisoimage" ) ) { genisoimage = true; path += "genisoimage"; } - else if( QFile::exists( path + "mkisofs" ) ) { + else if( TQFile::exists( path + "mkisofs" ) ) { path += "mkisofs"; } else @@ -303,18 +303,18 @@ bool K3bMkisofsProgram::scan( const QString& p ) if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { int pos = -1; if( genisoimage ) - pos = out.output().find( "genisoimage" ); + pos = out.output().tqfind( "genisoimage" ); else - pos = out.output().find( "mkisofs" ); + pos = out.output().tqfind( "mkisofs" ); if( pos < 0 ) return false; - pos = out.output().find( QRegExp("[0-9]"), pos ); + pos = out.output().tqfind( TQRegExp("[0-9]"), pos ); if( pos < 0 ) return false; - int endPos = out.output().find( ' ', pos+1 ); + int endPos = out.output().tqfind( ' ', pos+1 ); if( endPos < 0 ) return false; @@ -337,20 +337,20 @@ bool K3bMkisofsProgram::scan( const QString& p ) fp << path << "-help"; out.setProcess( &fp ); if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { - if( out.output().contains( "-udf" ) ) + if( out.output().tqcontains( "-udf" ) ) bin->addFeature( "udf" ); - if( out.output().contains( "-dvd-video" ) ) + if( out.output().tqcontains( "-dvd-video" ) ) bin->addFeature( "dvd-video" ); - if( out.output().contains( "-joliet-long" ) ) + if( out.output().tqcontains( "-joliet-long" ) ) bin->addFeature( "joliet-long" ); - if( out.output().contains( "-xa" ) ) + if( out.output().tqcontains( "-xa" ) ) bin->addFeature( "xa" ); - if( out.output().contains( "-sectype" ) ) + if( out.output().tqcontains( "-sectype" ) ) bin->addFeature( "sectype" ); // check if we run mkisofs as root struct stat s; - if( !::stat( QFile::encodeName(path), &s ) ) { + if( !::stat( TQFile::encodeName(path), &s ) ) { if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) bin->addFeature( "suidroot" ); } @@ -383,30 +383,30 @@ K3bReadcdProgram::K3bReadcdProgram() { } -bool K3bReadcdProgram::scan( const QString& p ) +bool K3bReadcdProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; bool readom = false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); - if( QFile::exists( path + "readom" ) ) { + if( TQFile::exists( path + "readom" ) ) { readom = true; path += "readom"; } - else if( QFile::exists( path + "readcd" ) ) { + else if( TQFile::exists( path + "readcd" ) ) { path += "readcd"; } else return false; } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -418,17 +418,17 @@ bool K3bReadcdProgram::scan( const QString& p ) if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { int pos = -1; if( readom ) - pos = out.output().find( "readom" ); + pos = out.output().tqfind( "readom" ); else - pos = out.output().find( "readcd" ); + pos = out.output().tqfind( "readcd" ); if( pos < 0 ) return false; - pos = out.output().find( QRegExp("[0-9]"), pos ); + pos = out.output().tqfind( TQRegExp("[0-9]"), pos ); if( pos < 0 ) return false; - int endPos = out.output().find( ' ', pos+1 ); + int endPos = out.output().tqfind( ' ', pos+1 ); if( endPos < 0 ) return false; @@ -451,12 +451,12 @@ bool K3bReadcdProgram::scan( const QString& p ) fp << path << "-help"; out.setProcess( &fp ); if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { - if( out.output().contains( "-clone" ) ) + if( out.output().tqcontains( "-clone" ) ) bin->addFeature( "clone" ); // check if we run mkisofs as root struct stat s; - if( !::stat( QFile::encodeName(path), &s ) ) { + if( !::stat( TQFile::encodeName(path), &s ) ) { if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) bin->addFeature( "suidroot" ); } @@ -484,20 +484,20 @@ K3bCdrdaoProgram::K3bCdrdaoProgram() { } -bool K3bCdrdaoProgram::scan( const QString& p ) +bool K3bCdrdaoProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append("cdrdao"); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -507,15 +507,15 @@ bool K3bCdrdaoProgram::scan( const QString& p ) vp << path ; K3bProcessOutputCollector out( &vp ); if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "Cdrdao version" ); + int pos = out.output().tqfind( "Cdrdao version" ); if( pos < 0 ) return false; - pos = out.output().find( QRegExp("[0-9]"), pos ); + pos = out.output().tqfind( TQRegExp("[0-9]"), pos ); if( pos < 0 ) return false; - int endPos = out.output().find( ' ', pos+1 ); + int endPos = out.output().tqfind( ' ', pos+1 ); if( endPos < 0 ) return false; @@ -523,8 +523,8 @@ bool K3bCdrdaoProgram::scan( const QString& p ) bin->path = path; bin->version = out.output().mid( pos, endPos-pos ); - pos = out.output().find( "(C)", endPos+1 ) + 4; - endPos = out.output().find( '\n', pos ); + pos = out.output().tqfind( "(C)", endPos+1 ) + 4; + endPos = out.output().tqfind( '\n', pos ); bin->copyright = out.output().mid( pos, endPos-pos ); } else { @@ -539,17 +539,17 @@ bool K3bCdrdaoProgram::scan( const QString& p ) fp << path << "write" << "-h"; out.setProcess( &fp ); if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { - if( out.output().contains( "--overburn" ) ) + if( out.output().tqcontains( "--overburn" ) ) bin->addFeature( "overburn" ); - if( out.output().contains( "--multi" ) ) + if( out.output().tqcontains( "--multi" ) ) bin->addFeature( "multisession" ); - if( out.output().contains( "--buffer-under-run-protection" ) ) + if( out.output().tqcontains( "--buffer-under-run-protection" ) ) bin->addFeature( "disable-burnproof" ); // check if we run cdrdao as root struct stat s; - if( !::stat( QFile::encodeName(path), &s ) ) { + if( !::stat( TQFile::encodeName(path), &s ) ) { if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) bin->addFeature( "suidroot" ); } @@ -578,24 +578,24 @@ bool K3bCdrdaoProgram::scan( const QString& p ) } -K3bTranscodeProgram::K3bTranscodeProgram( const QString& transcodeProgram ) +K3bTranscodeProgram::K3bTranscodeProgram( const TQString& transcodeProgram ) : K3bExternalProgram( transcodeProgram ), m_transcodeProgram( transcodeProgram ) { } -bool K3bTranscodeProgram::scan( const QString& p ) +bool K3bTranscodeProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; + TQString path = p; if( path[path.length()-1] != '/' ) path.append("/"); - QString appPath = path + m_transcodeProgram; + TQString appPath = path + m_transcodeProgram; - if( !QFile::exists( appPath ) ) + if( !TQFile::exists( appPath ) ) return false; K3bExternalBin* bin = 0; @@ -605,13 +605,13 @@ bool K3bTranscodeProgram::scan( const QString& p ) vp << appPath << "-v"; K3bProcessOutputCollector out( &vp ); if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "transcode v" ); + int pos = out.output().tqfind( "transcode v" ); if( pos < 0 ) return false; pos += 11; - int endPos = out.output().find( QRegExp("[\\s\\)]"), pos+1 ); + int endPos = out.output().tqfind( TQRegExp("[\\s\\)]"), pos+1 ); if( endPos < 0 ) return false; @@ -627,20 +627,20 @@ bool K3bTranscodeProgram::scan( const QString& p ) // // Check features // - QString modInfoBin = path + "tcmodinfo"; + TQString modInfoBin = path + "tcmodinfo"; KProcess modp; modp << modInfoBin << "-p"; out.setProcess( &modp ); if( modp.start( KProcess::Block, KProcess::AllOutput ) ) { - QString modPath = out.output().stripWhiteSpace(); - QDir modDir( modPath ); - if( !modDir.entryList( "*export_xvid*", QDir::Files ).isEmpty() ) + TQString modPath = out.output().stripWhiteSpace(); + TQDir modDir( modPath ); + if( !modDir.entryList( "*export_xvid*", TQDir::Files ).isEmpty() ) bin->addFeature( "xvid" ); - if( !modDir.entryList( "*export_lame*", QDir::Files ).isEmpty() ) + if( !modDir.entryList( "*export_lame*", TQDir::Files ).isEmpty() ) bin->addFeature( "lame" ); - if( !modDir.entryList( "*export_ffmpeg*", QDir::Files ).isEmpty() ) + if( !modDir.entryList( "*export_ffmpeg*", TQDir::Files ).isEmpty() ) bin->addFeature( "ffmpeg" ); - if( !modDir.entryList( "*export_ac3*", QDir::Files ).isEmpty() ) + if( !modDir.entryList( "*export_ac3*", TQDir::Files ).isEmpty() ) bin->addFeature( "ac3" ); } @@ -650,26 +650,26 @@ bool K3bTranscodeProgram::scan( const QString& p ) -K3bVcdbuilderProgram::K3bVcdbuilderProgram( const QString& p ) +K3bVcdbuilderProgram::K3bVcdbuilderProgram( const TQString& p ) : K3bExternalProgram( p ), m_vcdbuilderProgram( p ) { } -bool K3bVcdbuilderProgram::scan( const QString& p ) +bool K3bVcdbuilderProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append(m_vcdbuilderProgram); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -679,13 +679,13 @@ bool K3bVcdbuilderProgram::scan( const QString& p ) vp << path << "-V"; K3bProcessOutputCollector out( &vp ); if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "GNU VCDImager" ); + int pos = out.output().tqfind( "GNU VCDImager" ); if( pos < 0 ) return false; pos += 14; - int endPos = out.output().find( QRegExp("[\\n\\)]"), pos+1 ); + int endPos = out.output().tqfind( TQRegExp("[\\n\\)]"), pos+1 ); if( endPos < 0 ) return false; @@ -693,8 +693,8 @@ bool K3bVcdbuilderProgram::scan( const QString& p ) bin->path = path; bin->version = out.output().mid( pos, endPos-pos ).stripWhiteSpace(); - pos = out.output().find( "Copyright" ) + 14; - endPos = out.output().find( "\n", pos ); + pos = out.output().tqfind( "Copyright" ) + 14; + endPos = out.output().tqfind( "\n", pos ); bin->copyright = out.output().mid( pos, endPos-pos ).stripWhiteSpace(); } else { @@ -713,20 +713,20 @@ K3bNormalizeProgram::K3bNormalizeProgram() } -bool K3bNormalizeProgram::scan( const QString& p ) +bool K3bNormalizeProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append("normalize-audio"); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -737,15 +737,15 @@ bool K3bNormalizeProgram::scan( const QString& p ) vp << path << "--version"; if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "normalize" ); + int pos = out.output().tqfind( "normalize" ); if( pos < 0 ) return false; - pos = out.output().find( QRegExp("\\d"), pos ); + pos = out.output().tqfind( TQRegExp("\\d"), pos ); if( pos < 0 ) return false; - int endPos = out.output().find( QRegExp("\\s"), pos+1 ); + int endPos = out.output().tqfind( TQRegExp("\\s"), pos+1 ); if( endPos < 0 ) return false; @@ -753,8 +753,8 @@ bool K3bNormalizeProgram::scan( const QString& p ) bin->path = path; bin->version = out.output().mid( pos, endPos-pos ); - pos = out.output().find( "Copyright" )+14; - endPos = out.output().find( "\n", pos ); + pos = out.output().tqfind( "Copyright" )+14; + endPos = out.output().tqfind( "\n", pos ); bin->copyright = out.output().mid( pos, endPos-pos ).stripWhiteSpace(); } else { @@ -772,20 +772,20 @@ K3bGrowisofsProgram::K3bGrowisofsProgram() { } -bool K3bGrowisofsProgram::scan( const QString& p ) +bool K3bGrowisofsProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append("growisofs"); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -796,15 +796,15 @@ bool K3bGrowisofsProgram::scan( const QString& p ) vp << path << "-version"; if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "growisofs" ); + int pos = out.output().tqfind( "growisofs" ); if( pos < 0 ) return false; - pos = out.output().find( QRegExp("\\d"), pos ); + pos = out.output().tqfind( TQRegExp("\\d"), pos ); if( pos < 0 ) return false; - int endPos = out.output().find( ",", pos+1 ); + int endPos = out.output().tqfind( ",", pos+1 ); if( endPos < 0 ) return false; @@ -822,7 +822,7 @@ bool K3bGrowisofsProgram::scan( const QString& p ) // check if we run growisofs as root struct stat s; - if( !::stat( QFile::encodeName(path), &s ) ) { + if( !::stat( TQFile::encodeName(path), &s ) ) { if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) bin->addFeature( "suidroot" ); } @@ -837,20 +837,20 @@ K3bDvdformatProgram::K3bDvdformatProgram() { } -bool K3bDvdformatProgram::scan( const QString& p ) +bool K3bDvdformatProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append("dvd+rw-format"); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -863,18 +863,18 @@ bool K3bDvdformatProgram::scan( const QString& p ) if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { // different locales make searching for the +- char difficult // so we simply ignore it. - int pos = out.output().find( QRegExp("DVD.*RAM format utility") ); + int pos = out.output().tqfind( TQRegExp("DVD.*RAM format utility") ); if( pos < 0 ) return false; - pos = out.output().find( "version", pos ); + pos = out.output().tqfind( "version", pos ); if( pos < 0 ) return false; pos += 8; // the version ends in a dot. - int endPos = out.output().find( QRegExp("\\.\\D"), pos ); + int endPos = out.output().tqfind( TQRegExp("\\.\\D"), pos ); if( endPos < 0 ) return false; @@ -892,7 +892,7 @@ bool K3bDvdformatProgram::scan( const QString& p ) // check if we run dvd+rw-format as root struct stat s; - if( !::stat( QFile::encodeName(path), &s ) ) { + if( !::stat( TQFile::encodeName(path), &s ) ) { if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) bin->addFeature( "suidroot" ); } @@ -907,20 +907,20 @@ K3bDvdBooktypeProgram::K3bDvdBooktypeProgram() { } -bool K3bDvdBooktypeProgram::scan( const QString& p ) +bool K3bDvdBooktypeProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append("dvd+rw-booktype"); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -931,7 +931,7 @@ bool K3bDvdBooktypeProgram::scan( const QString& p ) vp << path; if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "dvd+rw-booktype" ); + int pos = out.output().tqfind( "dvd+rw-booktype" ); if( pos < 0 ) return false; @@ -956,20 +956,20 @@ K3bCdda2wavProgram::K3bCdda2wavProgram() { } -bool K3bCdda2wavProgram::scan( const QString& p ) +bool K3bCdda2wavProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append("cdda2wav"); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -980,18 +980,18 @@ bool K3bCdda2wavProgram::scan( const QString& p ) vp << path << "-h"; if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "cdda2wav" ); + int pos = out.output().tqfind( "cdda2wav" ); if( pos < 0 ) return false; - pos = out.output().find( "Version", pos ); + pos = out.output().tqfind( "Version", pos ); if( pos < 0 ) return false; pos += 8; // the version does not end in a space but the kernel info - int endPos = out.output().find( QRegExp("[^\\d\\.]"), pos ); + int endPos = out.output().tqfind( TQRegExp("[^\\d\\.]"), pos ); if( endPos < 0 ) return false; @@ -1001,15 +1001,15 @@ bool K3bCdda2wavProgram::scan( const QString& p ) // features (we do this since the cdda2wav help says that the short // options will disappear soon) - if( out.output().find( "-info-only" ) ) + if( out.output().tqfind( "-info-only" ) ) bin->addFeature( "info-only" ); // otherwise use the -J option - if( out.output().find( "-no-infofile" ) ) + if( out.output().tqfind( "-no-infofile" ) ) bin->addFeature( "no-infofile" ); // otherwise use the -H option - if( out.output().find( "-gui" ) ) + if( out.output().tqfind( "-gui" ) ) bin->addFeature( "gui" ); // otherwise use the -g option - if( out.output().find( "-bulk" ) ) + if( out.output().tqfind( "-bulk" ) ) bin->addFeature( "bulk" ); // otherwise use the -B option - if( out.output().find( "dev=" ) ) + if( out.output().tqfind( "dev=" ) ) bin->addFeature( "dev" ); // otherwise use the -B option } else { @@ -1019,7 +1019,7 @@ bool K3bCdda2wavProgram::scan( const QString& p ) // check if we run as root struct stat s; - if( !::stat( QFile::encodeName(path), &s ) ) { + if( !::stat( TQFile::encodeName(path), &s ) ) { if( (s.st_mode & S_ISUID) && s.st_uid == 0 ) bin->addFeature( "suidroot" ); } diff --git a/libk3b/core/k3bdefaultexternalprograms.h b/libk3b/core/k3bdefaultexternalprograms.h index 3212727..bc4d41c 100644 --- a/libk3b/core/k3bdefaultexternalprograms.h +++ b/libk3b/core/k3bdefaultexternalprograms.h @@ -35,7 +35,7 @@ class LIBK3B_EXPORT K3bCdrecordProgram : public K3bExternalProgram public: K3bCdrecordProgram( bool dvdPro ); - bool scan( const QString& ); + bool scan( const TQString& ); private: bool m_dvdPro; @@ -47,7 +47,7 @@ class LIBK3B_EXPORT K3bMkisofsProgram : public K3bExternalProgram public: K3bMkisofsProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); }; @@ -56,7 +56,7 @@ class LIBK3B_EXPORT K3bReadcdProgram : public K3bExternalProgram public: K3bReadcdProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); }; @@ -65,34 +65,34 @@ class LIBK3B_EXPORT K3bCdrdaoProgram : public K3bExternalProgram public: K3bCdrdaoProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); }; class LIBK3B_EXPORT K3bTranscodeProgram : public K3bExternalProgram { public: - K3bTranscodeProgram( const QString& transcodeProgram ); + K3bTranscodeProgram( const TQString& transcodeProgram ); - bool scan( const QString& ); + bool scan( const TQString& ); // no user parameters (yet) bool supportsUserParameters() const { return false; } private: - QString m_transcodeProgram; + TQString m_transcodeProgram; }; class LIBK3B_EXPORT K3bVcdbuilderProgram : public K3bExternalProgram { public: - K3bVcdbuilderProgram( const QString& ); + K3bVcdbuilderProgram( const TQString& ); - bool scan( const QString& ); + bool scan( const TQString& ); private: - QString m_vcdbuilderProgram; + TQString m_vcdbuilderProgram; }; @@ -101,7 +101,7 @@ class LIBK3B_EXPORT K3bNormalizeProgram : public K3bExternalProgram public: K3bNormalizeProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); }; @@ -110,7 +110,7 @@ class LIBK3B_EXPORT K3bGrowisofsProgram : public K3bExternalProgram public: K3bGrowisofsProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); }; @@ -119,7 +119,7 @@ class LIBK3B_EXPORT K3bDvdformatProgram : public K3bExternalProgram public: K3bDvdformatProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); }; @@ -128,7 +128,7 @@ class LIBK3B_EXPORT K3bDvdBooktypeProgram : public K3bExternalProgram public: K3bDvdBooktypeProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); }; @@ -137,7 +137,7 @@ class LIBK3B_EXPORT K3bCdda2wavProgram : public K3bExternalProgram public: K3bCdda2wavProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); }; #endif diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp index 2b21a85..7afc81e 100644 --- a/libk3b/core/k3bexternalbinmanager.cpp +++ b/libk3b/core/k3bexternalbinmanager.cpp @@ -20,11 +20,11 @@ #include <kconfig.h> #include <kdeversion.h> -#include <qstring.h> -#include <qregexp.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqptrlist.h> #include <unistd.h> #include <sys/stat.h> @@ -32,7 +32,7 @@ -QString K3bExternalBinManager::m_noPath = ""; +TQString K3bExternalBinManager::m_noPath = ""; // /////////////////////////////////////////////////////////// @@ -53,25 +53,25 @@ bool K3bExternalBin::isEmpty() const } -const QString& K3bExternalBin::name() const +const TQString& K3bExternalBin::name() const { return m_program->name(); } -bool K3bExternalBin::hasFeature( const QString& f ) const +bool K3bExternalBin::hasFeature( const TQString& f ) const { - return m_features.contains( f ); + return m_features.tqcontains( f ); } -void K3bExternalBin::addFeature( const QString& f ) +void K3bExternalBin::addFeature( const TQString& f ) { m_features.append( f ); } -const QStringList& K3bExternalBin::userParameters() const +const TQStringList& K3bExternalBin::userParameters() const { return m_program->userParameters(); } @@ -85,7 +85,7 @@ const QStringList& K3bExternalBin::userParameters() const // /////////////////////////////////////////////////////////// -K3bExternalProgram::K3bExternalProgram( const QString& name ) +K3bExternalProgram::K3bExternalProgram( const TQString& name ) : m_name( name ) { m_bins.setAutoDelete( true ); @@ -99,7 +99,7 @@ K3bExternalProgram::~K3bExternalProgram() const K3bExternalBin* K3bExternalProgram::mostRecentBin() const { - QPtrListIterator<K3bExternalBin> it( m_bins ); + TQPtrListIterator<K3bExternalBin> it( m_bins ); K3bExternalBin* bin = *it; ++it; while( *it ) { @@ -113,7 +113,7 @@ const K3bExternalBin* K3bExternalProgram::mostRecentBin() const void K3bExternalProgram::addBin( K3bExternalBin* bin ) { - if( !m_bins.contains( bin ) ) { + if( !m_bins.tqcontains( bin ) ) { // insertion sort // the first bin in the list is always the one used // so we default to using the newest one @@ -127,17 +127,17 @@ void K3bExternalProgram::addBin( K3bExternalBin* bin ) void K3bExternalProgram::setDefault( const K3bExternalBin* bin ) { - if( m_bins.contains( bin ) ) - m_bins.take( m_bins.find( bin ) ); + if( m_bins.tqcontains( bin ) ) + m_bins.take( m_bins.tqfind( bin ) ); // the first bin in the list is always the one used m_bins.insert( 0, bin ); } -void K3bExternalProgram::setDefault( const QString& path ) +void K3bExternalProgram::setDefault( const TQString& path ) { - for( QPtrListIterator<K3bExternalBin> it( m_bins ); it.current(); ++it ) { + for( TQPtrListIterator<K3bExternalBin> it( m_bins ); it.current(); ++it ) { if( it.current()->path == path ) { setDefault( it.current() ); return; @@ -146,9 +146,9 @@ void K3bExternalProgram::setDefault( const QString& path ) } -void K3bExternalProgram::addUserParameter( const QString& p ) +void K3bExternalProgram::addUserParameter( const TQString& p ) { - if( !m_userParameters.contains( p ) ) + if( !m_userParameters.tqcontains( p ) ) m_userParameters.append(p); } @@ -161,8 +161,8 @@ void K3bExternalProgram::addUserParameter( const QString& p ) // /////////////////////////////////////////////////////////// -K3bExternalBinManager::K3bExternalBinManager( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bExternalBinManager::K3bExternalBinManager( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { } @@ -184,14 +184,14 @@ bool K3bExternalBinManager::readConfig( KConfig* c ) search(); - for ( QMap<QString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) { + for ( TQMap<TQString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) { K3bExternalProgram* p = it.data(); if( c->hasKey( p->name() + " default" ) ) { p->setDefault( c->readEntry( p->name() + " default" ) ); } if( c->hasKey( p->name() + " user parameters" ) ) { - QStringList list = c->readListEntry( p->name() + " user parameters" ); - for( QStringList::iterator strIt = list.begin(); strIt != list.end(); ++strIt ) + TQStringList list = c->readListEntry( p->name() + " user parameters" ); + for( TQStringList::iterator strIt = list.begin(); strIt != list.end(); ++strIt ) p->addUserParameter( *strIt ); } if( c->hasKey( p->name() + " last seen newest version" ) ) { @@ -212,7 +212,7 @@ bool K3bExternalBinManager::saveConfig( KConfig* c ) c->setGroup( "External Programs" ); c->writePathEntry( "search path", m_searchPath ); - for ( QMap<QString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) { + for ( TQMap<TQString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) { K3bExternalProgram* p = it.data(); if( p->defaultBin() ) c->writeEntry( p->name() + " default", p->defaultBin()->path ); @@ -228,18 +228,18 @@ bool K3bExternalBinManager::saveConfig( KConfig* c ) } -bool K3bExternalBinManager::foundBin( const QString& name ) +bool K3bExternalBinManager::foundBin( const TQString& name ) { - if( m_programs.find( name ) == m_programs.end() ) + if( m_programs.tqfind( name ) == m_programs.end() ) return false; else return (m_programs[name]->defaultBin() != 0); } -const QString& K3bExternalBinManager::binPath( const QString& name ) +const TQString& K3bExternalBinManager::binPath( const TQString& name ) { - if( m_programs.find( name ) == m_programs.end() ) + if( m_programs.tqfind( name ) == m_programs.end() ) return m_noPath; if( m_programs[name]->defaultBin() != 0 ) @@ -249,9 +249,9 @@ const QString& K3bExternalBinManager::binPath( const QString& name ) } -const K3bExternalBin* K3bExternalBinManager::binObject( const QString& name ) +const K3bExternalBin* K3bExternalBinManager::binObject( const TQString& name ) { - if( m_programs.find( name ) == m_programs.end() ) + if( m_programs.tqfind( name ) == m_programs.end() ) return 0; return m_programs[name]->defaultBin(); @@ -266,7 +266,7 @@ void K3bExternalBinManager::addProgram( K3bExternalProgram* p ) void K3bExternalBinManager::clear() { - for( QMap<QString, K3bExternalProgram*>::Iterator it = m_programs.begin(); it != m_programs.end(); ++it ) + for( TQMap<TQString, K3bExternalProgram*>::Iterator it = m_programs.begin(); it != m_programs.end(); ++it ) delete it.data(); m_programs.clear(); } @@ -277,36 +277,36 @@ void K3bExternalBinManager::search() if( m_searchPath.isEmpty() ) loadDefaultSearchPath(); - for( QMap<QString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) { + for( TQMap<TQString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) { it.data()->clear(); } // do not search one path twice - QStringList paths; - for( QStringList::const_iterator it = m_searchPath.begin(); it != m_searchPath.end(); ++it ) { - QString p = *it; + TQStringList paths; + for( TQStringList::const_iterator it = m_searchPath.begin(); it != m_searchPath.end(); ++it ) { + TQString p = *it; if( p[p.length()-1] == '/' ) p.truncate( p.length()-1 ); - if( !paths.contains( p ) && !paths.contains( p + "/" ) ) + if( !paths.tqcontains( p ) && !paths.tqcontains( p + "/" ) ) paths.append(p); } // get the environment path variable char* env_path = ::getenv("PATH"); if( env_path ) { - QStringList env_pathList = QStringList::split(":", QString::fromLocal8Bit(env_path)); - for( QStringList::const_iterator it = env_pathList.begin(); it != env_pathList.end(); ++it ) { - QString p = *it; + TQStringList env_pathList = TQStringList::split(":", TQString::fromLocal8Bit(env_path)); + for( TQStringList::const_iterator it = env_pathList.begin(); it != env_pathList.end(); ++it ) { + TQString p = *it; if( p[p.length()-1] == '/' ) p.truncate( p.length()-1 ); - if( !paths.contains( p ) && !paths.contains( p + "/" ) ) + if( !paths.tqcontains( p ) && !paths.tqcontains( p + "/" ) ) paths.append(p); } } - for( QStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) - for( QMap<QString, K3bExternalProgram*>::iterator pit = m_programs.begin(); pit != m_programs.end(); ++pit ) + for( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) + for( TQMap<TQString, K3bExternalProgram*>::iterator pit = m_programs.begin(); pit != m_programs.end(); ++pit ) pit.data()->scan(*it); // TESTING @@ -332,9 +332,9 @@ void K3bExternalBinManager::search() } -K3bExternalProgram* K3bExternalBinManager::program( const QString& name ) const +K3bExternalProgram* K3bExternalBinManager::program( const TQString& name ) const { - if( m_programs.find( name ) == m_programs.end() ) + if( m_programs.tqfind( name ) == m_programs.end() ) return 0; else return m_programs[name]; @@ -358,26 +358,26 @@ void K3bExternalBinManager::loadDefaultSearchPath() } -void K3bExternalBinManager::setSearchPath( const QStringList& list ) +void K3bExternalBinManager::setSearchPath( const TQStringList& list ) { loadDefaultSearchPath(); - for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) { - if( !m_searchPath.contains( *it ) ) + for( TQStringList::const_iterator it = list.begin(); it != list.end(); ++it ) { + if( !m_searchPath.tqcontains( *it ) ) m_searchPath.append( *it ); } } -void K3bExternalBinManager::addSearchPath( const QString& path ) +void K3bExternalBinManager::addSearchPath( const TQString& path ) { - if( !m_searchPath.contains( path ) ) + if( !m_searchPath.tqcontains( path ) ) m_searchPath.append( path ); } -const K3bExternalBin* K3bExternalBinManager::mostRecentBinObject( const QString& name ) +const K3bExternalBin* K3bExternalBinManager::mostRecentBinObject( const TQString& name ) { if( K3bExternalProgram* p = program( name ) ) return p->mostRecentBin(); diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h index e7fe601..11a8dcb 100644 --- a/libk3b/core/k3bexternalbinmanager.h +++ b/libk3b/core/k3bexternalbinmanager.h @@ -16,11 +16,11 @@ #ifndef K3B_EXTERNAL_BIN_MANAGER_H #define K3B_EXTERNAL_BIN_MANAGER_H -#include <qmap.h> -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qptrlist.h> +#include <tqmap.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqptrlist.h> #include "k3b_export.h" #include "k3bversion.h" @@ -44,21 +44,21 @@ class LIBK3B_EXPORT K3bExternalBin virtual ~K3bExternalBin() {} K3bVersion version; - QString path; - QString copyright; + TQString path; + TQString copyright; - const QString& name() const; + const TQString& name() const; bool isEmpty() const; - const QStringList& userParameters() const; - const QStringList& features() const { return m_features; } + const TQStringList& userParameters() const; + const TQStringList& features() const { return m_features; } - bool hasFeature( const QString& ) const; - void addFeature( const QString& ); + bool hasFeature( const TQString& ) const; + void addFeature( const TQString& ); K3bExternalProgram* program() const { return m_program; } private: - QStringList m_features; + TQStringList m_features; K3bExternalProgram* m_program; }; @@ -72,31 +72,31 @@ class LIBK3B_EXPORT K3bExternalBin class LIBK3B_EXPORT K3bExternalProgram { public: - K3bExternalProgram( const QString& name ); + K3bExternalProgram( const TQString& name ); virtual ~K3bExternalProgram(); const K3bExternalBin* defaultBin() const { return m_bins.getFirst(); } const K3bExternalBin* mostRecentBin() const; - void addUserParameter( const QString& ); - void setUserParameters( const QStringList& list ) { m_userParameters = list; } + void addUserParameter( const TQString& ); + void setUserParameters( const TQStringList& list ) { m_userParameters = list; } - const QStringList& userParameters() const { return m_userParameters; } - const QString& name() const { return m_name; } + const TQStringList& userParameters() const { return m_userParameters; } + const TQString& name() const { return m_name; } void addBin( K3bExternalBin* ); void clear() { m_bins.clear(); } void setDefault( const K3bExternalBin* ); - void setDefault( const QString& path ); + void setDefault( const TQString& path ); - const QPtrList<K3bExternalBin>& bins() const { return m_bins; } + const TQPtrList<K3bExternalBin>& bins() const { return m_bins; } /** * this scans for the program in the given path, * adds the found bin object to the list and returnes true. * if nothing could be found false is returned. */ - virtual bool scan( const QString& ) {return false;}//= 0; + virtual bool scan( const TQString& ) {return false;}//= 0; /** * reimplement this if it does not make sense to have the user be able @@ -105,18 +105,19 @@ class LIBK3B_EXPORT K3bExternalProgram virtual bool supportsUserParameters() const { return true; } private: - QString m_name; - QStringList m_userParameters; - QPtrList<K3bExternalBin> m_bins; + TQString m_name; + TQStringList m_userParameters; + TQPtrList<K3bExternalBin> m_bins; }; -class LIBK3B_EXPORT K3bExternalBinManager : public QObject +class LIBK3B_EXPORT K3bExternalBinManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bExternalBinManager( QObject* parent = 0, const char* name = 0 ); + K3bExternalBinManager( TQObject* tqparent = 0, const char* name = 0 ); ~K3bExternalBinManager(); void search(); @@ -132,31 +133,31 @@ class LIBK3B_EXPORT K3bExternalBinManager : public QObject */ bool saveConfig( KConfig* ); - bool foundBin( const QString& name ); - const QString& binPath( const QString& name ); - const K3bExternalBin* binObject( const QString& name ); - const K3bExternalBin* mostRecentBinObject( const QString& name ); + bool foundBin( const TQString& name ); + const TQString& binPath( const TQString& name ); + const K3bExternalBin* binObject( const TQString& name ); + const K3bExternalBin* mostRecentBinObject( const TQString& name ); - K3bExternalProgram* program( const QString& ) const; - const QMap<QString, K3bExternalProgram*>& programs() const { return m_programs; } + K3bExternalProgram* program( const TQString& ) const; + const TQMap<TQString, K3bExternalProgram*>& programs() const { return m_programs; } /** always extends the default searchpath */ - void setSearchPath( const QStringList& ); - void addSearchPath( const QString& ); + void setSearchPath( const TQStringList& ); + void addSearchPath( const TQString& ); void loadDefaultSearchPath(); - const QStringList& searchPath() const { return m_searchPath; } + const TQStringList& searchPath() const { return m_searchPath; } void addProgram( K3bExternalProgram* ); void clear(); private: - QMap<QString, K3bExternalProgram*> m_programs; - QStringList m_searchPath; + TQMap<TQString, K3bExternalProgram*> m_programs; + TQStringList m_searchPath; - static QString m_noPath; // used for binPath() to return const string + static TQString m_noPath; // used for binPath() to return const string - QString m_gatheredOutput; + TQString m_gatheredOutput; }; #endif diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index fc5a4e1..f5a9e29 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -38,9 +38,9 @@ #include <dcopref.h> #include <kprocess.h> -#include <qdatastream.h> -#include <qdir.h> -#include <qfile.h> +#include <tqdatastream.h> +#include <tqdir.h> +#include <tqfile.h> #include <cmath> #include <sys/utsname.h> @@ -88,13 +88,13 @@ struct Sample { }; */ -QString K3b::framesToString( int h, bool showFrames ) +TQString K3b::framesToString( int h, bool showFrames ) { int m = h / 4500; int s = (h % 4500) / 75; int f = h % 75; - QString str; + TQString str; if( showFrames ) { // cdrdao needs the MSF format where 1 second has 75 frames! @@ -106,28 +106,28 @@ QString K3b::framesToString( int h, bool showFrames ) return str; } -/*QString K3b::sizeToTime(long size) +/*TQString K3b::sizeToTime(long size) { int h = size / sizeof(Sample) / 588; return framesToString(h, false); }*/ -Q_INT16 K3b::swapByteOrder( const Q_INT16& i ) +TQ_INT16 K3b::swapByteOrder( const TQ_INT16& i ) { return bswap_16( i ); //((i << 8) & 0xff00) | ((i >> 8 ) & 0xff); } -Q_INT32 K3b::swapByteOrder( const Q_INT32& i ) +TQ_INT32 K3b::swapByteOrder( const TQ_INT32& i ) { //return ((i << 24) & 0xff000000) | ((i << 8) & 0xff0000) | ((i >> 8) & 0xff00) | ((i >> 24) & 0xff ); return bswap_32( i ); } -Q_INT64 K3b::swapByteOrder( const Q_INT64& i ) +TQ_INT64 K3b::swapByteOrder( const TQ_INT64& i ) { return bswap_64( i ); } @@ -139,75 +139,75 @@ int K3b::round( double d ) } -QString K3b::findUniqueFilePrefix( const QString& _prefix, const QString& path ) +TQString K3b::findUniqueFilePrefix( const TQString& _prefix, const TQString& path ) { - QString url; - if( path.isEmpty() || !QFile::exists(path) ) + TQString url; + if( path.isEmpty() || !TQFile::exists(path) ) url = defaultTempPath(); else url = prepareDir( path ); - QString prefix = _prefix; + TQString prefix = _prefix; if( prefix.isEmpty() ) prefix = "k3b_"; // now create the unique prefix - QDir dir( url ); - QStringList entries = dir.entryList( QDir::DefaultFilter, QDir::Name ); + TQDir dir( url ); + TQStringList entries = dir.entryList( TQDir::DefaultFilter, TQDir::Name ); int i = 0; - for( QStringList::iterator it = entries.begin(); + for( TQStringList::iterator it = entries.begin(); it != entries.end(); ++it ) { - if( (*it).startsWith( prefix + QString::number(i) ) ) { + if( (*it).startsWith( prefix + TQString::number(i) ) ) { i++; it = entries.begin(); } } - return url + prefix + QString::number(i); + return url + prefix + TQString::number(i); } -QString K3b::findTempFile( const QString& ending, const QString& d ) +TQString K3b::findTempFile( const TQString& ending, const TQString& d ) { - return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? QString::null : (QString::fromLatin1(".") + ending) ); + return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::tqfromLatin1(".") + ending) ); } -QString K3b::defaultTempPath() +TQString K3b::defaultTempPath() { - QString oldGroup = kapp->config()->group(); + TQString oldGroup = kapp->config()->group(); kapp->config()->setGroup( "General Options" ); - QString url = kapp->config()->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() ); + TQString url = kapp->config()->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() ); kapp->config()->setGroup( oldGroup ); return prepareDir(url); } -QString K3b::prepareDir( const QString& dir ) +TQString K3b::prepareDir( const TQString& dir ) { return (dir + (dir[dir.length()-1] != '/' ? "/" : "")); } -QString K3b::parentDir( const QString& path ) +TQString K3b::tqparentDir( const TQString& path ) { - QString parent = path; + TQString tqparent = path; if( path[path.length()-1] == '/' ) - parent.truncate( parent.length()-1 ); + tqparent.truncate( tqparent.length()-1 ); - int pos = parent.findRev( '/' ); + int pos = tqparent.tqfindRev( '/' ); if( pos >= 0 ) - parent.truncate( pos+1 ); + tqparent.truncate( pos+1 ); else // relative path, do anything... - parent = "/"; + tqparent = "/"; - return parent; + return tqparent; } -QString K3b::fixupPath( const QString& path ) +TQString K3b::fixupPath( const TQString& path ) { - QString s; + TQString s; bool lastWasSlash = false; for( unsigned int i = 0; i < path.length(); ++i ) { if( path[i] == '/' ) { @@ -232,7 +232,7 @@ K3bVersion K3b::kernelVersion() K3bVersion v; utsname unameinfo; if( ::uname(&unameinfo) == 0 ) { - v = QString::fromLocal8Bit( unameinfo.release ); + v = TQString::fromLocal8Bit( unameinfo.release ); kdDebug() << "kernel version: " << v << endl; } else @@ -247,12 +247,12 @@ K3bVersion K3b::simpleKernelVersion() } -QString K3b::systemName() +TQString K3b::systemName() { - QString v; + TQString v; utsname unameinfo; if( ::uname(&unameinfo) == 0 ) { - v = QString::fromLocal8Bit( unameinfo.sysname ); + v = TQString::fromLocal8Bit( unameinfo.sysname ); } else kdError() << "could not determine system name." << endl; @@ -260,10 +260,10 @@ QString K3b::systemName() } -bool K3b::kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail ) +bool K3b::kbFreeOnFs( const TQString& path, unsigned long& size, unsigned long& avail ) { struct statvfs fs; - if( ::statvfs( QFile::encodeName(path), &fs ) == 0 ) { + if( ::statvfs( TQFile::encodeName(path), &fs ) == 0 ) { unsigned long kBfak = fs.f_frsize/1024; size = fs.f_blocks*kBfak; @@ -280,7 +280,7 @@ KIO::filesize_t K3b::filesize( const KURL& url ) { if( url.isLocalFile() ) { k3b_struct_stat buf; - if ( !k3b_stat( QFile::encodeName( url.path() ), &buf ) ) { + if ( !k3b_stat( TQFile::encodeName( url.path() ), &buf ) ) { return (KIO::filesize_t)buf.st_size; } } @@ -301,19 +301,19 @@ KIO::filesize_t K3b::imageFilesize( const KURL& url ) { KIO::filesize_t size = K3b::filesize( url ); int cnt = 0; - while( KIO::NetAccess::exists( KURL::fromPathOrURL( url.url() + '.' + QString::number(cnt).rightJustify( 3, '0' ) ), true ) ) - size += K3b::filesize( KURL::fromPathOrURL( url.url() + '.' + QString::number(cnt++).rightJustify( 3, '0' ) ) ); + while( KIO::NetAccess::exists( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt).rightJustify( 3, '0' ) ), true ) ) + size += K3b::filesize( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt++).rightJustify( 3, '0' ) ) ); return size; } -QString K3b::cutFilename( const QString& name, unsigned int len ) +TQString K3b::cutFilename( const TQString& name, unsigned int len ) { if( name.length() > len ) { - QString ret = name; + TQString ret = name; // determine extension (we think of an extension to be at most 5 chars in length) - int pos = name.find( '.', -6 ); + int pos = name.tqfind( '.', -6 ); if( pos > 0 ) len -= (name.length() - pos); @@ -329,28 +329,28 @@ QString K3b::cutFilename( const QString& name, unsigned int len ) } -QString K3b::removeFilenameExtension( const QString& name ) +TQString K3b::removeFilenameExtension( const TQString& name ) { - QString v = name; - int dotpos = v.findRev( '.' ); + TQString v = name; + int dotpos = v.tqfindRev( '.' ); if( dotpos > 0 ) v.truncate( dotpos ); return v; } -QString K3b::appendNumberToFilename( const QString& name, int num, unsigned int maxlen ) +TQString K3b::appendNumberToFilename( const TQString& name, int num, unsigned int maxlen ) { // determine extension (we think of an extension to be at most 5 chars in length) - QString result = name; - QString ext; - int pos = name.find( '.', -6 ); + TQString result = name; + TQString ext; + int pos = name.tqfind( '.', -6 ); if( pos > 0 ) { ext = name.mid(pos); result.truncate( pos ); } - ext.prepend( QString::number(num) ); + ext.prepend( TQString::number(num) ); result.truncate( maxlen - ext.length() ); return result + ext; @@ -372,7 +372,7 @@ bool K3b::hackedAtapiSupport() } -QString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExternalBin* bin ) +TQString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExternalBin* bin ) { #ifdef Q_OS_LINUX // @@ -387,11 +387,11 @@ QString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExtern else if( (plainAtapiSupport() && bin->hasFeature("plain-atapi") ) ) return dev->blockDeviceName(); else - return QString("ATAPI:%1").arg(dev->blockDeviceName()); + return TQString("ATAPI:%1").tqarg(dev->blockDeviceName()); } -int K3b::writingAppFromString( const QString& s ) +int K3b::writingAppFromString( const TQString& s ) { if( s.lower() == "cdrdao" ) return K3b::CDRDAO; @@ -408,7 +408,7 @@ int K3b::writingAppFromString( const QString& s ) } -QString K3b::writingModeString( int mode ) +TQString K3b::writingModeString( int mode ) { if( mode == WRITING_MODE_AUTO ) return i18n("Auto"); @@ -417,16 +417,16 @@ QString K3b::writingModeString( int mode ) } -QString K3b::resolveLink( const QString& file ) +TQString K3b::resolveLink( const TQString& file ) { - QFileInfo f( file ); - QStringList steps( f.absFilePath() ); + TQFileInfo f( file ); + TQStringList steps( f.absFilePath() ); while( f.isSymLink() ) { - QString p = f.readLink(); + TQString p = f.readLink(); if( !p.startsWith( "/" ) ) p.prepend( f.dirPath(true) + "/" ); f.setFile( p ); - if( steps.contains( f.absFilePath() ) ) { + if( steps.tqcontains( f.absFilePath() ) ) { kdDebug() << "(K3b) symlink loop detected." << endl; break; } @@ -442,8 +442,8 @@ K3bDevice::Device* K3b::urlToDevice( const KURL& deviceUrl ) if( deviceUrl.protocol() == "media" || deviceUrl.protocol() == "system" ) { kdDebug() << "(K3b) Asking mediamanager for " << deviceUrl.fileName() << endl; DCOPRef mediamanager("kded", "mediamanager"); - DCOPReply reply = mediamanager.call("properties(QString)", deviceUrl.fileName()); - QStringList properties = reply; + DCOPReply reply = mediamanager.call("properties(TQString)", deviceUrl.fileName()); + TQStringList properties = reply; if( !reply.isValid() || properties.count() < 6 ) { kdError() << "(K3b) Invalid reply from mediamanager" << endl; return 0; @@ -493,40 +493,40 @@ KURL::List K3b::convertToLocalUrls( const KURL::List& urls ) } -Q_INT16 K3b::fromLe16( char* data ) +TQ_INT16 K3b::fromLe16( char* data ) { #ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN - return swapByteOrder( *((Q_INT16*)data) ); + return swapByteOrder( *((TQ_INT16*)data) ); #else - return *((Q_INT16*)data); + return *((TQ_INT16*)data); #endif } -Q_INT32 K3b::fromLe32( char* data ) +TQ_INT32 K3b::fromLe32( char* data ) { #ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN - return swapByteOrder( *((Q_INT32*)data) ); + return swapByteOrder( *((TQ_INT32*)data) ); #else - return *((Q_INT32*)data); + return *((TQ_INT32*)data); #endif } -Q_INT64 K3b::fromLe64( char* data ) +TQ_INT64 K3b::fromLe64( char* data ) { #ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN - return swapByteOrder( *((Q_INT64*)data) ); + return swapByteOrder( *((TQ_INT64*)data) ); #else - return *((Q_INT64*)data); + return *((TQ_INT64*)data); #endif } -QString K3b::findExe( const QString& name ) +TQString K3b::findExe( const TQString& name ) { // first we search the path - QString bin = KStandardDirs::findExe( name ); + TQString bin = KStandardDirs::findExe( name ); // then go on with our own little list if( bin.isEmpty() ) @@ -550,7 +550,7 @@ bool K3b::unmount( K3bDevice::Device* dev ) if( !dev ) return false; - QString mntDev = dev->blockDeviceName(); + TQString mntDev = dev->blockDeviceName(); #if KDE_IS_VERSION(3,4,0) // first try to unmount it the standard way @@ -558,7 +558,7 @@ bool K3b::unmount( K3bDevice::Device* dev ) return true; #endif - QString umountBin = K3b::findExe( "umount" ); + TQString umountBin = K3b::findExe( "umount" ); if( !umountBin.isEmpty() ) { KProcess p; p << umountBin; @@ -570,7 +570,7 @@ bool K3b::unmount( K3bDevice::Device* dev ) } // now try pmount - QString pumountBin = K3b::findExe( "pumount" ); + TQString pumountBin = K3b::findExe( "pumount" ); if( !pumountBin.isEmpty() ) { KProcess p; p << pumountBin; @@ -594,7 +594,7 @@ bool K3b::mount( K3bDevice::Device* dev ) if( !dev ) return false; - QString mntDev = dev->blockDeviceName(); + TQString mntDev = dev->blockDeviceName(); #if KDE_IS_VERSION(3,4,0) // first try to mount it the standard way @@ -608,7 +608,7 @@ bool K3b::mount( K3bDevice::Device* dev ) #endif // now try pmount - QString pmountBin = K3b::findExe( "pmount" ); + TQString pmountBin = K3b::findExe( "pmount" ); if( !pmountBin.isEmpty() ) { KProcess p; p << pmountBin; diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h index 2795630..56f7f1b 100644 --- a/libk3b/core/k3bglobals.h +++ b/libk3b/core/k3bglobals.h @@ -21,8 +21,8 @@ #include <config.h> #endif -#include <qstring.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqfile.h> #include <kio/global.h> #include <kurl.h> #include <k3bdevicetypes.h> @@ -62,7 +62,7 @@ namespace K3b DVD_RW_FORMAT = 32 }; - LIBK3B_EXPORT int writingAppFromString( const QString& ); + LIBK3B_EXPORT int writingAppFromString( const TQString& ); /** * DATA_MODE_AUTO - let K3b determine the best mode @@ -106,14 +106,14 @@ namespace K3b WRITING_MODE_RES_OVWR = K3bDevice::WRITINGMODE_RES_OVWR // Restricted Overwrite }; - LIBK3B_EXPORT QString writingModeString( int ); + LIBK3B_EXPORT TQString writingModeString( int ); - LIBK3B_EXPORT QString framesToString( int h, bool showFrames = true ); - /*LIBK3B_EXPORT QString sizeToTime( long size );*/ + LIBK3B_EXPORT TQString framesToString( int h, bool showFrames = true ); + /*LIBK3B_EXPORT TQString sizeToTime( long size );*/ - LIBK3B_EXPORT Q_INT16 swapByteOrder( const Q_INT16& i ); - LIBK3B_EXPORT Q_INT32 swapByteOrder( const Q_INT32& i ); - LIBK3B_EXPORT Q_INT64 swapByteOrder( const Q_INT64& i ); + LIBK3B_EXPORT TQ_INT16 swapByteOrder( const TQ_INT16& i ); + LIBK3B_EXPORT TQ_INT32 swapByteOrder( const TQ_INT32& i ); + LIBK3B_EXPORT TQ_INT64 swapByteOrder( const TQ_INT64& i ); int round( double ); @@ -122,61 +122,61 @@ namespace K3b * We use this since we encountered problems with the KDE version. * @returns true on success. */ - LIBK3B_EXPORT bool kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail ); + LIBK3B_EXPORT bool kbFreeOnFs( const TQString& path, unsigned long& size, unsigned long& avail ); /** * Cut a filename preserving the extension */ - LIBK3B_EXPORT QString cutFilename( const QString& name, unsigned int len ); + LIBK3B_EXPORT TQString cutFilename( const TQString& name, unsigned int len ); - LIBK3B_EXPORT QString removeFilenameExtension( const QString& name ); + LIBK3B_EXPORT TQString removeFilenameExtension( const TQString& name ); /** * Append a number to a filename preserving the extension. * The resulting name's length will not exceed @p maxlen */ - LIBK3B_EXPORT QString appendNumberToFilename( const QString& name, int num, unsigned int maxlen ); + LIBK3B_EXPORT TQString appendNumberToFilename( const TQString& name, int num, unsigned int maxlen ); - LIBK3B_EXPORT QString findUniqueFilePrefix( const QString& _prefix = QString::null, const QString& path = QString::null ); + LIBK3B_EXPORT TQString findUniqueFilePrefix( const TQString& _prefix = TQString(), const TQString& path = TQString() ); /** * Find a unique filename in directory d (if d is empty the method uses the defaultTempPath) */ - LIBK3B_EXPORT QString findTempFile( const QString& ending = QString::null, const QString& d = QString::null ); + LIBK3B_EXPORT TQString findTempFile( const TQString& ending = TQString(), const TQString& d = TQString() ); /** * Wrapper around KStandardDirs::findExe which searches the PATH and some additional * directories to find system tools which are normally only in root's PATH. */ - LIBK3B_EXPORT QString findExe( const QString& name ); + LIBK3B_EXPORT TQString findExe( const TQString& name ); /** * get the default K3b temp path to store image files */ - LIBK3B_EXPORT QString defaultTempPath(); + LIBK3B_EXPORT TQString defaultTempPath(); /** * makes sure a path ends with a "/" */ - LIBK3B_EXPORT QString prepareDir( const QString& dir ); + LIBK3B_EXPORT TQString prepareDir( const TQString& dir ); /** - * returns the parent dir of a path. + * returns the tqparent dir of a path. * CAUTION: this does only work well with absolut paths. * * Example: /usr/share/doc -> /usr/share/ */ - QString parentDir( const QString& path ); + TQString tqparentDir( const TQString& path ); /** * For now this just replaces multiple occurrences of / with a single / */ - LIBK3B_EXPORT QString fixupPath( const QString& ); + LIBK3B_EXPORT TQString fixupPath( const TQString& ); /** * resolves a symlinks completely. Meaning it also handles links to links to links... */ - LIBK3B_EXPORT QString resolveLink( const QString& ); + LIBK3B_EXPORT TQString resolveLink( const TQString& ); LIBK3B_EXPORT K3bVersion kernelVersion(); @@ -185,7 +185,7 @@ namespace K3b */ LIBK3B_EXPORT K3bVersion simpleKernelVersion(); - QString systemName(); + TQString systemName(); LIBK3B_EXPORT KIO::filesize_t filesize( const KURL& ); @@ -214,7 +214,7 @@ namespace K3b * Used to create a parameter for cdrecord, cdrdao or readcd. * Takes care of SCSI and ATAPI. */ - QString externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExternalBin* ); + TQString externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExternalBin* ); /** * Convert an url pointing to a local device to a K3bDevice. @@ -228,9 +228,9 @@ namespace K3b LIBK3B_EXPORT KURL convertToLocalUrl( const KURL& url ); LIBK3B_EXPORT KURL::List convertToLocalUrls( const KURL::List& l ); - LIBK3B_EXPORT Q_INT16 fromLe16( char* ); - LIBK3B_EXPORT Q_INT32 fromLe32( char* ); - LIBK3B_EXPORT Q_INT64 fromLe64( char* ); + LIBK3B_EXPORT TQ_INT16 fromLe16( char* ); + LIBK3B_EXPORT TQ_INT32 fromLe32( char* ); + LIBK3B_EXPORT TQ_INT64 fromLe64( char* ); LIBK3B_EXPORT bool isMounted( K3bDevice::Device* ); diff --git a/libk3b/core/k3bglobalsettings.cpp b/libk3b/core/k3bglobalsettings.cpp index 6f58592..ac6a2f0 100644 --- a/libk3b/core/k3bglobalsettings.cpp +++ b/libk3b/core/k3bglobalsettings.cpp @@ -31,7 +31,7 @@ K3bGlobalSettings::K3bGlobalSettings() void K3bGlobalSettings::readSettings( KConfig* c ) { - QString lastG = c->group(); + TQString lastG = c->group(); c->setGroup( "General Options" ); m_eject = !c->readBoolEntry( "No cd eject", false ); @@ -47,7 +47,7 @@ void K3bGlobalSettings::readSettings( KConfig* c ) void K3bGlobalSettings::saveSettings( KConfig* c ) { - QString lastG = c->group(); + TQString lastG = c->group(); c->setGroup( "General Options" ); c->writeEntry( "No cd eject", !m_eject ); diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp index b545107..046de06 100644 --- a/libk3b/core/k3bjob.cpp +++ b/libk3b/core/k3bjob.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <kprocess.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdebug.h> @@ -34,14 +34,14 @@ public: const char* K3bJob::DEFAULT_SIGNAL_CONNECTION = "K3bJobDefault"; -K3bJob::K3bJob( K3bJobHandler* handler, QObject* parent, const char* name ) - : QObject( parent, name ), +K3bJob::K3bJob( K3bJobHandler* handler, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), m_jobHandler( handler ), m_canceled(false), m_active(false) { - connect( this, SIGNAL(canceled()), - this, SLOT(slotCanceled()) ); + connect( this, TQT_SIGNAL(canceled()), + this, TQT_SLOT(slotCanceled()) ); } K3bJob::~K3bJob() @@ -97,24 +97,24 @@ void K3bJob::slotCanceled() int K3bJob::waitForMedia( K3bDevice::Device* device, int mediaState, int mediaType, - const QString& message ) + const TQString& message ) { // TODO: What about: emit newSubTask( i18n("Waiting for media") ); return m_jobHandler->waitForMedia( device, mediaState, mediaType, message ); } -bool K3bJob::questionYesNo( const QString& text, - const QString& caption, - const QString& yesText, - const QString& noText ) +bool K3bJob::questionYesNo( const TQString& text, + const TQString& caption, + const TQString& yesText, + const TQString& noText ) { return m_jobHandler->questionYesNo( text, caption, yesText, noText ); } -void K3bJob::blockingInformation( const QString& text, - const QString& caption ) +void K3bJob::blockingInformation( const TQString& text, + const TQString& caption ) { return m_jobHandler->blockingInformation( text, caption ); } @@ -128,23 +128,23 @@ void K3bJob::connectSubJob( K3bJob* subJob, const char* processedSizeSlot, const char* processedSubSizeSlot ) { - connect( subJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( subJob, SIGNAL(newSubTask(const QString&)), this, SLOT(slotNewSubTask(const QString&)) ); - connect( subJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( subJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( subJob, SIGNAL(finished(bool)), this, finishedSlot ); + connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); + connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot ); if( connectProgress ) { - connect( subJob, SIGNAL(percent(int)), - this, progressSlot != 0 ? progressSlot : SIGNAL(subPercent(int)) ); + connect( subJob, TQT_SIGNAL(percent(int)), + this, progressSlot != 0 ? progressSlot : TQT_SIGNAL(subPercent(int)) ); if( subProgressSlot ) - connect( subJob, SIGNAL(subPercent(int)), this, subProgressSlot ); - connect( subJob, SIGNAL(processedSize(int, int)), - this, processedSizeSlot != 0 ? processedSizeSlot : SIGNAL(processedSubSize(int, int)) ); + connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot ); + connect( subJob, TQT_SIGNAL(processedSize(int, int)), + this, processedSizeSlot != 0 ? processedSizeSlot : TQT_SIGNAL(processedSubSize(int, int)) ); if( processedSubSizeSlot ) - connect( subJob, SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); + connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); } } @@ -159,42 +159,42 @@ void K3bJob::connectSubJob( K3bJob* subJob, const char* processedSubSizeSlot ) { // standard connections - connect( subJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( subJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); + connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); // task connections if( newTaskSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); + connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); else if( newTaskSlot ) - connect( subJob, SIGNAL(newTask(const QString&)), this, newTaskSlot ); + connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, newTaskSlot ); if( newSubTaskSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(newSubTask(const QString&)), this, SLOT(slotNewSubTask(const QString&)) ); + connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); else if( newSubTaskSlot ) - connect( subJob, SIGNAL(newSubTask(const QString&)), this, newSubTaskSlot ); + connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot ); if( finishedSlot && finishedSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(finished(bool)), this, finishedSlot ); + connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot ); // progress if( progressSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) ); + connect( subJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); else if( progressSlot ) - connect( subJob, SIGNAL(percent(int)), this, progressSlot ); + connect( subJob, TQT_SIGNAL(percent(int)), this, progressSlot ); if( subProgressSlot && subProgressSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(subPercent(int)), this, subProgressSlot ); + connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot ); // processed size if( processedSizeSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); + connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); else if( processedSizeSlot ) - connect( subJob, SIGNAL(processedSize(int, int)), this, processedSizeSlot ); + connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, processedSizeSlot ); if( processedSubSizeSlot && processedSubSizeSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); + connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); } @@ -204,7 +204,7 @@ unsigned int K3bJob::numRunningSubJobs() const } -void K3bJob::slotNewSubTask( const QString& str ) +void K3bJob::slotNewSubTask( const TQString& str ) { emit infoMessage( str, INFO ); } @@ -231,8 +231,8 @@ public: -K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, QObject* parent, const char* name ) - : K3bJob( handler, parent, name ), +K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* tqparent, const char* name ) + : K3bJob( handler, tqparent, name ), m_writeMethod( K3b::DEFAULT ) { d = new Private; diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h index 59e1f9b..c35118a 100644 --- a/libk3b/core/k3bjob.h +++ b/libk3b/core/k3bjob.h @@ -17,8 +17,8 @@ #ifndef K3BJOB_H #define K3BJOB_H -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> #include "k3bjobhandler.h" #include "k3b_export.h" @@ -30,7 +30,7 @@ namespace K3bDevice { /** * This is the baseclass for all the jobs in K3b which actually do the work like burning a cd! - * The K3bJob object takes care of registering with the k3bcore or with a parent K3bJob. + * The K3bJob object takes care of registering with the k3bcore or with a tqparent K3bJob. * * Every job has a jobhandler which can be another job (in which case the job is handled as * a subjob) or an arbitrary class implementing the K3bJobHandler interface. @@ -40,9 +40,10 @@ namespace K3bDevice { * * @author Sebastian Trueg */ -class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler +class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler { Q_OBJECT + TQ_OBJECT public: virtual ~K3bJob(); @@ -72,8 +73,8 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler */ virtual bool hasBeenCanceled() const { return m_canceled; } - virtual QString jobDescription() const { return "K3bJob"; } - virtual QString jobDetails() const { return QString::null; } + virtual TQString jobDescription() const { return "K3bJob"; } + virtual TQString jobDetails() const { return TQString(); } /** * @returns the number of running subjobs. @@ -81,7 +82,7 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler */ unsigned int numRunningSubJobs() const; - const QPtrList<K3bJob>& runningSubJobs() const { return m_runningSubJobs; } + const TQPtrList<K3bJob>& runningSubJobs() const { return m_runningSubJobs; } /** * \deprecated @@ -137,21 +138,21 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler int waitForMedia( K3bDevice::Device*, int mediaState = K3bDevice::STATE_EMPTY, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - const QString& message = QString::null ); + const TQString& message = TQString() ); /** * reimplemented from K3bJobHandler */ - bool questionYesNo( const QString& text, - const QString& caption = QString::null, - const QString& yesText = QString::null, - const QString& noText = QString::null ); + bool questionYesNo( const TQString& text, + const TQString& caption = TQString(), + const TQString& yesText = TQString(), + const TQString& noText = TQString() ); /** * reimplemented from K3bJobHandler */ - void blockingInformation( const QString& text, - const QString& caption = QString::null ); + void blockingInformation( const TQString& text, + const TQString& caption = TQString() ); public slots: /** @@ -176,14 +177,14 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler void setJobHandler( K3bJobHandler* ); signals: - void infoMessage( const QString& msg, int type ); + void infoMessage( const TQString& msg, int type ); void percent( int p ); void subPercent( int p ); void processedSize( int processed, int size ); void processedSubSize( int processed, int size ); - void newTask( const QString& job ); - void newSubTask( const QString& job ); - void debuggingOutput(const QString&, const QString&); + void newTask( const TQString& job ); + void newSubTask( const TQString& job ); + void debuggingOutput(const TQString&, const TQString&); void data( const char* data, int len ); void nextTrack( int track, int numTracks ); @@ -206,12 +207,12 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler * \param hdl the handler of the job. This allows for some user interaction without * specifying any details (like the GUI). * The job handler can also be another job. In that case this job is a sub job - * and will be part of the parents running sub jobs. + * and will be part of the tqparents running sub jobs. * * \see runningSubJobs() * \see numRunningSubJobs() */ - K3bJob( K3bJobHandler* hdl, QObject* parent = 0, const char* name = 0 ); + K3bJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); /** * Call this in start() to properly register the job and emit the started() signal. @@ -231,14 +232,14 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler private slots: void slotCanceled(); - void slotNewSubTask( const QString& str ); + void slotNewSubTask( const TQString& str ); private: void registerSubJob( K3bJob* ); void unregisterSubJob( K3bJob* ); K3bJobHandler* m_jobHandler; - QPtrList<K3bJob> m_runningSubJobs; + TQPtrList<K3bJob> m_runningSubJobs; bool m_canceled; bool m_active; @@ -256,9 +257,10 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler class LIBK3B_EXPORT K3bBurnJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bBurnJob( K3bJobHandler* hdl, QObject* parent = 0, const char* name = 0 ); + K3bBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bBurnJob(); /** @@ -283,7 +285,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob void setWritingApp( int w ) { m_writeMethod = w; } signals: - void bufferStatus( int ); + void buffertqStatus( int ); void deviceBuffer( int ); diff --git a/libk3b/core/k3bjobhandler.h b/libk3b/core/k3bjobhandler.h index 1262e0e..d4bff91 100644 --- a/libk3b/core/k3bjobhandler.h +++ b/libk3b/core/k3bjobhandler.h @@ -44,20 +44,20 @@ class K3bJobHandler virtual int waitForMedia( K3bDevice::Device*, int mediaState = K3bDevice::STATE_EMPTY, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - const QString& message = QString::null ) = 0; + const TQString& message = TQString() ) = 0; // FIXME: use KGuiItem - virtual bool questionYesNo( const QString& text, - const QString& caption = QString::null, - const QString& yesText = QString::null, - const QString& noText = QString::null ) = 0; + virtual bool questionYesNo( const TQString& text, + const TQString& caption = TQString(), + const TQString& yesText = TQString(), + const TQString& noText = TQString() ) = 0; /** * Use this if you need the user to do something before the job is able to continue. * In all other cases an infoMessage should be used. */ - virtual void blockingInformation( const QString& text, - const QString& caption = QString::null ) = 0; + virtual void blockingInformation( const TQString& text, + const TQString& caption = TQString() ) = 0; }; diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp index 35ddff4..ca8d2e0 100644 --- a/libk3b/core/k3bprocess.cpp +++ b/libk3b/core/k3bprocess.cpp @@ -18,10 +18,10 @@ #include "k3bprocess.h" #include "k3bexternalbinmanager.h" -#include <qstringlist.h> -#include <qsocketnotifier.h> -#include <qptrqueue.h> -#include <qapplication.h> +#include <tqstringlist.h> +#include <tqsocketnotifier.h> +#include <tqptrqueue.h> +#include <tqapplication.h> #include <kdebug.h> @@ -37,8 +37,8 @@ class K3bProcess::Data { public: - QString unfinishedStdoutLine; - QString unfinishedStderrLine; + TQString unfinishedStdoutLine; + TQString unfinishedStderrLine; int dupStdoutFd; int dupStdinFd; @@ -76,7 +76,7 @@ K3bProcess& K3bProcess::operator<<( const K3bExternalBin* bin ) return this->operator<<( bin->path ); } -K3bProcess& K3bProcess::operator<<( const QString& arg ) +K3bProcess& K3bProcess::operator<<( const TQString& arg ) { static_cast<KProcess*>(this)->operator<<( arg ); return *this; @@ -88,13 +88,13 @@ K3bProcess& K3bProcess::operator<<( const char* arg ) return *this; } -K3bProcess& K3bProcess::operator<<( const QCString& arg ) +K3bProcess& K3bProcess::operator<<( const TQCString& arg ) { static_cast<KProcess*>(this)->operator<<( arg ); return *this; } -K3bProcess& K3bProcess::operator<<( const QStringList& args ) +K3bProcess& K3bProcess::operator<<( const TQStringList& args ) { static_cast<KProcess*>(this)->operator<<( args ); return *this; @@ -104,12 +104,12 @@ K3bProcess& K3bProcess::operator<<( const QStringList& args ) bool K3bProcess::start( RunMode run, Communication com ) { if( com & Stderr ) { - connect( this, SIGNAL(receivedStderr(KProcess*, char*, int)), - this, SLOT(slotSplitStderr(KProcess*, char*, int)) ); + connect( this, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + this, TQT_SLOT(slotSplitStderr(KProcess*, char*, int)) ); } if( com & Stdout ) { - connect( this, SIGNAL(receivedStdout(KProcess*, char*, int)), - this, SLOT(slotSplitStdout(KProcess*, char*, int)) ); + connect( this, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), + this, TQT_SLOT(slotSplitStdout(KProcess*, char*, int)) ); } return KProcess::start( run, com ); @@ -119,10 +119,10 @@ bool K3bProcess::start( RunMode run, Communication com ) void K3bProcess::slotSplitStdout( KProcess*, char* data, int len ) { if( m_bSplitStdout ) { - QStringList lines = splitOutput( data, len, d->unfinishedStdoutLine, d->suppressEmptyLines ); + TQStringList lines = splitOutput( data, len, d->unfinishedStdoutLine, d->suppressEmptyLines ); - for( QStringList::iterator it = lines.begin(); it != lines.end(); ++it ) { - QString& str = *it; + for( TQStringList::iterator it = lines.begin(); it != lines.end(); ++it ) { + TQString& str = *it; // just to be sure since something in splitOutput does not do this right if( d->suppressEmptyLines && str.isEmpty() ) @@ -136,10 +136,10 @@ void K3bProcess::slotSplitStdout( KProcess*, char* data, int len ) void K3bProcess::slotSplitStderr( KProcess*, char* data, int len ) { - QStringList lines = splitOutput( data, len, d->unfinishedStderrLine, d->suppressEmptyLines ); + TQStringList lines = splitOutput( data, len, d->unfinishedStderrLine, d->suppressEmptyLines ); - for( QStringList::iterator it = lines.begin(); it != lines.end(); ++it ) { - QString& str = *it; + for( TQStringList::iterator it = lines.begin(); it != lines.end(); ++it ) { + TQString& str = *it; // just to be sure since something in splitOutput does not do this right if( d->suppressEmptyLines && str.isEmpty() ) @@ -150,15 +150,15 @@ void K3bProcess::slotSplitStderr( KProcess*, char* data, int len ) } -QStringList K3bProcess::splitOutput( char* data, int len, - QString& unfinishedLine, bool suppressEmptyLines ) +TQStringList K3bProcess::splitOutput( char* data, int len, + TQString& unfinishedLine, bool suppressEmptyLines ) { // // The stderr splitting is mainly used for parsing of messages // That's why we simplify the data before proceeding // - QString buffer; + TQString buffer; for( int i = 0; i < len; i++ ) { if( data[i] == '\b' ) { while( data[i] == '\b' ) // we replace multiple backspaces with a single line feed @@ -173,12 +173,12 @@ QStringList K3bProcess::splitOutput( char* data, int len, buffer += data[i]; } - QStringList lines = QStringList::split( '\n', buffer, !suppressEmptyLines ); + TQStringList lines = TQStringList::split( '\n', buffer, !suppressEmptyLines ); // in case we suppress empty lines we need to handle the following separately // to make sure we join unfinished lines correctly if( suppressEmptyLines && buffer[0] == '\n' ) - lines.prepend( QString::null ); + lines.prepend( TQString() ); if( !unfinishedLine.isEmpty() ) { lines.first().prepend( unfinishedLine ); @@ -187,12 +187,12 @@ QStringList K3bProcess::splitOutput( char* data, int len, kdDebug() << "(K3bProcess) joined line: '" << (lines.first()) << "'" << endl; } - QStringList::iterator it; + TQStringList::iterator it; // check if line ends with a newline // if not save the last line because it is not finished - QChar c = buffer.right(1).at(0); - bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != QChar(46) ); // What is unicode 46?? It is printed as a point + TQChar c = buffer.right(1).at(0); + bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is tqunicode 46?? It is printed as a point if( hasUnfinishedLine ) { kdDebug() << "(K3bProcess) found unfinished line: '" << lines.last() << "'" << endl; kdDebug() << "(K3bProcess) last char: '" << buffer.right(1) << "'" << endl; @@ -425,10 +425,10 @@ void K3bProcessOutputCollector::setProcess( KProcess* p ) m_process = p; if( p ) { - connect( p, SIGNAL(receivedStdout(KProcess*, char*, int)), - this, SLOT(slotGatherStdout(KProcess*, char*, int)) ); - connect( p, SIGNAL(receivedStderr(KProcess*, char*, int)), - this, SLOT(slotGatherStderr(KProcess*, char*, int)) ); + connect( p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), + this, TQT_SLOT(slotGatherStdout(KProcess*, char*, int)) ); + connect( p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + this, TQT_SLOT(slotGatherStderr(KProcess*, char*, int)) ); } m_gatheredOutput.truncate( 0 ); @@ -438,14 +438,14 @@ void K3bProcessOutputCollector::setProcess( KProcess* p ) void K3bProcessOutputCollector::slotGatherStderr( KProcess*, char* data, int len ) { - m_gatheredOutput.append( QString::fromLocal8Bit( data, len ) ); - m_stderrOutput.append( QString::fromLocal8Bit( data, len ) ); + m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) ); + m_stderrOutput.append( TQString::fromLocal8Bit( data, len ) ); } void K3bProcessOutputCollector::slotGatherStdout( KProcess*, char* data, int len ) { - m_gatheredOutput.append( QString::fromLocal8Bit( data, len ) ); - m_stdoutOutput.append( QString::fromLocal8Bit( data, len ) ); + m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) ); + m_stdoutOutput.append( TQString::fromLocal8Bit( data, len ) ); } diff --git a/libk3b/core/k3bprocess.h b/libk3b/core/k3bprocess.h index 959bda1..5b585dd 100644 --- a/libk3b/core/k3bprocess.h +++ b/libk3b/core/k3bprocess.h @@ -19,7 +19,7 @@ #include <kprocess.h> -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" class K3bExternalBin; @@ -38,6 +38,7 @@ class K3bExternalBin; class LIBK3B_EXPORT K3bProcess : public KProcess { Q_OBJECT + TQ_OBJECT public: class OutputCollector; @@ -51,10 +52,10 @@ class LIBK3B_EXPORT K3bProcess : public KProcess */ K3bProcess& operator<<( const K3bExternalBin* ); - K3bProcess& operator<<( const QString& arg ); + K3bProcess& operator<<( const TQString& arg ); K3bProcess& operator<<( const char* arg ); - K3bProcess& operator<<( const QCString& arg ); - K3bProcess& operator<<( const QStringList& args ); + K3bProcess& operator<<( const TQCString& arg ); + K3bProcess& operator<<( const TQStringList& args ); bool start( RunMode run = NotifyOnExit, Communication com = NoCommunication ); @@ -138,8 +139,8 @@ class LIBK3B_EXPORT K3bProcess : public KProcess void slotSplitStdout( KProcess*, char*, int ); signals: - void stderrLine( const QString& line ); - void stdoutLine( const QString& line ); + void stderrLine( const TQString& line ); + void stdoutLine( const TQString& line ); /** * Gets emitted if raw stdout mode has been requested @@ -169,7 +170,7 @@ class LIBK3B_EXPORT K3bProcess : public KProcess void commClose(); private: - static QStringList splitOutput( char*, int, QString&, bool ); + static TQStringList splitOutput( char*, int, TQString&, bool ); class Data; Data* d; @@ -177,26 +178,27 @@ class LIBK3B_EXPORT K3bProcess : public KProcess bool m_bSplitStdout; }; -class LIBK3B_EXPORT K3bProcessOutputCollector: public QObject +class LIBK3B_EXPORT K3bProcessOutputCollector: public TQObject { Q_OBJECT + TQ_OBJECT public: K3bProcessOutputCollector( KProcess* ); void setProcess( KProcess* ); - const QString& output() const { return m_gatheredOutput; } - const QString& stderrOutput() const { return m_stderrOutput; } - const QString& stdoutOutput() const { return m_stdoutOutput; } + const TQString& output() const { return m_gatheredOutput; } + const TQString& stderrOutput() const { return m_stderrOutput; } + const TQString& stdoutOutput() const { return m_stdoutOutput; } private slots: void slotGatherStderr( KProcess*, char*, int ); void slotGatherStdout( KProcess*, char*, int ); private: - QString m_gatheredOutput; - QString m_stderrOutput; - QString m_stdoutOutput; + TQString m_gatheredOutput; + TQString m_stderrOutput; + TQString m_stdoutOutput; KProcess* m_process; }; diff --git a/libk3b/core/k3bprogressinfoevent.h b/libk3b/core/k3bprogressinfoevent.h index 0e77718..78e17a2 100644 --- a/libk3b/core/k3bprogressinfoevent.h +++ b/libk3b/core/k3bprogressinfoevent.h @@ -16,27 +16,27 @@ #ifndef K3B_PROGRESS_INFO_EVENT_H #define K3B_PROGRESS_INFO_EVENT_H -#include <qevent.h> -#include <qstring.h> +#include <tqevent.h> +#include <tqstring.h> /** * Custom event class for posting events corresponding to the * K3bJob signals. This is useful for a threaded job since * in that case it's not possible to emit signals that directly - * change the GUI (see QThread docu). + * change the GUI (see TQThread docu). */ -class K3bProgressInfoEvent : public QCustomEvent +class K3bProgressInfoEvent : public TQCustomEvent { public: K3bProgressInfoEvent( int type ) - : QCustomEvent( type ), + : TQCustomEvent( type ), m_type(type) {} - K3bProgressInfoEvent( int type, const QString& v1, const QString& v2 = QString::null, + K3bProgressInfoEvent( int type, const TQString& v1, const TQString& v2 = TQString(), int value1 = 0, int value2 = 0 ) - : QCustomEvent( type ), + : TQCustomEvent( type ), m_type( type), m_firstValue(value1), m_secondValue(value2), @@ -45,20 +45,20 @@ class K3bProgressInfoEvent : public QCustomEvent {} K3bProgressInfoEvent( int type, int value1, int value2 = 0 ) - : QCustomEvent( type ), + : TQCustomEvent( type ), m_type( type), m_firstValue(value1), m_secondValue(value2) {} int type() const { return m_type; } - const QString& firstString() const { return m_firstString; } - const QString& secondString() const { return m_secondString; } + const TQString& firstString() const { return m_firstString; } + const TQString& secondString() const { return m_secondString; } int firstValue() const { return m_firstValue; } int secondValue() const { return m_secondValue; } enum K3bProgressInfoEventType { - Progress = QEvent::User + 1, + Progress = TQEvent::User + 1, SubProgress, ProcessedSize, ProcessedSubSize, @@ -69,7 +69,7 @@ class K3bProgressInfoEvent : public QCustomEvent NewTask, NewSubTask, DebuggingOutput, - BufferStatus, + BuffertqStatus, WriteSpeed, NextTrack }; @@ -78,8 +78,8 @@ class K3bProgressInfoEvent : public QCustomEvent int m_type; int m_firstValue; int m_secondValue; - QString m_firstString; - QString m_secondString; + TQString m_firstString; + TQString m_secondString; }; #endif diff --git a/libk3b/core/k3bsimplejobhandler.cpp b/libk3b/core/k3bsimplejobhandler.cpp index eaf7cd6..d48349e 100644 --- a/libk3b/core/k3bsimplejobhandler.cpp +++ b/libk3b/core/k3bsimplejobhandler.cpp @@ -16,8 +16,8 @@ #include "k3bsimplejobhandler.h" -K3bSimpleJobHandler::K3bSimpleJobHandler( QObject* parent ) - : QObject( parent ), +K3bSimpleJobHandler::K3bSimpleJobHandler( TQObject* tqparent ) + : TQObject( tqparent ), K3bJobHandler() { } @@ -29,7 +29,7 @@ K3bSimpleJobHandler::~K3bSimpleJobHandler() int K3bSimpleJobHandler::waitForMedia( K3bDevice::Device* dev, int mediaState, int mediaType, - const QString& message ) + const TQString& message ) { Q_UNUSED( dev ); Q_UNUSED( mediaState ); @@ -39,10 +39,10 @@ int K3bSimpleJobHandler::waitForMedia( K3bDevice::Device* dev, return 0; } -bool K3bSimpleJobHandler::questionYesNo( const QString& text, - const QString& caption, - const QString& yesText, - const QString& noText ) +bool K3bSimpleJobHandler::questionYesNo( const TQString& text, + const TQString& caption, + const TQString& yesText, + const TQString& noText ) { Q_UNUSED( text ); Q_UNUSED( caption ); @@ -52,8 +52,8 @@ bool K3bSimpleJobHandler::questionYesNo( const QString& text, return true; } -void K3bSimpleJobHandler::blockingInformation( const QString& text, - const QString& caption ) +void K3bSimpleJobHandler::blockingInformation( const TQString& text, + const TQString& caption ) { Q_UNUSED( text ); Q_UNUSED( caption ); diff --git a/libk3b/core/k3bsimplejobhandler.h b/libk3b/core/k3bsimplejobhandler.h index f84064e..60d4bf9 100644 --- a/libk3b/core/k3bsimplejobhandler.h +++ b/libk3b/core/k3bsimplejobhandler.h @@ -18,7 +18,7 @@ #include <k3b_export.h> -#include <qobject.h> +#include <tqobject.h> #include <k3bjobhandler.h> @@ -28,12 +28,13 @@ * Use it for very simple jobs that don't need the job handler * methods. */ -class LIBK3B_EXPORT K3bSimpleJobHandler : public QObject, public K3bJobHandler +class LIBK3B_EXPORT K3bSimpleJobHandler : public TQObject, public K3bJobHandler { Q_OBJECT + TQ_OBJECT public: - K3bSimpleJobHandler( QObject* parent = 0 ); + K3bSimpleJobHandler( TQObject* tqparent = 0 ); ~K3bSimpleJobHandler(); /* @@ -42,20 +43,20 @@ class LIBK3B_EXPORT K3bSimpleJobHandler : public QObject, public K3bJobHandler int waitForMedia( K3bDevice::Device*, int mediaState = K3bDevice::STATE_EMPTY, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - const QString& message = QString::null ); + const TQString& message = TQString() ); /** * \return true */ - bool questionYesNo( const QString& text, - const QString& caption = QString::null, - const QString& yesText = QString::null, - const QString& noText = QString::null ); + bool questionYesNo( const TQString& text, + const TQString& caption = TQString(), + const TQString& yesText = TQString(), + const TQString& noText = TQString() ); /** * Does nothing */ - void blockingInformation( const QString& text, - const QString& caption = QString::null ); + void blockingInformation( const TQString& text, + const TQString& caption = TQString() ); }; #endif diff --git a/libk3b/core/k3bthread.cpp b/libk3b/core/k3bthread.cpp index 07414ad..54b2218 100644 --- a/libk3b/core/k3bthread.cpp +++ b/libk3b/core/k3bthread.cpp @@ -20,15 +20,15 @@ #include <kdebug.h> -#include <qapplication.h> +#include <tqapplication.h> -static QPtrList<K3bThread> s_threads; +static TQPtrList<K3bThread> s_threads; void K3bThread::waitUntilFinished() { - QPtrListIterator<K3bThread> it( s_threads ); + TQPtrListIterator<K3bThread> it( s_threads ); while( it.current() ) { kdDebug() << "Waiting for thread " << it.current() << endl; it.current()->wait(); @@ -46,12 +46,12 @@ public: : eventHandler( 0 ) { } - QObject* eventHandler; + TQObject* eventHandler; }; -K3bThread::K3bThread( QObject* eventHandler ) - : QThread() +K3bThread::K3bThread( TQObject* eventHandler ) + : TQThread() { d = new Private; d->eventHandler = eventHandler; @@ -60,8 +60,8 @@ K3bThread::K3bThread( QObject* eventHandler ) } -K3bThread::K3bThread( unsigned int stackSize, QObject* eventHandler ) - : QThread( stackSize ) +K3bThread::K3bThread( unsigned int stackSize, TQObject* eventHandler ) + : TQThread( stackSize ) { d = new Private; d->eventHandler = eventHandler; @@ -77,20 +77,20 @@ K3bThread::~K3bThread() } -void K3bThread::setProgressInfoEventHandler( QObject* eventHandler ) +void K3bThread::setProgressInfoEventHandler( TQObject* eventHandler ) { d->eventHandler = eventHandler; } -QString K3bThread::jobDescription() const +TQString K3bThread::jobDescription() const { - return QString::null; + return TQString(); } -QString K3bThread::jobDetails() const +TQString K3bThread::jobDetails() const { - return QString::null; + return TQString(); } @@ -112,11 +112,11 @@ void K3bThread::cancel() } -void K3bThread::emitInfoMessage( const QString& msg, int type ) +void K3bThread::emitInfoMessage( const TQString& msg, int type ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, - new K3bProgressInfoEvent( K3bProgressInfoEvent::InfoMessage, msg, QString::null, type ) ); + TQApplication::postEvent( d->eventHandler, + new K3bProgressInfoEvent( K3bProgressInfoEvent::InfoMessage, msg, TQString(), type ) ); else kdWarning() << "(K3bThread) call to emitInfoMessage() without eventHandler." << endl; } @@ -124,7 +124,7 @@ void K3bThread::emitInfoMessage( const QString& msg, int type ) void K3bThread::emitPercent( int p ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Progress, p ) ); else kdWarning() << "(K3bThread) call to emitPercent() without eventHandler." << endl; @@ -133,7 +133,7 @@ void K3bThread::emitPercent( int p ) void K3bThread::emitSubPercent( int p ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::SubProgress, p ) ); else kdWarning() << "(K3bThread) call to emitSubPercent() without eventHandler." << endl; @@ -142,7 +142,7 @@ void K3bThread::emitSubPercent( int p ) void K3bThread::emitStarted() { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Started ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Started ) ); else kdWarning() << "(K3bThread) call to emitStarted() without eventHandler." << endl; } @@ -150,7 +150,7 @@ void K3bThread::emitStarted() void K3bThread::emitCanceled() { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Canceled ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Canceled ) ); else kdWarning() << "(K3bThread) call to emitCanceled() without eventHandler." << endl; } @@ -158,7 +158,7 @@ void K3bThread::emitCanceled() void K3bThread::emitFinished( bool success ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Finished, success ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Finished, success ) ); else kdWarning() << "(K3bThread) call to emitFinished() without eventHandler." << endl; } @@ -166,7 +166,7 @@ void K3bThread::emitFinished( bool success ) void K3bThread::emitProcessedSize( int p, int size ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::ProcessedSize, p, size ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::ProcessedSize, p, size ) ); else kdWarning() << "(K3bThread) call to emitProcessedSize() without eventHandler." << endl; } @@ -174,31 +174,31 @@ void K3bThread::emitProcessedSize( int p, int size ) void K3bThread::emitProcessedSubSize( int p, int size ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::ProcessedSubSize, p, size ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::ProcessedSubSize, p, size ) ); else kdWarning() << "(K3bThread) call to emitProcessedSubSize() without eventHandler." << endl; } -void K3bThread::emitNewTask( const QString& job ) +void K3bThread::emitNewTask( const TQString& job ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NewTask, job ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NewTask, job ) ); else kdWarning() << "(K3bThread) call to emitNewTask() without eventHandler." << endl; } -void K3bThread::emitNewSubTask( const QString& job ) +void K3bThread::emitNewSubTask( const TQString& job ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NewSubTask, job ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NewSubTask, job ) ); else kdWarning() << "(K3bThread) call to emitNewSubTask() without eventHandler." << endl; } -void K3bThread::emitDebuggingOutput(const QString& group, const QString& text) +void K3bThread::emitDebuggingOutput(const TQString& group, const TQString& text) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::DebuggingOutput, group, text ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::DebuggingOutput, group, text ) ); else kdWarning() << "(K3bThread) call to emitDebuggingOutput() without eventHandler." << endl; } @@ -206,7 +206,7 @@ void K3bThread::emitDebuggingOutput(const QString& group, const QString& text) void K3bThread::emitData( const char* data, int len ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bDataEvent( data, len ) ); + TQApplication::postEvent( d->eventHandler, new K3bDataEvent( data, len ) ); else kdWarning() << "(K3bThread) call to emitData() without eventHandler." << endl; } @@ -214,7 +214,7 @@ void K3bThread::emitData( const char* data, int len ) void K3bThread::emitNextTrack( int t, int n ) { if( d->eventHandler ) - QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NextTrack, t, n ) ); + TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NextTrack, t, n ) ); else kdWarning() << "(K3bThread) call to emitNextTrack() without eventHandler." << endl; } diff --git a/libk3b/core/k3bthread.h b/libk3b/core/k3bthread.h index f7e68fc..c57ab67 100644 --- a/libk3b/core/k3bthread.h +++ b/libk3b/core/k3bthread.h @@ -17,10 +17,10 @@ #ifndef _K3B_THREAD_H_ #define _K3B_THREAD_H_ -#include <qthread.h> +#include <tqthread.h> #include "k3b_export.h" -class QObject; +class TQObject; /** * The threaded couterpart to K3bJob @@ -34,14 +34,14 @@ class QObject; * * See K3bThreadJob for more information. */ -class LIBK3B_EXPORT K3bThread : public QThread +class LIBK3B_EXPORT K3bThread : public TQThread { public: - K3bThread( QObject* eventHandler = 0 ); - K3bThread( unsigned int stackSize, QObject* eventHandler = 0 ); + K3bThread( TQObject* eventHandler = 0 ); + K3bThread( unsigned int stackSize, TQObject* eventHandler = 0 ); virtual ~K3bThread(); - void setProgressInfoEventHandler( QObject* eventHandler ); + void setProgressInfoEventHandler( TQObject* eventHandler ); /** * Initialize the thread before starting it in the GUi thread. @@ -58,8 +58,8 @@ class LIBK3B_EXPORT K3bThread : public QThread */ virtual void cancel(); - virtual QString jobDescription() const; - virtual QString jobDetails() const; + virtual TQString jobDescription() const; + virtual TQString jobDetails() const; /** * waits until all running K3bThread have finished. @@ -73,7 +73,7 @@ class LIBK3B_EXPORT K3bThread : public QThread /** * uses the K3bJob::MessageType enum */ - void emitInfoMessage( const QString& msg, int type ); + void emitInfoMessage( const TQString& msg, int type ); void emitPercent( int p ); void emitSubPercent( int p ); void emitStarted(); @@ -81,9 +81,9 @@ class LIBK3B_EXPORT K3bThread : public QThread void emitFinished( bool success ); void emitProcessedSize( int processed, int size ); void emitProcessedSubSize( int processed, int size ); - void emitNewTask( const QString& job ); - void emitNewSubTask( const QString& job ); - void emitDebuggingOutput(const QString&, const QString&); + void emitNewTask( const TQString& job ); + void emitNewSubTask( const TQString& job ); + void emitDebuggingOutput(const TQString&, const TQString&); void emitData( const char* data, int len ); void emitNextTrack( int track, int trackNum ); diff --git a/libk3b/core/k3bthreadjob.cpp b/libk3b/core/k3bthreadjob.cpp index a13f10a..fcc192e 100644 --- a/libk3b/core/k3bthreadjob.cpp +++ b/libk3b/core/k3bthreadjob.cpp @@ -23,15 +23,15 @@ -K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_running(false) { } -K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_running(false) { setThread(thread); @@ -43,21 +43,21 @@ K3bThreadJob::~K3bThreadJob() } -QString K3bThreadJob::jobDescription() const +TQString K3bThreadJob::jobDescription() const { if( m_thread ) return m_thread->jobDescription(); else - return QString::null; + return TQString(); } -QString K3bThreadJob::jobDetails() const +TQString K3bThreadJob::jobDetails() const { if( m_thread ) return m_thread->jobDetails(); else - return QString::null; + return TQString(); } @@ -101,7 +101,7 @@ void K3bThreadJob::cleanupJob( bool success ) } -void K3bThreadJob::customEvent( QCustomEvent* e ) +void K3bThreadJob::customEvent( TQCustomEvent* e ) { if( K3bDataEvent* de = dynamic_cast<K3bDataEvent*>(e) ) { emit data( de->data(), de->length() ); diff --git a/libk3b/core/k3bthreadjob.h b/libk3b/core/k3bthreadjob.h index 25919f1..34b43fd 100644 --- a/libk3b/core/k3bthreadjob.h +++ b/libk3b/core/k3bthreadjob.h @@ -19,7 +19,7 @@ #include "k3bjob.h" #include "k3b_export.h" -class QCustomEvent; +class TQCustomEvent; class K3bThread; @@ -40,10 +40,11 @@ class K3bThread; class LIBK3B_EXPORT K3bThreadJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bThreadJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); - K3bThreadJob( K3bThread*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bThreadJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bThreadJob( K3bThread*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bThreadJob(); void setThread( K3bThread* t ); @@ -57,8 +58,8 @@ class LIBK3B_EXPORT K3bThreadJob : public K3bJob */ virtual bool active() const { return m_running; } - virtual QString jobDescription() const; - virtual QString jobDetails() const; + virtual TQString jobDescription() const; + virtual TQString jobDetails() const; public slots: virtual void start(); @@ -68,7 +69,7 @@ class LIBK3B_EXPORT K3bThreadJob : public K3bJob /** * converts K3bThread events to K3bJob signals */ - virtual void customEvent( QCustomEvent* ); + virtual void customEvent( TQCustomEvent* ); /** * Reimplement this method to do some housekeeping once diff --git a/libk3b/core/k3bversion.cpp b/libk3b/core/k3bversion.cpp index f7af248..e7ae9b0 100644 --- a/libk3b/core/k3bversion.cpp +++ b/libk3b/core/k3bversion.cpp @@ -15,7 +15,7 @@ #include "k3bversion.h" -#include <qregexp.h> +#include <tqregexp.h> #include <kdebug.h> @@ -35,7 +35,7 @@ K3bVersion::K3bVersion( const K3bVersion& v ) { } -K3bVersion::K3bVersion( const QString& version ) +K3bVersion::K3bVersion( const TQString& version ) { setVersion( version ); } @@ -43,14 +43,14 @@ K3bVersion::K3bVersion( const QString& version ) K3bVersion::K3bVersion( int majorVersion, int minorVersion, int patchlevel, - const QString& suffix ) + const TQString& suffix ) { setVersion( majorVersion, minorVersion, patchlevel, suffix ); } -void K3bVersion::setVersion( const QString& v ) +void K3bVersion::setVersion( const TQString& v ) { - QString suffix; + TQString suffix; splitVersionString( v.stripWhiteSpace(), m_majorVersion, suffix ); if( m_majorVersion >= 0 ) { if( suffix.startsWith(".") ) { @@ -99,9 +99,9 @@ void K3bVersion::setVersion( const QString& v ) // the dot is removed and the rest put in suffix // if s does not start with a digit or the first non-digit char is not a dot // suffix = s and num = -1 is returned -void K3bVersion::splitVersionString( const QString& s, int& num, QString& suffix ) +void K3bVersion::splitVersionString( const TQString& s, int& num, TQString& suffix ) { - int pos = s.find( QRegExp("\\D") ); + int pos = s.tqfind( TQRegExp("\\D") ); if( pos < 0 ) { num = s.toInt(); suffix = ""; @@ -126,7 +126,7 @@ bool K3bVersion::isValid() const void K3bVersion::setVersion( int majorVersion, int minorVersion, int patchlevel, - const QString& suffix ) + const TQString& suffix ) { m_majorVersion = majorVersion; m_minorVersion = minorVersion; @@ -135,7 +135,7 @@ void K3bVersion::setVersion( int majorVersion, m_versionString = createVersionString( majorVersion, minorVersion, patchlevel, suffix ); } -K3bVersion& K3bVersion::operator=( const QString& v ) +K3bVersion& K3bVersion::operator=( const TQString& v ) { setVersion( v ); return *this; @@ -148,18 +148,18 @@ K3bVersion K3bVersion::simplify() const return v; } -QString K3bVersion::createVersionString( int majorVersion, +TQString K3bVersion::createVersionString( int majorVersion, int minorVersion, int patchlevel, - const QString& suffix ) + const TQString& suffix ) { if( majorVersion >= 0 ) { - QString s = QString::number(majorVersion); + TQString s = TQString::number(majorVersion); if( minorVersion > -1 ) { - s.append( QString(".%1").arg(minorVersion) ); + s.append( TQString(".%1").tqarg(minorVersion) ); if( patchlevel > -1 ) - s.append( QString(".%1").arg(patchlevel) ); + s.append( TQString(".%1").tqarg(patchlevel) ); } if( !suffix.isNull() ) @@ -172,12 +172,12 @@ QString K3bVersion::createVersionString( int majorVersion, } -int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 ) +int K3bVersion::compareSuffix( const TQString& suffix1, const TQString& suffix2 ) { - static QRegExp rcRx( "rc(\\d+)" ); - static QRegExp preRx( "pre(\\d+)" ); - static QRegExp betaRx( "beta(\\d+)" ); - static QRegExp alphaRx( "a(?:lpha)?(\\d+)" ); + static TQRegExp rcRx( "rc(\\d+)" ); + static TQRegExp preRx( "pre(\\d+)" ); + static TQRegExp betaRx( "beta(\\d+)" ); + static TQRegExp alphaRx( "a(?:lpha)?(\\d+)" ); // first we check if one of the suffixes (or both are empty) becasue that case if simple if( suffix1.isEmpty() ) { @@ -202,7 +202,7 @@ int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 ) alphaRx.exactMatch( suffix2 ) ) return 1; // rc > than all the others else - return QString::compare( suffix1, suffix2 ); + return TQString::compare( suffix1, suffix2 ); } else if( preRx.exactMatch( suffix1 ) ) { @@ -219,7 +219,7 @@ int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 ) alphaRx.exactMatch( suffix2 ) ) return 1; // pre is greater than beta or alpha else - return QString::compare( suffix1, suffix2 ); + return TQString::compare( suffix1, suffix2 ); } else if( betaRx.exactMatch( suffix1 ) ) { @@ -235,7 +235,7 @@ int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 ) else if( alphaRx.exactMatch( suffix2 ) ) return 1; // beta is greater then alpha else - return QString::compare( suffix1, suffix2 ); + return TQString::compare( suffix1, suffix2 ); } else if( alphaRx.exactMatch( suffix1 ) ) { @@ -250,11 +250,11 @@ int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 ) return ( v1 == v2 ? 0 : ( v1 < v2 ? -1 : 1 ) ); } else - return QString::compare( suffix1, suffix2 ); + return TQString::compare( suffix1, suffix2 ); } else - return QString::compare( suffix1, suffix2 ); + return TQString::compare( suffix1, suffix2 ); } diff --git a/libk3b/core/k3bversion.h b/libk3b/core/k3bversion.h index a6e3aee..f1bffba 100644 --- a/libk3b/core/k3bversion.h +++ b/libk3b/core/k3bversion.h @@ -17,7 +17,7 @@ #ifndef _K3B_VERSION_H_ #define _K3B_VERSION_H_ -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" /** * \brief Representation of a version. @@ -32,7 +32,7 @@ * K3bVersion tries to treat version suffixes in an "intelligent" way to properly compare versions * (see compareSuffix() for more details). * - * K3bVersion may also be used everywhere a QString is needed as it automatically converts to a + * K3bVersion may also be used everywhere a TQString is needed as it automatically converts to a * string representation using createVersionString(). */ class LIBK3B_EXPORT K3bVersion @@ -53,18 +53,18 @@ class LIBK3B_EXPORT K3bVersion /** * this constructor tries to parse the given version string */ - K3bVersion( const QString& version ); + K3bVersion( const TQString& version ); /** * sets the version and generates a version string from it */ - K3bVersion( int majorVersion, int minorVersion, int pachlevel = -1, const QString& suffix = QString::null ); + K3bVersion( int majorVersion, int minorVersion, int pachlevel = -1, const TQString& suffix = TQString() ); /** * tries to parse the version string * used by the constructor */ - void setVersion( const QString& ); + void setVersion( const TQString& ); bool isValid() const; @@ -74,19 +74,19 @@ class LIBK3B_EXPORT K3bVersion * * If minorVersion or pachlevel are -1 they will not be used when generating the version string. */ - void setVersion( int majorVersion, int minorVersion = -1, int patchlevel = -1, const QString& suffix = QString::null ); + void setVersion( int majorVersion, int minorVersion = -1, int patchlevel = -1, const TQString& suffix = TQString() ); - const QString& versionString() const { return m_versionString; } + const TQString& versionString() const { return m_versionString; } int majorVersion() const { return m_majorVersion; } int minorVersion() const { return m_minorVersion; } int patchLevel() const { return m_patchLevel; } - const QString& suffix() const { return m_suffix; } + const TQString& suffix() const { return m_suffix; } /** - * just to make it possible to use as a QString + * just to make it possible to use as a TQString */ - operator const QString& () const { return m_versionString; } - K3bVersion& operator=( const QString& v ); + operator const TQString& () const { return m_versionString; } + K3bVersion& operator=( const TQString& v ); /** * \return A new K3bVersion object which equals this one except that the suffix is empty. @@ -97,10 +97,10 @@ class LIBK3B_EXPORT K3bVersion * If minorVersion or pachlevel are -1 they will not be used when generating the version string. * If minorVersion is -1 patchlevel will be ignored. */ - static QString createVersionString( int majorVersion, + static TQString createVersionString( int majorVersion, int minorVersion = -1, int patchlevel = -1, - const QString& suffix = QString::null ); + const TQString& suffix = TQString() ); /** * "Intelligent" comparison of two version suffixes. @@ -118,16 +118,16 @@ class LIBK3B_EXPORT K3bVersion * alphaX equals aX in this case.) * \li 1 if suffix1 is greater than suffix2 */ - static int compareSuffix( const QString& suffix1, const QString& suffix2 ); + static int compareSuffix( const TQString& suffix1, const TQString& suffix2 ); private: - static void splitVersionString( const QString& s, int& num, QString& suffix ); + static void splitVersionString( const TQString& s, int& num, TQString& suffix ); - QString m_versionString; + TQString m_versionString; int m_majorVersion; int m_minorVersion; int m_patchLevel; - QString m_suffix; + TQString m_suffix; }; diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp index 0c5cd9a..9b88345 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp +++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp @@ -50,35 +50,35 @@ private: }; -K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bBurnJob( jh, parent, name ), +K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bBurnJob( jh, tqparent, name ), m_decoder(0) { m_analyserThread = new AnalyserThread(); m_analyserJob = new K3bThreadJob( m_analyserThread, this, this ); - connect( m_analyserJob, SIGNAL(finished(bool)), this, SLOT(slotAnalyserThreadFinished(bool)) ); + connect( m_analyserJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAnalyserThreadFinished(bool)) ); m_audioDoc = new K3bAudioDoc( this ); m_audioDoc->newDocument(); m_audioJob = new K3bAudioJob( m_audioDoc, this, this ); // just loop all through - connect( m_audioJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_audioJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_audioJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( m_audioJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_audioJob, SIGNAL(finished(bool)), this, SIGNAL(finished(bool)) ); - connect( m_audioJob, SIGNAL(canceled()), this, SIGNAL(canceled()) ); - connect( m_audioJob, SIGNAL(percent(int)), this, SIGNAL(percent(int)) ); - connect( m_audioJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_audioJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_audioJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_audioJob, SIGNAL(burning(bool)), this, SIGNAL(burning(bool)) ); - connect( m_audioJob, SIGNAL(bufferStatus(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_audioJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_audioJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); + connect( m_audioJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( m_audioJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_audioJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_audioJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_audioJob, TQT_SIGNAL(finished(bool)), this, TQT_SIGNAL(finished(bool)) ); + connect( m_audioJob, TQT_SIGNAL(canceled()), this, TQT_SIGNAL(canceled()) ); + connect( m_audioJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) ); + connect( m_audioJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_audioJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_audioJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_audioJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) ); + connect( m_audioJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_audioJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); m_canceled = false; m_audioJobRunning = false; @@ -98,13 +98,13 @@ K3bDevice::Device* K3bAudioCueFileWritingJob::writer() const } -QString K3bAudioCueFileWritingJob::jobDescription() const +TQString K3bAudioCueFileWritingJob::jobDescription() const { return i18n("Writing Audio Cue File"); } -QString K3bAudioCueFileWritingJob::jobDetails() const +TQString K3bAudioCueFileWritingJob::jobDetails() const { return m_cueFile.section( '/', -1 ); } @@ -131,7 +131,7 @@ void K3bAudioCueFileWritingJob::cancel() } -void K3bAudioCueFileWritingJob::setCueFile( const QString& s ) +void K3bAudioCueFileWritingJob::setCueFile( const TQString& s ) { m_cueFile = s; } @@ -173,7 +173,7 @@ void K3bAudioCueFileWritingJob::setCopies( int c ) } -void K3bAudioCueFileWritingJob::setTempDir( const QString& s ) +void K3bAudioCueFileWritingJob::setTempDir( const TQString& s ) { m_audioDoc->setTempDir( s ); } @@ -252,19 +252,19 @@ void K3bAudioCueFileWritingJob::importCueInProject() // now analyze the source emit newTask( i18n("Analysing the audio file") ); - emit newSubTask( i18n("Analysing %1").arg( parser.imageFilename() ) ); + emit newSubTask( i18n("Analysing %1").tqarg( parser.imageFilename() ) ); // start the analyser thread m_analyserThread->setDecoder( m_decoder ); m_analyserJob->start(); } else { - emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").arg( m_cueFile ), ERROR ); + emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").tqarg( m_cueFile ), ERROR ); jobFinished(false); } } else { - emit infoMessage( i18n("No valid audio cue file: '%1'").arg( m_cueFile ), ERROR ); + emit infoMessage( i18n("No valid audio cue file: '%1'").tqarg( m_cueFile ), ERROR ); jobFinished(false); } } diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.h b/libk3b/jobs/k3baudiocuefilewritingjob.h index 6e0a3c2..a59dcb0 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.h +++ b/libk3b/jobs/k3baudiocuefilewritingjob.h @@ -30,30 +30,31 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bAudioCueFileWritingJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioCueFileWritingJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bAudioCueFileWritingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioCueFileWritingJob(); K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; - const QString& cueFile() const { return m_cueFile; } + const TQString& cueFile() const { return m_cueFile; } public slots: void start(); void cancel(); - void setCueFile( const QString& ); + void setCueFile( const TQString& ); void setSpeed( int s ); void setBurnDevice( K3bDevice::Device* dev ); void setWritingMode( int mode ); void setSimulate( bool b ); void setCopies( int c ); void setOnTheFly( bool b ); - void setTempDir( const QString& ); + void setTempDir( const TQString& ); private slots: void slotAnalyserThreadFinished(bool); @@ -63,7 +64,7 @@ class LIBK3B_EXPORT K3bAudioCueFileWritingJob : public K3bBurnJob K3bDevice::Device* m_device; - QString m_cueFile; + TQString m_cueFile; K3bAudioDoc* m_audioDoc; K3bAudioJob* m_audioJob; K3bAudioDecoder* m_decoder; diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp index f4ac550..acf7e9d 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.cpp +++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp @@ -46,7 +46,7 @@ public: K3bDevice::Device* device; K3bDevice::Toc toc; K3bWaveFileWriter* waveFileWriter; - QStringList filenames; + TQStringList filenames; int paranoiaMode; int retries; bool neverSkip; @@ -93,7 +93,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() toc = device->readToc(); if( !paranoia->initParanoia( device, toc ) ) { - emitInfoMessage( i18n("Could not open device %1").arg(device->blockDeviceName()), + emitInfoMessage( i18n("Could not open device %1").tqarg(device->blockDeviceName()), K3bJob::ERROR ); emitFinished(false); return; @@ -154,7 +154,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() } if( !waveFileWriter->open( filenames[currentTrack-1] ) ) { - emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filenames[currentTrack-1]), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filenames[currentTrack-1]), K3bJob::ERROR ); writeError = true; break; } @@ -188,7 +188,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() device->block( false ); if( status != K3bCdparanoiaLib::S_OK ) { - emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(trackNum), K3bJob::ERROR ); + emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(trackNum), K3bJob::ERROR ); emitFinished(false); return; } @@ -206,8 +206,8 @@ void K3bAudioSessionReadingJob::WorkThread::cancel() -K3bAudioSessionReadingJob::K3bAudioSessionReadingJob( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ) +K3bAudioSessionReadingJob::K3bAudioSessionReadingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ) { m_thread = new WorkThread(); setThread( m_thread ); @@ -238,7 +238,7 @@ void K3bAudioSessionReadingJob::writeToFd( int fd ) m_thread->fd = fd; } -void K3bAudioSessionReadingJob::setImageNames( const QStringList& l ) +void K3bAudioSessionReadingJob::setImageNames( const TQStringList& l ) { m_thread->filenames = l; m_thread->fd = -1; diff --git a/libk3b/jobs/k3baudiosessionreadingjob.h b/libk3b/jobs/k3baudiosessionreadingjob.h index 21f3d50..53ae7fa 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.h +++ b/libk3b/jobs/k3baudiosessionreadingjob.h @@ -18,7 +18,7 @@ #include <k3bthreadjob.h> -#include <qstringlist.h> +#include <tqstringlist.h> namespace K3bDevice { @@ -30,9 +30,10 @@ namespace K3bDevice { class K3bAudioSessionReadingJob : public K3bThreadJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioSessionReadingJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bAudioSessionReadingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioSessionReadingJob(); /** @@ -55,7 +56,7 @@ class K3bAudioSessionReadingJob : public K3bThreadJob /** * Used if fd == -1 */ - void setImageNames( const QStringList& l ); + void setImageNames( const TQStringList& l ); void setParanoiaMode( int m ); void setReadRetries( int ); diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp index de76e3f..3e39b1c 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.cpp +++ b/libk3b/jobs/k3bbinimagewritingjob.cpp @@ -25,13 +25,13 @@ #include <klocale.h> #include <kdebug.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> -K3bBinImageWritingJob::K3bBinImageWritingJob( K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ), +K3bBinImageWritingJob::K3bBinImageWritingJob( K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ), m_device(0), m_simulate(false), m_force(false), @@ -93,10 +93,10 @@ bool K3bBinImageWritingJob::prepareWriter() // TODO: put this into K3bCueFileParser // TODO: check K3bCueFileParser::imageFilenameInCue() // let's see if cdrecord can handle the cue file - QFile f( m_tocFile ); + TQFile f( m_tocFile ); if( f.open( IO_ReadOnly ) ) { - QTextStream fStr( &f ); - if( fStr.read().contains( "MODE1/2352" ) ) { + TQTextStream fStr( &f ); + if( fStr.read().tqcontains( "MODE1/2352" ) ) { kdDebug() << "(K3bBinImageWritingJob) cuefile contains MODE1/2352 track. using cdrdao." << endl; usedWritingApp = K3b::CDRDAO; } @@ -144,18 +144,18 @@ bool K3bBinImageWritingJob::prepareWriter() m_writer = writer; } - connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writer, SIGNAL(percent(int)), this, SLOT(copyPercent(int)) ); - connect( m_writer, SIGNAL(subPercent(int)), this, SLOT(copySubPercent(int)) ); - connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writer, SIGNAL(finished(bool)), this, SLOT(writerFinished(bool)) ); - connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotNextTrack(int, int)) ); - connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)), this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(copyPercent(int)) ); + connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(copySubPercent(int)) ); + connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(writerFinished(bool)) ); + connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) ); + connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); return true; } @@ -207,26 +207,26 @@ void K3bBinImageWritingJob::writerFinished(bool ok) void K3bBinImageWritingJob::slotNextTrack( int t, int tt ) { - emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) ); + emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) ); } -QString K3bBinImageWritingJob::jobDescription() const +TQString K3bBinImageWritingJob::jobDescription() const { return ( i18n("Writing cue/bin Image") + ( m_copies > 1 ? i18n(" - %n Copy", " - %n Copies", m_copies) - : QString::null ) ); + : TQString() ) ); } -QString K3bBinImageWritingJob::jobDetails() const +TQString K3bBinImageWritingJob::jobDetails() const { return m_tocFile.section("/", -1); } -void K3bBinImageWritingJob::setTocFile(const QString& s) +void K3bBinImageWritingJob::setTocFile(const TQString& s) { m_tocFile = s; } diff --git a/libk3b/jobs/k3bbinimagewritingjob.h b/libk3b/jobs/k3bbinimagewritingjob.h index 3666793..9782985 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.h +++ b/libk3b/jobs/k3bbinimagewritingjob.h @@ -30,15 +30,16 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bBinImageWritingJob( K3bJobHandler*, QObject* parent = 0 ); + K3bBinImageWritingJob( K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bBinImageWritingJob(); K3bDevice::Device* writer() const { return m_device; }; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); @@ -48,7 +49,7 @@ class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob void setSimulate( bool b ) { m_simulate = b; } void setForce(bool b) { m_force = b; } void setMulti( bool b ) { m_noFix = b; } - void setTocFile( const QString& s); + void setTocFile( const TQString& s); void setCopies(int c) { m_copies = c; } void setSpeed( int s ) { m_speed = s; } @@ -66,7 +67,7 @@ class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob bool m_simulate; bool m_force; bool m_noFix; - QString m_tocFile; + TQString m_tocFile; int m_speed; int m_copies; int m_finishedCopies; diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index c11f4b4..80eba84 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -27,12 +27,12 @@ #include <kio/job.h> #include <kdebug.h> -#include <qstring.h> +#include <tqstring.h> -K3bBlankingJob::K3bBlankingJob( K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ), +K3bBlankingJob::K3bBlankingJob( K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ), m_writerJob(0), m_force(true), m_device(0), @@ -94,7 +94,7 @@ void K3bBlankingJob::slotStartErasing() K3bCdrecordWriter* writer = new K3bCdrecordWriter( m_device, this ); m_writerJob = writer; - QString mode; + TQString mode; switch( m_mode ) { case Fast: mode = "fast"; @@ -121,19 +121,19 @@ void K3bBlankingJob::slotStartErasing() writer->setForceNoEject( m_forceNoEject ); } - connect(m_writerJob, SIGNAL(finished(bool)), this, SLOT(slotFinished(bool))); - connect(m_writerJob, SIGNAL(infoMessage( const QString&, int)), - this,SIGNAL(infoMessage( const QString&, int))); - connect( m_writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect(m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotFinished(bool))); + connect(m_writerJob, TQT_SIGNAL(infoMessage( const TQString&, int)), + this,TQT_SIGNAL(infoMessage( const TQString&, int))); + connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); if( waitForMedia( m_device, K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE, K3bDevice::MEDIA_CD_RW, i18n("Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>.") - .arg(m_device->vendor()) - .arg(m_device->description()) - .arg(m_device->devicename()) ) < 0 ) { + .tqarg(m_device->vendor()) + .tqarg(m_device->description()) + .tqarg(m_device->devicename()) ) < 0 ) { emit canceled(); jobFinished(false); return; diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h index 8cfe0a1..ab6becd 100644 --- a/libk3b/jobs/k3bblankingjob.h +++ b/libk3b/jobs/k3bblankingjob.h @@ -19,7 +19,7 @@ #include <k3bjob.h> #include "k3b_export.h" class KProcess; -class QString; +class TQString; class K3bDevice::Device; class K3bAbstractWriter; @@ -27,9 +27,10 @@ class K3bAbstractWriter; class LIBK3B_EXPORT K3bBlankingJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bBlankingJob( K3bJobHandler*, QObject* parent = 0 ); + K3bBlankingJob( K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bBlankingJob(); K3bDevice::Device* writer() const; diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index ff8f35d..c55e284 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -42,15 +42,15 @@ #include <kio/job.h> #include <kio/global.h> -#include <qtimer.h> -#include <qstringlist.h> -#include <qfile.h> -#include <qregexp.h> -#include <qtextstream.h> -#include <qcstring.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qapplication.h> +#include <tqtimer.h> +#include <tqstringlist.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqtextstream.h> +#include <tqcstring.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqapplication.h> class K3bCdCopyJob::Private @@ -80,7 +80,7 @@ public: unsigned int currentWrittenSession; K3bDevice::Toc toc; - QByteArray cdTextRaw; + TQByteArray cdTextRaw; K3bReadcdReader* readcdReader; K3bDataTrackReader* dataTrackReader; @@ -93,10 +93,10 @@ public: bool writerRunning; // image filenames, one for every track - QStringList imageNames; + TQStringList imageNames; // inf-filenames for writing audio tracks - QStringList infNames; + TQStringList infNames; // indicates if we created a dir or not bool deleteTempDir; @@ -107,16 +107,16 @@ public: bool haveCddb; bool haveCdText; - QValueVector<bool> dataSessionProbablyTAORecorded; + TQValueVector<bool> dataSessionProbablyTAORecorded; // used to determine progress - QValueVector<long> sessionSizes; + TQValueVector<long> sessionSizes; long overallSize; }; -K3bCdCopyJob::K3bCdCopyJob( K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ), +K3bCdCopyJob::K3bCdCopyJob( K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ), m_simulate(false), m_copies(1), m_onlyCreateImages(false), @@ -173,8 +173,8 @@ void K3bCdCopyJob::start() // FIXME: read ISRCs and MCN - connect( K3bDevice::diskInfo( m_readerDevice ), SIGNAL(finished(K3bDevice::DeviceHandler*)), - this, SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); + connect( K3bDevice::diskInfo( m_readerDevice ), TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + this, TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); } @@ -311,9 +311,9 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) } unsigned long avail, size; - QString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) ); + TQString pathToTest = m_tempPath.left( m_tempPath.tqfindRev( '/' ) ); if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { - emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR ); + emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR ); d->error = true; canCopy = false; } @@ -368,9 +368,9 @@ void K3bCdCopyJob::searchCdText() emit newSubTask( i18n("Searching CD-TEXT") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::CD_TEXT_RAW, m_readerDevice ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotCdTextReady(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotCdTextReady(K3bDevice::DeviceHandler*)) ); } @@ -379,7 +379,7 @@ void K3bCdCopyJob::slotCdTextReady( K3bDevice::DeviceHandler* dh ) if( dh->success() ) { if( K3bDevice::CdText::checkCrc( dh->cdTextRaw() ) ) { K3bDevice::CdText cdt( dh->cdTextRaw() ); - emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").arg(cdt.performer()).arg(cdt.title()), SUCCESS ); + emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").tqarg(cdt.performer()).tqarg(cdt.title()), SUCCESS ); d->haveCdText = true; d->cdTextRaw = dh->cdTextRaw(); } @@ -411,8 +411,8 @@ void K3bCdCopyJob::queryCddb() if( !d->cddb ) { d->cddb = new K3bCddb( this ); - connect( d->cddb, SIGNAL(queryFinished(int)), - this, SLOT(slotCddbQueryFinished(int)) ); + connect( d->cddb, TQT_SIGNAL(queryFinished(int)), + this, TQT_SLOT(slotCddbQueryFinished(int)) ); } KConfig* c = k3bcore->config(); @@ -429,7 +429,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error ) d->cddbInfo = d->cddb->result(); d->haveCddb = true; - emit infoMessage( i18n("Found Cddb entry (%1 - %2).").arg(d->cddbInfo.cdArtist).arg(d->cddbInfo.cdTitle), SUCCESS ); + emit infoMessage( i18n("Found Cddb entry (%1 - %2).").tqarg(d->cddbInfo.cdArtist).tqarg(d->cddbInfo.cdTitle), SUCCESS ); // save the entry locally KConfig* c = k3bcore->config(); @@ -441,7 +441,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error ) emit infoMessage( i18n("No Cddb entry found."), WARNING ); } else { - emit infoMessage( i18n("Cddb error (%1).").arg(d->cddb->errorString()), ERROR ); + emit infoMessage( i18n("Cddb error (%1).").tqarg(d->cddb->errorString()), ERROR ); } startCopy(); @@ -495,7 +495,7 @@ bool K3bCdCopyJob::prepareImageFiles() d->infNames.clear(); d->deleteTempDir = false; - QFileInfo fi( m_tempPath ); + TQFileInfo fi( m_tempPath ); if( d->toc.count() > 1 || d->toc.contentType() == K3bDevice::AUDIO ) { // create a directory which contains all the images and inf and stuff @@ -503,9 +503,9 @@ bool K3bCdCopyJob::prepareImageFiles() bool tempDirReady = false; if( !fi.isDir() ) { - if( QFileInfo( m_tempPath.section( '/', 0, -2 ) ).isDir() ) { - if( !QFile::exists( m_tempPath ) ) { - QDir dir( m_tempPath.section( '/', 0, -2 ) ); + if( TQFileInfo( m_tempPath.section( '/', 0, -2 ) ).isDir() ) { + if( !TQFile::exists( m_tempPath ) ) { + TQDir dir( m_tempPath.section( '/', 0, -2 ) ); dir.mkdir( m_tempPath.section( '/', -1 ) ); tempDirReady = true; } @@ -520,28 +520,28 @@ bool K3bCdCopyJob::prepareImageFiles() // create temp dir if( !tempDirReady ) { - QDir dir( m_tempPath ); + TQDir dir( m_tempPath ); m_tempPath = K3b::findUniqueFilePrefix( "k3bCdCopy", m_tempPath ); kdDebug() << "(K3bCdCopyJob) creating temp dir: " << m_tempPath << endl; if( !dir.mkdir( m_tempPath, true ) ) { - emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(m_tempPath), ERROR ); + emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(m_tempPath), ERROR ); return false; } d->deleteTempDir = true; } m_tempPath = K3b::prepareDir( m_tempPath ); - emit infoMessage( i18n("Using temporary directory %1.").arg(m_tempPath), INFO ); + emit infoMessage( i18n("Using temporary directory %1.").tqarg(m_tempPath), INFO ); // create temp filenames int i = 1; for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) { if( (*it).type() == K3bDevice::Track::AUDIO ) { - d->imageNames.append( m_tempPath + QString("Track%1.wav").arg(QString::number(i).rightJustify(2, '0')) ); - d->infNames.append( m_tempPath + QString("Track%1.inf").arg(QString::number(i).rightJustify(2, '0')) ); + d->imageNames.append( m_tempPath + TQString("Track%1.wav").tqarg(TQString::number(i).rightJustify(2, '0')) ); + d->infNames.append( m_tempPath + TQString("Track%1.inf").tqarg(TQString::number(i).rightJustify(2, '0')) ); } else - d->imageNames.append( m_tempPath + QString("Track%1.iso").arg(QString::number(i).rightJustify(2, '0')) ); + d->imageNames.append( m_tempPath + TQString("Track%1.iso").tqarg(TQString::number(i).rightJustify(2, '0')) ); ++i; } @@ -554,17 +554,17 @@ bool K3bCdCopyJob::prepareImageFiles() else { // we only need a single image file if( !fi.isFile() || - questionYesNo( i18n("Do you want to overwrite %1?").arg(m_tempPath), + questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_tempPath), i18n("File Exists") ) ) { if( fi.isDir() ) m_tempPath = K3b::findTempFile( "iso", m_tempPath ); - else if( !QFileInfo( m_tempPath.section( '/', 0, -2 ) ).isDir() ) { + else if( !TQFileInfo( m_tempPath.section( '/', 0, -2 ) ).isDir() ) { emit infoMessage( i18n("Specified an unusable temporary path. Using default."), WARNING ); m_tempPath = K3b::findTempFile( "iso" ); } // else the user specified a file in an existing dir - emit infoMessage( i18n("Writing image file to %1.").arg(m_tempPath), INFO ); + emit infoMessage( i18n("Writing image file to %1.").tqarg(m_tempPath), INFO ); } else return false; @@ -580,12 +580,12 @@ void K3bCdCopyJob::readNextSession() { if( !m_onTheFly || m_onlyCreateImages ) { if( d->numSessions > 1 ) - emit newTask( i18n("Reading Session %1").arg(d->currentReadSession) ); + emit newTask( i18n("Reading Session %1").tqarg(d->currentReadSession) ); else emit newTask( i18n("Reading Source Medium") ); if( d->currentReadSession == 1 ) - emit newSubTask( i18n("Reading track %1 of %2").arg(1).arg(d->toc.count()) ); + emit newSubTask( i18n("Reading track %1 of %2").tqarg(1).tqarg(d->toc.count()) ); } // there is only one situation where we need the audiosessionreader: @@ -594,13 +594,13 @@ void K3bCdCopyJob::readNextSession() if( d->currentReadSession == 1 && d->toc[0].type() == K3bDevice::Track::AUDIO ) { if( !d->audioSessionReader ) { d->audioSessionReader = new K3bAudioSessionReadingJob( this, this ); - connect( d->audioSessionReader, SIGNAL(nextTrack(int, int)), - this, SLOT(slotReadingNextTrack(int, int)) ); + connect( d->audioSessionReader, TQT_SIGNAL(nextTrack(int, int)), + this, TQT_SLOT(slotReadingNextTrack(int, int)) ); connectSubJob( d->audioSessionReader, - SLOT(slotSessionReaderFinished(bool)), + TQT_SLOT(slotSessionReaderFinished(bool)), true, - SLOT(slotReaderProgress(int)), - SLOT(slotReaderSubProgress(int)) ); + TQT_SLOT(slotReaderProgress(int)), + TQT_SLOT(slotReaderSubProgress(int)) ); } d->audioSessionReader->setDevice( m_readerDevice ); @@ -619,12 +619,12 @@ void K3bCdCopyJob::readNextSession() else { if( !d->dataTrackReader ) { d->dataTrackReader = new K3bDataTrackReader( this, this ); - connect( d->dataTrackReader, SIGNAL(percent(int)), this, SLOT(slotReaderProgress(int)) ); - connect( d->dataTrackReader, SIGNAL(processedSize(int, int)), this, SLOT(slotReaderProcessedSize(int, int)) ); - connect( d->dataTrackReader, SIGNAL(finished(bool)), this, SLOT(slotSessionReaderFinished(bool)) ); - connect( d->dataTrackReader, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->dataTrackReader, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) ); + connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) ); + connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotSessionReaderFinished(bool)) ); + connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->dataTrackReader->setDevice( m_readerDevice ); @@ -677,17 +677,17 @@ bool K3bCdCopyJob::writeNextSession() // we emit our own task since the cdrecord task is way too simple if( d->numSessions > 1 ) { if( m_simulate ) - emit newTask( i18n("Simulating Session %1").arg(d->currentWrittenSession) ); + emit newTask( i18n("Simulating Session %1").tqarg(d->currentWrittenSession) ); else if( m_copies > 1 ) - emit newTask( i18n("Writing Copy %1 (Session %2)").arg(d->doneCopies+1).arg(d->currentWrittenSession) ); + emit newTask( i18n("Writing Copy %1 (Session %2)").tqarg(d->doneCopies+1).tqarg(d->currentWrittenSession) ); else - emit newTask( i18n("Writing Copy (Session %2)").arg(d->currentWrittenSession) ); + emit newTask( i18n("Writing Copy (Session %2)").tqarg(d->currentWrittenSession) ); } else { if( m_simulate ) emit newTask( i18n("Simulating") ); else if( m_copies > 1 ) - emit newTask( i18n("Writing Copy %1").arg(d->doneCopies+1) ); + emit newTask( i18n("Writing Copy %1").tqarg(d->doneCopies+1) ); else emit newTask( i18n("Writing Copy") ); } @@ -707,20 +707,20 @@ bool K3bCdCopyJob::writeNextSession() if( !d->cdrecordWriter ) { d->cdrecordWriter = new K3bCdrecordWriter( m_writerDevice, this, this ); - connect( d->cdrecordWriter, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->cdrecordWriter, SIGNAL(percent(int)), this, SLOT(slotWriterProgress(int)) ); - connect( d->cdrecordWriter, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( d->cdrecordWriter, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( d->cdrecordWriter, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( d->cdrecordWriter, SIGNAL(nextTrack(int, int)), this, SLOT(slotWritingNextTrack(int, int)) ); - connect( d->cdrecordWriter, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( d->cdrecordWriter, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( d->cdrecordWriter, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( d->cdrecordWriter, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) ); - // connect( d->cdrecordWriter, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( d->cdrecordWriter, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( d->cdrecordWriter, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWritingNextTrack(int, int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); + // connect( d->cdrecordWriter, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->cdrecordWriter->setBurnDevice( m_writerDevice ); @@ -742,7 +742,7 @@ bool K3bCdCopyJob::writeNextSession() // // create the inf files if not already done // - if( d->infNames.isEmpty() || !QFile::exists( d->infNames[0] ) ) { + if( d->infNames.isEmpty() || !TQFile::exists( d->infNames[0] ) ) { unsigned int trackNumber = 1; @@ -773,7 +773,7 @@ bool K3bCdCopyJob::writeNextSession() // It is important that the files have the ending inf because // cdrecord only checks this - KTempFile tmp( QString::null, ".inf" ); + KTempFile tmp( TQString(), ".inf" ); d->infNames.append( tmp.name() ); bool success = d->infFileWriter->save( *tmp.textStream() ); tmp.close(); @@ -841,7 +841,7 @@ bool K3bCdCopyJob::writeNextSession() } else { // make sure the writer job does not create raw cdtext - d->cdrecordWriter->setRawCdText( QByteArray() ); + d->cdrecordWriter->setRawCdText( TQByteArray() ); // cdrecord will use the cdtext data in the inf files d->cdrecordWriter->addArgument( "-text" ); } @@ -923,7 +923,7 @@ bool K3bCdCopyJob::writeNextSession() trackLen = trackLen * 2056; // see k3bdatatrackreader.h else trackLen = trackLen * 2332; // see k3bdatatrackreader.h - d->cdrecordWriter->addArgument( QString("-tsize=%1").arg(trackLen) )->addArgument("-"); + d->cdrecordWriter->addArgument( TQString("-tsize=%1").tqarg(trackLen) )->addArgument("-"); } else if( d->toc.contentType() == K3bDevice::MIXED ) d->cdrecordWriter->addArgument( d->imageNames[d->toc.count()-1] ); @@ -931,7 +931,7 @@ bool K3bCdCopyJob::writeNextSession() d->cdrecordWriter->addArgument( d->imageNames[d->currentWrittenSession-1] ); // clear cd text from previous sessions - d->cdrecordWriter->setRawCdText( QByteArray() ); + d->cdrecordWriter->setRawCdText( TQByteArray() ); } @@ -953,7 +953,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success ) if( success ) { if( d->numSessions > 1 ) - emit infoMessage( i18n("Successfully read session %1.").arg(d->currentReadSession), SUCCESS ); + emit infoMessage( i18n("Successfully read session %1.").tqarg(d->currentReadSession), SUCCESS ); else emit infoMessage( i18n("Successfully read source disk."), SUCCESS ); @@ -987,7 +987,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success ) } else { if( !d->canceled ) { - emit infoMessage( i18n("Error while reading session %1.").arg(d->currentReadSession), ERROR ); + emit infoMessage( i18n("Error while reading session %1.").tqarg(d->currentReadSession), ERROR ); if( m_onTheFly ) d->cdrecordWriter->setSourceUnreadable(true); } @@ -1015,8 +1015,8 @@ void K3bCdCopyJob::slotWriterFinished( bool success ) // reload the media emit newSubTask( i18n("Reloading the medium") ); - connect( K3bDevice::reload( m_writerDevice ), SIGNAL(finished(K3bDevice::DeviceHandler*)), - this, SLOT(slotMediaReloadedForNextSession(K3bDevice::DeviceHandler*)) ); + connect( K3bDevice::reload( m_writerDevice ), TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + this, TQT_SLOT(slotMediaReloadedForNextSession(K3bDevice::DeviceHandler*)) ); } else { d->doneCopies++; @@ -1073,14 +1073,14 @@ void K3bCdCopyJob::cleanup() { if( m_onTheFly || !m_keepImage || ((d->canceled || d->error) && !d->readingSuccessful) ) { emit infoMessage( i18n("Removing temporary files."), INFO ); - for( QStringList::iterator it = d->infNames.begin(); it != d->infNames.end(); ++it ) - QFile::remove( *it ); + for( TQStringList::iterator it = d->infNames.begin(); it != d->infNames.end(); ++it ) + TQFile::remove( *it ); } if( !m_onTheFly && (!m_keepImage || ((d->canceled || d->error) && !d->readingSuccessful)) ) { emit infoMessage( i18n("Removing image files."), INFO ); - for( QStringList::iterator it = d->imageNames.begin(); it != d->imageNames.end(); ++it ) - QFile::remove( *it ); + for( TQStringList::iterator it = d->imageNames.begin(); it != d->imageNames.end(); ++it ) + TQFile::remove( *it ); // remove the tempdir created in prepareImageFiles() if( d->deleteTempDir ) { @@ -1137,14 +1137,14 @@ void K3bCdCopyJob::slotWritingNextTrack( int t, int tt ) { if( d->toc.contentType() == K3bDevice::MIXED ) { if( d->currentWrittenSession == 1 ) - emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(d->toc.count()) ); + emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(d->toc.count()) ); else - emit newSubTask( i18n("Writing track %1 of %2").arg(d->toc.count()).arg(d->toc.count()) ); + emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->toc.count()).tqarg(d->toc.count()) ); } else if( d->numSessions > 1 ) - emit newSubTask( i18n("Writing track %1 of %2").arg(d->currentWrittenSession).arg(d->toc.count()) ); + emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->currentWrittenSession).tqarg(d->toc.count()) ); else - emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) ); + emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) ); } @@ -1159,12 +1159,12 @@ void K3bCdCopyJob::slotReadingNextTrack( int t, int ) else track = d->currentReadSession; - emit newSubTask( i18n("Reading track %1 of %2").arg(track).arg(d->toc.count()) ); + emit newSubTask( i18n("Reading track %1 of %2").tqarg(track).tqarg(d->toc.count()) ); } } -QString K3bCdCopyJob::jobDescription() const +TQString K3bCdCopyJob::jobDescription() const { if( m_onlyCreateImages ) { return i18n("Creating CD Image"); @@ -1184,7 +1184,7 @@ QString K3bCdCopyJob::jobDescription() const } -QString K3bCdCopyJob::jobDetails() const +TQString K3bCdCopyJob::jobDetails() const { return i18n("Creating 1 copy", "Creating %n copies", diff --git a/libk3b/jobs/k3bcdcopyjob.h b/libk3b/jobs/k3bcdcopyjob.h index 3ab77e8..65c7e9f 100644 --- a/libk3b/jobs/k3bcdcopyjob.h +++ b/libk3b/jobs/k3bcdcopyjob.h @@ -32,16 +32,17 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bCdCopyJob( K3bJobHandler* hdl, QObject* parent = 0 ); + K3bCdCopyJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); ~K3bCdCopyJob(); K3bDevice::Device* writer() const { return m_onlyCreateImages ? 0 : m_writerDevice; } K3bDevice::Device* reader() const { return m_readerDevice; } - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); @@ -56,7 +57,7 @@ class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob void setKeepImage( bool b ) { m_keepImage = b; } void setOnlyCreateImage( bool b ) { m_onlyCreateImages = b; } void setSimulate( bool b ) { m_simulate = b; } - void setTempPath( const QString& path ) { m_tempPath= path; } + void setTempPath( const TQString& path ) { m_tempPath= path; } void setCopies( unsigned int c ) { m_copies = c; } void setParanoiaMode( int i ) { m_paranoiaMode = i; } void setIgnoreDataReadErrors( bool b ) { m_ignoreDataReadErrors = b; } @@ -107,7 +108,7 @@ class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob int m_audioReadRetries; bool m_preferCdText; bool m_copyCdText; - QString m_tempPath; + TQString m_tempPath; int m_writingMode; class Private; diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp index 3df87d3..901f77b 100644 --- a/libk3b/jobs/k3bcdda2wavreader.cpp +++ b/libk3b/jobs/k3bcdda2wavreader.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> #include <klocale.h> -#include <qvaluevector.h> -#include <qregexp.h> +#include <tqvaluevector.h> +#include <tqregexp.h> class K3bCdda2wavReader::Private @@ -48,12 +48,12 @@ public: int fdToWriteTo; int currentTrack; - QValueVector<int> trackOffsets; + TQValueVector<int> trackOffsets; }; -K3bCdda2wavReader::K3bCdda2wavReader( QObject* parent, const char* name ) - : K3bJob( parent, name ) +K3bCdda2wavReader::K3bCdda2wavReader( TQObject* tqparent, const char* name ) + : K3bJob( tqparent, name ) { d = new Private(); } @@ -95,7 +95,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) d->cdda2wavBin = k3bcore->externalBinManager()->binObject( "cdda2wav" ); if( !d->cdda2wavBin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("cdda2wav"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdda2wav"), ERROR ); jobFinished(false); d->running = false; return; @@ -107,15 +107,15 @@ void K3bCdda2wavReader::start( bool onlyInfo ) d->process->setSplitStdout(true); d->process->setSuppressEmptyLines(true); d->process->setWorkingDirectory( m_imagePath ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotProcessLine(const QString&)) ); - connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotProcessLine(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); // create the command line *d->process << d->cdda2wavBin->path; *d->process << "-vall" << ( d->cdda2wavBin->hasFeature( "gui" ) ? "-gui" : "-g" ); if( d->cdda2wavBin->hasFeature( "dev" ) ) - *d->process << QString("dev=%1").arg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin)); + *d->process << TQString("dev=%1").tqarg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin)); else *d->process << "-D" << K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin); *d->process << ( d->cdda2wavBin->hasFeature( "bulk" ) ? "-bulk" : "-B" ); @@ -125,8 +125,8 @@ void K3bCdda2wavReader::start( bool onlyInfo ) *d->process << ( d->cdda2wavBin->hasFeature( "no-infofile" ) ? "-no-infofile" : "-H" ); // additional user parameters from config - const QStringList& params = d->cdda2wavBin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = d->cdda2wavBin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *d->process << *it; // start the thing @@ -134,7 +134,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bCdda2wavReader) could not start cdda2wav" << endl; - emit infoMessage( i18n("Could not start %1.").arg("cdda2wav"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg("cdda2wav"), K3bJob::ERROR ); d->running = false; jobFinished(false); } @@ -152,7 +152,7 @@ void K3bCdda2wavReader::cancel() } -void K3bCdda2wavReader::slotProcessLine( const QString& line ) +void K3bCdda2wavReader::slotProcessLine( const TQString& line ) { // Tracks:11 44:37.30 // CDINDEX discid: ZvzBXv614ACgzn1bWWy107cs0nA- @@ -179,11 +179,11 @@ void K3bCdda2wavReader::slotProcessLine( const QString& line ) - static QRegExp rx( "T\\d\\d:" ); + static TQRegExp rx( "T\\d\\d:" ); if( rx.exactMatch( line.left(4) ) || line.startsWith( "Leadout" ) ) { - int pos = line.find( " " ); - int endpos = line.find( QRegExp( "\\d" ), pos ); - endpos = line.find( " ", endpos ); + int pos = line.tqfind( " " ); + int endpos = line.tqfind( TQRegExp( "\\d" ), pos ); + endpos = line.tqfind( " ", endpos ); bool ok; int offset = line.mid( pos, endpos-pos ).toInt(&ok); if( ok ) @@ -198,12 +198,12 @@ void K3bCdda2wavReader::slotProcessLine( const QString& line ) emit nextTrack( d->currentTrack, d->trackOffsets.count() ); } - else if( line.contains("successfully recorded") ) { + else if( line.tqcontains("successfully recorded") ) { d->currentTrack++; emit nextTrack( d->currentTrack, d->trackOffsets.count() ); } - else if( line.contains("%") ) { + else if( line.tqcontains("%") ) { // parse progress bool ok; int p = line.left(3).toInt(&ok); @@ -240,12 +240,12 @@ void K3bCdda2wavReader::slotProcessExited( KProcess* p ) } else { emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .arg("Cdda2wav").arg(p->exitStatus()), ERROR ); + .tqarg("Cdda2wav").tqarg(p->exitStatus()), ERROR ); jobFinished( false ); } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg("Cdda2wav"), + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Cdda2wav"), ERROR ); jobFinished( false ); } diff --git a/libk3b/jobs/k3bcdda2wavreader.h b/libk3b/jobs/k3bcdda2wavreader.h index edde65c..938e1a5 100644 --- a/libk3b/jobs/k3bcdda2wavreader.h +++ b/libk3b/jobs/k3bcdda2wavreader.h @@ -32,9 +32,10 @@ namespace K3bDevice { class K3bCdda2wavReader : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bCdda2wavReader( QObject* parent = 0, const char* name = 0 ); + K3bCdda2wavReader( TQObject* tqparent = 0, const char* name = 0 ); ~K3bCdda2wavReader(); bool active() const; @@ -45,7 +46,7 @@ class K3bCdda2wavReader : public K3bJob void cancel(); void setReadDevice( K3bDevice::Device* dev ) { m_device = dev; } - void setImagePath( const QString& p ) { m_imagePath = p; } + void setImagePath( const TQString& p ) { m_imagePath = p; } /** * the data gets written directly into fd instead of the imagefile. @@ -55,13 +56,13 @@ class K3bCdda2wavReader : public K3bJob void writeToFd( int fd ); private slots: - void slotProcessLine( const QString& ); + void slotProcessLine( const TQString& ); void slotProcessExited( KProcess* ); private: K3bDevice::Device* m_device; - QString m_imagePath; + TQString m_imagePath; class Private; Private* d; diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp index 9fb61ab..89c1c1f 100644 --- a/libk3b/jobs/k3bclonejob.cpp +++ b/libk3b/jobs/k3bclonejob.cpp @@ -27,8 +27,8 @@ #include <kdebug.h> #include <klocale.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqfileinfo.h> @@ -43,8 +43,8 @@ public: }; -K3bCloneJob::K3bCloneJob( K3bJobHandler* hdl, QObject* parent, const char* name ) - : K3bBurnJob( hdl, parent, name ), +K3bCloneJob::K3bCloneJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) + : K3bBurnJob( hdl, tqparent, name ), m_writerDevice(0), m_readerDevice(0), m_writerJob(0), @@ -85,13 +85,13 @@ void K3bCloneJob::start() // const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" ); if( !cdrecordBin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), ERROR ); jobFinished(false); m_running = false; return; } else if( !cdrecordBin->hasFeature( "clone" ) ) { - emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").arg(cdrecordBin->version), ERROR ); + emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").tqarg(cdrecordBin->version), ERROR ); jobFinished(false); m_running = false; return; @@ -109,8 +109,8 @@ void K3bCloneJob::start() if( !writer()->supportsWritingMode( K3bDevice::RAW_R96R ) && !writer()->supportsWritingMode( K3bDevice::RAW_R16 ) ) { emit infoMessage( i18n("CD writer %1 does not support cloning.") - .arg(writer()->vendor()) - .arg(writer()->description()), ERROR ); + .tqarg(writer()->vendor()) + .tqarg(writer()->description()), ERROR ); m_running = false; jobFinished(false); return; @@ -120,7 +120,7 @@ void K3bCloneJob::start() if( m_imagePath.isEmpty() ) { m_imagePath = K3b::findTempFile( "img" ); } - else if( QFileInfo(m_imagePath).isDir() ) { + else if( TQFileInfo(m_imagePath).isDir() ) { m_imagePath = K3b::findTempFile( "img", m_imagePath ); } @@ -152,14 +152,14 @@ void K3bCloneJob::prepareReader() { if( !m_readcdReader ) { m_readcdReader = new K3bReadcdReader( this, this ); - connect( m_readcdReader, SIGNAL(percent(int)), this, SLOT(slotReadingPercent(int)) ); - connect( m_readcdReader, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_readcdReader, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_readcdReader, SIGNAL(finished(bool)), this, SLOT(slotReadingFinished(bool)) ); - connect( m_readcdReader, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_readcdReader, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_readcdReader, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_readcdReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReadingPercent(int)) ); + connect( m_readcdReader, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_readcdReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_readcdReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReadingFinished(bool)) ); + connect( m_readcdReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_readcdReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_readcdReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } m_readcdReader->setReadDevice( readingDevice() ); @@ -175,19 +175,19 @@ void K3bCloneJob::prepareWriter() { if( !m_writerJob ) { m_writerJob = new K3bCdrecordWriter( writer(), this, this ); - connect( m_writerJob, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writerJob, SIGNAL(percent(int)), this, SLOT(slotWriterPercent(int)) ); - connect( m_writerJob, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_writerJob, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writerJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_writerJob, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writerJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writerJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writerJob, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) ); - // connect( m_writerJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_writerJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) ); + connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); + connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); + // connect( m_writerJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( m_writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } m_writerJob->clearArguments(); @@ -222,7 +222,7 @@ void K3bCloneJob::slotWriterPercent( int p ) void K3bCloneJob::slotWriterNextTrack( int t, int tt ) { - emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) ); + emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(tt) ); } @@ -239,7 +239,7 @@ void K3bCloneJob::slotWriterFinished( bool success ) if( success ) { d->doneCopies++; - emit infoMessage( i18n("Successfully written clone copy %1.").arg(d->doneCopies), INFO ); + emit infoMessage( i18n("Successfully written clone copy %1.").tqarg(d->doneCopies), INFO ); if( d->doneCopies < m_copies ) { K3bDevice::eject( writer() ); @@ -330,7 +330,7 @@ void K3bCloneJob::startWriting() if( m_simulate ) emit newTask( i18n("Simulating clone copy") ); else - emit newTask( i18n("Writing clone copy %1").arg(d->doneCopies+1) ); + emit newTask( i18n("Writing clone copy %1").tqarg(d->doneCopies+1) ); m_writerJob->start(); } @@ -340,15 +340,15 @@ void K3bCloneJob::removeImageFiles() { if( !m_onlyBurnExistingImage ) { emit infoMessage( i18n("Removing image files."), INFO ); - if( QFile::exists( m_imagePath ) ) - QFile::remove( m_imagePath ); - if( QFile::exists( m_imagePath + ".toc" ) ) - QFile::remove( m_imagePath + ".toc" ); + if( TQFile::exists( m_imagePath ) ) + TQFile::remove( m_imagePath ); + if( TQFile::exists( m_imagePath + ".toc" ) ) + TQFile::remove( m_imagePath + ".toc" ); } } -QString K3bCloneJob::jobDescription() const +TQString K3bCloneJob::jobDescription() const { if( m_onlyCreateImage ) return i18n("Creating Clone Image"); @@ -365,7 +365,7 @@ QString K3bCloneJob::jobDescription() const } -QString K3bCloneJob::jobDetails() const +TQString K3bCloneJob::jobDetails() const { return i18n("Creating 1 clone copy", "Creating %n clone copies", diff --git a/libk3b/jobs/k3bclonejob.h b/libk3b/jobs/k3bclonejob.h index 80c8ea9..e928f3c 100644 --- a/libk3b/jobs/k3bclonejob.h +++ b/libk3b/jobs/k3bclonejob.h @@ -18,7 +18,7 @@ #include <k3bjob.h> #include "k3b_export.h" -#include <qstring.h> +#include <tqstring.h> namespace K3bDevice { @@ -31,16 +31,17 @@ class K3bReadcdReader; class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bCloneJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bCloneJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bCloneJob(); K3bDevice::Device* writer() const { return m_writerDevice; } K3bDevice::Device* readingDevice() const { return m_readerDevice; } - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); @@ -48,7 +49,7 @@ class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob void setWriterDevice( K3bDevice::Device* w ) { m_writerDevice = w; } void setReaderDevice( K3bDevice::Device* w ) { m_readerDevice = w; } - void setImagePath( const QString& p ) { m_imagePath = p; } + void setImagePath( const TQString& p ) { m_imagePath = p; } void setNoCorrection( bool b ) { m_noCorrection = b; } void setRemoveImageFiles( bool b ) { m_removeImageFiles = b; } void setOnlyCreateImage( bool b ) { m_onlyCreateImage = b; } @@ -73,7 +74,7 @@ class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob K3bDevice::Device* m_writerDevice; K3bDevice::Device* m_readerDevice; - QString m_imagePath; + TQString m_imagePath; K3bCdrecordWriter* m_writerJob; K3bReadcdReader* m_readcdReader; diff --git a/libk3b/jobs/k3bclonetocreader.cpp b/libk3b/jobs/k3bclonetocreader.cpp index 5dd8b8b..2122937 100644 --- a/libk3b/jobs/k3bclonetocreader.cpp +++ b/libk3b/jobs/k3bclonetocreader.cpp @@ -21,8 +21,8 @@ #include <k3bdeviceglobals.h> #include <k3bglobals.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kdebug.h> @@ -35,12 +35,12 @@ public: } K3b::Msf size; - QString tocFile; + TQString tocFile; }; -K3bCloneTocReader::K3bCloneTocReader( const QString& filename ) +K3bCloneTocReader::K3bCloneTocReader( const TQString& filename ) : K3bImageFileReader() { d = new Private; @@ -74,8 +74,8 @@ void K3bCloneTocReader::readFile() d->tocFile = filename() + ".toc"; // now get rid of the ".toc" extension - QString imageFileName = d->tocFile.left( d->tocFile.length()-4 ); - if( !QFile::exists( imageFileName ) ) { + TQString imageFileName = d->tocFile.left( d->tocFile.length()-4 ); + if( !TQFile::exists( imageFileName ) ) { kdDebug() << "(K3bCloneTocReader) could not find image file " << imageFileName << endl; return; } @@ -84,7 +84,7 @@ void K3bCloneTocReader::readFile() d->size = 0; - QFile f( d->tocFile ); + TQFile f( d->tocFile ); if( f.open( IO_ReadOnly ) ) { // // Inspired by clone.c from the cdrecord sources diff --git a/libk3b/jobs/k3bclonetocreader.h b/libk3b/jobs/k3bclonetocreader.h index 17e80d7..6336050 100644 --- a/libk3b/jobs/k3bclonetocreader.h +++ b/libk3b/jobs/k3bclonetocreader.h @@ -30,7 +30,7 @@ class LIBK3B_EXPORT K3bCloneTocReader : public K3bImageFileReader { public: - K3bCloneTocReader( const QString& filename = QString::null ); + K3bCloneTocReader( const TQString& filename = TQString() ); ~K3bCloneTocReader(); const K3b::Msf& imageSize() const; diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp index 8300ada..85a14cd 100644 --- a/libk3b/jobs/k3bdatatrackreader.cpp +++ b/libk3b/jobs/k3bdatatrackreader.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kdebug.h> -#include <qfile.h> +#include <tqfile.h> #include <unistd.h> @@ -57,7 +57,7 @@ public: K3b::Msf m_lastSector; K3b::Msf m_nextReadSector; int m_fd; - QString m_imagePath; + TQString m_imagePath; int m_sectorSize; bool m_useLibdvdcss; K3bLibDvdCss* m_libcss; @@ -71,8 +71,8 @@ private: }; -K3bDataTrackReader::K3bDataTrackReader( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ) +K3bDataTrackReader::K3bDataTrackReader( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ) { m_thread = new WorkThread(); setThread( m_thread ); @@ -109,7 +109,7 @@ void K3bDataTrackReader::WorkThread::run() emitStarted(); if( !m_device->open() ) { - emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR ); + emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR ); emitFinished(false); return; } @@ -142,7 +142,7 @@ void K3bDataTrackReader::WorkThread::run() } if( !m_libcss->open(m_device) ) { - emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR ); + emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR ); emitFinished(false); return; } @@ -183,23 +183,23 @@ void K3bDataTrackReader::WorkThread::run() } } - emitInfoMessage( i18n("Reading with sector size %1.").arg(m_usedSectorSize), K3bJob::INFO ); + emitInfoMessage( i18n("Reading with sector size %1.").tqarg(m_usedSectorSize), K3bJob::INFO ); emitDebuggingOutput( "K3bDataTrackReader", - QString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.") - .arg( m_firstSector.lba() ) - .arg( m_lastSector.lba() ) - .arg( m_usedSectorSize ) - .arg( m_lastSector.lba() - m_firstSector.lba() + 1 ) - .arg( Q_UINT64(m_usedSectorSize) * (Q_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) ); - - QFile file; + TQString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.") + .tqarg( m_firstSector.lba() ) + .tqarg( m_lastSector.lba() ) + .tqarg( m_usedSectorSize ) + .tqarg( m_lastSector.lba() - m_firstSector.lba() + 1 ) + .tqarg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) ); + + TQFile file; if( m_fd == -1 ) { file.setName( m_imagePath ); if( !file.open( IO_WriteOnly ) ) { m_device->close(); if( m_useLibdvdcss ) m_libcss->close(); - emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), K3bJob::ERROR ); emitFinished( false ); return; } @@ -231,7 +231,7 @@ void K3bDataTrackReader::WorkThread::run() // s_bufferSizeSectors = K3bDevice::determineMaxReadingBufferSize( m_device, m_firstSector ); if( s_bufferSizeSectors <= 0 ) { - emitInfoMessage( i18n("Error while reading sector %1.").arg(m_firstSector.lba()), K3bJob::ERROR ); + emitInfoMessage( i18n("Error while reading sector %1.").tqarg(m_firstSector.lba()), K3bJob::ERROR ); emitFinished(false); m_device->block( false ); k3bcore->unblockDevice( m_device ); @@ -239,7 +239,7 @@ void K3bDataTrackReader::WorkThread::run() } kdDebug() << "(K3bDataTrackReader) using buffer size of " << s_bufferSizeSectors << " blocks." << endl; - emitDebuggingOutput( "K3bDataTrackReader", QString("using buffer size of %1 blocks.").arg( s_bufferSizeSectors ) ); + emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").tqarg( s_bufferSizeSectors ) ); // 2. get it on K3b::Msf currentSector = m_firstSector; @@ -253,7 +253,7 @@ void K3bDataTrackReader::WorkThread::run() int bufferLen = s_bufferSizeSectors*m_usedSectorSize; while( !m_canceled && currentSector <= m_lastSector ) { - int maxReadSectors = QMIN( bufferLen/m_usedSectorSize, m_lastSector.lba()-currentSector.lba()+1 ); + int maxReadSectors = TQMIN( bufferLen/m_usedSectorSize, m_lastSector.lba()-currentSector.lba()+1 ); int readSectors = read( buffer, currentSector.lba(), @@ -278,8 +278,8 @@ void K3bDataTrackReader::WorkThread::run() kdDebug() << "(K3bDataTrackReader::WorkThread) error while writing to fd " << m_fd << " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl; emitDebuggingOutput( "K3bDataTrackReader", - QString("Error while writing to fd %1. Current sector is %2.") - .arg(m_fd).arg(currentSector.lba()-m_firstSector.lba()) ); + TQString("Error while writing to fd %1. Current sector is %2.") + .tqarg(m_fd).tqarg(currentSector.lba()-m_firstSector.lba()) ); writeError = true; break; } @@ -289,8 +289,8 @@ void K3bDataTrackReader::WorkThread::run() kdDebug() << "(K3bDataTrackReader::WorkThread) error while writing to file " << m_imagePath << " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl; emitDebuggingOutput( "K3bDataTrackReader", - QString("Error while writing to file %1. Current sector is %2.") - .arg(m_imagePath).arg(currentSector.lba()-m_firstSector.lba()) ); + TQString("Error while writing to file %1. Current sector is %2.") + .tqarg(m_imagePath).tqarg(currentSector.lba()-m_firstSector.lba()) ); writeError = true; break; } @@ -330,9 +330,9 @@ void K3bDataTrackReader::WorkThread::run() delete [] buffer; emitDebuggingOutput( "K3bDataTrackReader", - QString("Read a total of %1 sectors (%2 bytes)") - .arg(totalReadSectors.lba()) - .arg((Q_UINT64)totalReadSectors.lba()*(Q_UINT64)m_usedSectorSize) ); + TQString("Read a total of %1 sectors (%2 bytes)") + .tqarg(totalReadSectors.lba()) + .tqarg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) ); if( m_canceled ) emitCanceled(); @@ -386,8 +386,8 @@ int K3bDataTrackReader::WorkThread::read( unsigned char* buffer, unsigned long s // here we read every single sector for itself to find the troubleing ones bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned long startSector, unsigned int len ) { - emitDebuggingOutput( "K3bDataTrackReader", QString( "Problem while reading. Retrying from sector %1.").arg(startSector) ); - emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").arg(startSector), K3bJob::WARNING ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").tqarg(startSector) ); + emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").tqarg(startSector), K3bJob::WARNING ); int sectorsRead = -1; bool success = true; @@ -403,16 +403,16 @@ bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned if( !success ) { if( m_ignoreReadErrors ) { - emitInfoMessage( i18n("Ignoring read error in sector %1.").arg(sector), K3bJob::ERROR ); - emitDebuggingOutput( "K3bDataTrackReader", QString( "Ignoring read error in sector %1.").arg(sector) ); + emitInfoMessage( i18n("Ignoring read error in sector %1.").tqarg(sector), K3bJob::ERROR ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").tqarg(sector) ); ++m_errorSectorCount; // ::memset( &buffer[i], 0, 1 ); success = true; } else { - emitInfoMessage( i18n("Error while reading sector %1.").arg(sector), K3bJob::ERROR ); - emitDebuggingOutput( "K3bDataTrackReader", QString( "Read error in sector %1.").arg(sector) ); + emitInfoMessage( i18n("Error while reading sector %1.").tqarg(sector), K3bJob::ERROR ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").tqarg(sector) ); break; } } @@ -502,7 +502,7 @@ void K3bDataTrackReader::writeToFd( int fd ) } -void K3bDataTrackReader::setImagePath( const QString& p ) +void K3bDataTrackReader::setImagePath( const TQString& p ) { m_thread->m_imagePath = p; m_thread->m_fd = -1; diff --git a/libk3b/jobs/k3bdatatrackreader.h b/libk3b/jobs/k3bdatatrackreader.h index 814c01c..0782079 100644 --- a/libk3b/jobs/k3bdatatrackreader.h +++ b/libk3b/jobs/k3bdatatrackreader.h @@ -41,7 +41,7 @@ namespace K3bDevice { class K3bDataTrackReader : public K3bThreadJob { public: - K3bDataTrackReader( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bDataTrackReader( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bDataTrackReader(); enum SectorSize { @@ -77,7 +77,7 @@ class K3bDataTrackReader : public K3bThreadJob */ void writeToFd( int fd ); - void setImagePath( const QString& p ); + void setImagePath( const TQString& p ); private: class WorkThread; diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index 96d727c..d00cc1d 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -36,9 +36,9 @@ #include <klocale.h> #include <kio/global.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qapplication.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqapplication.h> class K3bDvdCopyJob::Private @@ -83,8 +83,8 @@ public: }; -K3bDvdCopyJob::K3bDvdCopyJob( K3bJobHandler* hdl, QObject* parent, const char* name ) - : K3bBurnJob( hdl, parent, name ), +K3bDvdCopyJob::K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) + : K3bBurnJob( hdl, tqparent, name ), m_writerDevice(0), m_readerDevice(0), m_onTheFly(false), @@ -122,7 +122,7 @@ void K3bDvdCopyJob::start() k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) { m_onTheFly = false; emit infoMessage( i18n("K3b does not support writing on-the-fly with growisofs %1.") - .arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR ); + .tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR ); emit infoMessage( i18n("Disabling on-the-fly writing."), INFO ); } @@ -141,9 +141,9 @@ void K3bDvdCopyJob::start() emit newSubTask( i18n("Checking source medium") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, m_readerDevice ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); } @@ -293,19 +293,19 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // // Check the image path // - QFileInfo fi( m_imagePath ); + TQFileInfo fi( m_imagePath ); if( !fi.isFile() || - questionYesNo( i18n("Do you want to overwrite %1?").arg(m_imagePath), + questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_imagePath), i18n("File Exists") ) ) { if( fi.isDir() ) m_imagePath = K3b::findTempFile( "iso", m_imagePath ); - else if( !QFileInfo( m_imagePath.section( '/', 0, -2 ) ).isDir() ) { + else if( !TQFileInfo( m_imagePath.section( '/', 0, -2 ) ).isDir() ) { emit infoMessage( i18n("Specified an unusable temporary path. Using default."), WARNING ); m_imagePath = K3b::findTempFile( "iso" ); } // else the user specified a file in an existing dir - emit infoMessage( i18n("Writing image file to %1.").arg(m_imagePath), INFO ); + emit infoMessage( i18n("Writing image file to %1.").tqarg(m_imagePath), INFO ); emit newSubTask( i18n("Reading source medium.") ); } @@ -314,9 +314,9 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // KIO::filesize_t imageSpaceNeeded = (KIO::filesize_t)(d->lastSector.lba()+1)*2048; unsigned long avail, size; - QString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) ); + TQString pathToTest = m_imagePath.left( m_imagePath.tqfindRev( '/' ) ); if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { - emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR ); + emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR ); jobFinished(false); d->running = false; return; @@ -332,7 +332,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) d->imageFile.setName( m_imagePath ); if( !d->imageFile.open( IO_WriteOnly ) ) { - emit infoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), ERROR ); + emit infoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), ERROR ); jobFinished( false ); d->running = false; return; @@ -353,7 +353,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) if( m_simulate ) emit newTask( i18n("Simulating DVD copy") ); else if( m_copies > 1 ) - emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) ); + emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); else emit newTask( i18n("Writing DVD copy") ); @@ -399,13 +399,13 @@ void K3bDvdCopyJob::prepareReader() { if( !d->dataTrackReader ) { d->dataTrackReader = new K3bDataTrackReader( this ); - connect( d->dataTrackReader, SIGNAL(percent(int)), this, SLOT(slotReaderProgress(int)) ); - connect( d->dataTrackReader, SIGNAL(processedSize(int, int)), this, SLOT(slotReaderProcessedSize(int, int)) ); - connect( d->dataTrackReader, SIGNAL(finished(bool)), this, SLOT(slotReaderFinished(bool)) ); - connect( d->dataTrackReader, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->dataTrackReader, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( d->dataTrackReader, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) ); + connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) ); + connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReaderFinished(bool)) ); + connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->dataTrackReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->dataTrackReader->setDevice( m_readerDevice ); @@ -430,18 +430,18 @@ void K3bDvdCopyJob::prepareWriter() d->writerJob = new K3bGrowisofsWriter( m_writerDevice, this ); - connect( d->writerJob, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->writerJob, SIGNAL(percent(int)), this, SLOT(slotWriterProgress(int)) ); - connect( d->writerJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( d->writerJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( d->writerJob, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( d->writerJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( d->writerJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( d->writerJob, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) ); - // connect( d->writerJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( d->writerJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( d->writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( d->writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) ); + connect( d->writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( d->writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( d->writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( d->writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( d->writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); + // connect( d->writerJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( d->writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( d->writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); // these do only make sense with DVD-R(W) d->writerJob->setSimulate( m_simulate ); @@ -462,7 +462,7 @@ void K3bDvdCopyJob::prepareWriter() d->writerJob->setTrackSize( d->lastSector.lba()+1 ); } - d->writerJob->setImageToWrite( QString::null ); // write to stdin + d->writerJob->setImageToWrite( TQString() ); // write to stdin } @@ -548,7 +548,7 @@ void K3bDvdCopyJob::slotReaderFinished( bool success ) if( waitForDvd() ) { prepareWriter(); if( m_copies > 1 ) - emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) ); + emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); else emit newTask( i18n("Writing DVD copy") ); @@ -597,30 +597,30 @@ void K3bDvdCopyJob::slotWriterFinished( bool success ) } if( success ) { - emit infoMessage( i18n("Successfully written DVD copy %1.").arg(d->doneCopies+1), INFO ); + emit infoMessage( i18n("Successfully written DVD copy %1.").tqarg(d->doneCopies+1), INFO ); if( d->verifyData && !m_simulate ) { if( !d->verificationJob ) { d->verificationJob = new K3bVerificationJob( this, this ); - connect( d->verificationJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->verificationJob, SIGNAL(newTask(const QString&)), - this, SIGNAL(newSubTask(const QString&)) ); - connect( d->verificationJob, SIGNAL(percent(int)), - this, SLOT(slotVerificationProgress(int)) ); - connect( d->verificationJob, SIGNAL(percent(int)), - this, SIGNAL(subPercent(int)) ); - connect( d->verificationJob, SIGNAL(finished(bool)), - this, SLOT(slotVerificationFinished(bool)) ); - connect( d->verificationJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( d->verificationJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->verificationJob, TQT_SIGNAL(newTask(const TQString&)), + this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( d->verificationJob, TQT_SIGNAL(percent(int)), + this, TQT_SLOT(slotVerificationProgress(int)) ); + connect( d->verificationJob, TQT_SIGNAL(percent(int)), + this, TQT_SIGNAL(subPercent(int)) ); + connect( d->verificationJob, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotVerificationFinished(bool)) ); + connect( d->verificationJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->verificationJob->setDevice( m_writerDevice ); d->verificationJob->addTrack( 1, d->inPipe.checksum(), d->lastSector+1 ); if( m_copies > 1 ) - emit newTask( i18n("Verifying DVD copy %1").arg(d->doneCopies+1) ); + emit newTask( i18n("Verifying DVD copy %1").tqarg(d->doneCopies+1) ); else emit newTask( i18n("Verifying DVD copy") ); @@ -637,7 +637,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success ) if( waitForDvd() ) { prepareWriter(); - emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) ); + emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); emit burning(true); @@ -686,7 +686,7 @@ void K3bDvdCopyJob::slotVerificationFinished( bool success ) if( waitForDvd() ) { prepareWriter(); - emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) ); + emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); emit burning(true); @@ -790,8 +790,8 @@ bool K3bDvdCopyJob::waitForDvd() if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. " "Do you really want to continue? The media will be written " "for real.") - .arg(m_writerDevice->vendor()) - .arg(m_writerDevice->description()), + .tqarg(m_writerDevice->vendor()) + .tqarg(m_writerDevice->description()), i18n("No Simulation with DVD-R(W)") ) ) { cancel(); return false; @@ -839,11 +839,11 @@ bool K3bDvdCopyJob::waitForDvd() if( m_writingMode == K3b::DAO ) { // ( m_writingMode == K3b::WRITING_MODE_AUTO && // ( sizeWithDao || !m_onTheFly ) ) ) { - emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO ); d->usedWritingMode = K3b::DAO; } else { - emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO ); d->usedWritingMode = K3b::WRITING_MODE_INCR_SEQ; } } @@ -857,14 +857,14 @@ bool K3bDvdCopyJob::waitForDvd() void K3bDvdCopyJob::removeImageFiles() { - if( QFile::exists( m_imagePath ) ) { + if( TQFile::exists( m_imagePath ) ) { d->imageFile.remove(); - emit infoMessage( i18n("Removed image file %1").arg(m_imagePath), K3bJob::SUCCESS ); + emit infoMessage( i18n("Removed image file %1").tqarg(m_imagePath), K3bJob::SUCCESS ); } } -QString K3bDvdCopyJob::jobDescription() const +TQString K3bDvdCopyJob::jobDescription() const { if( m_onlyCreateImage ) { return i18n("Creating DVD Image"); @@ -878,7 +878,7 @@ QString K3bDvdCopyJob::jobDescription() const } -QString K3bDvdCopyJob::jobDetails() const +TQString K3bDvdCopyJob::jobDetails() const { return i18n("Creating 1 copy", "Creating %n copies", diff --git a/libk3b/jobs/k3bdvdcopyjob.h b/libk3b/jobs/k3bdvdcopyjob.h index 91da4e9..eb2e51c 100644 --- a/libk3b/jobs/k3bdvdcopyjob.h +++ b/libk3b/jobs/k3bdvdcopyjob.h @@ -18,7 +18,7 @@ #include <k3bjob.h> #include "k3b_export.h" -#include <qstring.h> +#include <tqstring.h> namespace K3bDevice { @@ -30,16 +30,17 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bDvdCopyJob( K3bJobHandler* hdl, QObject* parent = 0, const char* name = 0 ); + K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); ~K3bDvdCopyJob(); K3bDevice::Device* writer() const { return m_onlyCreateImage ? 0 : m_writerDevice; } K3bDevice::Device* readingDevice() const { return m_readerDevice; } - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); @@ -47,7 +48,7 @@ class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob void setWriterDevice( K3bDevice::Device* w ) { m_writerDevice = w; } void setReaderDevice( K3bDevice::Device* w ) { m_readerDevice = w; } - void setImagePath( const QString& p ) { m_imagePath = p; } + void setImagePath( const TQString& p ) { m_imagePath = p; } void setRemoveImageFiles( bool b ) { m_removeImageFiles = b; } void setOnlyCreateImage( bool b ) { m_onlyCreateImage = b; } void setSimulate( bool b ) { m_simulate = b; } @@ -77,7 +78,7 @@ class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob K3bDevice::Device* m_writerDevice; K3bDevice::Device* m_readerDevice; - QString m_imagePath; + TQString m_imagePath; bool m_onTheFly; bool m_removeImageFiles; diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp index 732e404..62ea78e 100644 --- a/libk3b/jobs/k3bdvdformattingjob.cpp +++ b/libk3b/jobs/k3bdvdformattingjob.cpp @@ -29,8 +29,8 @@ #include <klocale.h> #include <kdebug.h> -#include <qvaluelist.h> -#include <qregexp.h> +#include <tqvaluelist.h> +#include <tqregexp.h> #include <errno.h> #include <string.h> @@ -71,8 +71,8 @@ public: }; -K3bDvdFormattingJob::K3bDvdFormattingJob( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bBurnJob( jh, parent, name ) +K3bDvdFormattingJob::K3bDvdFormattingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bBurnJob( jh, tqparent, name ) { d = new Private; } @@ -97,18 +97,18 @@ void K3bDvdFormattingJob::setForceNoEject( bool b ) } -QString K3bDvdFormattingJob::jobDescription() const +TQString K3bDvdFormattingJob::jobDescription() const { return i18n("Formatting DVD"); // Formatting DVD±RW } -QString K3bDvdFormattingJob::jobDetails() const +TQString K3bDvdFormattingJob::jobDetails() const { if( d->quick ) return i18n("Quick Format"); else - return QString::null; + return TQString(); } @@ -142,7 +142,7 @@ void K3bDvdFormattingJob::start() K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY, K3bDevice::MEDIA_WRITABLE_DVD, i18n("Please insert a rewritable DVD medium into drive<p><b>%1 %2 (%3)</b>.") - .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) { + .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) { emit canceled(); d->running = false; jobFinished(false); @@ -153,9 +153,9 @@ void K3bDvdFormattingJob::start() emit newTask( i18n("Checking media") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) ); } @@ -207,7 +207,7 @@ void K3bDvdFormattingJob::setForce( bool b ) } -void K3bDvdFormattingJob::slotStderrLine( const QString& line ) +void K3bDvdFormattingJob::slotStderrLine( const TQString& line ) { // * DVD±RW format utility by <appro@fy.chalmers.se>, version 4.4. // * 4.7GB DVD-RW media in Sequential mode detected. @@ -218,15 +218,15 @@ void K3bDvdFormattingJob::slotStderrLine( const QString& line ) emit debuggingOutput( "dvd+rw-format", line ); // parsing for the -gui mode (since dvd+rw-format 4.6) - int pos = line.find( "blanking" ); + int pos = line.tqfind( "blanking" ); if( pos < 0 ) - pos = line.find( "formatting" ); + pos = line.tqfind( "formatting" ); if( pos >= 0 ) { - pos = line.find( QRegExp( "\\d" ), pos ); + pos = line.tqfind( TQRegExp( "\\d" ), pos ); } // parsing for \b\b... stuff else if( !line.startsWith("*") ) { - pos = line.find( QRegExp( "\\d" ) ); + pos = line.tqfind( TQRegExp( "\\d" ) ); } else if( line.startsWith( ":-(" ) ) { if( line.startsWith( ":-( unable to proceed with format" ) ) { @@ -235,7 +235,7 @@ void K3bDvdFormattingJob::slotStderrLine( const QString& line ) } if( pos >= 0 ) { - int endPos = line.find( QRegExp("[^\\d\\.]"), pos ) - 1; + int endPos = line.tqfind( TQRegExp("[^\\d\\.]"), pos ) - 1; bool ok; int progress = (int)(line.mid( pos, endPos - pos ).toDouble(&ok)); if( ok ) { @@ -267,7 +267,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p ) d->success = true; } else { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdFormatBin->name()).arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdFormatBin->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -275,7 +275,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdFormatBin->name()), + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdFormatBin->name()), ERROR ); d->success = false; } @@ -288,9 +288,9 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p ) else { emit infoMessage( i18n("Ejecting DVD..."), INFO ); connect( K3bDevice::eject( d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); } } @@ -362,7 +362,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) if( diskInfo.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) { - emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), + emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO ); // mode is ignored @@ -375,7 +375,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) } else { emit infoMessage( i18n("No need to format %1 media more than once.") - .arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO ); + .tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO ); emit infoMessage( i18n("It may simply be overwritten."), INFO ); if( d->force ) { @@ -401,11 +401,11 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) // else { // MEDIA_DVD_RW - emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)), + emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)), INFO ); if( diskInfo.currentProfile() != K3bDevice::MEDIA_UNKNOWN ) { - emit infoMessage( i18n("Formatted in %1 mode.").arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); + emit infoMessage( i18n("Formatted in %1 mode.").tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); // @@ -428,7 +428,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) else if( diskInfo.currentProfile() == K3bDevice::MEDIA_DVD_RW_OVWR && d->mode != K3b::WRITING_MODE_INCR_SEQ ) { emit infoMessage( i18n("No need to format %1 media more than once.") - .arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); + .tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); emit infoMessage( i18n("It may simply be overwritten."), INFO ); if( d->force ) @@ -448,7 +448,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) } emit newSubTask( i18n("Formatting" - " DVD-RW in %1 mode.").arg(K3bDevice::mediaTypeString( blank ? + " DVD-RW in %1 mode.").tqarg(K3bDevice::mediaTypeString( blank ? K3bDevice::MEDIA_DVD_RW_SEQ : K3bDevice::MEDIA_DVD_RW_OVWR )) ); } @@ -467,19 +467,19 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) d->process = new K3bProcess(); d->process->setRunPrivileged(true); // d->process->setSuppressEmptyLines(false); - connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStderrLine(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStderrLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessFinished(KProcess*)) ); d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" ); if( !d->dvdFormatBin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-format"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("dvd+rw-format"), ERROR ); d->running = false; jobFinished(false); return; } if( !d->dvdFormatBin->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(d->dvdFormatBin->name()).arg(d->dvdFormatBin->version).arg(d->dvdFormatBin->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(d->dvdFormatBin->name()).tqarg(d->dvdFormatBin->version).tqarg(d->dvdFormatBin->copyright), INFO ); *d->process << d->dvdFormatBin; @@ -487,7 +487,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) if( d->dvdFormatBin->version >= K3bVersion( 4, 6 ) ) *d->process << "-gui"; - QString p; + TQString p; if( blank ) p = "-blank"; else @@ -500,14 +500,14 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) *d->process << d->device->blockDeviceName(); // additional user parameters from config - const QStringList& params = d->dvdFormatBin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = d->dvdFormatBin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *d->process << *it; kdDebug() << "***** dvd+rw-format parameters:\n"; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << endl << flush; @@ -517,7 +517,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bDvdFormattingJob) could not start " << d->dvdFormatBin->path << endl; - emit infoMessage( i18n("Could not start %1.").arg(d->dvdFormatBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdFormatBin->name()), K3bJob::ERROR ); d->running = false; jobFinished(false); } diff --git a/libk3b/jobs/k3bdvdformattingjob.h b/libk3b/jobs/k3bdvdformattingjob.h index 10672cb..cf8b7eb 100644 --- a/libk3b/jobs/k3bdvdformattingjob.h +++ b/libk3b/jobs/k3bdvdformattingjob.h @@ -30,13 +30,14 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bDvdFormattingJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bDvdFormattingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bDvdFormattingJob(); - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; K3bDevice::Device* writer() const; @@ -75,7 +76,7 @@ class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob void setForceNoEject( bool ); private slots: - void slotStderrLine( const QString& ); + void slotStderrLine( const TQString& ); void slotProcessFinished( KProcess* ); void slotDeviceHandlerFinished( K3bDevice::DeviceHandler* ); void slotEjectingFinished( K3bDevice::DeviceHandler* ); diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp index 1fb3871..cf63da4 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.cpp +++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp @@ -36,10 +36,10 @@ #include <ktempfile.h> #include <kio/global.h> -#include <qstring.h> -#include <qtextstream.h> -#include <qfile.h> -#include <qapplication.h> +#include <tqstring.h> +#include <tqtextstream.h> +#include <tqfile.h> +#include <tqapplication.h> class K3bIso9660ImageWritingJob::Private @@ -85,8 +85,8 @@ void K3bIso9660ImageWritingJob::start() emit newTask( i18n("Preparing data") ); - if( !QFile::exists( m_imagePath ) ) { - emit infoMessage( i18n("Could not find image %1").arg(m_imagePath), K3bJob::ERROR ); + if( !TQFile::exists( m_imagePath ) ) { + emit infoMessage( i18n("Could not find image %1").tqarg(m_imagePath), K3bJob::ERROR ); jobFinished( false ); return; } @@ -121,10 +121,10 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success ) if( !m_verifyJob ) { m_verifyJob = new K3bVerificationJob( this ); connectSubJob( m_verifyJob, - SLOT(slotVerificationFinished(bool)), + TQT_SLOT(slotVerificationFinished(bool)), true, - SLOT(slotVerificationProgress(int)), - SIGNAL(subPercent(int)) ); + TQT_SLOT(slotVerificationProgress(int)), + TQT_SIGNAL(subPercent(int)) ); } m_verifyJob->setDevice( m_device ); m_verifyJob->clear(); @@ -133,7 +133,7 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success ) if( m_copies == 1 ) emit newTask( i18n("Verifying written data") ); else - emit newTask( i18n("Verifying written copy %1 of %2").arg(m_currentCopy).arg(m_copies) ); + emit newTask( i18n("Verifying written copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) ); m_verifyJob->start(); } @@ -164,8 +164,8 @@ void K3bIso9660ImageWritingJob::slotVerificationFinished( bool success ) if( success && m_currentCopy < m_copies ) { m_currentCopy++; - connect( K3bDevice::eject( m_device ), SIGNAL(finished(bool)), - this, SLOT(startWriting()) ); + connect( K3bDevice::eject( m_device ), TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(startWriting()) ); return; } @@ -200,7 +200,7 @@ void K3bIso9660ImageWritingJob::slotNextTrack( int, int ) if( m_copies == 1 ) emit newSubTask( i18n("Writing image") ); else - emit newSubTask( i18n("Writing copy %1 of %2").arg(m_currentCopy).arg(m_copies) ); + emit newSubTask( i18n("Writing copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) ); } @@ -350,7 +350,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType ) writer->addArgument("-data"); // read from stdin - writer->addArgument( QString("-tsize=%1s").arg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" ); + writer->addArgument( TQString("-tsize=%1s").tqarg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" ); m_writer = writer; } @@ -365,10 +365,10 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType ) // now write the tocfile delete m_tocFile; - m_tocFile = new KTempFile( QString::null, "toc" ); + m_tocFile = new KTempFile( TQString(), "toc" ); m_tocFile->setAutoDelete(true); - if( QTextStream* s = m_tocFile->textStream() ) { + if( TQTextStream* s = m_tocFile->textStream() ) { if( (m_dataMode == K3b::DATA_MODE_AUTO && m_noFix) || m_dataMode == K3b::MODE2 ) { *s << "CD_ROM_XA" << "\n"; @@ -380,7 +380,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType ) *s << "\n"; *s << "TRACK MODE1" << "\n"; } - *s << "DATAFILE \"-\" " << QString::number( K3b::imageFilesize( m_imagePath ) ) << "\n"; + *s << "DATAFILE \"-\" " << TQString::number( K3b::imageFilesize( m_imagePath ) ) << "\n"; m_tocFile->close(); } @@ -413,31 +413,31 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType ) writer->setSimulate( m_simulate ); writer->setBurnSpeed( m_speed ); writer->setWritingMode( m_writingMode == K3b::DAO ? K3b::DAO : 0 ); - writer->setImageToWrite( QString::null ); // read from stdin + writer->setImageToWrite( TQString() ); // read from stdin writer->setCloseDvd( !m_noFix ); writer->setTrackSize( K3b::imageFilesize( m_imagePath )/2048 ); m_writer = writer; } - connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotNextTrack(int, int)) ); - connect( m_writer, SIGNAL(percent(int)), this, SLOT(slotWriterPercent(int)) ); - connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writer, SIGNAL(finished(bool)), this, SLOT(slotWriterJobFinished(bool)) ); - connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) ); + connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) ); + connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) ); + connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); return true; } -QString K3bIso9660ImageWritingJob::jobDescription() const +TQString K3bIso9660ImageWritingJob::jobDescription() const { if( m_simulate ) return i18n("Simulating ISO9660 Image"); @@ -445,13 +445,13 @@ QString K3bIso9660ImageWritingJob::jobDescription() const return ( i18n("Burning ISO9660 Image") + ( m_copies > 1 ? i18n(" - %n Copy", " - %n Copies", m_copies) - : QString::null ) ); + : TQString() ) ); } -QString K3bIso9660ImageWritingJob::jobDetails() const +TQString K3bIso9660ImageWritingJob::jobDetails() const { - return m_imagePath.section("/", -1) + QString( " (%1)" ).arg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath)))); + return m_imagePath.section("/", -1) + TQString( " (%1)" ).tqarg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath)))); } diff --git a/libk3b/jobs/k3biso9660imagewritingjob.h b/libk3b/jobs/k3biso9660imagewritingjob.h index eceb6dc..e8a133b 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.h +++ b/libk3b/jobs/k3biso9660imagewritingjob.h @@ -19,7 +19,7 @@ #include <k3bjob.h> #include "k3b_export.h" -class QString; +class TQString; class K3bAbstractWriter; class KTempFile; namespace K3bDevice { @@ -34,6 +34,7 @@ class K3bVerificationJob; class LIBK3B_EXPORT K3bIso9660ImageWritingJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: K3bIso9660ImageWritingJob( K3bJobHandler* ); @@ -41,14 +42,14 @@ class LIBK3B_EXPORT K3bIso9660ImageWritingJob : public K3bBurnJob K3bDevice::Device* writer() const { return m_device; }; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void cancel(); void start(); - void setImagePath( const QString& path ) { m_imagePath = path; } + void setImagePath( const TQString& path ) { m_imagePath = path; } void setSpeed( int s ) { m_speed = s; } void setBurnDevice( K3bDevice::Device* dev ) { m_device = dev; } void setWritingMode( int mode ) { m_writingMode = mode; } @@ -78,7 +79,7 @@ class LIBK3B_EXPORT K3bIso9660ImageWritingJob : public K3bBurnJob bool m_verifyData; bool m_dvd; - QString m_imagePath; + TQString m_imagePath; K3bAbstractWriter* m_writer; KTempFile* m_tocFile; diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index d75eb63..ae6df10 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -28,9 +28,9 @@ #include <klocale.h> #include <kconfig.h> -#include <qregexp.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqregexp.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> @@ -60,8 +60,8 @@ public: -K3bReadcdReader::K3bReadcdReader( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bReadcdReader::K3bReadcdReader( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_noCorr(false), m_clone(false), m_noError(false), @@ -104,7 +104,7 @@ void K3bReadcdReader::start() // the first thing to do is to check for readcd d->readcdBinObject = k3bcore->externalBinManager()->binObject( "readcd" ); if( !d->readcdBinObject ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("readcd"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("readcd"), ERROR ); jobFinished(false); return; } @@ -116,11 +116,11 @@ void K3bReadcdReader::start() if( !d->readcdBinObject->hasFeature( "clone" ) ) { // search all readcd installations K3bExternalProgram* readcdProgram = k3bcore->externalBinManager()->program( "readcd" ); - const QPtrList<K3bExternalBin>& readcdBins = readcdProgram->bins(); - for( QPtrListIterator<K3bExternalBin> it( readcdBins ); it.current(); ++it ) { + const TQPtrList<K3bExternalBin>& readcdBins = readcdProgram->bins(); + for( TQPtrListIterator<K3bExternalBin> it( readcdBins ); it.current(); ++it ) { if( it.current()->hasFeature( "clone" ) ) { d->readcdBinObject = it.current(); - emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").arg(d->readcdBinObject->version), INFO ); + emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").tqarg(d->readcdBinObject->version), INFO ); foundCloneSupport = true; break; } @@ -138,8 +138,8 @@ void K3bReadcdReader::start() // create the commandline delete d->process; d->process = new K3bProcess(); - connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); *d->process << d->readcdBinObject; @@ -148,10 +148,10 @@ void K3bReadcdReader::start() *d->process << "-v"; // Again we assume the device to be set! - *d->process << QString("dev=%1").arg(K3b::externalBinDeviceParameter(m_readDevice, + *d->process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(m_readDevice, d->readcdBinObject)); if( m_speed > 0 ) - *d->process << QString("speed=%1").arg(m_speed); + *d->process << TQString("speed=%1").tqarg(m_speed); // output @@ -160,8 +160,8 @@ void K3bReadcdReader::start() d->process->dupStdout( d->fdToWriteTo ); } else { - emit newTask( i18n("Writing image to %1.").arg(m_imagePath) ); - emit infoMessage( i18n("Writing image to %1.").arg(m_imagePath), INFO ); + emit newTask( i18n("Writing image to %1.").tqarg(m_imagePath) ); + emit infoMessage( i18n("Writing image to %1.").tqarg(m_imagePath), INFO ); *d->process << "f=" + m_imagePath; } @@ -177,25 +177,25 @@ void K3bReadcdReader::start() if( m_c2Scan ) *d->process << "-c2scan"; - *d->process << QString("retries=%1").arg(m_retries); + *d->process << TQString("retries=%1").tqarg(m_retries); // readcd does not read the last sector specified if( d->firstSector < d->lastSector ) - *d->process << QString("sectors=%1-%2").arg(d->firstSector.lba()).arg(d->lastSector.lba()+1); + *d->process << TQString("sectors=%1-%2").tqarg(d->firstSector.lba()).tqarg(d->lastSector.lba()+1); // Joerg sais it is a Linux kernel bug, anyway, with the default value it does not work *d->process << "ts=128k"; // additional user parameters from config - const QStringList& params = d->readcdBinObject->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = d->readcdBinObject->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *d->process << *it; kdDebug() << "***** readcd parameters:\n"; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << endl << flush; @@ -225,7 +225,7 @@ void K3bReadcdReader::cancel() } -void K3bReadcdReader::slotStdLine( const QString& line ) +void K3bReadcdReader::slotStdLine( const TQString& line ) { emit debuggingOutput( "readcd", line ); @@ -243,7 +243,7 @@ void K3bReadcdReader::slotStdLine( const QString& line ) else if( line.startsWith( "addr:" ) ) { bool ok; - long currentReadBlock = line.mid( 6, line.find("cnt")-7 ).toInt(&ok); + long currentReadBlock = line.mid( 6, line.tqfind("cnt")-7 ).toInt(&ok); if( d->firstSector < d->lastSector ) currentReadBlock -= d->firstSector.lba(); if( ok ) { @@ -260,41 +260,41 @@ void K3bReadcdReader::slotStdLine( const QString& line ) } else kdError() << "(K3bReadcdReader) currentReadBlock parsing error in line: " - << line.mid( 6, line.find("cnt")-7 ) << endl; + << line.mid( 6, line.tqfind("cnt")-7 ) << endl; } - else if( line.contains("Cannot read source disk") ) { + else if( line.tqcontains("Cannot read source disk") ) { emit infoMessage( i18n("Cannot read source disk."), ERROR ); } - else if( (pos = line.find("Retrying from sector")) >= 0 ) { + else if( (pos = line.tqfind("Retrying from sector")) >= 0 ) { // parse the sector pos += 21; bool ok; - int problemSector = line.mid( pos, line.find( QRegExp("\\D"), pos )-pos ).toInt(&ok); + int problemSector = line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ).toInt(&ok); if( !ok ) { kdError() << "(K3bReadcdReader) problemSector parsing error in line: " - << line.mid( pos, line.find( QRegExp("\\D"), pos )-pos ) << endl; + << line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ) << endl; } - emit infoMessage( i18n("Retrying from sector %1.").arg(problemSector), INFO ); + emit infoMessage( i18n("Retrying from sector %1.").tqarg(problemSector), INFO ); } - else if( (pos = line.find("Error on sector")) >= 0 ) { + else if( (pos = line.tqfind("Error on sector")) >= 0 ) { d->unreadableBlocks++; pos += 16; bool ok; - int problemSector = line.mid( pos, line.find( QRegExp("\\D"), pos )-pos ).toInt(&ok); + int problemSector = line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ).toInt(&ok); if( !ok ) { kdError() << "(K3bReadcdReader) problemSector parsing error in line: " - << line.mid( pos, line.find( QRegExp("\\D"), pos )-pos ) << endl; + << line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ) << endl; } - if( line.contains( "not corrected") ) { - emit infoMessage( i18n("Uncorrected error in sector %1").arg(problemSector), ERROR ); + if( line.tqcontains( "not corrected") ) { + emit infoMessage( i18n("Uncorrected error in sector %1").tqarg(problemSector), ERROR ); } else { - emit infoMessage( i18n("Corrected error in sector %1").arg(problemSector), ERROR ); + emit infoMessage( i18n("Corrected error in sector %1").tqarg(problemSector), ERROR ); } } @@ -314,7 +314,7 @@ void K3bReadcdReader::slotProcessExited( KProcess* p ) jobFinished( true ); } else { - emit infoMessage( i18n("%1 returned error: %2").arg("Readcd").arg(p->exitStatus()), ERROR ); + emit infoMessage( i18n("%1 returned error: %2").tqarg("Readcd").tqarg(p->exitStatus()), ERROR ); jobFinished( false ); } } diff --git a/libk3b/jobs/k3breadcdreader.h b/libk3b/jobs/k3breadcdreader.h index 93ebce0..de6f225 100644 --- a/libk3b/jobs/k3breadcdreader.h +++ b/libk3b/jobs/k3breadcdreader.h @@ -34,9 +34,10 @@ namespace K3b { class K3bReadcdReader : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bReadcdReader( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bReadcdReader( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bReadcdReader(); bool active() const; @@ -59,7 +60,7 @@ class K3bReadcdReader : public K3bJob void setSectorRange( const K3b::Msf&, const K3b::Msf& ); - void setImagePath( const QString& p ) { m_imagePath = p; } + void setImagePath( const TQString& p ) { m_imagePath = p; } /** * the data gets written directly into fd instead of the imagefile. @@ -69,7 +70,7 @@ class K3bReadcdReader : public K3bJob void writeToFd( int fd ); private slots: - void slotStdLine( const QString& line ); + void slotStdLine( const TQString& line ); void slotProcessExited(KProcess*); private: @@ -82,7 +83,7 @@ class K3bReadcdReader : public K3bJob K3bDevice::Device* m_readDevice; - QString m_imagePath; + TQString m_imagePath; class Private; Private* d; diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index e73530e..963f1a2 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -29,10 +29,10 @@ #include <kio/job.h> #include <kio/netaccess.h> -#include <qcstring.h> -#include <qapplication.h> -#include <qvaluelist.h> -#include <qpair.h> +#include <tqcstring.h> +#include <tqapplication.h> +#include <tqvaluelist.h> +#include <tqpair.h> class K3bVerificationJobTrackEntry @@ -42,14 +42,14 @@ public: : trackNumber(0) { } - K3bVerificationJobTrackEntry( int tn, const QCString& cs, const K3b::Msf& msf ) + K3bVerificationJobTrackEntry( int tn, const TQCString& cs, const K3b::Msf& msf ) : trackNumber(tn), checksum(cs), length(msf) { } int trackNumber; - QCString checksum; + TQCString checksum; K3b::Msf length; }; @@ -69,7 +69,7 @@ public: K3b::Msf grownSessionSize; - QValueList<K3bVerificationJobTrackEntry> tracks; + TQValueList<K3bVerificationJobTrackEntry> tracks; int currentTrackIndex; K3bDevice::DiskInfo diskInfo; @@ -89,16 +89,16 @@ public: }; -K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, QObject* parent, const char* name ) - : K3bJob( hdl, parent, name ) +K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) + : K3bJob( hdl, tqparent, name ) { d = new Private(); d->md5Job = new K3bMd5Job( this ); - connect( d->md5Job, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->md5Job, SIGNAL(finished(bool)), this, SLOT(slotMd5JobFinished(bool)) ); - connect( d->md5Job, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( d->md5Job, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->md5Job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMd5JobFinished(bool)) ); + connect( d->md5Job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } @@ -118,7 +118,7 @@ void K3bVerificationJob::cancel() } -void K3bVerificationJob::addTrack( int trackNum, const QCString& checksum, const K3b::Msf& length ) +void K3bVerificationJob::addTrack( int trackNum, const TQCString& checksum, const K3b::Msf& length ) { d->tracks.append( K3bVerificationJobTrackEntry( trackNum, checksum, length ) ); } @@ -155,9 +155,9 @@ void K3bVerificationJob::start() d->mediumHasBeenReloaded = false; connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); } @@ -174,9 +174,9 @@ void K3bVerificationJob::slotMediaReloaded( bool /*success*/ ) emit newTask( i18n("Checking medium") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); } @@ -193,7 +193,7 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // just to be sure check if we actually have all the tracks int i = 0; - for( QValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin(); + for( TQValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin(); it != d->tracks.end(); ++i, ++it ) { // 0 means "last track" @@ -203,7 +203,7 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) if( (int)d->toc.count() < (*it).trackNumber ) { if ( d->mediumHasBeenReloaded ) { emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)") - .arg( "Specified track number not found on medium" ), ERROR ); + .tqarg( "Specified track number not found on medium" ), ERROR ); jobFinished( false ); return; } @@ -211,9 +211,9 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // many drives need to reload the medium to return to a proper state emit newTask( i18n("Reloading the medium") ); connect( K3bDevice::reload( d->device ), - SIGNAL(finished(bool)), + TQT_SIGNAL(finished(bool)), this, - SLOT(slotMediaReloaded(bool)) ); + TQT_SLOT(slotMediaReloaded(bool)) ); return; } } @@ -236,20 +236,20 @@ void K3bVerificationJob::readTrack( int trackIndex ) return; } - emit newTask( i18n("Verifying track %1").arg( d->tracks[trackIndex].trackNumber ) ); + emit newTask( i18n("Verifying track %1").tqarg( d->tracks[trackIndex].trackNumber ) ); d->pipe.open(); if( d->toc[d->tracks[trackIndex].trackNumber-1].type() == K3bDevice::Track::DATA ) { if( !d->dataTrackReader ) { d->dataTrackReader = new K3bDataTrackReader( this ); - connect( d->dataTrackReader, SIGNAL(percent(int)), this, SLOT(slotReaderProgress(int)) ); - // connect( d->dataTrackReader, SIGNAL(processedSize(int, int)), this, SLOT(slotReaderProcessedSize(int, int)) ); - connect( d->dataTrackReader, SIGNAL(finished(bool)), this, SLOT(slotReaderFinished(bool)) ); - connect( d->dataTrackReader, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->dataTrackReader, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( d->dataTrackReader, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) ); + // connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) ); + connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReaderFinished(bool)) ); + connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->dataTrackReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->dataTrackReader->setDevice( d->device ); @@ -304,7 +304,7 @@ void K3bVerificationJob::slotMd5JobFinished( bool success ) if( success && !d->canceled && d->readSuccessful ) { // compare the two sums if( d->tracks[d->currentTrackIndex].checksum != d->md5Job->hexDigest() ) { - emit infoMessage( i18n("Written data in track %1 differs from original.").arg(d->tracks[d->currentTrackIndex].trackNumber), ERROR ); + emit infoMessage( i18n("Written data in track %1 differs from original.").tqarg(d->tracks[d->currentTrackIndex].trackNumber), ERROR ); jobFinished(false); } else { diff --git a/libk3b/jobs/k3bverificationjob.h b/libk3b/jobs/k3bverificationjob.h index ad750ee..945198d 100644 --- a/libk3b/jobs/k3bverificationjob.h +++ b/libk3b/jobs/k3bverificationjob.h @@ -47,9 +47,10 @@ namespace K3bDevice { class K3bVerificationJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bVerificationJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bVerificationJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bVerificationJob(); public slots: @@ -67,7 +68,7 @@ class K3bVerificationJob : public K3bJob * useful when writing to DVD+RW media and the iso descriptor does not * contain the exact image size (as true for many commercial Video DVDs) */ - void addTrack( int tracknum, const QCString& checksum, const K3b::Msf& length = K3b::Msf() ); + void addTrack( int tracknum, const TQCString& checksum, const K3b::Msf& length = K3b::Msf() ); /** * Handle the special case of iso session growing diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp index fdcc3a4..320717a 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp @@ -46,8 +46,8 @@ public: -K3bVideoDVDTitleDetectClippingJob::K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, QObject* parent ) - : K3bJob( hdl, parent ), +K3bVideoDVDTitleDetectClippingJob::K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* tqparent ) + : K3bJob( hdl, tqparent ), m_clippingTop( 0 ), m_clippingBottom( 0 ), m_clippingLeft( 0 ), @@ -88,15 +88,15 @@ void K3bVideoDVDTitleDetectClippingJob::start() d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode"); if( !d->usedTranscodeBin ) { - emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR ); + emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR ); jobFinished( false ); return; } if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){ emit infoMessage( i18n("%1 version %2 is too old.") - .arg("transcode") - .arg(d->usedTranscodeBin->version), ERROR ); + .tqarg("transcode") + .tqarg(d->usedTranscodeBin->version), ERROR ); jobFinished( false ); return; } @@ -105,11 +105,11 @@ void K3bVideoDVDTitleDetectClippingJob::start() if( !d->usedTranscodeBin->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .arg(d->usedTranscodeBin->name()) - .arg(d->usedTranscodeBin->version) - .arg(d->usedTranscodeBin->copyright), INFO ); + .tqarg(d->usedTranscodeBin->name()) + .tqarg(d->usedTranscodeBin->version) + .tqarg(d->usedTranscodeBin->copyright), INFO ); - emit newTask( i18n("Analysing Title %1 of Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) ); + emit newTask( i18n("Analysing Title %1 of Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) ); startTranscode( 1 ); } @@ -125,9 +125,9 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) // use the whole chapter // if( d->totalChapters == 1 ) - d->currentFrames = QMIN( 3000, QMAX( 1, m_dvd[m_titleNumber-1][d->currentChapter-1].playbackTime().totalFrames() ) ); + d->currentFrames = TQMIN( 3000, TQMAX( 1, m_dvd[m_titleNumber-1][d->currentChapter-1].playbackTime().totalFrames() ) ); else - d->currentFrames = QMIN( 200, QMAX( 1, m_dvd[m_titleNumber-1][d->currentChapter-1].playbackTime().totalFrames() ) ); + d->currentFrames = TQMIN( 200, TQMAX( 1, m_dvd[m_titleNumber-1][d->currentChapter-1].playbackTime().totalFrames() ) ); // // prepare the process @@ -136,9 +136,9 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) d->process = new K3bProcess(); d->process->setSuppressEmptyLines(true); d->process->setSplitStdout(true); - // connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotTranscodeStderr(const QString&)) ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotTranscodeStderr(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotTranscodeExited(KProcess*)) ); + // connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); + connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTranscodeExited(KProcess*)) ); // the executable *d->process << d->usedTranscodeBin; @@ -151,27 +151,27 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) *d->process << "-i" << m_dvd.device()->blockDeviceName(); // select the title number and chapter - *d->process << "-T" << QString("%1,%2").arg(m_titleNumber).arg(chapter); + *d->process << "-T" << TQString("%1,%2").tqarg(m_titleNumber).tqarg(chapter); // null output *d->process << "-y" << "null,null" << "-o" << "/dev/null"; // analyze the first 200 frames - *d->process << "-J" << QString("detectclipping=range=0-%1/5").arg(d->currentFrames); + *d->process << "-J" << TQString("detectclipping=range=0-%1/5").tqarg(d->currentFrames); // also only decode the first 200 frames - *d->process << "-c" << QString("0-%1").arg(d->currentFrames+1); + *d->process << "-c" << TQString("0-%1").tqarg(d->currentFrames+1); // additional user parameters from config - const QStringList& params = d->usedTranscodeBin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = d->usedTranscodeBin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *d->process << *it; // produce some debugging output kdDebug() << "***** transcode parameters:\n"; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -181,11 +181,11 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable - emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR ); jobFinished(false); } else { - emit newSubTask( i18n("Analysing Chapter %1 of %2").arg(chapter).arg(m_dvd[m_titleNumber-1].numPTTs()) ); + emit newSubTask( i18n("Analysing Chapter %1 of %2").tqarg(chapter).tqarg(m_dvd[m_titleNumber-1].numPTTs()) ); emit subPercent( 0 ); } } @@ -199,15 +199,15 @@ void K3bVideoDVDTitleDetectClippingJob::cancel() } -void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const QString& line ) +void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const TQString& line ) { emit debuggingOutput( "transcode", line ); // parse progress // encoding frame [185], 24.02 fps, 93.0%, ETA: 0:00:00, ( 0| 0| 0) if( line.startsWith( "encoding frame" ) ) { - int pos1 = line.find( '[', 15 ); - int pos2 = line.find( ']', pos1+1 ); + int pos1 = line.tqfind( '[', 15 ); + int pos2 = line.tqfind( ']', pos1+1 ); if( pos1 > 0 && pos2 > 0 ) { bool ok; int encodedFrames = line.mid( pos1+1, pos2-pos1-1 ).toInt( &ok ); @@ -235,13 +235,13 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const QString& line // [detectclipping#0] valid area: X: 5..719 Y: 72..507 -> -j 72,6,68,0 else if( line.startsWith( "[detectclipping" ) ) { - int pos = line.find( "-j" ); + int pos = line.tqfind( "-j" ); if( pos > 0 ) { - QStringList values = QStringList::split( ',', line.mid( pos+3 ) ); - m_clippingTop = QMIN( m_clippingTop, values[0].toInt() ); - m_clippingLeft = QMIN( m_clippingLeft, values[1].toInt() ); - m_clippingBottom = QMIN( m_clippingBottom, values[2].toInt() ); - m_clippingRight = QMIN( m_clippingRight, values[3].toInt() ); + TQStringList values = TQStringList::split( ',', line.mid( pos+3 ) ); + m_clippingTop = TQMIN( m_clippingTop, values[0].toInt() ); + m_clippingLeft = TQMIN( m_clippingLeft, values[1].toInt() ); + m_clippingBottom = TQMIN( m_clippingBottom, values[2].toInt() ); + m_clippingRight = TQMIN( m_clippingRight, values[3].toInt() ); } else kdDebug() << "(K3bVideoDVDTitleDetectClippingJob) failed to parse line: " << line << endl; @@ -279,7 +279,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p ) } else { emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()), + .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); } diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h index b13bbf8..a102810 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h @@ -28,9 +28,10 @@ class KProcess; class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, QObject* parent ); + K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* tqparent ); ~K3bVideoDVDTitleDetectClippingJob(); const K3bVideoDVD::VideoDVD& videoDVD() const { return m_dvd; } @@ -82,7 +83,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob void setLowPriority( bool b ) { m_lowPriority = b; } private slots: - void slotTranscodeStderr( const QString& ); + void slotTranscodeStderr( const TQString& ); void slotTranscodeExited( KProcess* ); private: diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index 9fec637..08fbb59 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqfileinfo.h> class K3bVideoDVDTitleTranscodingJob::Private @@ -35,7 +35,7 @@ public: K3bProcess* process; - QString twoPassEncodingLogFile; + TQString twoPassEncodingLogFile; int currentEncodingPass; @@ -47,8 +47,8 @@ public: -K3bVideoDVDTitleTranscodingJob::K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, QObject* parent ) - : K3bJob( hdl, parent ), +K3bVideoDVDTitleTranscodingJob::K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* tqparent ) + : K3bJob( hdl, tqparent ), m_clippingTop( 0 ), m_clippingBottom( 0 ), m_clippingLeft( 0 ), @@ -87,15 +87,15 @@ void K3bVideoDVDTitleTranscodingJob::start() d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode"); if( !d->usedTranscodeBin ) { - emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR ); + emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR ); jobFinished( false ); return; } if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){ emit infoMessage( i18n("%1 version %2 is too old.") - .arg("transcode") - .arg(d->usedTranscodeBin->version), ERROR ); + .tqarg("transcode") + .tqarg(d->usedTranscodeBin->version), ERROR ); jobFinished( false ); return; } @@ -104,9 +104,9 @@ void K3bVideoDVDTitleTranscodingJob::start() if( !d->usedTranscodeBin->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .arg(d->usedTranscodeBin->name()) - .arg(d->usedTranscodeBin->version) - .arg(d->usedTranscodeBin->copyright), INFO ); + .tqarg(d->usedTranscodeBin->name()) + .tqarg(d->usedTranscodeBin->version) + .tqarg(d->usedTranscodeBin->copyright), INFO ); // // Let's take a look at the filename @@ -116,14 +116,14 @@ void K3bVideoDVDTitleTranscodingJob::start() } else { // let's see if the directory exists and we can write to it - QFileInfo fileInfo( m_filename ); - QFileInfo dirInfo( fileInfo.dirPath() ); + TQFileInfo fileInfo( m_filename ); + TQFileInfo dirInfo( fileInfo.dirPath() ); if( !dirInfo.exists() && !KStandardDirs::makeDir( dirInfo.absFilePath() ) ) { - emit infoMessage( i18n("Unable to create folder '%1'").arg(dirInfo.filePath()), ERROR ); + emit infoMessage( i18n("Unable to create folder '%1'").tqarg(dirInfo.filePath()), ERROR ); return; } else if( !dirInfo.isDir() || !dirInfo.isWritable() ) { - emit infoMessage( i18n("Invalid filename: '%1'").arg(m_filename), ERROR ); + emit infoMessage( i18n("Invalid filename: '%1'").tqarg(m_filename), ERROR ); jobFinished( false ); return; } @@ -134,7 +134,7 @@ void K3bVideoDVDTitleTranscodingJob::start() // d->twoPassEncodingLogFile = K3b::findTempFile( "log" ); - emit newTask( i18n("Transcoding title %1 from Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) ); + emit newTask( i18n("Transcoding title %1 from Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) ); // // Ok then, let's begin @@ -148,7 +148,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) d->currentEncodingPass = pass; d->lastSubProgress = 0; - QString videoCodecString; + TQString videoCodecString; switch( m_videoCodec ) { case VIDEO_CODEC_XVID: videoCodecString = "xvid"; @@ -159,12 +159,12 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) break; default: - emit infoMessage( i18n("Invalid Video codec set: %1").arg(m_videoCodec), ERROR ); + emit infoMessage( i18n("Invalid Video codec set: %1").tqarg(m_videoCodec), ERROR ); jobFinished( false ); return; } - QString audioCodecString; + TQString audioCodecString; switch( m_audioCodec ) { case AUDIO_CODEC_MP3: audioCodecString = "0x55"; @@ -182,7 +182,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) break; default: - emit infoMessage( i18n("Invalid Audio codec set: %1").arg(m_audioCodec), ERROR ); + emit infoMessage( i18n("Invalid Audio codec set: %1").tqarg(m_audioCodec), ERROR ); jobFinished( false ); return; } @@ -194,9 +194,9 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) d->process = new K3bProcess(); d->process->setSuppressEmptyLines(true); d->process->setSplitStdout(true); - connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotTranscodeStderr(const QString&)) ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotTranscodeStderr(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotTranscodeExited(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); + connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTranscodeExited(KProcess*)) ); // the executable *d->process << d->usedTranscodeBin; @@ -207,9 +207,9 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) // we only need 100 steps, but to make sure we use 150 if ( d->usedTranscodeBin->version.simplify() >= K3bVersion( 1, 1, 0 ) ) - *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150); + *d->process << "--progress_meter" << "2" << "--progress_rate" << TQString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150); else - *d->process << "--print_status" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150); + *d->process << "--print_status" << TQString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150); // the input *d->process << "-i" << m_dvd.device()->blockDeviceName(); @@ -218,22 +218,22 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) *d->process << "-x" << "dvd"; // select the title number - *d->process << "-T" << QString("%1,-1,1").arg( m_titleNumber ); + *d->process << "-T" << TQString("%1,-1,1").tqarg( m_titleNumber ); // select the audio stream to extract if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 ) - *d->process << "-a" << QString::number( m_audioStreamIndex ); + *d->process << "-a" << TQString::number( m_audioStreamIndex ); // clipping - *d->process << "-j" << QString("%1,%2,%3,%4") - .arg(m_clippingTop) - .arg(m_clippingLeft) - .arg(m_clippingBottom) - .arg(m_clippingRight); + *d->process << "-j" << TQString("%1,%2,%3,%4") + .tqarg(m_clippingTop) + .tqarg(m_clippingLeft) + .tqarg(m_clippingBottom) + .tqarg(m_clippingRight); // select the encoding type (single pass or two-pass) and the log file for two-pass encoding // the latter is unused for pass = 0 - *d->process << "-R" << QString("%1,%2").arg( pass ).arg( d->twoPassEncodingLogFile ); + *d->process << "-R" << TQString("%1,%2").tqarg( pass ).tqarg( d->twoPassEncodingLogFile ); // depending on the pass we use different options if( pass != 1 ) { @@ -249,7 +249,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) } else { // audio quality settings - *d->process << "-b" << QString("%1,%2").arg(m_audioBitrate).arg(m_audioVBR ? 1 : 0); + *d->process << "-b" << TQString("%1,%2").tqarg(m_audioBitrate).tqarg(m_audioVBR ? 1 : 0); // resample audio stream to 44.1 khz if( m_resampleAudio ) @@ -261,7 +261,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) } else { // gather information about the video stream, ignore audio - *d->process << "-y" << QString("%1,null").arg( videoCodecString ); + *d->process << "-y" << TQString("%1,null").tqarg( videoCodecString ); // we ignore the output from the first pass *d->process << "-o" << "/dev/null"; @@ -273,7 +273,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) } // video bitrate - *d->process << "-w" << QString::number( m_videoBitrate ); + *d->process << "-w" << TQString::number( m_videoBitrate ); // video resizing int usedWidth = m_width; @@ -317,19 +317,19 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) // we only give information about the resizing of the video once if( pass < 2 ) - emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").arg(m_titleNumber).arg(usedWidth).arg(usedHeight), INFO ); - *d->process << "-Z" << QString("%1x%2").arg(usedWidth).arg(usedHeight); + emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").tqarg(m_titleNumber).tqarg(usedWidth).tqarg(usedHeight), INFO ); + *d->process << "-Z" << TQString("%1x%2").tqarg(usedWidth).tqarg(usedHeight); // additional user parameters from config - const QStringList& params = d->usedTranscodeBin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = d->usedTranscodeBin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *d->process << *it; // produce some debugging output kdDebug() << "***** transcode parameters:\n"; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -339,7 +339,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable - emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR ); jobFinished(false); } else { @@ -367,26 +367,26 @@ void K3bVideoDVDTitleTranscodingJob::cancel() void K3bVideoDVDTitleTranscodingJob::cleanup( bool success ) { - if( QFile::exists( d->twoPassEncodingLogFile ) ) { - QFile::remove( d->twoPassEncodingLogFile ); + if( TQFile::exists( d->twoPassEncodingLogFile ) ) { + TQFile::remove( d->twoPassEncodingLogFile ); } - if( !success && QFile::exists( m_filename ) ) { - emit infoMessage( i18n("Removing incomplete video file '%1'").arg(m_filename), INFO ); - QFile::remove( m_filename ); + if( !success && TQFile::exists( m_filename ) ) { + emit infoMessage( i18n("Removing incomplete video file '%1'").tqarg(m_filename), INFO ); + TQFile::remove( m_filename ); } } -void K3bVideoDVDTitleTranscodingJob::slotTranscodeStderr( const QString& line ) +void K3bVideoDVDTitleTranscodingJob::slotTranscodeStderr( const TQString& line ) { emit debuggingOutput( "transcode", line ); // parse progress // encoding frames [000000-000144], 27.58 fps, EMT: 0:00:05, ( 0| 0| 0) if( line.startsWith( "encoding frame" ) ) { - int pos1 = line.find( '-', 15 ); - int pos2 = line.find( ']', pos1+1 ); + int pos1 = line.tqfind( '-', 15 ); + int pos2 = line.tqfind( ']', pos1+1 ); if( pos1 > 0 && pos2 > 0 ) { bool ok; int encodedFrames = line.mid( pos1+1, pos2-pos1-1 ).toInt( &ok ); @@ -440,7 +440,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p ) // FIXME: error handling emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()), + .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -450,7 +450,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p ) } else { cleanup( false ); - emit infoMessage( i18n("Execution of %1 failed.").arg("transcode"), ERROR ); + emit infoMessage( i18n("Execution of %1 failed.").tqarg("transcode"), ERROR ); emit infoMessage( i18n("Please consult the debugging output for details."), ERROR ); jobFinished( false ); } @@ -467,7 +467,7 @@ void K3bVideoDVDTitleTranscodingJob::setClipping( int top, int left, int bottom, // // transcode seems unable to handle different clipping values for left and right // - m_clippingLeft = m_clippingRight = QMIN( m_clippingRight, m_clippingLeft ); + m_clippingLeft = m_clippingRight = TQMIN( m_clippingRight, m_clippingLeft ); } @@ -478,7 +478,7 @@ void K3bVideoDVDTitleTranscodingJob::setSize( int width, int height ) } -QString K3bVideoDVDTitleTranscodingJob::audioCodecString( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) +TQString K3bVideoDVDTitleTranscodingJob::audioCodecString( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) { switch( codec ) { case AUDIO_CODEC_AC3_STEREO: @@ -493,7 +493,7 @@ QString K3bVideoDVDTitleTranscodingJob::audioCodecString( K3bVideoDVDTitleTransc } -QString K3bVideoDVDTitleTranscodingJob::videoCodecString( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) +TQString K3bVideoDVDTitleTranscodingJob::videoCodecString( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) { switch( codec ) { case VIDEO_CODEC_FFMPEG_MPEG4: @@ -506,7 +506,7 @@ QString K3bVideoDVDTitleTranscodingJob::videoCodecString( K3bVideoDVDTitleTransc } -QString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) +TQString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) { switch( codec ) { case VIDEO_CODEC_FFMPEG_MPEG4: @@ -521,7 +521,7 @@ QString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitleT "volunteer programmers after the OpenDivX source was closed in July 2001.") + "<br>" + i18n("XviD features MPEG-4 Advanced Profile settings such as b-frames, global " - "and quarter pixel motion compensation, lumi masking, trellis quantization, and " + "and quarter pixel motion compensation, lumi tqmasking, trellis quantization, and " "H.263, MPEG and custom quantization matrices.") + "<br>" + i18n("XviD is a primary competitor of DivX (XviD being DivX spelled backwards). " @@ -536,9 +536,9 @@ QString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitleT } -QString K3bVideoDVDTitleTranscodingJob::audioCodecDescription( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) +TQString K3bVideoDVDTitleTranscodingJob::audioCodecDescription( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) { - static QString s_ac3General = i18n("AC3, better known as Dolby Digital is standardized as ATSC A/52. " + static TQString s_ac3General = i18n("AC3, better known as Dolby Digital is standardized as ATSC A/52. " "It contains up to 6 total channels of sound."); switch( codec ) { case AUDIO_CODEC_AC3_STEREO: @@ -566,7 +566,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi bin = k3bcore->externalBinManager()->binObject("transcode"); if( !bin ) return false; - return bin->hasFeature( QString::fromLatin1( s_codecFeatures[(int)codec] ) ); + return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) ); } @@ -577,7 +577,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi bin = k3bcore->externalBinManager()->binObject("transcode"); if( !bin ) return false; - return bin->hasFeature( QString::fromLatin1( s_codecFeatures[(int)codec] ) ); + return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) ); } #include "k3bvideodvdtitletranscodingjob.moc" diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h index 77a48b5..8523d0e 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h @@ -33,9 +33,10 @@ class K3bExternalBin; class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, QObject* parent ); + K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* tqparent ); ~K3bVideoDVDTitleTranscodingJob(); /** @@ -67,7 +68,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob int clippingRight() const { return m_clippingRight; } int height() const { return m_height; } int width() const { return m_width; } - const QString& filename() { return m_filename; } + const TQString& filename() { return m_filename; } VideoCodec videoCodec() const { return m_videoCodec; } int videoBitrate() const { return m_videoBitrate; } bool twoPassEncoding() const { return m_twoPassEncoding; } @@ -87,11 +88,11 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob */ static bool transcodeBinaryHasSupportFor( AudioCodec codec, const K3bExternalBin* bin = 0 ); - static QString videoCodecString( VideoCodec ); - static QString audioCodecString( AudioCodec ); + static TQString videoCodecString( VideoCodec ); + static TQString audioCodecString( AudioCodec ); - static QString videoCodecDescription( VideoCodec ); - static QString audioCodecDescription( AudioCodec ); + static TQString videoCodecDescription( VideoCodec ); + static TQString audioCodecDescription( AudioCodec ); public slots: void start(); @@ -158,7 +159,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob * The default is some automatically generated filename * in the default K3b temp directory. */ - void setFilename( const QString& name ) { m_filename = name; } + void setFilename( const TQString& name ) { m_filename = name; } /** * Set the video codec used to encode the video title. @@ -228,7 +229,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob void setLowPriority( bool b ) { m_lowPriority = b; } private slots: - void slotTranscodeStderr( const QString& ); + void slotTranscodeStderr( const TQString& ); void slotTranscodeExited( KProcess* ); private: @@ -243,7 +244,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob K3bVideoDVD::VideoDVD m_dvd; - QString m_filename; + TQString m_filename; int m_clippingTop; int m_clippingBottom; diff --git a/libk3b/k3bimage.xsd b/libk3b/k3bimage.xsd index ab7f36c..607bd95 100644 --- a/libk3b/k3bimage.xsd +++ b/libk3b/k3bimage.xsd @@ -1,9 +1,9 @@ <!-- - This document describes the layout of the toc.xml file in a K3b image archive. - A K3b image archive is a TAR archive with a simple layout as follows. + This document describes the tqlayout of the toc.xml file in a K3b image archive. + A K3b image archive is a TAR archive with a simple tqlayout as follows. Every K3b image archive contains the toc.xml file as described in this document - which describes the layout of the CD or DVD saved in the K3b image archive. + which describes the tqlayout of the CD or DVD saved in the K3b image archive. Additionally the K3b image archive contains an arbitrary number of files which contain the CD/DVD sector data. These files are referenced in the elements of type "file". diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp index 82f4adb..54fe8ad 100644 --- a/libk3b/plugin/k3baudiodecoder.cpp +++ b/libk3b/plugin/k3baudiodecoder.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kfilemetainfo.h> -#include <qmap.h> +#include <tqmap.h> #include <math.h> @@ -98,16 +98,16 @@ public: char* decodingBufferPos; int decodingBufferFill; - QMap<QString, QString> technicalInfoMap; - QMap<MetaDataField, QString> metaInfoMap; + TQMap<TQString, TQString> technicalInfoMap; + TQMap<MetaDataField, TQString> metaInfoMap; bool valid; }; -K3bAudioDecoder::K3bAudioDecoder( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bAudioDecoder::K3bAudioDecoder( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); } @@ -129,7 +129,7 @@ K3bAudioDecoder::~K3bAudioDecoder() } -void K3bAudioDecoder::setFilename( const QString& filename ) +void K3bAudioDecoder::setFilename( const TQString& filename ) { m_fileName = filename; delete d->metaInfo; @@ -302,7 +302,7 @@ int K3bAudioDecoder::decode( char* _data, int maxLen ) // clear out the decoding buffer - read = QMIN( maxLen, d->decodingBufferFill ); + read = TQMIN( maxLen, d->decodingBufferFill ); ::memcpy( _data, d->decodingBufferPos, read ); d->decodingBufferPos += read; d->decodingBufferFill -= read; @@ -321,7 +321,7 @@ int K3bAudioDecoder::decode( char* _data, int maxLen ) int K3bAudioDecoder::resample( char* data, int maxLen ) { if( !d->resampleState ) { - d->resampleState = src_new( SRC_SINC_MEDIUM_QUALITY, d->channels, 0 ); + d->resampleState = src_new( SRC_SINC_MEDIUM_TQUALITY, d->channels, 0 ); if( !d->resampleState ) { kdDebug() << "(K3bAudioDecoder) unable to initialize resampler." << endl; return -1; @@ -375,7 +375,7 @@ void K3bAudioDecoder::from16bitBeSignedToFloat( char* src, float* dest, int samp { while( samples ) { samples--; - dest[samples] = static_cast<float>( Q_INT16(((src[2*samples]<<8)&0xff00)|(src[2*samples+1]&0x00ff)) / 32768.0 ); + dest[samples] = static_cast<float>( TQ_INT16(((src[2*samples]<<8)&0xff00)|(src[2*samples+1]&0x00ff)) / 32768.0 ); } } @@ -386,7 +386,7 @@ void K3bAudioDecoder::fromFloatTo16BitBeSigned( float* src, char* dest, int samp samples--; float scaled = src[samples] * 32768.0; - Q_INT16 val = 0; + TQ_INT16 val = 0; // clipping if( scaled >= ( 1.0 * 0x7FFF ) ) @@ -407,8 +407,8 @@ void K3bAudioDecoder::from8BitTo16BitBeSigned( char* src, char* dest, int sample while( samples ) { samples--; - float scaled = static_cast<float>(Q_UINT8(src[samples])-128) / 128.0 * 32768.0; - Q_INT16 val = 0; + float scaled = static_cast<float>(TQ_UINT8(src[samples])-128) / 128.0 * 32768.0; + TQ_INT16 val = 0; // clipping if( scaled >= ( 1.0 * 0x7FFF ) ) @@ -462,7 +462,7 @@ bool K3bAudioDecoder::seek( const K3b::Msf& pos ) kdDebug() << "(K3bAudioDecoder) seeking " << bytesToDecode << " bytes." << endl; char buffi[10*2352]; while( bytesToDecode > 0 ) { - int read = decode( buffi, QMIN(10*2352, bytesToDecode) ); + int read = decode( buffi, TQMIN(10*2352, bytesToDecode) ); if( read <= 0 ) return false; @@ -502,9 +502,9 @@ void K3bAudioDecoder::cleanup() } -QString K3bAudioDecoder::metaInfo( MetaDataField f ) +TQString K3bAudioDecoder::metaInfo( MetaDataField f ) { - if( d->metaInfoMap.contains( f ) ) + if( d->metaInfoMap.tqcontains( f ) ) return d->metaInfoMap[f]; // fall back to KFileMetaInfo @@ -512,7 +512,7 @@ QString K3bAudioDecoder::metaInfo( MetaDataField f ) d->metaInfo = new KFileMetaInfo( filename() ); if( d->metaInfo->isValid() ) { - QString tag; + TQString tag; switch( f ) { case META_TITLE: tag = "Title"; @@ -536,11 +536,11 @@ QString K3bAudioDecoder::metaInfo( MetaDataField f ) return item.string(); } - return QString::null; + return TQString(); } -void K3bAudioDecoder::addMetaInfo( MetaDataField f, const QString& value ) +void K3bAudioDecoder::addMetaInfo( MetaDataField f, const TQString& value ) { if( !value.isEmpty() ) d->metaInfoMap[f] = value; @@ -549,23 +549,23 @@ void K3bAudioDecoder::addMetaInfo( MetaDataField f, const QString& value ) } -QStringList K3bAudioDecoder::supportedTechnicalInfos() const +TQStringList K3bAudioDecoder::supportedTechnicalInfos() const { - QStringList l; - for( QMap<QString, QString>::const_iterator it = d->technicalInfoMap.begin(); + TQStringList l; + for( TQMap<TQString, TQString>::const_iterator it = d->technicalInfoMap.begin(); it != d->technicalInfoMap.end(); ++it ) l.append( it.key() ); return l; } -QString K3bAudioDecoder::technicalInfo( const QString& key ) const +TQString K3bAudioDecoder::technicalInfo( const TQString& key ) const { return d->technicalInfoMap[key]; } -void K3bAudioDecoder::addTechnicalInfo( const QString& key, const QString& value ) +void K3bAudioDecoder::addTechnicalInfo( const TQString& key, const TQString& value ) { d->technicalInfoMap[key] = value; } @@ -574,17 +574,17 @@ void K3bAudioDecoder::addTechnicalInfo( const QString& key, const QString& value K3bAudioDecoder* K3bAudioDecoderFactory::createDecoder( const KURL& url ) { kdDebug() << "(K3bAudioDecoderFactory::createDecoder( " << url.path() << " )" << endl; - QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioDecoder" ); + TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioDecoder" ); // first search for a single format decoder - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { K3bAudioDecoderFactory* f = dynamic_cast<K3bAudioDecoderFactory*>( it.current() ); if( f && !f->multiFormatDecoder() && f->canDecode( url ) ) { kdDebug() << "1" << endl; return f->createDecoder();} } // no single format decoder. Search for a multi format decoder - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { K3bAudioDecoderFactory* f = dynamic_cast<K3bAudioDecoderFactory*>( it.current() ); if( f && f->multiFormatDecoder() && f->canDecode( url ) ) { kdDebug() << "2" << endl; return f->createDecoder();} diff --git a/libk3b/plugin/k3baudiodecoder.h b/libk3b/plugin/k3baudiodecoder.h index 69f594c..ed13c66 100644 --- a/libk3b/plugin/k3baudiodecoder.h +++ b/libk3b/plugin/k3baudiodecoder.h @@ -31,12 +31,13 @@ * * Instances are created by K3bAudioDecoderFactory **/ -class LIBK3B_EXPORT K3bAudioDecoder : public QObject +class LIBK3B_EXPORT K3bAudioDecoder : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bAudioDecoder( QObject* parent = 0, const char* name = 0 ); + K3bAudioDecoder( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bAudioDecoder(); @@ -44,7 +45,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * Set the file to decode. Be aware that one cannot rely * on the file length until analyseFile() has been called. */ - void setFilename( const QString& ); + void setFilename( const TQString& ); /** * Since this may take a while depending on the filetype it is best @@ -87,7 +88,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * the default implementation returns the infos set via @p addMetaInfo * and uses KFileMetaInfo if none was set */ - virtual QString metaInfo( MetaDataField ); + virtual TQString metaInfo( MetaDataField ); /** * The filetype is only used for informational purposes. @@ -95,7 +96,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * as it enhances usability. * @returne The filetype of the decoded file. */ - virtual QString fileType() const { return QString::null; } + virtual TQString fileType() const { return TQString(); } /** * This method may be reimplemented to provide technical information about @@ -103,7 +104,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * * the default implementation returns the infos set via @p addTechnicalInfo */ - virtual QStringList supportedTechnicalInfos() const; + virtual TQStringList supportedTechnicalInfos() const; /** * The framework will call this method with all strings returned by the @@ -111,7 +112,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * * the default implementation returns the infos set via @p addTechnicalInfo */ - virtual QString technicalInfo( const QString& ) const; + virtual TQString technicalInfo( const TQString& ) const; /** * returnes -1 on error, 0 when finished, length of data otherwise @@ -144,7 +145,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject */ virtual K3b::Msf length() const { return m_length; } - const QString& filename() const { return m_fileName; } + const TQString& filename() const { return m_fileName; } // some helper methods static void fromFloatTo16BitBeSigned( float* src, char* dest, int samples ); @@ -155,13 +156,13 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject /** * Use this method if using the default implementation of @p metaInfo */ - void addMetaInfo( MetaDataField, const QString& ); + void addMetaInfo( MetaDataField, const TQString& ); /** * Use this method if using the default implementation of @p technicalInfo * and @p supportedTechnicalInfos. */ - void addTechnicalInfo( const QString&, const QString& ); + void addTechnicalInfo( const TQString&, const TQString& ); /** * This will be called once before the first call to decodeInternal. @@ -191,7 +192,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject private: int resample( char* data, int maxLen ); - QString m_fileName; + TQString m_fileName; K3b::Msf m_length; class Private; @@ -209,16 +210,17 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin { Q_OBJECT + TQ_OBJECT public: - K3bAudioDecoderFactory( QObject* parent = 0, const char* name = 0 ) - : K3bPlugin( parent, name ) { + K3bAudioDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ) + : K3bPlugin( tqparent, name ) { } virtual ~K3bAudioDecoderFactory() { } - QString group() const { return "AudioDecoder"; } + TQString group() const { return "AudioDecoder"; } /** * K3b uses this flag to decide which plugins to test first @@ -239,7 +241,7 @@ class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin */ virtual bool canDecode( const KURL& filename ) = 0; - virtual K3bAudioDecoder* createDecoder( QObject* parent = 0, const char* name = 0 ) const = 0; + virtual K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const = 0; /** * Searching for an audiodecoder for @p filename. diff --git a/libk3b/plugin/k3baudioencoder.cpp b/libk3b/plugin/k3baudioencoder.cpp index 3b1309a..d7f72d1 100644 --- a/libk3b/plugin/k3baudioencoder.cpp +++ b/libk3b/plugin/k3baudioencoder.cpp @@ -15,7 +15,7 @@ #include "k3baudioencoder.h" -#include <qfile.h> +#include <tqfile.h> #include <kdebug.h> @@ -27,15 +27,15 @@ public: : outputFile(0) { } - QFile* outputFile; - QString outputFilename; + TQFile* outputFile; + TQString outputFilename; - QString lastErrorString; + TQString lastErrorString; }; -K3bAudioEncoder::K3bAudioEncoder( QObject* parent, const char* name ) - : K3bPlugin( parent, name ) +K3bAudioEncoder::K3bAudioEncoder( TQObject* tqparent, const char* name ) + : K3bPlugin( tqparent, name ) { d = new Private(); } @@ -48,11 +48,11 @@ K3bAudioEncoder::~K3bAudioEncoder() } -bool K3bAudioEncoder::openFile( const QString& ext, const QString& filename, const K3b::Msf& length ) +bool K3bAudioEncoder::openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length ) { closeFile(); - d->outputFile = new QFile( filename ); + d->outputFile = new TQFile( filename ); if( d->outputFile->open( IO_WriteOnly ) ) { return initEncoder( ext, length ); } @@ -81,35 +81,35 @@ void K3bAudioEncoder::closeFile() d->outputFile->close(); delete d->outputFile; d->outputFile = 0; - d->outputFilename = QString::null; + d->outputFilename = TQString(); } } -const QString& K3bAudioEncoder::filename() const +const TQString& K3bAudioEncoder::filename() const { if( d->outputFile ) return d->outputFilename; else - return QString::null; + return TQString(); } -void K3bAudioEncoder::setMetaData( K3bAudioEncoder::MetaDataField f, const QString& data ) +void K3bAudioEncoder::setMetaData( K3bAudioEncoder::MetaDataField f, const TQString& data ) { if( !data.isEmpty() ) return setMetaDataInternal( f, data ); } -long K3bAudioEncoder::encode( const char* data, Q_ULONG len ) +long K3bAudioEncoder::encode( const char* data, TQ_ULONG len ) { return encodeInternal( data, len ); } -bool K3bAudioEncoder::initEncoder( const QString& ext, const K3b::Msf& length ) +bool K3bAudioEncoder::initEncoder( const TQString& ext, const K3b::Msf& length ) { if( !isOpen() ) { kdDebug() << "(K3bAudioEncoder) call to initEncoder without openFile!" << endl; @@ -120,7 +120,7 @@ bool K3bAudioEncoder::initEncoder( const QString& ext, const K3b::Msf& length ) } -Q_LONG K3bAudioEncoder::writeData( const char* data, Q_ULONG len ) +TQ_LONG K3bAudioEncoder::writeData( const char* data, TQ_ULONG len ) { if( d->outputFile ) { return d->outputFile->writeBlock( data, len ); @@ -132,14 +132,14 @@ Q_LONG K3bAudioEncoder::writeData( const char* data, Q_ULONG len ) } -bool K3bAudioEncoder::initEncoderInternal( const QString&, const K3b::Msf& ) +bool K3bAudioEncoder::initEncoderInternal( const TQString&, const K3b::Msf& ) { // do nothing return true; } -void K3bAudioEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField, const QString& ) +void K3bAudioEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField, const TQString& ) { // do nothing } @@ -158,13 +158,13 @@ void K3bAudioEncoder::finishEncoderInternal() } -void K3bAudioEncoder::setLastError( const QString& e ) +void K3bAudioEncoder::setLastError( const TQString& e ) { d->lastErrorString = e; } -QString K3bAudioEncoder::lastErrorString() const +TQString K3bAudioEncoder::lastErrorString() const { if( d->lastErrorString.isEmpty() ) return i18n("An unknown error occurred."); diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h index 137b49d..b3fc01b 100644 --- a/libk3b/plugin/k3baudioencoder.h +++ b/libk3b/plugin/k3baudioencoder.h @@ -33,9 +33,10 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin { Q_OBJECT + TQ_OBJECT public: - K3bAudioEncoder( QObject* parent = 0, const char* name = 0 ); + K3bAudioEncoder( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bAudioEncoder(); // TODO: if the following methods are to be activated the config methods in @@ -52,7 +53,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin */ // virtual void readConfig( KConfig* ); - QString group() const { return "AudioEncoder"; } + TQString group() const { return "AudioEncoder"; } /** * This should return the fileextensions supported by the filetype written in the @@ -61,19 +62,19 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * in handy if the encoder is based on some external program or lib which is not * available on runtime.) */ - virtual QStringList extensions() const = 0; + virtual TQStringList extensions() const = 0; /** * The filetype as presented to the user. */ - virtual QString fileTypeComment( const QString& extension ) const = 0; + virtual TQString fileTypeComment( const TQString& extension ) const = 0; /** * Determine the filesize of the encoded file (~) * default implementation returnes -1 (unknown) * First parameter is the extension to be used */ - virtual long long fileSize( const QString&, const K3b::Msf& ) const { return -1; } + virtual long long fileSize( const TQString&, const K3b::Msf& ) const { return -1; } /** * The default implementation openes the file for writing with @@ -81,7 +82,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * @param extension the filetype to be used. * */ - virtual bool openFile( const QString& extension, const QString& filename, const K3b::Msf& length ); + virtual bool openFile( const TQString& extension, const TQString& filename, const K3b::Msf& length ); /** @@ -101,11 +102,11 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin /** * The default implementation returnes the filename set in openFile - * or QString::null if no file has been opened. + * or TQString() if no file has been opened. * Normally this does not need to be reimplemented but it has to be * if openFile is reimplemented. */ - virtual const QString& filename() const; + virtual const TQString& filename() const; enum MetaDataField { META_TRACK_TITLE, @@ -123,7 +124,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * calling openFile and before calling encode. * This calls setMetaDataInternal. */ - void setMetaData( MetaDataField, const QString& ); + void setMetaData( MetaDataField, const TQString& ); /** * Returnes the amount of actually written bytes or -1 if an error @@ -132,20 +133,20 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * Be aware that the returned amount of written data may very well differ * from len since the data is encoded. */ - long encode( const char*, Q_ULONG len ); + long encode( const char*, TQ_ULONG len ); /** * Use this signal in case of an error to provide the user with information * about the problem. */ - virtual QString lastErrorString() const; + virtual TQString lastErrorString() const; protected: /** * Called by the default implementation of openFile * This calls initEncoderInternal. */ - bool initEncoder( const QString& extension, const K3b::Msf& length ); + bool initEncoder( const TQString& extension, const K3b::Msf& length ); /** * Called by the deafult implementation of openFile @@ -158,14 +159,14 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * using the default implementation of openFile * Returnes the number of bytes actually written. */ - Q_LONG writeData( const char*, Q_ULONG len ); + TQ_LONG writeData( const char*, TQ_ULONG len ); /** * initzialize the decoder structures. * default implementation does nothing * this may already write data. */ - virtual bool initEncoderInternal( const QString& extension, const K3b::Msf& length ); + virtual bool initEncoderInternal( const TQString& extension, const K3b::Msf& length ); /** * reimplement this if the encoder needs to do some @@ -180,20 +181,20 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * Should return the amount of actually written bytes (may be 0) and -1 * on error. */ - // TODO: use Q_INT16* instead of char* + // TODO: use TQ_INT16* instead of char* // FIXME: why little endian while CDs use big endian??? - virtual long encodeInternal( const char*, Q_ULONG len ) = 0; + virtual long encodeInternal( const char*, TQ_ULONG len ) = 0; /** * default implementation does nothing * this may already write data. */ - virtual void setMetaDataInternal( MetaDataField, const QString& ); + virtual void setMetaDataInternal( MetaDataField, const TQString& ); /** * Use this in combination with the default implementation of lastError() */ - void setLastError( const QString& ); + void setLastError( const TQString& ); private: class Private; diff --git a/libk3b/plugin/k3baudiooutputplugin.h b/libk3b/plugin/k3baudiooutputplugin.h index 97e897a..fdd57a5 100644 --- a/libk3b/plugin/k3baudiooutputplugin.h +++ b/libk3b/plugin/k3baudiooutputplugin.h @@ -25,18 +25,19 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin { Q_OBJECT + TQ_OBJECT public: virtual ~K3bAudioOutputPlugin() { } - QString group() const { return "AudioOutput"; } + TQString group() const { return "AudioOutput"; } /** * This is the short name of the sound system which can be used * to specify the sound system on the command line (like "arts", "alsa", or "oss") */ - virtual QCString soundSystem() const = 0; + virtual TQCString soundSystem() const = 0; /** * Initialize the plugin. @@ -51,7 +52,7 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin */ virtual void cleanup() {} - virtual QString lastErrorMessage() const { return QString::null; } + virtual TQString lastErrorMessage() const { return TQString(); } /** * Let there be sound... @@ -61,8 +62,8 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin virtual int write( char* data, int len ) = 0; protected: - K3bAudioOutputPlugin( QObject* parent = 0, const char* name = 0 ) - : K3bPlugin( parent, name ) { + K3bAudioOutputPlugin( TQObject* tqparent = 0, const char* name = 0 ) + : K3bPlugin( tqparent, name ) { } }; diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp index ecfb25f..3251ed5 100644 --- a/libk3b/plugin/k3baudioserver.cpp +++ b/libk3b/plugin/k3baudioserver.cpp @@ -89,8 +89,8 @@ private: }; -K3bAudioServer::K3bAudioServer( QObject* parent, const char* name ) - : QObject( parent, name ), +K3bAudioServer::K3bAudioServer( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), m_usedOutputPlugin(0), m_pluginInitialized(false), m_client(0) @@ -107,7 +107,7 @@ K3bAudioServer::~K3bAudioServer() } -bool K3bAudioServer::setOutputMethod( const QCString& name ) +bool K3bAudioServer::setOutputMethod( const TQCString& name ) { if( K3bAudioOutputPlugin* p = findOutputPlugin( name ) ) { setOutputPlugin( p ); @@ -153,8 +153,8 @@ void K3bAudioServer::attachClient( K3bAudioClient* c ) if( m_usedOutputPlugin && !m_pluginInitialized ) { if( !m_usedOutputPlugin->init() ) { emit error( i18n("Could not initialize Audio Output plugin %1 (%2)") - .arg(m_usedOutputPlugin->pluginInfo().name()) - .arg(m_usedOutputPlugin->lastErrorMessage()) ); + .tqarg(m_usedOutputPlugin->pluginInfo().name()) + .tqarg(m_usedOutputPlugin->lastErrorMessage()) ); } else m_pluginInitialized = true; @@ -184,11 +184,11 @@ void K3bAudioServer::detachClient( K3bAudioClient* c ) } -K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const QCString& name ) +K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const TQCString& name ) { - QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioOutput" ); + TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioOutput" ); - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { K3bAudioOutputPlugin* f = dynamic_cast<K3bAudioOutputPlugin*>( it.current() ); if( f && f->soundSystem() == name ) { @@ -202,7 +202,7 @@ K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const QCString& name ) } -void K3bAudioServer::customEvent( QCustomEvent* e ) +void K3bAudioServer::customEvent( TQCustomEvent* e ) { if( K3bProgressInfoEvent* be = dynamic_cast<K3bProgressInfoEvent*>(e) ) { if( be->type() == K3bProgressInfoEvent::InfoMessage ) { diff --git a/libk3b/plugin/k3baudioserver.h b/libk3b/plugin/k3baudioserver.h index 1e8d4a8..b428056 100644 --- a/libk3b/plugin/k3baudioserver.h +++ b/libk3b/plugin/k3baudioserver.h @@ -16,7 +16,7 @@ #ifndef _K3B_AUDIO_SERVER_H_ #define _K3B_AUDIO_SERVER_H_ -#include <qobject.h> +#include <tqobject.h> #include "k3b_export.h" class K3bAudioOutputPlugin; class K3bAudioClient; @@ -26,18 +26,19 @@ class K3bAudioClient; * The AudioServer manages AudioClients to play audio data through * some output plugin. */ -class LIBK3B_EXPORT K3bAudioServer : public QObject +class LIBK3B_EXPORT K3bAudioServer : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bAudioServer( QObject* parent = 0, const char* name = 0 ); + K3bAudioServer( TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioServer(); /** * Returns false in case the named output method could not be found. */ - bool setOutputMethod( const QCString& name ); + bool setOutputMethod( const TQCString& name ); void setOutputPlugin( K3bAudioOutputPlugin* p ); /** @@ -62,13 +63,13 @@ class LIBK3B_EXPORT K3bAudioServer : public QObject /** * Find a plugin by classname. */ - static K3bAudioOutputPlugin* findOutputPlugin( const QCString& name ); + static K3bAudioOutputPlugin* findOutputPlugin( const TQCString& name ); signals: - void error( const QString& ); + void error( const TQString& ); private: - void customEvent( QCustomEvent* e ); + void customEvent( TQCustomEvent* e ); class Private; friend class Private; diff --git a/libk3b/plugin/k3bplugin.cpp b/libk3b/plugin/k3bplugin.cpp index db75bb4..6929bd0 100644 --- a/libk3b/plugin/k3bplugin.cpp +++ b/libk3b/plugin/k3bplugin.cpp @@ -17,8 +17,8 @@ #include "k3bplugin.h" -K3bPlugin::K3bPlugin( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bPlugin::K3bPlugin( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { } @@ -28,7 +28,7 @@ K3bPlugin::~K3bPlugin() } -K3bPluginConfigWidget* K3bPlugin::createConfigWidget( QWidget*, const char* ) const +K3bPluginConfigWidget* K3bPlugin::createConfigWidget( TQWidget*, const char* ) const { return 0; } diff --git a/libk3b/plugin/k3bplugin.h b/libk3b/plugin/k3bplugin.h index f4501a7..1eeb622 100644 --- a/libk3b/plugin/k3bplugin.h +++ b/libk3b/plugin/k3bplugin.h @@ -17,7 +17,7 @@ #ifndef _K3B_PLUGIN_H_ #define _K3B_PLUGIN_H_ -#include <qobject.h> +#include <tqobject.h> #include <kgenericfactory.h> #include "k3b_export.h" @@ -25,7 +25,7 @@ class K3bPluginConfigWidget; -class QWidget; +class TQWidget; @@ -37,13 +37,13 @@ class K3bPluginInfo K3bPluginInfo() { } - K3bPluginInfo( QString libraryName, - QString name, - QString author, - QString email, - QString comment, - QString version, - QString licence ) + K3bPluginInfo( TQString libraryName, + TQString name, + TQString author, + TQString email, + TQString comment, + TQString version, + TQString licence ) : m_libraryName(libraryName), m_name(name), m_author(author), @@ -53,38 +53,39 @@ class K3bPluginInfo m_licence(licence) { } - const QString& name() const { return m_name; } - const QString& author() const { return m_author; } - const QString& email() const { return m_email; } - const QString& comment() const { return m_comment; } - const QString& version() const { return m_version; } - const QString& licence() const { return m_licence; } + const TQString& name() const { return m_name; } + const TQString& author() const { return m_author; } + const TQString& email() const { return m_email; } + const TQString& comment() const { return m_comment; } + const TQString& version() const { return m_version; } + const TQString& licence() const { return m_licence; } - const QString& libraryName() const { return m_libraryName; } + const TQString& libraryName() const { return m_libraryName; } private: - QString m_libraryName; - - QString m_name; - QString m_author; - QString m_email; - QString m_comment; - QString m_version; - QString m_licence; + TQString m_libraryName; + + TQString m_name; + TQString m_author; + TQString m_email; + TQString m_comment; + TQString m_version; + TQString m_licence; }; /** * Base class for all plugins. You may use the K3bPluginFactory to make your plugin available. */ -class LIBK3B_EXPORT K3bPlugin : public QObject +class LIBK3B_EXPORT K3bPlugin : public TQObject { Q_OBJECT + TQ_OBJECT friend class K3bPluginManager; public: - K3bPlugin( QObject* parent = 0, const char* name = 0 ); + K3bPlugin( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bPlugin(); const K3bPluginInfo& pluginInfo() const { return m_pluginInfo; } @@ -97,14 +98,14 @@ class LIBK3B_EXPORT K3bPlugin : public QObject /** * The plugin group. */ - virtual QString group() const = 0; + virtual TQString group() const = 0; /** * Returns a widget which configures the plugin. * * The caller has to destroy the widget */ - virtual K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, const char* name = 0 ) const; + virtual K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: K3bPluginInfo m_pluginInfo; diff --git a/libk3b/plugin/k3bpluginconfigwidget.cpp b/libk3b/plugin/k3bpluginconfigwidget.cpp index 09b7f0b..b93fa9d 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.cpp +++ b/libk3b/plugin/k3bpluginconfigwidget.cpp @@ -22,8 +22,8 @@ #include <kdebug.h> -K3bPluginConfigWidget::K3bPluginConfigWidget( QWidget* parent, const char* name ) - : QWidget( parent, name ) +K3bPluginConfigWidget::K3bPluginConfigWidget( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { } diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h index baa07ab..3e5068d 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.h +++ b/libk3b/plugin/k3bpluginconfigwidget.h @@ -17,15 +17,16 @@ #ifndef _K3B_PLUGIN_CONFIG_WIDGET_H_ #define _K3B_PLUGIN_CONFIG_WIDGET_H_ -#include <qwidget.h> +#include <tqwidget.h> #include "k3b_export.h" -class LIBK3B_EXPORT K3bPluginConfigWidget : public QWidget +class LIBK3B_EXPORT K3bPluginConfigWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bPluginConfigWidget( QWidget* parent = 0, const char* name = 0 ); + K3bPluginConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ); virtual ~K3bPluginConfigWidget(); public slots: diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h index 6dbc6cb..463703f 100644 --- a/libk3b/plugin/k3bpluginfactory.h +++ b/libk3b/plugin/k3bpluginfactory.h @@ -23,7 +23,7 @@ #include <klocale.h> /** - * Template based on KGenericFactory. This is just here to avoid using the QStringList args parameter + * Template based on KGenericFactory. This is just here to avoid using the TQStringList args parameter * in every plugin's constructor. * * Use this as follows: @@ -64,14 +64,14 @@ class K3bPluginFactory : public KLibFactory } } - virtual QObject* createObject( QObject *parent, const char *name, - const char*, const QStringList& ) { + virtual TQObject* createObject( TQObject *tqparent, const char *name, + const char*, const TQStringList& ) { initializeMessageCatalogue(); - return new T( parent, name ); + return new T( tqparent, name ); } private: - QCString m_instanceName; + TQCString m_instanceName; bool m_catalogueInitialized; static KInstance* s_instance; diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index 3e963a2..5436251 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -27,23 +27,23 @@ #include <kmessagebox.h> #include <klibloader.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qdir.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqdir.h> class K3bPluginManager::Private { public: - QPtrList<K3bPlugin> plugins; + TQPtrList<K3bPlugin> plugins; }; -K3bPluginManager::K3bPluginManager( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bPluginManager::K3bPluginManager( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); } @@ -56,14 +56,14 @@ K3bPluginManager::~K3bPluginManager() -QStringList K3bPluginManager::groups() const +TQStringList K3bPluginManager::groups() const { - QStringList grps; + TQStringList grps; - QPtrList<K3bPlugin> fl; - for( QPtrListIterator<K3bPlugin> it( d->plugins ); + TQPtrList<K3bPlugin> fl; + for( TQPtrListIterator<K3bPlugin> it( d->plugins ); it.current(); ++it ) { - if( !grps.contains( it.current()->group() ) ) + if( !grps.tqcontains( it.current()->group() ) ) grps.append( it.current()->group() ); } @@ -71,10 +71,10 @@ QStringList K3bPluginManager::groups() const } -QPtrList<K3bPlugin> K3bPluginManager::plugins( const QString& group ) const +TQPtrList<K3bPlugin> K3bPluginManager::plugins( const TQString& group ) const { - QPtrList<K3bPlugin> fl; - for( QPtrListIterator<K3bPlugin> it( d->plugins ); + TQPtrList<K3bPlugin> fl; + for( TQPtrListIterator<K3bPlugin> it( d->plugins ); it.current(); ++it ) { if( it.current()->group() == group || group.isEmpty() ) fl.append( it.current() ); @@ -83,12 +83,12 @@ QPtrList<K3bPlugin> K3bPluginManager::plugins( const QString& group ) const } -void K3bPluginManager::loadPlugin( const QString& fileName ) +void K3bPluginManager::loadPlugin( const TQString& fileName ) { KSimpleConfig c( fileName, true ); c.setGroup( "K3b Plugin" ); - QString libName = c.readEntry( "Lib" ); + TQString libName = c.readEntry( "Lib" ); if( libName.isEmpty() ) { kdDebug() << "(K3bPluginManager) no Lib specified in " << fileName << endl; return; @@ -115,7 +115,7 @@ void K3bPluginManager::loadPlugin( const QString& fileName ) // make sure to only use the latest version of one plugin bool addPlugin = true; - for( QPtrListIterator<K3bPlugin> it( d->plugins ); *it; ++it ) { + for( TQPtrListIterator<K3bPlugin> it( d->plugins ); *it; ++it ) { if( it.current()->pluginInfo().name() == plugin->pluginInfo().name() ) { if( K3bVersion(it.current()->pluginInfo().version()) < K3bVersion(plugin->pluginInfo().version()) ) { K3bPlugin* p = it.current(); @@ -145,12 +145,12 @@ void K3bPluginManager::loadPlugin( const QString& fileName ) void K3bPluginManager::loadAll() { // we simply search the K3b plugin dir for now - QStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" ); + TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" ); - for( QStringList::const_iterator it = dirs.begin(); + for( TQStringList::const_iterator it = dirs.begin(); it != dirs.end(); ++it ) { - QStringList entries = QDir(*it).entryList( "*.plugin", QDir::Files ); - for( QStringList::const_iterator it2 = entries.begin(); + TQStringList entries = TQDir(*it).entryList( "*.plugin", TQDir::Files ); + for( TQStringList::const_iterator it2 = entries.begin(); it2 != entries.end(); ++it2 ) { loadPlugin( *it + *it2 ); } @@ -163,25 +163,25 @@ int K3bPluginManager::pluginSystemVersion() const } -int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, QWidget* parent, const char* name ) +int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* tqparent, const char* name ) { - KDialogBase dlg( parent, + KDialogBase dlg( tqparent, name, true, - i18n("Configure plugin %1").arg( plugin->pluginInfo().name() ) ); + i18n("Configure plugin %1").tqarg( plugin->pluginInfo().name() ) ); K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg ); if( configWidget ) { dlg.setMainWidget( configWidget ); - connect( &dlg, SIGNAL(applyClicked()), configWidget, SLOT(saveConfig()) ); - connect( &dlg, SIGNAL(okClicked()), configWidget, SLOT(saveConfig()) ); + connect( &dlg, TQT_SIGNAL(applyClicked()), configWidget, TQT_SLOT(saveConfig()) ); + connect( &dlg, TQT_SIGNAL(okClicked()), configWidget, TQT_SLOT(saveConfig()) ); configWidget->loadConfig(); int r = dlg.exec(); delete configWidget; return r; } else { - KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").arg( plugin->pluginInfo().name() ) ); + KMessageBox::sorry( tqparent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) ); return 0; } } diff --git a/libk3b/plugin/k3bpluginmanager.h b/libk3b/plugin/k3bpluginmanager.h index 9295dee..c047c1a 100644 --- a/libk3b/plugin/k3bpluginmanager.h +++ b/libk3b/plugin/k3bpluginmanager.h @@ -16,14 +16,14 @@ #ifndef _K3B_PLUGIN_MANAGER_H_ #define _K3B_PLUGIN_MANAGER_H_ -#include <qobject.h> -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqptrlist.h> +#include <tqstringlist.h> #include "k3b_export.h" class K3bPlugin; -class QWidget; +class TQWidget; /** @@ -32,23 +32,24 @@ class QWidget; * Like the K3bCore the single instance (which has to be created manually) * can be obtained with the k3bpluginmanager macro. */ -class LIBK3B_EXPORT K3bPluginManager : public QObject +class LIBK3B_EXPORT K3bPluginManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bPluginManager( QObject* parent = 0, const char* name = 0 ); + K3bPluginManager( TQObject* tqparent = 0, const char* name = 0 ); ~K3bPluginManager(); /** * if group is empty all plugins are returned */ - QPtrList<K3bPlugin> plugins( const QString& group = QString::null ) const; + TQPtrList<K3bPlugin> plugins( const TQString& group = TQString() ) const; /** * Returnes a list of the available groups. */ - QStringList groups() const; + TQStringList groups() const; int pluginSystemVersion() const; @@ -58,9 +59,9 @@ class LIBK3B_EXPORT K3bPluginManager : public QObject */ void loadAll(); - void loadPlugin( const QString& fileName ); + void loadPlugin( const TQString& fileName ); - int execPluginDialog( K3bPlugin*, QWidget* parent = 0, const char* name = 0 ); + int execPluginDialog( K3bPlugin*, TQWidget* tqparent = 0, const char* name = 0 ); private: class Private; diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h index c15b9a3..a8d0c47 100644 --- a/libk3b/plugin/k3bprojectplugin.h +++ b/libk3b/plugin/k3bprojectplugin.h @@ -17,7 +17,7 @@ #define _K3B_PROJECT_PLUGIN_H_ #include <k3bplugin.h> -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" class K3bDoc; @@ -26,8 +26,8 @@ class K3bDoc; * K3bProjectPluginGUIBase interface. That way K3b can embed the GUI into * a fancy dialog which fits the overall look. * - * This is not derived from QWidget to make it possible to inherit - * from other QWidget derivates. + * This is not derived from TQWidget to make it possible to inherit + * from other TQWidget derivates. */ class K3bProjectPluginGUIBase { @@ -35,13 +35,13 @@ class K3bProjectPluginGUIBase K3bProjectPluginGUIBase() {} virtual ~K3bProjectPluginGUIBase() {} - virtual QWidget* qWidget() = 0; + virtual TQWidget* qWidget() = 0; /** * Title used for the GUI */ - virtual QString title() const = 0; - virtual QString subTitle() const { return QString::null; } + virtual TQString title() const = 0; + virtual TQString subTitle() const { return TQString(); } virtual void readSettings( KConfigBase* ) {} virtual void saveSettings( KConfigBase* ) {} @@ -68,6 +68,7 @@ class K3bProjectPluginGUIBase class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin { Q_OBJECT + TQ_OBJECT public: /** @@ -76,8 +77,8 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin * @p activate() will not be used. A plugin has a GUI if it's functionality is started * by some user input. */ - K3bProjectPlugin( int type, bool gui = false, QObject* parent = 0, const char* name = 0 ) - : K3bPlugin( parent, name ), + K3bProjectPlugin( int type, bool gui = false, TQObject* tqparent = 0, const char* name = 0 ) + : K3bPlugin( tqparent, name ), m_type(type), m_hasGUI(gui) { } @@ -100,7 +101,7 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin }; // TODO: maybe we should use something like "ProjectPlugin/AudioCD" based on the type? - QString group() const { return "ProjectPlugin"; } + TQString group() const { return "ProjectPlugin"; } /** * audio, data, videocd, or videodvd @@ -112,23 +113,23 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin /** * Text used for menu entries and the like. */ - const QString& text() const { return m_text; } - const QString& toolTip() const { return m_toolTip; } - const QString& whatsThis() const { return m_whatsThis; } - const QString& icon() const { return m_icon; } + const TQString& text() const { return m_text; } + const TQString& toolTip() const { return m_toolTip; } + const TQString& whatsThis() const { return m_whatsThis; } + const TQString& icon() const { return m_icon; } bool hasGUI() const { return m_hasGUI; } /** * Create the GUI which provides the features for the plugin. * This only needs to be implemented in case hasGUI returns true. - * The returned object has to be a QWidget based class. + * The returned object has to be a TQWidget based class. * * @param doc based on the type returned by the factory * this will be the doc to work on. It should * be dynamically casted to the needed project type. */ - virtual K3bProjectPluginGUIBase* createGUI( K3bDoc* doc, QWidget* = 0, const char* = 0 ) { Q_UNUSED(doc); return 0; } + virtual K3bProjectPluginGUIBase* createGUI( K3bDoc* doc, TQWidget* = 0, const char* = 0 ) { Q_UNUSED(doc); return 0; } /** * This is where the action happens. @@ -138,23 +139,23 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin * this will be the doc to work on. It should * be dynamically casted to the needed project type. * - * @param parent the parent widget to be used for things like progress dialogs. + * @param tqparent the tqparent widget to be used for things like progress dialogs. */ - virtual void activate( K3bDoc* doc, QWidget* parent ) { Q_UNUSED(doc); Q_UNUSED(parent); } + virtual void activate( K3bDoc* doc, TQWidget* tqparent ) { Q_UNUSED(doc); Q_UNUSED(tqparent); } protected: - void setText( const QString& s ) { m_text = s; } - void setToolTip( const QString& s ) { m_toolTip = s; } - void setWhatsThis( const QString& s ) { m_whatsThis = s; } - void setIcon( const QString& s ) { m_icon = s; } + void setText( const TQString& s ) { m_text = s; } + void setToolTip( const TQString& s ) { m_toolTip = s; } + void setWhatsThis( const TQString& s ) { m_whatsThis = s; } + void setIcon( const TQString& s ) { m_icon = s; } private: int m_type; bool m_hasGUI; - QString m_text; - QString m_toolTip; - QString m_whatsThis; - QString m_icon; + TQString m_text; + TQString m_toolTip; + TQString m_whatsThis; + TQString m_icon; }; diff --git a/libk3b/plugin/libsamplerate/samplerate.h b/libk3b/plugin/libsamplerate/samplerate.h index dfc4448..f83ae48 100644 --- a/libk3b/plugin/libsamplerate/samplerate.h +++ b/libk3b/plugin/libsamplerate/samplerate.h @@ -123,8 +123,8 @@ const char* src_strerror (int error) ; enum { - SRC_SINC_BEST_QUALITY = 0, - SRC_SINC_MEDIUM_QUALITY = 1, + SRC_SINC_BEST_TQUALITY = 0, + SRC_SINC_MEDIUM_TQUALITY = 1, SRC_SINC_FASTEST = 2, SRC_ZERO_ORDER_HOLD = 3, SRC_LINEAR = 4 diff --git a/libk3b/plugin/libsamplerate/src_sinc.c b/libk3b/plugin/libsamplerate/src_sinc.c index ddfc06b..cca8b64 100644 --- a/libk3b/plugin/libsamplerate/src_sinc.c +++ b/libk3b/plugin/libsamplerate/src_sinc.c @@ -114,10 +114,10 @@ const char* sinc_get_name (int src_enum) { switch (src_enum) - { case SRC_SINC_BEST_QUALITY : + { case SRC_SINC_BEST_TQUALITY : return "Best Sinc Interpolator" ; - case SRC_SINC_MEDIUM_QUALITY : + case SRC_SINC_MEDIUM_TQUALITY : return "Medium Sinc Interpolator" ; case SRC_SINC_FASTEST : @@ -131,10 +131,10 @@ const char* sinc_get_description (int src_enum) { switch (src_enum) - { case SRC_SINC_BEST_QUALITY : + { case SRC_SINC_BEST_TQUALITY : return "Band limitied sinc interpolation, best quality, 97dB SNR, 96% BW." ; - case SRC_SINC_MEDIUM_QUALITY : + case SRC_SINC_MEDIUM_TQUALITY : return "Band limitied sinc interpolation, medium quality, 97dB SNR, 90% BW." ; case SRC_SINC_FASTEST : @@ -170,7 +170,7 @@ sinc_set_converter (SRC_PRIVATE *psrc, int src_enum) psrc->reset = sinc_reset ; switch (src_enum) - { case SRC_SINC_BEST_QUALITY : + { case SRC_SINC_BEST_TQUALITY : temp_filter.coeffs = high_qual_coeffs ; temp_filter.coeff_half_len = (sizeof (high_qual_coeffs) / sizeof (coeff_t)) - 1 ; temp_filter.index_inc = 128 ; @@ -178,7 +178,7 @@ sinc_set_converter (SRC_PRIVATE *psrc, int src_enum) temp_filter.coeff_len = sizeof (high_qual_coeffs) / sizeof (coeff_t) ; break ; - case SRC_SINC_MEDIUM_QUALITY : + case SRC_SINC_MEDIUM_TQUALITY : temp_filter.coeffs = mid_qual_coeffs ; temp_filter.coeff_half_len = (sizeof (mid_qual_coeffs) / sizeof (coeff_t)) - 1 ; temp_filter.index_inc = 128 ; diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp index 8429f25..f8a5b71 100644 --- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp +++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp @@ -21,28 +21,28 @@ #include <k3btrack.h> #include <k3bcore.h> -#include <qdatastream.h> -#include <qcstring.h> +#include <tqdatastream.h> +#include <tqcstring.h> // FIXME: multiple tracks -K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValueList<int>& cdTrackNumbers, +K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const TQValueList<int>& cdTrackNumbers, const K3bCddbResultEntry& cddb, - K3bDevice::Device* lastDev, QWidget* dragSource, const char* name ) - : QStoredDrag( "k3b/audio_track_drag", dragSource, name ), + K3bDevice::Device* lastDev, TQWidget* dragSource, const char* name ) + : TQStoredDrag( "k3b/audio_track_drag", dragSource, name ), m_toc(toc), m_cdTrackNumbers(cdTrackNumbers), m_cddb(cddb), m_device(lastDev) { - QByteArray data; - QDataStream s( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream s( data, IO_WriteOnly ); s << (unsigned int)toc.count(); for( K3bDevice::Toc::const_iterator it = toc.begin(); it != toc.end(); ++it ) { const K3bDevice::Track& track = *it; s << track.firstSector().lba() << track.lastSector().lba(); } - QTextStream t( s.device() ); + TQTextStream t( s.device() ); t << cddb.cdArtist << endl << cddb.cdTitle << endl; for( unsigned int i = 0; i < toc.count(); ++i ) { @@ -52,7 +52,7 @@ K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValu s << (unsigned int)cdTrackNumbers.count(); - for( QValueList<int>::const_iterator it = cdTrackNumbers.begin(); + for( TQValueList<int>::const_iterator it = cdTrackNumbers.begin(); it != cdTrackNumbers.end(); ++it ) s << *it; @@ -66,13 +66,13 @@ K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValu } -bool K3bAudioCdTrackDrag::decode( const QMimeSource* e, - K3bDevice::Toc& toc, QValueList<int>& trackNumbers, +bool K3bAudioCdTrackDrag::decode( const TQMimeSource* e, + K3bDevice::Toc& toc, TQValueList<int>& trackNumbers, K3bCddbResultEntry& cddb, K3bDevice::Device** dev ) { - QByteArray data = e->encodedData( "k3b/audio_track_drag" ); + TQByteArray data = e->tqencodedData( "k3b/audio_track_drag" ); - QDataStream s( data, IO_ReadOnly ); + TQDataStream s( data, IO_ReadOnly ); unsigned int trackCnt; s >> trackCnt; @@ -83,7 +83,7 @@ bool K3bAudioCdTrackDrag::decode( const QMimeSource* e, toc.append( K3bDevice::Track( fs, ls, K3bDevice::Track::AUDIO ) ); } - QTextStream t( s.device() ); + TQTextStream t( s.device() ); cddb.artists.clear(); cddb.titles.clear(); cddb.cdArtist = t.readLine(); @@ -101,7 +101,7 @@ bool K3bAudioCdTrackDrag::decode( const QMimeSource* e, trackNumbers.append( trackNumber ); } - QString devName = t.readLine(); + TQString devName = t.readLine(); if( dev && !devName.isEmpty() ) *dev = k3bcore->deviceManager()->findDevice( devName ); diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.h b/libk3b/projects/audiocd/k3baudiocdtrackdrag.h index 3148466..f88c4e5 100644 --- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.h +++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.h @@ -16,33 +16,33 @@ #ifndef _K3B_AUDIO_CDTRACK_DRAG_H_ #define _K3B_AUDIO_CDTRACK_DRAG_H_ -#include <qdragobject.h> -#include <qcstring.h> -#include <qvaluelist.h> +#include <tqdragobject.h> +#include <tqcstring.h> +#include <tqvaluelist.h> #include <k3btoc.h> #include <k3bcddbresult.h> #include <k3bdevice.h> #include "k3b_export.h" -class LIBK3B_EXPORT K3bAudioCdTrackDrag : public QStoredDrag +class LIBK3B_EXPORT K3bAudioCdTrackDrag : public TQStoredDrag { public: - K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValueList<int>& cdTrackNumbers, const K3bCddbResultEntry& cddb, - K3bDevice::Device* lastDev = 0, QWidget* dragSource = 0, const char* name = 0 ); + K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const TQValueList<int>& cdTrackNumbers, const K3bCddbResultEntry& cddb, + K3bDevice::Device* lastDev = 0, TQWidget* dragSource = 0, const char* name = 0 ); const K3bDevice::Toc& toc() const { return m_toc; } - const QValueList<int>& cdTrackNumbers() const { return m_cdTrackNumbers; } + const TQValueList<int>& cdTrackNumbers() const { return m_cdTrackNumbers; } const K3bCddbResultEntry& cddbEntry() const { return m_cddb; } bool provides( const char* mimetype ) const { return !qstrcmp( mimetype, "k3b/audio_track_drag" ); } - static bool canDecode( const QMimeSource* s ) { return s->provides( "k3b/audio_track_drag" ); } - static bool decode( const QMimeSource* s, K3bDevice::Toc&, QValueList<int>& trackNumbers, K3bCddbResultEntry&, K3bDevice::Device** dev = 0 ); + static bool canDecode( const TQMimeSource* s ) { return s->provides( "k3b/audio_track_drag" ); } + static bool decode( const TQMimeSource* s, K3bDevice::Toc&, TQValueList<int>& trackNumbers, K3bCddbResultEntry&, K3bDevice::Device** dev = 0 ); private: K3bDevice::Toc m_toc; - QValueList<int> m_cdTrackNumbers; + TQValueList<int> m_cdTrackNumbers; K3bCddbResultEntry m_cddb; K3bDevice::Device* m_device; }; diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp index b61e865..6319086 100644 --- a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp +++ b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp @@ -45,8 +45,8 @@ K3bAudioCdTrackSource::K3bAudioCdTrackSource( const K3bDevice::Toc& toc, int cdT K3bAudioCdTrackSource::K3bAudioCdTrackSource( unsigned int discid, const K3b::Msf& length, int cdTrackNumber, - const QString& artist, const QString& title, - const QString& cdArtist, const QString& cdTitle ) + const TQString& artist, const TQString& title, + const TQString& cdArtist, const TQString& cdTitle ) : K3bAudioDataSource(), m_discId( discid ), m_length( length ), @@ -56,8 +56,8 @@ K3bAudioCdTrackSource::K3bAudioCdTrackSource( unsigned int discid, const K3b::Ms m_initialized( false ) { for( int i = 1; i < cdTrackNumber; ++i ) { - m_cddbEntry.titles.append( QString::null ); - m_cddbEntry.artists.append( QString::null ); + m_cddbEntry.titles.append( TQString() ); + m_cddbEntry.artists.append( TQString() ); } m_cddbEntry.titles.append( title ); m_cddbEntry.artists.append( artist ); @@ -98,10 +98,10 @@ bool K3bAudioCdTrackSource::initParanoia() // ask here for the cd since searchForAudioCD() may also be called from outside if( !m_lastUsedDevice ) { // could not find the CD, so ask for it - QString s = i18n("Please insert Audio CD %1%2") - .arg(m_discId, 0, 16) - .arg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty() - ? QString::null + TQString s = i18n("Please insert Audio CD %1%2") + .tqarg(m_discId, 0, 16) + .tqarg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty() + ? TQString() : " (" + m_cddbEntry.cdArtist + " - " + m_cddbEntry.cdTitle + ")"); while( K3bDevice::Device* dev = K3bThreadWidget::selectDevice( track()->doc()->view(), s ) ) { @@ -163,8 +163,8 @@ K3bDevice::Device* K3bAudioCdTrackSource::searchForAudioCD() const if( m_lastUsedDevice && searchForAudioCD( m_lastUsedDevice ) ) return m_lastUsedDevice; - const QPtrList<K3bDevice::Device>& devices = k3bcore->deviceManager()->readingDevices(); - for( QPtrListIterator<K3bDevice::Device> it(devices); *it; ++it ) { + const TQPtrList<K3bDevice::Device>& devices = k3bcore->deviceManager()->readingDevices(); + for( TQPtrListIterator<K3bDevice::Device> it(devices); *it; ++it ) { if( searchForAudioCD( *it ) ) { return *it; } @@ -244,15 +244,15 @@ int K3bAudioCdTrackSource::read( char* data, unsigned int ) } -QString K3bAudioCdTrackSource::type() const +TQString K3bAudioCdTrackSource::type() const { return i18n("CD Track"); } -QString K3bAudioCdTrackSource::sourceComment() const +TQString K3bAudioCdTrackSource::sourceComment() const { - return i18n("Track %1 from Audio CD %2").arg(m_cdTrackNumber).arg(m_discId,0,16); + return i18n("Track %1 from Audio CD %2").tqarg(m_cdTrackNumber).tqarg(m_discId,0,16); } diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.h b/libk3b/projects/audiocd/k3baudiocdtracksource.h index 6eaaa5b..b6e4ea4 100644 --- a/libk3b/projects/audiocd/k3baudiocdtracksource.h +++ b/libk3b/projects/audiocd/k3baudiocdtracksource.h @@ -50,8 +50,8 @@ class LIBK3B_EXPORT K3bAudioCdTrackSource : public K3bAudioDataSource * Constructor to create sources when loading from a project file without toc information */ K3bAudioCdTrackSource( unsigned int discid, const K3b::Msf& length, int cdTrackNumber, - const QString& artist, const QString& title, - const QString& cdartist, const QString& cdtitle ); + const TQString& artist, const TQString& title, + const TQString& cdartist, const TQString& cdtitle ); K3bAudioCdTrackSource( const K3bAudioCdTrackSource& ); ~K3bAudioCdTrackSource(); @@ -62,8 +62,8 @@ class LIBK3B_EXPORT K3bAudioCdTrackSource : public K3bAudioDataSource K3b::Msf originalLength() const; bool seek( const K3b::Msf& ); int read( char* data, unsigned int max ); - QString type() const; - QString sourceComment() const; + TQString type() const; + TQString sourceComment() const; K3bAudioDataSource* copy() const; /** diff --git a/libk3b/projects/audiocd/k3baudiodatasource.h b/libk3b/projects/audiocd/k3baudiodatasource.h index d12fd10..5ac7336 100644 --- a/libk3b/projects/audiocd/k3baudiodatasource.h +++ b/libk3b/projects/audiocd/k3baudiodatasource.h @@ -79,12 +79,12 @@ class LIBK3B_EXPORT K3bAudioDataSource /** * Type of the data in readable form. */ - virtual QString type() const = 0; + virtual TQString type() const = 0; /** * The source in readable form (this is the filename for files) */ - virtual QString sourceComment() const = 0; + virtual TQString sourceComment() const = 0; /** * Used in case an error occurred. For now this is used if the @@ -150,7 +150,7 @@ class LIBK3B_EXPORT K3bAudioDataSource protected: /** - * Informs the parent track about changes. + * Informs the tqparent track about changes. */ void emitChange(); diff --git a/libk3b/projects/audiocd/k3baudiodatasourceiterator.h b/libk3b/projects/audiocd/k3baudiodatasourceiterator.h index 7a0ce59..f340fce 100644 --- a/libk3b/projects/audiocd/k3baudiodatasourceiterator.h +++ b/libk3b/projects/audiocd/k3baudiodatasourceiterator.h @@ -26,7 +26,7 @@ class K3bAudioDoc; * * Be aware that this iterator does not properly update when the doc * changes. A manual update can be issued with first(). This is becasue - * an update would either involve slots (this being a QObject) which is + * an update would either involve slots (this being a TQObject) which is * too much overhead or the AudioDoc would need to have knowledge of all * the iterators which is also overhead that would be overkill. */ diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index e7661ba..817d5fa 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -29,16 +29,16 @@ // QT-includes -#include <qstring.h> -#include <qstringlist.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdatastream.h> -#include <qdir.h> -#include <qdom.h> -#include <qdatetime.h> -#include <qtextstream.h> -#include <qsemaphore.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdatastream.h> +#include <tqdir.h> +#include <tqdom.h> +#include <tqdatetime.h> +#include <tqtextstream.h> +#include <tqsemaphore.h> // KDE-includes #include <kprocess.h> @@ -69,8 +69,8 @@ public: }; -K3bAudioDoc::K3bAudioDoc( QObject* parent ) - : K3bDoc( parent ), +K3bAudioDoc::K3bAudioDoc( TQObject* tqparent ) + : K3bDoc( tqparent ), m_firstTrack(0), m_lastTrack(0) { @@ -111,7 +111,7 @@ bool K3bAudioDoc::newDocument() } -QString K3bAudioDoc::name() const +TQString K3bAudioDoc::name() const { if( !m_cdTextData.title().isEmpty() ) return m_cdTextData.title(); @@ -212,7 +212,7 @@ KURL::List K3bAudioDoc::extractUrlList( const KURL::List& urls ) while( it != allUrls.end() ) { const KURL& url = *it; - QFileInfo fi( url.path() ); + TQFileInfo fi( url.path() ); if( !url.isLocalFile() ) { kdDebug() << url.path() << " no local file" << endl; @@ -227,11 +227,11 @@ KURL::List K3bAudioDoc::extractUrlList( const KURL::List& urls ) else if( fi.isDir() ) { it = allUrls.remove( it ); // add all files in the dir - QDir dir(fi.filePath()); - QStringList entries = dir.entryList( QDir::Files ); + TQDir dir(fi.filePath()); + TQStringList entries = dir.entryList( TQDir::Files ); KURL::List::iterator oldIt = it; // add all files into the list after the current item - for( QStringList::iterator dirIt = entries.begin(); + for( TQStringList::iterator dirIt = entries.begin(); dirIt != entries.end(); ++dirIt ) it = allUrls.insert( oldIt, KURL::fromPathOrURL( dir.absPath() + "/" + *dirIt ) ); } @@ -256,14 +256,14 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) // check if the file is a m3u playlist // and if so add all listed files - QFile f( url.path() ); + TQFile f( url.path() ); if( !f.open( IO_ReadOnly ) ) return false; - QTextStream t( &f ); + TQTextStream t( &f ); char buf[7]; t.readRawBytes( buf, 7 ); - if( QString::fromLatin1( buf, 7 ) != "#EXTM3U" ) + if( TQString::tqfromLatin1( buf, 7 ) != "#EXTM3U" ) return false; // skip the first line @@ -271,7 +271,7 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) // read the file while( !t.atEnd() ) { - QString line = t.readLine(); + TQString line = t.readLine(); if( line[0] != '#' ) { KURL mp3url; // relative paths @@ -288,11 +288,11 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) } -void K3bAudioDoc::addSources( K3bAudioTrack* parent, +void K3bAudioDoc::addSources( K3bAudioTrack* tqparent, const KURL::List& urls, K3bAudioDataSource* sourceAfter ) { - kdDebug() << "(K3bAudioDoc::addSources( " << parent << ", " + kdDebug() << "(K3bAudioDoc::addSources( " << tqparent << ", " << urls.first().path() << ", " << sourceAfter << " )" << endl; KURL::List allUrls = extractUrlList( urls ); @@ -302,7 +302,7 @@ void K3bAudioDoc::addSources( K3bAudioTrack* parent, if( sourceAfter ) file->moveAfter( sourceAfter ); else - file->moveAhead( parent->firstSource() ); + file->moveAhead( tqparent->firstSource() ); sourceAfter = file; } } @@ -312,7 +312,7 @@ void K3bAudioDoc::addSources( K3bAudioTrack* parent, } -K3bAudioTrack* K3bAudioDoc::importCueFile( const QString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder ) +K3bAudioTrack* K3bAudioDoc::importCueFile( const TQString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder ) { if( !after ) after = m_lastTrack; @@ -382,7 +382,7 @@ K3bAudioDecoder* K3bAudioDoc::getDecoderForUrl( const KURL& url, bool* reused ) K3bAudioDecoder* decoder = 0; // check if we already have a proper decoder - if( m_decoderPresenceMap.contains( url.path() ) ) { + if( m_decoderPresenceMap.tqcontains( url.path() ) ) { decoder = m_decoderPresenceMap[url.path()]; *reused = true; } @@ -400,7 +400,7 @@ K3bAudioDecoder* K3bAudioDoc::getDecoderForUrl( const KURL& url, bool* reused ) K3bAudioFile* K3bAudioDoc::createAudioFile( const KURL& url ) { - if( !QFile::exists( url.path() ) ) { + if( !TQFile::exists( url.path() ) ) { m_notFoundFiles.append( url.path() ); kdDebug() << "(K3bAudioDoc) could not find file " << url.path() << endl; return 0; @@ -488,24 +488,24 @@ void K3bAudioDoc::moveTrack( K3bAudioTrack* track, K3bAudioTrack* after ) } -QString K3bAudioDoc::typeString() const +TQString K3bAudioDoc::typeString() const { return "audio"; } -bool K3bAudioDoc::loadDocumentData( QDomElement* root ) +bool K3bAudioDoc::loadDocumentData( TQDomElement* root ) { newDocument(); // we will parse the dom-tree and create a K3bAudioTrack for all entries immediately // this should not take long and so not block the gui - QDomNodeList nodes = root->childNodes(); + TQDomNodeList nodes = root->childNodes(); for( uint i = 0; i < nodes.count(); i++ ) { - QDomElement e = nodes.item(i).toElement(); + TQDomElement e = nodes.item(i).toElement(); if( e.isNull() ) return false; @@ -522,7 +522,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) setHideFirstTrack( e.text() == "yes" ); else if( e.nodeName() == "audio_ripping" ) { - QDomNodeList ripNodes = e.childNodes(); + TQDomNodeList ripNodes = e.childNodes(); for( uint j = 0; j < ripNodes.length(); j++ ) { if( ripNodes.item(j).nodeName() == "paranoia_mode" ) setAudioRippingParanoiaMode( ripNodes.item(j).toElement().text().toInt() ); @@ -540,7 +540,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) writeCdText( e.attributeNode( "activated" ).value() == "yes" ); - QDomNodeList cdTextNodes = e.childNodes(); + TQDomNodeList cdTextNodes = e.childNodes(); for( uint j = 0; j < cdTextNodes.length(); j++ ) { if( cdTextNodes.item(j).nodeName() == "title" ) setTitle( cdTextNodes.item(j).toElement().text() ); @@ -570,11 +570,11 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) else if( e.nodeName() == "contents" ) { - QDomNodeList contentNodes = e.childNodes(); + TQDomNodeList contentNodes = e.childNodes(); for( uint j = 0; j< contentNodes.length(); j++ ) { - QDomElement trackElem = contentNodes.item(j).toElement(); + TQDomElement trackElem = contentNodes.item(j).toElement(); // first of all we need a track K3bAudioTrack* track = new K3bAudioTrack(); @@ -582,7 +582,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) // backwards compatibility // ----------------------------------------------------------------------------------------------------- - QDomAttr oldUrlAttr = trackElem.attributeNode( "url" ); + TQDomAttr oldUrlAttr = trackElem.attributeNode( "url" ); if( !oldUrlAttr.isNull() ) { if( K3bAudioFile* file = createAudioFile( KURL::fromPathOrURL( oldUrlAttr.value() ) ) ) { @@ -592,13 +592,13 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) // ----------------------------------------------------------------------------------------------------- - QDomNodeList trackNodes = trackElem.childNodes(); + TQDomNodeList trackNodes = trackElem.childNodes(); for( uint trackJ = 0; trackJ < trackNodes.length(); trackJ++ ) { if( trackNodes.item(trackJ).nodeName() == "sources" ) { - QDomNodeList sourcesNodes = trackNodes.item(trackJ).childNodes(); + TQDomNodeList sourcesNodes = trackNodes.item(trackJ).childNodes(); for( unsigned int sourcesIndex = 0; sourcesIndex < sourcesNodes.length(); sourcesIndex++ ) { - QDomElement sourceElem = sourcesNodes.item(sourcesIndex).toElement(); + TQDomElement sourceElem = sourcesNodes.item(sourcesIndex).toElement(); if( sourceElem.nodeName() == "file" ) { if( K3bAudioFile* file = createAudioFile( KURL::fromPathOrURL( sourceElem.attributeNode( "url" ).value() ) ) ) { @@ -616,11 +616,11 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) K3b::Msf length = K3b::Msf::fromString( sourceElem.attributeNode( "length" ).value() ); int titlenum = 0; unsigned int discid = 0; - QString title, artist, cdTitle, cdArtist; + TQString title, artist, cdTitle, cdArtist; - QDomNodeList cdTrackSourceNodes = sourceElem.childNodes(); + TQDomNodeList cdTrackSourceNodes = sourceElem.childNodes(); for( unsigned int cdTrackSourceIndex = 0; cdTrackSourceIndex < cdTrackSourceNodes.length(); ++cdTrackSourceIndex ) { - QDomElement cdTrackSourceItemElem = cdTrackSourceNodes.item(cdTrackSourceIndex).toElement(); + TQDomElement cdTrackSourceItemElem = cdTrackSourceNodes.item(cdTrackSourceIndex).toElement(); if( cdTrackSourceItemElem.nodeName() == "title_number" ) titlenum = cdTrackSourceItemElem.text().toInt(); else if( cdTrackSourceItemElem.nodeName() == "disc_id" ) @@ -657,7 +657,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) // load cd-text else if( trackNodes.item(trackJ).nodeName() == "cd-text" ) { - QDomNodeList cdTextNodes = trackNodes.item(trackJ).childNodes(); + TQDomNodeList cdTextNodes = trackNodes.item(trackJ).childNodes(); for( uint trackCdTextJ = 0; trackCdTextJ < cdTextNodes.length(); trackCdTextJ++ ) { if( cdTextNodes.item(trackCdTextJ).nodeName() == "title" ) track->setTitle( cdTextNodes.item(trackCdTextJ).toElement().text() ); @@ -713,33 +713,33 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) return true; } -bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) +bool K3bAudioDoc::saveDocumentData( TQDomElement* docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); // add normalize - QDomElement normalizeElem = doc.createElement( "normalize" ); + TQDomElement normalizeElem = doc.createElement( "normalize" ); normalizeElem.appendChild( doc.createTextNode( normalize() ? "yes" : "no" ) ); docElem->appendChild( normalizeElem ); // add hide track - QDomElement hideFirstTrackElem = doc.createElement( "hide_first_track" ); + TQDomElement hideFirstTrackElem = doc.createElement( "hide_first_track" ); hideFirstTrackElem.appendChild( doc.createTextNode( hideFirstTrack() ? "yes" : "no" ) ); docElem->appendChild( hideFirstTrackElem ); // save the audio cd ripping settings // paranoia mode, read retries, and ignore read errors // ------------------------------------------------------------ - QDomElement ripMain = doc.createElement( "audio_ripping" ); + TQDomElement ripMain = doc.createElement( "audio_ripping" ); docElem->appendChild( ripMain ); - QDomElement ripElem = doc.createElement( "paranoia_mode" ); - ripElem.appendChild( doc.createTextNode( QString::number( audioRippingParanoiaMode() ) ) ); + TQDomElement ripElem = doc.createElement( "paranoia_mode" ); + ripElem.appendChild( doc.createTextNode( TQString::number( audioRippingParanoiaMode() ) ) ); ripMain.appendChild( ripElem ); ripElem = doc.createElement( "read_retries" ); - ripElem.appendChild( doc.createTextNode( QString::number( audioRippingRetries() ) ) ); + ripElem.appendChild( doc.createTextNode( TQString::number( audioRippingRetries() ) ) ); ripMain.appendChild( ripElem ); ripElem = doc.createElement( "ignore_read_errors" ); @@ -749,9 +749,9 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) // save disc cd-text // ------------------------------------------------------------- - QDomElement cdTextMain = doc.createElement( "cd-text" ); + TQDomElement cdTextMain = doc.createElement( "cd-text" ); cdTextMain.setAttribute( "activated", cdText() ? "yes" : "no" ); - QDomElement cdTextElem = doc.createElement( "title" ); + TQDomElement cdTextElem = doc.createElement( "title" ); cdTextElem.appendChild( doc.createTextNode( (title())) ); cdTextMain.appendChild( cdTextElem ); @@ -788,42 +788,42 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) // save the tracks // ------------------------------------------------------------- - QDomElement contentsElem = doc.createElement( "contents" ); + TQDomElement contentsElem = doc.createElement( "contents" ); for( K3bAudioTrack* track = firstTrack(); track != 0; track = track->next() ) { - QDomElement trackElem = doc.createElement( "track" ); + TQDomElement trackElem = doc.createElement( "track" ); // add sources - QDomElement sourcesParent = doc.createElement( "sources" ); + TQDomElement sourcesParent = doc.createElement( "sources" ); for( K3bAudioDataSource* source = track->firstSource(); source; source = source->next() ) { // TODO: save a source element with a type attribute and start- and endoffset // then distict between the different source types. if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>(source) ) { - QDomElement sourceElem = doc.createElement( "file" ); + TQDomElement sourceElem = doc.createElement( "file" ); sourceElem.setAttribute( "url", file->filename() ); sourceElem.setAttribute( "start_offset", file->startOffset().toString() ); sourceElem.setAttribute( "end_offset", file->endOffset().toString() ); sourcesParent.appendChild( sourceElem ); } else if( K3bAudioZeroData* zero = dynamic_cast<K3bAudioZeroData*>(source) ) { - QDomElement sourceElem = doc.createElement( "silence" ); + TQDomElement sourceElem = doc.createElement( "silence" ); sourceElem.setAttribute( "length", zero->length().toString() ); sourcesParent.appendChild( sourceElem ); } else if( K3bAudioCdTrackSource* cdTrack = dynamic_cast<K3bAudioCdTrackSource*>(source) ) { - QDomElement sourceElem = doc.createElement( "cdtrack" ); + TQDomElement sourceElem = doc.createElement( "cdtrack" ); sourceElem.setAttribute( "length", cdTrack->originalLength().toString() ); sourceElem.setAttribute( "start_offset", cdTrack->startOffset().toString() ); sourceElem.setAttribute( "end_offset", cdTrack->endOffset().toString() ); - QDomElement subElem = doc.createElement( "title_number" ); - subElem.appendChild( doc.createTextNode( QString::number(cdTrack->cdTrackNumber()) ) ); + TQDomElement subElem = doc.createElement( "title_number" ); + subElem.appendChild( doc.createTextNode( TQString::number(cdTrack->cdTrackNumber()) ) ); sourceElem.appendChild( subElem ); subElem = doc.createElement( "disc_id" ); - subElem.appendChild( doc.createTextNode( QString::number(cdTrack->discId(), 16) ) ); + subElem.appendChild( doc.createTextNode( TQString::number(cdTrack->discId(), 16) ) ); sourceElem.appendChild( subElem ); subElem = doc.createElement( "title" ); @@ -852,7 +852,7 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) trackElem.appendChild( sourcesParent ); // index 0 - QDomElement index0Elem = doc.createElement( "index0" ); + TQDomElement index0Elem = doc.createElement( "index0" ); index0Elem.appendChild( doc.createTextNode( track->index0().toString() ) ); trackElem.appendChild( index0Elem ); @@ -891,7 +891,7 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) trackElem.appendChild( cdTextMain ); // add copy protection - QDomElement copyElem = doc.createElement( "copy_protection" ); + TQDomElement copyElem = doc.createElement( "copy_protection" ); copyElem.appendChild( doc.createTextNode( track->copyProtection() ? "yes" : "no" ) ); trackElem.appendChild( copyElem ); @@ -916,20 +916,20 @@ int K3bAudioDoc::numOfTracks() const } -K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bAudioJob( this, hdl, parent ); + return new K3bAudioJob( this, hdl, tqparent ); } void K3bAudioDoc::informAboutNotFoundFiles() { if( !m_notFoundFiles.isEmpty() ) { - QStringList l; + TQStringList l; for( KURL::List::const_iterator it = m_notFoundFiles.begin(); it != m_notFoundFiles.end(); ++it ) l.append( (*it).path() ); - KMessageBox::informationList( qApp->activeWindow(), + KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("Could not find the following files:"), l, i18n("Not Found") ); @@ -937,11 +937,11 @@ void K3bAudioDoc::informAboutNotFoundFiles() m_notFoundFiles.clear(); } if( !m_unknownFileFormatFiles.isEmpty() ) { - QStringList l; + TQStringList l; for( KURL::List::const_iterator it = m_unknownFileFormatFiles.begin(); it != m_unknownFileFormatFiles.end(); ++it ) l.append( (*it).path() ); - KMessageBox::informationList( qApp->activeWindow(), + KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("<p>Unable to handle the following files due to an unsupported format:" "<p>You may manually convert these audio files to wave using another " "application supporting the audio format and then add the wave files " @@ -997,7 +997,7 @@ void K3bAudioDoc::slotTrackRemoved( K3bAudioTrack* track ) void K3bAudioDoc::increaseDecoderUsage( K3bAudioDecoder* decoder ) { kdDebug() << "(K3bAudioDoc::increaseDecoderUsage)" << endl; - if( !m_decoderUsageCounterMap.contains( decoder ) ) { + if( !m_decoderUsageCounterMap.tqcontains( decoder ) ) { m_decoderUsageCounterMap[decoder] = 1; m_decoderPresenceMap[decoder->filename()] = decoder; } @@ -1049,76 +1049,76 @@ K3bDevice::Toc K3bAudioDoc::toToc() const } -void K3bAudioDoc::setTitle( const QString& v ) +void K3bAudioDoc::setTitle( const TQString& v ) { m_cdTextData.setTitle( v ); emit changed(); } -void K3bAudioDoc::setArtist( const QString& v ) +void K3bAudioDoc::setArtist( const TQString& v ) { setPerformer( v ); } -void K3bAudioDoc::setPerformer( const QString& v ) +void K3bAudioDoc::setPerformer( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setPerformer( s ); emit changed(); } -void K3bAudioDoc::setDisc_id( const QString& v ) +void K3bAudioDoc::setDisc_id( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setDiscId( s ); emit changed(); } -void K3bAudioDoc::setArranger( const QString& v ) +void K3bAudioDoc::setArranger( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setArranger( s ); emit changed(); } -void K3bAudioDoc::setSongwriter( const QString& v ) +void K3bAudioDoc::setSongwriter( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setSongwriter( s ); emit changed(); } -void K3bAudioDoc::setComposer( const QString& v ) +void K3bAudioDoc::setComposer( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setComposer( s ); emit changed(); } -void K3bAudioDoc::setUpc_ean( const QString& v ) +void K3bAudioDoc::setUpc_ean( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setUpcEan( s ); emit changed(); } -void K3bAudioDoc::setCdTextMessage( const QString& v ) +void K3bAudioDoc::setCdTextMessage( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setMessage( s ); emit changed(); diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h index 87a512e..943bf14 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.h +++ b/libk3b/projects/audiocd/k3baudiodoc.h @@ -22,21 +22,21 @@ #include <k3bcdtext.h> #include <k3btoc.h> -#include <qptrlist.h> -#include <qfile.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qdatetime.h> -#include <qtextstream.h> +#include <tqptrlist.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqdatetime.h> +#include <tqtextstream.h> #include "k3b_export.h" #include <kurl.h> class K3bApp; class K3bAudioTrack; -class QWidget; -class QTimer; -class QDomDocument; -class QDomElement; +class TQWidget; +class TQTimer; +class TQDomDocument; +class TQDomElement; class K3bThreadJob; class KConfig; class K3bAudioDataSource; @@ -50,16 +50,17 @@ class K3bAudioFile; class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc { Q_OBJECT + TQ_OBJECT friend class K3bMixedDoc; friend class K3bAudioTrack; friend class K3bAudioFile; public: - K3bAudioDoc( QObject* ); + K3bAudioDoc( TQObject* ); ~K3bAudioDoc(); - QString name() const; + TQString name() const; bool newDocument(); @@ -88,14 +89,14 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc // CD-Text bool cdText() const { return m_cdText; } - const QString& title() const { return m_cdTextData.title(); } - const QString& artist() const { return m_cdTextData.performer(); } - const QString& disc_id() const { return m_cdTextData.discId(); } - const QString& arranger() const { return m_cdTextData.arranger(); } - const QString& songwriter() const { return m_cdTextData.songwriter(); } - const QString& composer() const { return m_cdTextData.composer(); } - const QString& upc_ean() const { return m_cdTextData.upcEan(); } - const QString& cdTextMessage() const { return m_cdTextData.message(); } + const TQString& title() const { return m_cdTextData.title(); } + const TQString& artist() const { return m_cdTextData.performer(); } + const TQString& disc_id() const { return m_cdTextData.discId(); } + const TQString& arranger() const { return m_cdTextData.arranger(); } + const TQString& songwriter() const { return m_cdTextData.songwriter(); } + const TQString& composer() const { return m_cdTextData.composer(); } + const TQString& upc_ean() const { return m_cdTextData.upcEan(); } + const TQString& cdTextMessage() const { return m_cdTextData.message(); } /** * Create complete CD-Text including the tracks' data. @@ -111,7 +112,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc */ K3bDevice::Toc toToc() const; - K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 ); + K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ); /** * Shows dialogs. @@ -130,7 +131,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc * * BE AWARE THAT THE DECODER HAS TO FIT THE AUDIO FILE IN THE CUE. */ - K3bAudioTrack* importCueFile( const QString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder = 0 ); + K3bAudioTrack* importCueFile( const TQString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder = 0 ); /** * Create a decoder for a specific url. If another AudioFileSource with this @@ -158,7 +159,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc */ void addTrack( K3bAudioTrack* track, uint position = 0 ); - void addSources( K3bAudioTrack* parent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 ); + void addSources( K3bAudioTrack* tqparent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 ); void removeTrack( K3bAudioTrack* ); void moveTrack( K3bAudioTrack* track, K3bAudioTrack* after ); @@ -168,15 +169,15 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc // CD-Text void writeCdText( bool b ) { m_cdText = b; } - void setTitle( const QString& v ); - void setArtist( const QString& v ); - void setPerformer( const QString& v ); - void setDisc_id( const QString& v ); - void setArranger( const QString& v ); - void setSongwriter( const QString& v ); - void setComposer( const QString& v ); - void setUpc_ean( const QString& v ); - void setCdTextMessage( const QString& v ); + void setTitle( const TQString& v ); + void setArtist( const TQString& v ); + void setPerformer( const TQString& v ); + void setDisc_id( const TQString& v ); + void setArranger( const TQString& v ); + void setSongwriter( const TQString& v ); + void setComposer( const TQString& v ); + void setUpc_ean( const TQString& v ); + void setCdTextMessage( const TQString& v ); // Audio-CD Ripping void setAudioRippingParanoiaMode( int i ) { m_audioRippingParanoiaMode = i; } @@ -195,11 +196,11 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc protected: /** reimplemented from K3bDoc */ - bool loadDocumentData( QDomElement* ); + bool loadDocumentData( TQDomElement* ); /** reimplemented from K3bDoc */ - bool saveDocumentData( QDomElement* ); + bool saveDocumentData( TQDomElement* ); - QString typeString() const; + TQString typeString() const; private: // the stuff for adding files @@ -251,9 +252,9 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc // decoder housekeeping // -------------------------------------------------- // used to check if we may delete a decoder - QMap<K3bAudioDecoder*, int> m_decoderUsageCounterMap; + TQMap<K3bAudioDecoder*, int> m_decoderUsageCounterMap; // used to check if we already have a decoder for a specific file - QMap<QString, K3bAudioDecoder*> m_decoderPresenceMap; + TQMap<TQString, K3bAudioDecoder*> m_decoderPresenceMap; class Private; Private* d; diff --git a/libk3b/projects/audiocd/k3baudiofile.cpp b/libk3b/projects/audiocd/k3baudiofile.cpp index 2011e73..955dab0 100644 --- a/libk3b/projects/audiocd/k3baudiofile.cpp +++ b/libk3b/projects/audiocd/k3baudiofile.cpp @@ -47,19 +47,19 @@ K3bAudioFile::~K3bAudioFile() } -QString K3bAudioFile::type() const +TQString K3bAudioFile::type() const { return m_decoder->fileType(); } -QString K3bAudioFile::sourceComment() const +TQString K3bAudioFile::sourceComment() const { return m_decoder->filename().section( "/", -1 ); } -const QString& K3bAudioFile::filename() const +const TQString& K3bAudioFile::filename() const { return m_decoder->filename(); } diff --git a/libk3b/projects/audiocd/k3baudiofile.h b/libk3b/projects/audiocd/k3baudiofile.h index 83f75eb..74d0a12 100644 --- a/libk3b/projects/audiocd/k3baudiofile.h +++ b/libk3b/projects/audiocd/k3baudiofile.h @@ -55,15 +55,15 @@ class LIBK3B_EXPORT K3bAudioFile : public K3bAudioDataSource */ ~K3bAudioFile(); - const QString& filename() const; + const TQString& filename() const; /** * The complete length of the file used by this source. */ K3b::Msf originalLength() const; - QString type() const; - QString sourceComment() const; + TQString type() const; + TQString sourceComment() const; bool isValid() const; diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp index b8a7a11..0a385e9 100644 --- a/libk3b/projects/audiocd/k3baudioimager.cpp +++ b/libk3b/projects/audiocd/k3baudioimager.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <kdebug.h> -#include <qfile.h> +#include <tqfile.h> #include <unistd.h> @@ -40,7 +40,7 @@ public: bool m_canceled; int m_fd; - QStringList m_imageNames; + TQStringList m_imageNames; K3bAudioImager::ErrorType lastError; private: @@ -68,7 +68,7 @@ void K3bAudioImager::WorkThread::run() // // // - QStringList::iterator imageFileIt = m_imageNames.begin(); + TQStringList::iterator imageFileIt = m_imageNames.begin(); K3bWaveFileWriter waveFileWriter; K3bAudioTrack* track = m_doc->firstTrack(); @@ -85,7 +85,7 @@ void K3bAudioImager::WorkThread::run() // Seek to the beginning of the track // if( !track->seek(0) ) { - emitInfoMessage( i18n("Unable to seek in track %1.").arg(trackNumber), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to seek in track %1.").tqarg(trackNumber), K3bJob::ERROR ); emitFinished(false); return; } @@ -101,7 +101,7 @@ void K3bAudioImager::WorkThread::run() // if( m_fd == -1 ) { if( !waveFileWriter.open( *imageFileIt ) ) { - emitInfoMessage( i18n("Could not open %1 for writing").arg(*imageFileIt), K3bJob::ERROR ); + emitInfoMessage( i18n("Could not open %1 for writing").tqarg(*imageFileIt), K3bJob::ERROR ); emitFinished(false); return; } @@ -142,7 +142,7 @@ void K3bAudioImager::WorkThread::run() } if( read < 0 ) { - emitInfoMessage( i18n("Error while decoding track %1.").arg(trackNumber), K3bJob::ERROR ); + emitInfoMessage( i18n("Error while decoding track %1.").tqarg(trackNumber), K3bJob::ERROR ); kdDebug() << "(K3bAudioImager::WorkThread) read error on track " << trackNumber << " at pos " << K3b::Msf(trackRead/2352) << endl; lastError = K3bAudioImager::ERROR_DECODING_TRACK; @@ -167,8 +167,8 @@ void K3bAudioImager::WorkThread::cancel() -K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ), +K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ), m_doc(doc) { m_thread = new WorkThread(doc); @@ -188,7 +188,7 @@ void K3bAudioImager::writeToFd( int fd ) } -void K3bAudioImager::setImageFilenames( const QStringList& p ) +void K3bAudioImager::setImageFilenames( const TQStringList& p ) { m_thread->m_imageNames = p; m_thread->m_fd = -1; diff --git a/libk3b/projects/audiocd/k3baudioimager.h b/libk3b/projects/audiocd/k3baudioimager.h index df4ae7a..bfa1d83 100644 --- a/libk3b/projects/audiocd/k3baudioimager.h +++ b/libk3b/projects/audiocd/k3baudioimager.h @@ -23,9 +23,10 @@ class K3bAudioDoc; class K3bAudioImager : public K3bThreadJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioImager(); /** @@ -39,7 +40,7 @@ class K3bAudioImager : public K3bThreadJob * Image path. Should be an empty directory or a non-existing * directory in which case it will be created. */ - void setImageFilenames( const QStringList& p ); + void setImageFilenames( const TQStringList& p ); enum ErrorType { ERROR_FD_WRITE, diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp index c2e62c2..ddf15a3 100644 --- a/libk3b/projects/audiocd/k3baudiojob.cpp +++ b/libk3b/projects/audiocd/k3baudiojob.cpp @@ -38,8 +38,8 @@ #include <k3btocfilewriter.h> #include <k3binffilewriter.h> -#include <qfile.h> -#include <qvaluevector.h> +#include <tqfile.h> +#include <tqvaluevector.h> #include <kdebug.h> #include <klocale.h> @@ -48,11 +48,11 @@ -static QString createNonExistingFilesString( const QValueList<K3bAudioFile*>& items, unsigned int max ) +static TQString createNonExistingFilesString( const TQValueList<K3bAudioFile*>& items, unsigned int max ) { - QString s; + TQString s; unsigned int cnt = 0; - for( QValueList<K3bAudioFile*>::const_iterator it = items.begin(); + for( TQValueList<K3bAudioFile*>::const_iterator it = items.begin(); it != items.end(); ++it ) { s += KStringHandler::csqueeze( (*it)->filename(), 60 ); @@ -92,8 +92,8 @@ class K3bAudioJob::Private }; -K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ), +K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ), m_doc( doc ), m_normalizeJob(0), m_maxSpeedJob(0) @@ -101,16 +101,16 @@ K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, QObject* parent d = new Private; m_audioImager = new K3bAudioImager( m_doc, this, this ); - connect( m_audioImager, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_audioImager, SIGNAL(percent(int)), - this, SLOT(slotAudioDecoderPercent(int)) ); - connect( m_audioImager, SIGNAL(subPercent(int)), - this, SLOT(slotAudioDecoderSubPercent(int)) ); - connect( m_audioImager, SIGNAL(finished(bool)), - this, SLOT(slotAudioDecoderFinished(bool)) ); - connect( m_audioImager, SIGNAL(nextTrack(int, int)), - this, SLOT(slotAudioDecoderNextTrack(int, int)) ); + connect( m_audioImager, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_audioImager, TQT_SIGNAL(percent(int)), + this, TQT_SLOT(slotAudioDecoderPercent(int)) ); + connect( m_audioImager, TQT_SIGNAL(subPercent(int)), + this, TQT_SLOT(slotAudioDecoderSubPercent(int)) ); + connect( m_audioImager, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotAudioDecoderFinished(bool)) ); + connect( m_audioImager, TQT_SIGNAL(nextTrack(int, int)), + this, TQT_SLOT(slotAudioDecoderNextTrack(int, int)) ); m_writer = 0; m_tempData = new K3bAudioJobTempData( m_doc, this ); @@ -159,13 +159,13 @@ void K3bAudioJob::start() // // Check if all files exist // - QValueList<K3bAudioFile*> nonExistingFiles; + TQValueList<K3bAudioFile*> nonExistingFiles; K3bAudioTrack* track = m_doc->firstTrack(); while( track ) { K3bAudioDataSource* source = track->firstSource(); while( source ) { if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( source ) ) { - if( !QFile::exists( file->filename() ) ) + if( !TQFile::exists( file->filename() ) ) nonExistingFiles.append( file ); } source = source->next(); @@ -179,7 +179,7 @@ void K3bAudioJob::start() i18n("Warning"), i18n("Remove missing files and continue"), i18n("Cancel and go back") ) ) { - for( QValueList<K3bAudioFile*>::const_iterator it = nonExistingFiles.begin(); + for( TQValueList<K3bAudioFile*>::const_iterator it = nonExistingFiles.begin(); it != nonExistingFiles.end(); ++it ) { delete *it; } @@ -297,7 +297,7 @@ void K3bAudioJob::start() d->useCdText ) { if( !cdrecordCdText ) { emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.") - .arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); + .tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); d->useCdText = false; } else if( m_usedWritingMode == K3b::TAO ) { @@ -314,10 +314,10 @@ void K3bAudioJob::start() emit newSubTask( i18n("Determining maximum writing speed") ); if( !m_maxSpeedJob ) { m_maxSpeedJob = new K3bAudioMaxSpeedJob( m_doc, this, this ); - connect( m_maxSpeedJob, SIGNAL(percent(int)), - this, SIGNAL(subPercent(int)) ); - connect( m_maxSpeedJob, SIGNAL(finished(bool)), - this, SLOT(slotMaxSpeedJobFinished(bool)) ); + connect( m_maxSpeedJob, TQT_SIGNAL(percent(int)), + this, TQT_SIGNAL(subPercent(int)) ); + connect( m_maxSpeedJob, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotMaxSpeedJobFinished(bool)) ); } m_maxSpeedJob->start(); return; @@ -346,10 +346,10 @@ void K3bAudioJob::start() } else { emit burning(false); - emit infoMessage( i18n("Creating image files in %1").arg(m_doc->tempDir()), INFO ); + emit infoMessage( i18n("Creating image files in %1").tqarg(m_doc->tempDir()), INFO ); emit newTask( i18n("Creating image files") ); m_tempData->prepareTempFileNames( doc()->tempDir() ); - QStringList filenames; + TQStringList filenames; for( int i = 1; i <= m_doc->numOfTracks(); ++i ) filenames += m_tempData->bufferFileName( i ); m_audioImager->setImageFilenames( filenames ); @@ -480,10 +480,10 @@ void K3bAudioJob::slotAudioDecoderNextTrack( int t, int tt ) if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) { K3bAudioTrack* track = m_doc->getTrack(t); emit newSubTask( i18n("Decoding audio track %1 of %2%3") - .arg(t) - .arg(tt) - .arg( track->title().isEmpty() || track->artist().isEmpty() - ? QString::null + .tqarg(t) + .tqarg(tt) + .tqarg( track->title().isEmpty() || track->artist().isEmpty() + ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } } @@ -533,10 +533,10 @@ bool K3bAudioJob::prepareWriter() while( track ) { if( m_doc->onTheFly() ) { // this is only supported by cdrecord versions >= 2.01a13 - writer->addArgument( QFile::encodeName( m_tempData->infFileName( track ) ) ); + writer->addArgument( TQFile::encodeName( m_tempData->infFileName( track ) ) ); } else { - writer->addArgument( QFile::encodeName( m_tempData->bufferFileName( track ) ) ); + writer->addArgument( TQFile::encodeName( m_tempData->bufferFileName( track ) ) ); } track = track->next(); } @@ -562,20 +562,20 @@ bool K3bAudioJob::prepareWriter() m_writer = writer; } - connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writer, SIGNAL(percent(int)), this, SLOT(slotWriterJobPercent(int)) ); - connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_writer, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_writer, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writer, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) ); - // connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterJobPercent(int)) ); + connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); + // connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); return true; } @@ -588,10 +588,10 @@ void K3bAudioJob::slotWriterNextTrack( int t, int tt ) if( m_doc->hideFirstTrack() ) track = m_doc->getTrack(t+1); emit newSubTask( i18n("Writing track %1 of %2%3") - .arg(t) - .arg(tt) - .arg( track->title().isEmpty() || track->artist().isEmpty() - ? QString::null + .tqarg(t) + .tqarg(tt) + .tqarg( track->title().isEmpty() || track->artist().isEmpty() + ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } @@ -650,7 +650,7 @@ bool K3bAudioJob::startWriting() if( m_doc->dummy() ) emit newTask( i18n("Simulating") ); else if( d->copies > 1 ) - emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); else emit newTask( i18n("Writing") ); @@ -706,19 +706,19 @@ void K3bAudioJob::normalizeFiles() if( !m_normalizeJob ) { m_normalizeJob = new K3bAudioNormalizeJob( this, this ); - connect( m_normalizeJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_normalizeJob, SIGNAL(percent(int)), this, SLOT(slotNormalizeProgress(int)) ); - connect( m_normalizeJob, SIGNAL(subPercent(int)), this, SLOT(slotNormalizeSubProgress(int)) ); - connect( m_normalizeJob, SIGNAL(finished(bool)), this, SLOT(slotNormalizeJobFinished(bool)) ); - connect( m_normalizeJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_normalizeJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_normalizeJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_normalizeJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotNormalizeProgress(int)) ); + connect( m_normalizeJob, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotNormalizeSubProgress(int)) ); + connect( m_normalizeJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotNormalizeJobFinished(bool)) ); + connect( m_normalizeJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_normalizeJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } // add all the files // TODO: we may need to split the wave files and put them back together! - QValueVector<QString> files; + TQValueVector<TQString> files; K3bAudioTrack* track = m_doc->firstTrack(); while( track ) { files.append( m_tempData->bufferFileName(track) ); @@ -779,7 +779,7 @@ bool K3bAudioJob::writeTocFile() if( d->useCdText ) tocWriter.setCdText( m_doc->cdTextData() ); if( !m_doc->onTheFly() ) { - QStringList filenames; + TQStringList filenames; for( int i = 1; i <= m_doc->numOfTracks(); ++i ) filenames += m_tempData->bufferFileName( i ); tocWriter.setFilenames( filenames ); @@ -842,23 +842,23 @@ bool K3bAudioJob::checkAudioSources() } -QString K3bAudioJob::jobDescription() const +TQString K3bAudioJob::jobDescription() const { return i18n("Writing Audio CD") + ( m_doc->title().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->title()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->title()) ); } -QString K3bAudioJob::jobDetails() const +TQString K3bAudioJob::jobDetails() const { return ( i18n( "1 track (%1 minutes)", "%n tracks (%1 minutes)", - m_doc->numOfTracks() ).arg(m_doc->length().toString()) + m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) + ( m_doc->copies() > 1 && !m_doc->dummy() ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3baudiojob.moc" diff --git a/libk3b/projects/audiocd/k3baudiojob.h b/libk3b/projects/audiocd/k3baudiojob.h index af37639..309d3f3 100644 --- a/libk3b/projects/audiocd/k3baudiojob.h +++ b/libk3b/projects/audiocd/k3baudiojob.h @@ -22,8 +22,8 @@ class K3bAudioDoc; class K3bAudioImager; -class QFile; -class QDataStream; +class TQFile; +class TQDataStream; class K3bAbstractWriter; class KTempFile; class K3bCdrecordWriter; @@ -38,16 +38,17 @@ class K3bAudioMaxSpeedJob; class K3bAudioJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bAudioJob(); K3bDoc* doc() const; K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void cancel(); diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp index af98c2e..538d454 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp @@ -21,9 +21,9 @@ #include <k3bmsf.h> #include <k3bcore.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qvaluevector.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqvaluevector.h> #include <kdebug.h> @@ -35,16 +35,16 @@ public: : doc(_doc) { } - QValueVector<QString> bufferFiles; - QValueVector<QString> infFiles; - QString tocFile; + TQValueVector<TQString> bufferFiles; + TQValueVector<TQString> infFiles; + TQString tocFile; K3bAudioDoc* doc; }; -K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, QObject* parent, const char* name ) - : QObject( parent, name ) +K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private( doc ); } @@ -56,20 +56,20 @@ K3bAudioJobTempData::~K3bAudioJobTempData() } -const QString& K3bAudioJobTempData::bufferFileName( int track ) +const TQString& K3bAudioJobTempData::bufferFileName( int track ) { if( (int)d->bufferFiles.count() < track ) prepareTempFileNames(); return d->bufferFiles.at(track-1); } -const QString& K3bAudioJobTempData::bufferFileName( K3bAudioTrack* track ) +const TQString& K3bAudioJobTempData::bufferFileName( K3bAudioTrack* track ) { return bufferFileName( track->trackNumber() ); } -const QString& K3bAudioJobTempData::tocFileName() +const TQString& K3bAudioJobTempData::tocFileName() { if( d->tocFile.isEmpty() ) prepareTempFileNames(); @@ -77,14 +77,14 @@ const QString& K3bAudioJobTempData::tocFileName() } -const QString& K3bAudioJobTempData::infFileName( int track ) +const TQString& K3bAudioJobTempData::infFileName( int track ) { if( (int)d->infFiles.count() < track ) prepareTempFileNames(); return d->infFiles.at( track - 1 ); } -const QString& K3bAudioJobTempData::infFileName( K3bAudioTrack* track ) +const TQString& K3bAudioJobTempData::infFileName( K3bAudioTrack* track ) { return infFileName( track->trackNumber() ); } @@ -96,16 +96,16 @@ K3bAudioDoc* K3bAudioJobTempData::doc() const } -void K3bAudioJobTempData::prepareTempFileNames( const QString& path ) +void K3bAudioJobTempData::prepareTempFileNames( const TQString& path ) { d->bufferFiles.clear(); d->infFiles.clear(); - QString prefix = K3b::findUniqueFilePrefix( "k3b_audio_", path ) + "_"; + TQString prefix = K3b::findUniqueFilePrefix( "k3b_audio_", path ) + "_"; for( int i = 0; i < d->doc->numOfTracks(); i++ ) { - d->bufferFiles.append( prefix + QString::number( i+1 ).rightJustify( 2, '0' ) + ".wav" ); - d->infFiles.append( prefix + QString::number( i+1 ).rightJustify( 2, '0' ) + ".inf" ); + d->bufferFiles.append( prefix + TQString::number( i+1 ).rightJustify( 2, '0' ) + ".wav" ); + d->infFiles.append( prefix + TQString::number( i+1 ).rightJustify( 2, '0' ) + ".inf" ); } d->tocFile = prefix + ".toc"; @@ -115,17 +115,17 @@ void K3bAudioJobTempData::prepareTempFileNames( const QString& path ) void K3bAudioJobTempData::cleanup() { for( uint i = 0; i < d->infFiles.count(); ++i ) { - if( QFile::exists( d->infFiles[i] ) ) - QFile::remove( d->infFiles[i] ); + if( TQFile::exists( d->infFiles[i] ) ) + TQFile::remove( d->infFiles[i] ); } for( uint i = 0; i < d->bufferFiles.count(); ++i ) { - if( QFile::exists( d->bufferFiles[i] ) ) - QFile::remove( d->bufferFiles[i] ); + if( TQFile::exists( d->bufferFiles[i] ) ) + TQFile::remove( d->bufferFiles[i] ); } - if( QFile::exists( d->tocFile ) ) - QFile::remove( d->tocFile ); + if( TQFile::exists( d->tocFile ) ) + TQFile::remove( d->tocFile ); } diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.h b/libk3b/projects/audiocd/k3baudiojobtempdata.h index 72b753f..62bc7e7 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.h +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.h @@ -17,29 +17,30 @@ #ifndef _K3B_AUDIO_JOB_TEMPDATA_H_ #define _K3B_AUDIO_JOB_TEMPDATA_H_ -#include <qobject.h> +#include <tqobject.h> #include <k3bmsf.h> class K3bAudioTrack; class K3bAudioDoc; -class QTextStream; +class TQTextStream; -class K3bAudioJobTempData : public QObject +class K3bAudioJobTempData : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bAudioJobTempData( K3bAudioDoc* doc, QObject* parent = 0, const char* name = 0 ); + K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioJobTempData(); - const QString& bufferFileName( int track ); - const QString& bufferFileName( K3bAudioTrack* track ); + const TQString& bufferFileName( int track ); + const TQString& bufferFileName( K3bAudioTrack* track ); - const QString& infFileName( int track ); - const QString& infFileName( K3bAudioTrack* track ); + const TQString& infFileName( int track ); + const TQString& infFileName( K3bAudioTrack* track ); - const QString& tocFileName(); + const TQString& tocFileName(); K3bAudioDoc* doc() const; @@ -48,7 +49,7 @@ class K3bAudioJobTempData : public QObject * a specific directory * it defaults to the default K3b temp dir */ - void prepareTempFileNames( const QString& path = QString::null ); + void prepareTempFileNames( const TQString& path = TQString() ); /** * remove all temp files (this does not include the audio buffer files diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp index 975ab89..cde09c9 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <klocale.h> -#include <qdatetime.h> +#include <tqdatetime.h> class K3bAudioMaxSpeedJob::WorkThread : public K3bThread @@ -106,7 +106,7 @@ void K3bAudioMaxSpeedJob::WorkThread::run() } else if( speed > 0 ) { // update the max speed - maxSpeed = QMIN( maxSpeed, speed ); + maxSpeed = TQMIN( maxSpeed, speed ); } it.next(); @@ -142,7 +142,7 @@ int K3bAudioMaxSpeedJob::WorkThread::speedTest( K3bAudioDataSource* source ) } } - QTime t; + TQTime t; int dataRead = 0; int r = 0; @@ -183,11 +183,11 @@ int K3bAudioMaxSpeedJob::WorkThread::maxSpeedByMedia() const { int s = 0; - QValueList<int> speeds = m_doc->burner()->determineSupportedWriteSpeeds(); + TQValueList<int> speeds = m_doc->burner()->determineSupportedWriteSpeeds(); // simply use what we have and let the writer decide if the speeds are empty if( !speeds.isEmpty() ) { // start with the highest speed and go down the list until we are below our max - QValueListIterator<int> it = speeds.end(); + TQValueListIterator<int> it = speeds.end(); --it; while( *it > maxSpeed && it != speeds.begin() ) --it; @@ -203,8 +203,8 @@ int K3bAudioMaxSpeedJob::WorkThread::maxSpeedByMedia() const -K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ) +K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ) { m_thread = new WorkThread( doc ); setThread( m_thread ); diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h index 876bc7f..9526d4a 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h @@ -24,9 +24,10 @@ class K3bAudioDoc; class K3bAudioMaxSpeedJob : public K3bThreadJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioMaxSpeedJob(); /** diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index 782712b..a732bb5 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -23,8 +23,8 @@ #include <klocale.h> -K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, QObject* parent, const char* name ) - : K3bJob( hdl, parent, name ), +K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) + : K3bJob( hdl, tqparent, name ), m_process(0) { } @@ -49,8 +49,8 @@ void K3bAudioNormalizeJob::start() delete m_process; m_process = new K3bProcess(); - connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" ); @@ -61,14 +61,14 @@ void K3bAudioNormalizeJob::start() } if( !bin->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(bin->name()).arg(bin->version).arg(bin->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(bin->name()).tqarg(bin->version).tqarg(bin->copyright), INFO ); // create the commandline *m_process << bin; // additional user parameters from config - const QStringList& params = bin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = bin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; // end the options @@ -100,11 +100,11 @@ void K3bAudioNormalizeJob::cancel() } -void K3bAudioNormalizeJob::slotStdLine( const QString& line ) +void K3bAudioNormalizeJob::slotStdLine( const TQString& line ) { // percent, subPercent, newTask (compute level and adjust) - // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) ); + // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").tqarg(t).tqarg(tt).tqarg(m_files.at(t-1)) ); emit debuggingOutput( "normalize-audio", line ); @@ -121,15 +121,15 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line ) } } - else if( line.contains( "already normalized" ) ) { + else if( line.tqcontains( "already normalized" ) ) { // no normalization necessary for the current track - emit infoMessage( i18n("Track %1 is already normalized.").arg(m_currentTrack), INFO ); + emit infoMessage( i18n("Track %1 is already normalized.").tqarg(m_currentTrack), INFO ); m_currentTrack++; } - else if( line.contains( "--% done") ) { + else if( line.tqcontains( "--% done") ) { if( m_currentAction == ADJUSTING_LEVELS ) { - emit newTask( i18n("Adjusting volume level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) ); + emit newTask( i18n("Adjusting volume level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) ); kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track " << m_currentTrack << " " @@ -137,7 +137,7 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line ) << endl; } else { - emit newTask( i18n("Computing level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) ); + emit newTask( i18n("Computing level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) ); kdDebug() << "(K3bAudioNormalizeJob) computing level for track " << m_currentTrack << " " @@ -148,7 +148,7 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line ) m_currentTrack++; } - else if( int pos = line.find( "% done" ) > 0 ) { + else if( int pos = line.tqfind( "% done" ) > 0 ) { // parse progress: "XXX% done" and "batch XXX% done" pos -= 3; bool ok; @@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p ) break; default: if( !m_canceled ) { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("normalize-audio").tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Error while normalizing tracks."), ERROR ); @@ -197,7 +197,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg("Normalize"), K3bJob::ERROR ); + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Normalize"), K3bJob::ERROR ); jobFinished( false ); } } diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h index e56086b..b623a41 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.h +++ b/libk3b/projects/audiocd/k3baudionormalizejob.h @@ -20,7 +20,7 @@ #include <k3bjob.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> class K3bProcess; class KProcess; @@ -29,25 +29,26 @@ class KProcess; class K3bAudioNormalizeJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioNormalizeJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bAudioNormalizeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioNormalizeJob(); public slots: void start(); void cancel(); - void setFilesToNormalize( const QValueVector<QString>& files ) { m_files = files; } + void setFilesToNormalize( const TQValueVector<TQString>& files ) { m_files = files; } private slots: - void slotStdLine( const QString& line ); + void slotStdLine( const TQString& line ); void slotProcessExited( KProcess* p ); private: K3bProcess* m_process; - QValueVector<QString> m_files; + TQValueVector<TQString> m_files; bool m_canceled; enum Action { diff --git a/libk3b/projects/audiocd/k3baudiotrack.cpp b/libk3b/projects/audiocd/k3baudiotrack.cpp index a1d12e4..53d1d34 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.cpp +++ b/libk3b/projects/audiocd/k3baudiotrack.cpp @@ -22,7 +22,7 @@ #include <k3bcore.h> #include <k3bcdtextvalidator.h> -#include <qstring.h> +#include <tqstring.h> #include <kdebug.h> @@ -59,8 +59,8 @@ K3bAudioTrack::K3bAudioTrack() } -K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* parent ) - : m_parent(parent), +K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* tqparent ) + : m_parent(tqparent), m_copy(false), m_preEmp(false), m_index0Offset(150), @@ -106,67 +106,67 @@ void K3bAudioTrack::emitChanged() } -void K3bAudioTrack::setArtist( const QString& a ) +void K3bAudioTrack::setArtist( const TQString& a ) { setPerformer( a ); } -void K3bAudioTrack::setPerformer( const QString& a ) +void K3bAudioTrack::setPerformer( const TQString& a ) { - QString s( a ); + TQString s( a ); d->cdTextValidator->fixup( s ); m_cdText.setPerformer(s); emitChanged(); } -void K3bAudioTrack::setTitle( const QString& t ) +void K3bAudioTrack::setTitle( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setTitle(s); emitChanged(); } -void K3bAudioTrack::setArranger( const QString& t ) +void K3bAudioTrack::setArranger( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setArranger(s); emitChanged(); } -void K3bAudioTrack::setSongwriter( const QString& t ) +void K3bAudioTrack::setSongwriter( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setSongwriter(s); emitChanged(); } -void K3bAudioTrack::setComposer( const QString& t ) +void K3bAudioTrack::setComposer( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setComposer(s); emitChanged(); } -void K3bAudioTrack::setIsrc( const QString& t ) +void K3bAudioTrack::setIsrc( const TQString& t ) { m_cdText.setIsrc(t); emitChanged(); } -void K3bAudioTrack::setCdTextMessage( const QString& t ) +void K3bAudioTrack::setCdTextMessage( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setMessage(s); emitChanged(); @@ -282,7 +282,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track ) kdDebug() << "(K3bAudioTrack::moveAfter( " << track << " )" << endl; if( !track ) { if( !doc() ) { - kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl; + kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl; return; } @@ -302,7 +302,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track ) // remove this from the list take(); - // set the new parent doc + // set the new tqparent doc m_parent = track->doc(); K3bAudioTrack* oldNext = track->m_next; @@ -330,7 +330,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track ) { if( !track ) { if( !doc() ) { - kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl; + kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl; return; } @@ -350,7 +350,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track ) // remove this from the list take(); - // set the new parent doc + // set the new tqparent doc m_parent = track->doc(); K3bAudioTrack* oldPrev = track->m_prev; @@ -568,7 +568,7 @@ K3bAudioTrack* K3bAudioTrack::split( const K3b::Msf& pos ) splitTrack->addSource( addSource ); } - kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with parent " << doc() << endl; + kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with tqparent " << doc() << endl; splitTrack->moveAfter( this ); return splitTrack; @@ -604,7 +604,7 @@ K3bDevice::Track K3bAudioTrack::toCdTrack() const if( doc()->lastTrack() != this ) cdTrack.setIndex0( index0() ); - // FIXME: convert to QCString + // FIXME: convert to TQCString // cdTrack.setIsrc( isrc() ); return cdTrack; diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h index ab0ee1b..0edef0a 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.h +++ b/libk3b/projects/audiocd/k3baudiotrack.h @@ -17,10 +17,10 @@ #ifndef K3BAUDIOTRACK_H #define K3BAUDIOTRACK_H -#include <qstring.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqptrlist.h> #include <kio/global.h> @@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bAudioTrack public: K3bAudioTrack(); - K3bAudioTrack( K3bAudioDoc* parent ); + K3bAudioTrack( K3bAudioDoc* tqparent ); ~K3bAudioTrack(); K3bAudioDoc* doc() const { return m_parent; } @@ -58,14 +58,14 @@ class LIBK3B_EXPORT K3bAudioTrack K3b::Msf length() const; KIO::filesize_t size() const; - const QString& artist() const { return m_cdText.performer(); } - const QString& performer() const { return m_cdText.performer(); } - const QString& title() const { return m_cdText.title(); } - const QString& arranger() const { return m_cdText.arranger(); } - const QString& songwriter() const { return m_cdText.songwriter(); } - const QString& composer() const { return m_cdText.composer(); } - const QString& isrc() const { return m_cdText.isrc(); } - const QString& cdTextMessage() const { return m_cdText.message(); } + const TQString& artist() const { return m_cdText.performer(); } + const TQString& performer() const { return m_cdText.performer(); } + const TQString& title() const { return m_cdText.title(); } + const TQString& arranger() const { return m_cdText.arranger(); } + const TQString& songwriter() const { return m_cdText.songwriter(); } + const TQString& composer() const { return m_cdText.composer(); } + const TQString& isrc() const { return m_cdText.isrc(); } + const TQString& cdTextMessage() const { return m_cdText.message(); } const K3bDevice::TrackCdText& cdText() const { return m_cdText; } bool copyProtection() const { return m_copy; } @@ -74,14 +74,14 @@ class LIBK3B_EXPORT K3bAudioTrack /** * @obsolete use setPerformer **/ - void setArtist( const QString& a ); - void setPerformer( const QString& a ); - void setTitle( const QString& t ); - void setArranger( const QString& t ); - void setSongwriter( const QString& t ); - void setComposer( const QString& t ); - void setIsrc( const QString& t ); - void setCdTextMessage( const QString& t ); + void setArtist( const TQString& a ); + void setPerformer( const TQString& a ); + void setTitle( const TQString& t ); + void setArranger( const TQString& t ); + void setSongwriter( const TQString& t ); + void setComposer( const TQString& t ); + void setIsrc( const TQString& t ); + void setCdTextMessage( const TQString& t ); void setCdText( const K3bDevice::TrackCdText& cdtext ); diff --git a/libk3b/projects/audiocd/k3baudiozerodata.cpp b/libk3b/projects/audiocd/k3baudiozerodata.cpp index f5c985d..aff0cf9 100644 --- a/libk3b/projects/audiocd/k3baudiozerodata.cpp +++ b/libk3b/projects/audiocd/k3baudiozerodata.cpp @@ -55,15 +55,15 @@ void K3bAudioZeroData::setLength( const K3b::Msf& msf ) } -QString K3bAudioZeroData::type() const +TQString K3bAudioZeroData::type() const { return i18n("Silence"); } -QString K3bAudioZeroData::sourceComment() const +TQString K3bAudioZeroData::sourceComment() const { - return QString::null; + return TQString(); } diff --git a/libk3b/projects/audiocd/k3baudiozerodata.h b/libk3b/projects/audiocd/k3baudiozerodata.h index 8cb2911..6475cd1 100644 --- a/libk3b/projects/audiocd/k3baudiozerodata.h +++ b/libk3b/projects/audiocd/k3baudiozerodata.h @@ -29,8 +29,8 @@ class LIBK3B_EXPORT K3bAudioZeroData : public K3bAudioDataSource K3b::Msf originalLength() const { return m_length; } void setLength( const K3b::Msf& msf ); - QString type() const; - QString sourceComment() const; + TQString type() const; + TQString sourceComment() const; bool seek( const K3b::Msf& ); int read( char* data, unsigned int max ); diff --git a/libk3b/projects/datacd/k3bbootitem.cpp b/libk3b/projects/datacd/k3bbootitem.cpp index e94830e..f5a8725 100644 --- a/libk3b/projects/datacd/k3bbootitem.cpp +++ b/libk3b/projects/datacd/k3bbootitem.cpp @@ -19,10 +19,10 @@ #include <klocale.h> -#include <qptrlist.h> +#include <tqptrlist.h> -K3bBootItem::K3bBootItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName ) +K3bBootItem::K3bBootItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName ) : K3bFileItem( fileName, doc, dir, k3bName, FILE|BOOT_IMAGE ), m_noBoot(false), m_bootInfoTable(false), diff --git a/libk3b/projects/datacd/k3bbootitem.h b/libk3b/projects/datacd/k3bbootitem.h index 9dd8704..78478ea 100644 --- a/libk3b/projects/datacd/k3bbootitem.h +++ b/libk3b/projects/datacd/k3bbootitem.h @@ -21,7 +21,7 @@ class K3bBootItem : public K3bFileItem { public: - K3bBootItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 ); + K3bBootItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 ); K3bBootItem( const K3bBootItem& ); ~K3bBootItem(); @@ -39,7 +39,7 @@ class K3bBootItem : public K3bFileItem void setLoadSize( int s ) { m_loadSize = s; } void setImageType( int t ) { m_imageType = t; } - void setTempPath( const QString& p ) { m_tempPath = p; } + void setTempPath( const TQString& p ) { m_tempPath = p; } bool noBoot() const { return m_noBoot; } bool bootInfoTable() const { return m_bootInfoTable; } @@ -51,7 +51,7 @@ class K3bBootItem : public K3bFileItem * mkisofs changes boot images on disk. That is why the iso imager * buffers them and saves the path to the buffered copy here. */ - const QString& tempPath() const { return m_tempPath; } + const TQString& tempPath() const { return m_tempPath; } private: bool m_noBoot; @@ -60,7 +60,7 @@ class K3bBootItem : public K3bFileItem int m_loadSize; int m_imageType; - QString m_tempPath; + TQString m_tempPath; }; #endif diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index d12c8d2..44b6214 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -34,14 +34,14 @@ #include <k3bmultichoicedialog.h> #include <k3bvalidators.h> -#include <qdir.h> -#include <qstring.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qdom.h> -#include <qptrlist.h> +#include <tqdir.h> +#include <tqstring.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqdom.h> +#include <tqptrlist.h> #include <kstandarddirs.h> #include <kurl.h> @@ -67,8 +67,8 @@ * \li or create your own K3bDirItems and K3bFileItems. The doc will be properly updated * by the constructors of the items. */ -K3bDataDoc::K3bDataDoc( QObject* parent ) - : K3bDoc( parent ) +K3bDataDoc::K3bDataDoc( TQObject* tqparent ) + : K3bDoc( tqparent ) { m_root = 0; @@ -92,8 +92,8 @@ bool K3bDataDoc::newDocument() m_bExistingItemsReplaceAll = m_bExistingItemsIgnoreAll = false; if( m_root ) { - while( m_root->children().getFirst() ) - removeItem( m_root->children().getFirst() ); + while( m_root->tqchildren().getFirst() ) + removeItem( m_root->tqchildren().getFirst() ); } else m_root = new K3bRootItem( this ); @@ -109,7 +109,7 @@ bool K3bDataDoc::newDocument() } -QString K3bDataDoc::name() const +TQString K3bDataDoc::name() const { return m_isoOptions.volumeID(); } @@ -122,7 +122,7 @@ void K3bDataDoc::setIsoOptions( const K3bIsoOptions& o ) } -void K3bDataDoc::setVolumeID( const QString& v ) +void K3bDataDoc::setVolumeID( const TQString& v ) { m_isoOptions.setVolumeID( v ); emit changed(); @@ -144,8 +144,8 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) { const KURL& url = *it; - QFileInfo f( url.path() ); - QString k3bname = f.absFilePath().section( "/", -1 ); + TQFileInfo f( url.path() ); + TQString k3bname = f.absFilePath().section( "/", -1 ); // filenames cannot end in backslashes (mkisofs problem. See comments in k3bisoimager.cpp (escapeGraftPoint())) while( k3bname[k3bname.length()-1] == '\\' ) @@ -162,10 +162,10 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) bool ok = false; while( !ok ) { ok = true; - QString name( k3bname ); + TQString name( k3bname ); if( cnt > 0 ) - name += QString("_%1").arg(cnt); - if( K3bDataItem* oldItem = dir->find( name ) ) { + name += TQString("_%1").tqarg(cnt); + if( K3bDataItem* oldItem = dir->tqfind( name ) ) { if( f.isDir() && oldItem->isDir() ) { // ok, just reuse the dir newDirItem = static_cast<K3bDirItem*>(oldItem); @@ -182,9 +182,9 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) } } if( cnt > 0 ) - k3bname += QString("_%1").arg(cnt); + k3bname += TQString("_%1").tqarg(cnt); - // QFileInfo::exists and QFileInfo::isReadable return false for broken symlinks :( + // TQFileInfo::exists and TQFileInfo::isReadable return false for broken symlinks :( if( f.isDir() && !f.isSymLink() ) { if( !newDirItem ) { newDirItem = new K3bDirItem( k3bname, this, dir ); @@ -192,11 +192,11 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) } // recursively add all the files in the directory - QStringList dlist = QDir( f.absFilePath() ).entryList( QDir::All|QDir::System|QDir::Hidden ); + TQStringList dlist = TQDir( f.absFilePath() ).entryList( TQDir::All|TQDir::System|TQDir::Hidden ); dlist.remove("."); dlist.remove(".."); KURL::List newUrls; - for( QStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) + for( TQStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) newUrls.append( KURL::fromPathOrURL( f.absFilePath() + "/" + *it ) ); addUrls( newUrls, newDirItem ); } @@ -210,18 +210,18 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) } -bool K3bDataDoc::nameAlreadyInDir( const QString& name, K3bDirItem* dir ) +bool K3bDataDoc::nameAlreadyInDir( const TQString& name, K3bDirItem* dir ) { if( !dir ) return false; else - return ( dir->find( name ) != 0 ); + return ( dir->tqfind( name ) != 0 ); } -K3bDirItem* K3bDataDoc::addEmptyDir( const QString& name, K3bDirItem* parent ) +K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* tqparent ) { - K3bDirItem* item = new K3bDirItem( name, this, parent ); + K3bDirItem* item = new K3bDirItem( name, this, tqparent ); setModified( true ); @@ -261,21 +261,21 @@ K3b::Msf K3bDataDoc::burningLength() const } -QString K3bDataDoc::typeString() const +TQString K3bDataDoc::typeString() const { - return QString::fromLatin1("data"); + return TQString::tqfromLatin1("data"); } -bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) +bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem ) { if( !root() ) newDocument(); - QDomNodeList nodes = rootElem->childNodes(); + TQDomNodeList nodes = rootElem->childNodes(); if( nodes.item(0).nodeName() != "general" ) { - kdDebug() << "(K3bDataDoc) could not find 'general' section." << endl; + kdDebug() << "(K3bDataDoc) could not tqfind 'general' section." << endl; return false; } if( !readGeneralDocumentData( nodes.item(0).toElement() ) ) @@ -285,7 +285,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) // parse options // ----------------------------------------------------------------- if( nodes.item(1).nodeName() != "options" ) { - kdDebug() << "(K3bDataDoc) could not find 'options' section." << endl; + kdDebug() << "(K3bDataDoc) could not tqfind 'options' section." << endl; return false; } if( !loadDocumentDataOptions( nodes.item(1).toElement() ) ) @@ -297,7 +297,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) // parse header // ----------------------------------------------------------------- if( nodes.item(2).nodeName() != "header" ) { - kdDebug() << "(K3bDataDoc) could not find 'header' section." << endl; + kdDebug() << "(K3bDataDoc) could not tqfind 'header' section." << endl; return false; } if( !loadDocumentDataHeader( nodes.item(2).toElement() ) ) @@ -309,17 +309,17 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) // parse files // ----------------------------------------------------------------- if( nodes.item(3).nodeName() != "files" ) { - kdDebug() << "(K3bDataDoc) could not find 'files' section." << endl; + kdDebug() << "(K3bDataDoc) could not tqfind 'files' section." << endl; return false; } if( m_root == 0 ) m_root = new K3bRootItem( this ); - QDomNodeList filesList = nodes.item(3).childNodes(); + TQDomNodeList filesList = nodes.item(3).childNodes(); for( uint i = 0; i < filesList.count(); i++ ) { - QDomElement e = filesList.item(i).toElement(); + TQDomElement e = filesList.item(i).toElement(); if( !loadDataItem( e, root() ) ) return false; } @@ -332,7 +332,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) // file we create a default one here. // if( !m_bootImages.isEmpty() && !m_bootCataloge ) - createBootCatalogeItem( m_bootImages.first()->parent() ); + createBootCatalogeItem( m_bootImages.first()->tqparent() ); informAboutNotFoundFiles(); @@ -341,12 +341,12 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) } -bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem ) +bool K3bDataDoc::loadDocumentDataOptions( TQDomElement elem ) { - QDomNodeList headerList = elem.childNodes(); + TQDomNodeList headerList = elem.childNodes(); for( uint i = 0; i < headerList.count(); i++ ) { - QDomElement e = headerList.item(i).toElement(); + TQDomElement e = headerList.item(i).toElement(); if( e.isNull() ) return false; @@ -428,7 +428,7 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem ) else if( e.text() == "extended" ) m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::extended ); else if( e.text() == "extended" ) - m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::replace ); + m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::tqreplace ); else m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::noChange ); } @@ -446,7 +446,7 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem ) } else if( e.nodeName() == "multisession" ) { - QString mode = e.text(); + TQString mode = e.text(); if( mode == "start" ) setMultiSessionMode( START ); else if( mode == "continue" ) @@ -470,12 +470,12 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem ) } -bool K3bDataDoc::loadDocumentDataHeader( QDomElement headerElem ) +bool K3bDataDoc::loadDocumentDataHeader( TQDomElement headerElem ) { - QDomNodeList headerList = headerElem.childNodes(); + TQDomNodeList headerList = headerElem.childNodes(); for( uint i = 0; i < headerList.count(); i++ ) { - QDomElement e = headerList.item(i).toElement(); + TQDomElement e = headerList.item(i).toElement(); if( e.isNull() ) return false; @@ -511,31 +511,31 @@ bool K3bDataDoc::loadDocumentDataHeader( QDomElement headerElem ) } -bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent ) +bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) { K3bDataItem* newItem = 0; if( elem.nodeName() == "file" ) { - QDomElement urlElem = elem.firstChild().toElement(); + TQDomElement urlElem = elem.firstChild().toElement(); if( urlElem.isNull() ) { kdDebug() << "(K3bDataDoc) file-element without url!" << endl; return false; } - QFileInfo f( urlElem.text() ); + TQFileInfo f( urlElem.text() ); // We canot use exists() here since this always disqualifies broken symlinks if( !f.isFile() && !f.isSymLink() ) m_notFoundFiles.append( urlElem.text() ); - // broken symlinks are not readable according to QFileInfo which is wrong in our case + // broken symlinks are not readable according to TQFileInfo which is wrong in our case else if( f.isFile() && !f.isReadable() ) m_noPermissionFiles.append( urlElem.text() ); else if( !elem.attribute( "bootimage" ).isEmpty() ) { K3bBootItem* bootItem = new K3bBootItem( urlElem.text(), this, - parent, + tqparent, elem.attributeNode( "name" ).value() ); if( elem.attribute( "bootimage" ) == "floppy" ) bootItem->setImageType( K3bBootItem::FLOPPY ); @@ -554,18 +554,18 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent ) else { newItem = new K3bFileItem( urlElem.text(), this, - parent, + tqparent, elem.attributeNode( "name" ).value() ); } } else if( elem.nodeName() == "special" ) { if( elem.attributeNode( "type" ).value() == "boot cataloge" ) - createBootCatalogeItem( parent )->setK3bName( elem.attributeNode( "name" ).value() ); + createBootCatalogeItem( tqparent )->setK3bName( elem.attributeNode( "name" ).value() ); } else if( elem.nodeName() == "directory" ) { // This is for the VideoDVD project which already contains the *_TS folders K3bDirItem* newDirItem = 0; - if( K3bDataItem* item = parent->find( elem.attributeNode( "name" ).value() ) ) { + if( K3bDataItem* item = tqparent->tqfind( elem.attributeNode( "name" ).value() ) ) { if( item->isDir() ) { newDirItem = static_cast<K3bDirItem*>(item); } @@ -576,11 +576,11 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent ) } if( !newDirItem ) - newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, parent ); - QDomNodeList childNodes = elem.childNodes(); + newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, tqparent ); + TQDomNodeList childNodes = elem.childNodes(); for( uint i = 0; i < childNodes.count(); i++ ) { - QDomElement e = childNodes.item(i).toElement(); + TQDomElement e = childNodes.item(i).toElement(); if( !loadDataItem( e, newDirItem ) ) return false; } @@ -600,31 +600,31 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent ) } -bool K3bDataDoc::saveDocumentData( QDomElement* docElem ) +bool K3bDataDoc::saveDocumentData( TQDomElement* docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); // all options // ---------------------------------------------------------------------- - QDomElement optionsElem = doc.createElement( "options" ); + TQDomElement optionsElem = doc.createElement( "options" ); saveDocumentDataOptions( optionsElem ); docElem->appendChild( optionsElem ); // ---------------------------------------------------------------------- // the header stuff // ---------------------------------------------------------------------- - QDomElement headerElem = doc.createElement( "header" ); + TQDomElement headerElem = doc.createElement( "header" ); saveDocumentDataHeader( headerElem ); docElem->appendChild( headerElem ); // now do the "real" work: save the entries // ---------------------------------------------------------------------- - QDomElement topElem = doc.createElement( "files" ); + TQDomElement topElem = doc.createElement( "files" ); - QPtrListIterator<K3bDataItem> it( root()->children() ); + TQPtrListIterator<K3bDataItem> it( root()->tqchildren() ); for( ; it.current(); ++it ) { saveDataItem( it.current(), &doc, &topElem ); } @@ -636,11 +636,11 @@ bool K3bDataDoc::saveDocumentData( QDomElement* docElem ) } -void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem ) +void K3bDataDoc::saveDocumentDataOptions( TQDomElement& optionsElem ) { - QDomDocument doc = optionsElem.ownerDocument(); + TQDomDocument doc = optionsElem.ownerDocument(); - QDomElement topElem = doc.createElement( "rock_ridge" ); + TQDomElement topElem = doc.createElement( "rock_ridge" ); topElem.setAttribute( "activated", isoOptions().createRockRidge() ? "yes" : "no" ); optionsElem.appendChild( topElem ); @@ -709,7 +709,7 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem ) optionsElem.appendChild( topElem ); topElem = doc.createElement( "iso_level" ); - topElem.appendChild( doc.createTextNode( QString::number(isoOptions().ISOLevel()) ) ); + topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().ISOLevel()) ) ); optionsElem.appendChild( topElem ); topElem = doc.createElement( "discard_symlinks" ); @@ -745,8 +745,8 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem ) case K3bIsoOptions::extended: topElem.appendChild( doc.createTextNode( "extended" ) ); break; - case K3bIsoOptions::replace: - topElem.appendChild( doc.createTextNode( "replace" ) ); + case K3bIsoOptions::tqreplace: + topElem.appendChild( doc.createTextNode( "tqreplace" ) ); break; default: topElem.appendChild( doc.createTextNode( "noChange" ) ); @@ -796,11 +796,11 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem ) } -void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem ) +void K3bDataDoc::saveDocumentDataHeader( TQDomElement& headerElem ) { - QDomDocument doc = headerElem.ownerDocument(); + TQDomDocument doc = headerElem.ownerDocument(); - QDomElement topElem = doc.createElement( "volume_id" ); + TQDomElement topElem = doc.createElement( "volume_id" ); topElem.appendChild( doc.createTextNode( isoOptions().volumeID() ) ); headerElem.appendChild( topElem ); @@ -809,11 +809,11 @@ void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem ) headerElem.appendChild( topElem ); topElem = doc.createElement( "volume_set_size" ); - topElem.appendChild( doc.createTextNode( QString::number(isoOptions().volumeSetSize()) ) ); + topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().volumeSetSize()) ) ); headerElem.appendChild( topElem ); topElem = doc.createElement( "volume_set_number" ); - topElem.appendChild( doc.createTextNode( QString::number(isoOptions().volumeSetNumber()) ) ); + topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().volumeSetNumber()) ) ); headerElem.appendChild( topElem ); topElem = doc.createElement( "system_id" ); @@ -835,23 +835,23 @@ void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem ) } -void K3bDataDoc::saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement* parent ) +void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ) { if( K3bFileItem* fileItem = dynamic_cast<K3bFileItem*>( item ) ) { - if( m_oldSession.contains( fileItem ) ) { + if( m_oldSession.tqcontains( fileItem ) ) { kdDebug() << "(K3bDataDoc) ignoring fileitem " << fileItem->k3bName() << " from old session while saving..." << endl; } else { - QDomElement topElem = doc->createElement( "file" ); + TQDomElement topElem = doc->createElement( "file" ); topElem.setAttribute( "name", fileItem->k3bName() ); - QDomElement subElem = doc->createElement( "url" ); + TQDomElement subElem = doc->createElement( "url" ); subElem.appendChild( doc->createTextNode( fileItem->localPath() ) ); topElem.appendChild( subElem ); if( item->sortWeight() != 0 ) - topElem.setAttribute( "sort_weight", QString::number(item->sortWeight()) ); + topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) ); - parent->appendChild( topElem ); + tqparent->appendChild( topElem ); // add boot options as attributes to preserve compatibility to older K3b versions if( K3bBootItem* bootItem = dynamic_cast<K3bBootItem*>( fileItem ) ) { @@ -864,31 +864,31 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement topElem.setAttribute( "no_boot", bootItem->noBoot() ? "yes" : "no" ); topElem.setAttribute( "boot_info_table", bootItem->bootInfoTable() ? "yes" : "no" ); - topElem.setAttribute( "load_segment", QString::number( bootItem->loadSegment() ) ); - topElem.setAttribute( "load_size", QString::number( bootItem->loadSize() ) ); + topElem.setAttribute( "load_segment", TQString::number( bootItem->loadSegment() ) ); + topElem.setAttribute( "load_size", TQString::number( bootItem->loadSize() ) ); } } } else if( item == m_bootCataloge ) { - QDomElement topElem = doc->createElement( "special" ); + TQDomElement topElem = doc->createElement( "special" ); topElem.setAttribute( "name", m_bootCataloge->k3bName() ); topElem.setAttribute( "type", "boot cataloge" ); - parent->appendChild( topElem ); + tqparent->appendChild( topElem ); } else if( K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( item ) ) { - QDomElement topElem = doc->createElement( "directory" ); + TQDomElement topElem = doc->createElement( "directory" ); topElem.setAttribute( "name", dirItem->k3bName() ); if( item->sortWeight() != 0 ) - topElem.setAttribute( "sort_weight", QString::number(item->sortWeight()) ); + topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) ); - QPtrListIterator<K3bDataItem> it( dirItem->children() ); + TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); for( ; it.current(); ++it ) { saveDataItem( it.current(), doc, &topElem ); } - parent->appendChild( topElem ); + tqparent->appendChild( topElem ); } } @@ -944,7 +944,7 @@ void K3bDataDoc::itemAddedToDir( K3bDirItem*, K3bDataItem* item ) void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent ) { if( !item || !newParent ) { - kdDebug() << "(K3bDataDoc) item or parentitem was NULL while moving." << endl; + kdDebug() << "(K3bDataDoc) item or tqparentitem was NULL while moving." << endl; return; } @@ -957,14 +957,14 @@ void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent ) } -void K3bDataDoc::moveItems( QPtrList<K3bDataItem> itemList, K3bDirItem* newParent ) +void K3bDataDoc::moveItems( TQPtrList<K3bDataItem> itemList, K3bDirItem* newParent ) { if( !newParent ) { kdDebug() << "(K3bDataDoc) tried to move items to nowhere...!" << endl; return; } - QPtrListIterator<K3bDataItem> it( itemList ); + TQPtrListIterator<K3bDataItem> it( itemList ); for( ; it.current(); ++it ) { // check if newParent is subdir of item if( K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( it.current() ) ) { @@ -979,13 +979,13 @@ void K3bDataDoc::moveItems( QPtrList<K3bDataItem> itemList, K3bDirItem* newParen } -K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bDataJob( this, hdl, parent ); + return new K3bDataJob( this, hdl, tqparent ); } -QString K3bDataDoc::treatWhitespace( const QString& path ) +TQString K3bDataDoc::treatWhitespace( const TQString& path ) { // TODO: @@ -996,10 +996,10 @@ QString K3bDataDoc::treatWhitespace( const QString& path ) if( isoOptions().whiteSpaceTreatment() != K3bIsoOptions::noChange ) { - QString result = path; + TQString result = path; - if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::replace ) { - result.replace( ' ', isoOptions().whiteSpaceTreatmentReplaceString() ); + if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::tqreplace ) { + result.tqreplace( ' ', isoOptions().whiteSpaceTreatmentReplaceString() ); } else if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::strip ) { result.remove( ' ' ); @@ -1064,8 +1064,8 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) if( !dir ) return; - QPtrList<K3bDataItem> sortedChildren; - QPtrListIterator<K3bDataItem> it( dir->children() ); + TQPtrList<K3bDataItem> sortedChildren; + TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); for( it.toLast(); it.current(); --it ) { K3bDataItem* item = it.current(); @@ -1083,7 +1083,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) if( isoOptions().createJoliet() || isoOptions().createRockRidge() ) { - QPtrList<K3bDataItem> sameNameList; + TQPtrList<K3bDataItem> sameNameList; while( !sortedChildren.isEmpty() ) { sameNameList.clear(); @@ -1105,7 +1105,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) } int cnt = 1; - for( QPtrListIterator<K3bDataItem> it( sameNameList ); + for( TQPtrListIterator<K3bDataItem> it( sameNameList ); it.current(); ++it ) { it.current()->setWrittenName( K3b::appendNumberToFilename( it.current()->writtenName(), cnt++, maxlen ) ); } @@ -1118,13 +1118,13 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) void K3bDataDoc::informAboutNotFoundFiles() { if( !m_notFoundFiles.isEmpty() ) { - KMessageBox::informationList( qApp->activeWindow(), i18n("Could not find the following files:"), + KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("Could not find the following files:"), m_notFoundFiles, i18n("Not Found") ); m_notFoundFiles.clear(); } if( !m_noPermissionFiles.isEmpty() ) { - KMessageBox::informationList( qApp->activeWindow(), i18n("No permission to read the following files:"), + KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("No permission to read the following files:"), m_noPermissionFiles, i18n("No Read Permission") ); m_noPermissionFiles.clear(); @@ -1188,7 +1188,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device ) // TODO: also import some other pd fields const K3bIso9660Directory* rootDir = iso.firstRRDirEntry(); - // Jörg Schilling says that it is impossible to import the joliet tree for multisession + // J�rg Schilling says that it is impossible to import the joliet tree for multisession // if( !rootDir ) // rootDir = iso.firstJolietDirEntry(); if( !rootDir ) @@ -1211,16 +1211,16 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device ) } -void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* parent ) +void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* tqparent ) { Q_ASSERT(importDir); - QStringList entries = importDir->entries(); + TQStringList entries = importDir->entries(); entries.remove( "." ); entries.remove( ".." ); - for( QStringList::const_iterator it = entries.begin(); + for( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { const K3bIso9660Entry* entry = importDir->entry( *it ); - K3bDataItem* oldItem = parent->find( entry->name() ); + K3bDataItem* oldItem = tqparent->tqfind( entry->name() ); if( entry->isDirectory() ) { K3bDirItem* dir = 0; if( oldItem && oldItem->isDir() ) { @@ -1230,7 +1230,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, // we overwrite without warning! if( oldItem ) removeItem( oldItem ); - dir = new K3bDirItem( entry->name(), this, parent ); + dir = new K3bDirItem( entry->name(), this, tqparent ); } dir->setRemoveable(false); @@ -1250,7 +1250,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, if( oldItem ) removeItem( oldItem ); - K3bSessionImportItem* item = new K3bSessionImportItem( file, this, parent ); + K3bSessionImportItem* item = new K3bSessionImportItem( file, this, tqparent ); item->setExtraInfo( i18n("From previous session") ); m_oldSession.append( item ); } @@ -1277,8 +1277,8 @@ void K3bDataDoc::clearImportedSession() delete dir; } else { - for( QPtrListIterator<K3bDataItem> it( dir->children() ); it.current(); ++it ) { - if( !m_oldSession.contains(it.current()) ) { + for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); it.current(); ++it ) { + if( !m_oldSession.tqcontains(it.current()) ) { m_oldSession.remove(); // now the dir becomes a totally normal dir dir->setRemoveable(true); @@ -1308,7 +1308,7 @@ void K3bDataDoc::clearImportedSession() K3bDirItem* K3bDataDoc::bootImageDir() { - K3bDataItem* b = m_root->find( "boot" ); + K3bDataItem* b = m_root->tqfind( "boot" ); if( !b ) { b = new K3bDirItem( "boot", this, m_root ); setModified( true ); @@ -1322,7 +1322,7 @@ K3bDirItem* K3bDataDoc::bootImageDir() } -K3bBootItem* K3bDataDoc::createBootItem( const QString& filename, K3bDirItem* dir ) +K3bBootItem* K3bDataDoc::createBootItem( const TQString& filename, K3bDirItem* dir ) { if( !dir ) dir = bootImageDir(); @@ -1339,11 +1339,11 @@ K3bBootItem* K3bDataDoc::createBootItem( const QString& filename, K3bDirItem* di K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir ) { if( !m_bootCataloge ) { - QString newName = "boot.catalog"; + TQString newName = "boot.catalog"; int i = 0; while( dir->alreadyInDirectory( "boot.catalog" ) ) { ++i; - newName = QString( "boot%1.catalog" ).arg(i); + newName = TQString( "boot%1.catalog" ).tqarg(i); } K3bSpecialDataItem* b = new K3bSpecialDataItem( this, 0, dir, newName ); @@ -1361,10 +1361,10 @@ K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir ) } -QValueList<K3bDataItem*> K3bDataDoc::findItemByLocalPath( const QString& path ) const +TQValueList<K3bDataItem*> K3bDataDoc::findItemByLocalPath( const TQString& path ) const { Q_UNUSED( path ); - return QValueList<K3bDataItem*>(); + return TQValueList<K3bDataItem*>(); } diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h index e09177a..eccbde9 100644 --- a/libk3b/projects/datacd/k3bdatadoc.h +++ b/libk3b/projects/datacd/k3bdatadoc.h @@ -22,9 +22,9 @@ #include "k3bisooptions.h" -#include <qptrlist.h> -#include <qfileinfo.h> -#include <qstringlist.h> +#include <tqptrlist.h> +#include <tqfileinfo.h> +#include <tqstringlist.h> #include <kurl.h> #include <kio/global.h> @@ -41,11 +41,11 @@ class K3bFileCompilationSizeHandler; class KProgressDialog; //class K3bView; class KConfig; -class QString; -class QStringList; -class QWidget; -class QDomDocument; -class QDomElement; +class TQString; +class TQStringList; +class TQWidget; +class TQDomDocument; +class TQDomElement; class K3bIso9660Directory; namespace K3bDevice { @@ -61,15 +61,16 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDataDoc : public K3bDoc { Q_OBJECT + TQ_OBJECT public: - K3bDataDoc( QObject* parent = 0 ); + K3bDataDoc( TQObject* tqparent = 0 ); virtual ~K3bDataDoc(); virtual int type() const { return DATA; } - virtual QString typeString() const; + virtual TQString typeString() const; - virtual QString name() const; + virtual TQString name() const; enum MultiSessionMode { /** @@ -108,13 +109,13 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc * Simply calls reparent. */ void moveItem( K3bDataItem* item, K3bDirItem* newParent ); - void moveItems( QPtrList<K3bDataItem> itemList, K3bDirItem* newParent ); + void moveItems( TQPtrList<K3bDataItem> itemList, K3bDirItem* newParent ); - K3bDirItem* addEmptyDir( const QString& name, K3bDirItem* parent ); + K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* tqparent ); - QString treatWhitespace( const QString& ); + TQString treatWhitespace( const TQString& ); - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent = 0 ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); MultiSessionMode multiSessionMode() const { return m_multisessionMode; } void setMultiSessionMode( MultiSessionMode mode ); @@ -125,7 +126,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc void setVerifyData( bool b ) { m_verifyData = b; } bool verifyData() const { return m_verifyData; } - static bool nameAlreadyInDir( const QString&, K3bDirItem* ); + static bool nameAlreadyInDir( const TQString&, K3bDirItem* ); /** * Most of the options that map to the mkisofs parameters are grouped @@ -135,7 +136,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc const K3bIsoOptions& isoOptions() const { return m_isoOptions; } void setIsoOptions( const K3bIsoOptions& ); - const QPtrList<K3bBootItem>& bootImages() { return m_bootImages; } + const TQPtrList<K3bBootItem>& bootImages() { return m_bootImages; } K3bDataItem* bootCataloge() { return m_bootCataloge; } K3bDirItem* bootImageDir(); @@ -150,7 +151,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc * \return The new boot item on success or 0 in case a file with the same * name already exists. */ - K3bBootItem* createBootItem( const QString& filename, K3bDirItem* bootDir = 0 ); + K3bBootItem* createBootItem( const TQString& filename, K3bDirItem* bootDir = 0 ); /** * Create a new boot catalog item. @@ -178,7 +179,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc */ bool needToCutFilenames() const { return m_needToCutFilenames; } - const QValueList<K3bDataItem*>& needToCutFilenameItems() const { return m_needToCutFilenameItems; } + const TQValueList<K3bDataItem*>& needToCutFilenameItems() const { return m_needToCutFilenameItems; } /** * Imports a session into the project. This will create K3bSessionImportItems @@ -203,7 +204,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc * * \return The items that correspond to the specified local path. */ - QValueList<K3bDataItem*> findItemByLocalPath( const QString& path ) const; + TQValueList<K3bDataItem*> findItemByLocalPath( const TQString& path ) const; public slots: virtual void addUrls( const KURL::List& urls ); @@ -221,7 +222,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc * Just a convience method to prevent using setIsoOptions for this * often used value. */ - void setVolumeID( const QString& ); + void setVolumeID( const TQString& ); signals: void itemRemoved( K3bDataItem* ); @@ -229,14 +230,14 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc protected: /** reimplemented from K3bDoc */ - virtual bool loadDocumentData( QDomElement* root ); + virtual bool loadDocumentData( TQDomElement* root ); /** reimplemented from K3bDoc */ - virtual bool saveDocumentData( QDomElement* ); + virtual bool saveDocumentData( TQDomElement* ); - void saveDocumentDataOptions( QDomElement& optionsElem ); - void saveDocumentDataHeader( QDomElement& headerElem ); - bool loadDocumentDataOptions( QDomElement optionsElem ); - bool loadDocumentDataHeader( QDomElement optionsElem ); + void saveDocumentDataOptions( TQDomElement& optionsElem ); + void saveDocumentDataHeader( TQDomElement& headerElem ); + bool loadDocumentDataOptions( TQDomElement optionsElem ); + bool loadDocumentDataHeader( TQDomElement optionsElem ); K3bFileCompilationSizeHandler* m_sizeHandler; @@ -245,27 +246,27 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc private: void prepareFilenamesInDir( K3bDirItem* dir ); - void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* parent ); + void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* tqparent ); /** * used by K3bDirItem to inform about removed items. */ - void itemRemovedFromDir( K3bDirItem* parent, K3bDataItem* removedItem ); - void itemAddedToDir( K3bDirItem* parent, K3bDataItem* addedItem ); + void itemRemovedFromDir( K3bDirItem* tqparent, K3bDataItem* removedItem ); + void itemAddedToDir( K3bDirItem* tqparent, K3bDataItem* addedItem ); /** * load recursivly */ - bool loadDataItem( QDomElement& e, K3bDirItem* parent ); + bool loadDataItem( TQDomElement& e, K3bDirItem* tqparent ); /** * save recursivly */ - void saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement* parent ); + void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ); void informAboutNotFoundFiles(); - QStringList m_notFoundFiles; - QStringList m_noPermissionFiles; + TQStringList m_notFoundFiles; + TQStringList m_noPermissionFiles; K3bRootItem* m_root; @@ -278,17 +279,17 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc K3bIsoOptions m_isoOptions; MultiSessionMode m_multisessionMode; - QPtrList<K3bDataItem> m_oldSession; + TQPtrList<K3bDataItem> m_oldSession; // boot cd stuff K3bDataItem* m_bootCataloge; - QPtrList<K3bBootItem> m_bootImages; + TQPtrList<K3bBootItem> m_bootImages; bool m_bExistingItemsReplaceAll; bool m_bExistingItemsIgnoreAll; bool m_needToCutFilenames; - QValueList<K3bDataItem*> m_needToCutFilenameItems; + TQValueList<K3bDataItem*> m_needToCutFilenameItems; friend class K3bMixedDoc; friend class K3bDirItem; diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp index 6f2a861..ff6aa61 100644 --- a/libk3b/projects/datacd/k3bdataitem.cpp +++ b/libk3b/projects/datacd/k3bdataitem.cpp @@ -29,7 +29,7 @@ public: }; -K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags ) +K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags ) : m_bHideOnRockRidge(false), m_bHideOnJoliet(false), m_bRemoveable(true), @@ -45,8 +45,8 @@ K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags ) m_doc = doc; m_bHideOnRockRidge = m_bHideOnJoliet = false; - if( parent ) - m_parentDir = parent->getDirItem(); + if( tqparent ) + m_parentDir = tqparent->getDirItem(); else m_parentDir = 0; } @@ -113,16 +113,16 @@ K3b::Msf K3bDataItem::itemBlocks( bool followSymbolicLinks ) const } -void K3bDataItem::setK3bName( const QString& name ) { +void K3bDataItem::setK3bName( const TQString& name ) { if ( name != m_k3bName ) { // test for not-allowed characters - if( name.contains('/') ) { + if( name.tqcontains('/') ) { kdDebug() << "(K3bDataItem) name contained invalid characters!" << endl; return; } - if( parent() ) { - K3bDataItem* item = parent()->find( name ); + if( tqparent() ) { + K3bDataItem* item = tqparent()->tqfind( name ); if( item && item != this ) { kdDebug() << "(K3bDataItem) item with that name already exists." << endl; return; @@ -135,7 +135,7 @@ void K3bDataItem::setK3bName( const QString& name ) { } -const QString& K3bDataItem::k3bName() const +const TQString& K3bDataItem::k3bName() const { return m_k3bName; } @@ -143,17 +143,17 @@ const QString& K3bDataItem::k3bName() const K3bDataItem* K3bDataItem::take() { - if( parent() ) - parent()->takeDataItem( this ); + if( tqparent() ) + tqparent()->takeDataItem( this ); return this; } -QString K3bDataItem::k3bPath() const +TQString K3bDataItem::k3bPath() const { if( !getParent() ) - return QString::null; // the root item is the only one not having a parent + return TQString(); // the root item is the only one not having a tqparent else if( isDir() ) return getParent()->k3bPath() + k3bName() + "/"; else @@ -161,10 +161,10 @@ QString K3bDataItem::k3bPath() const } -QString K3bDataItem::writtenPath() const +TQString K3bDataItem::writtenPath() const { if( !getParent() ) - return QString::null; // the root item is the only one not having a parent + return TQString(); // the root item is the only one not having a tqparent else if( isDir() ) return getParent()->writtenPath() + writtenName() + "/"; else @@ -172,10 +172,10 @@ QString K3bDataItem::writtenPath() const } -QString K3bDataItem::iso9660Path() const +TQString K3bDataItem::iso9660Path() const { if( !getParent() ) - return QString::null; // the root item is the only one not having a parent + return TQString(); // the root item is the only one not having a tqparent else if( isDir() ) return getParent()->iso9660Path() + iso9660Name() + "/"; else @@ -186,14 +186,14 @@ QString K3bDataItem::iso9660Path() const K3bDataItem* K3bDataItem::nextSibling() const { K3bDataItem* item = const_cast<K3bDataItem*>(this); // urg, but we know that we don't mess with it, so... - K3bDirItem* parentItem = getParent(); + K3bDirItem* tqparentItem = getParent(); - while( parentItem ) { - if( K3bDataItem* i = parentItem->nextChild( item ) ) + while( tqparentItem ) { + if( K3bDataItem* i = tqparentItem->nextChild( item ) ) return i; - item = parentItem; - parentItem = item->getParent(); + item = tqparentItem; + tqparentItem = item->getParent(); } return 0; @@ -232,7 +232,7 @@ bool K3bDataItem::hideOnJoliet() const void K3bDataItem::setHideOnRockRidge( bool b ) { // there is no use in changing the value if - // it is already set by the parent + // it is already set by the tqparent if( ( !getParent() || !getParent()->hideOnRockRidge() ) && b != m_bHideOnRockRidge ) { m_bHideOnRockRidge = b; @@ -245,7 +245,7 @@ void K3bDataItem::setHideOnRockRidge( bool b ) void K3bDataItem::setHideOnJoliet( bool b ) { // there is no use in changing the value if - // it is already set by the parent + // it is already set by the tqparent if( ( !getParent() || !getParent()->hideOnJoliet() ) && b != m_bHideOnJoliet ) { m_bHideOnJoliet = b; diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h index 36cdf05..db7452b 100644 --- a/libk3b/projects/datacd/k3bdataitem.h +++ b/libk3b/projects/datacd/k3bdataitem.h @@ -21,7 +21,7 @@ class K3bDirItem; class K3bDataDoc; -#include <qstring.h> +#include <tqstring.h> #include <kio/global.h> @@ -35,12 +35,12 @@ class K3bDataDoc; class LIBK3B_EXPORT K3bDataItem { public: - K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent = 0, int flags = 0 ); + K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent = 0, int flags = 0 ); /** * Default copy constructor. * - * The result is an exact copy except that no parent dir it set and, thus, also no doc. + * The result is an exact copy except that no tqparent dir it set and, thus, also no doc. */ K3bDataItem( const K3bDataItem& ); @@ -49,44 +49,44 @@ class LIBK3B_EXPORT K3bDataItem /** * Return an exact copy of this data item. * - * The result is an exact copy except that no parent dir it set and, thus, also no doc. + * The result is an exact copy except that no tqparent dir it set and, thus, also no doc. * * Implementations should use the default constructor. */ virtual K3bDataItem* copy() const = 0; - K3bDirItem* parent() { return m_parentDir; } + K3bDirItem* tqparent() { return m_parentDir; } K3bDirItem* getParent() const { return m_parentDir; } /** - * Remove this item from it's parent and return a pointer to it. + * Remove this item from it's tqparent and return a pointer to it. */ K3bDataItem* take(); K3bDataDoc* doc() const { return m_doc; } - virtual const QString& k3bName() const; - virtual void setK3bName( const QString& ); + virtual const TQString& k3bName() const; + virtual void setK3bName( const TQString& ); /** * returns the path as defined by the k3b-hierachy, NOT starting with a slash * (since this is used for graft-points!) * directories have a trailing "/" */ - virtual QString k3bPath() const; + virtual TQString k3bPath() const; /** * Returns the name of the item as used on the CD or DVD image. * * This is only valid after a call to @p K3bDataDoc::prepareFilenames() */ - const QString& writtenName() const { return m_writtenName; } + const TQString& writtenName() const { return m_writtenName; } /** * \return the pure name used in the Iso9660 tree. * * This is only valid after a call to @p K3bDataDoc::prepareFilenames() */ - const QString& iso9660Name() const { return m_rawIsoName; } + const TQString& iso9660Name() const { return m_rawIsoName; } /** * Returns the path of the item as written to the CD or DVD image. @@ -95,24 +95,24 @@ class LIBK3B_EXPORT K3bDataItem * * This is only valid after a call to @p K3bDataDoc::prepareFilenames() */ - virtual QString writtenPath() const; + virtual TQString writtenPath() const; - virtual QString iso9660Path() const; + virtual TQString iso9660Path() const; /** * Used to set the written name by @p K3bDataDoc::prepareFilenames() */ - void setWrittenName( const QString& s ) { m_writtenName = s; } + void setWrittenName( const TQString& s ) { m_writtenName = s; } /** * Used to set the pure Iso9660 name by @p K3bDataDoc::prepareFilenames() */ - void setIso9660Name( const QString& s ) { m_rawIsoName = s; } + void setIso9660Name( const TQString& s ) { m_rawIsoName = s; } virtual K3bDataItem* nextSibling() const; /** returns the path to the file on the local filesystem */ - virtual QString localPath() const { return QString::null; } + virtual TQString localPath() const { return TQString(); } /** * The size of the item @@ -133,7 +133,7 @@ class LIBK3B_EXPORT K3bDataItem virtual void reparent( K3bDirItem* ); // FIXME: use all these flags and make the isXXX methods - // non-virtual. Then move the parent()->addDataItem call + // non-virtual. Then move the tqparent()->addDataItem call // to the K3bDataItem constructor enum ItemFlags { DIR = 0x1, @@ -173,14 +173,14 @@ class LIBK3B_EXPORT K3bDataItem virtual bool isRenameable() const { return m_bRenameable; } virtual bool isHideable() const { return m_bHideable; } virtual bool writeToCd() const { return m_bWriteToCd; } - virtual const QString& extraInfo() const { return m_extraInfo; } + virtual const TQString& extraInfo() const { return m_extraInfo; } void setRenameable( bool b ) { m_bRenameable = b; } void setMoveable( bool b ) { m_bMovable = b; } void setRemoveable( bool b ) { m_bRemoveable = b; } void setHideable( bool b ) { m_bHideable = b; } void setWriteToCd( bool b ) { m_bWriteToCd = b; } - void setExtraInfo( const QString& i ) { m_extraInfo = i; } + void setExtraInfo( const TQString& i ) { m_extraInfo = i; } protected: virtual KIO::filesize_t itemSize( bool followSymlinks ) const = 0; @@ -194,7 +194,7 @@ class LIBK3B_EXPORT K3bDataItem */ virtual K3b::Msf itemBlocks( bool followSymlinks ) const; - QString m_k3bName; + TQString m_k3bName; void setFlags( int flags ); @@ -202,8 +202,8 @@ class LIBK3B_EXPORT K3bDataItem class Private; Private* d; - QString m_writtenName; - QString m_rawIsoName; + TQString m_writtenName; + TQString m_rawIsoName; K3bDataDoc* m_doc; K3bDirItem* m_parentDir; @@ -215,7 +215,7 @@ class LIBK3B_EXPORT K3bDataItem bool m_bMovable; bool m_bHideable; bool m_bWriteToCd; - QString m_extraInfo; + TQString m_extraInfo; long m_sortWeight; diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index 7009a43..abceb3a 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -43,11 +43,11 @@ #include <kio/global.h> #include <kio/job.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qdatetime.h> -#include <qfile.h> -#include <qdatastream.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqdatetime.h> +#include <tqfile.h> +#include <tqdatastream.h> #include <kdebug.h> @@ -83,8 +83,8 @@ public: }; -K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ) +K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ) { d = new Private; @@ -95,10 +95,10 @@ K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ) m_isoImager = 0; m_msInfoFetcher = new K3bMsInfoFetcher( this, this ); - connect( m_msInfoFetcher, SIGNAL(finished(bool)), this, SLOT(slotMsInfoFetched(bool)) ); - connect( m_msInfoFetcher, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_msInfoFetcher, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_msInfoFetcher, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMsInfoFetched(bool)) ); + connect( m_msInfoFetcher, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_msInfoFetcher, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); d->imageFinished = true; } @@ -179,7 +179,7 @@ void K3bDataJob::prepareWriting() m_msInfoFetcher->start(); } else { - m_isoImager->setMultiSessionInfo( QString::null ); + m_isoImager->setMultiSessionInfo( TQString() ); prepareData(); d->initializingImager = true; @@ -196,7 +196,7 @@ void K3bDataJob::slotMsInfoFetched(bool success) prepareData(); if( d->usedWritingApp == K3b::CDRDAO ) // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord - m_isoImager->setMultiSessionInfo( QString("%1,%2").arg(m_msInfoFetcher->lastSessionStart()).arg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() ); + m_isoImager->setMultiSessionInfo( TQString("%1,%2").tqarg(m_msInfoFetcher->lastSessionStart()).tqarg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() ); else m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo(), d->doc->burner() ); @@ -226,7 +226,7 @@ void K3bDataJob::writeImage() emit newTask( i18n("Creating image file") ); emit newSubTask( i18n("Track 1 of 1") ); - emit infoMessage( i18n("Creating image file in %1").arg(d->doc->tempDir()), INFO ); + emit infoMessage( i18n("Creating image file in %1").tqarg(d->doc->tempDir()), INFO ); m_isoImager->writeToImageFile( d->doc->tempDir() ); m_isoImager->start(); @@ -324,7 +324,7 @@ void K3bDataJob::slotIsoImagerFinished( bool success ) d->doc->onlyCreateImages() ) { if( success ) { - emit infoMessage( i18n("Image successfully created in %1").arg(d->doc->tempDir()), K3bJob::SUCCESS ); + emit infoMessage( i18n("Image successfully created in %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS ); d->imageFinished = true; if( d->doc->onlyCreateImages() ) { @@ -370,7 +370,7 @@ bool K3bDataJob::startWriterJob() if( d->doc->dummy() ) emit newTask( i18n("Simulating") ); else if( d->copies > 1 ) - emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); else emit newTask( i18n("Writing") ); @@ -408,7 +408,7 @@ void K3bDataJob::slotWriterJobPercent( int p ) void K3bDataJob::slotWriterNextTrack( int t, int tt ) { - emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) ); + emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(tt) ); } @@ -432,20 +432,20 @@ void K3bDataJob::slotWriterJobFinished( bool success ) if( d->doc->verifyData() ) { if( !d->verificationJob ) { d->verificationJob = new K3bVerificationJob( this, this ); - connect( d->verificationJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->verificationJob, SIGNAL(newTask(const QString&)), - this, SIGNAL(newSubTask(const QString&)) ); - connect( d->verificationJob, SIGNAL(newSubTask(const QString&)), - this, SIGNAL(newSubTask(const QString&)) ); - connect( d->verificationJob, SIGNAL(percent(int)), - this, SLOT(slotVerificationProgress(int)) ); - connect( d->verificationJob, SIGNAL(percent(int)), - this, SIGNAL(subPercent(int)) ); - connect( d->verificationJob, SIGNAL(finished(bool)), - this, SLOT(slotVerificationFinished(bool)) ); - connect( d->verificationJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( d->verificationJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->verificationJob, TQT_SIGNAL(newTask(const TQString&)), + this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( d->verificationJob, TQT_SIGNAL(newSubTask(const TQString&)), + this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( d->verificationJob, TQT_SIGNAL(percent(int)), + this, TQT_SLOT(slotVerificationProgress(int)) ); + connect( d->verificationJob, TQT_SIGNAL(percent(int)), + this, TQT_SIGNAL(subPercent(int)) ); + connect( d->verificationJob, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotVerificationFinished(bool)) ); + connect( d->verificationJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->verificationJob->clear(); @@ -541,19 +541,19 @@ void K3bDataJob::setWriterJob( K3bAbstractWriter* writer ) { // FIXME: progressedsize for multiple copies m_writerJob = writer; - connect( m_writerJob, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writerJob, SIGNAL(percent(int)), this, SLOT(slotWriterJobPercent(int)) ); - connect( m_writerJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_writerJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_writerJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_writerJob, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writerJob, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writerJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writerJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writerJob, SIGNAL(finished(bool)), this, SLOT(slotWriterJobFinished(bool)) ); - connect( m_writerJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterJobPercent(int)) ); + connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( m_writerJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); + connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) ); + connect( m_writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } @@ -572,11 +572,11 @@ void K3bDataJob::setImager( K3bIsoImager* imager ) void K3bDataJob::connectImager() { m_isoImager->disconnect( this ); - connect( m_isoImager, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_isoImager, SIGNAL(percent(int)), this, SLOT(slotIsoImagerPercent(int)) ); - connect( m_isoImager, SIGNAL(finished(bool)), this, SLOT(slotIsoImagerFinished(bool)) ); - connect( m_isoImager, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_isoImager, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_isoImager, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotIsoImagerPercent(int)) ); + connect( m_isoImager, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotIsoImagerFinished(bool)) ); + connect( m_isoImager, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } @@ -632,7 +632,7 @@ bool K3bDataJob::prepareWriterJob() writer->addArgument( "-xa1" ); } - writer->addArgument( QString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-"); + writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-"); setWriterJob( writer ); } @@ -648,10 +648,10 @@ bool K3bDataJob::prepareWriterJob() // now write the tocfile if( d->tocFile ) delete d->tocFile; - d->tocFile = new KTempFile( QString::null, "toc" ); + d->tocFile = new KTempFile( TQString(), "toc" ); d->tocFile->setAutoDelete(true); - if( QTextStream* s = d->tocFile->textStream() ) { + if( TQTextStream* s = d->tocFile->textStream() ) { if( d->usedDataMode == K3b::MODE1 ) { *s << "CD_ROM" << "\n"; *s << "\n"; @@ -790,9 +790,9 @@ void K3bDataJob::determineMultiSessionMode() else { // now we need to determine the media's size connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->doc->burner() ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); } } else { @@ -905,7 +905,7 @@ bool K3bDataJob::waitForMedium() } -QString K3bDataJob::jobDescription() const +TQString K3bDataJob::jobDescription() const { if( d->doc->onlyCreateImages() ) { return i18n("Creating Data Image File"); @@ -914,19 +914,19 @@ QString K3bDataJob::jobDescription() const d->doc->multiSessionMode() == K3bDataDoc::AUTO ) { return i18n("Writing Data CD") + ( d->doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) ); } else { return i18n("Writing Multisession CD") + ( d->doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) ); } } -QString K3bDataJob::jobDetails() const +TQString K3bDataJob::jobDetails() const { if( d->doc->copies() > 1 && !d->doc->dummy() && @@ -935,10 +935,10 @@ QString K3bDataJob::jobDetails() const return i18n("ISO9660 Filesystem (Size: %1) - %n copy", "ISO9660 Filesystem (Size: %1) - %n copies", d->doc->copies() ) - .arg(KIO::convertSize( d->doc->size() )); + .tqarg(KIO::convertSize( d->doc->size() )); else return i18n("ISO9660 Filesystem (Size: %1)") - .arg(KIO::convertSize( d->doc->size() )); + .tqarg(KIO::convertSize( d->doc->size() )); } @@ -951,9 +951,9 @@ K3bDataDoc::MultiSessionMode K3bDataJob::usedMultiSessionMode() const void K3bDataJob::cleanup() { if( !d->doc->onTheFly() && d->doc->removeImages() ) { - if( QFile::exists( d->doc->tempDir() ) ) { + if( TQFile::exists( d->doc->tempDir() ) ) { d->imageFile.remove(); - emit infoMessage( i18n("Removed image file %1").arg(d->doc->tempDir()), K3bJob::SUCCESS ); + emit infoMessage( i18n("Removed image file %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS ); } } diff --git a/libk3b/projects/datacd/k3bdatajob.h b/libk3b/projects/datacd/k3bdatajob.h index 58de969..a55e2d9 100644 --- a/libk3b/projects/datacd/k3bdatajob.h +++ b/libk3b/projects/datacd/k3bdatajob.h @@ -20,10 +20,10 @@ #include <k3bjob.h> #include <k3bdatadoc.h> -#include <qfile.h> +#include <tqfile.h> -class QString; -class QDataStream; +class TQString; +class TQDataStream; class K3bAbstractWriter; class K3bIsoImager; class KTempFile; @@ -40,9 +40,10 @@ namespace K3bDevice { class K3bDataJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bDataJob( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); virtual ~K3bDataJob(); K3bDoc* doc() const; @@ -50,8 +51,8 @@ class K3bDataJob : public K3bBurnJob virtual bool hasBeenCanceled() const; - virtual QString jobDescription() const; - virtual QString jobDetails() const; + virtual TQString jobDescription() const; + virtual TQString jobDetails() const; public slots: void cancel(); diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp index dd29d6d..d9d4893 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp +++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp @@ -26,8 +26,8 @@ #include <klocale.h> #include <kstringhandler.h> -#include <qfile.h> -#include <qvaluelist.h> +#include <tqfile.h> +#include <tqvaluelist.h> class K3bDataPreparationJob::Private : public K3bThread @@ -40,9 +40,9 @@ public: K3bDataDoc* doc; - QValueList<K3bDataItem*> nonExistingItems; - QString listOfRenamedItems; - QValueList<K3bDataItem*> folderSymLinkItems; + TQValueList<K3bDataItem*> nonExistingItems; + TQString listOfRenamedItems; + TQValueList<K3bDataItem*> folderSymLinkItems; K3bThreadJob* threadJob; @@ -71,14 +71,14 @@ void K3bDataPreparationJob::Private::run() // create the message string for the renamed files if( doc->needToCutFilenames() ) { int maxlines = 10; - QValueList<K3bDataItem*>::const_iterator it; + TQValueList<K3bDataItem*>::const_iterator it; for( it = doc->needToCutFilenameItems().begin(); maxlines > 0 && it != doc->needToCutFilenameItems().end(); ++it, --maxlines ) { K3bDataItem* item = *it; listOfRenamedItems += i18n("<em>%1</em> renamed to <em>%2</em>") - .arg( KStringHandler::csqueeze( item->k3bName(), 30 ) ) - .arg( KStringHandler::csqueeze( item->writtenName(), 30 ) ); + .tqarg( KStringHandler::csqueeze( item->k3bName(), 30 ) ) + .tqarg( KStringHandler::csqueeze( item->writtenName(), 30 ) ); listOfRenamedItems += "<br>"; } if( it != doc->needToCutFilenameItems().end() ) @@ -93,7 +93,7 @@ void K3bDataPreparationJob::Private::run() if( item->isSymLink() ) { if( doc->isoOptions().followSymbolicLinks() ) { - QFileInfo f( K3b::resolveLink( item->localPath() ) ); + TQFileInfo f( K3b::resolveLink( item->localPath() ) ); if( !f.exists() ) { nonExistingItems.append( item ); } @@ -102,7 +102,7 @@ void K3bDataPreparationJob::Private::run() } } } - else if( item->isFile() && !QFile::exists( item->localPath() ) ) { + else if( item->isFile() && !TQFile::exists( item->localPath() ) ) { nonExistingItems.append( item ); } @@ -126,11 +126,11 @@ void K3bDataPreparationJob::Private::cancel() -static QString createItemsString( const QValueList<K3bDataItem*>& items, unsigned int max ) +static TQString createItemsString( const TQValueList<K3bDataItem*>& items, unsigned int max ) { - QString s; + TQString s; unsigned int cnt = 0; - for( QValueList<K3bDataItem*>::const_iterator it = items.begin(); + for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { s += KStringHandler::csqueeze( (*it)->localPath(), 60 ); @@ -149,12 +149,12 @@ static QString createItemsString( const QValueList<K3bDataItem*>& items, unsigne } -K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bJob( hdl, parent ) +K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bJob( hdl, tqparent ) { d = new Private( doc ); d->threadJob = new K3bThreadJob( d, this, this ); - connectSubJob( d->threadJob, SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION ); + connectSubJob( d->threadJob, TQT_SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION ); } @@ -182,7 +182,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success ) "of the Joliet extensions. If the Joliet extensions are disabled filenames " "do not have to be shortened but long filenames will not be available on " "Windows systems.") - .arg( d->doc->isoOptions().jolietLong() ? 103 : 64 ) + .tqarg( d->doc->isoOptions().jolietLong() ? 103 : 64 ) + "<p>" + d->listOfRenamedItems, i18n("Warning"), i18n("Shorten Filenames"), @@ -207,7 +207,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success ) "restrict the length of the volume descriptior (the name of the filesystem) " "to %1 characters. The selected descriptor '%2' is longer than that. Do you " "want it to be cut or do you want to go back and change it manually?") - .arg( 16 ).arg( d->doc->isoOptions().volumeID() ), + .tqarg( 16 ).tqarg( d->doc->isoOptions().volumeID() ), i18n("Warning"), i18n("Cut volume descriptor in the Joliet tree"), i18n("Cancel and go back") ) ) { @@ -228,7 +228,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success ) i18n("Warning"), i18n("Remove missing files and continue"), i18n("Cancel and go back") ) ) { - for( QValueList<K3bDataItem*>::const_iterator it = d->nonExistingItems.begin(); + for( TQValueList<K3bDataItem*>::const_iterator it = d->nonExistingItems.begin(); it != d->nonExistingItems.end(); ++it ) { delete *it; } diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.h b/libk3b/projects/datacd/k3bdatapreparationjob.h index 1c83a42..3ac7d7d 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.h +++ b/libk3b/projects/datacd/k3bdatapreparationjob.h @@ -29,9 +29,10 @@ class K3bJobHandler; class K3bDataPreparationJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ); + K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ); ~K3bDataPreparationJob(); bool hasBeenCanceled() const; diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp index 3ea3236..c36595e 100644 --- a/libk3b/projects/datacd/k3bdiritem.cpp +++ b/libk3b/projects/datacd/k3bdiritem.cpp @@ -19,14 +19,14 @@ #include "k3bsessionimportitem.h" #include "k3bfileitem.h" -#include <qstring.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqptrlist.h> #include <kdebug.h> -K3bDirItem::K3bDirItem(const QString& name, K3bDataDoc* doc, K3bDirItem* parentDir) - : K3bDataItem( doc, parentDir ), +K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* tqparentDir) + : K3bDataItem( doc, tqparentDir ), m_size(0), m_followSymlinksSize(0), m_blocks(0), @@ -37,8 +37,8 @@ K3bDirItem::K3bDirItem(const QString& name, K3bDataDoc* doc, K3bDirItem* parentD m_k3bName = name; // add automagically like a qlistviewitem - if( parent() ) - parent()->addDataItem( this ); + if( tqparent() ) + tqparent()->addDataItem( this ); } @@ -52,26 +52,26 @@ K3bDirItem::K3bDirItem( const K3bDirItem& item ) m_dirs(0), m_localPath( item.m_localPath ) { - for( QPtrListIterator<K3bDataItem> it( item.children() ); *it; ++it ) + for( TQPtrListIterator<K3bDataItem> it( item.tqchildren() ); *it; ++it ) addDataItem( (*it)->copy() ); } K3bDirItem::~K3bDirItem() { - // delete all children + // delete all tqchildren // doing this by hand is much saver than using the // auto-delete feature since some of the items' destructors // may change the list - K3bDataItem* i = m_children.first(); + K3bDataItem* i = m_tqchildren.first(); while( i ) { // it is important to use takeDataItem here to be sure // the size gets updated properly takeDataItem(i); delete i; - i = m_children.first(); + i = m_tqchildren.first(); } - // this has to be done after deleting the children + // this has to be done after deleting the tqchildren // because the directory itself has a size of 0 in K3b // and all it's files' sizes have already been substracted take(); @@ -99,14 +99,14 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) } } - if( m_children.findRef( item ) == -1 ) { + if( m_tqchildren.tqfindRef( item ) == -1 ) { if( item->isFile() ) { // do we replace an old item? - QString name = item->k3bName(); + TQString name = item->k3bName(); int cnt = 1; - while( K3bDataItem* oldItem = find( name ) ) { + while( K3bDataItem* oldItem = tqfind( name ) ) { if( !oldItem->isDir() && oldItem->isFromOldSession() ) { - // in this case we remove this item from it's parent and save it in the new one + // in this case we remove this item from it's tqparent and save it in the new one // to be able to recover it oldItem->take(); static_cast<K3bSessionImportItem*>(oldItem)->setReplaceItem( static_cast<K3bFileItem*>(item) ); @@ -118,15 +118,15 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) // add a counter to the filename // if( item->k3bName()[item->k3bName().length()-4] == '.' ) - name = item->k3bName().left( item->k3bName().length()-4 ) + QString::number(cnt++) + item->k3bName().right(4); + name = item->k3bName().left( item->k3bName().length()-4 ) + TQString::number(cnt++) + item->k3bName().right(4); else - name = item->k3bName() + QString::number(cnt++); + name = item->k3bName() + TQString::number(cnt++); } } item->setK3bName( name ); } - m_children.append( item->take() ); + m_tqchildren.append( item->take() ); updateSize( item, false ); if( item->isDir() ) updateFiles( ((K3bDirItem*)item)->numFiles(), ((K3bDirItem*)item)->numDirs()+1 ); @@ -146,9 +146,9 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item ) { - int x = m_children.findRef( item ); + int x = m_tqchildren.tqfindRef( item ); if( x > -1 ) { - K3bDataItem* item = m_children.take(); + K3bDataItem* item = m_tqchildren.take(); updateSize( item, true ); if( item->isDir() ) updateFiles( -1*((K3bDirItem*)item)->numFiles(), -1*((K3bDirItem*)item)->numDirs()-1 ); @@ -176,8 +176,8 @@ K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item ) K3bDataItem* K3bDirItem::nextSibling() const { - if( !m_children.isEmpty() ) - return m_children.getFirst(); + if( !m_tqchildren.isEmpty() ) + return m_tqchildren.getFirst(); else return K3bDataItem::nextSibling(); } @@ -185,24 +185,24 @@ K3bDataItem* K3bDirItem::nextSibling() const K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const { - // search for prev in children - if( m_children.findRef( prev ) < 0 ) { + // search for prev in tqchildren + if( m_tqchildren.tqfindRef( prev ) < 0 ) { return 0; } else - return m_children.next(); + return m_tqchildren.next(); } -bool K3bDirItem::alreadyInDirectory( const QString& filename ) const +bool K3bDirItem::alreadyInDirectory( const TQString& filename ) const { - return (find( filename ) != 0); + return (tqfind( filename ) != 0); } -K3bDataItem* K3bDirItem::find( const QString& filename ) const +K3bDataItem* K3bDirItem::tqfind( const TQString& filename ) const { - for( QPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { if( it.current()->k3bName() == filename ) return it.current(); } @@ -210,20 +210,20 @@ K3bDataItem* K3bDirItem::find( const QString& filename ) const } -K3bDataItem* K3bDirItem::findByPath( const QString& p ) +K3bDataItem* K3bDirItem::findByPath( const TQString& p ) { if( p.isEmpty() || p == "/" ) return this; - QString path = p; + TQString path = p; if( path.startsWith("/") ) path = path.mid(1); - int pos = path.find( "/" ); + int pos = path.tqfind( "/" ); if( pos < 0 ) - return find( path ); + return tqfind( path ); else { // do it recursivly - K3bDataItem* item = find( path.left(pos) ); + K3bDataItem* item = tqfind( path.left(pos) ); if( item && item->isDir() ) return ((K3bDirItem*)item)->findByPath( path.mid( pos+1 ) ); else @@ -232,14 +232,14 @@ K3bDataItem* K3bDirItem::findByPath( const QString& p ) } -bool K3bDirItem::mkdir( const QString& dirPath ) +bool K3bDirItem::mkdir( const TQString& dirPath ) { // // An absolut path always starts at the root item // if( dirPath[0] == '/' ) { - if( parent() ) - return parent()->mkdir( dirPath ); + if( tqparent() ) + return tqparent()->mkdir( dirPath ); else return mkdir( dirPath.mid( 1 ) ); } @@ -247,9 +247,9 @@ bool K3bDirItem::mkdir( const QString& dirPath ) if( findByPath( dirPath ) ) return false; - QString restPath; - QString dirName; - int pos = dirPath.find( '/' ); + TQString restPath; + TQString dirName; + int pos = dirPath.tqfind( '/' ); if( pos == -1 ) { dirName = dirPath; } @@ -258,7 +258,7 @@ bool K3bDirItem::mkdir( const QString& dirPath ) restPath = dirPath.mid( pos+1 ); } - K3bDataItem* dir = find( dirName ); + K3bDataItem* dir = tqfind( dirName ); if( !dir ) dir = new K3bDirItem( dirName, doc(), this ); else if( !dir->isDir() ) @@ -294,12 +294,12 @@ bool K3bDirItem::isSubItem( K3bDataItem* item ) const if( dynamic_cast<K3bDirItem*>(item) == this ) return true; - K3bDirItem* d = item->parent(); + K3bDirItem* d = item->tqparent(); while( d ) { if( d == this ) { return true; } - d = d->parent(); + d = d->tqparent(); } return false; @@ -323,7 +323,7 @@ bool K3bDirItem::isRemoveable() const if( !K3bDataItem::isRemoveable() ) return false; - for( QPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { if( !it.current()->isRemoveable() ) return false; } @@ -349,22 +349,22 @@ void K3bDirItem::updateSize( K3bDataItem* item, bool removed ) } } - if( parent() ) - parent()->updateSize( item, removed ); + if( tqparent() ) + tqparent()->updateSize( item, removed ); } void K3bDirItem::updateFiles( long files, long dirs ) { m_files += files; m_dirs += dirs; - if( parent() ) - parent()->updateFiles( files, dirs ); + if( tqparent() ) + tqparent()->updateFiles( files, dirs ); } bool K3bDirItem::isFromOldSession() const { - for( QPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { if( (*it)->isFromOldSession() ) return true; } @@ -375,7 +375,7 @@ bool K3bDirItem::isFromOldSession() const bool K3bDirItem::writeToCd() const { // check if this dir contains items to write - for( QPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { if( (*it)->writeToCd() ) return true; } @@ -394,13 +394,13 @@ K3bRootItem::~K3bRootItem() } -const QString& K3bRootItem::k3bName() const +const TQString& K3bRootItem::k3bName() const { return doc()->isoOptions().volumeID(); } -void K3bRootItem::setK3bName( const QString& text ) +void K3bRootItem::setK3bName( const TQString& text ) { doc()->setVolumeID( text ); } diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index a64b4fd..61b6c8a 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -18,8 +18,8 @@ #define K3BDIRITEM_H -#include <qstring.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqptrlist.h> #include <kio/global.h> @@ -34,11 +34,11 @@ class K3bDataDoc; class LIBK3B_EXPORT K3bDirItem : public K3bDataItem { public: - K3bDirItem( const QString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 ); + K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* tqparentDir = 0 ); /** - * Default copy constructor. Copies the dir including all children. However, none of the - * children will have set a doc and the copy dir will not have set a parent dir. + * Default copy constructor. Copies the dir including all tqchildren. However, none of the + * tqchildren will have set a doc and the copy dir will not have set a tqparent dir. */ K3bDirItem( const K3bDirItem& ); @@ -48,16 +48,16 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem K3bDirItem* getDirItem() const; - const QPtrList<K3bDataItem>& children() const { return m_children; } + const TQPtrList<K3bDataItem>& tqchildren() const { return m_tqchildren; } K3bDirItem* addDataItem( K3bDataItem* item ); K3bDataItem* takeDataItem( K3bDataItem* item ); K3bDataItem* nextSibling() const; K3bDataItem* nextChild( K3bDataItem* ) const; - bool alreadyInDirectory( const QString& fileName ) const; - K3bDataItem* find( const QString& filename ) const; - K3bDataItem* findByPath( const QString& ); + bool alreadyInDirectory( const TQString& fileName ) const; + K3bDataItem* tqfind( const TQString& filename ) const; + K3bDataItem* findByPath( const TQString& ); long numFiles() const; long numDirs() const; @@ -83,10 +83,10 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem /** * Recursively creates a directory. */ - bool mkdir( const QString& dir ); + bool mkdir( const TQString& dir ); - void setLocalPath( const QString& p ) { m_localPath = p; } - QString localPath() const { return m_localPath; } + void setLocalPath( const TQString& p ) { m_localPath = p; } + TQString localPath() const { return m_localPath; } /** * \reimplemented @@ -111,7 +111,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem private: /** * this recursivly updates the size of the directories. - * The size of this dir and the parent dir is updated. + * The size of this dir and the tqparent dir is updated. * These values are just used for user information. */ void updateSize( K3bDataItem*, bool removed = false ); @@ -121,7 +121,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem */ void updateFiles( long files, long dirs ); - mutable QPtrList<K3bDataItem> m_children; + mutable TQPtrList<K3bDataItem> m_tqchildren; // size of the items simply added KIO::filesize_t m_size; @@ -136,7 +136,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem // HACK: store the original path to be able to use it's permissions // ´remove this once we have a backup project - QString m_localPath; + TQString m_localPath; }; @@ -146,8 +146,8 @@ class K3bRootItem : public K3bDirItem K3bRootItem( K3bDataDoc* ); ~K3bRootItem(); - const QString& k3bName() const; - void setK3bName( const QString& ); + const TQString& k3bName() const; + void setK3bName( const TQString& ); bool isMoveable() const { return false; } bool isRemoveable() const { return false; } diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp index 0ddab76..7d92e7e 100644 --- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp +++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp @@ -18,9 +18,9 @@ #include <kdebug.h> -#include <qfile.h> -#include <qmap.h> -#include <qptrlist.h> +#include <tqfile.h> +#include <tqmap.h> +#include <tqptrlist.h> // TODO: remove the items from the project if the savedSize differs @@ -71,7 +71,7 @@ public: */ K3b::Msf blocks() const { return K3b::Msf( usedBlocks(savedSize) ); } - QPtrList<K3bDataItem> items; + TQPtrList<K3bDataItem> items; }; @@ -114,7 +114,7 @@ public: void removeFile( K3bFileItem* item, bool followSymlinks ) { InodeInfo& inodeInfo = inodeMap[item->localId(followSymlinks)]; - if( inodeInfo.items.findRef( item ) == -1 ) { + if( inodeInfo.items.tqfindRef( item ) == -1 ) { kdError() << "(K3bFileCompilationSizeHandler) " << item->localPath() << " has been removed without being added!" << endl; @@ -136,7 +136,7 @@ public: void removeSpecialItem( K3bDataItem* item ) { // special files do not have a corresponding local file // so we just substract their k3bSize - if( specialItems.findRef( item ) == -1 ) { + if( specialItems.tqfindRef( item ) == -1 ) { kdError() << "(K3bFileCompilationSizeHandler) Special item " << item->k3bName() << " has been removed without being added!" << endl; @@ -152,12 +152,12 @@ public: /** * This maps from inodes to the number of occurrences of the inode. */ - QMap<K3bFileItem::Id, InodeInfo> inodeMap; + TQMap<K3bFileItem::Id, InodeInfo> inodeMap; KIO::filesize_t size; K3b::Msf blocks; - QPtrList<K3bDataItem> specialItems; + TQPtrList<K3bDataItem> specialItems; }; diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp index d9e288f..cc71b3a 100644 --- a/libk3b/projects/datacd/k3bfileitem.cpp +++ b/libk3b/projects/datacd/k3bfileitem.cpp @@ -22,11 +22,11 @@ #include "k3bisooptions.h" #include <k3bglobals.h> -#include <qfileinfo.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqfileinfo.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqregexp.h> +#include <tqfile.h> #include <kurl.h> #include <kdebug.h> @@ -57,7 +57,7 @@ bool operator>( const K3bFileItem::Id& id1, const K3bFileItem::Id& id2 ) -K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName, int flags ) +K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName, int flags ) : K3bDataItem( doc, dir, flags ), m_replacedItemFromOldSession(0), m_localPath(filePath) @@ -71,7 +71,7 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* // we need to use lstat here since for symlinks both KDE and QT return the size of the file pointed to // instead the size of the link. k3b_struct_stat statBuf; - if( k3b_lstat( QFile::encodeName(filePath), &statBuf ) ) { + if( k3b_lstat( TQFile::encodeName(filePath), &statBuf ) ) { m_size = K3b::filesize( filePath ); m_id.inode = 0; m_id.device = 0; @@ -104,7 +104,7 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* if( isSymLink() ) { k3b_struct_stat statBuf; - if( k3b_stat( QFile::encodeName(filePath), &statBuf ) == 0 ) { + if( k3b_stat( TQFile::encodeName(filePath), &statBuf ) == 0 ) { m_idFollowed.inode = statBuf.st_ino; m_idFollowed.device = statBuf.st_dev; @@ -113,14 +113,14 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* } // add automagically like a qlistviewitem - if( parent() ) - parent()->addDataItem( this ); + if( tqparent() ) + tqparent()->addDataItem( this ); } K3bFileItem::K3bFileItem( const k3b_struct_stat* stat, const k3b_struct_stat* followedStat, - const QString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName ) + const TQString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName ) : K3bDataItem( doc, dir ), m_replacedItemFromOldSession(0), m_localPath(filePath) @@ -151,8 +151,8 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat, m_sizeFollowed = m_size; } - if( parent() ) - parent()->addDataItem( this ); + if( tqparent() ) + tqparent()->addDataItem( this ); } @@ -171,7 +171,7 @@ K3bFileItem::K3bFileItem( const K3bFileItem& item ) K3bFileItem::~K3bFileItem() { - // remove this from parentdir + // remove this from tqparentdir take(); } @@ -211,14 +211,14 @@ bool K3bFileItem::exists() const return true; } -QString K3bFileItem::absIsoPath() +TQString K3bFileItem::absIsoPath() { // return m_dir->absIsoPath() + m_isoName; - return QString::null; + return TQString(); } -QString K3bFileItem::localPath() const +TQString K3bFileItem::localPath() const { return m_localPath; } @@ -235,9 +235,9 @@ bool K3bFileItem::isSymLink() const } -QString K3bFileItem::linkDest() const +TQString K3bFileItem::linkDest() const { - return QFileInfo( localPath() ).readLink(); + return TQFileInfo( localPath() ).readLink(); } @@ -247,10 +247,10 @@ bool K3bFileItem::isValid() const // this link is not valid if we cannot follow it if we want to if( doc()->isoOptions().followSymbolicLinks() ) { - return QFile::exists( K3b::resolveLink( localPath() ) ); + return TQFile::exists( K3b::resolveLink( localPath() ) ); } - QString dest = linkDest(); + TQString dest = linkDest(); if( dest[0] == '/' ) return false; // absolut links can never be part of the compilation! @@ -258,7 +258,7 @@ bool K3bFileItem::isValid() const // parse the link K3bDirItem* dir = getParent(); - QStringList tokens = QStringList::split( QRegExp("/+"), dest ); // two slashes or more do the same as one does! + TQStringList tokens = TQStringList::split( TQRegExp("/+"), dest ); // two slashes or more do the same as one does! unsigned int i = 0; while( i < tokens.size() ) { @@ -267,13 +267,13 @@ bool K3bFileItem::isValid() const } else if( tokens[i] == ".." ) { // change the directory - dir = dir->parent(); + dir = dir->tqparent(); if( dir == 0 ) return false; } else { // search for the item in dir - K3bDataItem* d = dir->find( tokens[i] ); + K3bDataItem* d = dir->tqfind( tokens[i] ); if( d == 0 ) return false; diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h index f23644f..68ee49d 100644 --- a/libk3b/projects/datacd/k3bfileitem.h +++ b/libk3b/projects/datacd/k3bfileitem.h @@ -22,7 +22,7 @@ #include <k3bglobals.h> #include <kio/global.h> -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" @@ -39,7 +39,7 @@ public: /** * Creates a new K3bFileItem */ - K3bFileItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0, int flags = 0 ); + K3bFileItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0, int flags = 0 ); /** * Constructor for optimized file item creation which does no additional stat. @@ -48,12 +48,12 @@ public: */ K3bFileItem( const k3b_struct_stat* stat, const k3b_struct_stat* followedStat, - const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 ); + const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 ); /** * Default copy constructor * Creates a copy of the fileitem. The copy, however, is not an exact duplicate of this item. - * The copy does not have a parent dir set and any old session items are set to 0. + * The copy does not have a tqparent dir set and any old session items are set to 0. */ K3bFileItem( const K3bFileItem& ); @@ -63,10 +63,10 @@ public: bool exists() const; - QString absIsoPath(); + TQString absIsoPath(); /** reimplemented from K3bDataItem */ - QString localPath() const; + TQString localPath() const; /** * Identification of the files on the local device. @@ -77,7 +77,7 @@ public: }; /** - * This is not the normal inode number but it also contains + * This is not the normal inode number but it also tqcontains * the device number. */ Id localId() const; @@ -90,7 +90,7 @@ public: K3bDirItem* getDirItem() const; bool isSymLink() const; - QString linkDest() const; + TQString linkDest() const; bool isFile() const { return true; } /** returns true if the item is not a link or @@ -113,7 +113,7 @@ public: Id m_id; Id m_idFollowed; - QString m_localPath; + TQString m_localPath; bool m_bSymLink; }; diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index f44d3ab..b7ff5ad 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -39,11 +39,11 @@ #include <kio/job.h> #include <kstringhandler.h> -#include <qfile.h> -#include <qregexp.h> -#include <qdir.h> -#include <qapplication.h> -#include <qvaluestack.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqdir.h> +#include <tqapplication.h> +#include <tqvaluestack.h> #include <sys/types.h> #include <sys/stat.h> @@ -65,7 +65,7 @@ public: delete pipe; } - QString imagePath; + TQString imagePath; K3bFileSplitter imageFile; const K3bExternalBin* mkisofsBin; @@ -85,8 +85,8 @@ public: }; -K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent, const char* name ) - : K3bJob( hdl, parent, name ), +K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent, const char* name ) + : K3bJob( hdl, tqparent, name ), m_pathSpecFile(0), m_rrHideFile(0), m_jolietHideFile(0), @@ -103,7 +103,7 @@ K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent d = new Private(); d->dataPreparationJob = new K3bDataPreparationJob( doc, this, this ); connectSubJob( d->dataPreparationJob, - SLOT(slotDataPreparationDone(bool)), + TQT_SLOT(slotDataPreparationDone(bool)), DEFAULT_SIGNAL_CONNECTION ); } @@ -127,14 +127,14 @@ void K3bIsoImager::writeToFd( int fd ) } -void K3bIsoImager::writeToImageFile( const QString& path ) +void K3bIsoImager::writeToImageFile( const TQString& path ) { d->imagePath = path; m_fdToWriteTo = -1; } -void K3bIsoImager::slotReceivedStderr( const QString& line ) +void K3bIsoImager::slotReceivedStderr( const TQString& line ) { parseMkisofsOutput( line ); emit debuggingOutput( "mkisofs", line ); @@ -147,7 +147,7 @@ void K3bIsoImager::handleMkisofsProgress( int p ) } -void K3bIsoImager::handleMkisofsInfoMessage( const QString& line, int type ) +void K3bIsoImager::handleMkisofsInfoMessage( const TQString& line, int type ) { emit infoMessage( line, type ); if( type == ERROR ) @@ -164,15 +164,15 @@ void K3bIsoImager::slotProcessExited( KProcess* p ) d->pipe->close(); emit debuggingOutput( "K3bIsoImager", - QString("Pipe throughput: %1 bytes read, %2 bytes written.") - .arg(d->pipe->bytesRead()).arg(d->pipe->bytesWritten()) ); + TQString("Pipe throughput: %1 bytes read, %2 bytes written.") + .tqarg(d->pipe->bytesRead()).tqarg(d->pipe->bytesWritten()) ); if( d->imageFile.isOpen() ) { d->imageFile.close(); if( m_canceled || p->exitStatus() != 0 ) { d->imageFile.remove(); - emit infoMessage( i18n("Removed incomplete image file %1.").arg(d->imageFile.name()), WARNING ); + emit infoMessage( i18n("Removed incomplete image file %1.").tqarg(d->imageFile.name()), WARNING ); } } @@ -210,7 +210,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p ) default: if( !d->knownError && !mkisofsReadError() ) { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("mkisofs").arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("mkisofs").tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); } @@ -220,7 +220,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg("mkisofs"), ERROR ); + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("mkisofs"), ERROR ); jobFinished( false ); } } @@ -238,9 +238,9 @@ void K3bIsoImager::cleanup() delete m_sortWeightFile; // remove boot-images-temp files - for( QStringList::iterator it = m_tempFiles.begin(); + for( TQStringList::iterator it = m_tempFiles.begin(); it != m_tempFiles.end(); ++it ) - QFile::remove( *it ); + TQFile::remove( *it ); m_tempFiles.clear(); m_pathSpecFile = m_jolietHideFile = m_rrHideFile = m_sortWeightFile = 0; @@ -319,9 +319,9 @@ void K3bIsoImager::startSizeCalculation() // *m_process << dummyDir(); kdDebug() << "***** mkisofs calculate size parameters:\n"; - const QValueList<QCString>& args = m_process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = m_process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << endl << flush; @@ -340,23 +340,23 @@ void K3bIsoImager::startSizeCalculation() // TODO: use K3bProcess::OutputCollector instead iof our own two slots. - connect( m_process, SIGNAL(receivedStderr(KProcess*, char*, int)), - this, SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) ); - connect( m_process, SIGNAL(stdoutLine(const QString&)), - this, SLOT(slotCollectMkisofsPrintSizeStdout(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotMkisofsPrintSizeFinished()) ); + connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), + this, TQT_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotMkisofsPrintSizeFinished()) ); // we also want error messages - connect( m_process, SIGNAL(stderrLine( const QString& )), - this, SLOT(slotReceivedStderr( const QString& )) ); + connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )), + this, TQT_SLOT(slotReceivedStderr( const TQString& )) ); - m_collectedMkisofsPrintSizeStdout = QString::null; - m_collectedMkisofsPrintSizeStderr = QString::null; + m_collectedMkisofsPrintSizeStdout = TQString(); + m_collectedMkisofsPrintSizeStderr = TQString(); m_mkisofsPrintSizeResult = 0; if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { - emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR ); cleanup(); jobFinished( false ); @@ -367,12 +367,12 @@ void K3bIsoImager::startSizeCalculation() void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(KProcess*, char* data , int len) { - emit debuggingOutput( "mkisofs", QString::fromLocal8Bit( data, len ) ); - m_collectedMkisofsPrintSizeStderr.append( QString::fromLocal8Bit( data, len ) ); + emit debuggingOutput( "mkisofs", TQString::fromLocal8Bit( data, len ) ); + m_collectedMkisofsPrintSizeStderr.append( TQString::fromLocal8Bit( data, len ) ); } -void K3bIsoImager::slotCollectMkisofsPrintSizeStdout( const QString& line ) +void K3bIsoImager::slotCollectMkisofsPrintSizeStdout( const TQString& line ) { // newer versions of mkisofs outut additional lines of junk before the size :( // so we only use the last line @@ -400,7 +400,7 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished() else { // parse the stderr output // I hope parsing the last line is enough! - int pos = m_collectedMkisofsPrintSizeStderr.findRev( "extents scheduled to be written" ); + int pos = m_collectedMkisofsPrintSizeStderr.tqfindRev( "extents scheduled to be written" ); if( pos == -1 ) success = false; @@ -409,9 +409,9 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished() } emit debuggingOutput( "K3bIsoImager", - QString("mkisofs print size result: %1 (%2 bytes)") - .arg(m_mkisofsPrintSizeResult) - .arg(Q_UINT64(m_mkisofsPrintSizeResult)*2048ULL) ); + TQString("mkisofs print size result: %1 (%2 bytes)") + .tqarg(m_mkisofsPrintSizeResult) + .tqarg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) ); cleanup(); @@ -485,18 +485,18 @@ void K3bIsoImager::start() return; } - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*)) ); - connect( m_process, SIGNAL(stderrLine( const QString& )), - this, SLOT(slotReceivedStderr( const QString& )) ); + connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )), + this, TQT_SLOT(slotReceivedStderr( const TQString& )) ); // // Check the image file if( m_fdToWriteTo == -1 ) { d->imageFile.setName( d->imagePath ); if( !d->imageFile.open( IO_WriteOnly ) ) { - emit infoMessage( i18n("Could not open %1 for writing").arg(d->imagePath), ERROR ); + emit infoMessage( i18n("Could not open %1 for writing").tqarg(d->imagePath), ERROR ); cleanup(); jobFinished(false); return; @@ -520,9 +520,9 @@ void K3bIsoImager::start() kdDebug() << "***** mkisofs parameters:\n"; - const QValueList<QCString>& args = m_process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = m_process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << endl << flush; @@ -532,7 +532,7 @@ void K3bIsoImager::start() // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bIsoImager) could not start mkisofs" << endl; - emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR ); jobFinished( false ); cleanup(); } @@ -553,7 +553,7 @@ void K3bIsoImager::cancel() } -void K3bIsoImager::setMultiSessionInfo( const QString& info, K3bDevice::Device* dev ) +void K3bIsoImager::setMultiSessionInfo( const TQString& info, K3bDevice::Device* dev ) { m_multiSessionInfo = info; m_device = dev; @@ -563,11 +563,11 @@ void K3bIsoImager::setMultiSessionInfo( const QString& info, K3bDevice::Device* // iso9660 + RR use some latin1 variant. So we need to cut the desc fields // counting 8bit chars. The GUI should take care of restricting the length // and the charset -static void truncateTheHardWay( QString& s, int max ) +static void truncateTheHardWay( TQString& s, int max ) { - QCString cs = s.utf8(); + TQCString cs = s.utf8(); cs.truncate(max); - s = QString::fromUtf8( cs ); + s = TQString::fromUtf8( cs ); } @@ -588,7 +588,7 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) *m_process << "-print-size" << "-quiet"; if( !m_doc->isoOptions().volumeID().isEmpty() ) { - QString s = m_doc->isoOptions().volumeID(); + TQString s = m_doc->isoOptions().volumeID(); truncateTheHardWay(s, 32); // ensure max length *m_process << "-volid" << s; } @@ -597,7 +597,7 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) *m_process << "-volid" << "CDROM"; } - QString s = m_doc->isoOptions().volumeSetId(); + TQString s = m_doc->isoOptions().volumeSetId(); truncateTheHardWay(s, 128); // ensure max length *m_process << "-volset" << s; @@ -639,8 +639,8 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) << " with volume set size: " << volsetSize << endl; volsetSeqNo = volsetSize; } - *m_process << "-volset-size" << QString::number(volsetSize); - *m_process << "-volset-seqno" << QString::number(volsetSeqNo); + *m_process << "-volset-size" << TQString::number(volsetSize); + *m_process << "-volset-seqno" << TQString::number(volsetSeqNo); if( m_sortWeightFile ) { *m_process << "-sort" << m_sortWeightFile->name(); @@ -733,18 +733,18 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) if( m_doc->isoOptions().hideTRANS_TBL() ) *m_process << "-hide-joliet-trans-tbl"; - *m_process << "-iso-level" << QString::number(m_doc->isoOptions().ISOLevel()); + *m_process << "-iso-level" << TQString::number(m_doc->isoOptions().ISOLevel()); if( m_doc->isoOptions().forceInputCharset() ) *m_process << "-input-charset" << m_doc->isoOptions().inputCharset(); - *m_process << "-path-list" << QFile::encodeName(m_pathSpecFile->name()); + *m_process << "-path-list" << TQFile::encodeName(m_pathSpecFile->name()).data(); // boot stuff if( !m_doc->bootImages().isEmpty() ) { bool first = true; - for( QPtrListIterator<K3bBootItem> it( m_doc->bootImages() ); + for( TQPtrListIterator<K3bBootItem> it( m_doc->bootImages() ); *it; ++it ) { if( !first ) *m_process << "-eltorito-alt-boot"; @@ -760,9 +760,9 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) else if( bootItem->imageType() == K3bBootItem::NONE ) { *m_process << "-no-emul-boot"; if( bootItem->loadSegment() > 0 ) - *m_process << "-boot-load-seg" << QString::number(bootItem->loadSegment()); + *m_process << "-boot-load-seg" << TQString::number(bootItem->loadSegment()); if( bootItem->loadSize() > 0 ) - *m_process << "-boot-load-size" << QString::number(bootItem->loadSize()); + *m_process << "-boot-load-size" << TQString::number(bootItem->loadSize()); } if( bootItem->imageType() != K3bBootItem::NONE && bootItem->noBoot() ) @@ -778,8 +778,8 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) // additional parameters from config - const QStringList& params = k3bcore->externalBinManager()->binObject( "mkisofs" )->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = k3bcore->externalBinManager()->binObject( "mkisofs" )->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; return true; @@ -792,7 +792,7 @@ int K3bIsoImager::writePathSpec() m_pathSpecFile = new KTempFile(); m_pathSpecFile->setAutoDelete(true); - if( QTextStream* t = m_pathSpecFile->textStream() ) { + if( TQTextStream* t = m_pathSpecFile->textStream() ) { // recursive path spec writing int num = writePathSpecForDir( m_doc->root(), *t ); @@ -805,7 +805,7 @@ int K3bIsoImager::writePathSpec() } -int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream ) +int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream ) { if( !m_noDeepDirectoryRelocation && dirItem->depth() > 7 ) { kdDebug() << "(K3bIsoImager) found directory depth > 7. Enabling no deep directory relocation." << endl; @@ -814,7 +814,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream // now create the graft points int num = 0; - for( QPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); it.current(); ++it ) { K3bDataItem* item = it.current(); bool writeItem = item->writeToCd(); @@ -825,29 +825,29 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream writeItem = false; else if( d->usedLinkHandling == Private::FOLLOW ) { - QFileInfo f( K3b::resolveLink( item->localPath() ) ); + TQFileInfo f( K3b::resolveLink( item->localPath() ) ); if( !f.exists() ) { emit infoMessage( i18n("Could not follow link %1 to non-existing file %2. Skipping...") - .arg(item->k3bName()) - .arg(f.filePath()), WARNING ); + .tqarg(item->k3bName()) + .tqarg(f.filePath()), WARNING ); writeItem = false; } else if( f.isDir() ) { emit infoMessage( i18n("Ignoring link %1 to folder %2. K3b is unable to follow links to folders.") - .arg(item->k3bName()) - .arg(f.filePath()), WARNING ); + .tqarg(item->k3bName()) + .tqarg(f.filePath()), WARNING ); writeItem = false; } } } else if( item->isFile() ) { - QFileInfo f( item->localPath() ); + TQFileInfo f( item->localPath() ); if( !f.exists() ) { - emit infoMessage( i18n("Could not find file %1. Skipping...").arg(item->localPath()), WARNING ); + emit infoMessage( i18n("Could not find file %1. Skipping...").tqarg(item->localPath()), WARNING ); writeItem = false; } else if( !f.isReadable() ) { - emit infoMessage( i18n("Could not read file %1. Skipping...").arg(item->localPath()), WARNING ); + emit infoMessage( i18n("Could not read file %1. Skipping...").tqarg(item->localPath()), WARNING ); writeItem = false; } } @@ -857,7 +857,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream // some versions of mkisofs seem to have a bug that prevents to use filenames // that contain one or more backslashes - if( item->writtenPath().contains("\\") ) + if( item->writtenPath().tqcontains("\\") ) m_containsFilesWithMultibleBackslashes = true; @@ -882,20 +882,20 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream } -void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, QTextStream& stream ) +void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream ) { stream << escapeGraftPoint( item->writtenPath() ) << "="; - if( m_doc->bootImages().containsRef( dynamic_cast<K3bBootItem*>(item) ) ) { // boot-image-backup-hack + if( m_doc->bootImages().tqcontainsRef( dynamic_cast<K3bBootItem*>(item) ) ) { // boot-image-backup-hack // create temp file KTempFile temp; - QString tempPath = temp.name(); + TQString tempPath = temp.name(); temp.unlink(); if( !KIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) { - emit infoMessage( i18n("Failed to backup boot image file %1").arg(item->localPath()), ERROR ); + emit infoMessage( i18n("Failed to backup boot image file %1").tqarg(item->localPath()), ERROR ); return; } @@ -917,7 +917,7 @@ bool K3bIsoImager::writeRRHideFile() m_rrHideFile = new KTempFile(); m_rrHideFile->setAutoDelete(true); - if( QTextStream* t = m_rrHideFile->textStream() ) { + if( TQTextStream* t = m_rrHideFile->textStream() ) { K3bDataItem* item = m_doc->root(); while( item ) { @@ -942,7 +942,7 @@ bool K3bIsoImager::writeJolietHideFile() m_jolietHideFile = new KTempFile(); m_jolietHideFile->setAutoDelete(true); - if( QTextStream* t = m_jolietHideFile->textStream() ) { + if( TQTextStream* t = m_jolietHideFile->textStream() ) { K3bDataItem* item = m_doc->root(); while( item ) { @@ -967,7 +967,7 @@ bool K3bIsoImager::writeSortWeightFile() m_sortWeightFile = new KTempFile(); m_sortWeightFile->setAutoDelete(true); - if( QTextStream* t = m_sortWeightFile->textStream() ) { + if( TQTextStream* t = m_sortWeightFile->textStream() ) { // // We need to write the local path in combination with the sort weight // mkisofs will take care of multiple entries for one local file and always @@ -976,7 +976,7 @@ bool K3bIsoImager::writeSortWeightFile() K3bDataItem* item = m_doc->root(); while( (item = item->nextSibling()) ) { // we skip the root here if( item->sortWeight() != 0 ) { - if( m_doc->bootImages().containsRef( dynamic_cast<K3bBootItem*>(item) ) ) { // boot-image-backup-hack + if( m_doc->bootImages().tqcontainsRef( dynamic_cast<K3bBootItem*>(item) ) ) { // boot-image-backup-hack *t << escapeGraftPoint( static_cast<K3bBootItem*>(item)->tempPath() ) << " " << item->sortWeight() << endl; } else if( item->isDir() ) { @@ -999,9 +999,9 @@ bool K3bIsoImager::writeSortWeightFile() } -QString K3bIsoImager::escapeGraftPoint( const QString& str ) +TQString K3bIsoImager::escapeGraftPoint( const TQString& str ) { - QString enc = str; + TQString enc = str; // // mkisofs manpage (-graft-points) is incorrect (as of mkisofs 2.01.01) @@ -1018,8 +1018,8 @@ QString K3bIsoImager::escapeGraftPoint( const QString& str ) // // - // we do not use QString::replace to have full control - // this might be slow since QString::insert is slow but we don't care + // we do not use TQString::replace to have full control + // this might be slow since TQString::insert is slow but we don't care // since this is only called to prepare the iso creation which is not // time critical. :) // @@ -1049,8 +1049,8 @@ QString K3bIsoImager::escapeGraftPoint( const QString& str ) ++pos; } -// enc.replace( "\\\\", "\\\\\\\\" ); -// enc.replace( "=", "\\=" ); +// enc.tqreplace( "\\\\", "\\\\\\\\" ); +// enc.tqreplace( "=", "\\=" ); return enc; } @@ -1093,43 +1093,43 @@ bool K3bIsoImager::prepareMkisofsFiles() } -QString K3bIsoImager::dummyDir( K3bDirItem* dir ) +TQString K3bIsoImager::dummyDir( K3bDirItem* dir ) { // // since we use virtual folders in order to have folders with different weight factors and different // permissions we create different dummy dirs to be passed to mkisofs // - QDir _appDir( locateLocal( "appdata", "temp/" ) ); + TQDir _appDir( locateLocal( "appdata", "temp/" ) ); // // create a unique isoimager session id // This might become important in case we will allow multiple instances of the isoimager // to run at the same time. // - QString jobId = qApp->sessionId() + "_" + QString::number( m_sessionNumber ); + TQString jobId = tqApp->sessionId() + "_" + TQString::number( m_sessionNumber ); if( !_appDir.cd( jobId ) ) { _appDir.mkdir( jobId ); _appDir.cd( jobId ); } - QString name( "dummydir_" ); - name += QString::number( dir->sortWeight() ); + TQString name( "dummydir_" ); + name += TQString::number( dir->sortWeight() ); bool perm = false; k3b_struct_stat statBuf; if( !dir->localPath().isEmpty() ) { // permissions - if( k3b_stat( QFile::encodeName(dir->localPath()), &statBuf ) == 0 ) { + if( k3b_stat( TQFile::encodeName(dir->localPath()), &statBuf ) == 0 ) { name += "_"; - name += QString::number( statBuf.st_uid ); + name += TQString::number( statBuf.st_uid ); name += "_"; - name += QString::number( statBuf.st_gid ); + name += TQString::number( statBuf.st_gid ); name += "_"; - name += QString::number( statBuf.st_mode ); + name += TQString::number( statBuf.st_mode ); name += "_"; - name += QString::number( statBuf.st_mtime ); + name += TQString::number( statBuf.st_mtime ); perm = true; } @@ -1144,11 +1144,11 @@ QString K3bIsoImager::dummyDir( K3bDirItem* dir ) _appDir.cd( name ); if( perm ) { - ::chmod( QFile::encodeName( _appDir.absPath() ), statBuf.st_mode ); - ::chown( QFile::encodeName( _appDir.absPath() ), statBuf.st_uid, statBuf.st_gid ); + ::chmod( TQFile::encodeName( _appDir.absPath() ), statBuf.st_mode ); + ::chown( TQFile::encodeName( _appDir.absPath() ), statBuf.st_uid, statBuf.st_gid ); struct utimbuf tb; tb.actime = tb.modtime = statBuf.st_mtime; - ::utime( QFile::encodeName( _appDir.absPath() ), &tb ); + ::utime( TQFile::encodeName( _appDir.absPath() ), &tb ); } } @@ -1158,11 +1158,11 @@ QString K3bIsoImager::dummyDir( K3bDirItem* dir ) void K3bIsoImager::clearDummyDirs() { - QString jobId = qApp->sessionId() + "_" + QString::number( m_sessionNumber ); - QDir appDir( locateLocal( "appdata", "temp/" ) ); + TQString jobId = tqApp->sessionId() + "_" + TQString::number( m_sessionNumber ); + TQDir appDir( locateLocal( "appdata", "temp/" ) ); if( appDir.cd( jobId ) ) { - QStringList dummyDirEntries = appDir.entryList( "dummydir*", QDir::Dirs ); - for( QStringList::iterator it = dummyDirEntries.begin(); it != dummyDirEntries.end(); ++it ) + TQStringList dummyDirEntries = appDir.entryList( "dummydir*", TQDir::Dirs ); + for( TQStringList::iterator it = dummyDirEntries.begin(); it != dummyDirEntries.end(); ++it ) appDir.rmdir( *it ); appDir.cdUp(); appDir.rmdir( jobId ); @@ -1170,12 +1170,12 @@ void K3bIsoImager::clearDummyDirs() } -QCString K3bIsoImager::checksum() const +TQCString K3bIsoImager::checksum() const { if( K3bChecksumPipe* p = dynamic_cast<K3bChecksumPipe*>( d->pipe ) ) return p->checksum(); else - return QCString(); + return TQCString(); } diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h index 82501ba..446fef8 100644 --- a/libk3b/projects/datacd/k3bisoimager.h +++ b/libk3b/projects/datacd/k3bisoimager.h @@ -19,14 +19,14 @@ #include <k3bjob.h> #include "k3bmkisofshandler.h" -#include <qptrqueue.h> -#include <qstringlist.h> +#include <tqptrqueue.h> +#include <tqstringlist.h> class K3bDataDoc; class K3bDirItem; class K3bDataItem; class K3bFileItem; -class QTextStream; +class TQTextStream; class K3bProcess; class KProcess; class K3bDevice::Device; @@ -36,9 +36,10 @@ class KTempFile; class K3bIsoImager : public K3bJob, public K3bMkisofsHandler { Q_OBJECT + TQ_OBJECT public: - K3bIsoImager( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bIsoImager(); virtual bool active() const; @@ -50,7 +51,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler /** * Get the checksum calculated during the creation of the image. */ - QCString checksum() const; + TQCString checksum() const; public slots: /** @@ -86,20 +87,20 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler */ void writeToFd( int fd ); - void writeToImageFile( const QString& path ); + void writeToImageFile( const TQString& path ); /** * If dev == 0 K3bIsoImager will ignore the data in the previous session. * This is usable for CD-Extra. */ - void setMultiSessionInfo( const QString&, K3bDevice::Device* dev = 0 ); + void setMultiSessionInfo( const TQString&, K3bDevice::Device* dev = 0 ); K3bDevice::Device* device() const { return m_device; } K3bDataDoc* doc() const { return m_doc; } protected: virtual void handleMkisofsProgress( int ); - virtual void handleMkisofsInfoMessage( const QString&, int ); + virtual void handleMkisofsInfoMessage( const TQString&, int ); virtual bool addMkisofsParameters( bool printSize = false ); @@ -113,7 +114,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler * * @return an empty dummy dir for use with K3bDirItems. */ - QString dummyDir( K3bDirItem* ); + TQString dummyDir( K3bDirItem* ); void outputData(); void initVariables(); @@ -129,9 +130,9 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler bool writeSortWeightFile(); // used by writePathSpec - virtual int writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream ); - virtual void writePathSpecForFile( K3bFileItem*, QTextStream& stream ); - QString escapeGraftPoint( const QString& str ); + virtual int writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream ); + virtual void writePathSpecForFile( K3bFileItem*, TQTextStream& stream ); + TQString escapeGraftPoint( const TQString& str ); KTempFile* m_pathSpecFile; KTempFile* m_rrHideFile; @@ -144,12 +145,12 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler bool m_canceled; protected slots: - virtual void slotReceivedStderr( const QString& ); + virtual void slotReceivedStderr( const TQString& ); virtual void slotProcessExited( KProcess* ); private slots: void slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int); - void slotCollectMkisofsPrintSizeStdout( const QString& ); + void slotCollectMkisofsPrintSizeStdout( const TQString& ); void slotMkisofsPrintSizeFinished(); void slotDataPreparationDone( bool success ); @@ -164,15 +165,15 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler bool m_noDeepDirectoryRelocation; bool m_importSession; - QString m_multiSessionInfo; + TQString m_multiSessionInfo; K3bDevice::Device* m_device; // used for mkisofs -print-size parsing - QString m_collectedMkisofsPrintSizeStdout; - QString m_collectedMkisofsPrintSizeStderr; + TQString m_collectedMkisofsPrintSizeStdout; + TQString m_collectedMkisofsPrintSizeStderr; int m_mkisofsPrintSizeResult; - QStringList m_tempFiles; + TQStringList m_tempFiles; int m_fdToWriteTo; diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp index bd7314d..5adca1a 100644 --- a/libk3b/projects/datacd/k3bisooptions.cpp +++ b/libk3b/projects/datacd/k3bisooptions.cpp @@ -20,12 +20,12 @@ #include <kconfig.h> #include <klocale.h> -#include <qstring.h> +#include <tqstring.h> K3bIsoOptions::K3bIsoOptions() : m_volumeID( "K3b data project" ), - m_applicationID( QString("K3B THE CD KREATOR (C) 1998-2006 SEBASTIAN TRUEG AND THE K3B TEAM") ), + m_applicationID( TQString("K3B THE CD KREATOR (C) 1998-2006 SEBASTIAN TRUEG AND THE K3B TEAM") ), m_systemId( K3b::systemName().upper() ), m_inputCharset( "iso8859-1" ), m_whiteSpaceTreatmentReplaceString( "_" ) @@ -118,8 +118,8 @@ void K3bIsoOptions::save( KConfigBase* c, bool saveVolumeDesc ) case extended: c->writeEntry( "white_space_treatment", "extended" ); break; - case replace: - c->writeEntry( "white_space_treatment", "replace" ); + case tqreplace: + c->writeEntry( "white_space_treatment", "tqreplace" ); break; default: c->writeEntry( "white_space_treatment", "noChange" ); @@ -188,9 +188,9 @@ K3bIsoOptions K3bIsoOptions::load( KConfigBase* c, bool loadVolumeDesc ) options.setDoNotCacheInodes( c->readBoolEntry( "do not cache inodes", options.doNotCacheInodes() ) ); - QString w = c->readEntry( "white_space_treatment", "noChange" ); - if( w == "replace" ) - options.setWhiteSpaceTreatment( replace ); + TQString w = c->readEntry( "white_space_treatment", "noChange" ); + if( w == "tqreplace" ) + options.setWhiteSpaceTreatment( tqreplace ); else if( w == "strip" ) options.setWhiteSpaceTreatment( strip ); else if( w == "extended" ) diff --git a/libk3b/projects/datacd/k3bisooptions.h b/libk3b/projects/datacd/k3bisooptions.h index 254c998..570f3d3 100644 --- a/libk3b/projects/datacd/k3bisooptions.h +++ b/libk3b/projects/datacd/k3bisooptions.h @@ -16,7 +16,7 @@ #ifndef K3B_ISO_OPTIONS_H #define K3B_ISO_OPTIONS_H -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" class KConfigBase; @@ -28,10 +28,10 @@ class LIBK3B_EXPORT K3bIsoOptions K3bIsoOptions(); bool forceInputCharset() const { return m_bForceInputCharset; } - const QString& inputCharset() const { return m_inputCharset; } + const TQString& inputCharset() const { return m_inputCharset; } void setForceInputCharset( bool b ) { m_bForceInputCharset = b; } - void setInputCharset( const QString& cs ) { m_inputCharset = cs; } + void setInputCharset( const TQString& cs ) { m_inputCharset = cs; } // -- mkisofs-options ---------------------------------------------------------------------- @@ -56,17 +56,17 @@ class LIBK3B_EXPORT K3bIsoOptions bool preserveFilePermissions() const { return m_preserveFilePermissions; } int ISOLevel() const { return m_isoLevel; } - const QString& systemId() const { return m_systemId; } - const QString& applicationID() const { return m_applicationID; } - const QString& volumeID() const { return m_volumeID; } - const QString& volumeSetId() const { return m_volumeSetId; } + const TQString& systemId() const { return m_systemId; } + const TQString& applicationID() const { return m_applicationID; } + const TQString& volumeID() const { return m_volumeID; } + const TQString& volumeSetId() const { return m_volumeSetId; } int volumeSetSize() const { return m_volumeSetSize; } int volumeSetNumber() const { return m_volumeSetNumber; } - const QString& publisher() const { return m_publisher; } - const QString& preparer() const { return m_preparer; } - const QString& abstractFile() const { return m_abstractFile; } - const QString& copyrightFile() const { return m_copyrightFile; } - const QString& bibliographFile() const { return m_bibliographFile; } + const TQString& publisher() const { return m_publisher; } + const TQString& preparer() const { return m_preparer; } + const TQString& abstractFile() const { return m_abstractFile; } + const TQString& copyrightFile() const { return m_copyrightFile; } + const TQString& bibliographFile() const { return m_bibliographFile; } void setCreateRockRidge( bool b ) { m_createRockRidge = b; } void setCreateJoliet( bool b ) { m_createJoliet = b; } @@ -87,33 +87,33 @@ class LIBK3B_EXPORT K3bIsoOptions void setJolietLong( bool b ) { m_jolietLong = b; } void setISOLevel( int i ) { m_isoLevel = i; } - void setSystemId( const QString& s ) { m_systemId = s; } - void setApplicationID( const QString& s ) { m_applicationID = s; } + void setSystemId( const TQString& s ) { m_systemId = s; } + void setApplicationID( const TQString& s ) { m_applicationID = s; } /** * Set the filesystems volume id. * * max length for this field is 32 chars. */ - void setVolumeID( const QString& s ) { m_volumeID = s; } - void setVolumeSetId( const QString& s ) { m_volumeSetId = s; } + void setVolumeID( const TQString& s ) { m_volumeID = s; } + void setVolumeSetId( const TQString& s ) { m_volumeSetId = s; } void setVolumeSetSize( int size ) { m_volumeSetSize = size; } void setVolumeSetNumber( int n ) { m_volumeSetNumber = n; } - void setPublisher( const QString& s ) { m_publisher = s; } - void setPreparer( const QString& s ) { m_preparer = s; } - void setAbstractFile( const QString& s ) { m_abstractFile = s; } - void setCoprightFile( const QString& s ) { m_copyrightFile = s; } - void setBibliographFile( const QString& s ) { m_bibliographFile = s; } + void setPublisher( const TQString& s ) { m_publisher = s; } + void setPreparer( const TQString& s ) { m_preparer = s; } + void setAbstractFile( const TQString& s ) { m_abstractFile = s; } + void setCoprightFile( const TQString& s ) { m_copyrightFile = s; } + void setBibliographFile( const TQString& s ) { m_bibliographFile = s; } void setPreserveFilePermissions( bool b ) { m_preserveFilePermissions = b; } // ----------------------------------------------------------------- mkisofs-options ----------- - enum whiteSpaceTreatments { noChange = 0, replace = 1, strip = 2, extended = 3 }; + enum whiteSpaceTreatments { noChange = 0, tqreplace = 1, strip = 2, extended = 3 }; void setWhiteSpaceTreatment( int i ) { m_whiteSpaceTreatment = i; } int whiteSpaceTreatment() const { return m_whiteSpaceTreatment; } - const QString& whiteSpaceTreatmentReplaceString() const { return m_whiteSpaceTreatmentReplaceString; } - void setWhiteSpaceTreatmentReplaceString( const QString& s ) { m_whiteSpaceTreatmentReplaceString = s; } + const TQString& whiteSpaceTreatmentReplaceString() const { return m_whiteSpaceTreatmentReplaceString; } + void setWhiteSpaceTreatmentReplaceString( const TQString& s ) { m_whiteSpaceTreatmentReplaceString = s; } bool discardSymlinks() const { return m_discardSymlinks; } void setDiscardSymlinks( bool b ) { m_discardSymlinks = b; } @@ -131,21 +131,21 @@ class LIBK3B_EXPORT K3bIsoOptions private: // volume descriptor - QString m_volumeID; - QString m_applicationID; - QString m_preparer; - QString m_publisher; - QString m_systemId; - QString m_volumeSetId; - QString m_abstractFile; - QString m_copyrightFile; - QString m_bibliographFile; + TQString m_volumeID; + TQString m_applicationID; + TQString m_preparer; + TQString m_publisher; + TQString m_systemId; + TQString m_volumeSetId; + TQString m_abstractFile; + TQString m_copyrightFile; + TQString m_bibliographFile; int m_volumeSetSize; int m_volumeSetNumber; bool m_bForceInputCharset; - QString m_inputCharset; + TQString m_inputCharset; // mkisofs options ------------------------------------- bool m_createRockRidge; // -r or -R @@ -174,7 +174,7 @@ class LIBK3B_EXPORT K3bIsoOptions int m_whiteSpaceTreatment; - QString m_whiteSpaceTreatmentReplaceString; + TQString m_whiteSpaceTreatmentReplaceString; bool m_discardSymlinks; bool m_discardBrokenSymlinks; diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp index a3579ec..5fdb526 100644 --- a/libk3b/projects/datacd/k3bmkisofshandler.cpp +++ b/libk3b/projects/datacd/k3bmkisofshandler.cpp @@ -61,7 +61,7 @@ const K3bExternalBin* K3bMkisofsHandler::initMkisofs() if( d->mkisofsBin ) { if( !d->mkisofsBin->copyright.isEmpty() ) handleMkisofsInfoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .arg("mkisofs").arg(d->mkisofsBin->version).arg(d->mkisofsBin->copyright), + .tqarg("mkisofs").tqarg(d->mkisofsBin->version).tqarg(d->mkisofsBin->copyright), K3bJob::INFO ); d->firstProgressValue = -1; @@ -76,14 +76,14 @@ const K3bExternalBin* K3bMkisofsHandler::initMkisofs() } -void K3bMkisofsHandler::parseMkisofsOutput( const QString& line ) +void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line ) { if( !line.isEmpty() ) { if( line.startsWith( d->mkisofsBin->path ) ) { // error or warning - QString errorLine = line.mid( d->mkisofsBin->path.length() + 2 ); + TQString errorLine = line.mid( d->mkisofsBin->path.length() + 2 ); if( errorLine.startsWith( "Input/output error. Cannot read from" ) ) { - handleMkisofsInfoMessage( i18n("Read error from file '%1'").arg( errorLine.mid( 38, errorLine.length()-40 ) ), + handleMkisofsInfoMessage( i18n("Read error from file '%1'").tqarg( errorLine.mid( 38, errorLine.length()-40 ) ), K3bJob::ERROR ); d->readError = true; } @@ -93,17 +93,17 @@ void K3bMkisofsHandler::parseMkisofsOutput( const QString& line ) d->readError = true; } } - else if( line.contains( "done, estimate" ) ) { + else if( line.tqcontains( "done, estimate" ) ) { int p = parseMkisofsProgress( line ); if( p != -1 ) handleMkisofsProgress( p ); } - else if( line.contains( "extents written" ) ) { + else if( line.tqcontains( "extents written" ) ) { handleMkisofsProgress( 100 ); } else if( line.startsWith( "Incorrectly encoded string" ) ) { handleMkisofsInfoMessage( i18n("Encountered an incorrectly encoded filename '%1'") - .arg(line.section( QRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR ); + .tqarg(line.section( TQRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR ); handleMkisofsInfoMessage( i18n("This may be caused by a system update which changed the local character set."), K3bJob::ERROR ); handleMkisofsInfoMessage( i18n("You may use convmv (http://j3e.de/linux/convmv/) to fix the filename encoding."), K3bJob::ERROR ); d->readError = true; @@ -124,7 +124,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const QString& line ) } -int K3bMkisofsHandler::parseMkisofsProgress( const QString& line ) +int K3bMkisofsHandler::parseMkisofsProgress( const TQString& line ) { // // in multisession mode mkisofs' progress does not start at 0 but at (X+Y)/X @@ -133,8 +133,8 @@ int K3bMkisofsHandler::parseMkisofsProgress( const QString& line ) // We just save the first emitted progress value and to some math ;) // - QString perStr = line; - perStr.truncate( perStr.find('%') ); + TQString perStr = line; + perStr.truncate( perStr.tqfind('%') ); bool ok; double p = perStr.toDouble( &ok ); if( !ok ) { diff --git a/libk3b/projects/datacd/k3bmkisofshandler.h b/libk3b/projects/datacd/k3bmkisofshandler.h index 32576bc..0692b4e 100644 --- a/libk3b/projects/datacd/k3bmkisofshandler.h +++ b/libk3b/projects/datacd/k3bmkisofshandler.h @@ -16,7 +16,7 @@ #ifndef _K3B_MKISOfS_HANDLER_H_ #define _K3B_MKISOfS_HANDLER_H_ -#include <qstring.h> +#include <tqstring.h> class K3bExternalBin; @@ -45,13 +45,13 @@ class K3bMkisofsHandler */ const K3bExternalBin* initMkisofs(); - void parseMkisofsOutput( const QString& line ); + void parseMkisofsOutput( const TQString& line ); /** * Used internally by handleMkisofsOutput. * May be used in case handleMkisofsOutput is not sufficient. */ - int parseMkisofsProgress( const QString& line ); + int parseMkisofsProgress( const TQString& line ); /** * Called by handleMkisofsOutput @@ -63,7 +63,7 @@ class K3bMkisofsHandler * * Uses K3bJob::MessageType */ - virtual void handleMkisofsInfoMessage( const QString&, int ) = 0; + virtual void handleMkisofsInfoMessage( const TQString&, int ) = 0; private: class Private; diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index c30d0ff..14eca4f 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -27,11 +27,11 @@ #include <kprocess.h> #include <kdebug.h> -#include <qstringlist.h> +#include <tqstringlist.h> -K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_process(0), m_device(0), m_dvd(false) @@ -53,7 +53,7 @@ void K3bMsInfoFetcher::start() if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) { kdDebug() << "(K3bMsInfoFetcher) could not find cdrecord executable" << endl; - emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), K3bJob::ERROR ); jobFinished(false); return; } @@ -70,9 +70,9 @@ void K3bMsInfoFetcher::start() // connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) ); } @@ -89,7 +89,7 @@ void K3bMsInfoFetcher::getMsInfo() bin = k3bcore->externalBinManager()->binObject( "cdrecord" ); if( !bin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR ); jobFinished(false); return; } @@ -97,38 +97,38 @@ void K3bMsInfoFetcher::getMsInfo() *m_process << bin->path; // add the device (e.g. /dev/sg1) - *m_process << QString("dev=%1").arg( K3b::externalBinDeviceParameter(m_device, bin) ); + *m_process << TQString("dev=%1").tqarg( K3b::externalBinDeviceParameter(m_device, bin) ); *m_process << "-msinfo"; // additional user parameters from config - const QStringList& params = bin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = bin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; kdDebug() << "***** " << bin->name() << " parameters:\n"; - const QValueList<QCString>& args = m_process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = m_process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; emit debuggingOutput( "msinfo command:", s ); - // connect( m_process, SIGNAL(receivedStderr(KProcess*, char*, int)), - // this, SLOT(slotCollectOutput(KProcess*, char*, int)) ); - connect( m_process, SIGNAL(receivedStdout(KProcess*, char*, int)), - this, SLOT(slotCollectOutput(KProcess*, char*, int)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited()) ); + // connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + // this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), + this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited()) ); - m_msInfo = QString::null; - m_collectedOutput = QString::null; + m_msInfo = TQString(); + m_collectedOutput = TQString(); m_canceled = false; if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { - emit infoMessage( i18n("Could not start %1.").arg(bin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(bin->name()), K3bJob::ERROR ); jobFinished(false); } } @@ -161,7 +161,7 @@ void K3bMsInfoFetcher::slotMediaDetectionFinished( K3bDevice::DeviceHandler* h ) } else { emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.") - .arg( m_device->vendor() + " " + m_device->description() ), ERROR ); + .tqarg( m_device->vendor() + " " + m_device->description() ), ERROR ); jobFinished( false ); } } @@ -190,8 +190,8 @@ void K3bMsInfoFetcher::slotProcessExited() kdDebug() << "(K3bMsInfoFetcher) msinfo fetched" << endl; // now parse the output - QString firstLine = m_collectedOutput.left( m_collectedOutput.find("\n") ); - QStringList list = QStringList::split( ",", firstLine ); + TQString firstLine = m_collectedOutput.left( m_collectedOutput.tqfind("\n") ); + TQStringList list = TQStringList::split( ",", firstLine ); if( list.count() == 2 ) { bool ok1, ok2; m_lastSessionStart = list.first().toInt( &ok1 ); @@ -199,10 +199,10 @@ void K3bMsInfoFetcher::slotProcessExited() if( ok1 && ok2 ) m_msInfo = firstLine.stripWhiteSpace(); else - m_msInfo = QString::null; + m_msInfo = TQString(); } else { - m_msInfo = QString::null; + m_msInfo = TQString(); } kdDebug() << "(K3bMsInfoFetcher) msinfo parsed: " << m_msInfo << endl; @@ -220,9 +220,9 @@ void K3bMsInfoFetcher::slotProcessExited() void K3bMsInfoFetcher::slotCollectOutput( KProcess*, char* output, int len ) { - emit debuggingOutput( "msinfo", QString::fromLocal8Bit( output, len ) ); + emit debuggingOutput( "msinfo", TQString::fromLocal8Bit( output, len ) ); - m_collectedOutput += QString::fromLocal8Bit( output, len ); + m_collectedOutput += TQString::fromLocal8Bit( output, len ); } diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h index 593664f..da609cb 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.h +++ b/libk3b/projects/datacd/k3bmsinfofetcher.h @@ -27,12 +27,13 @@ class KProcess; class K3bMsInfoFetcher : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bMsInfoFetcher( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bMsInfoFetcher( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bMsInfoFetcher(); - const QString& msInfo() const { return m_msInfo; } + const TQString& msInfo() const { return m_msInfo; } int lastSessionStart() const { return m_lastSessionStart; } int nextSessionStart() const { return m_nextSessionStart; } @@ -49,10 +50,10 @@ class K3bMsInfoFetcher : public K3bJob void getMsInfo(); private: - QString m_msInfo; + TQString m_msInfo; int m_lastSessionStart; int m_nextSessionStart; - QString m_collectedOutput; + TQString m_collectedOutput; KProcess* m_process; K3bDevice::Device* m_device; diff --git a/libk3b/projects/datacd/k3bsessionimportitem.cpp b/libk3b/projects/datacd/k3bsessionimportitem.cpp index 35f7936..9173d5e 100644 --- a/libk3b/projects/datacd/k3bsessionimportitem.cpp +++ b/libk3b/projects/datacd/k3bsessionimportitem.cpp @@ -29,8 +29,8 @@ K3bSessionImportItem::K3bSessionImportItem( const K3bIso9660File* isoF, K3bDataD setK3bName( isoF->name() ); // add automagically like a qlistviewitem - if( parent() ) - parent()->addDataItem( this ); + if( tqparent() ) + tqparent()->addDataItem( this ); } @@ -47,9 +47,9 @@ K3bSessionImportItem::~K3bSessionImportItem() if( m_replaceItem ) m_replaceItem->setReplacedItemFromOldSession(0); - // remove this from parentdir - if( parent() ) - parent()->takeDataItem( this ); + // remove this from tqparentdir + if( tqparent() ) + tqparent()->takeDataItem( this ); } diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h index 05005ed..e2efa6c 100644 --- a/libk3b/projects/datacd/k3bspecialdataitem.h +++ b/libk3b/projects/datacd/k3bspecialdataitem.h @@ -29,15 +29,15 @@ class K3bSpecialDataItem : public K3bDataItem { public: - K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* parent = 0, const QString& k3bName = QString::null ) - : K3bDataItem( doc, parent ), + K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* tqparent = 0, const TQString& k3bName = TQString() ) + : K3bDataItem( doc, tqparent ), m_size( size ) { setK3bName( k3bName ); // add automagically like a qlistviewitem - if( parent ) - parent->addDataItem( this ); + if( tqparent ) + tqparent->addDataItem( this ); } K3bSpecialDataItem( const K3bSpecialDataItem& item ) @@ -47,17 +47,17 @@ class K3bSpecialDataItem : public K3bDataItem } ~K3bSpecialDataItem() { - // remove this from parentdir - if( parent() ) - parent()->takeDataItem( this ); + // remove this from tqparentdir + if( tqparent() ) + tqparent()->takeDataItem( this ); } K3bDataItem* copy() const { return new K3bSpecialDataItem( *this ); } - void setMimeType( const QString& s ) { m_mimeType = s; } - const QString& mimeType() const { return m_mimeType; } + void setMimeType( const TQString& s ) { m_mimeType = s; } + const TQString& mimeType() const { return m_mimeType; } bool isSpecialFile() const { return true; } @@ -68,7 +68,7 @@ class K3bSpecialDataItem : public K3bDataItem KIO::filesize_t itemSize( bool ) const { return m_size; } private: - QString m_mimeType; + TQString m_mimeType; KIO::filesize_t m_size; }; diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp index f703452..f5dea6b 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp @@ -29,8 +29,8 @@ #include <klocale.h> #include <kdebug.h> -#include <qvaluelist.h> -#include <qregexp.h> +#include <tqvaluelist.h> +#include <tqregexp.h> #include <errno.h> #include <string.h> @@ -61,8 +61,8 @@ public: }; -K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_action(0) { d = new Private; @@ -82,15 +82,15 @@ void K3bDvdBooktypeJob::setForceNoEject( bool b ) } -QString K3bDvdBooktypeJob::jobDescription() const +TQString K3bDvdBooktypeJob::jobDescription() const { return i18n("Changing DVD Booktype"); // Changing DVD±R(W) Booktype } -QString K3bDvdBooktypeJob::jobDetails() const +TQString K3bDvdBooktypeJob::jobDetails() const { - return QString::null; + return TQString(); } @@ -118,7 +118,7 @@ void K3bDvdBooktypeJob::start() K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY, K3bDevice::MEDIA_DVD_PLUS_RW|K3bDevice::MEDIA_DVD_PLUS_R, i18n("Please insert an empty DVD+R or a DVD+RW medium into drive<p><b>%1 %2 (%3)</b>.") - .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) { + .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) { emit canceled(); jobFinished(false); d->running = false; @@ -129,9 +129,9 @@ void K3bDvdBooktypeJob::start() emit newTask( i18n("Checking media") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) ); } else { // change writer defaults @@ -170,7 +170,7 @@ void K3bDvdBooktypeJob::setDevice( K3bDevice::Device* dev ) } -void K3bDvdBooktypeJob::slotStderrLine( const QString& line ) +void K3bDvdBooktypeJob::slotStderrLine( const TQString& line ) { emit debuggingOutput( "dvd+rw-booktype", line ); // FIXME @@ -189,7 +189,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) d->success = true; } else { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdBooktypeBin->name()).arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdBooktypeBin->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -197,7 +197,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdBooktypeBin->name()), + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdBooktypeBin->name()), ERROR ); d->success = false; } @@ -216,9 +216,9 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) else { emit infoMessage( i18n("Ejecting DVD..."), INFO ); connect( K3bDevice::eject( d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); } } else { @@ -280,12 +280,12 @@ void K3bDvdBooktypeJob::startBooktypeChange() d->process = new K3bProcess(); d->process->setRunPrivileged(true); d->process->setSuppressEmptyLines(true); - connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStderrLine(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStderrLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessFinished(KProcess*)) ); d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" ); if( !d->dvdBooktypeBin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-booktype"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("dvd+rw-booktype"), ERROR ); d->running = false; jobFinished(false); return; @@ -326,9 +326,9 @@ void K3bDvdBooktypeJob::startBooktypeChange() *d->process << d->device->blockDeviceName(); kdDebug() << "***** dvd+rw-booktype parameters:\n"; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << endl << flush; @@ -338,7 +338,7 @@ void K3bDvdBooktypeJob::startBooktypeChange() if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable - emit infoMessage( i18n("Could not start %1.").arg(d->dvdBooktypeBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdBooktypeBin->name()), K3bJob::ERROR ); d->running = false; jobFinished(false); } diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h index b9e7e4b..6605007 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h @@ -34,13 +34,14 @@ namespace K3bDevice { class K3bDvdBooktypeJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bDvdBooktypeJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bDvdBooktypeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bDvdBooktypeJob(); - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; /** * @list SET_MEDIA_DVD_ROM Change media identification on current media to DVD-ROM. @@ -81,7 +82,7 @@ class K3bDvdBooktypeJob : public K3bJob void setForceNoEject( bool ); private slots: - void slotStderrLine( const QString& ); + void slotStderrLine( const TQString& ); void slotProcessFinished( KProcess* ); void slotDeviceHandlerFinished( K3bDevice::DeviceHandler* ); void slotEjectingFinished( K3bDevice::DeviceHandler* ); diff --git a/libk3b/projects/datadvd/k3bdvddoc.cpp b/libk3b/projects/datadvd/k3bdvddoc.cpp index 4ab8b9f..2d6ae46 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.cpp +++ b/libk3b/projects/datadvd/k3bdvddoc.cpp @@ -22,8 +22,8 @@ #include <kconfig.h> -K3bDvdDoc::K3bDvdDoc( QObject* parent ) - : K3bDataDoc( parent ) +K3bDvdDoc::K3bDvdDoc( TQObject* tqparent ) + : K3bDataDoc( tqparent ) { } @@ -31,9 +31,9 @@ K3bDvdDoc::~K3bDvdDoc() { } -K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bDvdJob( this, hdl, parent ); + return new K3bDvdJob( this, hdl, tqparent ); } //#include "k3bdvddoc.moc" diff --git a/libk3b/projects/datadvd/k3bdvddoc.h b/libk3b/projects/datadvd/k3bdvddoc.h index 03b5c3d..20b039e 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.h +++ b/libk3b/projects/datadvd/k3bdvddoc.h @@ -23,15 +23,15 @@ class KConfig; class LIBK3B_EXPORT K3bDvdDoc : public K3bDataDoc { public: - K3bDvdDoc( QObject* parent = 0 ); + K3bDvdDoc( TQObject* tqparent = 0 ); virtual ~K3bDvdDoc(); virtual int type() const { return DVD; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent = 0 ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); protected: - virtual QString typeString() const { return "dvd"; } + virtual TQString typeString() const { return "dvd"; } }; #endif diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp index 3cd1521..d8bb75c 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.cpp +++ b/libk3b/projects/datadvd/k3bdvdjob.cpp @@ -39,8 +39,8 @@ public: }; -K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bDataJob( doc, hdl, parent ), +K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bDataJob( doc, hdl, tqparent ), m_doc( doc ) { d = new Private(); @@ -79,7 +79,7 @@ bool K3bDvdJob::prepareWriterJob() writer->setCloseDvd( usedMultiSessionMode() == K3bDataDoc::NONE || usedMultiSessionMode() == K3bDataDoc::FINISH ); - writer->setImageToWrite( QString::null ); // read from stdin + writer->setImageToWrite( TQString() ); // read from stdin writer->setTrackSize( m_isoImager->size() ); if( usedMultiSessionMode() != K3bDataDoc::NONE ) { @@ -105,9 +105,9 @@ void K3bDvdJob::determineMultiSessionMode() } else { connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_doc->burner() ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); } } @@ -243,8 +243,8 @@ bool K3bDvdJob::waitForMedium() if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. " "Do you really want to continue? The media will be written " "for real.") - .arg(m_doc->burner()->vendor()) - .arg(m_doc->burner()->description()), + .tqarg(m_doc->burner()->vendor()) + .tqarg(m_doc->burner()->description()), i18n("No Simulation with DVD-R(W)") ) ) { return false; } @@ -271,7 +271,7 @@ bool K3bDvdJob::waitForMedium() if( m_doc->writingMode() == K3b::DAO ) // || ( m_doc->writingMode() == K3b::WRITING_MODE_AUTO && // usedMultiSessionMode() == K3bDataDoc::NONE ) ) - emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); else { // check if the writer supports writing sequential and thus multisession (on -1 the burner cannot handle @@ -279,14 +279,14 @@ bool K3bDvdJob::waitForMedium() if( m_doc->burner()->featureCurrent( K3bDevice::FEATURE_INCREMENTAL_STREAMING_WRITABLE ) == 0 ) { if( !questionYesNo( i18n("Your writer (%1 %2) does not support Incremental Streaming with %3 " "media. Multisession will not be possible. Continue anyway?") - .arg(m_doc->burner()->vendor()) - .arg(m_doc->burner()->description()) - .arg( K3bDevice::mediaTypeString(foundMedium, true) ), + .tqarg(m_doc->burner()->vendor()) + .tqarg(m_doc->burner()->description()) + .tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), i18n("No Incremental Streaming") ) ) { return false; } else { - emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); } } else { @@ -294,7 +294,7 @@ bool K3bDvdJob::waitForMedium() m_doc->writingMode() == K3b::WRITING_MODE_RES_OVWR ) emit infoMessage( i18n("Restricted Overwrite is not possible with DVD-R media."), INFO ); - emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); } } } @@ -305,7 +305,7 @@ bool K3bDvdJob::waitForMedium() } -QString K3bDvdJob::jobDescription() const +TQString K3bDvdJob::jobDescription() const { if( m_doc->onlyCreateImages() ) { return i18n("Creating Data Image File"); @@ -314,19 +314,19 @@ QString K3bDvdJob::jobDescription() const m_doc->multiSessionMode() == K3bDataDoc::AUTO ) { return i18n("Writing Data DVD") + ( m_doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); } else { return i18n("Writing Multisession DVD") + ( m_doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); } } -QString K3bDvdJob::jobDetails() const +TQString K3bDvdJob::jobDetails() const { if( m_doc->copies() > 1 && !m_doc->dummy() && @@ -335,10 +335,10 @@ QString K3bDvdJob::jobDetails() const return i18n("ISO9660 Filesystem (Size: %1) - %n copy", "ISO9660 Filesystem (Size: %1) - %n copies", m_doc->copies()) - .arg(KIO::convertSize( m_doc->size() )); + .tqarg(KIO::convertSize( m_doc->size() )); else return i18n("ISO9660 Filesystem (Size: %1)") - .arg(KIO::convertSize( m_doc->size() )); + .tqarg(KIO::convertSize( m_doc->size() )); } #include "k3bdvdjob.moc" diff --git a/libk3b/projects/datadvd/k3bdvdjob.h b/libk3b/projects/datadvd/k3bdvdjob.h index 381bc1d..3bdf7b6 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.h +++ b/libk3b/projects/datadvd/k3bdvdjob.h @@ -19,7 +19,7 @@ #include <k3bdatajob.h> -#include <qfile.h> +#include <tqfile.h> class K3bDataDoc; class K3bGrowisofsWriter; @@ -28,16 +28,17 @@ class K3bGrowisofsWriter; class K3bDvdJob : public K3bDataJob { Q_OBJECT + TQ_OBJECT public: /** * To be more flexible we allow writing of any data doc */ - K3bDvdJob( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bDvdJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); virtual ~K3bDvdJob(); - virtual QString jobDescription() const; - virtual QString jobDetails() const; + virtual TQString jobDescription() const; + virtual TQString jobDetails() const; protected: void prepareData(); diff --git a/libk3b/projects/datadvd/k3bdvdview.cpp b/libk3b/projects/datadvd/k3bdvdview.cpp index 512ec4b..dc5f67a 100644 --- a/libk3b/projects/datadvd/k3bdvdview.cpp +++ b/libk3b/projects/datadvd/k3bdvdview.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -K3bDvdView::K3bDvdView( K3bDvdDoc* doc, QWidget *parent, const char *name ) - : K3bDataView( doc, parent, name ) +K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bDataView( doc, tqparent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView() } -K3bProjectBurnDialog* K3bDvdView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bDvdBurnDialog( m_doc, parent, name, true ); + return new K3bDvdBurnDialog( m_doc, tqparent, name, true ); } #include "k3bdvdview.moc" diff --git a/libk3b/projects/datadvd/k3bdvdview.h b/libk3b/projects/datadvd/k3bdvdview.h index d9f30f3..1072cc2 100644 --- a/libk3b/projects/datadvd/k3bdvdview.h +++ b/libk3b/projects/datadvd/k3bdvdview.h @@ -25,13 +25,14 @@ class K3bDvdDoc; class K3bDvdView : public K3bDataView { Q_OBJECT + TQ_OBJECT public: - K3bDvdView( K3bDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bDvdView(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private: K3bDvdDoc* m_doc; diff --git a/libk3b/projects/k3babstractwriter.cpp b/libk3b/projects/k3babstractwriter.cpp index df22bc3..61d2ac6 100644 --- a/libk3b/projects/k3babstractwriter.cpp +++ b/libk3b/projects/k3babstractwriter.cpp @@ -26,8 +26,8 @@ -K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_burnDevice(dev), m_burnSpeed(1), m_simulate(false), @@ -55,8 +55,8 @@ void K3bAbstractWriter::cancel() if( burnDevice() ) { // we need to unlock the writer because cdrecord locked it while writing emit infoMessage( i18n("Unlocking drive..."), INFO ); - connect( K3bDevice::unblock( burnDevice() ), SIGNAL(finished(bool)), - this, SLOT(slotUnblockWhileCancellationFinished(bool)) ); + connect( K3bDevice::unblock( burnDevice() ), TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotUnblockWhileCancellationFinished(bool)) ); } else { emit canceled(); @@ -72,8 +72,8 @@ void K3bAbstractWriter::slotUnblockWhileCancellationFinished( bool success ) if( k3bcore->globalSettings()->ejectMedia() ) { emit newSubTask( i18n("Ejecting CD") ); // FIXME: "media" instead of "CD" - connect( K3bDevice::eject( burnDevice() ), SIGNAL(finished(bool)), - this, SLOT(slotEjectWhileCancellationFinished(bool)) ); + connect( K3bDevice::eject( burnDevice() ), TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotEjectWhileCancellationFinished(bool)) ); } else { emit canceled(); diff --git a/libk3b/projects/k3babstractwriter.h b/libk3b/projects/k3babstractwriter.h index 3f91ee3..b6f4e1d 100644 --- a/libk3b/projects/k3babstractwriter.h +++ b/libk3b/projects/k3babstractwriter.h @@ -20,7 +20,7 @@ #include "k3bjob.h" -#include <qdatetime.h> +#include <tqdatetime.h> class K3bDevice::Device; class K3bJobHandler; @@ -29,6 +29,7 @@ class K3bJobHandler; class K3bAbstractWriter : public K3bJob { Q_OBJECT + TQ_OBJECT public: virtual ~K3bAbstractWriter(); @@ -73,7 +74,7 @@ class K3bAbstractWriter : public K3bJob protected: K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); bool wasSourceUnreadable() const { return m_sourceUnreadable; } diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index c49cb4b..3339581 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -27,16 +27,16 @@ #include <k3bglobals.h> #include <k3bglobalsettings.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> -#include <qregexp.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qurl.h> -#include <qsocket.h> -#include <qsocketdevice.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> +#include <tqregexp.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqurl.h> +#include <tqsocket.h> +#include <tqsocketdevice.h> #include <klocale.h> #include <kdebug.h> @@ -124,8 +124,8 @@ public: K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - QObject* parent, const char* name ) - : K3bAbstractWriter( dev, hdl, parent, name ), + TQObject* tqparent, const char* name ) + : K3bAbstractWriter( dev, hdl, tqparent, name ), m_command(WRITE), m_blankMode(MINIMAL), m_sourceDevice(0), @@ -146,8 +146,8 @@ K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, { d = new Private(); d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, SIGNAL(throughput(int)), - this, SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQT_SIGNAL(throughput(int)), + this, TQT_SLOT(slotThroughput(int)) ); m_eject = k3bcore->globalSettings()->ejectMedia(); @@ -161,13 +161,13 @@ K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, else { delete m_comSock; - m_comSock = new QSocket(); + m_comSock = new TQSocket(); m_comSock->setSocket(m_cdrdaoComm[1]); m_comSock->socketDevice()->setReceiveBufferSize(49152); - // magic number from Qt documentation + // magic number from TQt documentation m_comSock->socketDevice()->setBlocking(false); - connect( m_comSock, SIGNAL(readyRead()), - this, SLOT(parseCdrdaoMessage())); + connect( m_comSock, TQT_SIGNAL(readyRead()), + this, TQT_SLOT(parseCdrdaoMessage())); } } @@ -253,7 +253,7 @@ void K3bCdrdaoWriter::setWriteArguments() { *m_process << "--driver"; if( burnDevice()->cdTextCapable() == 1 ) - *m_process << QString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() ); + *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() ); else *m_process << burnDevice()->cdrdaoDriver(); } @@ -264,7 +264,7 @@ void K3bCdrdaoWriter::setWriteArguments() // burn speed if( d->usedSpeed != 0 ) - *m_process << "--speed" << QString("%1").arg(d->usedSpeed); + *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed); //simulate if( simulate() ) @@ -283,7 +283,7 @@ void K3bCdrdaoWriter::setWriteArguments() if( m_cdrdaoBinObject->hasFeature( "disable-burnproof" ) ) *m_process << "--buffer-under-run-protection" << "0"; else - emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").arg(m_cdrdaoBinObject->version), WARNING ); + emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").tqarg(m_cdrdaoBinObject->version), WARNING ); } if( k3bcore->globalSettings()->force() ) { @@ -298,7 +298,7 @@ void K3bCdrdaoWriter::setWriteArguments() // one buffer in cdrdao holds 1 second of audio data = 75 frames = 75 * 2352 bytes // int bufSizeInMb = k3bcore->globalSettings()->bufferSize(); - *m_process << "--buffers" << QString::number( bufSizeInMb*1024*1024/(75*2352) ); + *m_process << "--buffers" << TQString::number( bufSizeInMb*1024*1024/(75*2352) ); } bool overburn = @@ -307,7 +307,7 @@ void K3bCdrdaoWriter::setWriteArguments() if( m_cdrdaoBinObject->hasFeature("overburn") ) *m_process << "--overburn"; else - emit infoMessage( i18n("Cdrdao %1 does not support overburning.").arg(m_cdrdaoBinObject->version), WARNING ); + emit infoMessage( i18n("Cdrdao %1 does not support overburning.").tqarg(m_cdrdaoBinObject->version), WARNING ); } } @@ -342,17 +342,17 @@ void K3bCdrdaoWriter::setReadArguments() // TAO Source Adjust if ( m_taoSourceAdjust != -1 ) *m_process << "--tao-source-adjust" - << QString("%1").arg(m_taoSourceAdjust); + << TQString("%1").tqarg(m_taoSourceAdjust); // paranoia Mode if ( m_paranoiaMode != -1 ) *m_process << "--paranoia-mode" - << QString("%1").arg(m_paranoiaMode); + << TQString("%1").tqarg(m_paranoiaMode); // session if ( m_session != -1 ) *m_process << "--session" - << QString("%1").arg(m_session); + << TQString("%1").tqarg(m_session); // fast TOC if ( m_fastToc ) @@ -386,7 +386,7 @@ void K3bCdrdaoWriter::setBlankArguments() { *m_process << "--driver"; if( burnDevice()->cdTextCapable() == 1 ) - *m_process << QString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() ); + *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() ); else *m_process << burnDevice()->cdrdaoDriver(); } @@ -397,7 +397,7 @@ void K3bCdrdaoWriter::setBlankArguments() // burn speed if( d->usedSpeed != 0 ) - *m_process << "--speed" << QString("%1").arg(d->usedSpeed); + *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed); // blank-mode *m_process << "--blank-mode"; @@ -416,8 +416,8 @@ void K3bCdrdaoWriter::setCommonArguments() { // additional user parameters from config - const QStringList& params = m_cdrdaoBinObject->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = m_cdrdaoBinObject->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; @@ -432,7 +432,7 @@ void K3bCdrdaoWriter::setCommonArguments() *m_process << "--eject"; // remote - *m_process << "--remote" << QString("%1").arg(m_cdrdaoComm[0]); + *m_process << "--remote" << TQString("%1").tqarg(m_cdrdaoComm[0]); // data File if ( ! m_dataFile.isEmpty() ) @@ -446,7 +446,7 @@ void K3bCdrdaoWriter::setCommonArguments() *m_process << m_tocFile; } -K3bCdrdaoWriter* K3bCdrdaoWriter::addArgument( const QString& arg ) +K3bCdrdaoWriter* K3bCdrdaoWriter::addArgument( const TQString& arg ) { *m_process << arg; return this; @@ -464,10 +464,10 @@ void K3bCdrdaoWriter::start() m_process->setRunPrivileged(true); m_process->setSplitStdout(false); m_process->setRawStdin(true); - connect( m_process, SIGNAL(stderrLine(const QString&)), - this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), + this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*)) ); m_canceled = false; m_knownError = false; @@ -475,7 +475,7 @@ void K3bCdrdaoWriter::start() m_cdrdaoBinObject = k3bcore->externalBinManager()->binObject("cdrdao"); if( !m_cdrdaoBinObject ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("cdrdao"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrdao"), ERROR ); jobFinished(false); return; } @@ -483,7 +483,7 @@ void K3bCdrdaoWriter::start() emit debuggingOutput( "Used versions", "cdrdao: " + m_cdrdaoBinObject->version ); if( !m_cdrdaoBinObject->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(m_cdrdaoBinObject->name()).arg(m_cdrdaoBinObject->version).arg(m_cdrdaoBinObject->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(m_cdrdaoBinObject->name()).tqarg(m_cdrdaoBinObject->version).tqarg(m_cdrdaoBinObject->copyright), INFO ); // the message size changed in cdrdao 1.1.8) @@ -516,7 +516,7 @@ void K3bCdrdaoWriter::start() m_backupTocFile = m_tocFile + ".k3bbak"; // workaround, cdrdao deletes the tocfile when --remote parameter is set - if ( !KIO::NetAccess::copy(KURL(m_tocFile),KURL(m_backupTocFile), (QWidget*) 0) ) + if ( !KIO::NetAccess::copy(KURL(m_tocFile),KURL(m_backupTocFile), (TQWidget*) 0) ) { kdDebug() << "(K3bCdrdaoWriter) could not backup " << m_tocFile << " to " << m_backupTocFile << endl; emit infoMessage( i18n("Could not backup tocfile."), ERROR ); @@ -532,12 +532,12 @@ void K3bCdrdaoWriter::start() } prepareArgumentList(); // set working dir to dir part of toc file (to allow rel names in toc-file) - m_process->setWorkingDirectory(QUrl(m_tocFile).dirPath()); + m_process->setWorkingDirectory(TQUrl(m_tocFile).dirPath()); kdDebug() << "***** cdrdao parameters:\n"; - const QValueList<QCString>& args = m_process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) + const TQValueList<TQCString>& args = m_process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } @@ -582,7 +582,7 @@ void K3bCdrdaoWriter::start() // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bCdrdaoWriter) could not start cdrdao" << endl; - emit infoMessage( i18n("Could not start %1.").arg("cdrdao"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg("cdrdao"), K3bJob::ERROR ); jobFinished(false); } else @@ -592,13 +592,13 @@ void K3bCdrdaoWriter::start() case WRITE: if( simulate() ) { - emit infoMessage(i18n("Starting DAO simulation at %1x speed...").arg(d->usedSpeed), + emit infoMessage(i18n("Starting DAO simulation at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit newTask( i18n("Simulating") ); } else { - emit infoMessage( i18n("Starting DAO writing at %1x speed...").arg(d->usedSpeed), K3bJob::INFO ); + emit infoMessage( i18n("Starting DAO writing at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit newTask( i18n("Writing") ); } break; @@ -609,12 +609,12 @@ void K3bCdrdaoWriter::start() case COPY: if( simulate() ) { - emit infoMessage(i18n("Starting simulation copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO ); + emit infoMessage(i18n("Starting simulation copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit newTask( i18n("Simulating") ); } else { - emit infoMessage( i18n("Starting copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO ); + emit infoMessage( i18n("Starting copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit newTask( i18n("Copying") ); } break; @@ -658,41 +658,41 @@ bool K3bCdrdaoWriter::cueSheet() // TODO: do this in the K3bCueFileParser if ( m_tocFile.lower().endsWith( ".cue" ) ) { - QFile f( m_tocFile ); + TQFile f( m_tocFile ); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); if ( !ts.eof() ) { - QString line = ts.readLine(); + TQString line = ts.readLine(); f.close(); - int pos = line.find( "FILE \"" ); + int pos = line.tqfind( "FILE \"" ); if( pos < 0 ) return false; pos += 6; - int endPos = line.find( "\" BINARY", pos+1 ); + int endPos = line.tqfind( "\" BINARY", pos+1 ); if( endPos < 0 ) return false; line = line.mid( pos, endPos-pos ); - QFileInfo fi( QFileInfo( m_tocFile ).dirPath() + "/" + QFileInfo( line ).fileName() ); - QString binpath = fi.filePath(); - kdDebug() << QString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").arg( line ) << endl; - kdDebug() << QString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").arg( binpath ) << endl; + TQFileInfo fi( TQFileInfo( m_tocFile ).dirPath() + "/" + TQFileInfo( line ).fileName() ); + TQString binpath = fi.filePath(); + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").tqarg( line ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").tqarg( binpath ) << endl; if ( !fi.exists() ) return false; KTempFile tempF; - QString tempFile = tempF.name(); + TQString tempFile = tempF.name(); tempF.unlink(); - if ( symlink(QFile::encodeName( binpath ), QFile::encodeName( tempFile + ".bin") ) == -1 ) + if ( symlink(TQFile::encodeName( binpath ), TQFile::encodeName( tempFile + ".bin") ) == -1 ) return false; - if ( symlink(QFile::encodeName( m_tocFile ), QFile::encodeName( tempFile + ".cue") ) == -1 ) + if ( symlink(TQFile::encodeName( m_tocFile ), TQFile::encodeName( tempFile + ".cue") ) == -1 ) return false; - kdDebug() << QString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").arg( tempFile ) << endl; - kdDebug() << QString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").arg( tempFile ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").tqarg( tempFile ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").tqarg( tempFile ) << endl; m_binFileLnk = tempFile + ".bin"; m_cueFileLnk = tempFile + ".cue"; return true; @@ -703,7 +703,7 @@ bool K3bCdrdaoWriter::cueSheet() return false; } -void K3bCdrdaoWriter::slotStdLine( const QString& line ) +void K3bCdrdaoWriter::slotStdLine( const TQString& line ) { parseCdrdaoLine(line); } @@ -722,20 +722,20 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) case WRITE: case COPY: if ( !m_binFileLnk.isEmpty() ) { - KIO::NetAccess::del(KURL::fromPathOrURL(m_cueFileLnk), (QWidget*) 0); - KIO::NetAccess::del(KURL::fromPathOrURL(m_binFileLnk), (QWidget*) 0); + KIO::NetAccess::del(KURL::fromPathOrURL(m_cueFileLnk), (TQWidget*) 0); + KIO::NetAccess::del(KURL::fromPathOrURL(m_binFileLnk), (TQWidget*) 0); } - else if( (!QFile::exists( m_tocFile ) || K3b::filesize( KURL::fromPathOrURL(m_tocFile) ) == 0 ) && !m_onTheFly ) + else if( (!TQFile::exists( m_tocFile ) || K3b::filesize( KURL::fromPathOrURL(m_tocFile) ) == 0 ) && !m_onTheFly ) { // cdrdao removed the tocfile :( // we need to recover it - if ( !KIO::NetAccess::copy(KURL::fromPathOrURL(m_backupTocFile), KURL::fromPathOrURL(m_tocFile), (QWidget*) 0) ) + if ( !KIO::NetAccess::copy(KURL::fromPathOrURL(m_backupTocFile), KURL::fromPathOrURL(m_tocFile), (TQWidget*) 0) ) { kdDebug() << "(K3bCdrdaoWriter) restoring tocfile " << m_tocFile << " failed." << endl; emit infoMessage( i18n("Due to a bug in cdrdao the toc/cue file %1 has been deleted. " - "K3b was unable to restore it from the backup %2.").arg(m_tocFile).arg(m_backupTocFile), ERROR ); + "K3b was unable to restore it from the backup %2.").tqarg(m_tocFile).tqarg(m_backupTocFile), ERROR ); } - else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (QWidget*) 0) ) + else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (TQWidget*) 0) ) { kdDebug() << "(K3bCdrdaoWriter) delete tocfile backkup " << m_backupTocFile << " failed." << endl; } @@ -775,7 +775,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) if( m_command == WRITE || m_command == COPY ) { int s = d->speedEst->average(); - emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); + emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); } jobFinished( true ); @@ -783,7 +783,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) default: if( !m_knownError && !wasSourceUnreadable() ) { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(m_cdrdaoBinObject->name()).arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(m_cdrdaoBinObject->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please include the debugging output in your problem report."), K3bJob::ERROR ); } @@ -794,24 +794,24 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg("cdrdao"), K3bJob::ERROR ); + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("cdrdao"), K3bJob::ERROR ); jobFinished( false ); } } -void K3bCdrdaoWriter::unknownCdrdaoLine( const QString& line ) +void K3bCdrdaoWriter::unknownCdrdaoLine( const TQString& line ) { - if( line.contains( "at speed" ) ) + if( line.tqcontains( "at speed" ) ) { // parse the speed and inform the user if cdrdao switched it down - int pos = line.find( "at speed" ); - int po2 = line.find( QRegExp("\\D"), pos + 9 ); + int pos = line.tqfind( "at speed" ); + int po2 = line.tqfind( TQRegExp("\\D"), pos + 9 ); int speed = line.mid( pos+9, po2-pos-9 ).toInt(); if( speed < d->usedSpeed ) { - emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING ); - emit infoMessage( i18n("Switching down burn speed to %1x").arg(speed), K3bJob::WARNING ); + emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING ); + emit infoMessage( i18n("Switching down burn speed to %1x").tqarg(speed), K3bJob::WARNING ); } } } @@ -825,7 +825,7 @@ void K3bCdrdaoWriter::reinitParser() m_currentTrack=0; } -void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str ) +void K3bCdrdaoWriter::parseCdrdaoLine( const TQString& str ) { emit debuggingOutput( "cdrdao", str ); // kdDebug() << "(cdrdaoparse)" << str << endl; @@ -835,7 +835,7 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str ) { parseCdrdaoError( str ); } - else if( (str).startsWith( "Wrote" ) && !str.contains("blocks") ) + else if( (str).startsWith( "Wrote" ) && !str.tqcontains("blocks") ) { parseCdrdaoWrote( str ); } @@ -870,62 +870,62 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str ) } else if( str.startsWith( "Found pre-gap" ) ) { - emit infoMessage( i18n("Found pregap: %1").arg( str.mid(str.find(":")+1) ), K3bJob::INFO ); + emit infoMessage( i18n("Found pregap: %1").tqarg( str.mid(str.tqfind(":")+1) ), K3bJob::INFO ); } else unknownCdrdaoLine(str); } -void K3bCdrdaoWriter::parseCdrdaoError( const QString& line ) +void K3bCdrdaoWriter::parseCdrdaoError( const TQString& line ) { int pos = -1; - if( line.contains( "No driver found" ) || - line.contains( "use option --driver" ) ) + if( line.tqcontains( "No driver found" ) || + line.tqcontains( "use option --driver" ) ) { emit infoMessage( i18n("No cdrdao driver found."), K3bJob::ERROR ); emit infoMessage( i18n("Please select one manually in the device settings."), K3bJob::ERROR ); emit infoMessage( i18n("For most current drives this would be 'generic-mmc'."), K3bJob::ERROR ); m_knownError = true; } - else if( line.contains( "Cannot setup device" ) ) + else if( line.tqcontains( "Cannot setup device" ) ) { // no nothing... } - else if( line.contains( "not ready") ) + else if( line.tqcontains( "not ready") ) { emit infoMessage( i18n("Device not ready, waiting."),K3bJob::WARNING ); } - else if( line.contains("Drive does not accept any cue sheet") ) + else if( line.tqcontains("Drive does not accept any cue sheet") ) { emit infoMessage( i18n("Cue sheet not accepted."), K3bJob::ERROR ); m_knownError = true; } - else if( (pos = line.find( "Illegal option" )) > 0 ) { + else if( (pos = line.tqfind( "Illegal option" )) > 0 ) { // ERROR: Illegal option: -wurst - emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrdaoBinObject->name()).arg(line.mid(pos+16)), + emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrdaoBinObject->name()).tqarg(line.mid(pos+16)), ERROR ); m_knownError = true; } - else if( line.contains( "exceeds capacity" ) ) { + else if( line.tqcontains( "exceeds capacity" ) ) { emit infoMessage( i18n("Data does not fit on disk."), ERROR ); if( m_cdrdaoBinObject->hasFeature("overburn") ) emit infoMessage( i18n("Enable overburning in the advanced K3b settings to burn anyway."), INFO ); m_knownError = true; } - // else if( !line.contains( "remote progress message" ) ) + // else if( !line.tqcontains( "remote progress message" ) ) // emit infoMessage( line, K3bJob::ERROR ); } -void K3bCdrdaoWriter::parseCdrdaoWrote( const QString& line ) +void K3bCdrdaoWriter::parseCdrdaoWrote( const TQString& line ) { int pos, po2; - pos = line.find( "Wrote" ); - po2 = line.find( " ", pos + 6 ); + pos = line.tqfind( "Wrote" ); + po2 = line.tqfind( " ", pos + 6 ); int processed = line.mid( pos+6, po2-pos-6 ).toInt(); - pos = line.find( "of" ); - po2 = line.find( " ", pos + 3 ); + pos = line.tqfind( "of" ); + po2 = line.tqfind( " ", pos + 3 ); m_size = line.mid( pos+3, po2-pos-3 ).toInt(); d->speedEst->dataWritten( processed*1024 ); @@ -1035,21 +1035,21 @@ void K3bCdrdaoWriter::slotThroughput( int t ) } -QString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin ) +TQString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin ) { if( !bin ) - return QString::null; + return TQString(); // cdrdao normally in (prefix)/bin and driver table in (prefix)/share/cdrdao - QString path = bin->path; - path.truncate( path.findRev("/") ); - path.truncate( path.findRev("/") ); + TQString path = bin->path; + path.truncate( path.tqfindRev("/") ); + path.truncate( path.tqfindRev("/") ); path += "/share/cdrdao/drivers"; - if( QFile::exists(path) ) + if( TQFile::exists(path) ) return path; else { kdDebug() << "(K3bCdrdaoWriter) could not find cdrdao driver table." << endl; - return QString::null; + return TQString(); } } @@ -1058,15 +1058,15 @@ QString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin ) // TODO: cache the drivers bool K3bCdrdaoWriter::defaultToGenericMMC( K3bDevice::Device* dev, bool writer ) { - QString driverTable = findDriverFile( m_cdrdaoBinObject ); + TQString driverTable = findDriverFile( m_cdrdaoBinObject ); if( !driverTable.isEmpty() ) { - QFile f( driverTable ); + TQFile f( driverTable ); if( f.open( IO_ReadOnly ) ) { // read all drivers - QStringList drivers; - QTextStream fStr( &f ); + TQStringList drivers; + TQTextStream fStr( &f ); while( !fStr.atEnd() ) { - QString line = fStr.readLine(); + TQString line = fStr.readLine(); if( line.isEmpty() ) continue; if( line[0] == '#' ) @@ -1079,7 +1079,7 @@ bool K3bCdrdaoWriter::defaultToGenericMMC( K3bDevice::Device* dev, bool writer ) } // search for the driver - for( QStringList::const_iterator it = drivers.begin(); it != drivers.end(); ++it ) { + for( TQStringList::const_iterator it = drivers.begin(); it != drivers.end(); ++it ) { if( (*it).section( '|', 1, 1 ) == dev->vendor() && (*it).section( '|', 2, 2 ) == dev->description() ) return false; diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h index 94a0c9f..704125d 100644 --- a/libk3b/projects/k3bcdrdaowriter.h +++ b/libk3b/projects/k3bcdrdaowriter.h @@ -25,13 +25,14 @@ class K3bExternalBin; class K3bProcess; class KProcess; class K3bDevice::Device; -class QSocket; +class TQSocket; class K3bCdrdaoWriter : public K3bAbstractWriter { Q_OBJECT + TQ_OBJECT public: @@ -40,13 +41,13 @@ class K3bCdrdaoWriter : public K3bAbstractWriter enum SubMode { None, RW, RW_RAW }; K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler*, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); ~K3bCdrdaoWriter(); /** * to be used in chain: addArgument(x)->addArgument(y) */ - K3bCdrdaoWriter* addArgument( const QString& ); + K3bCdrdaoWriter* addArgument( const TQString& ); K3bDevice::Device* sourceDevice() { return m_sourceDevice; }; int fd() const; @@ -55,9 +56,9 @@ class K3bCdrdaoWriter : public K3bAbstractWriter private: void reinitParser(); - void parseCdrdaoLine( const QString& line ); - void parseCdrdaoWrote( const QString& line ); - void parseCdrdaoError( const QString& line ); + void parseCdrdaoLine( const TQString& line ); + void parseCdrdaoWrote( const TQString& line ); + void parseCdrdaoError( const TQString& line ); public slots: void start(); @@ -70,8 +71,8 @@ class K3bCdrdaoWriter : public K3bAbstractWriter void setMulti( bool b ) { m_multi = b; } void setForce( bool b ) { m_force = b; } void setOnTheFly( bool b ) { m_onTheFly = b; } - void setDataFile( const QString& s ) { m_dataFile = s; } - void setTocFile( const QString& s ) { m_tocFile = s; } + void setDataFile( const TQString& s ) { m_dataFile = s; } + void setTocFile( const TQString& s ) { m_tocFile = s; } void setSourceDevice( K3bDevice::Device* dev ) { m_sourceDevice = dev; } void setFastToc( bool b ) { m_fastToc = b; } @@ -91,13 +92,13 @@ class K3bCdrdaoWriter : public K3bAbstractWriter void setForceNoEject( bool b ) { m_forceNoEject = b; } private slots: - void slotStdLine( const QString& line ); + void slotStdLine( const TQString& line ); void slotProcessExited(KProcess*); void parseCdrdaoMessage(); void slotThroughput( int t ); private: - void unknownCdrdaoLine( const QString& ); + void unknownCdrdaoLine( const TQString& ); void prepareArgumentList(); void setWriteArguments(); void setReadArguments(); @@ -107,7 +108,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter bool cueSheet(); - QString findDriverFile( const K3bExternalBin* bin ); + TQString findDriverFile( const K3bExternalBin* bin ); bool defaultToGenericMMC( K3bDevice::Device* dev, bool writer ); // options @@ -115,11 +116,11 @@ class K3bCdrdaoWriter : public K3bAbstractWriter int m_command; int m_blankMode; K3bDevice::Device* m_sourceDevice; - QString m_dataFile; - QString m_tocFile; - QString m_cueFileLnk; - QString m_binFileLnk; - QString m_backupTocFile; + TQString m_dataFile; + TQString m_tocFile; + TQString m_cueFileLnk; + TQString m_binFileLnk; + TQString m_backupTocFile; bool m_readRaw; bool m_multi; bool m_force; @@ -137,7 +138,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter K3bProcess* m_process; int m_cdrdaoComm[2]; - QSocket *m_comSock; + TQSocket *m_comSock; bool m_canceled; diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp index e87c767..1b02290 100644 --- a/libk3b/projects/k3bcdrecordwriter.cpp +++ b/libk3b/projects/k3bcdrecordwriter.cpp @@ -29,12 +29,12 @@ #include <k3bglobalsettings.h> #include <k3btempfile.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qurl.h> -#include <qvaluelist.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqurl.h> +#include <tqvaluelist.h> +#include <tqregexp.h> +#include <tqfile.h> #include <klocale.h> #include <kdebug.h> @@ -59,23 +59,23 @@ public: bool audio; }; - QValueList<Track> tracks; + TQValueList<Track> tracks; KTempFile* cdTextFile; }; K3bCdrecordWriter::K3bCdrecordWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - QObject* parent, const char* name ) - : K3bAbstractWriter( dev, hdl, parent, name ), + TQObject* tqparent, const char* name ) + : K3bAbstractWriter( dev, hdl, tqparent, name ), m_clone(false), m_cue(false), m_forceNoEject(false) { d = new Private(); d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, SIGNAL(throughput(int)), - this, SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQT_SIGNAL(throughput(int)), + this, TQT_SLOT(slotThroughput(int)) ); m_process = 0; m_writingMode = K3b::TAO; @@ -110,7 +110,7 @@ void K3bCdrecordWriter::setDao( bool b ) m_writingMode = ( b ? K3b::DAO : K3b::TAO ); } -void K3bCdrecordWriter::setCueFile( const QString& s) +void K3bCdrecordWriter::setCueFile( const TQString& s) { m_cue = true; m_cueFile = s; @@ -145,9 +145,9 @@ void K3bCdrecordWriter::prepareProcess() m_process->setSplitStdout(true); m_process->setSuppressEmptyLines(true); m_process->setRawStdin(true); // we only use stdin when writing on-the-fly - connect( m_process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord"); @@ -163,7 +163,7 @@ void K3bCdrecordWriter::prepareProcess() *m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?) // Again we assume the device to be set! - *m_process << QString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); + *m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); d->usedSpeed = burnSpeed(); if( d->usedSpeed == 0 ) { @@ -174,7 +174,7 @@ void K3bCdrecordWriter::prepareProcess() } d->usedSpeed /= 175; if( d->usedSpeed != 0 ) - *m_process << QString("speed=%1").arg(d->usedSpeed); + *m_process << TQString("speed=%1").tqarg(d->usedSpeed); if( m_writingMode == K3b::DAO || m_cue ) { if( burnDevice()->dao() ) @@ -226,8 +226,8 @@ void K3bCdrecordWriter::prepareProcess() } if( m_cue ) { - m_process->setWorkingDirectory(QUrl(m_cueFile).dirPath()); - *m_process << QString("cuefile=%1").arg( m_cueFile ); + m_process->setWorkingDirectory(TQUrl(m_cueFile).dirPath()); + *m_process << TQString("cuefile=%1").tqarg( m_cueFile ); } if( m_clone ) @@ -235,7 +235,7 @@ void K3bCdrecordWriter::prepareProcess() if( m_rawCdText.size() > 0 ) { delete d->cdTextFile; - d->cdTextFile = new K3bTempFile( QString::null, ".dat" ); + d->cdTextFile = new K3bTempFile( TQString(), ".dat" ); d->cdTextFile->setAutoDelete(true); d->cdTextFile->file()->writeBlock( m_rawCdText ); d->cdTextFile->close(); @@ -249,7 +249,7 @@ void K3bCdrecordWriter::prepareProcess() bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); if( manualBufferSize ) { - *m_process << QString("fs=%1m").arg( k3bcore->globalSettings()->bufferSize() ); + *m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->bufferSize() ); } bool overburn = k3bcore->globalSettings()->overburn(); @@ -257,20 +257,20 @@ void K3bCdrecordWriter::prepareProcess() if( m_cdrecordBinObject->hasFeature("overburn") ) *m_process << "-overburn"; else - emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), WARNING ); + emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), WARNING ); // additional user parameters from config - const QStringList& params = m_cdrecordBinObject->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = m_cdrecordBinObject->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; // add the user parameters - for( QStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it ) + for( TQStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it ) *m_process << *it; } -K3bCdrecordWriter* K3bCdrecordWriter::addArgument( const QString& arg ) +K3bCdrecordWriter* K3bCdrecordWriter::addArgument( const TQString& arg ) { m_arguments.append( arg ); return this; @@ -293,7 +293,7 @@ void K3bCdrecordWriter::start() prepareProcess(); if( !m_cdrecordBinObject ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), ERROR ); jobFinished(false); return; } @@ -302,15 +302,15 @@ void K3bCdrecordWriter::start() if( !m_cdrecordBinObject->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .arg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" ) - .arg(m_cdrecordBinObject->version) - .arg(m_cdrecordBinObject->copyright), INFO ); + .tqarg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" ) + .tqarg(m_cdrecordBinObject->version) + .tqarg(m_cdrecordBinObject->copyright), INFO ); kdDebug() << "***** " << m_cdrecordBinObject->name() << " parameters:\n"; - const QValueList<QCString>& args = m_process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = m_process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -343,22 +343,22 @@ void K3bCdrecordWriter::start() // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bCdrecordWriter) could not start " << m_cdrecordBinObject->name() << endl; - emit infoMessage( i18n("Could not start %1.").arg(m_cdrecordBinObject->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(m_cdrecordBinObject->name()), K3bJob::ERROR ); jobFinished(false); } else { if( simulate() ) { emit newTask( i18n("Simulating") ); emit infoMessage( i18n("Starting %1 simulation at %2x speed...") - .arg(K3b::writingModeString(m_writingMode)) - .arg(d->usedSpeed), + .tqarg(K3b::writingModeString(m_writingMode)) + .tqarg(d->usedSpeed), K3bJob::INFO ); } else { emit newTask( i18n("Writing") ); emit infoMessage( i18n("Starting %1 writing at %2x speed...") - .arg(K3b::writingModeString(m_writingMode)) - .arg(d->usedSpeed), + .tqarg(K3b::writingModeString(m_writingMode)) + .tqarg(d->usedSpeed), K3bJob::INFO ); } } @@ -375,17 +375,17 @@ void K3bCdrecordWriter::cancel() } -void K3bCdrecordWriter::slotStdLine( const QString& line ) +void K3bCdrecordWriter::slotStdLine( const TQString& line ) { - static QRegExp s_burnfreeCounterRx( "^BURN\\-Free\\swas\\s(\\d+)\\stimes\\sused" ); - static QRegExp s_burnfreeCounterRxPredict( "^Total\\sof\\s(\\d+)\\s\\spossible\\sbuffer\\sunderruns\\spredicted" ); + static TQRegExp s_burnfreeCounterRx( "^BURN\\-Free\\swas\\s(\\d+)\\stimes\\sused" ); + static TQRegExp s_burnfreeCounterRxPredict( "^Total\\sof\\s(\\d+)\\s\\spossible\\sbuffer\\sunderruns\\spredicted" ); // tracknumber: cap(1) // done: cap(2) // complete: cap(3) // fifo: cap(4) (it seems as if some patched cdrecord versions do not emit the fifo info but only the buf... :( // buffer: cap(5) - static QRegExp s_progressRx( "Track\\s(\\d\\d)\\:\\s*(\\d*)\\sof\\s*(\\d*)\\sMB\\swritten\\s(?:\\(fifo\\s*(\\d*)\\%\\)\\s*)?(?:\\[buf\\s*(\\d*)\\%\\])?.*" ); + static TQRegExp s_progressRx( "Track\\s(\\d\\d)\\:\\s*(\\d*)\\sof\\s*(\\d*)\\sMB\\swritten\\s(?:\\(fifo\\s*(\\d*)\\%\\)\\s*)?(?:\\[buf\\s*(\\d*)\\%\\])?.*" ); emit debuggingOutput( m_cdrecordBinObject->name(), line ); @@ -406,8 +406,8 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) m_totalTracks = tt; - int sizeStart = line.find( QRegExp("\\d"), 10 ); - int sizeEnd = line.find( "MB", sizeStart ); + int sizeStart = line.tqfind( TQRegExp("\\d"), 10 ); + int sizeEnd = line.tqfind( "MB", sizeStart ); track.size = line.mid( sizeStart, sizeEnd-sizeStart ).toInt(&ok); if( ok ) { @@ -474,7 +474,7 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) line.startsWith( m_cdrecordBinObject->path ) || line.startsWith( m_cdrecordBinObject->path.left(m_cdrecordBinObject->path.length()-5) ) ) { // get rid of the path and the following colon and space - QString errStr = line.mid( line.find(':') + 2 ); + TQString errStr = line.mid( line.tqfind(':') + 2 ); if( errStr.startsWith( "Drive does not support SAO" ) ) { emit infoMessage( i18n("DAO (Disk At Once) recording not supported with this writer"), K3bJob::ERROR ); @@ -508,9 +508,9 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) else if( errStr.startsWith("Bad Option") ) { m_cdrecordError = BAD_OPTION; // parse option - int pos = line.find( "Bad Option" ) + 13; + int pos = line.tqfind( "Bad Option" ) + 13; int len = line.length() - pos - 1; - emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrecordBinObject->name()).arg(line.mid(pos, len)), + emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrecordBinObject->name()).tqarg(line.mid(pos, len)), ERROR ); } else if( errStr.startsWith("Cannot set speed/dummy") ) { @@ -556,17 +556,17 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) // All other messages // - else if( line.contains( "at speed" ) ) { + else if( line.tqcontains( "at speed" ) ) { // parse the speed and inform the user if cdrdao switched it down - int pos = line.find( "at speed" ); - int pos2 = line.find( "in", pos+9 ); + int pos = line.tqfind( "at speed" ); + int pos2 = line.tqfind( "in", pos+9 ); int speed = static_cast<int>( line.mid( pos+9, pos2-pos-10 ).toDouble() ); // cdrecord-dvd >= 2.01a25 uses 8.0 and stuff if( speed != d->usedSpeed ) { - emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING ); + emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING ); if( speed > d->usedSpeed ) - emit infoMessage( i18n("Switching burn speed up to %1x").arg(speed), K3bJob::WARNING ); + emit infoMessage( i18n("Switching burn speed up to %1x").tqarg(speed), K3bJob::WARNING ); else - emit infoMessage( i18n("Switching burn speed down to %1x").arg(speed), K3bJob::WARNING ); + emit infoMessage( i18n("Switching burn speed down to %1x").tqarg(speed), K3bJob::WARNING ); } } else if( line.startsWith( "Starting new" ) ) { @@ -640,10 +640,10 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) if( ok ) emit infoMessage( i18n("Buffer was low 1 time.", "Buffer was low %n times.", num), INFO ); } - else if( line.contains("Medium Error") ) { + else if( line.tqcontains("Medium Error") ) { m_cdrecordError = MEDIUM_ERROR; } - else if( line.startsWith( "Error trying to open" ) && line.contains( "(Device or resource busy)" ) ) { + else if( line.startsWith( "Error trying to open" ) && line.tqcontains( "(Device or resource busy)" ) ) { m_cdrecordError = DEVICE_BUSY; } else { @@ -682,7 +682,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) emit infoMessage( i18n("Writing successfully completed"), K3bJob::SUCCESS ); int s = d->speedEst->average(); - emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); + emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); jobFinished( true ); } @@ -709,14 +709,14 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) // error message has already been emited earlier since we needed the actual line break; case SHMGET_FAILED: - emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").arg(m_cdrecordBinObject->name()), ERROR ); + emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").tqarg(m_cdrecordBinObject->name()), ERROR ); emit infoMessage( i18n("Probably you chose a too large buffer size."), ERROR ); break; case OPC_FAILED: emit infoMessage( i18n("OPC failed. Probably the writer does not like the medium."), ERROR ); break; case CANNOT_SET_SPEED: - emit infoMessage( i18n("Unable to set write speed to %1.").arg(d->usedSpeed), ERROR ); + emit infoMessage( i18n("Unable to set write speed to %1.").tqarg(d->usedSpeed), ERROR ); emit infoMessage( i18n("Probably this is lower than your writer's lowest writing speed."), ERROR ); break; case CANNOT_SEND_CUE_SHEET: @@ -734,7 +734,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) emit infoMessage( i18n("Try DAO writing mode."), ERROR ); break; case PERMISSION_DENIED: - emit infoMessage( i18n("%1 has no permission to open the device.").arg("Cdrecord"), ERROR ); + emit infoMessage( i18n("%1 has no permission to open the device.").tqarg("Cdrecord"), ERROR ); #ifdef HAVE_K3BSETUP emit infoMessage( i18n("You may use K3bsetup2 to solve this problem."), ERROR ); #endif @@ -776,7 +776,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) } else if( !wasSourceUnreadable() ) { emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .arg(m_cdrecordBinObject->name()).arg(p->exitStatus()), + .tqarg(m_cdrecordBinObject->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); if( p->exitStatus() >= 254 && m_writingMode == K3b::DAO ) { @@ -795,7 +795,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg(m_cdrecordBinObject->name()), + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(m_cdrecordBinObject->name()), ERROR ); jobFinished( false ); } diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h index 9333588..6bb9792 100644 --- a/libk3b/projects/k3bcdrecordwriter.h +++ b/libk3b/projects/k3bcdrecordwriter.h @@ -20,7 +20,7 @@ #include "k3babstractwriter.h" -#include <qstringlist.h> +#include <tqstringlist.h> class K3bExternalBin; class K3bProcess; @@ -31,10 +31,11 @@ class K3bDevice::Device; class K3bCdrecordWriter : public K3bAbstractWriter { Q_OBJECT + TQ_OBJECT public: K3bCdrecordWriter( K3bDevice::Device*, K3bJobHandler* hdl, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); ~K3bCdrecordWriter(); bool active() const; @@ -42,7 +43,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter /** * to be used in chain: addArgument(x)->addArgument(y) */ - K3bCdrecordWriter* addArgument( const QString& ); + K3bCdrecordWriter* addArgument( const TQString& ); void clearArguments(); int fd() const; @@ -53,10 +54,10 @@ class K3bCdrecordWriter : public K3bAbstractWriter void setDao( bool b ); void setWritingMode( int ); - void setCueFile( const QString& s); + void setCueFile( const TQString& s); void setClone( bool b ); - void setRawCdText( const QByteArray& a ) { m_rawCdText = a; } + void setRawCdText( const TQByteArray& a ) { m_rawCdText = a; } /** * If set true the job ignores the global K3b setting @@ -65,7 +66,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter void setForceNoEject( bool b ) { m_forceNoEject = b; } protected slots: - void slotStdLine( const QString& line ); + void slotStdLine( const TQString& line ); void slotProcessExited(KProcess*); void slotThroughput( int t ); @@ -80,7 +81,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter bool m_clone; bool m_cue; - QString m_cueFile; + TQString m_cueFile; enum CdrecordError { UNKNOWN, OVERSIZE, @@ -100,7 +101,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter DEVICE_BUSY, BLANK_FAILED }; - QStringList m_arguments; + TQStringList m_arguments; private: unsigned int m_currentTrack; @@ -114,7 +115,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter bool m_forceNoEject; - QByteArray m_rawCdText; + TQByteArray m_rawCdText; class Private; Private* d; diff --git a/libk3b/projects/k3bcuefileparser.cpp b/libk3b/projects/k3bcuefileparser.cpp index 49ca4fc..7e00c5a 100644 --- a/libk3b/projects/k3bcuefileparser.cpp +++ b/libk3b/projects/k3bcuefileparser.cpp @@ -20,29 +20,29 @@ #include <k3btrack.h> #include <k3bcdtext.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qtextstream.h> -#include <qregexp.h> -#include <qdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqtextstream.h> +#include <tqregexp.h> +#include <tqdir.h> #include <kdebug.h> -// avoid usage of QTextStream since K3b often +// avoid usage of TQTextStream since K3b often // tries to open big files (iso images) in a // cue file parser to test it. -static QString readLine( QFile* f ) +static TQString readLine( TQFile* f ) { - QString s; - Q_LONG r = f->readLine( s, 1024 ); + TQString s; + TQ_LONG r = f->readLine( s, 1024 ); if( r >= 0 ) { // remove the trailing newline return s.stripWhiteSpace(); } else { // end of file or error - return QString::null; + return TQString(); } } @@ -70,7 +70,7 @@ public: -K3bCueFileParser::K3bCueFileParser( const QString& filename ) +K3bCueFileParser::K3bCueFileParser( const TQString& filename ) : K3bImageFileReader() { d = new Private; @@ -94,9 +94,9 @@ void K3bCueFileParser::readFile() d->cdText.clear(); d->currentParsedTrack = 0; - QFile f( filename() ); + TQFile f( filename() ); if( f.open( IO_ReadOnly ) ) { - QString line = readLine( &f ); + TQString line = readLine( &f ); while( !line.isNull() ) { if( !parseLine(line) ) { @@ -136,33 +136,33 @@ void K3bCueFileParser::readFile() } -bool K3bCueFileParser::parseLine( QString& line ) +bool K3bCueFileParser::parseLine( TQString& line ) { // use cap(1) for the filename - static QRegExp fileRx( "FILE\\s\"?([^\"]*)\"?\\s[^\"\\s]*" ); + static TQRegExp fileRx( "FILE\\s\"?([^\"]*)\"?\\s[^\"\\s]*" ); // use cap(1) for the flags - static QRegExp flagsRx( "FLAGS(\\s(DCP|4CH|PRE|SCMS)){1,4}" ); + static TQRegExp flagsRx( "FLAGS(\\s(DCP|4CH|PRE|SCMS)){1,4}" ); // use cap(1) for the tracknumber and cap(2) for the datatype - static QRegExp trackRx( "TRACK\\s(\\d{1,2})\\s(AUDIO|CDG|MODE1/2048|MODE1/2352|MODE2/2336|MODE2/2352|CDI/2336|CDI/2352)" ); + static TQRegExp trackRx( "TRACK\\s(\\d{1,2})\\s(AUDIO|CDG|MODE1/2048|MODE1/2352|MODE2/2336|MODE2/2352|CDI/2336|CDI/2352)" ); // use cap(1) for the index number, cap(3) for the minutes, cap(4) for the seconds, cap(5) for the frames, // and cap(2) for the MSF value string - static QRegExp indexRx( "INDEX\\s(\\d{1,2})\\s((\\d+):([0-5]\\d):((?:[0-6]\\d)|(?:7[0-4])))" ); + static TQRegExp indexRx( "INDEX\\s(\\d{1,2})\\s((\\d+):([0-5]\\d):((?:[0-6]\\d)|(?:7[0-4])))" ); // use cap(1) for the MCN - static QRegExp catalogRx( "CATALOG\\s(\\w{13,13})" ); + static TQRegExp catalogRx( "CATALOG\\s(\\w{13,13})" ); // use cap(1) for the ISRC - static QRegExp isrcRx( "ISRC\\s(\\w{5,5}\\d{7,7})" ); + static TQRegExp isrcRx( "ISRC\\s(\\w{5,5}\\d{7,7})" ); - static QString cdTextRxStr = "\"?([^\"]{0,80})\"?"; + static TQString cdTextRxStr = "\"?([^\"]{0,80})\"?"; // use cap(1) for the string - static QRegExp titleRx( "TITLE\\s" + cdTextRxStr ); - static QRegExp performerRx( "PERFORMER\\s" + cdTextRxStr ); - static QRegExp songwriterRx( "SONGWRITER\\s" + cdTextRxStr ); + static TQRegExp titleRx( "TITLE\\s" + cdTextRxStr ); + static TQRegExp performerRx( "PERFORMER\\s" + cdTextRxStr ); + static TQRegExp songwriterRx( "SONGWRITER\\s" + cdTextRxStr ); // simplify all white spaces except those in filenames and CD-TEXT @@ -235,7 +235,7 @@ bool K3bCueFileParser::parseLine( QString& line ) d->rawData = (trackRx.cap(2) == "MODE2/2352"); } else { - kdDebug() << "(K3bCueFileParser) unsupported track type: " << trackRx.cap(2) << endl; + kdDebug() << "(K3bCueFileParser) unsupported track type: " << TQString(trackRx.cap(2)) << endl; return false; } } @@ -360,7 +360,7 @@ bool K3bCueFileParser::parseLine( QString& line ) } -void K3bCueFileParser::simplifyWhiteSpace( QString& s ) +void K3bCueFileParser::simplifyWhiteSpace( TQString& s ) { s = s.stripWhiteSpace(); @@ -392,7 +392,7 @@ const K3bDevice::CdText& K3bCueFileParser::cdText() const } -bool K3bCueFileParser::findImageFileName( const QString& dataFile ) +bool K3bCueFileParser::findImageFileName( const TQString& dataFile ) { // // CDRDAO does not use this image filename but replaces the extension from the cue file @@ -402,21 +402,21 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile ) m_imageFilenameInCue = true; // first try filename as a hole (absolut) - if( QFile::exists( dataFile ) ) { - setImageFilename( QFileInfo(dataFile).absFilePath() ); + if( TQFile::exists( dataFile ) ) { + setImageFilename( TQFileInfo(dataFile).absFilePath() ); return true; } // try the filename in the cue's directory - if( QFileInfo( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) { - setImageFilename( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) ); + if( TQFileInfo( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) { + setImageFilename( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ); kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; return true; } // try the filename ignoring case - if( QFileInfo( K3b::parentDir(filename()) + dataFile.section( '/', -1 ).lower() ).isFile() ) { - setImageFilename( K3b::parentDir(filename()) + dataFile.section( '/', -1 ).lower() ); + if( TQFileInfo( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ).isFile() ) { + setImageFilename( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ); kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; return true; } @@ -424,7 +424,7 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile ) m_imageFilenameInCue = false; // try removing the ending from the cue file (image.bin.cue and image.bin) - if( QFileInfo( filename().left( filename().length()-4 ) ).isFile() ) { + if( TQFileInfo( filename().left( filename().length()-4 ) ).isFile() ) { setImageFilename( filename().left( filename().length()-4 ) ); kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; return true; @@ -435,21 +435,21 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile ) // Search for another one having the same filename as the cue but a different extension // - QDir parentDir( K3b::parentDir(filename()) ); - QString filenamePrefix = filename().section( '/', -1 ); + TQDir tqparentDir( K3b::tqparentDir(filename()) ); + TQString filenamePrefix = filename().section( '/', -1 ); filenamePrefix.truncate( filenamePrefix.length() - 3 ); // remove cue extension - kdDebug() << "(K3bCueFileParser) checking folder " << parentDir.path() << " for files: " << filenamePrefix << "*" << endl; + kdDebug() << "(K3bCueFileParser) checking folder " << tqparentDir.path() << " for files: " << filenamePrefix << "*" << endl; // - // we cannot use the nameFilter in QDir because of the spaces that may occur in filenames + // we cannot use the nameFilter in TQDir because of the spaces that may occur in filenames // - QStringList possibleImageFiles = parentDir.entryList( QDir::Files ); + TQStringList possibleImageFiles = tqparentDir.entryList( TQDir::Files ); int cnt = 0; - for( QStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) { - if( (*it).lower() == dataFile.section( '/', -1 ).lower() || + for( TQStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) { + if( (*it).lower() == TQString(dataFile.section( '/', -1 )).lower() || (*it).startsWith( filenamePrefix ) && !(*it).endsWith( "cue" ) ) { ++cnt; - setImageFilename( K3b::parentDir(filename()) + *it ); + setImageFilename( K3b::tqparentDir(filename()) + *it ); } } @@ -457,5 +457,5 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile ) // we only do this if there is one unique file which fits the requirements. // Otherwise we cannot be certain to have the right file. // - return ( cnt == 1 && QFileInfo( imageFilename() ).isFile() ); + return ( cnt == 1 && TQFileInfo( imageFilename() ).isFile() ); } diff --git a/libk3b/projects/k3bcuefileparser.h b/libk3b/projects/k3bcuefileparser.h index 41a5ee6..112caec 100644 --- a/libk3b/projects/k3bcuefileparser.h +++ b/libk3b/projects/k3bcuefileparser.h @@ -29,7 +29,7 @@ class LIBK3B_EXPORT K3bCueFileParser : public K3bImageFileReader { public: - K3bCueFileParser( const QString& filename = QString::null ); + K3bCueFileParser( const TQString& filename = TQString() ); ~K3bCueFileParser(); /** @@ -44,9 +44,9 @@ class LIBK3B_EXPORT K3bCueFileParser : public K3bImageFileReader private: void readFile(); - bool parseLine( QString& line ); - void simplifyWhiteSpace( QString& s ); - bool findImageFileName( const QString& fileEntry ); + bool parseLine( TQString& line ); + void simplifyWhiteSpace( TQString& s ); + bool findImageFileName( const TQString& fileEntry ); bool m_imageFilenameInCue; diff --git a/libk3b/projects/k3bdoc.cpp b/libk3b/projects/k3bdoc.cpp index ac5346d..29648a7 100644 --- a/libk3b/projects/k3bdoc.cpp +++ b/libk3b/projects/k3bdoc.cpp @@ -14,10 +14,10 @@ */ -// include files for Qt -#include <qwidget.h> -#include <qstring.h> -#include <qdom.h> +// include files for TQt +#include <tqwidget.h> +#include <tqstring.h> +#include <tqdom.h> // include files for KDE #include <klocale.h> @@ -40,12 +40,12 @@ #include <k3bdevicemanager.h> -K3bDoc::K3bDoc( QObject* parent ) - : QObject( parent ), +K3bDoc::K3bDoc( TQObject* tqparent ) + : TQObject( tqparent ), m_modified(false), m_view(0) { - connect( this, SIGNAL(changed()), this, SLOT(slotChanged()) ); + connect( this, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); } @@ -107,7 +107,7 @@ const KURL& K3bDoc::URL() const } -QString K3bDoc::name() const +TQString K3bDoc::name() const { return URL().path().section( '/', -1 ); } @@ -132,12 +132,12 @@ bool K3bDoc::newDocument() } -bool K3bDoc::saveGeneralDocumentData( QDomElement* part ) +bool K3bDoc::saveGeneralDocumentData( TQDomElement* part ) { - QDomDocument doc = part->ownerDocument(); - QDomElement mainElem = doc.createElement( "general" ); + TQDomDocument doc = part->ownerDocument(); + TQDomElement mainElem = doc.createElement( "general" ); - QDomElement propElem = doc.createElement( "writing_mode" ); + TQDomElement propElem = doc.createElement( "writing_mode" ); switch( writingMode() ) { case K3b::DAO: propElem.appendChild( doc.createTextNode( "dao" ) ); @@ -176,20 +176,20 @@ bool K3bDoc::saveGeneralDocumentData( QDomElement* part ) } -bool K3bDoc::readGeneralDocumentData( const QDomElement& elem ) +bool K3bDoc::readGeneralDocumentData( const TQDomElement& elem ) { if( elem.nodeName() != "general" ) return false; - QDomNodeList nodes = elem.childNodes(); + TQDomNodeList nodes = elem.childNodes(); for( uint i = 0; i < nodes.count(); i++ ) { - QDomElement e = nodes.item(i).toElement(); + TQDomElement e = nodes.item(i).toElement(); if( e.isNull() ) return false; if( e.nodeName() == "writing_mode") { - QString mode = e.text(); + TQString mode = e.text(); if( mode == "dao" ) setWritingMode( K3b::DAO ); else if( mode == "tao" ) diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index f241487..1cdde4f 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -22,9 +22,9 @@ #endif // include files for QT -#include <qobject.h> -#include <qstring.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqptrlist.h> // include files for KDE @@ -33,11 +33,11 @@ #include "k3b_export.h" // forward declaration of the K3b classes -class QTimer; +class TQTimer; class KTempFile; class K3bBurnJob; -class QDomDocument; -class QDomElement; +class TQDomDocument; +class TQDomElement; class KConfig; class KActionCollection; class K3bJobHandler; @@ -54,12 +54,13 @@ namespace K3b { * K3bDoc is the base document class. * It handles some general settings. */ -class LIBK3B_EXPORT K3bDoc : public QObject +class LIBK3B_EXPORT K3bDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bDoc( QObject* = 0 ); + K3bDoc( TQObject* = 0 ); virtual ~K3bDoc(); enum DocType { @@ -79,22 +80,22 @@ class LIBK3B_EXPORT K3bDoc : public QObject * \return A name for the project which might for example be used as a suggestion for a file name * when saving. The default implementation extracts a name from the URL. */ - virtual QString name() const; + virtual TQString name() const; /** * \return A string representation of the document type. */ - virtual QString typeString() const = 0; + virtual TQString typeString() const = 0; /** * returns the view widget set with setView() or null if none has been set. */ - QWidget* view() const { return m_view; } + TQWidget* view() const { return m_view; } /** * Just for convenience to make an easy mapping from doc to GUI possible. */ - void setView( QWidget* v ) { m_view = v; } + void setView( TQWidget* v ) { m_view = v; } /** * sets the modified flag for the document after a modifying action on the view connected to the document. @@ -118,14 +119,14 @@ class LIBK3B_EXPORT K3bDoc : public QObject * * This is used to load/save k3b projects. */ - virtual bool loadDocumentData( QDomElement* root ) = 0; + virtual bool loadDocumentData( TQDomElement* root ) = 0; /** * Save a project to an xml stream. * * This is used to load/save k3b projects. */ - virtual bool saveDocumentData( QDomElement* docElem ) = 0; + virtual bool saveDocumentData( TQDomElement* docElem ) = 0; /** returns the KURL of the document */ const KURL& URL() const; @@ -144,7 +145,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject virtual K3b::Msf length() const = 0; // FIXME: rename this to something like imagePath - const QString& tempDir() const { return m_tempDir; } + const TQString& tempDir() const { return m_tempDir; } virtual int numOfTracks() const { return 1; } @@ -154,7 +155,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject * easier this way since you don't need to distinguish between the different * project types. */ - virtual K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 ) = 0; + virtual K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ) = 0; int writingApp() const { return m_writingApp; } void setWritingApp( int a ) { m_writingApp = a; } @@ -179,7 +180,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject void setOnTheFly( bool b ) { m_onTheFly = b; } void setSpeed( int speed ); void setBurner( K3bDevice::Device* dev ); - void setTempDir( const QString& dir ) { m_tempDir = dir; } + void setTempDir( const TQString& dir ) { m_tempDir = dir; } void setRemoveImages( bool b ) { m_removeImages = b; } void setOnlyCreateImages( bool b ) { m_onlyCreateImages = b; } void setCopies( int c ) { m_copies = c; } @@ -194,9 +195,9 @@ class LIBK3B_EXPORT K3bDoc : public QObject protected: int m_docType; - bool saveGeneralDocumentData( QDomElement* ); + bool saveGeneralDocumentData( TQDomElement* ); - bool readGeneralDocumentData( const QDomElement& ); + bool readGeneralDocumentData( const TQDomElement& ); private slots: void slotChanged(); @@ -206,9 +207,9 @@ class LIBK3B_EXPORT K3bDoc : public QObject bool m_modified; KURL doc_url; - QWidget* m_view; + TQWidget* m_view; - QString m_tempDir; + TQString m_tempDir; K3bDevice::Device* m_burner; bool m_dummy; bool m_onTheFly; diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp index 0910d4a..ae33599 100644 --- a/libk3b/projects/k3bdvdrecordwriter.cpp +++ b/libk3b/projects/k3bdvdrecordwriter.cpp @@ -26,8 +26,8 @@ #include <klocale.h> -K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, QObject* parent, const char* name ) - : K3bCdrecordWriter( dev, parent, name ) +K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* tqparent, const char* name ) + : K3bCdrecordWriter( dev, tqparent, name ) { } @@ -42,10 +42,10 @@ void K3bDvdrecordWriter::prepareProcess() m_process = new K3bProcess(); m_process->setRunPrivileged(true); m_process->setSplitStdout(true); - connect( m_process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); - connect( m_process, SIGNAL(wroteStdin(KProcess*)), this, SIGNAL(dataWritten()) ); + connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(wroteStdin(KProcess*)), this, TQT_SIGNAL(dataWritten()) ); // if( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "dvd-patch" ) ) // m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord"); @@ -66,8 +66,8 @@ void K3bDvdrecordWriter::prepareProcess() *m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?) // Again we assume the device to be set! - *m_process << QString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); - *m_process << QString("speed=%1").arg(burnSpeed()); + *m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); + *m_process << TQString("speed=%1").tqarg(burnSpeed()); // DVDs are only written in DAO mode (and Packet, but we do not support that since it does not // make much sense here) @@ -95,7 +95,7 @@ void K3bDvdrecordWriter::prepareProcess() bool manualBufferSize = k3bcore->globalSettings()->manualBufferSize(); if( manualBufferSize ) { - *m_process << QString("fs=%1m").arg( k3bcore->globalSettings()->writingBuffer() ); + *m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->writingBuffer() ); } bool overburn = k3bcore->globalSettings()->overburn(); @@ -103,15 +103,15 @@ void K3bDvdrecordWriter::prepareProcess() if( m_cdrecordBinObject->hasFeature("overburn") ) *m_process << "-overburn"; else - emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), INFO ); + emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), INFO ); // additional user parameters from config - const QStringList& params = m_cdrecordBinObject->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = m_cdrecordBinObject->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; // add the user parameters - for( QStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it ) + for( TQStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it ) *m_process << *it; } diff --git a/libk3b/projects/k3bdvdrecordwriter.h b/libk3b/projects/k3bdvdrecordwriter.h index f9dcf4a..02421bb 100644 --- a/libk3b/projects/k3bdvdrecordwriter.h +++ b/libk3b/projects/k3bdvdrecordwriter.h @@ -28,9 +28,10 @@ class K3bDevice::Device; class K3bDvdrecordWriter : public K3bCdrecordWriter { Q_OBJECT + TQ_OBJECT public: - K3bDvdrecordWriter( K3bDevice::Device*, QObject* parent = 0, const char* name = 0 ); + K3bDvdrecordWriter( K3bDevice::Device*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bDvdrecordWriter(); protected: diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp index 0b582ce..926c959 100644 --- a/libk3b/projects/k3bgrowisofshandler.cpp +++ b/libk3b/projects/k3bgrowisofshandler.cpp @@ -25,7 +25,7 @@ #include <kglobal.h> #include <kdebug.h> -#include <qtimer.h> +#include <tqtimer.h> #include <errno.h> #include <string.h> @@ -39,8 +39,8 @@ public: }; -K3bGrowisofsHandler::K3bGrowisofsHandler( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bGrowisofsHandler::K3bGrowisofsHandler( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private; reset(); @@ -65,18 +65,18 @@ void K3bGrowisofsHandler::reset( K3bDevice::Device* dev, bool dao ) void K3bGrowisofsHandler::handleStart() { -// QTimer::singleShot( 2000, this, SLOT(slotCheckBufferStatus()) ); +// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBuffertqStatus()) ); } -void K3bGrowisofsHandler::handleLine( const QString& line ) +void K3bGrowisofsHandler::handleLine( const TQString& line ) { int pos = 0; if( line.startsWith( ":-[" ) ) { // Error - if( line.contains( "ASC=30h" ) ) + if( line.tqcontains( "ASC=30h" ) ) m_error = ERROR_MEDIA; // :-[ PERFORM OPC failed with SK=3h/ASC=73h/ASCQ=03h @@ -85,7 +85,7 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) // :-[ attempt -blank=full or re-run with -dvd-compat -dvd-compat to engage DAO ] else if( !m_dao && - ( line.contains( "engage DAO" ) || line.contains( "media is not formatted or unsupported" ) ) ) + ( line.tqcontains( "engage DAO" ) || line.tqcontains( "media is not formatted or unsupported" ) ) ) emit infoMessage( i18n("Please try again with writing mode DAO."), K3bJob::ERROR ); else if( line.startsWith( ":-[ Failed to change write speed" ) ) { @@ -93,10 +93,10 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) } } else if( line.startsWith( ":-(" ) ) { - if( line.contains( "No space left on device" ) ) + if( line.tqcontains( "No space left on device" ) ) m_error = ERROR_OVERSIZE; - else if( line.contains( "blocks are free" ) && line.contains( "to be written" ) ) { + else if( line.tqcontains( "blocks are free" ) && line.tqcontains( "to be written" ) ) { m_error = ERROR_OVERSIZE; if( k3bcore->globalSettings()->overburn() ) emit infoMessage( i18n("Trying to write more than the official disk capacity"), K3bJob::WARNING ); @@ -116,7 +116,7 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) else if( line.startsWith( "PERFORM OPC" ) ) { m_error = ERROR_OPC; } - else if( line.contains( "flushing cache" ) ) { + else if( line.tqcontains( "flushing cache" ) ) { // here is where we already should stop queriying the buffer fill // since the device is only used there so far... m_device = 0; @@ -131,34 +131,34 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) // line = line.mid( dev->blockDeviceName().length() ); // if( line.startsWith( "closing..... - else if( line.contains( "closing track" ) ) { + else if( line.tqcontains( "closing track" ) ) { emit newSubTask( i18n("Closing Track") ); } - else if( line.contains( "closing disc" ) ) { + else if( line.tqcontains( "closing disc" ) ) { emit newSubTask( i18n("Closing Disk") ); } - else if( line.contains( "closing session" ) ) { + else if( line.tqcontains( "closing session" ) ) { emit newSubTask( i18n("Closing Session") ); } - else if( line.contains( "updating RMA" ) ) { + else if( line.tqcontains( "updating RMA" ) ) { emit newSubTask( i18n("Updating RMA") ); emit infoMessage( i18n("Updating RMA") + "...", K3bJob::INFO ); } - else if( line.contains( "closing session" ) ) { + else if( line.tqcontains( "closing session" ) ) { emit newSubTask( i18n("Closing Session") ); emit infoMessage( i18n("Closing Session") + "...", K3bJob::INFO ); } - else if( line.contains( "writing lead-out" ) ) { + else if( line.tqcontains( "writing lead-out" ) ) { emit newSubTask( i18n("Writing Lead-out") ); emit infoMessage( i18n("Writing the lead-out may take some time."), K3bJob::INFO ); } - else if( line.contains( "Quick Grow" ) ) { + else if( line.tqcontains( "Quick Grow" ) ) { emit infoMessage( i18n("Removing reference to lead-out."), K3bJob::INFO ); } - else if( line.contains( "copying volume descriptor" ) ) { + else if( line.tqcontains( "copying volume descriptor" ) ) { emit infoMessage( i18n("Modifying ISO9660 volume descriptor"), K3bJob::INFO ); } - else if( line.contains( "FEATURE 21h is not on" ) ) { + else if( line.tqcontains( "FEATURE 21h is not on" ) ) { if( !m_dao ) { // FIXME: it's not only the writer. It may be the media: something like does not support it with this media // da war was mit: wenn einmal formattiert, dann geht nur noch dao oder wenn einmal als overwrite @@ -167,28 +167,28 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) emit infoMessage( i18n("Engaging DAO"), K3bJob::WARNING ); } } - else if( ( pos = line.find( "Current Write Speed" ) ) > 0 ) { + else if( ( pos = line.tqfind( "Current Write Speed" ) ) > 0 ) { // parse write speed // /dev/sr0: "Current Write Speed" is 2.4x1385KBps pos += 24; - int endPos = line.find( 'x', pos+1 ); + int endPos = line.tqfind( 'x', pos+1 ); bool ok = true; double speed = line.mid( pos, endPos-pos ).toDouble(&ok); if( ok ) emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)") - .arg((int)(speed*1385.0)) - .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); + .tqarg((int)(speed*1385.0)) + .tqarg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); else kdDebug() << "(K3bGrowisofsHandler) parsing error: '" << line.mid( pos, endPos-pos ) << "'" << endl; } - else if( (pos = line.find( "RBU" )) > 0 ) { + else if( (pos = line.tqfind( "RBU" )) > 0 ) { - // FIXME: use QRegExp + // FIXME: use TQRegExp // parse ring buffer fill for growisofs >= 6.0 pos += 4; - int endPos = line.find( '%', pos+1 ); + int endPos = line.tqfind( '%', pos+1 ); bool ok = true; double val = line.mid( pos, endPos-pos ).toDouble( &ok ); if( ok ) { @@ -199,8 +199,8 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) } // device buffer for growisofs >= 7.0 - pos = line.find( "UBU", pos ); - endPos = line.find( '%', pos+5 ); + pos = line.tqfind( "UBU", pos ); + endPos = line.tqfind( '%', pos+5 ); if( pos > 0 ) { pos += 4; val = line.mid( pos, endPos-pos ).toDouble( &ok ); @@ -274,7 +274,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode ) // for now we just emit a message with the error // in the future when I know more about what kinds of errors may occur // we will enhance this - emit infoMessage( i18n("Fatal error at startup: %1").arg(strerror(exitCode-128)), + emit infoMessage( i18n("Fatal error at startup: %1").tqarg(strerror(exitCode-128)), K3bJob::ERROR ); } else if( exitCode == 1 ) { @@ -286,7 +286,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode ) emit infoMessage( i18n("Most likely mkisofs failed in some way."), K3bJob::ERROR ); } else { - emit infoMessage( i18n("Fatal error during recording: %1").arg(strerror(exitCode)), + emit infoMessage( i18n("Fatal error during recording: %1").tqarg(strerror(exitCode)), K3bJob::ERROR ); } } @@ -295,12 +295,12 @@ void K3bGrowisofsHandler::handleExit( int exitCode ) } -void K3bGrowisofsHandler::slotCheckBufferStatus() +void K3bGrowisofsHandler::slotCheckBuffertqStatus() { connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::BUFFER_CAPACITY, m_device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotCheckBufferStatusDone(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotCheckBufferStatusDone(K3bDevice::DeviceHandler*)) ); } @@ -308,7 +308,7 @@ void K3bGrowisofsHandler::slotCheckBufferStatusDone( K3bDevice::DeviceHandler* d { if( dh->success() && dh->bufferCapacity() > 0 ) { emit deviceBuffer( 100 * (dh->bufferCapacity() - dh->availableBufferCapacity() ) / dh->bufferCapacity() ); - QTimer::singleShot( 500, this, SLOT(slotCheckBufferStatus()) ); + TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBuffertqStatus()) ); } else { kdDebug() << "(K3bGrowisofsHandler) stopping buffer check." << endl; diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h index 42fcd2a..5243ebc 100644 --- a/libk3b/projects/k3bgrowisofshandler.h +++ b/libk3b/projects/k3bgrowisofshandler.h @@ -16,7 +16,7 @@ #ifndef _K3B_GROWISOFS_HANDLER_H_ #define _K3B_GROWISOFS_HANDLER_H_ -#include <qobject.h> +#include <tqobject.h> namespace K3bDevice { class Device; @@ -29,12 +29,13 @@ namespace K3bDevice { * We put it in an extra class since we have two classes * using growisofs: the writer and the imager. */ -class K3bGrowisofsHandler : public QObject +class K3bGrowisofsHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bGrowisofsHandler( QObject* parent = 0, const char* name = 0 ); + K3bGrowisofsHandler( TQObject* tqparent = 0, const char* name = 0 ); ~K3bGrowisofsHandler(); enum ErrorType { @@ -57,12 +58,12 @@ class K3bGrowisofsHandler : public QObject void reset( K3bDevice::Device* = 0, bool dao = false ); void handleStart(); - void handleLine( const QString& ); + void handleLine( const TQString& ); void handleExit( int exitCode ); signals: - void infoMessage( const QString&, int ); - void newSubTask( const QString& ); + void infoMessage( const TQString&, int ); + void newSubTask( const TQString& ); void buffer( int ); void deviceBuffer( int ); @@ -72,7 +73,7 @@ class K3bGrowisofsHandler : public QObject void flushingCache(); private slots: - void slotCheckBufferStatus(); + void slotCheckBuffertqStatus(); void slotCheckBufferStatusDone( K3bDevice::DeviceHandler* ); private: diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp index 3144547..3480711 100644 --- a/libk3b/projects/k3bgrowisofswriter.cpp +++ b/libk3b/projects/k3bgrowisofswriter.cpp @@ -33,8 +33,8 @@ #include <kdebug.h> #include <kglobal.h> -#include <qvaluelist.h> -#include <qfile.h> +#include <tqvaluelist.h> +#include <tqfile.h> #include <unistd.h> @@ -60,13 +60,13 @@ public: bool multiSession; K3bProcess* process; const K3bExternalBin* growisofsBin; - QString image; + TQString image; bool success; bool canceled; bool finished; - QTime lastSpeedCalculationTime; + TQTime lastSpeedCalculationTime; int lastSpeedCalculationBytes; int lastProgress; unsigned int lastProgressed; @@ -85,37 +85,37 @@ public: unsigned long long overallSizeFromOutput; long long firstSizeFromOutput; - QFile inputFile; + TQFile inputFile; bool usingRingBuffer; K3bPipeBuffer* ringBuffer; - QString multiSessionInfo; + TQString multiSessionInfo; bool forceNoEject; }; K3bGrowisofsWriter::K3bGrowisofsWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - QObject* parent, const char* name ) - : K3bAbstractWriter( dev, hdl, parent, name ) + TQObject* tqparent, const char* name ) + : K3bAbstractWriter( dev, hdl, tqparent, name ) { d = new Private; d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, SIGNAL(throughput(int)), - this, SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQT_SIGNAL(throughput(int)), + this, TQT_SLOT(slotThroughput(int)) ); d->gh = new K3bGrowisofsHandler( this ); - connect( d->gh, SIGNAL(infoMessage(const QString&, int)), - this,SIGNAL(infoMessage(const QString&, int)) ); - connect( d->gh, SIGNAL(newSubTask(const QString&)), - this, SIGNAL(newSubTask(const QString&)) ); - connect( d->gh, SIGNAL(buffer(int)), - this, SIGNAL(buffer(int)) ); - connect( d->gh, SIGNAL(deviceBuffer(int)), - this, SIGNAL(deviceBuffer(int)) ); - connect( d->gh, SIGNAL(flushingCache()), - this, SLOT(slotFlushingCache()) ); + connect( d->gh, TQT_SIGNAL(infoMessage(const TQString&, int)), + this,TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->gh, TQT_SIGNAL(newSubTask(const TQString&)), + this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( d->gh, TQT_SIGNAL(buffer(int)), + this, TQT_SIGNAL(buffer(int)) ); + connect( d->gh, TQT_SIGNAL(deviceBuffer(int)), + this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( d->gh, TQT_SIGNAL(flushingCache()), + this, TQT_SLOT(slotFlushingCache()) ); } @@ -155,13 +155,13 @@ bool K3bGrowisofsWriter::prepareProcess() { d->growisofsBin = k3bcore->externalBinManager()->binObject( "growisofs" ); if( !d->growisofsBin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("growisofs"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("growisofs"), ERROR ); return false; } if( d->growisofsBin->version < K3bVersion( 5, 10 ) ) { emit infoMessage( i18n("Growisofs version %1 is too old. " - "K3b needs at least version 5.10.").arg(d->growisofsBin->version), + "K3b needs at least version 5.10.").tqarg(d->growisofsBin->version), ERROR ); return false; } @@ -169,8 +169,8 @@ bool K3bGrowisofsWriter::prepareProcess() emit debuggingOutput( "Used versions", "growisofs: " + d->growisofsBin->version ); if( !d->growisofsBin->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg("growisofs") - .arg(d->growisofsBin->version).arg(d->growisofsBin->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg("growisofs") + .tqarg(d->growisofsBin->version).tqarg(d->growisofsBin->copyright), INFO ); // @@ -182,9 +182,9 @@ bool K3bGrowisofsWriter::prepareProcess() // d->process->setPriority( KProcess::PrioHighest ); d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotReceivedStderr(const QString&)) ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotReceivedStderr(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(const TQString&)) ); + connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(const TQString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); // @@ -212,7 +212,7 @@ bool K3bGrowisofsWriter::prepareProcess() // set this var to true to enable the ringbuffer d->usingRingBuffer = ( d->growisofsBin->version < K3bVersion( 6, 0 ) ); - QString s = burnDevice()->blockDeviceName() + "="; + TQString s = burnDevice()->blockDeviceName() + "="; if( d->usingRingBuffer || d->image.isEmpty() ) { // we always read from stdin since the ringbuffer does the actual reading from the source s += "/dev/fd/0"; @@ -234,7 +234,7 @@ bool K3bGrowisofsWriter::prepareProcess() d->inputFile.setName( d->image ); d->trackSize = (K3b::filesize( d->image ) + 1024) / 2048; if( !d->inputFile.open( IO_ReadOnly ) ) { - emit infoMessage( i18n("Could not open file %1.").arg(d->image), ERROR ); + emit infoMessage( i18n("Could not open file %1.").tqarg(d->image), ERROR ); return false; } } @@ -249,13 +249,13 @@ bool K3bGrowisofsWriter::prepareProcess() // DL writing with forced layer break if( d->layerBreak > 0 ) { - *d->process << "-use-the-force-luke=break:" + QString::number(d->layerBreak); + *d->process << "-use-the-force-luke=break:" + TQString::number(d->layerBreak); dvdCompat = true; } // the tracksize parameter takes priority over the dao:tracksize parameter since growisofs 5.18 else if( d->growisofsBin->version > K3bVersion( 5, 17 ) && d->trackSize > 0 ) - *d->process << "-use-the-force-luke=tracksize:" + QString::number(d->trackSize + trackSizePadding); + *d->process << "-use-the-force-luke=tracksize:" + TQString::number(d->trackSize + trackSizePadding); if( simulate() ) *d->process << "-use-the-force-luke=dummy"; @@ -263,7 +263,7 @@ bool K3bGrowisofsWriter::prepareProcess() if( d->writingMode == K3b::DAO ) { dvdCompat = true; if( d->growisofsBin->version >= K3bVersion( 5, 15 ) && d->trackSize > 0 ) - *d->process << "-use-the-force-luke=dao:" + QString::number(d->trackSize + trackSizePadding); + *d->process << "-use-the-force-luke=dao:" + TQString::number(d->trackSize + trackSizePadding); else *d->process << "-use-the-force-luke=dao"; d->gh->reset( burnDevice(), true ); @@ -299,9 +299,9 @@ bool K3bGrowisofsWriter::prepareProcess() // speed may be a float number. example: DVD+R(W): 2.4x if( speed != 0 ) - *d->process << QString("-speed=%1").arg( speed%1385 > 0 - ? QString::number( (float)speed/1385.0, 'f', 1 ) - : QString::number( speed/1385 ) ); + *d->process << TQString("-speed=%1").tqarg( speed%1385 > 0 + ? TQString::number( (float)speed/1385.0, 'f', 1 ) + : TQString::number( speed/1385 ) ); } if( k3bcore->globalSettings()->overburn() ) @@ -310,12 +310,12 @@ bool K3bGrowisofsWriter::prepareProcess() if( !d->usingRingBuffer && d->growisofsBin->version >= K3bVersion( 6, 0 ) ) { bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); int bufSize = ( manualBufferSize ? k3bcore->globalSettings()->bufferSize() : 32 ); - *d->process << QString("-use-the-force-luke=bufsize:%1m").arg(bufSize); + *d->process << TQString("-use-the-force-luke=bufsize:%1m").tqarg(bufSize); } // additional user parameters from config - const QStringList& params = d->growisofsBin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = d->growisofsBin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *d->process << *it; emit debuggingOutput( "Burned media", K3bDevice::mediaTypeString(mediaType) ); @@ -332,7 +332,7 @@ void K3bGrowisofsWriter::start() d->lastProgressed = 0; d->lastProgress = 0; d->firstSizeFromOutput = -1; - d->lastSpeedCalculationTime = QTime::currentTime(); + d->lastSpeedCalculationTime = TQTime::currentTime(); d->lastSpeedCalculationBytes = 0; d->writingStarted = false; d->canceled = false; @@ -345,9 +345,9 @@ void K3bGrowisofsWriter::start() else { kdDebug() << "***** " << d->growisofsBin->name() << " parameters:\n"; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -374,7 +374,7 @@ void K3bGrowisofsWriter::start() // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bGrowisofsWriter) could not start " << d->growisofsBin->path << endl; - emit infoMessage( i18n("Could not start %1.").arg(d->growisofsBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(d->growisofsBin->name()), K3bJob::ERROR ); jobFinished(false); } else { @@ -394,8 +394,8 @@ void K3bGrowisofsWriter::start() if( d->usingRingBuffer ) { if( !d->ringBuffer ) { d->ringBuffer = new K3bPipeBuffer( this, this ); - connect( d->ringBuffer, SIGNAL(percent(int)), this, SIGNAL(buffer(int)) ); - connect( d->ringBuffer, SIGNAL(finished(bool)), this, SLOT(slotRingBufferFinished(bool)) ); + connect( d->ringBuffer, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(buffer(int)) ); + connect( d->ringBuffer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotRingBufferFinished(bool)) ); } d->ringBuffer->writeToFd( d->process->stdinFd() ); @@ -455,17 +455,17 @@ void K3bGrowisofsWriter::setMultiSession( bool b ) } -void K3bGrowisofsWriter::setImageToWrite( const QString& filename ) +void K3bGrowisofsWriter::setImageToWrite( const TQString& filename ) { d->image = filename; } -void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) +void K3bGrowisofsWriter::slotReceivedStderr( const TQString& line ) { emit debuggingOutput( d->growisofsBin->name(), line ); - if( line.contains( "remaining" ) ) { + if( line.tqcontains( "remaining" ) ) { if( !d->writingStarted ) { d->writingStarted = true; @@ -473,10 +473,10 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) } // parse progress - int pos = line.find( "/" ); + int pos = line.tqfind( "/" ); unsigned long long done = line.left( pos ).toULongLong(); bool ok = true; - d->overallSizeFromOutput = line.mid( pos+1, line.find( "(", pos ) - pos - 1 ).toULongLong( &ok ); + d->overallSizeFromOutput = line.mid( pos+1, line.tqfind( "(", pos ) - pos - 1 ).toULongLong( &ok ); if( d->firstSizeFromOutput == -1 ) d->firstSizeFromOutput = done; done -= d->firstSizeFromOutput; @@ -495,10 +495,10 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) } // try parsing write speed (since growisofs 5.11) - pos = line.find( '@' ); + pos = line.tqfind( '@' ); if( pos != -1 ) { pos += 1; - double speed = line.mid( pos, line.find( 'x', pos ) - pos ).toDouble(&ok); + double speed = line.mid( pos, line.tqfind( 'x', pos ) - pos ).toDouble(&ok); if( ok ) { if( d->lastWritingSpeed != speed ) emit writeSpeed( (int)(speed*1385.0), 1385 ); @@ -506,7 +506,7 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) } else kdDebug() << "(K3bGrowisofsWriter) speed parsing failed: '" - << line.mid( pos, line.find( 'x', pos ) - pos ) << "'" << endl; + << line.mid( pos, line.tqfind( 'x', pos ) - pos ) << "'" << endl; } else { d->speedEst->dataWritten( done/1024 ); @@ -514,7 +514,7 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) } else kdDebug() << "(K3bGrowisofsWriter) progress parsing failed: '" - << line.mid( pos+1, line.find( "(", pos ) - pos - 1 ).stripWhiteSpace() << "'" << endl; + << line.mid( pos+1, line.tqfind( "(", pos ) - pos - 1 ).stripWhiteSpace() << "'" << endl; } // else @@ -551,7 +551,7 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p ) int s = d->speedEst->average(); if( s > 0 ) emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)") - .arg(s).arg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO ); + .tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO ); if( simulate() ) emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS ); @@ -571,9 +571,9 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p ) else { emit newSubTask( i18n("Ejecting DVD") ); connect( K3bDevice::eject( burnDevice() ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); } } @@ -616,7 +616,7 @@ void K3bGrowisofsWriter::slotFlushingCache() } -void K3bGrowisofsWriter::setMultiSessionInfo( const QString& info ) +void K3bGrowisofsWriter::setMultiSessionInfo( const TQString& info ) { d->multiSessionInfo = info; } diff --git a/libk3b/projects/k3bgrowisofswriter.h b/libk3b/projects/k3bgrowisofswriter.h index ed69923..b65b894 100644 --- a/libk3b/projects/k3bgrowisofswriter.h +++ b/libk3b/projects/k3bgrowisofswriter.h @@ -30,10 +30,11 @@ class KProcess; class K3bGrowisofsWriter : public K3bAbstractWriter { Q_OBJECT + TQ_OBJECT public: K3bGrowisofsWriter( K3bDevice::Device*, K3bJobHandler*, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); ~K3bGrowisofsWriter(); bool active() const; @@ -74,16 +75,16 @@ class K3bGrowisofsWriter : public K3bAbstractWriter void setCloseDvd( bool ); /** - * set this to QString::null or an empty string to let the writer + * set this to TQString() or an empty string to let the writer * read it's data from fd() */ - void setImageToWrite( const QString& ); + void setImageToWrite( const TQString& ); /** * While reading the image from stdin growisofs needs * a valid -C parameter for multisession. */ - void setMultiSessionInfo( const QString& ); + void setMultiSessionInfo( const TQString& ); void setForceNoEject( bool ); @@ -91,7 +92,7 @@ class K3bGrowisofsWriter : public K3bAbstractWriter bool prepareProcess(); protected slots: - void slotReceivedStderr( const QString& ); + void slotReceivedStderr( const TQString& ); void slotProcessExited( KProcess* ); void slotEjectingFinished( K3bDevice::DeviceHandler* dh ); void slotThroughput( int t ); diff --git a/libk3b/projects/k3bimagefilereader.cpp b/libk3b/projects/k3bimagefilereader.cpp index 70ece16..76d8e92 100644 --- a/libk3b/projects/k3bimagefilereader.cpp +++ b/libk3b/projects/k3bimagefilereader.cpp @@ -15,8 +15,8 @@ #include "k3bimagefilereader.h" -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kdebug.h> @@ -29,8 +29,8 @@ public: : isValid(false) { } - QString filename; - QString imageFilename; + TQString filename; + TQString imageFilename; bool isValid; }; @@ -47,10 +47,10 @@ K3bImageFileReader::~K3bImageFileReader() } -void K3bImageFileReader::openFile( const QString& filename ) +void K3bImageFileReader::openFile( const TQString& filename ) { d->filename = filename; - d->imageFilename = QString::null; + d->imageFilename = TQString(); setValid(false); if( !filename.isEmpty() ) @@ -64,7 +64,7 @@ void K3bImageFileReader::setValid( bool b ) } -void K3bImageFileReader::setImageFilename( const QString& filename ) +void K3bImageFileReader::setImageFilename( const TQString& filename ) { d->imageFilename = filename; } @@ -76,13 +76,13 @@ bool K3bImageFileReader::isValid() const } -const QString& K3bImageFileReader::filename() const +const TQString& K3bImageFileReader::filename() const { return d->filename; } -const QString& K3bImageFileReader::imageFilename() const +const TQString& K3bImageFileReader::imageFilename() const { return d->imageFilename; } diff --git a/libk3b/projects/k3bimagefilereader.h b/libk3b/projects/k3bimagefilereader.h index 2bf727e..aca0fc5 100644 --- a/libk3b/projects/k3bimagefilereader.h +++ b/libk3b/projects/k3bimagefilereader.h @@ -16,7 +16,7 @@ #ifndef _K3B_IMAGE_FILE_READER_H_ #define _K3B_IMAGE_FILE_READER_H_ -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" class LIBK3B_EXPORT K3bImageFileReader @@ -28,24 +28,24 @@ class LIBK3B_EXPORT K3bImageFileReader /** * Open a file. In most cases the TOC file */ - void openFile( const QString& filename ); + void openFile( const TQString& filename ); virtual bool isValid() const; /** * Return the current set filename; */ - const QString& filename() const; + const TQString& filename() const; /** * returns the name of the corresponding image file. */ - virtual const QString& imageFilename() const; + virtual const TQString& imageFilename() const; protected: virtual void readFile() = 0; void setValid( bool ); - void setImageFilename( const QString& ); + void setImageFilename( const TQString& ); private: class Private; diff --git a/libk3b/projects/k3binffilewriter.cpp b/libk3b/projects/k3binffilewriter.cpp index 9395b2a..ecfb912 100644 --- a/libk3b/projects/k3binffilewriter.cpp +++ b/libk3b/projects/k3binffilewriter.cpp @@ -21,9 +21,9 @@ #include <k3bcore.h> #include <k3bversion.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqdatetime.h> @@ -39,28 +39,28 @@ K3bInfFileWriter::K3bInfFileWriter() } -bool K3bInfFileWriter::save( const QString& filename ) +bool K3bInfFileWriter::save( const TQString& filename ) { - QFile f( filename ); + TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { kdDebug() << "(K3bInfFileWriter) could not open file " << f.name() << endl; return false; } - QTextStream s( &f ); + TQTextStream s( &f ); return save( s ); } -bool K3bInfFileWriter::save( QTextStream& s ) +bool K3bInfFileWriter::save( TQTextStream& s ) { // now write the inf data // ---------------------- // header s << "# Cdrecord-Inf-File written by K3b " << k3bcore->version() - << ", " << QDateTime::currentDateTime().toString() << endl + << ", " << TQDateTime::tqcurrentDateTime().toString() << endl << "#" << endl; s << "ISRC=\t\t" << m_isrc << endl; @@ -130,7 +130,7 @@ bool K3bInfFileWriter::save( QTextStream& s ) s << "Index0=\t\t" << m_index0 << endl; - return ( s.device()->status() == IO_Ok ); + return ( s.tqdevice()->status() == IO_Ok ); } @@ -141,7 +141,7 @@ void K3bInfFileWriter::setTrack( const K3bDevice::Track& track ) // the first index always has to be a zero (cdrecord manpage) m_indices.append( 0 ); - const QValueVector<K3b::Msf>& indexList = track.indices(); + const TQValueVector<K3b::Msf>& indexList = track.indices(); for( unsigned int i = 0; i < indexList.count(); ++i ) m_indices.append( indexList[i].lba() ); diff --git a/libk3b/projects/k3binffilewriter.h b/libk3b/projects/k3binffilewriter.h index 74e23e4..93164ed 100644 --- a/libk3b/projects/k3binffilewriter.h +++ b/libk3b/projects/k3binffilewriter.h @@ -16,8 +16,8 @@ #ifndef _K3B_INF_FILE_WRITER_H_ #define _K3B_INF_FILE_WRITER_H_ -#include <qvaluevector.h> -#include <qtextstream.h> +#include <tqvaluevector.h> +#include <tqtextstream.h> #include <k3bmsf.h> @@ -34,8 +34,8 @@ class K3bInfFileWriter public: K3bInfFileWriter(); - bool save( QTextStream& ); - bool save( const QString& filename ); + bool save( TQTextStream& ); + bool save( const TQString& filename ); /** * Use this to set: @@ -76,24 +76,24 @@ class K3bInfFileWriter void setBigEndian( bool b ) { m_bigEndian = b; } void setTrackCdText( const K3bDevice::TrackCdText& ); - void setTrackTitle( const QString& s ) { m_trackTitle = s; } - void setTrackPerformer( const QString& s ) { m_trackPerformer = s; } - void setTrackSongwriter( const QString& s ) { m_trackSongwriter = s; } - void setTrackComposer( const QString& s ) { m_trackComposer = s; } - void setTrackArranger( const QString& s ) { m_trackArranger = s; } - void setTrackMessage( const QString& s ) { m_trackMessage = s; } + void setTrackTitle( const TQString& s ) { m_trackTitle = s; } + void setTrackPerformer( const TQString& s ) { m_trackPerformer = s; } + void setTrackSongwriter( const TQString& s ) { m_trackSongwriter = s; } + void setTrackComposer( const TQString& s ) { m_trackComposer = s; } + void setTrackArranger( const TQString& s ) { m_trackArranger = s; } + void setTrackMessage( const TQString& s ) { m_trackMessage = s; } void setCdText( const K3bDevice::CdText& ); - void setAlbumTitle( const QString& s ) { m_albumTitle = s; } - void setAlbumPerformer( const QString& s ) { m_albumPerformer = s; } + void setAlbumTitle( const TQString& s ) { m_albumTitle = s; } + void setAlbumPerformer( const TQString& s ) { m_albumPerformer = s; } - void setIsrc( const QCString& s ) { m_isrc = s; } - void setMcn( const QCString& s ) { m_mcn = s; } + void setIsrc( const TQCString& s ) { m_isrc = s; } + void setMcn( const TQCString& s ) { m_mcn = s; } private: long m_index0; - QValueVector<long> m_indices; + TQValueVector<long> m_indices; int m_trackNumber; K3b::Msf m_trackStart; @@ -102,18 +102,18 @@ class K3bInfFileWriter bool m_copyPermitted; bool m_bigEndian; - QString m_trackTitle; - QString m_trackPerformer; - QString m_trackSongwriter; - QString m_trackComposer; - QString m_trackArranger; - QString m_trackMessage; + TQString m_trackTitle; + TQString m_trackPerformer; + TQString m_trackSongwriter; + TQString m_trackComposer; + TQString m_trackArranger; + TQString m_trackMessage; - QString m_albumTitle; - QString m_albumPerformer; + TQString m_albumTitle; + TQString m_albumPerformer; - QCString m_isrc; - QCString m_mcn; + TQCString m_isrc; + TQCString m_mcn; }; #endif diff --git a/libk3b/projects/k3bpipebuffer.cpp b/libk3b/projects/k3bpipebuffer.cpp index 3b61116..4dbfd38 100644 --- a/libk3b/projects/k3bpipebuffer.cpp +++ b/libk3b/projects/k3bpipebuffer.cpp @@ -115,7 +115,7 @@ public: // // wait for data // - int ret = select( QMAX(usedInFd, outFd) + 1, &readFds, &writeFds, NULL, NULL); + int ret = select( TQMAX(usedInFd, outFd) + 1, &readFds, &writeFds, NULL, NULL); // // Do the buffering @@ -128,7 +128,7 @@ public: // Read from the buffer and write to the output // if( FD_ISSET(outFd, &writeFds) ) { - unsigned int maxLen = QMIN(bufSize - bufPos, dataLen); + unsigned int maxLen = TQMIN(bufSize - bufPos, dataLen); ret = ::write( outFd, &buffer[bufPos], maxLen ); @@ -155,7 +155,7 @@ public: // else if( FD_ISSET(usedInFd, &readFds) ) { unsigned int readPos = (bufPos + dataLen) % bufSize; - unsigned int maxLen = QMIN(bufSize - readPos, bufSize - dataLen); + unsigned int maxLen = TQMIN(bufSize - readPos, bufSize - dataLen); // // never read more than xxx bytes // This is some tuning to prevent the reading from blocking the whole thread @@ -221,8 +221,8 @@ public: }; -K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ) +K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ) { m_thread = new WorkThread(); setThread( m_thread ); diff --git a/libk3b/projects/k3bpipebuffer.h b/libk3b/projects/k3bpipebuffer.h index 6aae368..7f6ad1b 100644 --- a/libk3b/projects/k3bpipebuffer.h +++ b/libk3b/projects/k3bpipebuffer.h @@ -25,7 +25,7 @@ class K3bPipeBuffer : public K3bThreadJob { public: - K3bPipeBuffer( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bPipeBuffer( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bPipeBuffer(); /** diff --git a/libk3b/projects/k3btocfilewriter.cpp b/libk3b/projects/k3btocfilewriter.cpp index 77662d6..249ef84 100644 --- a/libk3b/projects/k3btocfilewriter.cpp +++ b/libk3b/projects/k3btocfilewriter.cpp @@ -20,9 +20,9 @@ #include <k3bcore.h> #include <k3bversion.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqdatetime.h> K3bTocFileWriter::K3bTocFileWriter() @@ -32,22 +32,22 @@ K3bTocFileWriter::K3bTocFileWriter() } -bool K3bTocFileWriter::save( const QString& filename ) +bool K3bTocFileWriter::save( const TQString& filename ) { - QFile f( filename ); + TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { kdDebug() << "(K3bCueFileWriter) could not open file " << f.name() << endl; return false; } - QTextStream s( &f ); + TQTextStream s( &f ); return save( s ); } -bool K3bTocFileWriter::save( QTextStream& t ) +bool K3bTocFileWriter::save( TQTextStream& t ) { writeHeader(t); @@ -149,15 +149,15 @@ bool K3bTocFileWriter::save( QTextStream& t ) trackIndex++; } - return ( t.device()->status() == IO_Ok ); + return ( t.tqdevice()->status() == IO_Ok ); } -void K3bTocFileWriter::writeHeader( QTextStream& t ) +void K3bTocFileWriter::writeHeader( TQTextStream& t ) { // little comment t << "// TOC-file to use with cdrdao created by K3b " << k3bcore->version() - << ", " << QDateTime::currentDateTime().toString() << endl << endl; + << ", " << TQDateTime::tqcurrentDateTime().toString() << endl << endl; t << "// " << m_toc.count() << " tracks" << endl; if( m_toc.back().session() > 0 ) { @@ -193,7 +193,7 @@ void K3bTocFileWriter::writeHeader( QTextStream& t ) } -void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, QTextStream& t ) +void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, TQTextStream& t ) { const K3bDevice::Track& track = m_toc[index]; @@ -305,7 +305,7 @@ void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, Q } -void K3bTocFileWriter::writeGlobalCdText( QTextStream& t ) +void K3bTocFileWriter::writeGlobalCdText( TQTextStream& t ) { t << "CD_TEXT {" << endl; t << " LANGUAGE_MAP { 0: EN }" << endl; @@ -325,7 +325,7 @@ void K3bTocFileWriter::writeGlobalCdText( QTextStream& t ) } -void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, QTextStream& t ) +void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, TQTextStream& t ) { t << "CD_TEXT {" << endl; t << " LANGUAGE 0 {" << endl; @@ -341,7 +341,7 @@ void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, QT } -void K3bTocFileWriter::writeDataSource( unsigned int trackIndex, QTextStream& t ) +void K3bTocFileWriter::writeDataSource( unsigned int trackIndex, TQTextStream& t ) { if( readFromStdin() ) t << "\"-\" "; diff --git a/libk3b/projects/k3btocfilewriter.h b/libk3b/projects/k3btocfilewriter.h index 1c1da47..3127fca 100644 --- a/libk3b/projects/k3btocfilewriter.h +++ b/libk3b/projects/k3btocfilewriter.h @@ -16,8 +16,8 @@ #ifndef _K3B_TOC_FILE_WRITER_H_ #define _K3B_TOC_FILE_WRITER_H_ -#include <qtextstream.h> -#include <qstringlist.h> +#include <tqtextstream.h> +#include <tqstringlist.h> #include <k3btoc.h> #include <k3bcdtext.h> @@ -31,12 +31,12 @@ class K3bTocFileWriter public: K3bTocFileWriter(); - bool save( QTextStream& ); - bool save( const QString& filename ); + bool save( TQTextStream& ); + bool save( const TQString& filename ); void setData( const K3bDevice::Toc& toc ) { m_toc = toc; } void setCdText( const K3bDevice::CdText& text ) { m_cdText = text; } - void setFilenames( const QStringList& names ) { m_filenames = names; } + void setFilenames( const TQStringList& names ) { m_filenames = names; } void setHideFirstTrack( bool b ) { m_hideFirstTrack = b; } /** @@ -45,16 +45,16 @@ class K3bTocFileWriter void setSession( int s ) { m_sessionToWrite = s; } private: - void writeHeader( QTextStream& t ); - void writeGlobalCdText( QTextStream& t ); - void writeTrackCdText( const K3bDevice::TrackCdText& track, QTextStream& t ); - void writeTrack( unsigned int index, const K3b::Msf& offset, QTextStream& t ); - void writeDataSource( unsigned int trackNumber, QTextStream& t ); + void writeHeader( TQTextStream& t ); + void writeGlobalCdText( TQTextStream& t ); + void writeTrackCdText( const K3bDevice::TrackCdText& track, TQTextStream& t ); + void writeTrack( unsigned int index, const K3b::Msf& offset, TQTextStream& t ); + void writeDataSource( unsigned int trackNumber, TQTextStream& t ); bool readFromStdin() const; K3bDevice::Toc m_toc; K3bDevice::CdText m_cdText; - QStringList m_filenames; + TQStringList m_filenames; bool m_hideFirstTrack; int m_sessionToWrite; }; diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index a2c76b0..2160581 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -21,8 +21,8 @@ #include <k3bglobals.h> #include <k3bmsf.h> -#include <qfileinfo.h> -#include <qdom.h> +#include <tqfileinfo.h> +#include <tqdom.h> #include <klocale.h> #include <kconfig.h> @@ -31,16 +31,16 @@ -K3bMixedDoc::K3bMixedDoc( QObject* parent ) - : K3bDoc( parent ) +K3bMixedDoc::K3bMixedDoc( TQObject* tqparent ) + : K3bDoc( tqparent ) { m_dataDoc = new K3bDataDoc( this ); m_audioDoc = new K3bAudioDoc( this ); - connect( m_dataDoc, SIGNAL(changed()), - this, SIGNAL(changed()) ); - connect( m_audioDoc, SIGNAL(changed()), - this, SIGNAL(changed()) ); + connect( m_dataDoc, TQT_SIGNAL(changed()), + this, TQT_SIGNAL(changed()) ); + connect( m_audioDoc, TQT_SIGNAL(changed()), + this, TQT_SIGNAL(changed()) ); } @@ -58,7 +58,7 @@ bool K3bMixedDoc::newDocument() } -QString K3bMixedDoc::name() const +TQString K3bMixedDoc::name() const { return m_dataDoc->name(); } @@ -102,9 +102,9 @@ int K3bMixedDoc::numOfTracks() const } -K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bMixedJob( this, hdl, parent ); + return new K3bMixedJob( this, hdl, tqparent ); } @@ -114,9 +114,9 @@ void K3bMixedDoc::addUrls( const KURL::List& urls ) } -bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem ) +bool K3bMixedDoc::loadDocumentData( TQDomElement* rootElem ) { - QDomNodeList nodes = rootElem->childNodes(); + TQDomNodeList nodes = rootElem->childNodes(); if( nodes.length() < 4 ) return false; @@ -128,23 +128,23 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem ) if( nodes.item(1).nodeName() != "audio" ) return false; - QDomElement audioElem = nodes.item(1).toElement(); + TQDomElement audioElem = nodes.item(1).toElement(); if( !m_audioDoc->loadDocumentData( &audioElem ) ) return false; if( nodes.item(2).nodeName() != "data" ) return false; - QDomElement dataElem = nodes.item(2).toElement(); + TQDomElement dataElem = nodes.item(2).toElement(); if( !m_dataDoc->loadDocumentData( &dataElem ) ) return false; if( nodes.item(3).nodeName() != "mixed" ) return false; - QDomNodeList optionList = nodes.item(3).childNodes(); + TQDomNodeList optionList = nodes.item(3).childNodes(); for( uint i = 0; i < optionList.count(); i++ ) { - QDomElement e = optionList.item(i).toElement(); + TQDomElement e = optionList.item(i).toElement(); if( e.isNull() ) return false; @@ -153,7 +153,7 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem ) else if( e.nodeName() == "image_path" ) setTempDir( e.toElement().text() ); else if( e.nodeName() == "mixed_type" ) { - QString mt = e.toElement().text(); + TQString mt = e.toElement().text(); if( mt == "last_track" ) setMixedType( DATA_LAST_TRACK ); else if( mt == "second_session" ) @@ -167,31 +167,31 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem ) } -bool K3bMixedDoc::saveDocumentData( QDomElement* docElem ) +bool K3bMixedDoc::saveDocumentData( TQDomElement* docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); - QDomElement audioElem = doc.createElement( "audio" ); + TQDomElement audioElem = doc.createElement( "audio" ); m_audioDoc->saveDocumentData( &audioElem ); docElem->appendChild( audioElem ); - QDomElement dataElem = doc.createElement( "data" ); + TQDomElement dataElem = doc.createElement( "data" ); m_dataDoc->saveDocumentData( &dataElem ); docElem->appendChild( dataElem ); - QDomElement mixedElem = doc.createElement( "mixed" ); + TQDomElement mixedElem = doc.createElement( "mixed" ); docElem->appendChild( mixedElem ); - QDomElement bufferFilesElem = doc.createElement( "remove_buffer_files" ); + TQDomElement bufferFilesElem = doc.createElement( "remove_buffer_files" ); bufferFilesElem.appendChild( doc.createTextNode( removeImages() ? "yes" : "no" ) ); mixedElem.appendChild( bufferFilesElem ); - QDomElement imagePathElem = doc.createElement( "image_path" ); + TQDomElement imagePathElem = doc.createElement( "image_path" ); imagePathElem.appendChild( doc.createTextNode( tempDir() ) ); mixedElem.appendChild( imagePathElem ); - QDomElement mixedTypeElem = doc.createElement( "mixed_type" ); + TQDomElement mixedTypeElem = doc.createElement( "mixed_type" ); switch( mixedType() ) { case DATA_FIRST_TRACK: mixedTypeElem.appendChild( doc.createTextNode( "first_track" ) ); diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h index 7d71b39..b4ebc07 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.h +++ b/libk3b/projects/mixedcd/k3bmixeddoc.h @@ -22,23 +22,24 @@ #include <k3btoc.h> #include "k3b_export.h" -class QDomDocument; -class QDomElement; +class TQDomDocument; +class TQDomElement; class K3bBurnJob; //class K3bView; -class QWidget; +class TQWidget; class KConfig; class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc { Q_OBJECT + TQ_OBJECT public: - K3bMixedDoc( QObject* parent = 0 ); + K3bMixedDoc( TQObject* tqparent = 0 ); ~K3bMixedDoc(); - QString name() const; + TQString name() const; bool newDocument(); @@ -50,7 +51,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc int numOfTracks() const; - K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 ); + K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ); K3bAudioDoc* audioDoc() const { return m_audioDoc; } K3bDataDoc* dataDoc() const { return m_dataDoc; } @@ -80,9 +81,9 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc void addUrls( const KURL::List& urls ); protected: - bool loadDocumentData( QDomElement* ); - bool saveDocumentData( QDomElement* ); - QString typeString() const { return "mixed"; } + bool loadDocumentData( TQDomElement* ); + bool saveDocumentData( TQDomElement* ); + TQString typeString() const { return "mixed"; } private: K3bDataDoc* m_dataDoc; diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index a4be92c..8fbe2ff 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -43,9 +43,9 @@ #include <k3bglobalsettings.h> #include <k3baudiofile.h> -#include <qfile.h> -#include <qdatastream.h> -#include <qapplication.h> +#include <tqfile.h> +#include <tqdatastream.h> +#include <tqapplication.h> #include <kdebug.h> #include <klocale.h> @@ -55,11 +55,11 @@ #include <kstringhandler.h> -static QString createNonExistingFilesString( const QValueList<K3bAudioFile*>& items, unsigned int max ) +static TQString createNonExistingFilesString( const TQValueList<K3bAudioFile*>& items, unsigned int max ) { - QString s; + TQString s; unsigned int cnt = 0; - for( QValueList<K3bAudioFile*>::const_iterator it = items.begin(); + for( TQValueList<K3bAudioFile*>::const_iterator it = items.begin(); it != items.end(); ++it ) { s += KStringHandler::csqueeze( (*it)->filename(), 60 ); @@ -95,31 +95,31 @@ public: }; -K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ), +K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ), m_doc( doc ), m_normalizeJob(0) { d = new Private; m_isoImager = new K3bIsoImager( doc->dataDoc(), this, this ); - connect( m_isoImager, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_isoImager, SIGNAL(percent(int)), this, SLOT(slotIsoImagerPercent(int)) ); - connect( m_isoImager, SIGNAL(finished(bool)), this, SLOT(slotIsoImagerFinished(bool)) ); - connect( m_isoImager, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_isoImager, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_isoImager, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotIsoImagerPercent(int)) ); + connect( m_isoImager, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotIsoImagerFinished(bool)) ); + connect( m_isoImager, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); m_audioImager = new K3bAudioImager( doc->audioDoc(), this, this ); - connect( m_audioImager, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_audioImager, SIGNAL(percent(int)), this, SLOT(slotAudioDecoderPercent(int)) ); - connect( m_audioImager, SIGNAL(subPercent(int)), this, SLOT(slotAudioDecoderSubPercent(int)) ); - connect( m_audioImager, SIGNAL(finished(bool)), this, SLOT(slotAudioDecoderFinished(bool)) ); - connect( m_audioImager, SIGNAL(nextTrack(int, int)), this, SLOT(slotAudioDecoderNextTrack(int, int)) ); + connect( m_audioImager, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_audioImager, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotAudioDecoderPercent(int)) ); + connect( m_audioImager, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotAudioDecoderSubPercent(int)) ); + connect( m_audioImager, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAudioDecoderFinished(bool)) ); + connect( m_audioImager, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotAudioDecoderNextTrack(int, int)) ); m_msInfoFetcher = new K3bMsInfoFetcher( this, this ); - connect( m_msInfoFetcher, SIGNAL(finished(bool)), this, SLOT(slotMsInfoFetched(bool)) ); - connect( m_msInfoFetcher, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); + connect( m_msInfoFetcher, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMsInfoFetched(bool)) ); + connect( m_msInfoFetcher, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); m_writer = 0; m_tocFile = 0; @@ -168,13 +168,13 @@ void K3bMixedJob::start() // // Check if all files exist // - QValueList<K3bAudioFile*> nonExistingFiles; + TQValueList<K3bAudioFile*> nonExistingFiles; K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); while( track ) { K3bAudioDataSource* source = track->firstSource(); while( source ) { if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( source ) ) { - if( !QFile::exists( file->filename() ) ) + if( !TQFile::exists( file->filename() ) ) nonExistingFiles.append( file ); } source = source->next(); @@ -188,7 +188,7 @@ void K3bMixedJob::start() i18n("Warning"), i18n("Remove missing files and continue"), i18n("Cancel and go back") ) ) { - for( QValueList<K3bAudioFile*>::const_iterator it = nonExistingFiles.begin(); + for( TQValueList<K3bAudioFile*>::const_iterator it = nonExistingFiles.begin(); it != nonExistingFiles.end(); ++it ) { delete *it; } @@ -226,7 +226,7 @@ void K3bMixedJob::start() // we do not have msinfo yet m_currentAction = INITIALIZING_IMAGER; - m_isoImager->setMultiSessionInfo( QString::null ); + m_isoImager->setMultiSessionInfo( TQString() ); m_isoImager->init(); } @@ -251,10 +251,10 @@ void K3bMixedJob::startFirstCopy() // the maxspeed job gets the device from the doc: m_doc->audioDoc()->setBurner( m_doc->burner() ); d->maxSpeedJob = new K3bAudioMaxSpeedJob( m_doc->audioDoc(), this, this ); - connect( d->maxSpeedJob, SIGNAL(percent(int)), - this, SIGNAL(subPercent(int)) ); - connect( d->maxSpeedJob, SIGNAL(finished(bool)), - this, SLOT(slotMaxSpeedJobFinished(bool)) ); + connect( d->maxSpeedJob, TQT_SIGNAL(percent(int)), + this, TQT_SIGNAL(subPercent(int)) ); + connect( d->maxSpeedJob, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotMaxSpeedJobFinished(bool)) ); } d->maxSpeedJob->start(); } @@ -271,7 +271,7 @@ void K3bMixedJob::startFirstCopy() else { emit burning(false); - emit infoMessage( i18n("Creating audio image files in %1").arg(m_doc->tempDir()), INFO ); + emit infoMessage( i18n("Creating audio image files in %1").tqarg(m_doc->tempDir()), INFO ); m_tempFilePrefix = K3b::findUniqueFilePrefix( ( !m_doc->audioDoc()->title().isEmpty() ? m_doc->audioDoc()->title() @@ -279,7 +279,7 @@ void K3bMixedJob::startFirstCopy() m_doc->tempDir() ); m_tempData->prepareTempFileNames( m_doc->tempDir() ); - QStringList filenames; + TQStringList filenames; for( K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); track; track = track->next() ) filenames += m_tempData->bufferFileName( track ); m_audioImager->setImageFilenames( filenames ); @@ -374,9 +374,9 @@ void K3bMixedJob::slotMsInfoFetched( bool success ) if( m_usedDataWritingApp == K3b::CDRECORD ) m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo() ); else // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord - m_isoImager->setMultiSessionInfo( QString("%1,%2") - .arg(m_msInfoFetcher->lastSessionStart()) - .arg(m_msInfoFetcher->nextSessionStart()+150) ); + m_isoImager->setMultiSessionInfo( TQString("%1,%2") + .tqarg(m_msInfoFetcher->lastSessionStart()) + .tqarg(m_msInfoFetcher->nextSessionStart()+150) ); if( m_doc->onTheFly() ) { m_currentAction = PREPARING_DATA; @@ -510,8 +510,8 @@ void K3bMixedJob::slotWriterFinished( bool success ) // reload the media (as a subtask so the user does not see the "Flushing cache" or "Fixating" messages while // doing so emit newSubTask( i18n("Reloading the medium") ); - connect( K3bDevice::reload( m_doc->burner() ), SIGNAL(finished(bool)), - this, SLOT(slotMediaReloadedForSecondSession(bool)) ); + connect( K3bDevice::reload( m_doc->burner() ), TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotMediaReloadedForSecondSession(bool)) ); } else { d->copiesDone++; @@ -611,10 +611,10 @@ void K3bMixedJob::slotAudioDecoderNextTrack( int t, int tt ) if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) { K3bAudioTrack* track = m_doc->audioDoc()->getTrack(t); emit newSubTask( i18n("Decoding audio track %1 of %2%3") - .arg(t) - .arg(tt) - .arg( track->title().isEmpty() || track->artist().isEmpty() - ? QString::null + .tqarg(t) + .tqarg(tt) + .tqarg( track->title().isEmpty() || track->artist().isEmpty() + ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } } @@ -690,20 +690,20 @@ bool K3bMixedJob::prepareWriter() m_writer = writer; } - connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writer, SIGNAL(percent(int)), this, SLOT(slotWriterJobPercent(int)) ); - connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_writer, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_writer, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writer, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) ); - // connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterJobPercent(int)) ); + connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); + // connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); return true; } @@ -734,11 +734,11 @@ bool K3bMixedJob::writeTocFile() // FIXME: create the tocfile in the same directory like all the other files. if( m_tocFile ) delete m_tocFile; - m_tocFile = new KTempFile( QString::null, "toc" ); + m_tocFile = new KTempFile( TQString(), "toc" ); m_tocFile->setAutoDelete(true); // write the toc-file - if( QTextStream* s = m_tocFile->textStream() ) { + if( TQTextStream* s = m_tocFile->textStream() ) { K3bTocFileWriter tocFileWriter; @@ -774,7 +774,7 @@ bool K3bMixedJob::writeTocFile() // image filenames // if( !m_doc->onTheFly() ) { - QStringList files; + TQStringList files; K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); while( track ) { files += m_tempData->bufferFileName( track ); @@ -827,10 +827,10 @@ void K3bMixedJob::addAudioTracks( K3bCdrecordWriter* writer ) while( track ) { if( m_doc->onTheFly() ) { // this is only supported by cdrecord versions >= 2.01a13 - writer->addArgument( QFile::encodeName( m_tempData->infFileName( track ) ) ); + writer->addArgument( TQFile::encodeName( m_tempData->infFileName( track ) ) ); } else { - writer->addArgument( QFile::encodeName( m_tempData->bufferFileName( track ) ) ); + writer->addArgument( TQFile::encodeName( m_tempData->bufferFileName( track ) ) ); } track = track->next(); } @@ -850,7 +850,7 @@ void K3bMixedJob::addDataTrack( K3bCdrecordWriter* writer ) writer->addArgument( "-data" ); if( m_doc->onTheFly() ) - writer->addArgument( QString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-"); + writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-"); else writer->addArgument( m_isoImageFilePath ); } @@ -875,13 +875,13 @@ void K3bMixedJob::slotWriterNextTrack( int t, int ) if( track ) emit newSubTask( i18n("Writing track %1 of %2%3") - .arg(t) - .arg(m_doc->numOfTracks()) - .arg( track->title().isEmpty() || track->artist().isEmpty() - ? QString::null + .tqarg(t) + .tqarg(m_doc->numOfTracks()) + .tqarg( track->title().isEmpty() || track->artist().isEmpty() + ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); else - emit newSubTask( i18n("Writing track %1 of %2 (%3)").arg(t).arg(m_doc->numOfTracks()).arg(i18n("ISO9660 data")) ); + emit newSubTask( i18n("Writing track %1 of %2 (%3)").tqarg(t).tqarg(m_doc->numOfTracks()).tqarg(i18n("ISO9660 data")) ); } @@ -989,7 +989,7 @@ bool K3bMixedJob::startWriting() if( m_doc->dummy() ) emit newTask( i18n("Simulating second session") ); else if( d->copies > 1 ) - emit newTask( i18n("Writing second session of copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing second session of copy %1").tqarg(d->copiesDone+1) ); else emit newTask( i18n("Writing second session") ); } @@ -997,7 +997,7 @@ bool K3bMixedJob::startWriting() if( m_doc->dummy() ) emit newTask( i18n("Simulating first session") ); else if( d->copies > 1 ) - emit newTask( i18n("Writing first session of copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing first session of copy %1").tqarg(d->copiesDone+1) ); else emit newTask( i18n("Writing first session") ); } @@ -1005,7 +1005,7 @@ bool K3bMixedJob::startWriting() else if( m_doc->dummy() ) emit newTask( i18n("Simulating") ); else - emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); // if we append the second session the cd is already in the drive @@ -1070,8 +1070,8 @@ void K3bMixedJob::createIsoImage() if( !m_doc->onTheFly() ) emit newTask( i18n("Creating ISO image file") ); - emit newSubTask( i18n("Creating ISO image in %1").arg(m_isoImageFilePath) ); - emit infoMessage( i18n("Creating ISO image in %1").arg(m_isoImageFilePath), INFO ); + emit newSubTask( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath) ); + emit infoMessage( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath), INFO ); m_isoImager->writeToImageFile( m_isoImageFilePath ); m_isoImager->start(); @@ -1100,9 +1100,9 @@ void K3bMixedJob::removeBufferFiles() emit infoMessage( i18n("Removing buffer files."), INFO ); } - if( QFile::exists( m_isoImageFilePath ) ) - if( !QFile::remove( m_isoImageFilePath ) ) - emit infoMessage( i18n("Could not delete file %1.").arg(m_isoImageFilePath), ERROR ); + if( TQFile::exists( m_isoImageFilePath ) ) + if( !TQFile::remove( m_isoImageFilePath ) ) + emit infoMessage( i18n("Could not delete file %1.").tqarg(m_isoImageFilePath), ERROR ); // removes buffer images and temp toc or inf files m_tempData->cleanup(); @@ -1213,7 +1213,7 @@ void K3bMixedJob::determineWritingMode() if( m_doc->audioDoc()->cdText() ) { if( !cdrecordCdText ) { m_doc->audioDoc()->writeCdText( false ); - emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); + emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); } else if( m_usedAudioWritingMode == K3b::TAO ) { emit infoMessage( i18n("It is not possible to write CD-Text in TAO mode. Try DAO or RAW."), WARNING ); @@ -1228,18 +1228,18 @@ void K3bMixedJob::normalizeFiles() if( !m_normalizeJob ) { m_normalizeJob = new K3bAudioNormalizeJob( this, this ); - connect( m_normalizeJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_normalizeJob, SIGNAL(percent(int)), this, SLOT(slotNormalizeProgress(int)) ); - connect( m_normalizeJob, SIGNAL(subPercent(int)), this, SLOT(slotNormalizeSubProgress(int)) ); - connect( m_normalizeJob, SIGNAL(finished(bool)), this, SLOT(slotNormalizeJobFinished(bool)) ); - connect( m_normalizeJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_normalizeJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + connect( m_normalizeJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_normalizeJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotNormalizeProgress(int)) ); + connect( m_normalizeJob, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotNormalizeSubProgress(int)) ); + connect( m_normalizeJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotNormalizeJobFinished(bool)) ); + connect( m_normalizeJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_normalizeJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } // add all the files - QValueVector<QString> files; + TQValueVector<TQString> files; K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); while( track ) { files.append( m_tempData->bufferFileName(track) ); @@ -1310,30 +1310,30 @@ void K3bMixedJob::prepareProgressInformation() } -QString K3bMixedJob::jobDescription() const +TQString K3bMixedJob::jobDescription() const { if( m_doc->mixedType() == K3bMixedDoc::DATA_SECOND_SESSION ) return i18n("Writing Enhanced Audio CD") + ( m_doc->audioDoc()->title().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->audioDoc()->title()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) ); else return i18n("Writing Mixed Mode CD") + ( m_doc->audioDoc()->title().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->audioDoc()->title()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) ); } -QString K3bMixedJob::jobDetails() const +TQString K3bMixedJob::jobDetails() const { return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)") - .arg(m_doc->numOfTracks()) - .arg(m_doc->audioDoc()->length().toString()) - .arg(KIO::convertSize(m_doc->dataDoc()->size())) + .tqarg(m_doc->numOfTracks()) + .tqarg(m_doc->audioDoc()->length().toString()) + .tqarg(KIO::convertSize(m_doc->dataDoc()->size())) + ( m_doc->copies() > 1 && !m_doc->dummy() ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3bmixedjob.moc" diff --git a/libk3b/projects/mixedcd/k3bmixedjob.h b/libk3b/projects/mixedcd/k3bmixedjob.h index 50a1dc7..a00a0ce 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.h +++ b/libk3b/projects/mixedcd/k3bmixedjob.h @@ -23,8 +23,8 @@ class K3bMixedDoc; class K3bIsoImager; class K3bAudioImager; -class QFile; -class QDataStream; +class TQFile; +class TQDataStream; class K3bAbstractWriter; class K3bWaveFileWriter; class KTempFile; @@ -40,16 +40,17 @@ class K3bDevice::Device; class K3bMixedJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bMixedJob(); K3bDoc* doc() const; K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void cancel(); @@ -109,7 +110,7 @@ class K3bMixedJob : public K3bBurnJob K3bMsInfoFetcher* m_msInfoFetcher; K3bAudioNormalizeJob* m_normalizeJob; - QString m_isoImageFilePath; + TQString m_isoImageFilePath; KTempFile* m_tocFile; @@ -133,7 +134,7 @@ class K3bMixedJob : public K3bBurnJob int m_usedDataWritingMode; int m_usedAudioWritingMode; - QString m_tempFilePrefix; + TQString m_tempFilePrefix; K3b::Msf m_projectSize; diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index f7b2198..5b5ea82 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -30,15 +30,15 @@ #include <kconfig.h> #include <kapplication.h> -#include <qdom.h> -#include <qfileinfo.h> +#include <tqdom.h> +#include <tqfileinfo.h> -K3bMovixDoc::K3bMovixDoc( QObject* parent ) - : K3bDataDoc( parent ) +K3bMovixDoc::K3bMovixDoc( TQObject* tqparent ) + : K3bDataDoc( tqparent ) { - connect( this, SIGNAL(itemRemoved(K3bDataItem*)), - this, SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( this, TQT_SIGNAL(itemRemoved(K3bDataItem*)), + this, TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); } @@ -47,9 +47,9 @@ K3bMovixDoc::~K3bMovixDoc() } -K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bMovixJob( this, hdl, parent ); + return new K3bMovixJob( this, hdl, tqparent ); } @@ -79,11 +79,11 @@ void K3bMovixDoc::addMovixFile( const KURL& _url, int pos ) { KURL url = K3b::convertToLocalUrl( _url ); - QFileInfo f( url.path() ); + TQFileInfo f( url.path() ); if( !f.isFile() || !url.isLocalFile() ) return; - QString newName = f.fileName(); + TQString newName = f.fileName(); if( nameAlreadyInDir( newName, root() ) ) { kapp->config()->setGroup("Data project settings"); bool dropDoubles = kapp->config()->readBoolEntry( "Drop doubles", false ); @@ -113,15 +113,15 @@ void K3bMovixDoc::addMovixFile( const KURL& _url, int pos ) } -bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) +bool K3bMovixDoc::loadDocumentData( TQDomElement* rootElem ) { if( !root() ) newDocument(); - QDomNodeList nodes = rootElem->childNodes(); + TQDomNodeList nodes = rootElem->childNodes(); if( nodes.item(0).nodeName() != "general" ) { - kdDebug() << "(K3bMovixDoc) could not find 'general' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'general' section." << endl; return false; } if( !readGeneralDocumentData( nodes.item(0).toElement() ) ) @@ -131,7 +131,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) // parse options // ----------------------------------------------------------------- if( nodes.item(1).nodeName() != "data_options" ) { - kdDebug() << "(K3bMovixDoc) could not find 'data_options' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'data_options' section." << endl; return false; } if( !loadDocumentDataOptions( nodes.item(1).toElement() ) ) @@ -143,7 +143,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) // parse header // ----------------------------------------------------------------- if( nodes.item(2).nodeName() != "data_header" ) { - kdDebug() << "(K3bMovixDoc) could not find 'data_header' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'data_header' section." << endl; return false; } if( !loadDocumentDataHeader( nodes.item(2).toElement() ) ) @@ -155,15 +155,15 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) // parse movix options // ----------------------------------------------------------------- if( nodes.item(3).nodeName() != "movix_options" ) { - kdDebug() << "(K3bMovixDoc) could not find 'movix_options' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'movix_options' section." << endl; return false; } // load the options - QDomNodeList optionList = nodes.item(3).childNodes(); + TQDomNodeList optionList = nodes.item(3).childNodes(); for( uint i = 0; i < optionList.count(); i++ ) { - QDomElement e = optionList.item(i).toElement(); + TQDomElement e = optionList.item(i).toElement(); if( e.isNull() ) return false; @@ -186,7 +186,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) else if( e.nodeName() == "keyboard_language") setKeyboardLayout( e.text() ); else if( e.nodeName() == "codecs") - setCodecs( QStringList::split( ',', e.text() ) ); + setCodecs( TQStringList::split( ',', e.text() ) ); else if( e.nodeName() == "default_boot_label") setDefaultBootLabel( e.text() ); else if( e.nodeName() == "additional_mplayer_options") @@ -203,15 +203,15 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) // parse files // ----------------------------------------------------------------- if( nodes.item(4).nodeName() != "movix_files" ) { - kdDebug() << "(K3bMovixDoc) could not find 'movix_files' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'movix_files' section." << endl; return false; } // load file items - QDomNodeList fileList = nodes.item(4).childNodes(); + TQDomNodeList fileList = nodes.item(4).childNodes(); for( uint i = 0; i < fileList.count(); i++ ) { - QDomElement e = fileList.item(i).toElement(); + TQDomElement e = fileList.item(i).toElement(); if( e.isNull() ) return false; @@ -221,7 +221,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) return false; } - QDomElement urlElem = e.firstChild().toElement(); + TQDomElement urlElem = e.firstChild().toElement(); if( urlElem.isNull() ) { kdDebug() << "(K3bMovixDoc) found file tag without url child." << endl; return false; @@ -235,7 +235,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) m_movixFiles.append( newK3bItem ); // subtitle file? - QDomElement subTitleElem = e.childNodes().item(1).toElement(); + TQDomElement subTitleElem = e.childNodes().item(1).toElement(); if( !subTitleElem.isNull() && subTitleElem.nodeName() == "subtitle_file" ) { urlElem = subTitleElem.firstChild().toElement(); if( urlElem.isNull() ) { @@ -243,7 +243,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) return false; } - QString name = K3bMovixFileItem::subTitleFileName( newK3bItem->k3bName() ); + TQString name = K3bMovixFileItem::subTitleFileName( newK3bItem->k3bName() ); K3bFileItem* subItem = new K3bFileItem( urlElem.text(), this, root(), name ); newK3bItem->setSubTitleItem( subItem ); } @@ -262,24 +262,24 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) } -bool K3bMovixDoc::saveDocumentData( QDomElement* docElem ) +bool K3bMovixDoc::saveDocumentData( TQDomElement* docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); - QDomElement optionsElem = doc.createElement( "data_options" ); + TQDomElement optionsElem = doc.createElement( "data_options" ); saveDocumentDataOptions( optionsElem ); - QDomElement headerElem = doc.createElement( "data_header" ); + TQDomElement headerElem = doc.createElement( "data_header" ); saveDocumentDataHeader( headerElem ); - QDomElement movixOptElem = doc.createElement( "movix_options" ); - QDomElement movixFilesElem = doc.createElement( "movix_files" ); + TQDomElement movixOptElem = doc.createElement( "movix_options" ); + TQDomElement movixFilesElem = doc.createElement( "movix_files" ); // save the movix options - QDomElement propElem = doc.createElement( "shutdown" ); + TQDomElement propElem = doc.createElement( "shutdown" ); propElem.setAttribute( "activated", shutdown() ? "yes" : "no" ); movixOptElem.appendChild( propElem ); @@ -332,22 +332,22 @@ bool K3bMovixDoc::saveDocumentData( QDomElement* docElem ) movixOptElem.appendChild( propElem ); propElem = doc.createElement( "loop_playlist" ); - propElem.appendChild( doc.createTextNode( QString::number(loopPlaylist()) ) ); + propElem.appendChild( doc.createTextNode( TQString::number(loopPlaylist()) ) ); movixOptElem.appendChild( propElem ); // save the movix items - for( QPtrListIterator<K3bMovixFileItem> it( m_movixFiles ); + for( TQPtrListIterator<K3bMovixFileItem> it( m_movixFiles ); *it; ++it ) { K3bMovixFileItem* item = *it; - QDomElement topElem = doc.createElement( "file" ); + TQDomElement topElem = doc.createElement( "file" ); topElem.setAttribute( "name", item->k3bName() ); - QDomElement urlElem = doc.createElement( "url" ); + TQDomElement urlElem = doc.createElement( "url" ); urlElem.appendChild( doc.createTextNode( item->localPath() ) ); topElem.appendChild( urlElem ); if( item->subTitleItem() ) { - QDomElement subElem = doc.createElement( "subtitle_file" ); + TQDomElement subElem = doc.createElement( "subtitle_file" ); urlElem = doc.createElement( "url" ); urlElem.appendChild( doc.createTextNode( item->subTitleItem()->localPath() ) ); subElem.appendChild( urlElem ); @@ -370,7 +370,7 @@ void K3bMovixDoc::slotDataItemRemoved( K3bDataItem* item ) { // check if it's a movix item if( K3bMovixFileItem* fi = dynamic_cast<K3bMovixFileItem*>(item) ) - if( m_movixFiles.containsRef( fi ) ) { + if( m_movixFiles.tqcontainsRef( fi ) ) { emit movixItemRemoved( fi ); m_movixFiles.removeRef( fi ); setModified(true); @@ -380,7 +380,7 @@ void K3bMovixDoc::slotDataItemRemoved( K3bDataItem* item ) int K3bMovixDoc::indexOf( K3bMovixFileItem* item ) { - return m_movixFiles.findRef(item)+1; + return m_movixFiles.tqfindRef(item)+1; } @@ -390,12 +390,12 @@ void K3bMovixDoc::moveMovixItem( K3bMovixFileItem* item, K3bMovixFileItem* itemA return; // set the current item to track - m_movixFiles.findRef( item ); + m_movixFiles.tqfindRef( item ); // take the current item item = m_movixFiles.take(); - // if after == 0 findRef returnes -1 - int pos = m_movixFiles.findRef( itemAfter ); + // if after == 0 tqfindRef returnes -1 + int pos = m_movixFiles.tqfindRef( itemAfter ); m_movixFiles.insert( pos+1, item ); emit newMovixFileItems(); @@ -409,15 +409,15 @@ void K3bMovixDoc::addSubTitleItem( K3bMovixFileItem* item, const KURL& url ) if( item->subTitleItem() ) removeSubTitleItem( item ); - QFileInfo f( url.path() ); + TQFileInfo f( url.path() ); if( !f.isFile() || !url.isLocalFile() ) return; // check if there already is a file named like we want to name the subTitle file - QString name = K3bMovixFileItem::subTitleFileName( item->k3bName() ); + TQString name = K3bMovixFileItem::subTitleFileName( item->k3bName() ); if( nameAlreadyInDir( name, root() ) ) { - KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").arg(name) ); + KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").tqarg(name) ); return; } diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h index 53debfc..cd46dbf 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.h +++ b/libk3b/projects/movixcd/k3bmovixdoc.h @@ -20,11 +20,11 @@ #include <k3bdatadoc.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include "k3b_export.h" //class K3bView; class KURL; -class QDomElement; +class TQDomElement; class K3bFileItem; class K3bMovixFileItem; class K3bDataItem; @@ -34,18 +34,19 @@ class KConfig; class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc { Q_OBJECT + TQ_OBJECT public: - K3bMovixDoc( QObject* parent = 0 ); + K3bMovixDoc( TQObject* tqparent = 0 ); virtual ~K3bMovixDoc(); virtual int type() const { return MOVIX; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); bool newDocument(); - const QPtrList<K3bMovixFileItem>& movixFileItems() const { return m_movixFiles; } + const TQPtrList<K3bMovixFileItem>& movixFileItems() const { return m_movixFiles; } int indexOf( K3bMovixFileItem* ); @@ -54,14 +55,14 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc bool reboot() const { return m_reboot; } bool ejectDisk() const { return m_ejectDisk; } bool randomPlay() const { return m_randomPlay; } - const QString& subtitleFontset() const { return m_subtitleFontset; } - const QString& bootMessageLanguage() const { return m_bootMessageLanguage; } - const QString& audioBackground() const { return m_audioBackground; } - const QString& keyboardLayout() const { return m_keyboardLayout; } - const QStringList& codecs() const { return m_codecs; } - const QString& defaultBootLabel() const { return m_defaultBootLabel; } - const QString& additionalMPlayerOptions() const { return m_additionalMPlayerOptions; } - const QString& unwantedMPlayerOptions() const { return m_unwantedMPlayerOptions; } + const TQString& subtitleFontset() const { return m_subtitleFontset; } + const TQString& bootMessageLanguage() const { return m_bootMessageLanguage; } + const TQString& audioBackground() const { return m_audioBackground; } + const TQString& keyboardLayout() const { return m_keyboardLayout; } + const TQStringList& codecs() const { return m_codecs; } + const TQString& defaultBootLabel() const { return m_defaultBootLabel; } + const TQString& additionalMPlayerOptions() const { return m_additionalMPlayerOptions; } + const TQString& unwantedMPlayerOptions() const { return m_unwantedMPlayerOptions; } int loopPlaylist() const { return m_loopPlaylist; } bool noDma() const { return m_noDma; } @@ -69,14 +70,14 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc void setReboot( bool v ) { m_reboot = v; } void setEjectDisk( bool v ) { m_ejectDisk = v; } void setRandomPlay( bool v ) { m_randomPlay = v; } - void setSubtitleFontset( const QString& v ) { m_subtitleFontset = v; } - void setBootMessageLanguage( const QString& v ) { m_bootMessageLanguage = v; } - void setAudioBackground( const QString& b ) { m_audioBackground = b; } - void setKeyboardLayout( const QString& l ) { m_keyboardLayout = l; } - void setCodecs( const QStringList& c ) { m_codecs = c; } - void setDefaultBootLabel( const QString& v ) { m_defaultBootLabel = v; } - void setAdditionalMPlayerOptions( const QString& v ) { m_additionalMPlayerOptions = v; } - void setUnwantedMPlayerOptions( const QString& v ) { m_unwantedMPlayerOptions = v; } + void setSubtitleFontset( const TQString& v ) { m_subtitleFontset = v; } + void setBootMessageLanguage( const TQString& v ) { m_bootMessageLanguage = v; } + void setAudioBackground( const TQString& b ) { m_audioBackground = b; } + void setKeyboardLayout( const TQString& l ) { m_keyboardLayout = l; } + void setCodecs( const TQStringList& c ) { m_codecs = c; } + void setDefaultBootLabel( const TQString& v ) { m_defaultBootLabel = v; } + void setAdditionalMPlayerOptions( const TQString& v ) { m_additionalMPlayerOptions = v; } + void setUnwantedMPlayerOptions( const TQString& v ) { m_unwantedMPlayerOptions = v; } void setLoopPlaylist( int v ) { m_loopPlaylist = v; } void setNoDma( bool b ) { m_noDma = b; } @@ -94,30 +95,30 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc protected: /** reimplemented from K3bDoc */ - bool loadDocumentData( QDomElement* root ); + bool loadDocumentData( TQDomElement* root ); /** reimplemented from K3bDoc */ - bool saveDocumentData( QDomElement* ); + bool saveDocumentData( TQDomElement* ); - virtual QString typeString() const { return "movix"; } + virtual TQString typeString() const { return "movix"; } private slots: void slotDataItemRemoved( K3bDataItem* ); private: - QPtrList<K3bMovixFileItem> m_movixFiles; + TQPtrList<K3bMovixFileItem> m_movixFiles; bool m_shutdown; bool m_reboot; bool m_ejectDisk; bool m_randomPlay; - QString m_subtitleFontset; - QString m_bootMessageLanguage; - QString m_audioBackground; - QString m_keyboardLayout; - QStringList m_codecs; - QString m_defaultBootLabel; - QString m_additionalMPlayerOptions; - QString m_unwantedMPlayerOptions; + TQString m_subtitleFontset; + TQString m_bootMessageLanguage; + TQString m_audioBackground; + TQString m_keyboardLayout; + TQStringList m_codecs; + TQString m_defaultBootLabel; + TQString m_additionalMPlayerOptions; + TQString m_unwantedMPlayerOptions; int m_loopPlaylist; bool m_noDma; }; diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 57e18af..04afd83 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -31,8 +31,8 @@ #include <ktempfile.h> #include <kio/global.h> -#include <qtextstream.h> -#include <qdir.h> +#include <tqtextstream.h> +#include <tqdir.h> class K3bMovixDocPreparer::Private @@ -62,14 +62,14 @@ public: K3bDirItem* mplayerDir; K3bFileItem* playlistFileItem; - QPtrList<K3bDataItem> newMovixItems; + TQPtrList<K3bDataItem> newMovixItems; bool structuresCreated; }; -K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ) +K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ) { d = new Private(); d->doc = doc; @@ -175,11 +175,11 @@ bool K3bMovixDocPreparer::writePlaylistFile() d->playlistFile = new KTempFile(); d->playlistFile->setAutoDelete(true); - if( QTextStream* s = d->playlistFile->textStream() ) { + if( TQTextStream* s = d->playlistFile->textStream() ) { - const QPtrList<K3bMovixFileItem>& movixFileItems = d->doc->movixFileItems(); + const TQPtrList<K3bMovixFileItem>& movixFileItems = d->doc->movixFileItems(); - for( QPtrListIterator<K3bMovixFileItem> it( movixFileItems ); + for( TQPtrListIterator<K3bMovixFileItem> it( movixFileItems ); *it; ++it ) { *s << "/cdrom/"; *s << it.current()->writtenName(); @@ -190,33 +190,33 @@ bool K3bMovixDocPreparer::writePlaylistFile() return true; } else { - emit infoMessage( i18n("Could not write to temporary file %1").arg(d->playlistFile->name()), ERROR ); + emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->playlistFile->name()), ERROR ); return false; } } -bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const QString& originalPath ) +bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const TQString& originalPath ) { delete d->isolinuxConfigFile; d->isolinuxConfigFile = new KTempFile(); d->isolinuxConfigFile->setAutoDelete(true); - if( QTextStream* s = d->isolinuxConfigFile->textStream() ) { + if( TQTextStream* s = d->isolinuxConfigFile->textStream() ) { - // now open the default isolinux.cfg and copy everything except the first line which contains + // now open the default isolinux.cfg and copy everything except the first line which tqcontains // the default boot label - QFile f( originalPath ); + TQFile f( originalPath ); if( f.open( IO_ReadOnly ) ) { - QTextStream isolinuxConfigOrig( &f ); + TQTextStream isolinuxConfigOrig( &f ); if( d->doc->defaultBootLabel() != i18n("default") ) { isolinuxConfigOrig.readLine(); // skip first line *s << "default " << d->doc->defaultBootLabel() << endl; } - QString line = isolinuxConfigOrig.readLine(); + TQString line = isolinuxConfigOrig.readLine(); while( !line.isNull() ) { *s << line << endl; line = isolinuxConfigOrig.readLine(); @@ -229,7 +229,7 @@ bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const QString& originalPath ) return false; } else { - emit infoMessage( i18n("Could not write to temporary file %1").arg(d->isolinuxConfigFile->name()), ERROR ); + emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->isolinuxConfigFile->name()), ERROR ); return false; } } @@ -241,7 +241,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile() d->movixRcFile = new KTempFile(); d->movixRcFile->setAutoDelete(true); - if( QTextStream* s = d->movixRcFile->textStream() ) { + if( TQTextStream* s = d->movixRcFile->textStream() ) { if( !d->doc->additionalMPlayerOptions().isEmpty() ) *s << "extra-mplayer-options=" << d->doc->additionalMPlayerOptions() << endl; @@ -263,7 +263,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile() return true; } else { - emit infoMessage( i18n("Could not write to temporary file %1").arg(d->movixRcFile->name()), ERROR ); + emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->movixRcFile->name()), ERROR ); return false; } } @@ -297,28 +297,28 @@ bool K3bMovixDocPreparer::addMovixFiles() // the following sucks! Redesign it! // add all the isolinux files - QStringList isolinuxFiles = d->eMovixBin->isolinuxFiles(); + TQStringList isolinuxFiles = d->eMovixBin->isolinuxFiles(); isolinuxFiles.remove( "isolinux.bin" ); isolinuxFiles.remove( "isolinux.cfg" ); isolinuxFiles.remove( "kernel/vmlinuz" ); - for( QStringList::const_iterator it = isolinuxFiles.begin(); + for( TQStringList::const_iterator it = isolinuxFiles.begin(); it != isolinuxFiles.end(); ++it ) { - QString path = d->eMovixBin->path + "/isolinux/" + *it; + TQString path = d->eMovixBin->path + "/isolinux/" + *it; (void)new K3bFileItem( path, d->doc, d->isolinuxDir ); } - const QStringList& movixFiles = d->eMovixBin->movixFiles(); - for( QStringList::const_iterator it = movixFiles.begin(); + const TQStringList& movixFiles = d->eMovixBin->movixFiles(); + for( TQStringList::const_iterator it = movixFiles.begin(); it != movixFiles.end(); ++it ) { - QString path = d->eMovixBin->path + "/movix/" + *it; + TQString path = d->eMovixBin->path + "/movix/" + *it; (void)new K3bFileItem( path, d->doc, d->movixDir ); } // add doku files - QString path = d->eMovixBin->languageDir( d->doc->bootMessageLanguage() ); - QDir dir(path); - QStringList helpFiles = dir.entryList(QDir::Files); - for( QStringList::const_iterator it = helpFiles.begin(); + TQString path = d->eMovixBin->languageDir( d->doc->bootMessageLanguage() ); + TQDir dir(path); + TQStringList helpFiles = dir.entryList(TQDir::Files); + for( TQStringList::const_iterator it = helpFiles.begin(); it != helpFiles.end(); ++it ) { // some emovix installations include backup-files, no one's perfect ;) if( !(*it).endsWith( "~" ) ) @@ -331,13 +331,13 @@ bool K3bMovixDocPreparer::addMovixFiles() d->doc->subtitleFontset() != i18n("none") ) { d->mplayerDir = new K3bDirItem( "mplayer", d->doc, d->doc->root() ); - QString fontPath = d->eMovixBin->subtitleFontDir( d->doc->subtitleFontset() ); - QFileInfo fontType( fontPath ); + TQString fontPath = d->eMovixBin->subtitleFontDir( d->doc->subtitleFontset() ); + TQFileInfo fontType( fontPath ); if( fontType.isDir() ) { K3bDirItem* fontDir = new K3bDirItem( "font", d->doc, d->mplayerDir ); - QDir dir( fontPath ); - QStringList fontFiles = dir.entryList( QDir::Files ); - for( QStringList::const_iterator it = fontFiles.begin(); + TQDir dir( fontPath ); + TQStringList fontFiles = dir.entryList( TQDir::Files ); + for( TQStringList::const_iterator it = fontFiles.begin(); it != fontFiles.end(); ++it ) { (void)new K3bFileItem( fontPath + "/" + *it, d->doc, fontDir ); } @@ -378,16 +378,16 @@ bool K3bMovixDocPreparer::addMovixFilesNew() // 4. set weights for isolinux files // FIXME: use the settings from the doc - QStringList files = d->eMovixBin->files( d->doc->keyboardLayout(), + TQStringList files = d->eMovixBin->files( d->doc->keyboardLayout(), d->doc->subtitleFontset(), d->doc->audioBackground(), d->doc->bootMessageLanguage(), "all" /*d->doc->codecs()*/ ); // for now we simply don't allow selection - for( QStringList::iterator it = files.begin(); it != files.end(); ++it ) { - QString docPath = (*it).section( ' ', 0, 0 ); - QString filePath = (*it).section( ' ', 1, 1 ); - QString fileName = filePath.section( '/', -1 ); + for( TQStringList::iterator it = files.begin(); it != files.end(); ++it ) { + TQString docPath = (*it).section( ' ', 0, 0 ); + TQString filePath = (*it).section( ' ', 1, 1 ); + TQString fileName = filePath.section( '/', -1 ); if( fileName == "isolinux.cfg" ) { // replace the local file with our modified one @@ -406,7 +406,7 @@ bool K3bMovixDocPreparer::addMovixFilesNew() // set the proper sort weight bootItem->setSortWeight( 200 ); - bootItem->parent()->setSortWeight( 100 ); + bootItem->tqparent()->setSortWeight( 100 ); } else if( fileName != "movixrc" ) { // we create our own movixrc K3bFileItem* item = createItem( filePath, docPath ); @@ -424,10 +424,10 @@ bool K3bMovixDocPreparer::addMovixFilesNew() // eMovix supplied codecs. These codecs are not picked up by the movix-conf script K3bDirItem* codecDir = dynamic_cast<K3bDirItem*>( d->doc->root()->findByPath( "/eMoviX/codecs" ) ); if( !codecDir || codecDir->isEmpty() ) { - QDir localCodecDir( d->eMovixBin->movixDataDir() + "/codecs" ); + TQDir localCodecDir( d->eMovixBin->movixDataDir() + "/codecs" ); if( localCodecDir.exists() ) { - QStringList codecFiles = localCodecDir.entryList( QDir::Files ); - for( QStringList::const_iterator it = codecFiles.begin(); it != codecFiles.end(); ++it ) + TQStringList codecFiles = localCodecDir.entryList( TQDir::Files ); + for( TQStringList::const_iterator it = codecFiles.begin(); it != codecFiles.end(); ++it ) createItem( localCodecDir.path() + '/' + *it, "/eMoviX/codecs" ); } } @@ -443,7 +443,7 @@ bool K3bMovixDocPreparer::addMovixFilesNew() } -K3bFileItem* K3bMovixDocPreparer::createItem( const QString& localPath, const QString& docPath ) +K3bFileItem* K3bMovixDocPreparer::createItem( const TQString& localPath, const TQString& docPath ) { // make sure the path in the doc exists K3bDirItem* dir = createDir( docPath ); @@ -459,12 +459,12 @@ K3bFileItem* K3bMovixDocPreparer::createItem( const QString& localPath, const QS } -K3bDirItem* K3bMovixDocPreparer::createDir( const QString& docPath ) +K3bDirItem* K3bMovixDocPreparer::createDir( const TQString& docPath ) { - QStringList docPathSections = QStringList::split( '/', docPath ); + TQStringList docPathSections = TQStringList::split( '/', docPath ); K3bDirItem* dir = d->doc->root(); - for( QStringList::iterator it = docPathSections.begin(); it != docPathSections.end(); ++it ) { - K3bDataItem* next = dir->find( *it ); + for( TQStringList::iterator it = docPathSections.begin(); it != docPathSections.end(); ++it ) { + K3bDataItem* next = dir->tqfind( *it ); if( !next ) dir = new K3bDirItem( *it, d->doc, dir ); else if( next->isDir() ) @@ -478,9 +478,9 @@ K3bDirItem* K3bMovixDocPreparer::createDir( const QString& docPath ) // remember the dir to remove it if( dir != d->doc->root() ) { K3bDirItem* delDir = dir; - while( delDir->parent() != d->doc->root() ) - delDir = delDir->parent(); - if( d->newMovixItems.findRef( delDir ) == -1 ) + while( delDir->tqparent() != d->doc->root() ) + delDir = delDir->tqparent(); + if( d->newMovixItems.tqfindRef( delDir ) == -1 ) d->newMovixItems.append( delDir ); } diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.h b/libk3b/projects/movixcd/k3bmovixdocpreparer.h index 3844eae..8d4ba1e 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.h +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.h @@ -30,9 +30,10 @@ class K3bDirItem; class K3bMovixDocPreparer : public K3bJob { Q_OBJECT + TQ_OBJECT public: - explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bMovixDocPreparer(); K3bMovixDoc* doc() const; @@ -53,12 +54,12 @@ class K3bMovixDocPreparer : public K3bJob private: bool writePlaylistFile(); - bool writeIsolinuxConfigFile( const QString& ); + bool writeIsolinuxConfigFile( const TQString& ); bool writeMovixRcFile(); bool addMovixFiles(); bool addMovixFilesNew(); - K3bFileItem* createItem( const QString& localPath, const QString& docPath ); - K3bDirItem* createDir( const QString& docPath ); + K3bFileItem* createItem( const TQString& localPath, const TQString& docPath ); + K3bDirItem* createDir( const TQString& docPath ); class Private; Private* d; diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.cpp b/libk3b/projects/movixcd/k3bmovixfileitem.cpp index 12803a2..ccc387f 100644 --- a/libk3b/projects/movixcd/k3bmovixfileitem.cpp +++ b/libk3b/projects/movixcd/k3bmovixfileitem.cpp @@ -20,10 +20,10 @@ #include <k3bdiritem.h> -K3bMovixFileItem::K3bMovixFileItem( const QString& fileName, +K3bMovixFileItem::K3bMovixFileItem( const TQString& fileName, K3bMovixDoc* doc, K3bDirItem* dir, - const QString& k3bName ) + const TQString& k3bName ) : K3bFileItem( fileName, doc, dir, k3bName ), m_doc(doc), m_subTitleItem(0) @@ -36,16 +36,16 @@ K3bMovixFileItem::~K3bMovixFileItem() if( m_subTitleItem ) m_doc->removeSubTitleItem( this ); - // remove this from parentdir + // remove this from tqparentdir // it is important to do it here and not // rely on the K3bFileItem destructor becasue // otherwise the doc is not informed early enough - if( parent() ) - parent()->takeDataItem( this ); + if( tqparent() ) + tqparent()->takeDataItem( this ); } -void K3bMovixFileItem::setK3bName( const QString& newName ) +void K3bMovixFileItem::setK3bName( const TQString& newName ) { K3bFileItem::setK3bName( newName ); @@ -56,11 +56,11 @@ void K3bMovixFileItem::setK3bName( const QString& newName ) } -QString K3bMovixFileItem::subTitleFileName( const QString& name ) +TQString K3bMovixFileItem::subTitleFileName( const TQString& name ) { // remove ending from k3bName - QString subName = name; - int pos = subName.findRev("."); + TQString subName = name; + int pos = subName.tqfindRev("."); if( pos > 0 ) subName.truncate( pos ); subName += ".sub"; diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.h b/libk3b/projects/movixcd/k3bmovixfileitem.h index 343f00b..a605434 100644 --- a/libk3b/projects/movixcd/k3bmovixfileitem.h +++ b/libk3b/projects/movixcd/k3bmovixfileitem.h @@ -25,7 +25,7 @@ class K3bMovixDoc; class K3bMovixFileItem : public K3bFileItem { public: - K3bMovixFileItem( const QString& fileName, K3bMovixDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 ); + K3bMovixFileItem( const TQString& fileName, K3bMovixDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 ); ~K3bMovixFileItem(); K3bFileItem* subTitleItem() const { return m_subTitleItem; } @@ -35,13 +35,13 @@ class K3bMovixFileItem : public K3bFileItem * reimplemented from K3bDataItem * also renames the subTitleItem */ - void setK3bName( const QString& ); + void setK3bName( const TQString& ); /** * returnes the name that the subtitle file must have in * order to work with mplayer */ - static QString subTitleFileName( const QString& ); + static TQString subTitleFileName( const TQString& ); private: K3bMovixDoc* m_doc; diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp index 2579453..220a8da 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.cpp +++ b/libk3b/projects/movixcd/k3bmovixjob.cpp @@ -27,34 +27,34 @@ #include <kdebug.h> -K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, QObject* parent ) - : K3bBurnJob( jh, parent ), +K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) + : K3bBurnJob( jh, tqparent ), m_doc(doc) { m_dataJob = new K3bDataJob( doc, this, this ); m_movixDocPreparer = new K3bMovixDocPreparer( doc, this, this ); // pipe signals - connect( m_dataJob, SIGNAL(percent(int)), this, SIGNAL(percent(int)) ); - connect( m_dataJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_dataJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_dataJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_dataJob, SIGNAL(bufferStatus(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_dataJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_dataJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_dataJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_dataJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_dataJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( m_dataJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_dataJob, SIGNAL(burning(bool)), this, SIGNAL(burning(bool)) ); + connect( m_dataJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) ); + connect( m_dataJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_dataJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_dataJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( m_dataJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_dataJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); + connect( m_dataJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( m_dataJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( m_dataJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_dataJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_dataJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_dataJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) ); // we need to clean up here - connect( m_dataJob, SIGNAL(finished(bool)), this, SLOT(slotDataJobFinished(bool)) ); + connect( m_dataJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDataJobFinished(bool)) ); - connect( m_movixDocPreparer, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); + connect( m_movixDocPreparer, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); } @@ -110,23 +110,23 @@ void K3bMovixJob::slotDataJobFinished( bool success ) } -QString K3bMovixJob::jobDescription() const +TQString K3bMovixJob::jobDescription() const { if( m_doc->isoOptions().volumeID().isEmpty() ) return i18n("Writing eMovix CD"); else - return i18n("Writing eMovix CD (%1)").arg(m_doc->isoOptions().volumeID()); + return i18n("Writing eMovix CD (%1)").tqarg(m_doc->isoOptions().volumeID()); } -QString K3bMovixJob::jobDetails() const +TQString K3bMovixJob::jobDetails() const { return ( i18n("1 file (%1) and about 8 MB eMovix data", "%n files (%1) and about 8 MB eMovix data", - m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) + m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) + ( m_doc->copies() > 1 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3bmovixjob.moc" diff --git a/libk3b/projects/movixcd/k3bmovixjob.h b/libk3b/projects/movixcd/k3bmovixjob.h index 81dea8e..d1689f6 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.h +++ b/libk3b/projects/movixcd/k3bmovixjob.h @@ -31,16 +31,17 @@ class K3bFileItem; class K3bMovixJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, QObject* parent = 0 ); + K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bMovixJob(); K3bDoc* doc() const; K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp index 8720e8d..522e700 100644 --- a/libk3b/projects/movixcd/k3bmovixprogram.cpp +++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp @@ -21,9 +21,9 @@ #include <kdebug.h> #include <klocale.h> -#include <qdir.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqtextstream.h> K3bMovixProgram::K3bMovixProgram() @@ -31,17 +31,17 @@ K3bMovixProgram::K3bMovixProgram() { } -bool K3bMovixProgram::scan( const QString& p ) +bool K3bMovixProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; + TQString path = p; if( path[path.length()-1] != '/' ) path.append("/"); // first test if we have a version info (eMovix >= 0.8.0pre3) - if( !QFile::exists( path + "movix-version" ) ) + if( !TQFile::exists( path + "movix-version" ) ) return false; K3bMovixBin* bin = 0; @@ -74,19 +74,19 @@ bool K3bMovixProgram::scan( const QString& p ) } -bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const QString& path ) +bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const TQString& path ) { - QStringList files = bin->files(); - for( QStringList::iterator it = files.begin(); + TQStringList files = bin->files(); + for( TQStringList::iterator it = files.begin(); it != files.end(); ++it ) { - if( (*it).contains( "isolinux.cfg" ) ) { - bin->m_supportedBootLabels = determineSupportedBootLabels( QStringList::split( " ", *it )[1] ); + if( (*it).tqcontains( "isolinux.cfg" ) ) { + bin->m_supportedBootLabels = determineSupportedBootLabels( TQStringList::split( " ", *it )[1] ); break; } } // here we simply check for the movix-conf program - if( QFile::exists( path + "movix-conf" ) ) { + if( TQFile::exists( path + "movix-conf" ) ) { bin->addFeature( "newfiles" ); addBin(bin); return true; @@ -98,29 +98,29 @@ bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const QString& path ) } -bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) +bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const TQString& path ) { // // first check if all necessary directories are present // - QDir dir( bin->movixDataDir() ); - QStringList subdirs = dir.entryList( QDir::Dirs ); - if( !subdirs.contains( "boot-messages" ) ) { + TQDir dir( bin->movixDataDir() ); + TQStringList subdirs = dir.entryList( TQDir::Dirs ); + if( !subdirs.tqcontains( "boot-messages" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'boot-messages'" << endl; delete bin; return false; } - if( !subdirs.contains( "isolinux" ) ) { + if( !subdirs.tqcontains( "isolinux" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'isolinux'" << endl; delete bin; return false; } - if( !subdirs.contains( "movix" ) ) { + if( !subdirs.tqcontains( "movix" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'movix'" << endl; delete bin; return false; } - if( !subdirs.contains( "mplayer-fonts" ) ) { + if( !subdirs.tqcontains( "mplayer-fonts" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'mplayer-fonts'" << endl; delete bin; return false; @@ -130,14 +130,14 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // // check if we have a version of eMovix which contains the movix-files script // - if( QFile::exists( path + "movix-files" ) ) { + if( TQFile::exists( path + "movix-files" ) ) { bin->addFeature( "files" ); KProcess p; K3bProcessOutputCollector out( &p ); p << bin->path + "movix-files"; if( p.start( KProcess::Block, KProcess::AllOutput ) ) { - bin->m_movixFiles = QStringList::split( "\n", out.output() ); + bin->m_movixFiles = TQStringList::split( "\n", out.output() ); } } @@ -145,8 +145,8 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // fallback: to be compatible with 0.8.0rc2 we just add all files in the movix directory // if( bin->m_movixFiles.isEmpty() ) { - QDir dir( bin->movixDataDir() + "/movix" ); - bin->m_movixFiles = dir.entryList(QDir::Files); + TQDir dir( bin->movixDataDir() + "/movix" ); + bin->m_movixFiles = dir.entryList(TQDir::Files); } // @@ -164,9 +164,9 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // // check every single necessary file :( // - for( QStringList::const_iterator it = bin->m_isolinuxFiles.begin(); + for( TQStringList::const_iterator it = bin->m_isolinuxFiles.begin(); it != bin->m_isolinuxFiles.end(); ++it ) { - if( !QFile::exists( bin->movixDataDir() + "/isolinux/" + *it ) ) { + if( !TQFile::exists( bin->movixDataDir() + "/isolinux/" + *it ) ) { kdDebug() << "(K3bMovixProgram) Could not find file " << *it << endl; delete bin; return false; @@ -177,7 +177,7 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // now check the boot-messages languages // dir.cd( "boot-messages" ); - bin->m_supportedLanguages = dir.entryList(QDir::Dirs); + bin->m_supportedLanguages = dir.entryList(TQDir::Dirs); bin->m_supportedLanguages.remove("."); bin->m_supportedLanguages.remove(".."); bin->m_supportedLanguages.remove("CVS"); // the eMovix makefile stuff seems not perfect ;) @@ -189,12 +189,12 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // FIXME: every font dir needs to contain the "font.desc" file! // dir.cd( "mplayer-fonts" ); - bin->m_supportedSubtitleFonts = dir.entryList( QDir::Dirs ); + bin->m_supportedSubtitleFonts = dir.entryList( TQDir::Dirs ); bin->m_supportedSubtitleFonts.remove("."); bin->m_supportedSubtitleFonts.remove(".."); bin->m_supportedSubtitleFonts.remove("CVS"); // the eMovix makefile stuff seems not perfect ;) // new ttf fonts in 0.8.0rc2 - bin->m_supportedSubtitleFonts += dir.entryList( "*.ttf", QDir::Files ); + bin->m_supportedSubtitleFonts += dir.entryList( "*.ttf", TQDir::Files ); bin->m_supportedSubtitleFonts.prepend( i18n("none") ); dir.cdUp(); @@ -213,17 +213,17 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) } -QStringList K3bMovixProgram::determineSupportedBootLabels( const QString& isoConfigFile ) const +TQStringList K3bMovixProgram::determineSupportedBootLabels( const TQString& isoConfigFile ) const { - QStringList list( i18n("default") ); + TQStringList list( i18n("default") ); - QFile f( isoConfigFile ); + TQFile f( isoConfigFile ); if( !f.open( IO_ReadOnly ) ) { kdDebug() << "(K3bMovixProgram) could not open file '" << f.name() << "'" << endl; } else { - QTextStream fs( &f ); - QString line = fs.readLine(); + TQTextStream fs( &f ); + TQString line = fs.readLine(); while( !line.isNull() ) { if( line.startsWith( "label" ) ) list.append( line.mid( 5 ).stripWhiteSpace() ); @@ -237,84 +237,84 @@ QStringList K3bMovixProgram::determineSupportedBootLabels( const QString& isoCon } -QString K3bMovixBin::subtitleFontDir( const QString& font ) const +TQString K3bMovixBin::subtitleFontDir( const TQString& font ) const { if( font == i18n("none" ) ) return ""; - else if( m_supportedSubtitleFonts.contains( font ) ) + else if( m_supportedSubtitleFonts.tqcontains( font ) ) return path + "/mplayer-fonts/" + font; else return ""; } -QString K3bMovixBin::languageDir( const QString& lang ) const +TQString K3bMovixBin::languageDir( const TQString& lang ) const { if( lang == i18n("default") ) return languageDir( "en" ); - else if( m_supportedLanguages.contains( lang ) ) + else if( m_supportedLanguages.tqcontains( lang ) ) return path + "/boot-messages/" + lang; else return ""; } -QStringList K3bMovixBin::supportedSubtitleFonts() const +TQStringList K3bMovixBin::supportedSubtitleFonts() const { if( version >= K3bVersion( 0, 9, 0 ) ) - return QStringList( i18n("default") ) += supported( "font" ); + return TQStringList( i18n("default") ) += supported( "font" ); else return m_supportedSubtitleFonts; } -QStringList K3bMovixBin::supportedLanguages() const +TQStringList K3bMovixBin::supportedLanguages() const { if( version >= K3bVersion( 0, 9, 0 ) ) - return QStringList( i18n("default") ) += supported( "lang" ); + return TQStringList( i18n("default") ) += supported( "lang" ); else return m_supportedLanguages; } // only used for eMovix >= 0.9.0 -QStringList K3bMovixBin::supportedKbdLayouts() const +TQStringList K3bMovixBin::supportedKbdLayouts() const { - return QStringList( i18n("default") ) += supported( "kbd" ); + return TQStringList( i18n("default") ) += supported( "kbd" ); } // only used for eMovix >= 0.9.0 -QStringList K3bMovixBin::supportedBackgrounds() const +TQStringList K3bMovixBin::supportedBackgrounds() const { - return QStringList( i18n("default") ) += supported( "background" ); + return TQStringList( i18n("default") ) += supported( "background" ); } // only used for eMovix >= 0.9.0 -QStringList K3bMovixBin::supportedCodecs() const +TQStringList K3bMovixBin::supportedCodecs() const { return supported( "codecs" ); } -QStringList K3bMovixBin::supported( const QString& type ) const +TQStringList K3bMovixBin::supported( const TQString& type ) const { KProcess p; K3bProcessOutputCollector out( &p ); p << path + "movix-conf" << "--supported=" + type; if( p.start( KProcess::Block, KProcess::AllOutput ) ) - return QStringList::split( "\n", out.output() ); + return TQStringList::split( "\n", out.output() ); else - return QStringList(); + return TQStringList(); } -QStringList K3bMovixBin::files( const QString& kbd, - const QString& font, - const QString& bg, - const QString& lang, - const QStringList& codecs ) const +TQStringList K3bMovixBin::files( const TQString& kbd, + const TQString& font, + const TQString& bg, + const TQString& lang, + const TQStringList& codecs ) const { KProcess p; K3bProcessOutputCollector out( &p ); @@ -333,7 +333,7 @@ QStringList K3bMovixBin::files( const QString& kbd, p << "--codecs" << codecs.join( "," ); if( p.start( KProcess::Block, KProcess::AllOutput ) ) - return QStringList::split( "\n", out.output() ); + return TQStringList::split( "\n", out.output() ); else - return QStringList(); + return TQStringList(); } diff --git a/libk3b/projects/movixcd/k3bmovixprogram.h b/libk3b/projects/movixcd/k3bmovixprogram.h index a6a9ac0..7508626 100644 --- a/libk3b/projects/movixcd/k3bmovixprogram.h +++ b/libk3b/projects/movixcd/k3bmovixprogram.h @@ -26,58 +26,58 @@ class LIBK3B_EXPORT K3bMovixBin : public K3bExternalBin : K3bExternalBin( p ) { } - const QString& movixDataDir() const { return m_movixPath; } + const TQString& movixDataDir() const { return m_movixPath; } - const QStringList& supportedBootLabels() const { return m_supportedBootLabels; } - QStringList supportedSubtitleFonts() const; - QStringList supportedLanguages() const; - QStringList supportedKbdLayouts() const; - QStringList supportedBackgrounds() const; - QStringList supportedCodecs() const; + const TQStringList& supportedBootLabels() const { return m_supportedBootLabels; } + TQStringList supportedSubtitleFonts() const; + TQStringList supportedLanguages() const; + TQStringList supportedKbdLayouts() const; + TQStringList supportedBackgrounds() const; + TQStringList supportedCodecs() const; /* * Unused for eMovix versions 0.9.0 and above */ - const QStringList& movixFiles() const { return m_movixFiles; } + const TQStringList& movixFiles() const { return m_movixFiles; } /* * Unused for eMovix versions 0.9.0 and above */ - const QStringList& isolinuxFiles() const { return m_isolinuxFiles; } + const TQStringList& isolinuxFiles() const { return m_isolinuxFiles; } /** * returnes empty string if font was not found * * Unused for eMovix versions 0.9.0 and above */ - QString subtitleFontDir( const QString& font ) const; + TQString subtitleFontDir( const TQString& font ) const; /** * returnes empty string if lang was not found * * Unused for eMovix versions 0.9.0 and above */ - QString languageDir( const QString& lang ) const; + TQString languageDir( const TQString& lang ) const; /** * Interface for the movix-conf --files interface for * versions >= 0.9.0 */ - QStringList files( const QString& kbd = QString::null, - const QString& font = QString::null, - const QString& bg = QString::null, - const QString& lang = QString::null, - const QStringList& codecs = QStringList() ) const; + TQStringList files( const TQString& kbd = TQString(), + const TQString& font = TQString(), + const TQString& bg = TQString(), + const TQString& lang = TQString(), + const TQStringList& codecs = TQStringList() ) const; private: - QStringList supported( const QString& ) const; + TQStringList supported( const TQString& ) const; - QString m_movixPath; - QStringList m_movixFiles; - QStringList m_isolinuxFiles; - QStringList m_supportedBootLabels; - QStringList m_supportedSubtitleFonts; - QStringList m_supportedLanguages; + TQString m_movixPath; + TQStringList m_movixFiles; + TQStringList m_isolinuxFiles; + TQStringList m_supportedBootLabels; + TQStringList m_supportedSubtitleFonts; + TQStringList m_supportedLanguages; friend class K3bMovixProgram; }; @@ -88,14 +88,14 @@ class LIBK3B_EXPORT K3bMovixProgram : public K3bExternalProgram public: K3bMovixProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); bool supportsUserParameters() const { return false; } private: - bool scanNewEMovix( K3bMovixBin* bin, const QString& ); - bool scanOldEMovix( K3bMovixBin* bin, const QString& ); - QStringList determineSupportedBootLabels( const QString& ) const; + bool scanNewEMovix( K3bMovixBin* bin, const TQString& ); + bool scanOldEMovix( K3bMovixBin* bin, const TQString& ); + TQStringList determineSupportedBootLabels( const TQString& ) const; }; diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp index 80b8ec2..d05c75a 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp @@ -19,8 +19,8 @@ #include <kconfig.h> -K3bMovixDvdDoc::K3bMovixDvdDoc( QObject* parent ) - : K3bMovixDoc( parent ) +K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* tqparent ) + : K3bMovixDoc( tqparent ) { } @@ -28,9 +28,9 @@ K3bMovixDvdDoc::~K3bMovixDvdDoc() { } -K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bMovixDvdJob( this, hdl, parent ); + return new K3bMovixDvdJob( this, hdl, tqparent ); } #include "k3bmovixdvddoc.moc" diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.h b/libk3b/projects/movixdvd/k3bmovixdvddoc.h index 85943f0..cd19cc8 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.h +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.h @@ -24,17 +24,18 @@ class KConfig; class LIBK3B_EXPORT K3bMovixDvdDoc : public K3bMovixDoc { Q_OBJECT + TQ_OBJECT public: - K3bMovixDvdDoc( QObject* parent = 0 ); + K3bMovixDvdDoc( TQObject* tqparent = 0 ); ~K3bMovixDvdDoc(); int type() const { return MOVIX_DVD; } - K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent ); + K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); protected: - QString typeString() const { return "movixdvd"; } + TQString typeString() const { return "movixdvd"; } }; #endif diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp index b556997..d97f42a 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp @@ -27,33 +27,33 @@ #include <kdebug.h> -K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, QObject* parent ) - : K3bBurnJob( jh, parent ), +K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) + : K3bBurnJob( jh, tqparent ), m_doc(doc) { m_dvdJob = new K3bDvdJob( doc, this, this ); m_movixDocPreparer = new K3bMovixDocPreparer( doc, this, this ); // pipe signals - connect( m_dvdJob, SIGNAL(percent(int)), this, SIGNAL(percent(int)) ); - connect( m_dvdJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_dvdJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_dvdJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_dvdJob, SIGNAL(bufferStatus(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_dvdJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_dvdJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_dvdJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_dvdJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( m_dvdJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_dvdJob, SIGNAL(burning(bool)), this, SIGNAL(burning(bool)) ); + connect( m_dvdJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) ); + connect( m_dvdJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_dvdJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( m_dvdJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); + connect( m_dvdJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_dvdJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); + connect( m_dvdJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); + connect( m_dvdJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( m_dvdJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_dvdJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_dvdJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) ); // we need to clean up here - connect( m_dvdJob, SIGNAL(finished(bool)), this, SLOT(slotDvdJobFinished(bool)) ); + connect( m_dvdJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDvdJobFinished(bool)) ); - connect( m_movixDocPreparer, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); + connect( m_movixDocPreparer, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); } @@ -109,23 +109,23 @@ void K3bMovixDvdJob::slotDvdJobFinished( bool success ) } -QString K3bMovixDvdJob::jobDescription() const +TQString K3bMovixDvdJob::jobDescription() const { if( m_doc->isoOptions().volumeID().isEmpty() ) return i18n("Writing eMovix DVD"); else - return i18n("Writing eMovix DVD (%1)").arg(m_doc->isoOptions().volumeID()); + return i18n("Writing eMovix DVD (%1)").tqarg(m_doc->isoOptions().volumeID()); } -QString K3bMovixDvdJob::jobDetails() const +TQString K3bMovixDvdJob::jobDetails() const { return ( i18n("1 file (%1) and about 8 MB eMovix data", "%n files (%1) and about 8 MB eMovix data", - m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) + m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) + ( m_doc->copies() > 1 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3bmovixdvdjob.moc" diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.h b/libk3b/projects/movixdvd/k3bmovixdvdjob.h index 2b9ce10..a803b75 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.h +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.h @@ -31,16 +31,17 @@ class K3bFileItem; class K3bMovixDvdJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, QObject* parent = 0 ); + K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bMovixDvdJob(); K3bDoc* doc() const; K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); diff --git a/libk3b/projects/videocd/cdi/cdi_imag.rtf b/libk3b/projects/videocd/cdi/cdi_imag.rtf Binary files differindex 809145f..f866494 100644 --- a/libk3b/projects/videocd/cdi/cdi_imag.rtf +++ b/libk3b/projects/videocd/cdi/cdi_imag.rtf diff --git a/libk3b/projects/videocd/cdi/cdi_vcd.app b/libk3b/projects/videocd/cdi/cdi_vcd.app Binary files differindex ceb31fc..31a7527 100644 --- a/libk3b/projects/videocd/cdi/cdi_vcd.app +++ b/libk3b/projects/videocd/cdi/cdi_vcd.app diff --git a/libk3b/projects/videocd/cdi/icdia.htm b/libk3b/projects/videocd/cdi/icdia.htm index cd6c47b..53f9121 100644 --- a/libk3b/projects/videocd/cdi/icdia.htm +++ b/libk3b/projects/videocd/cdi/icdia.htm @@ -1,7 +1,7 @@ <HTML> <HEAD> -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> -<META HTTP-EQUIV="Refresh" CONTENT="0; URL=http://www.icdia.org/"> +<META HTTP-ETQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> +<META HTTP-ETQUIV="Refresh" CONTENT="0; URL=http://www.icdia.org/"> <TITLE>The New International CD-i Association</TITLE> </HEAD> <BODY> diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index 462aea3..0898fdf 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -14,14 +14,14 @@ */ // QT-includes -#include <qstring.h> -#include <qstringlist.h> -#include <qfile.h> -#include <qdatastream.h> -#include <qdom.h> -#include <qdatetime.h> -#include <qtimer.h> -#include <qtextstream.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqfile.h> +#include <tqdatastream.h> +#include <tqdom.h> +#include <tqdatetime.h> +#include <tqtimer.h> +#include <tqtextstream.h> // KDE-includes #include <kprocess.h> @@ -49,8 +49,8 @@ bool print_progress = true; bool aspect_correction = false; byte forced_sequence_header = 0; -K3bVcdDoc::K3bVcdDoc( QObject* parent ) - : K3bDoc( parent ) +K3bVcdDoc::K3bVcdDoc( TQObject* tqparent ) + : K3bDoc( tqparent ) { m_tracks = 0L; m_vcdOptions = new K3bVcdOptions(); @@ -58,12 +58,12 @@ K3bVcdDoc::K3bVcdDoc( QObject* parent ) m_docType = VCD; m_vcdType = NONE; - m_urlAddingTimer = new QTimer( this ); - connect( m_urlAddingTimer, SIGNAL( timeout() ), this, SLOT( slotWorkUrlQueue() ) ); + m_urlAddingTimer = new TQTimer( this ); + connect( m_urlAddingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotWorkUrlQueue() ) ); // FIXME: remove the newTracks() signal and replace it with the changed signal - connect( this, SIGNAL( newTracks() ), this, SIGNAL( changed() ) ); - connect( this, SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, SIGNAL( changed() ) ); + connect( this, TQT_SIGNAL( newTracks() ), this, TQT_SIGNAL( changed() ) ); + connect( this, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQT_SIGNAL( changed() ) ); } K3bVcdDoc::~K3bVcdDoc() @@ -82,14 +82,14 @@ bool K3bVcdDoc::newDocument() while ( m_tracks->first() ) removeTrack( m_tracks->first() ); else - m_tracks = new QPtrList<K3bVcdTrack>; + m_tracks = new TQPtrList<K3bVcdTrack>; m_tracks->setAutoDelete( false ); return K3bDoc::newDocument(); } -QString K3bVcdDoc::name() const +TQString K3bVcdDoc::name() const { return m_vcdOptions->volumeId(); } @@ -133,8 +133,8 @@ K3b::Msf K3bVcdDoc::length() const bool K3bVcdDoc::isImage( const KURL& url ) { - QImage p; - return p.load( QFile::encodeName( url.path() ) ); + TQImage p; + return p.load( TQFile::encodeName( url.path() ) ); } void K3bVcdDoc::addUrls( const KURL::List& urls ) @@ -168,7 +168,7 @@ void K3bVcdDoc::slotWorkUrlQueue() return ; } - if ( !QFile::exists( item->url.path() ) ) { + if ( !TQFile::exists( item->url.path() ) ) { kdDebug() << "(K3bVcdDoc) file not found: " << item->url.path() << endl; m_notFoundFiles.append( item->url.path() ); return ; @@ -195,8 +195,8 @@ void K3bVcdDoc::slotWorkUrlQueue() K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) { char filename[ 255 ]; - QString error_string = ""; - strcpy( filename, QFile::encodeName( url.path() ) ); + TQString error_string = ""; + strcpy( filename, TQFile::encodeName( url.path() ) ); K3bMpegInfo* Mpeg = new K3bMpegInfo( filename ); if ( Mpeg ) { @@ -211,8 +211,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) i18n( "K3b will create a %1 image from the given MPEG " "files, but these files must already be in %2 " "format. K3b does not yet resample MPEG files." ) - .arg( i18n( "VCD" ) ) - .arg( i18n( "VCD" ) ), + .tqarg( i18n( "VCD" ) ) + .tqarg( i18n( "VCD" ) ), i18n( "Information" ) ); m_urlAddingTimer->start( 0 ); } else if ( vcdType() == NONE ) { @@ -223,8 +223,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) i18n( "K3b will create a %1 image from the given MPEG " "files, but these files must already be in %2 " "format. K3b does not yet resample MPEG files." ) - .arg( i18n( "SVCD" ) ) - .arg( i18n( "SVCD" ) ) + .tqarg( i18n( "SVCD" ) ) + .tqarg( i18n( "SVCD" ) ) + "\n\n" + i18n( "Note: Forcing MPEG2 as VCD is not supported by " "some standalone DVD players." ), @@ -336,7 +336,7 @@ void K3bVcdDoc::removeTrack( K3bVcdTrack* track ) } // set the current item to track - if ( m_tracks->findRef( track ) >= 0 ) { + if ( m_tracks->tqfindRef( track ) >= 0 ) { // take the current item track = m_tracks->take(); @@ -374,12 +374,12 @@ void K3bVcdDoc::moveTrack( const K3bVcdTrack* track, const K3bVcdTrack* after ) return ; // set the current item to track - m_tracks->findRef( track ); + m_tracks->tqfindRef( track ); // take the current item track = m_tracks->take(); - // if after == 0 findRef returnes -1 - int pos = m_tracks->findRef( after ); + // if after == 0 tqfindRef returnes -1 + int pos = m_tracks->tqfindRef( after ); m_tracks->insert( pos + 1, track ); // reorder pbc tracks @@ -389,15 +389,15 @@ void K3bVcdDoc::moveTrack( const K3bVcdTrack* track, const K3bVcdTrack* after ) } -QString K3bVcdDoc::typeString() const +TQString K3bVcdDoc::typeString() const { return "vcd"; } -K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bVcdJob( this, hdl, parent ); + return new K3bVcdJob( this, hdl, tqparent ); } void K3bVcdDoc::informAboutNotFoundFiles() @@ -448,9 +448,9 @@ void K3bVcdDoc::setPbcTracks() if ( m_tracks ) { int count = m_tracks->count(); - kdDebug() << QString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).arg( count ) << endl; + kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).tqarg( count ) << endl; - QPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks ); + TQPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks ); K3bVcdTrack* track; while ( ( track = iterTrack.current() ) != 0 ) { ++iterTrack; @@ -546,11 +546,11 @@ void K3bVcdDoc::setPbcTracks() } -bool K3bVcdDoc::loadDocumentData( QDomElement* root ) +bool K3bVcdDoc::loadDocumentData( TQDomElement* root ) { newDocument(); - QDomNodeList nodes = root->childNodes(); + TQDomNodeList nodes = root->childNodes(); if ( nodes.length() < 3 ) return false; @@ -568,13 +568,13 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) // vcd Label - QDomNodeList vcdNodes = nodes.item( 1 ).childNodes(); + TQDomNodeList vcdNodes = nodes.item( 1 ).childNodes(); for ( uint i = 0; i < vcdNodes.count(); i++ ) { - QDomNode item = vcdNodes.item( i ); - QString name = item.nodeName(); + TQDomNode item = vcdNodes.item( i ); + TQString name = item.nodeName(); - kdDebug() << QString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).arg( name ) << endl; + kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).tqarg( name ) << endl; if ( name == "volumeId" ) vcdOptions() ->setVolumeId( item.toElement().text() ); @@ -629,14 +629,14 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) } // vcd Tracks - QDomNodeList trackNodes = nodes.item( 2 ).childNodes(); + TQDomNodeList trackNodes = nodes.item( 2 ).childNodes(); for ( uint i = 0; i < trackNodes.length(); i++ ) { // check if url is available - QDomElement trackElem = trackNodes.item( i ).toElement(); - QString url = trackElem.attributeNode( "url" ).value(); - if ( !QFile::exists( url ) ) + TQDomElement trackElem = trackNodes.item( i ).toElement(); + TQString url = trackElem.attributeNode( "url" ).value(); + if ( !TQFile::exists( url ) ) m_notFoundFiles.append( url ); else { KURL k; @@ -645,8 +645,8 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) track ->setPlayTime( trackElem.attribute( "playtime", "1" ).toInt() ); track ->setWaitTime( trackElem.attribute( "waittime", "2" ).toInt() ); track ->setReactivity( trackElem.attribute( "reactivity", "0" ).toInt() ); - track -> setPbcNumKeys( ( trackElem.attribute( "numkeys", "yes" ).contains( "yes" ) ) ? true : false ); - track -> setPbcNumKeysUserdefined( ( trackElem.attribute( "userdefinednumkeys", "no" ).contains( "yes" ) ) ? true : false ); + track -> setPbcNumKeys( ( trackElem.attribute( "numkeys", "yes" ).tqcontains( "yes" ) ) ? true : false ); + track -> setPbcNumKeysUserdefined( ( trackElem.attribute( "userdefinednumkeys", "no" ).tqcontains( "yes" ) ) ? true : false ); addTrack( track, m_tracks->count() ); } @@ -662,12 +662,12 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) int val; bool pbctrack; for ( uint trackId = 0; trackId < trackNodes.length(); trackId++ ) { - QDomElement trackElem = trackNodes.item( trackId ).toElement(); - QDomNodeList trackNodes = trackElem.childNodes(); + TQDomElement trackElem = trackNodes.item( trackId ).toElement(); + TQDomNodeList trackNodes = trackElem.childNodes(); for ( uint i = 0; i < trackNodes.length(); i++ ) { - QDomElement trackElem = trackNodes.item( i ).toElement(); - QString name = trackElem.tagName(); - if ( name.contains( "pbc" ) ) { + TQDomElement trackElem = trackNodes.item( i ).toElement(); + TQString name = trackElem.tagName(); + if ( name.tqcontains( "pbc" ) ) { if ( trackElem.hasAttribute ( "type" ) ) { type = trackElem.attribute ( "type" ).toInt(); if ( trackElem.hasAttribute ( "pbctrack" ) ) { @@ -688,7 +688,7 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) } } } - } else if ( name.contains( "numkeys" ) ) { + } else if ( name.tqcontains( "numkeys" ) ) { if ( trackElem.hasAttribute ( "key" ) ) { int key = trackElem.attribute ( "key" ).toInt(); if ( trackElem.hasAttribute ( "val" ) ) { @@ -717,15 +717,15 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) -bool K3bVcdDoc::saveDocumentData( QDomElement * docElem ) +bool K3bVcdDoc::saveDocumentData( TQDomElement * docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); // save Vcd Label - QDomElement vcdMain = doc.createElement( "vcd" ); + TQDomElement vcdMain = doc.createElement( "vcd" ); - QDomElement vcdElem = doc.createElement( "volumeId" ); + TQDomElement vcdElem = doc.createElement( "volumeId" ); vcdElem.appendChild( doc.createTextNode( vcdOptions() ->volumeId() ) ); vcdMain.appendChild( vcdElem ); @@ -749,98 +749,98 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem ) // systemId() vcdElem = doc.createElement( "vcdType" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdType() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdType() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "mpegVersion" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->mpegVersion() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->mpegVersion() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "PreGapLeadout" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PreGapLeadout() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PreGapLeadout() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "PreGapTrack" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PreGapTrack() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PreGapTrack() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "FrontMarginTrack" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->FrontMarginTrack() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->FrontMarginTrack() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "RearMarginTrack" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RearMarginTrack() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RearMarginTrack() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "FrontMarginTrackSVCD" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->FrontMarginTrackSVCD() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->FrontMarginTrackSVCD() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "RearMarginTrackSVCD" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RearMarginTrackSVCD() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RearMarginTrackSVCD() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "volumeCount" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->volumeCount() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->volumeCount() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "volumeNumber" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->volumeNumber() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->volumeNumber() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "AutoDetect" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->AutoDetect() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->AutoDetect() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "CdiSupport" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->CdiSupport() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->CdiSupport() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "NonCompliantMode" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->NonCompliantMode() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->NonCompliantMode() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "Sector2336" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->Sector2336() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->Sector2336() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "UpdateScanOffsets" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->UpdateScanOffsets() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->UpdateScanOffsets() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "RelaxedAps" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RelaxedAps() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RelaxedAps() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "UseGaps" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->UseGaps() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->UseGaps() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "PbcEnabled" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PbcEnabled() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PbcEnabled() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "SegmentFolder" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->SegmentFolder() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->SegmentFolder() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "Restriction" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->Restriction() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->Restriction() ) ) ); vcdMain.appendChild( vcdElem ); docElem->appendChild( vcdMain ); // save the tracks // ------------------------------------------------------------- - QDomElement contentsElem = doc.createElement( "contents" ); + TQDomElement contentsElem = doc.createElement( "contents" ); - QPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks ); + TQPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks ); K3bVcdTrack* track; while ( ( track = iterTrack.current() ) != 0 ) { ++iterTrack; - QDomElement trackElem = doc.createElement( "track" ); + TQDomElement trackElem = doc.createElement( "track" ); trackElem.setAttribute( "url", KIO::decodeFileName( track->absPath() ) ); trackElem.setAttribute( "playtime", track->getPlayTime() ); trackElem.setAttribute( "waittime", track->getWaitTime() ); @@ -853,7 +853,7 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem ) i++ ) { if ( track->isPbcUserDefined( i ) ) { // save pbcTracks - QDomElement pbcElem = doc.createElement( "pbc" ); + TQDomElement pbcElem = doc.createElement( "pbc" ); pbcElem.setAttribute( "type", i ); if ( track->getPbcTrack( i ) ) { pbcElem.setAttribute( "pbctrack", "yes" ); @@ -865,13 +865,13 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem ) trackElem.appendChild( pbcElem ); } } - QMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey(); - QMap<int, K3bVcdTrack*>::const_iterator trackIt; + TQMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey(); + TQMap<int, K3bVcdTrack*>::const_iterator trackIt; for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) { - QDomElement numElem = doc.createElement( "numkeys" ); + TQDomElement numElem = doc.createElement( "numkeys" ); if ( trackIt.data() ) { numElem.setAttribute( "key", trackIt.key() ); numElem.setAttribute( "val", trackIt.data() ->index() + 1 ); diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h index 8b10837..4f24200 100644 --- a/libk3b/projects/videocd/k3bvcddoc.h +++ b/libk3b/projects/videocd/k3bvcddoc.h @@ -16,14 +16,14 @@ #ifndef K3BVCDDOC_H #define K3BVCDDOC_H -// Qt Includes -#include <qptrqueue.h> -#include <qfile.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qdatetime.h> -#include <qtextstream.h> -#include <qimage.h> +// TQt Includes +#include <tqptrqueue.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqdatetime.h> +#include <tqtextstream.h> +#include <tqimage.h> // Kde Includes #include <kurl.h> @@ -37,10 +37,10 @@ class K3bApp; class K3bVcdTrack; class K3bVcdJob; //class K3bView; -class QWidget; -class QTimer; -class QDomDocument; -class QDomElement; +class TQWidget; +class TQTimer; +class TQDomDocument; +class TQDomElement; class KConfig; @@ -48,16 +48,17 @@ class KConfig; class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc { Q_OBJECT + TQ_OBJECT public: - K3bVcdDoc( QObject* ); + K3bVcdDoc( TQObject* ); ~K3bVcdDoc(); int type() const { return VCD; } - QString name() const; + TQString name() const; - enum vcdTypes { VCD11, VCD20, SVCD10, HQVCD, NONE}; + enum vcdTypes { VCD11, VCD20, SVCD10, HTQVCD, NONE}; bool newDocument(); int numOfTracks() const @@ -65,11 +66,11 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc return m_tracks->count(); } - const QString& vcdImage() const + const TQString& vcdImage() const { return m_vcdImage; } - void setVcdImage( const QString& s ) + void setVcdImage( const TQString& s ) { m_vcdImage = s; } @@ -99,7 +100,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc return m_tracks->take( i ); } - const QPtrList<K3bVcdTrack>* tracks() const + const TQPtrList<K3bVcdTrack>* tracks() const { return m_tracks; } @@ -108,7 +109,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc KIO::filesize_t size() const; K3b::Msf length() const; - K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent ); + K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); K3bVcdOptions* vcdOptions() const { return m_vcdOptions; @@ -149,18 +150,18 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc protected: /** reimplemented from K3bDoc */ - bool loadDocumentData( QDomElement* root ); + bool loadDocumentData( TQDomElement* root ); /** reimplemented from K3bDoc */ - bool saveDocumentData( QDomElement* ); + bool saveDocumentData( TQDomElement* ); - QString typeString() const; + TQString typeString() const; private: K3bVcdTrack* createTrack( const KURL& url ); void informAboutNotFoundFiles(); - QStringList m_notFoundFiles; - QString m_vcdImage; + TQStringList m_notFoundFiles; + TQString m_vcdImage; class PrivateUrlToAdd { @@ -173,10 +174,10 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc }; /** Holds all the urls that have to be added to the list of tracks. **/ - QPtrQueue<PrivateUrlToAdd> urlsToAdd; - QTimer* m_urlAddingTimer; + TQPtrQueue<PrivateUrlToAdd> urlsToAdd; + TQTimer* m_urlAddingTimer; - QPtrList<K3bVcdTrack>* m_tracks; + TQPtrList<K3bVcdTrack>* m_tracks; KIO::filesize_t calcTotalSize() const; KIO::filesize_t ISOsize() const; diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index a1b347a..156c79a 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -20,13 +20,13 @@ #include <ktempfile.h> #include <kio/global.h> -#include <qstring.h> -#include <qdatetime.h> -#include <qfile.h> -#include <qtimer.h> +#include <tqstring.h> +#include <tqdatetime.h> +#include <tqfile.h> +#include <tqtimer.h> #include <kdebug.h> -#include <qregexp.h> -#include <qdom.h> +#include <tqregexp.h> +#include <tqdom.h> #include "k3bvcdjob.h" @@ -43,8 +43,8 @@ #include <k3bcdrecordwriter.h> #include <k3bcdrdaowriter.h> -K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bBurnJob( jh, parent, name ) +K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bBurnJob( jh, tqparent, name ) { m_doc = doc; m_doc->setCopies( m_doc->dummy() || m_doc->onlyCreateImages() ? 1 : m_doc->copies() ); @@ -104,20 +104,20 @@ void K3bVcdJob::cancelAll() } // remove bin-file if it is unfinished or the user selected to remove image - if ( QFile::exists( m_doc->vcdImage() ) ) { + if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS ); - QFile::remove + emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS ); + TQFile::remove ( m_doc->vcdImage() ); m_doc->setVcdImage( "" ); } } // remove cue-file if it is unfinished or the user selected to remove image - if ( QFile::exists( m_cueFile ) ) { + if ( TQFile::exists( m_cueFile ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS ); - QFile::remove + emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS ); + TQFile::remove ( m_cueFile ); m_cueFile = ""; } @@ -133,7 +133,7 @@ void K3bVcdJob::start() emit burning( false ); m_canceled = false; - int pos = QString( m_doc->vcdImage() ).find( ".bin", QString( m_doc->vcdImage() ).length() - 4 ); + int pos = TQString( m_doc->vcdImage() ).tqfind( ".bin", TQString( m_doc->vcdImage() ).length() - 4 ); if ( pos > 0 ) { m_cueFile = m_doc->vcdImage().left( pos ) + ".cue"; } else { @@ -184,8 +184,8 @@ void K3bVcdJob::vcdxBuild() const K3bExternalBin* bin = k3bcore ->externalBinManager() ->binObject( "vcdxbuild" ); if ( !bin ) { kdDebug() << "(K3bVcdJob) could not find vcdxbuild executable" << endl; - emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxbuild" ), K3bJob::ERROR ); - emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).arg( ">= 0.7.12" ), K3bJob::INFO ); + emit infoMessage( i18n( "Could not tqfind %1 executable." ).tqarg( "vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -194,7 +194,7 @@ void K3bVcdJob::vcdxBuild() if ( bin->version < K3bVersion( "0.7.12" ) ) { kdDebug() << "(K3bVcdJob) vcdxbuild executable too old!" << endl; - emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).arg( "Vcdxbuild" ).arg( "0.7.12" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).tqarg( "Vcdxbuild" ).tqarg( "0.7.12" ), K3bJob::ERROR ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -202,13 +202,13 @@ void K3bVcdJob::vcdxBuild() } if ( !bin->copyright.isEmpty() ) - emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO ); + emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO ); *m_process << bin; // additional user parameters from config - const QStringList& params = k3bcore->externalBinManager() ->program( "vcdxbuild" ) ->userParameters(); - for ( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = k3bcore->externalBinManager() ->program( "vcdxbuild" ) ->userParameters(); + for ( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; @@ -219,25 +219,25 @@ void K3bVcdJob::vcdxBuild() *m_process << "--progress" << "--gui"; - *m_process << QString( "--cue-file=%1" ).arg( m_cueFile ); + *m_process << TQString( "--cue-file=%1" ).tqarg( m_cueFile ); - *m_process << QString( "--bin-file=%1" ).arg( m_doc->vcdImage() ); + *m_process << TQString( "--bin-file=%1" ).tqarg( m_doc->vcdImage() ); - *m_process << QString( "%1" ).arg( QFile::encodeName( m_xmlFile ) ); + *m_process << TQString( "%1" ).tqarg( TQFile::encodeName( m_xmlFile ).data() ); - connect( m_process, SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); - connect( m_process, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); - connect( m_process, SIGNAL( processExited( KProcess* ) ), - this, SLOT( slotVcdxBuildFinished() ) ); + connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + this, TQT_SLOT( slotVcdxBuildFinished() ) ); // vcdxbuild commandline parameters kdDebug() << "***** vcdxbuild parameters:" << endl; ; - const QValueList<QCString>& args = m_process->args(); - QString s; - for ( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = m_process->args(); + TQString s; + for ( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -245,7 +245,7 @@ void K3bVcdJob::vcdxBuild() if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { kdDebug() << "(K3bVcdJob) could not start vcdxbuild" << endl; - emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxbuild" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); } @@ -253,44 +253,44 @@ void K3bVcdJob::vcdxBuild() void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) { - QString buffer = QString::fromLocal8Bit( output, len ); + TQString buffer = TQString::fromLocal8Bit( output, len ); // split to lines - QStringList lines = QStringList::split( "\n", buffer ); + TQStringList lines = TQStringList::split( "\n", buffer ); - QDomDocument xml_doc; - QDomElement xml_root; + TQDomDocument xml_doc; + TQDomElement xml_root; // do every line - for ( QStringList::Iterator str = lines.begin(); str != lines.end(); ++str ) { + for ( TQStringList::Iterator str = lines.begin(); str != lines.end(); ++str ) { *str = ( *str ).stripWhiteSpace(); emit debuggingOutput( "vcdxbuild", *str ); - xml_doc.setContent( QString( "<?xml version='1.0'?><vcdxbuild>" ) + *str + "</vcdxbuild>" ); + xml_doc.setContent( TQString( "<?xml version='1.0'?><vcdxbuild>" ) + *str + "</vcdxbuild>" ); xml_root = xml_doc.documentElement(); // There should be only one... but ... - for ( QDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement el = node.toElement(); + for ( TQDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) { + TQDomElement el = node.toElement(); if ( el.isNull() ) continue; - const QString tagName = el.tagName().lower(); + const TQString tagName = el.tagName().lower(); if ( tagName == "progress" ) { - const QString oper = el.attribute( "operation" ).lower(); + const TQString oper = el.attribute( "operation" ).lower(); const unsigned long long pos = el.attribute( "position" ).toLong(); const long long size = el.attribute( "size" ).toLong(); if ( oper == "scan" ) { // Scan Video Files if ( m_stage == stageUnknown || pos < m_bytesFinished ) { - const uint index = el.attribute( "id" ).replace( QRegExp( "sequence-" ), "" ).toUInt(); + const uint index = el.attribute( "id" ).tqreplace( TQRegExp( "sequence-" ), "" ).toUInt(); m_currentWrittenTrack = m_doc->at( m_currentWrittenTrackNumber ); - emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).arg( index + 1 ).arg( doc() ->numOfTracks() ).arg( m_currentWrittenTrack->fileName() ) ); + emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).tqarg( index + 1 ).tqarg( doc() ->numOfTracks() ).tqarg( m_currentWrittenTrack->fileName() ) ); m_bytesFinished = 0; if ( !firstTrack ) { @@ -319,20 +319,20 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) return ; } } else if ( tagName == "log" ) { - QDomText tel = el.firstChild().toText(); - const QString level = el.attribute( "level" ).lower(); + TQDomText tel = el.firstChild().toText(); + const TQString level = el.attribute( "level" ).lower(); if ( tel.isText() ) { - const QString text = tel.data(); + const TQString text = tel.data(); if ( m_stage == stageWrite && level == "information" ) - kdDebug() << QString( "(K3bVcdJob) VcdxBuild information, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).tqarg( text ) << endl; if ( ( text ).startsWith( "writing track" ) ) - emit newSubTask( i18n( "Creating Image for track %1" ).arg( ( text ).mid( 14 ) ) ); + emit newSubTask( i18n( "Creating Image for track %1" ).tqarg( ( text ).mid( 14 ) ) ); else { if ( level != "error" ) { - kdDebug() << QString( "(K3bVcdJob) vcdxbuild warning, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).tqarg( text ) << endl; parseInformation( text ); } else { - kdDebug() << QString( "(K3bVcdJob) vcdxbuild error, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).tqarg( text ) << endl; emit infoMessage( text, K3bJob::ERROR ); } } @@ -353,7 +353,7 @@ void K3bVcdJob::slotVcdxBuildFinished() m_imageFinished = true; break; default: - emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxbuild" ).arg( m_process->exitStatus() ), + emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxbuild" ).tqarg( m_process->exitStatus() ), K3bJob::ERROR ); emit infoMessage( i18n( "Please send me an email with the last output." ), K3bJob::ERROR ); cancelAll(); @@ -361,18 +361,18 @@ void K3bVcdJob::slotVcdxBuildFinished() return ; } } else { - emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxbuild" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); return ; } //remove xml-file - if ( QFile::exists( m_xmlFile ) ) - QFile::remove + if ( TQFile::exists( m_xmlFile ) ) + TQFile::remove ( m_xmlFile ); - kdDebug() << QString( "(K3bVcdJob) create only image: %1" ).arg( vcdDoc() ->onlyCreateImages() ) << endl; + kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).tqarg( vcdDoc() ->onlyCreateImages() ) << endl; if ( !vcdDoc() ->onlyCreateImages() ) startWriterjob(); else @@ -381,7 +381,7 @@ void K3bVcdJob::slotVcdxBuildFinished() void K3bVcdJob::startWriterjob() { - kdDebug() << QString( "(K3bVcdJob) writing copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) << endl; + kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) << endl; if ( prepareWriterJob() ) { if ( waitForMedia( m_doc->burner() ) < 0 ) { cancel(); @@ -392,7 +392,7 @@ void K3bVcdJob::startWriterjob() return ; if ( m_doc->copies() > 1 ) - emit newTask( i18n( "Writing Copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) ); + emit newTask( i18n( "Writing Copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) ); emit burning( true ); m_writerJob->start(); @@ -432,19 +432,19 @@ bool K3bVcdJob::prepareWriterJob() } - connect( m_writerJob, SIGNAL( infoMessage( const QString&, int ) ), this, SIGNAL( infoMessage( const QString&, int ) ) ); - connect( m_writerJob, SIGNAL( percent( int ) ), this, SLOT( slotWriterJobPercent( int ) ) ); - connect( m_writerJob, SIGNAL( processedSize( int, int ) ), this, SLOT( slotProcessedSize( int, int ) ) ); - connect( m_writerJob, SIGNAL( subPercent( int ) ), this, SIGNAL( subPercent( int ) ) ); - connect( m_writerJob, SIGNAL( processedSubSize( int, int ) ), this, SIGNAL( processedSubSize( int, int ) ) ); - connect( m_writerJob, SIGNAL( nextTrack( int, int ) ), this, SLOT( slotWriterNextTrack( int, int ) ) ); - connect( m_writerJob, SIGNAL( buffer( int ) ), this, SIGNAL( bufferStatus( int ) ) ); - connect( m_writerJob, SIGNAL( deviceBuffer( int ) ), this, SIGNAL( deviceBuffer( int ) ) ); - connect( m_writerJob, SIGNAL( writeSpeed( int, int ) ), this, SIGNAL( writeSpeed( int, int ) ) ); - connect( m_writerJob, SIGNAL( finished( bool ) ), this, SLOT( slotWriterJobFinished( bool ) ) ); - connect( m_writerJob, SIGNAL( newTask( const QString& ) ), this, SIGNAL( newTask( const QString& ) ) ); - connect( m_writerJob, SIGNAL( newSubTask( const QString& ) ), this, SIGNAL( newSubTask( const QString& ) ) ); - connect( m_writerJob, SIGNAL( debuggingOutput( const QString&, const QString& ) ), this, SIGNAL( debuggingOutput( const QString&, const QString& ) ) ); + connect( m_writerJob, TQT_SIGNAL( infoMessage( const TQString&, int ) ), this, TQT_SIGNAL( infoMessage( const TQString&, int ) ) ); + connect( m_writerJob, TQT_SIGNAL( percent( int ) ), this, TQT_SLOT( slotWriterJobPercent( int ) ) ); + connect( m_writerJob, TQT_SIGNAL( processedSize( int, int ) ), this, TQT_SLOT( slotProcessedSize( int, int ) ) ); + connect( m_writerJob, TQT_SIGNAL( subPercent( int ) ), this, TQT_SIGNAL( subPercent( int ) ) ); + connect( m_writerJob, TQT_SIGNAL( processedSubSize( int, int ) ), this, TQT_SIGNAL( processedSubSize( int, int ) ) ); + connect( m_writerJob, TQT_SIGNAL( nextTrack( int, int ) ), this, TQT_SLOT( slotWriterNextTrack( int, int ) ) ); + connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( buffertqStatus( int ) ) ); + connect( m_writerJob, TQT_SIGNAL( deviceBuffer( int ) ), this, TQT_SIGNAL( deviceBuffer( int ) ) ); + connect( m_writerJob, TQT_SIGNAL( writeSpeed( int, int ) ), this, TQT_SIGNAL( writeSpeed( int, int ) ) ); + connect( m_writerJob, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotWriterJobFinished( bool ) ) ); + connect( m_writerJob, TQT_SIGNAL( newTask( const TQString& ) ), this, TQT_SIGNAL( newTask( const TQString& ) ) ); + connect( m_writerJob, TQT_SIGNAL( newSubTask( const TQString& ) ), this, TQT_SIGNAL( newSubTask( const TQString& ) ) ); + connect( m_writerJob, TQT_SIGNAL( debuggingOutput( const TQString&, const TQString& ) ), this, TQT_SIGNAL( debuggingOutput( const TQString&, const TQString& ) ) ); return true; } @@ -461,7 +461,7 @@ void K3bVcdJob::slotProcessedSize( int cs, int ts ) void K3bVcdJob::slotWriterNextTrack( int t, int tt ) { - emit newSubTask( i18n( "Writing Track %1 of %2" ).arg( t ).arg( tt ) ); + emit newSubTask( i18n( "Writing Track %1 of %2" ).tqarg( t ).tqarg( tt ) ); } void K3bVcdJob::slotWriterJobFinished( bool success ) @@ -471,20 +471,20 @@ void K3bVcdJob::slotWriterJobFinished( bool success ) if ( m_currentcopy >= m_doc->copies() ) { // remove bin-file if it is unfinished or the user selected to remove image - if ( QFile::exists( m_doc->vcdImage() ) ) { + if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS ); - QFile::remove + emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS ); + TQFile::remove ( m_doc->vcdImage() ); m_doc->setVcdImage( "" ); } } // remove cue-file if it is unfinished or the user selected to remove image - if ( QFile::exists( m_cueFile ) ) { + if ( TQFile::exists( m_cueFile ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS ); - QFile::remove + emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS ); + TQFile::remove ( m_cueFile ); m_cueFile = ""; } @@ -506,38 +506,38 @@ void K3bVcdJob::slotWriterJobFinished( bool success ) } } -void K3bVcdJob::parseInformation( const QString &text ) +void K3bVcdJob::parseInformation( const TQString &text ) { // parse warning - if ( text.contains( "mpeg user scan data: one or more BCD fields out of range for" ) ) { - int index = text.find( " for" ); + if ( text.tqcontains( "mpeg user scan data: one or more BCD fields out of range for" ) ) { + int index = text.tqfind( " for" ); - emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).arg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).tqarg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING ); - } else if ( text.contains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) { + } else if ( text.tqcontains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) { emit infoMessage( i18n( "From now on, scan information data errors will not be reported anymore" ), K3bJob::INFO ); emit infoMessage( i18n( "Consider enabling the 'update scan offsets' option, if it is not enabled already." ), K3bJob::INFO ); - } else if ( text.contains( "APS' pts seems out of order (actual pts" ) ) { - int index = text.find( "(actual pts" ); - int index2 = text.find( ", last seen pts" ); - int index3 = text.find( ") -- ignoring this aps" ); + } else if ( text.tqcontains( "APS' pts seems out of order (actual pts" ) ) { + int index = text.tqfind( "(actual pts" ); + int index2 = text.tqfind( ", last seen pts" ); + int index3 = text.tqfind( ") -- ignoring this aps" ); - emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).arg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).arg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).tqarg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING ); emit infoMessage( i18n( "Ignoring this aps" ), K3bJob::INFO ); - } else if ( text.contains( "bad packet at packet" ) ) { - int index = text.find( "at packet #" ); - int index2 = text.find( "(stream byte offset" ); - int index3 = text.find( ") -- remaining " ); - int index4 = text.find( "bytes of stream will be ignored" ); + } else if ( text.tqcontains( "bad packet at packet" ) ) { + int index = text.tqfind( "at packet #" ); + int index2 = text.tqfind( "(stream byte offset" ); + int index3 = text.tqfind( ") -- remaining " ); + int index4 = text.tqfind( "bytes of stream will be ignored" ); - emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).arg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).arg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING ); - emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).arg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).tqarg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).tqarg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING ); } } -QString K3bVcdJob::jobDescription() const +TQString K3bVcdJob::jobDescription() const { switch ( m_doc->vcdType() ) { case K3bVcdDoc::VCD11: @@ -546,7 +546,7 @@ QString K3bVcdJob::jobDescription() const return i18n( "Writing Video CD (Version 2.0)" ); case K3bVcdDoc::SVCD10: return i18n( "Writing Super Video CD" ); - case K3bVcdDoc::HQVCD: + case K3bVcdDoc::HTQVCD: return i18n( "Writing High-Quality Video CD" ); default: return i18n( "Writing Video CD" ); @@ -554,14 +554,14 @@ QString K3bVcdJob::jobDescription() const } -QString K3bVcdJob::jobDetails() const +TQString K3bVcdJob::jobDetails() const { return ( i18n( "1 MPEG (%1)", "%n MPEGs (%1)", - m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) ) + m_doc->tracks() ->count() ).tqarg( KIO::convertSize( m_doc->size() ) ) + ( m_doc->copies() > 1 ? i18n( " - %n copy", " - %n copies", m_doc->copies() ) - : QString::null ) ); + : TQString() ) ); } #include "k3bvcdjob.moc" diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h index 917c8b1..96d9026 100644 --- a/libk3b/projects/videocd/k3bvcdjob.h +++ b/libk3b/projects/videocd/k3bvcdjob.h @@ -20,10 +20,10 @@ class K3bVcdDoc; class K3bVcdTrack; -class QString; +class TQString; class K3bProcess; class KProcess; -class QDataStream; +class TQDataStream; class K3bAbstractWriter; class K3bDevice::Device; @@ -31,9 +31,10 @@ class K3bDevice::Device; class K3bVcdJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bVcdJob(); K3bDoc* doc() const; @@ -43,8 +44,8 @@ class K3bVcdJob : public K3bBurnJob } K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); @@ -68,7 +69,7 @@ class K3bVcdJob : public K3bBurnJob void xmlGen(); void vcdxBuild(); - void parseInformation( const QString& ); + void parseInformation( const TQString& ); void startWriterjob(); int m_copies; @@ -103,10 +104,10 @@ class K3bVcdJob : public K3bBurnJob bool m_imageFinished; bool m_canceled; - QString m_tempPath; - QString m_cueFile; - QString m_xmlFile; - QString m_collectedOutput; + TQString m_tempPath; + TQString m_cueFile; + TQString m_xmlFile; + TQString m_collectedOutput; K3bAbstractWriter* m_writerJob; K3bProcess* m_process; diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index 6009a4a..854919f 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -20,9 +20,9 @@ #include <klocale.h> #include <kstandarddirs.h> -// Qt Includes -#include <qstring.h> -#include <qfile.h> +// TQt Includes +#include <tqstring.h> +#include <tqfile.h> // K3b Includes #include "k3bvcdoptions.h" @@ -37,7 +37,7 @@ K3bVcdOptions::K3bVcdOptions() m_volumeID( "VIDEOCD" ), m_albumID( "" ), m_volumeSetId( "" ), - m_publisher( QString( "K3b - Version %1" ).arg( k3bcore->version() ) ), + m_publisher( TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ) ), m_applicationId( "CDI/CDI_VCD.APP;1" ), m_systemId( "CD-RTOS CD-BRIDGE" ), m_vcdclass( "vcd" ), @@ -65,19 +65,19 @@ K3bVcdOptions::K3bVcdOptions() bool K3bVcdOptions::checkCdiFiles() { m_cdisize = 0; - if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ) ) + if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ) ) return false; - if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_text.fnt" ) ) ) + if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_text.fnt" ) ) ) return false; - if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_vcd.app" ) ) ) + if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_vcd.app" ) ) ) return false; - if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ) ) + if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ) ) return false; - m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ).size(); - m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_text.fnt" ) ).size(); - m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_vcd.app" ) ).size(); - m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ).size(); + m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ).size(); + m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_text.fnt" ) ).size(); + m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_vcd.app" ) ).size(); + m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ).size(); return true; } diff --git a/libk3b/projects/videocd/k3bvcdoptions.h b/libk3b/projects/videocd/k3bvcdoptions.h index aa5fed2..420e593 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.h +++ b/libk3b/projects/videocd/k3bvcdoptions.h @@ -16,7 +16,7 @@ #ifndef K3B_VCD_OPTIONS_H #define K3B_VCD_OPTIONS_H -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" class KConfigBase; @@ -25,41 +25,41 @@ class LIBK3B_EXPORT K3bVcdOptions { public: K3bVcdOptions(); - const QString& volumeId() const + const TQString& volumeId() const { return m_volumeID; } - const QString& albumId() const + const TQString& albumId() const { return m_albumID; } - const QString& volumeSetId() const + const TQString& volumeSetId() const { return m_volumeSetId; } - const QString& preparer() const + const TQString& preparer() const { return m_preparer; } - const QString& publisher() const + const TQString& publisher() const { return m_publisher; } - const QString& applicationId() const + const TQString& applicationId() const { return m_applicationId; } - const QString& systemId() const + const TQString& systemId() const { return m_systemId; } - const QString& vcdClass() const + const TQString& vcdClass() const { return m_vcdclass; } - const QString& vcdVersion() const + const TQString& vcdVersion() const { return m_vcdversion; } @@ -140,32 +140,32 @@ class LIBK3B_EXPORT K3bVcdOptions return m_cdisize; } - void setAlbumId( const QString& s ) + void setAlbumId( const TQString& s ) { m_albumID = s; } - void setVolumeId( const QString& s ) + void setVolumeId( const TQString& s ) { m_volumeID = s; } - void setVolumeSetId( const QString& s ) + void setVolumeSetId( const TQString& s ) { m_volumeSetId = s; } - void setPreparer( const QString& s ) + void setPreparer( const TQString& s ) { m_preparer = s; } - void setPublisher( const QString& s ) + void setPublisher( const TQString& s ) { m_publisher = s; } - void setVcdClass( const QString& s ) + void setVcdClass( const TQString& s ) { m_vcdclass = s; } - void setVcdVersion( const QString& s ) + void setVcdVersion( const TQString& s ) { m_vcdversion = s; } @@ -335,18 +335,18 @@ class LIBK3B_EXPORT K3bVcdOptions bool m_pbcnumkeysenabled; // volume descriptor - QString m_volumeID; - QString m_albumID; - QString m_volumeSetId; + TQString m_volumeID; + TQString m_albumID; + TQString m_volumeSetId; - QString m_preparer; - QString m_publisher; + TQString m_preparer; + TQString m_publisher; - QString m_applicationId; - QString m_systemId; + TQString m_applicationId; + TQString m_systemId; - QString m_vcdclass; - QString m_vcdversion; + TQString m_vcdclass; + TQString m_vcdversion; int m_pregapleadout; int m_pregaptrack; diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index 7f0043f..68d04fd 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -16,8 +16,8 @@ #include <kapplication.h> #include <kconfig.h> -#include <qstring.h> -#include <qfileinfo.h> +#include <tqstring.h> +#include <tqfileinfo.h> #include <stdio.h> #include <sys/types.h> @@ -30,15 +30,15 @@ #include "k3bvcdtrack.h" #include <k3bglobals.h> -K3bVcdTrack::K3bVcdTrack( QPtrList<K3bVcdTrack>* parent, const QString& filename ) +K3bVcdTrack::K3bVcdTrack( TQPtrList<K3bVcdTrack>* tqparent, const TQString& filename ) : m_pbcnumkeys( true ), m_pbcnumkeysuserdefined( false ), m_file( filename ) { - m_parent = parent; - m_title = QFileInfo( m_file ).baseName( true ); + m_parent = tqparent; + m_title = TQFileInfo( m_file ).baseName( true ); - m_revreflist = new QPtrList<K3bVcdTrack>; + m_revreflist = new TQPtrList<K3bVcdTrack>; for ( int i = 0; i < K3bVcdTrack::_maxPbcTracks; i++ ) { m_pbctrackmap.insert( i, 0L ); @@ -65,9 +65,9 @@ KIO::filesize_t K3bVcdTrack::size() const int K3bVcdTrack::index() const { - int i = m_parent->find( this ); + int i = m_parent->tqfind( this ); if ( i < 0 ) - kdDebug() << "(K3bVcdTrack) I'm not part of my parent!" << endl; + kdDebug() << "(K3bVcdTrack) I'm not part of my tqparent!" << endl; return i; } @@ -119,23 +119,23 @@ void K3bVcdTrack::delRefFromUs() void K3bVcdTrack::setPbcTrack( int which, K3bVcdTrack* pbctrack ) { kdDebug() << "K3bVcdTrack::setPbcTrack " << which << ", " << pbctrack << endl; - m_pbctrackmap.replace( which, pbctrack ); + m_pbctrackmap.tqreplace( which, pbctrack ); } void K3bVcdTrack::setPbcNonTrack( int which, int type ) { kdDebug() << "K3bVcdTrack::setNonPbcTrack " << which << ", " << type << endl; - m_pbcnontrackmap.replace( which, type ); + m_pbcnontrackmap.tqreplace( which, type ); } void K3bVcdTrack::setUserDefined( int which, bool ud ) { - m_pbcusrdefmap.replace( which, ud ); + m_pbcusrdefmap.tqreplace( which, ud ); } K3bVcdTrack* K3bVcdTrack::getPbcTrack( const int& which ) { - if ( m_pbctrackmap.find( which ) == m_pbctrackmap.end() ) + if ( m_pbctrackmap.tqfind( which ) == m_pbctrackmap.end() ) return 0; else return m_pbctrackmap[ which ]; @@ -143,7 +143,7 @@ K3bVcdTrack* K3bVcdTrack::getPbcTrack( const int& which ) int K3bVcdTrack::getNonPbcTrack( const int& which ) { - if ( m_pbcnontrackmap.find( which ) == m_pbcnontrackmap.end() ) + if ( m_pbcnontrackmap.tqfind( which ) == m_pbcnontrackmap.end() ) return 0; else return m_pbcnontrackmap[ which ]; @@ -154,12 +154,12 @@ bool K3bVcdTrack::isPbcUserDefined( int which ) return m_pbcusrdefmap[ which ]; } -const QString K3bVcdTrack::resolution() +const TQString K3bVcdTrack::resolution() { if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { - return QString( "%1 x %2" ).arg( mpeg_info->video[ i ].hsize ).arg( mpeg_info->video[ i ].vsize ); + return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ i ].hsize ).tqarg( mpeg_info->video[ i ].vsize ); } } } @@ -167,22 +167,22 @@ const QString K3bVcdTrack::resolution() return i18n( "n/a" ); } -const QString K3bVcdTrack::highresolution() +const TQString K3bVcdTrack::highresolution() { if ( mpeg_info->has_video ) { if ( mpeg_info->video[ 2 ].seen ) { - return QString( "%1 x %2" ).arg( mpeg_info->video[ 2 ].hsize ).arg( mpeg_info->video[ 2 ].vsize ); + return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ 2 ].hsize ).tqarg( mpeg_info->video[ 2 ].vsize ); } } return i18n( "n/a" ); } -const QString K3bVcdTrack::video_frate() +const TQString K3bVcdTrack::video_frate() { if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { - return QString::number( mpeg_info->video[ i ].frate ); + return TQString::number( mpeg_info->video[ i ].frate ); } } } @@ -190,12 +190,12 @@ const QString K3bVcdTrack::video_frate() return i18n( "n/a" ); } -const QString K3bVcdTrack::video_bitrate() +const TQString K3bVcdTrack::video_bitrate() { if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { - return i18n( "%1 bit/s" ).arg( mpeg_info->video[ i ].bitrate ) ; + return i18n( "%1 bit/s" ).tqarg( mpeg_info->video[ i ].bitrate ) ; } } } @@ -205,7 +205,7 @@ const QString K3bVcdTrack::video_bitrate() -const QString K3bVcdTrack::video_format() +const TQString K3bVcdTrack::video_format() { if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { @@ -238,24 +238,24 @@ const QString K3bVcdTrack::video_format() return i18n( "n/a" ); } -const QString K3bVcdTrack::video_chroma() +const TQString K3bVcdTrack::video_chroma() { if ( mpeg_info->has_video ) { // MPEG1 only supports 4:2:0 Format if ( version() == K3bMpegInfo::MPEG_VERS_MPEG1 ) - return QString( "4:2:0" ); + return TQString( "4:2:0" ); for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { switch ( mpeg_info->video[ i ].chroma_format ) { case 1 : - return QString( "4:2:0" ); + return TQString( "4:2:0" ); break; case 2 : - return QString( "4:2:2" ); + return TQString( "4:2:2" ); break; case 3 : - return QString( "4:4:4" ); + return TQString( "4:4:4" ); break; } @@ -266,12 +266,12 @@ const QString K3bVcdTrack::video_chroma() return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_layer() +const TQString K3bVcdTrack::audio_layer() { if ( mpeg_info->has_audio ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->audio[ i ].seen ) { - return QString::number( mpeg_info->audio[ i ].layer ); + return TQString::number( mpeg_info->audio[ i ].layer ); } } } @@ -279,12 +279,12 @@ const QString K3bVcdTrack::audio_layer() return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_bitrate() +const TQString K3bVcdTrack::audio_bitrate() { if ( mpeg_info->has_audio ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->audio[ i ].seen ) { - return i18n( "%1 bit/s" ).arg( mpeg_info->audio[ i ].bitrate ) ; + return i18n( "%1 bit/s" ).tqarg( mpeg_info->audio[ i ].bitrate ) ; } } } @@ -292,12 +292,12 @@ const QString K3bVcdTrack::audio_bitrate() return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_sampfreq() +const TQString K3bVcdTrack::audio_sampfreq() { if ( mpeg_info->has_audio ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->audio[ i ].seen ) { - return i18n( "%1 Hz" ).arg( mpeg_info->audio[ i ].sampfreq ) ; + return i18n( "%1 Hz" ).tqarg( mpeg_info->audio[ i ].sampfreq ) ; } } } @@ -305,25 +305,25 @@ const QString K3bVcdTrack::audio_sampfreq() return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_mode( ) +const TQString K3bVcdTrack::audio_mode( ) { if ( mpeg_info->has_audio ) { for ( int i = 2; i >= 0; i-- ) if ( mpeg_info->audio[ i ].seen ) - return QString( audio_type2str( mpeg_info->audio[ i ].version, mpeg_info->audio[ i ].mode, i ) ); + return TQString( audio_type2str( mpeg_info->audio[ i ].version, mpeg_info->audio[ i ].mode, i ) ); } return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_copyright( ) +const TQString K3bVcdTrack::audio_copyright( ) { if ( mpeg_info->has_audio ) { for ( int i = 2; i >= 0; i-- ) if ( mpeg_info->audio[ i ].seen ) if ( mpeg_info->audio[ i ].copyright ) - return QString( "(c) " ) + ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) ); + return TQString( "(c) " ) + ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) ); else return ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) ); } @@ -331,22 +331,22 @@ const QString K3bVcdTrack::audio_copyright( ) return i18n( "n/a" ); } -const QString K3bVcdTrack::mpegTypeS( bool audio ) +const TQString K3bVcdTrack::mpegTypeS( bool audio ) { if ( mpeg_info->has_video && !audio ) { for ( int i = 0; i < 3; i++ ) if ( mpeg_info->video[ i ].seen ) { if ( i == 0 ) { - return QString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Motion Picture" ); + return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Motion Picture" ); } else { - return QString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Still Picture" ); + return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Still Picture" ); } } } if ( mpeg_info->has_audio && audio ) { for ( int i = 0; i < 3; i++ ) if ( mpeg_info->audio[ i ].seen ) { - return QString( "MPEG%1 " ).arg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).arg( mpeg_info->audio[ i ].layer ); + return TQString( "MPEG%1 " ).tqarg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).tqarg( mpeg_info->audio[ i ].layer ); } } @@ -374,17 +374,17 @@ const int K3bVcdTrack::mpegType( ) return -1; // MPEG_UNKNOWN; } -const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int audio_mode, unsigned int audio_type ) +const TQString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int audio_mode, unsigned int audio_type ) { kdDebug() << "K3bVcdTrack::audio_type2str() version:" << version << " audio_mode:" << audio_mode << " audio_type:" << audio_type << endl; - QString audio_types[ 3 ][ 5 ] = { + TQString audio_types[ 3 ][ 5 ] = { { i18n( "unknown" ), i18n( "invalid" ), - QString::null, - QString::null, - QString::null + TQString(), + TQString(), + TQString() }, { i18n( "stereo" ), @@ -393,11 +393,11 @@ const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int au i18n( "single channel" ) }, { - QString::null, + TQString(), i18n( "dual channel" ), i18n( "surround sound" ), - QString::null, - QString::null + TQString(), + TQString() } }; switch ( version ) { @@ -417,18 +417,18 @@ const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int au } // convert a time in second to HH:mm:ss notation -QString K3bVcdTrack::SecsToHMS( double duration ) +TQString K3bVcdTrack::SecsToHMS( double duration ) { byte hours = ( byte ) ( duration / 3600 ); byte mins = ( byte ) ( ( duration / 60 ) - ( hours * 60 ) ); float secs = duration - 60 * mins - 3600 * hours; if ( hours != 0 ) { - return QString( "%1:" ).arg( hours ).rightJustify( 3, ' ' ) + QString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + QString::number( secs, 'f', 2 ); + return TQString( "%1:" ).tqarg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 ); } if ( mins != 0 ) { - return QString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + QString::number( secs, 'f', 2 ); + return TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 ); } - return QString::number( secs, 'f', 2 ); + return TQString::number( secs, 'f', 2 ); } void K3bVcdTrack::PrintInfo() diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index 0d9a3cf..a06552e 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -16,11 +16,11 @@ #ifndef K3BVCDTRACK_H #define K3BVCDTRACK_H -// Qt Includes -#include <qstring.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qptrlist.h> +// TQt Includes +#include <tqstring.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqptrlist.h> // Kde Includes #include <kio/global.h> @@ -31,25 +31,25 @@ class LIBK3B_EXPORT K3bVcdTrack { public: - K3bVcdTrack( QPtrList<K3bVcdTrack>* parent, const QString& filename ); + K3bVcdTrack( TQPtrList<K3bVcdTrack>* tqparent, const TQString& filename ); ~K3bVcdTrack(); - QString fileName() const + TQString fileName() const { - return QFileInfo( m_file ).fileName(); + return TQFileInfo( m_file ).fileName(); } - QString absPath() const + TQString absPath() const { - return QFileInfo( m_file ).absFilePath(); + return TQFileInfo( m_file ).absFilePath(); } KIO::filesize_t size() const; int index() const; - const QString& title() const + const TQString& title() const { return m_title; } - void setTitle( const QString& t ) + void setTitle( const TQString& t ) { m_title = t; } @@ -131,21 +131,21 @@ class LIBK3B_EXPORT K3bVcdTrack { m_definedkeysmap.clear(); } - QMap<int, K3bVcdTrack*> DefinedNumKey() + TQMap<int, K3bVcdTrack*> DefinedNumKey() { return m_definedkeysmap; } // Mpeg Infos - const QString resolution(); - const QString highresolution(); - const QString video_frate(); - const QString video_bitrate(); - const QString audio_layer(); - const QString audio_bitrate(); - const QString audio_sampfreq(); + const TQString resolution(); + const TQString highresolution(); + const TQString video_frate(); + const TQString video_bitrate(); + const TQString audio_layer(); + const TQString audio_bitrate(); + const TQString audio_sampfreq(); - const QString duration() + const TQString duration() { return SecsToHMS( mpeg_info->playing_time ); }; @@ -157,11 +157,11 @@ class LIBK3B_EXPORT K3bVcdTrack { return mpeg_info->muxrate; }; - const QString video_format( ); - const QString video_chroma( ); - const QString audio_mode( ); - const QString audio_copyright( ); - const QString mpegTypeS( bool audio = false ); + const TQString video_format( ); + const TQString video_chroma( ); + const TQString audio_mode( ); + const TQString audio_copyright( ); + const TQString mpegTypeS( bool audio = false ); const int mpegType(); void PrintInfo(); @@ -170,17 +170,17 @@ class LIBK3B_EXPORT K3bVcdTrack protected: - const QString audio_type2str( unsigned int , unsigned int, unsigned int ); - QString SecsToHMS( double ); + const TQString audio_type2str( unsigned int , unsigned int, unsigned int ); + TQString SecsToHMS( double ); - QPtrList<K3bVcdTrack>* m_parent; + TQPtrList<K3bVcdTrack>* m_parent; // PBC - QPtrList<K3bVcdTrack>* m_revreflist; // List of Tracks which points to us - QMap<int, K3bVcdTrack*> m_pbctrackmap; // Pbc Tracks (Previous, Next, ...) - QMap<int, int> m_pbcnontrackmap; // Pbc NON Track types (Previous, Next, ...) - QMap<int, bool> m_pbcusrdefmap; // Pbc is userdefined or defaults (Previous, Next, ...) - QMap<int, K3bVcdTrack*> m_definedkeysmap; + TQPtrList<K3bVcdTrack>* m_revreflist; // List of Tracks which points to us + TQMap<int, K3bVcdTrack*> m_pbctrackmap; // Pbc Tracks (Previous, Next, ...) + TQMap<int, int> m_pbcnontrackmap; // Pbc NON Track types (Previous, Next, ...) + TQMap<int, bool> m_pbcusrdefmap; // Pbc is userdefined or defaults (Previous, Next, ...) + TQMap<int, K3bVcdTrack*> m_definedkeysmap; bool m_pbcnumkeys; bool m_pbcnumkeysuserdefined; @@ -191,8 +191,8 @@ class LIBK3B_EXPORT K3bVcdTrack bool m_reactivity; int m_filetype; - QFile m_file; - QString m_title; + TQFile m_file; + TQString m_title; }; #endif diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp index 0b6f250..0857013 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.cpp +++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp @@ -14,7 +14,7 @@ * See the file "COPYING" for the exact licensing terms. */ -#include <qfile.h> +#include <tqfile.h> #include <kstandarddirs.h> #include <kdebug.h> @@ -35,15 +35,15 @@ K3bVcdXmlView::K3bVcdXmlView( K3bVcdDoc* pDoc ) K3bVcdXmlView::~K3bVcdXmlView() {} -bool K3bVcdXmlView::write( const QString& fname ) +bool K3bVcdXmlView::write( const TQString& fname ) { - QDomDocument xmlDoc( "videocd PUBLIC \"-//GNU//DTD VideoCD//EN\" \"http://www.gnu.org/software/vcdimager/videocd.dtd\"" ); + TQDomDocument xmlDoc( "videocd PUBLIC \"-//GNU//DTD VideoCD//EN\" \"http://www.gnu.org/software/vcdimager/videocd.dtd\"" ); // xmlDoc.appendChild( xmlDoc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"iso-8859-1\"" ) ); xmlDoc.appendChild( xmlDoc.createProcessingInstruction( "xml", "version=\"1.0\"" ) ); // create root element - QDomElement root = xmlDoc.createElement( "videocd" ); + TQDomElement root = xmlDoc.createElement( "videocd" ); root.setAttribute( "xmlns", "http://www.gnu.org/software/vcdimager/1.0/" ); root.setAttribute( "class", m_doc->vcdOptions() ->vcdClass() ); root.setAttribute( "version", m_doc->vcdOptions() ->vcdVersion() ); @@ -53,7 +53,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // Broken SVCD mode - NonCompliantMode if ( m_doc->vcdOptions() ->NonCompliantMode() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "svcd vcd30 mpegav" ); elemOption.setAttribute( "value", "true" ); @@ -65,7 +65,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // VCD3.0 track interpretation if ( m_doc->vcdOptions() ->VCD30interpretation() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "svcd vcd30 tracksvd" ); elemOption.setAttribute( "value", "true" ); @@ -73,7 +73,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // Relaxed aps if ( m_doc->vcdOptions() ->RelaxedAps() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "relaxed aps" ); elemOption.setAttribute( "value", "true" ); @@ -81,7 +81,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // Update scan offsets if ( m_doc->vcdOptions() ->UpdateScanOffsets() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "update scan offsets" ); elemOption.setAttribute( "value", "true" ); @@ -90,7 +90,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // Gaps & Margins if ( m_doc->vcdOptions() ->UseGaps() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "leadout pregap" ); elemOption.setAttribute( "value", m_doc->vcdOptions() ->PreGapLeadout() ); @@ -120,23 +120,23 @@ bool K3bVcdXmlView::write( const QString& fname ) } // create info element - QDomElement elemInfo = addSubElement( xmlDoc, root, "info" ); + TQDomElement elemInfo = addSubElement( xmlDoc, root, "info" ); addSubElement( xmlDoc, elemInfo, "album-id", m_doc->vcdOptions() ->albumId().upper() ); addSubElement( xmlDoc, elemInfo, "volume-count", m_doc->vcdOptions() ->volumeCount() ); addSubElement( xmlDoc, elemInfo, "volume-number", m_doc->vcdOptions() ->volumeNumber() ); addSubElement( xmlDoc, elemInfo, "restriction", m_doc->vcdOptions() ->Restriction() ); // create pvd element - QDomElement elemPvd = addSubElement( xmlDoc, root, "pvd" ); + TQDomElement elemPvd = addSubElement( xmlDoc, root, "pvd" ); addSubElement( xmlDoc, elemPvd, "volume-id", m_doc->vcdOptions() ->volumeId().upper() ); addSubElement( xmlDoc, elemPvd, "system-id", m_doc->vcdOptions() ->systemId() ); addSubElement( xmlDoc, elemPvd, "application-id", m_doc->vcdOptions() ->applicationId() ); - addSubElement( xmlDoc, elemPvd, "preparer-id", QString( "K3b - Version %1" ).arg( k3bcore->version() ).upper() ); + addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ).upper() ); addSubElement( xmlDoc, elemPvd, "publisher-id", m_doc->vcdOptions() ->publisher().upper() ); // create filesystem element - QDomElement elemFileSystem = addSubElement( xmlDoc, root, "filesystem" ); + TQDomElement elemFileSystem = addSubElement( xmlDoc, root, "filesystem" ); // SEGMENT folder, some standalone DVD-Player need this if ( !m_doc->vcdOptions() ->haveSegments() && m_doc->vcdOptions() ->SegmentFolder() ) @@ -144,26 +144,26 @@ bool K3bVcdXmlView::write( const QString& fname ) // create cdi element if ( m_doc->vcdOptions() ->CdiSupport() ) { - QDomElement elemFolder = addFolderElement( xmlDoc, elemFileSystem, "CDI" ); + TQDomElement elemFolder = addFolderElement( xmlDoc, elemFileSystem, "CDI" ); addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_imag.rtf" ), "CDI_IMAG.RTF", true ); addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_text.fnt" ), "CDI_TEXT.FNT" ); addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_vcd.app" ), "CDI_VCD.APP" ); - QString usercdicfg = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); - if ( QFile::exists( usercdicfg ) ) + TQString usercdicfg = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); + if ( TQFile::exists( usercdicfg ) ) addFileElement( xmlDoc, elemFolder, usercdicfg, "CDI_VCD.CFG" ); else addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_vcd.cfg" ), "CDI_VCD.CFG" ); } // sequence-items element & segment-items element - QDomElement elemsequenceItems; - QDomElement elemsegmentItems; + TQDomElement elemsequenceItems; + TQDomElement elemsegmentItems; // sequence-item element & segment-item element - QDomElement elemsequenceItem; - QDomElement elemsegmentItem; + TQDomElement elemsequenceItem; + TQDomElement elemsegmentItem; // if we have segments, elemsegmentItems must be before any sequence in xml file order if ( m_doc->vcdOptions()->haveSegments() ) @@ -173,45 +173,45 @@ bool K3bVcdXmlView::write( const QString& fname ) elemsequenceItems = addSubElement( xmlDoc, root, "sequence-items" ); // if we have no sequence (photo (s)vcd) we must add a dummy sequence they inform the user to turn on pbc on there videoplayer if ( !m_doc->vcdOptions()->haveSequence() ) { - QString filename; + TQString filename; if ( m_doc->vcdOptions()->mpegVersion() == 1 ) filename = locate( "data", "k3b/extra/k3bphotovcd.mpg" ); else filename = locate( "data", "k3b/extra/k3bphotosvcd.mpg" ); elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" ); - elemsequenceItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( filename ) ) ); + elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( filename ).data() ) ); elemsequenceItem.setAttribute( "id", "sequence-000" ); // default entry - QDomElement elemdefaultEntry; + TQDomElement elemdefaultEntry; elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" ); elemdefaultEntry.setAttribute( "id", "entry-000" ); } // pbc - QDomElement elemPbc; + TQDomElement elemPbc; // Add Tracks to XML - QPtrListIterator<K3bVcdTrack> it( *m_doc->tracks() ); + TQPtrListIterator<K3bVcdTrack> it( *m_doc->tracks() ); for ( ; it.current(); ++it ) { if ( !it.current() ->isSegment() ) { - QString seqId = QString::number( it.current() ->index() ).rightJustify( 3, '0' ); + TQString seqId = TQString::number( it.current() ->index() ).rightJustify( 3, '0' ); elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" ); - elemsequenceItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( it.current() ->absPath() ) ) ); - elemsequenceItem.setAttribute( "id", QString( "sequence-%1" ).arg( seqId ) ); + elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); + elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).tqarg( seqId ) ); // default entry - QDomElement elemdefaultEntry; + TQDomElement elemdefaultEntry; elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" ); - elemdefaultEntry.setAttribute( "id", QString( "entry-%1" ).arg( seqId ) ); + elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).tqarg( seqId ) ); } else { // sequence-items element needs at least one segment to fit the XML elemsegmentItem = addSubElement( xmlDoc, elemsegmentItems, "segment-item" ); - elemsegmentItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( it.current() ->absPath() ) ) ); - elemsegmentItem.setAttribute( "id", QString( "segment-%1" ).arg( QString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) ); + elemsegmentItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); + elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).tqarg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) ); } } @@ -226,17 +226,17 @@ bool K3bVcdXmlView::write( const QString& fname ) } if ( ! elemPbc.isNull() ) { - QDomElement elemEndlist = addSubElement( xmlDoc, elemPbc, "endlist" ); + TQDomElement elemEndlist = addSubElement( xmlDoc, elemPbc, "endlist" ); elemEndlist.setAttribute( "id", "end" ); elemEndlist.setAttribute( "rejected", "true" ); } m_xmlstring = xmlDoc.toString(); - kdDebug() << QString( "(K3bVcdXmlView) Write Data to %1:" ).arg( fname ) << endl; + kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).tqarg( fname ) << endl; - QFile xmlFile( fname ); + TQFile xmlFile( fname ); if ( xmlFile.open( IO_WriteOnly ) ) { - QTextStream ts( & xmlFile ); + TQTextStream ts( & xmlFile ); ts << m_xmlstring; xmlFile.close(); return true; @@ -245,89 +245,89 @@ bool K3bVcdXmlView::write( const QString& fname ) return false; } -void K3bVcdXmlView::addComment( QDomDocument& doc, QDomElement& parent, const QString& text ) +void K3bVcdXmlView::addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text ) { - QDomComment comment = doc.createComment( text ); - parent.appendChild( comment ); + TQDomComment comment = doc.createComment( text ); + tqparent.appendChild( comment ); } -QDomElement K3bVcdXmlView::addSubElement( QDomDocument& doc, QDomElement& parent, const QString& name, const QString& value ) +TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const TQString& value ) { - QDomElement element = doc.createElement( name ); - parent.appendChild( element ); + TQDomElement element = doc.createElement( name ); + tqparent.appendChild( element ); if ( !value.isNull() ) { - QDomText t = doc.createTextNode( value ); + TQDomText t = doc.createTextNode( value ); element.appendChild( t ); } return element; } -QDomElement K3bVcdXmlView::addSubElement( QDomDocument& doc, QDomElement& parent, const QString& name, const int& value ) +TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const int& value ) { - QDomElement element = doc.createElement( name ); - parent.appendChild( element ); + TQDomElement element = doc.createElement( name ); + tqparent.appendChild( element ); if ( value >= -1 ) { - QDomText t = doc.createTextNode( QString( "%1" ).arg( value ) ); + TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) ); element.appendChild( t ); } return element; } -QDomElement K3bVcdXmlView::addFolderElement( QDomDocument& doc, QDomElement& parent, const QString& name ) +TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name ) { - QDomElement elemFolder = addSubElement( doc, parent, "folder" ); + TQDomElement elemFolder = addSubElement( doc, tqparent, "folder" ); addSubElement( doc, elemFolder, "name", name ); return elemFolder; } -void K3bVcdXmlView::addFileElement( QDomDocument& doc, QDomElement& parent, const QString& src, const QString& name, bool mixed ) +void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& src, const TQString& name, bool mixed ) { - QDomElement elemFile = addSubElement( doc, parent, "file" ); - elemFile.setAttribute( "src", QString( "%1" ).arg( src ) ); + TQDomElement elemFile = addSubElement( doc, tqparent, "file" ); + elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) ); if ( mixed ) elemFile.setAttribute( "format", "mixed" ); addSubElement( doc, elemFile, "name", name ); } -void K3bVcdXmlView::doPbc( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track ) +void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) { - QString ref = ( track->isSegment() ) ? "segment" : "sequence"; + TQString ref = ( track->isSegment() ) ? "segment" : "sequence"; - QDomElement elemSelection = addSubElement( doc, parent, "selection" ); - elemSelection.setAttribute( "id", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) ); + TQDomElement elemSelection = addSubElement( doc, tqparent, "selection" ); + elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); setNumkeyBSN( doc, elemSelection, track ); for ( int i = 0; i < K3bVcdTrack::_maxPbcTracks; i++ ) { - QDomElement elemPbcSelectionPNRDT; + TQDomElement elemPbcSelectionPNRDT; if ( track->getPbcTrack( i ) ) { int index = track->getPbcTrack( i ) ->index(); - QString ref = ( track->getPbcTrack( i ) ->isSegment() ) ? "segment" : "sequence"; + TQString ref = ( track->getPbcTrack( i ) ->isSegment() ) ? "segment" : "sequence"; switch ( i ) { case K3bVcdTrack::PREVIOUS: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "prev" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::NEXT: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "next" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::RETURN: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "return" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::DEFAULT: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "default" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::AFTERTIMEOUT: if ( track->getWaitTime() >= 0 ) { elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "timeout" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); } break; } @@ -363,23 +363,23 @@ void K3bVcdXmlView::doPbc( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* } addSubElement( doc, elemSelection, "wait", track->getWaitTime() ); - QDomElement loop = addSubElement( doc, elemSelection, "loop", track->getPlayTime() ); + TQDomElement loop = addSubElement( doc, elemSelection, "loop", track->getPlayTime() ); if ( track->Reactivity() ) loop.setAttribute( "jump-timing", "delayed" ); else loop.setAttribute( "jump-timing", "immediate" ); - addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", QString( "%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) ); + addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); setNumkeySEL( doc, elemSelection, track ); } -void K3bVcdXmlView::setNumkeyBSN( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track ) +void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) { if ( track->PbcNumKeys() ) { if ( track->PbcNumKeysUserdefined() ) { - QMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey(); - QMap<int, K3bVcdTrack*>::const_iterator trackIt; + TQMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey(); + TQMap<int, K3bVcdTrack*>::const_iterator trackIt; m_startkey = 0; trackIt = numKeyMap.begin(); @@ -387,53 +387,53 @@ void K3bVcdXmlView::setNumkeyBSN( QDomDocument& doc, QDomElement& parent, K3bVcd m_startkey = trackIt.key(); if ( m_startkey > 0 ) - addSubElement( doc, parent, "bsn", m_startkey ); + addSubElement( doc, tqparent, "bsn", m_startkey ); else // user has no numKeys defined for this track track->setPbcNumKeys( false ); } else { // default start with key #1 - addSubElement( doc, parent, "bsn", 1 ); + addSubElement( doc, tqparent, "bsn", 1 ); } } } -void K3bVcdXmlView::setNumkeySEL( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track ) +void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) { if ( track->PbcNumKeys() ) { - QDomElement elemPbcSelectionNumKeySEL; - QString ref = ( track->isSegment() ) ? "segment" : "sequence"; + TQDomElement elemPbcSelectionNumKeySEL; + TQString ref = ( track->isSegment() ) ? "segment" : "sequence"; int none = m_startkey; if ( track->PbcNumKeysUserdefined() ) { - QMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey(); - QMap<int, K3bVcdTrack*>::const_iterator trackIt; + TQMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey(); + TQMap<int, K3bVcdTrack*>::const_iterator trackIt; for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) { - kdDebug() << QString( "trackIt key: %1 none: %2" ).arg( trackIt.key() ).arg( none ) << endl; + kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl; while ( none < trackIt.key() ) { - elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) ); - addComment( doc, parent, QString( "key %1 -> %2 (normal none)" ).arg( none ).arg( QFile::encodeName( track->absPath() ) ) ); + elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); + addComment( doc, tqparent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) ); none++; } if ( trackIt.data() ) { - QString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence"; - elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) ); - addComment( doc, parent, QString( "key %1 -> %2" ).arg( trackIt.key() ).arg( QFile::encodeName( trackIt.data() ->absPath() ) ) ); + TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence"; + elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) ); + addComment( doc, tqparent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) ); } else { - elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" ); - addComment( doc, parent, QString( "key %1 -> end" ).arg( trackIt.key() ) ); + addComment( doc, tqparent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) ); } none++; } } else { // default reference to itSelf - elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); } } } diff --git a/libk3b/projects/videocd/k3bvcdxmlview.h b/libk3b/projects/videocd/k3bvcdxmlview.h index d99549b..cce8341 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.h +++ b/libk3b/projects/videocd/k3bvcdxmlview.h @@ -17,8 +17,8 @@ #ifndef K3B_VCD_XMLVIEW_H #define K3B_VCD_XMLVIEW_H -#include <qstring.h> -#include <qdom.h> +#include <tqstring.h> +#include <tqdom.h> #include <ktempfile.h> #include <k3bvcddoc.h> @@ -34,24 +34,24 @@ class K3bVcdXmlView K3bVcdXmlView( K3bVcdDoc* ); ~K3bVcdXmlView(); - bool write( const QString& ); - QString xmlString() + bool write( const TQString& ); + TQString xmlString() { return m_xmlstring; } private: - QString m_xmlstring; + TQString m_xmlstring; - void addComment( QDomDocument& doc, QDomElement& parent, const QString& text ); - QDomElement addSubElement( QDomDocument&, QDomElement&, const QString& name, const QString& value = QString::null ); - QDomElement addSubElement( QDomDocument&, QDomElement&, const QString& name, const int& value ); + void addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text ); + TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const TQString& value = TQString() ); + TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const int& value ); - QDomElement addFolderElement( QDomDocument&, QDomElement&, const QString& name ); - void addFileElement( QDomDocument&, QDomElement&, const QString& src, const QString& name, bool mixed = false ); - void doPbc( QDomDocument&, QDomElement&, K3bVcdTrack* ); - void setNumkeyBSN( QDomDocument& , QDomElement&, K3bVcdTrack* ); - void setNumkeySEL( QDomDocument& , QDomElement&, K3bVcdTrack* ); + TQDomElement addFolderElement( TQDomDocument&, TQDomElement&, const TQString& name ); + void addFileElement( TQDomDocument&, TQDomElement&, const TQString& src, const TQString& name, bool mixed = false ); + void doPbc( TQDomDocument&, TQDomElement&, K3bVcdTrack* ); + void setNumkeyBSN( TQDomDocument& , TQDomElement&, K3bVcdTrack* ); + void setNumkeySEL( TQDomDocument& , TQDomElement&, K3bVcdTrack* ); K3bVcdDoc* m_doc; int m_startkey; }; diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp index 583a0aa..089f22d 100644 --- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp +++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp @@ -41,19 +41,19 @@ K3bMpegInfo::K3bMpegInfo( const char* filename ) m_mpegfile = fopen( filename, "rb" ); if ( m_mpegfile == 0 ) { - kdDebug() << QString( "Unable to open %1" ).arg( m_filename ) << endl; + kdDebug() << TQString( "Unable to open %1" ).tqarg( m_filename ) << endl; return ; } if ( fseeko( m_mpegfile, 0, SEEK_END ) ) { - kdDebug() << QString( "Unable to seek in file %1" ).arg( m_filename ) << endl; + kdDebug() << TQString( "Unable to seek in file %1" ).tqarg( m_filename ) << endl; return ; } llong lof = ftello( m_mpegfile ); if ( lof == -1 ) { - kdDebug() << QString( "Seeking to end of input file %1 failed." ).arg( m_filename ) << endl; + kdDebug() << TQString( "Seeking to end of input file %1 failed." ).tqarg( m_filename ) << endl; //give up.. return ; } else @@ -61,8 +61,8 @@ K3bMpegInfo::K3bMpegInfo( const char* filename ) // nothing to do on an empty file if ( !m_filesize ) { - kdDebug() << QString( "File %1 is empty." ).arg( m_filename ) << endl; - m_error_string = i18n( "File %1 is empty." ).arg( m_filename ); + kdDebug() << TQString( "File %1 is empty." ).tqarg( m_filename ) << endl; + m_error_string = i18n( "File %1 is empty." ).tqarg( m_filename ); return ; } @@ -90,7 +90,7 @@ bool K3bMpegInfo::MpegParsePacket () if ( !EnsureMPEG( 0, MPEG_PACK_HEADER_CODE ) ) { llong code = GetNBytes( 0, 4 ); - kdDebug() << QString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).arg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).arg( code, 0, 16 ) << endl; + kdDebug() << TQString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).tqarg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).tqarg( code, 0, 16 ) << endl; if ( code == 0x00000100 + MPEG_SEQUENCE_CODE ) { kdDebug() << "...this looks like a elementary video stream but a multiplexed program stream was required." << endl; @@ -120,7 +120,7 @@ bool K3bMpegInfo::MpegParsePacket () if ( offset != 0 ) { // we actually skipped some zeroes - kdDebug() << QString( "Skipped %1 zeroes at start of file" ).arg( offset ) << endl; + kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).tqarg( offset ) << endl; } // here while schleife @@ -155,7 +155,7 @@ bool K3bMpegInfo::MpegParsePacket () { duration = ReadTSMpeg2( last_pack ); } else { - kdDebug() << QString( "no timestamp found" ) << endl; + kdDebug() << TQString( "no timestamp found" ) << endl; duration = ReadTS( last_pack ); } @@ -190,7 +190,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) int bits; case MPEG_PACK_HEADER_CODE: - // kdDebug() << QString( "MPEG_PACK_HEADER_CODE @ %1" ).arg( offset ) << endl; + // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).tqarg( offset ) << endl; offset += 4; @@ -214,7 +214,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) if ( m_initial_TS == 0.0 ) { m_initial_TS = ReadTS( offset ); - kdDebug() << QString( "Initial TS = %1" ).arg( m_initial_TS ) << endl; + kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl; } } else if ( bits >> 2 == 0x1 ) /* %01xx ISO13818-1 */ @@ -231,11 +231,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) if ( m_initial_TS == 0.0 ) { m_initial_TS = ReadTSMpeg2( offset ); - kdDebug() << QString( "Initial TS = %1" ).arg( m_initial_TS ) << endl; + kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl; } } else { - kdDebug() << QString( "packet not recognized as either version 1 or 2 (%1)" ).arg( bits ) << endl; + kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).tqarg( bits ) << endl; mpeg_info->version = MPEG_VERS_INVALID; return -1; } @@ -254,11 +254,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) offset += 4; size = GetSize( offset ); offset += 2; - // kdDebug() << QString( "offset = %1, size = %2" ).arg( offset ).arg( size ) << endl; + // kdDebug() << TQString( "offset = %1, size = %2" ).tqarg( offset ).tqarg( size ) << endl; switch ( mark ) { case MPEG_SYSTEM_HEADER_CODE: - // kdDebug() << QString( "Systemheader: %1" ).arg( m_code, 0, 16 ) << endl; + // kdDebug() << TQString( "Systemheader: %1" ).tqarg( m_code, 0, 16 ) << endl; break; case MPEG_VIDEO_E0_CODE: @@ -296,18 +296,18 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) break; case MPEG_PRIVATE_1_CODE: - kdDebug() << QString( "PrivateCode: %1" ).arg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "PrivateCode: %1" ).tqarg( mark, 0, 16 ) << endl; break; } break; case MPEG_PROGRAM_END_CODE: - kdDebug() << QString( "ProgramEndCode: %1" ).arg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "ProgramEndCode: %1" ).tqarg( mark, 0, 16 ) << endl; offset += 4; break; case MPEG_PICTURE_CODE: - kdDebug() << QString( "PictureCode: %1" ).arg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "PictureCode: %1" ).tqarg( mark, 0, 16 ) << endl; offset += 3; break; @@ -325,7 +325,7 @@ byte K3bMpegInfo::GetByte( llong offset ) if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { if ( fseeko( m_mpegfile, offset, SEEK_SET ) ) { - kdDebug() << QString( "could not get seek to offset (%1) in file %2 (size:%3)" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; + kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; return 0x11; } nread = fread( m_buffer, 1, BUFFERSIZE, m_mpegfile ); @@ -333,7 +333,7 @@ byte K3bMpegInfo::GetByte( llong offset ) m_buffend = offset + nread; if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { // weird - kdDebug() << QString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; + kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; return 0x11; } } @@ -355,7 +355,7 @@ byte K3bMpegInfo::bdGetByte( llong offset ) m_buffend = start + nread; if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { // weird - kdDebug() << QString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; + kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; return 0x11; } diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h index 3436214..461af3a 100644 --- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h +++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h @@ -30,7 +30,7 @@ #define MPEG_USER_CODE ((uchar) 0xb2) #define MPEG_SEQUENCE_CODE ((uchar) 0xb3) #define MPEG_EXT_CODE ((uchar) 0xb5) -#define MPEG_SEQ_END_CODE ((uchar) 0xb7) +#define MPEG_SETQ_END_CODE ((uchar) 0xb7) #define MPEG_GOP_CODE ((uchar) 0xb8) #define MPEG_PROGRAM_END_CODE ((uchar) 0xb9) #define MPEG_PACK_HEADER_CODE ((uchar) 0xba) @@ -127,7 +127,7 @@ class K3bMpegInfo { return mpeg_info->version; }; - const QString error_string() + const TQString error_string() { return m_error_string; }; @@ -171,7 +171,7 @@ class K3bMpegInfo llong m_buffend; byte* m_buffer; double m_initial_TS; - QString m_error_string; + TQString m_error_string; }; diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.cpp b/libk3b/projects/videodvd/k3bvideodvddoc.cpp index 2f02ac6..f86830d 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.cpp +++ b/libk3b/projects/videodvd/k3bvideodvddoc.cpp @@ -24,8 +24,8 @@ #include <kconfig.h> -K3bVideoDvdDoc::K3bVideoDvdDoc( QObject* parent ) - : K3bDvdDoc( parent ) +K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* tqparent ) + : K3bDvdDoc( tqparent ) { } @@ -63,9 +63,9 @@ bool K3bVideoDvdDoc::newDocument() } -K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bVideoDvdJob( this, hdl, parent ); + return new K3bVideoDvdJob( this, hdl, tqparent ); } //#include "k3bdvddoc.moc" diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.h b/libk3b/projects/videodvd/k3bvideodvddoc.h index 034ae4d..cdfdfa7 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.h +++ b/libk3b/projects/videodvd/k3bvideodvddoc.h @@ -23,12 +23,12 @@ class KConfig; class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc { public: - K3bVideoDvdDoc( QObject* parent = 0 ); + K3bVideoDvdDoc( TQObject* tqparent = 0 ); virtual ~K3bVideoDvdDoc(); virtual int type() const { return VIDEODVD; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); virtual bool newDocument(); @@ -37,7 +37,7 @@ class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc // TODO: implement load- and saveDocumentData since we do not need all those options protected: - virtual QString typeString() const { return "video_dvd"; } + virtual TQString typeString() const { return "video_dvd"; } private: K3bDirItem* m_videoTsDir; diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp index 7362aa0..ab7c17a 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp @@ -26,10 +26,10 @@ #include <kdebug.h> #include <klocale.h> -#include <qtextstream.h> -#include <qdir.h> -#include <qfile.h> -#include <qptrlist.h> +#include <tqtextstream.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqptrlist.h> @@ -38,12 +38,12 @@ class K3bVideoDvdImager::Private public: K3bVideoDvdDoc* doc; - QString tempPath; + TQString tempPath; }; -K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bIsoImager( doc, jh, parent, name ) +K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bIsoImager( doc, jh, tqparent, name ) { d = new Private; d->doc = doc; @@ -104,30 +104,30 @@ int K3bVideoDvdImager::writePathSpec() // // We do this here since K3bIsoImager::start calls cleanup which deletes the temp files // - QDir dir( KGlobal::dirs()->resourceDirs( "tmp" ).first() ); + TQDir dir( KGlobal::dirs()->resourceDirs( "tmp" ).first() ); d->tempPath = K3b::findUniqueFilePrefix( "k3bVideoDvd", dir.path() ); kdDebug() << "(K3bVideoDvdImager) creating temp dir: " << d->tempPath << endl; if( !dir.mkdir( d->tempPath, true ) ) { - emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath), ERROR ); + emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath), ERROR ); return -1; } dir.cd( d->tempPath ); if( !dir.mkdir( "VIDEO_TS" ) ) { - emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath + "/VIDEO_TS"), ERROR ); + emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath + "/VIDEO_TS"), ERROR ); return -1; } - for( QPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it ) { + for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) { if( (*it)->isDir() ) { - emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").arg((*it)->k3bName()), ERROR ); + emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").tqarg((*it)->k3bName()), ERROR ); return -1; } // convert to upper case names - if( ::symlink( QFile::encodeName( (*it)->localPath() ), - QFile::encodeName( d->tempPath + "/VIDEO_TS/" + (*it)->k3bName().upper() ) ) == -1 ) { - emit infoMessage( i18n("Unable to link temporary file in folder %1.").arg( d->tempPath ), ERROR ); + if( ::symlink( TQFile::encodeName( (*it)->localPath() ), + TQFile::encodeName( d->tempPath + "/VIDEO_TS/" + (*it)->k3bName().upper() ) ) == -1 ) { + emit infoMessage( i18n("Unable to link temporary file in folder %1.").tqarg( d->tempPath ), ERROR ); return -1; } } @@ -137,7 +137,7 @@ int K3bVideoDvdImager::writePathSpec() } -int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream ) +int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream ) { // // We handle the VIDEO_TS dir differently since otherwise mkisofs is not able to @@ -148,7 +148,7 @@ int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& st } int num = 0; - for( QPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); it.current(); ++it ) { K3bDataItem* item = it.current(); num++; @@ -192,25 +192,25 @@ bool K3bVideoDvdImager::addMkisofsParameters( bool printSize ) void K3bVideoDvdImager::cleanup() { - if( QFile::exists( d->tempPath ) ) { - QDir dir( d->tempPath ); + if( TQFile::exists( d->tempPath ) ) { + TQDir dir( d->tempPath ); dir.cd( "VIDEO_TS" ); - for( QPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it ) + for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) dir.remove( (*it)->k3bName().upper() ); dir.cdUp(); dir.rmdir( "VIDEO_TS" ); dir.cdUp(); dir.rmdir( d->tempPath ); } - d->tempPath = QString::null; + d->tempPath = TQString(); K3bIsoImager::cleanup(); } -void K3bVideoDvdImager::slotReceivedStderr( const QString& line ) +void K3bVideoDvdImager::slotReceivedStderr( const TQString& line ) { - if( line.contains( "Unable to make a DVD-Video image" ) ) { + if( line.tqcontains( "Unable to make a DVD-Video image" ) ) { emit infoMessage( i18n("The project does not contain all necessary VideoDVD files."), WARNING ); emit infoMessage( i18n("The resulting DVD will most likely not be playable on a Hifi DVD player."), WARNING ); } diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.h b/libk3b/projects/videodvd/k3bvideodvdimager.h index 0062d55..b1a9678 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.h +++ b/libk3b/projects/videodvd/k3bvideodvdimager.h @@ -32,9 +32,10 @@ class K3bVideoDvdDoc; class K3bVideoDvdImager : public K3bIsoImager { Q_OBJECT + TQ_OBJECT public: - K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bVideoDvdImager(); public slots: @@ -46,10 +47,10 @@ class K3bVideoDvdImager : public K3bIsoImager bool addMkisofsParameters( bool printSize = false ); int writePathSpec(); void cleanup(); - int writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream ); + int writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream ); protected slots: - virtual void slotReceivedStderr( const QString& ); + virtual void slotReceivedStderr( const TQString& ); private: void fixVideoDVDSettings(); diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index f4e6129..b550379 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -30,8 +30,8 @@ -K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, QObject* parent ) - : K3bDvdJob( doc, jh, parent ), +K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) + : K3bDvdJob( doc, jh, tqparent ), m_doc(doc) { } @@ -64,7 +64,7 @@ bool K3bVideoDvdJob::prepareWriterJob() writer->setCloseDvd( true ); if( m_doc->onTheFly() ) { - writer->setImageToWrite( QString::null ); // read from stdin + writer->setImageToWrite( TQString() ); // read from stdin writer->setTrackSize( m_isoImager->size() ); } else @@ -76,7 +76,7 @@ bool K3bVideoDvdJob::prepareWriterJob() } -QString K3bVideoDvdJob::jobDescription() const +TQString K3bVideoDvdJob::jobDescription() const { if( m_doc->onlyCreateImages() ) { return i18n("Creating Video DVD Image File"); @@ -84,18 +84,18 @@ QString K3bVideoDvdJob::jobDescription() const else { return i18n("Writing Video DVD") + ( m_doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); } } -QString K3bVideoDvdJob::jobDetails() const +TQString K3bVideoDvdJob::jobDetails() const { - return ( i18n("ISO9660/Udf Filesystem (Size: %1)").arg(KIO::convertSize( doc()->size() )) + return ( i18n("ISO9660/Udf Filesystem (Size: %1)").tqarg(KIO::convertSize( doc()->size() )) + ( m_doc->copies() > 1 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3bvideodvdjob.moc" diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.h b/libk3b/projects/videodvd/k3bvideodvdjob.h index 3f03cea..a1d079e 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.h +++ b/libk3b/projects/videodvd/k3bvideodvdjob.h @@ -28,13 +28,14 @@ class K3bVideoDvdDoc; class K3bVideoDvdJob : public K3bDvdJob { Q_OBJECT + TQ_OBJECT public: - K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); virtual ~K3bVideoDvdJob(); - virtual QString jobDescription() const; - virtual QString jobDetails() const; + virtual TQString jobDescription() const; + virtual TQString jobDetails() const; private: bool prepareWriterJob(); 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; diff --git a/libk3b/videodvd/k3bvideodvd.cpp b/libk3b/videodvd/k3bvideodvd.cpp index 8692c04..47de0d0 100644 --- a/libk3b/videodvd/k3bvideodvd.cpp +++ b/libk3b/videodvd/k3bvideodvd.cpp @@ -22,7 +22,7 @@ #include <k3bdevice.h> -#include <qfile.h> +#include <tqfile.h> #include <klocale.h> @@ -61,7 +61,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev ) // // Initialize libdvdread // - dvd_reader_t* dvdReaderT = DVDOpen( QFile::encodeName(dev->blockDeviceName()) ); + dvd_reader_t* dvdReaderT = DVDOpen( TQFile::encodeName(dev->blockDeviceName()) ); if( !dvdReaderT ) { kdDebug() << "(K3bVideoDVD) Could not open device " << dev->blockDeviceName() << endl; return false; @@ -77,7 +77,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev ) DVDClose( dvdReaderT ); return false; } - m_volumeIdentifier = QString::fromLatin1( v, 32 ); + m_volumeIdentifier = TQString::tqfromLatin1( v, 32 ); // // Open the VMG info @@ -160,7 +160,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev ) titleIfo->vtsi_mat->vts_audio_attr[j].lang_code>>8, titleIfo->vtsi_mat->vts_audio_attr[j].lang_code & 0xff ); else - m_titles[i].m_audioStreams[j].m_langCode = QString::null; + m_titles[i].m_audioStreams[j].m_langCode = TQString(); } // @@ -175,7 +175,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev ) titleIfo->vtsi_mat->vts_subp_attr[j].lang_code>>8, titleIfo->vtsi_mat->vts_subp_attr[j].lang_code & 0xff ); else - m_titles[i].m_subPictureStreams[j].m_langCode = QString::null; + m_titles[i].m_subPictureStreams[j].m_langCode = TQString(); } // @@ -244,7 +244,7 @@ void K3bVideoDVD::VideoDVD::debug() const } -QString K3bVideoDVD::audioFormatString( int format ) +TQString K3bVideoDVD::audioFormatString( int format ) { switch( format ) { case AUDIO_FORMAT_AC3: @@ -263,7 +263,7 @@ QString K3bVideoDVD::audioFormatString( int format ) } -QString K3bVideoDVD::audioCodeExtensionString( int ext ) +TQString K3bVideoDVD::audioCodeExtensionString( int ext ) { switch( ext ) { case AUDIO_CODE_EXT_UNSPECIFIED: @@ -282,7 +282,7 @@ QString K3bVideoDVD::audioCodeExtensionString( int ext ) } -QString K3bVideoDVD::subPictureCodeModeString( int mode ) +TQString K3bVideoDVD::subPictureCodeModeString( int mode ) { switch( mode ) { case SUBPIC_CODE_MODE_RLE: @@ -295,7 +295,7 @@ QString K3bVideoDVD::subPictureCodeModeString( int mode ) } -QString K3bVideoDVD::subPictureCodeExtensionString( int ext ) +TQString K3bVideoDVD::subPictureCodeExtensionString( int ext ) { switch( ext ) { case SUBPIC_CODE_EXT_UNSPECIFIED: @@ -305,13 +305,13 @@ QString K3bVideoDVD::subPictureCodeExtensionString( int ext ) case SUBPIC_CODE_EXT_CAPTION_BIGGER_SIZE: return i18n("Caption with bigger size character"); case SUBPIC_CODE_EXT_CAPTION_FOR_CHILDREN: - return i18n("Caption for children"); + return i18n("Caption for tqchildren"); case SUBPIC_CODE_EXT_CLOSED_CAPTION_NORMAL_SIZE: return i18n("Closed caption with normal size character"); case SUBPIC_CODE_EXT_CLOSED_CAPTION_BIGGER_SIZE: return i18n("Closed caption with bigger size character"); case SUBPIC_CODE_EXT_CLOSED_CAPTION_FOR_CHILDREN: - return i18n("Closed caption for children"); + return i18n("Closed caption for tqchildren"); case SUBPIC_CODE_EXT_FORCED_CAPTION: return i18n("Forced caption"); case SUBPIC_CODE_EXT_DIR_COMMENTS_NORMAL_SIZE: @@ -319,7 +319,7 @@ QString K3bVideoDVD::subPictureCodeExtensionString( int ext ) case SUBPIC_CODE_EXT_DIR_COMMENTS_BIGGER_SIZE: return i18n("Director's comments with bigger size characters"); case SUBPIC_CODE_EXT_DIR_COMMENTS_FOR_CHILDREN: - return i18n("Director's comments for children"); + return i18n("Director's comments for tqchildren"); default: return i18n("unknown code extension"); } diff --git a/libk3b/videodvd/k3bvideodvd.h b/libk3b/videodvd/k3bvideodvd.h index 180a6f5..a3ee19d 100644 --- a/libk3b/videodvd/k3bvideodvd.h +++ b/libk3b/videodvd/k3bvideodvd.h @@ -20,8 +20,8 @@ #include <k3b_export.h> -#include <qstring.h> -#include <qvaluevector.h> +#include <tqstring.h> +#include <tqvaluevector.h> namespace K3bDevice { @@ -65,7 +65,7 @@ namespace K3bVideoDVD bool open( K3bDevice::Device* dev ); K3bDevice::Device* device() const { return m_device; } - const QString& volumeIdentifier() const { return m_volumeIdentifier; } + const TQString& volumeIdentifier() const { return m_volumeIdentifier; } unsigned int numTitles() const { return m_titles.count(); } /** @@ -78,14 +78,14 @@ namespace K3bVideoDVD private: K3bDevice::Device* m_device; - QValueVector<Title> m_titles; - QString m_volumeIdentifier; + TQValueVector<Title> m_titles; + TQString m_volumeIdentifier; }; - LIBK3B_EXPORT QString audioFormatString( int format ); - LIBK3B_EXPORT QString audioCodeExtensionString( int ext ); - LIBK3B_EXPORT QString subPictureCodeModeString( int mode ); - LIBK3B_EXPORT QString subPictureCodeExtensionString( int ext ); + LIBK3B_EXPORT TQString audioFormatString( int format ); + LIBK3B_EXPORT TQString audioCodeExtensionString( int ext ); + LIBK3B_EXPORT TQString subPictureCodeModeString( int mode ); + LIBK3B_EXPORT TQString subPictureCodeExtensionString( int ext ); } #endif diff --git a/libk3b/videodvd/k3bvideodvdaudiostream.h b/libk3b/videodvd/k3bvideodvdaudiostream.h index 78068f0..b5719f9 100644 --- a/libk3b/videodvd/k3bvideodvdaudiostream.h +++ b/libk3b/videodvd/k3bvideodvdaudiostream.h @@ -18,7 +18,7 @@ #include <k3b_export.h> -#include <qstring.h> +#include <tqstring.h> namespace K3bVideoDVD @@ -37,14 +37,14 @@ namespace K3bVideoDVD }; enum AudioQuantization { - AUDIO_QUANTIZATION_16BIT = 0, - AUDIO_QUANTIZATION_20BIT = 1, - AUDIO_QUANTIZATION_24BIT = 2 + AUDIO_TQUANTIZATION_16BIT = 0, + AUDIO_TQUANTIZATION_20BIT = 1, + AUDIO_TQUANTIZATION_24BIT = 2 }; enum AudioSampleFrequency { - AUDIO_SAMPLE_FREQ_48HZ = 0, - AUDIO_SAMPLE_FREQ_96HZ = 1 + AUDIO_SAMPLE_FRETQ_48HZ = 0, + AUDIO_SAMPLE_FRETQ_96HZ = 1 }; enum AudioCodeExtension { @@ -64,7 +64,7 @@ namespace K3bVideoDVD * \return A two chars language code or the empty string * if the language is undefined. */ - const QString& langCode() const { return m_langCode; } + const TQString& langCode() const { return m_langCode; } /** * \see AudioFormat @@ -103,7 +103,7 @@ namespace K3bVideoDVD unsigned short m_codeExtension; bool m_multiChannelExt; unsigned short m_channels:3; - QString m_langCode; + TQString m_langCode; friend class VideoDVD; }; diff --git a/libk3b/videodvd/k3bvideodvdsubpicturestream.h b/libk3b/videodvd/k3bvideodvdsubpicturestream.h index b32407d..c9b6126 100644 --- a/libk3b/videodvd/k3bvideodvdsubpicturestream.h +++ b/libk3b/videodvd/k3bvideodvdsubpicturestream.h @@ -18,7 +18,7 @@ #include <k3b_export.h> -#include <qstring.h> +#include <tqstring.h> namespace K3bVideoDVD @@ -54,11 +54,11 @@ namespace K3bVideoDVD * \return A two chars language code or the empty string * if the language is undefined. */ - const QString& langCode() const { return m_langCode; } + const TQString& langCode() const { return m_langCode; } private: unsigned int m_codeMode:3; - QString m_langCode; + TQString m_langCode; unsigned int m_codeExtension; friend class VideoDVD; diff --git a/libk3b/videodvd/k3bvideodvdtime.cpp b/libk3b/videodvd/k3bvideodvdtime.cpp index acc6aec..93840c5 100644 --- a/libk3b/videodvd/k3bvideodvdtime.cpp +++ b/libk3b/videodvd/k3bvideodvdtime.cpp @@ -76,19 +76,19 @@ double K3bVideoDVD::Time::frameRate() const } -QString K3bVideoDVD::Time::toString( bool includeFrames ) const +TQString K3bVideoDVD::Time::toString( bool includeFrames ) const { // FIXME: use a d-pointer const_cast<K3bVideoDVD::Time*>(this)->makeValid(); if( includeFrames ) - return QString().sprintf( "%02d:%02d:%02d.%02d", + return TQString().sprintf( "%02d:%02d:%02d.%02d", m_hour, m_minute, m_second, m_frame & 0x3f ); else - return QString().sprintf( "%02d:%02d:%02d", + return TQString().sprintf( "%02d:%02d:%02d", m_hour, m_minute, m_second + ( m_frame > 0 ? 1 : 0 ) ); diff --git a/libk3b/videodvd/k3bvideodvdtime.h b/libk3b/videodvd/k3bvideodvdtime.h index f486741..5af771c 100644 --- a/libk3b/videodvd/k3bvideodvdtime.h +++ b/libk3b/videodvd/k3bvideodvdtime.h @@ -18,7 +18,7 @@ #include <k3b_export.h> -#include <qstring.h> +#include <tqstring.h> /** * This should not be confused with K3b::Msf @@ -45,7 +45,7 @@ namespace K3bVideoDVD // FIXME: is this useful? double frameRate() const; - QString toString( bool includeFrames = true ) const; + TQString toString( bool includeFrames = true ) const; private: void makeValid(); diff --git a/libk3b/videodvd/k3bvideodvdtitle.h b/libk3b/videodvd/k3bvideodvdtitle.h index 17f31a3..4872c7b 100644 --- a/libk3b/videodvd/k3bvideodvdtitle.h +++ b/libk3b/videodvd/k3bvideodvdtitle.h @@ -24,7 +24,7 @@ #include <k3bvideodvdsubpicturestream.h> #include <k3bvideodvdptt.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> namespace K3bVideoDVD @@ -85,7 +85,7 @@ namespace K3bVideoDVD /** * \return A video capture */ - // QBitmap videoCapture( const Time& ) const; + // TQBitmap videoCapture( const Time& ) const; private: unsigned int m_titleNum; @@ -98,10 +98,10 @@ namespace K3bVideoDVD Time m_playbackTime; VideoStream m_videoStream; - QValueVector<AudioStream> m_audioStreams; - QValueVector<SubPictureStream> m_subPictureStreams; + TQValueVector<AudioStream> m_audioStreams; + TQValueVector<SubPictureStream> m_subPictureStreams; - QValueVector<PTT> m_ptts; + TQValueVector<PTT> m_ptts; // VideoDVD* m_videoDVD; diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp index 713f7dd..774c59e 100644 --- a/libk3bdevice/k3bcdtext.cpp +++ b/libk3bdevice/k3bcdtext.cpp @@ -20,7 +20,7 @@ #include <k3bdebug.h> -#include <qtextcodec.h> +#include <tqtextcodec.h> #include <string.h> @@ -64,30 +64,30 @@ namespace K3bDevice { cdtext_pack* pack = (cdtext_pack*)data; for( int i = 0; i < dataLen/18; ++i ) { - QString s; - s += QString( " %1 |" ).arg( pack[i].id1, 6, 16 ); - s += QString( " %1 |" ).arg( pack[i].id2, 6 ); - s += QString( " %1 |" ).arg( pack[i].id3, 6 ); - s += QString( " %1 |" ).arg( pack[i].charpos, 6 ); - s += QString( " %1 |" ).arg( pack[i].blocknum, 6 ); - s += QString( " %1 |" ).arg( pack[i].dbcc, 4 ); + TQString s; + s += TQString( " %1 |" ).tqarg( pack[i].id1, 6, 16 ); + s += TQString( " %1 |" ).tqarg( pack[i].id2, 6 ); + s += TQString( " %1 |" ).tqarg( pack[i].id3, 6 ); + s += TQString( " %1 |" ).tqarg( pack[i].charpos, 6 ); + s += TQString( " %1 |" ).tqarg( pack[i].blocknum, 6 ); + s += TQString( " %1 |" ).tqarg( pack[i].dbcc, 4 ); // char str[12]; // sprintf( str, "%c%c%c%c%c%c%c%c%c%c%c%c", -// pack[i].data[0] == '\0' ? '°' : pack[i].data[0], -// pack[i].data[1] == '\0' ? '°' : pack[i].data[1], -// pack[i].data[2] == '\0' ? '°' : pack[i].data[2], -// pack[i].data[3] == '\0' ? '°' : pack[i].data[3], -// pack[i].data[4] == '\0' ? '°' : pack[i].data[4], -// pack[i].data[5] == '\0' ? '°' : pack[i].data[5], -// pack[i].data[6] == '\0' ? '°' : pack[i].data[6], -// pack[i].data[7] == '\0' ? '°' : pack[i].data[7], -// pack[i].data[8] == '\0' ? '°' : pack[i].data[8], -// pack[i].data[9] == '\0' ? '°' : pack[i].data[9], -// pack[i].data[10] == '\0' ? '°' : pack[i].data[10], -// pack[i].data[11] == '\0' ? '°' : pack[i].data[11] ); -// s += QString( " %1 |" ).arg( "'" + QCString(str,13) + "'", 14 ); -// Q_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1]; -// s += QString( " %1 |" ).arg( crc ); +// pack[i].data[0] == '\0' ? '�' : pack[i].data[0], +// pack[i].data[1] == '\0' ? '�' : pack[i].data[1], +// pack[i].data[2] == '\0' ? '�' : pack[i].data[2], +// pack[i].data[3] == '\0' ? '�' : pack[i].data[3], +// pack[i].data[4] == '\0' ? '�' : pack[i].data[4], +// pack[i].data[5] == '\0' ? '�' : pack[i].data[5], +// pack[i].data[6] == '\0' ? '�' : pack[i].data[6], +// pack[i].data[7] == '\0' ? '�' : pack[i].data[7], +// pack[i].data[8] == '\0' ? '�' : pack[i].data[8], +// pack[i].data[9] == '\0' ? '�' : pack[i].data[9], +// pack[i].data[10] == '\0' ? '�' : pack[i].data[10], +// pack[i].data[11] == '\0' ? '�' : pack[i].data[11] ); +// s += TQString( " %1 |" ).tqarg( "'" + TQCString(str,13) + "'", 14 ); +// TQ_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1]; +// s += TQString( " %1 |" ).tqarg( crc ); k3bDebug() << s << endl; } } @@ -102,7 +102,7 @@ K3bDevice::CdText::CdText() K3bDevice::CdText::CdText( const K3bDevice::CdText& text ) - : QValueVector<K3bDevice::TrackCdText>( text ), + : TQValueVector<K3bDevice::TrackCdText>( text ), m_title( text.title() ), m_performer( text.performer() ), m_songwriter( text.songwriter() ), @@ -121,7 +121,7 @@ K3bDevice::CdText::CdText( const unsigned char* data, int len ) } -K3bDevice::CdText::CdText( const QByteArray& b ) +K3bDevice::CdText::CdText( const TQByteArray& b ) { setRawPackData( b ); } @@ -135,7 +135,7 @@ K3bDevice::CdText::CdText( int size ) void K3bDevice::CdText::clear() { - QValueVector<TrackCdText>::clear(); + TQValueVector<TrackCdText>::clear(); m_title.setLength(0); m_performer.setLength(0); @@ -175,7 +175,7 @@ void K3bDevice::CdText::setRawPackData( const unsigned char* data, int len ) pack[i].crc[0] ^= 0xff; pack[i].crc[1] ^= 0xff; - Q_UINT16 crc = calcX25( reinterpret_cast<unsigned char*>(&pack[i]), 18 ); + TQ_UINT16 crc = calcX25( reinterpret_cast<unsigned char*>(&pack[i]), 18 ); pack[i].crc[0] ^= 0xff; pack[i].crc[1] ^= 0xff; @@ -200,11 +200,11 @@ void K3bDevice::CdText::setRawPackData( const unsigned char* data, int len ) resize( trackNo ); char* nextNullPos = (char*)::memchr( nullPos+1, '\0', 11 - (nullPos - (char*)pack[i].data) ); - QString txtstr; + TQString txtstr; if( nextNullPos ) // take all chars up to the next null - txtstr = QString::fromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 ); + txtstr = TQString::tqfromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 ); else // take all chars to the end of the pack data (12 bytes) - txtstr = QString::fromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) ); + txtstr = TQString::tqfromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) ); // // a tab character means to use the same as for the previous track @@ -293,12 +293,12 @@ void K3bDevice::CdText::setRawPackData( const unsigned char* data, int len ) } -void K3bDevice::CdText::setRawPackData( const QByteArray& b ) +void K3bDevice::CdText::setRawPackData( const TQByteArray& b ) { setRawPackData( reinterpret_cast<const unsigned char*>(b.data()), b.size() ); } -QByteArray K3bDevice::CdText::rawPackData() const +TQByteArray K3bDevice::CdText::rawPackData() const { // FIXME: every pack block may only consist of up to 255 packs. @@ -321,7 +321,7 @@ QByteArray K3bDevice::CdText::rawPackData() const // // create the CD-Text packs // - QByteArray data(0); + TQByteArray data(0); for( int i = 0; i <= 6; ++i ) { if( textLengthForPackType( 0x80 | i ) ) { appendByteArray( data, createPackData( 0x80 | i, pc ) ); @@ -358,7 +358,7 @@ QByteArray K3bDevice::CdText::rawPackData() const // // add MMC header // - QByteArray a( 4 ); + TQByteArray a( 4 ); a[0] = (data.size()+2)>>8 & 0xff; a[1] = (data.size()+2) & 0xff; a[2] = a[3] = 0; @@ -368,7 +368,7 @@ QByteArray K3bDevice::CdText::rawPackData() const } -void K3bDevice::CdText::appendByteArray( QByteArray& a, const QByteArray& b ) const +void K3bDevice::CdText::appendByteArray( TQByteArray& a, const TQByteArray& b ) const { unsigned int oldSize = a.size(); a.resize( oldSize + b.size() ); @@ -377,11 +377,11 @@ void K3bDevice::CdText::appendByteArray( QByteArray& a, const QByteArray& b ) co // this method also creates completely empty packs -QByteArray K3bDevice::CdText::createPackData( int packType, unsigned int& packCount ) const +TQByteArray K3bDevice::CdText::createPackData( int packType, unsigned int& packCount ) const { - QByteArray data; + TQByteArray data; unsigned int dataFill = 0; - QCString text = encodeCdText( textForPackType( packType, 0 ) ); + TQCString text = encodeCdText( textForPackType( packType, 0 ) ); unsigned int currentTrack = 0; unsigned int textPos = 0; unsigned int packPos = 0; @@ -401,7 +401,7 @@ QByteArray K3bDevice::CdText::createPackData( int packType, unsigned int& packCo // // Copy as many bytes as possible into the pack // - int copyBytes = QMIN( 12-packPos, text.length()-textPos ); + int copyBytes = TQMIN( 12-packPos, text.length()-textPos ); ::memcpy( reinterpret_cast<char*>(&pack.data[packPos]), &text.data()[textPos], copyBytes ); textPos += copyBytes; packPos += copyBytes; @@ -457,10 +457,10 @@ QByteArray K3bDevice::CdText::createPackData( int packType, unsigned int& packCo } -void K3bDevice::CdText::savePack( cdtext_pack* pack, QByteArray& data, unsigned int& dataFill ) const +void K3bDevice::CdText::savePack( cdtext_pack* pack, TQByteArray& data, unsigned int& dataFill ) const { // create CRC - Q_UINT16 crc = calcX25( reinterpret_cast<unsigned char*>(pack), sizeof(cdtext_pack)-2 ); + TQ_UINT16 crc = calcX25( reinterpret_cast<unsigned char*>(pack), sizeof(cdtext_pack)-2 ); // invert for Redbook compliance crc ^= 0xffff; @@ -471,7 +471,7 @@ void K3bDevice::CdText::savePack( cdtext_pack* pack, QByteArray& data, unsigned // append the pack to data if( data.size() < dataFill + sizeof(cdtext_pack) ) - data.resize( dataFill + sizeof(cdtext_pack), QGArray::SpeedOptim ); + data.tqresize( dataFill + sizeof(cdtext_pack), TQGArray::SpeedOptim ); ::memcpy( &data.data()[dataFill], reinterpret_cast<char*>( pack ), sizeof(cdtext_pack) ); @@ -480,7 +480,7 @@ void K3bDevice::CdText::savePack( cdtext_pack* pack, QByteArray& data, unsigned // track 0 means global cdtext -const QString& K3bDevice::CdText::textForPackType( int packType, unsigned int track ) const +const TQString& K3bDevice::CdText::textForPackType( int packType, unsigned int track ) const { switch( packType ) { default: @@ -524,7 +524,7 @@ const QString& K3bDevice::CdText::textForPackType( int packType, unsigned int tr if( track == 0 ) return discId(); else - return QString::null; + return TQString(); // case 0x87: // if( track == 0 ) @@ -551,19 +551,19 @@ unsigned int K3bDevice::CdText::textLengthForPackType( int packType ) const } -QCString K3bDevice::encodeCdText( const QString& s, bool* illegalChars ) +TQCString K3bDevice::encodeCdText( const TQString& s, bool* illegalChars ) { if( illegalChars ) *illegalChars = false; // TODO: do this without QT - QTextCodec* codec = QTextCodec::codecForName("ISO8859-1"); + TQTextCodec* codec = TQTextCodec::codecForName("ISO8859-1"); if( codec ) { - QCString encoded = codec->fromUnicode( s ); + TQCString encoded = codec->fromUnicode( s ); return encoded; } else { - QCString r(s.length()+1); + TQCString r(s.length()+1); for( unsigned int i = 0; i < s.length(); ++i ) { if( s[i].latin1() == 0 ) { // non-ASCII character @@ -580,7 +580,7 @@ QCString K3bDevice::encodeCdText( const QString& s, bool* illegalChars ) } -bool K3bDevice::CdText::checkCrc( const QByteArray& rawData ) +bool K3bDevice::CdText::checkCrc( const TQByteArray& rawData ) { return checkCrc( reinterpret_cast<const unsigned char*>(rawData.data()), rawData.size() ); } @@ -675,7 +675,7 @@ bool K3bDevice::CdText::operator==( const K3bDevice::CdText& other ) const m_message == other.m_message && m_discId == other.m_discId && m_upcEan == other.m_upcEan && - QValueVector<TrackCdText>::operator==( other ) ); + TQValueVector<TrackCdText>::operator==( other ) ); } diff --git a/libk3bdevice/k3bcdtext.h b/libk3bdevice/k3bcdtext.h index 10f6c82..dd78d5e 100644 --- a/libk3bdevice/k3bcdtext.h +++ b/libk3bdevice/k3bcdtext.h @@ -17,8 +17,8 @@ #ifndef _K3B_CDTEXT_H_ #define _K3B_CDTEXT_H_ -#include <qstring.h> -#include <qvaluevector.h> +#include <tqstring.h> +#include <tqvaluevector.h> #include "k3bdevice_export.h" namespace K3bDevice @@ -43,22 +43,22 @@ namespace K3bDevice m_isrc.truncate(0); } - const QString& title() const { return m_title; } - const QString& performer() const { return m_performer; } - const QString& songwriter() const { return m_songwriter; } - const QString& composer() const { return m_composer; } - const QString& arranger() const { return m_arranger; } - const QString& message() const { return m_message; } - const QString& isrc() const { return m_isrc; } + const TQString& title() const { return m_title; } + const TQString& performer() const { return m_performer; } + const TQString& songwriter() const { return m_songwriter; } + const TQString& composer() const { return m_composer; } + const TQString& arranger() const { return m_arranger; } + const TQString& message() const { return m_message; } + const TQString& isrc() const { return m_isrc; } // TODO: use the real CD-TEXT charset (a modified ISO8859-1) - void setTitle( const QString& s ) { m_title = s; fixup(m_title); } - void setPerformer( const QString& s ) { m_performer = s; fixup(m_performer); } - void setSongwriter( const QString& s ) { m_songwriter = s; fixup(m_songwriter); } - void setComposer( const QString& s ) { m_composer = s; fixup(m_composer); } - void setArranger( const QString& s ) { m_arranger = s; fixup(m_arranger); } - void setMessage( const QString& s ) { m_message = s; fixup(m_message); } - void setIsrc( const QString& s ) { m_isrc = s; fixup(m_isrc); } + void setTitle( const TQString& s ) { m_title = s; fixup(m_title); } + void setPerformer( const TQString& s ) { m_performer = s; fixup(m_performer); } + void setSongwriter( const TQString& s ) { m_songwriter = s; fixup(m_songwriter); } + void setComposer( const TQString& s ) { m_composer = s; fixup(m_composer); } + void setArranger( const TQString& s ) { m_arranger = s; fixup(m_arranger); } + void setMessage( const TQString& s ) { m_message = s; fixup(m_message); } + void setIsrc( const TQString& s ) { m_isrc = s; fixup(m_isrc); } bool isEmpty() const { if( !m_title.isEmpty() ) @@ -84,34 +84,34 @@ namespace K3bDevice private: // TODO: remove this (see above) - void fixup( QString& s ) { s.replace( '/', "_" ); s.replace( '\"', "_" ); } + void fixup( TQString& s ) { s.tqreplace( '/', "_" ); s.tqreplace( '\"', "_" ); } - QString m_title; - QString m_performer; - QString m_songwriter; - QString m_composer; - QString m_arranger; - QString m_message; - QString m_isrc; + TQString m_title; + TQString m_performer; + TQString m_songwriter; + TQString m_composer; + TQString m_arranger; + TQString m_message; + TQString m_isrc; friend class CdText; }; - class LIBK3BDEVICE_EXPORT CdText : public QValueVector<TrackCdText> + class LIBK3BDEVICE_EXPORT CdText : public TQValueVector<TrackCdText> { friend class Device; public: CdText(); CdText( const unsigned char* data, int len ); - CdText( const QByteArray& ); + CdText( const TQByteArray& ); CdText( int size ); CdText( const CdText& ); void setRawPackData( const unsigned char*, int ); - void setRawPackData( const QByteArray& ); + void setRawPackData( const TQByteArray& ); - QByteArray rawPackData() const; + TQByteArray rawPackData() const; bool empty() const { if( !m_title.isEmpty() ) @@ -144,24 +144,24 @@ namespace K3bDevice void clear(); - const QString& title() const { return m_title; } - const QString& performer() const { return m_performer; } - const QString& songwriter() const { return m_songwriter; } - const QString& composer() const { return m_composer; } - const QString& arranger() const { return m_arranger; } - const QString& message() const { return m_message; } - const QString& discId() const { return m_discId; } - const QString& upcEan() const { return m_upcEan; } + const TQString& title() const { return m_title; } + const TQString& performer() const { return m_performer; } + const TQString& songwriter() const { return m_songwriter; } + const TQString& composer() const { return m_composer; } + const TQString& arranger() const { return m_arranger; } + const TQString& message() const { return m_message; } + const TQString& discId() const { return m_discId; } + const TQString& upcEan() const { return m_upcEan; } // TODO: use the real CD-TEXT charset (a modified ISO8859-1) - void setTitle( const QString& s ) { m_title = s; fixup(m_title); } - void setPerformer( const QString& s ) { m_performer = s; fixup(m_performer); } - void setSongwriter( const QString& s ) { m_songwriter = s; fixup(m_songwriter); } - void setComposer( const QString& s ) { m_composer = s; fixup(m_composer); } - void setArranger( const QString& s ) { m_arranger = s; fixup(m_arranger); } - void setMessage( const QString& s ) { m_message = s; fixup(m_message); } - void setDiscId( const QString& s ) { m_discId = s; fixup(m_discId); } - void setUpcEan( const QString& s ) { m_upcEan = s; fixup(m_upcEan); } + void setTitle( const TQString& s ) { m_title = s; fixup(m_title); } + void setPerformer( const TQString& s ) { m_performer = s; fixup(m_performer); } + void setSongwriter( const TQString& s ) { m_songwriter = s; fixup(m_songwriter); } + void setComposer( const TQString& s ) { m_composer = s; fixup(m_composer); } + void setArranger( const TQString& s ) { m_arranger = s; fixup(m_arranger); } + void setMessage( const TQString& s ) { m_message = s; fixup(m_message); } + void setDiscId( const TQString& s ) { m_discId = s; fixup(m_discId); } + void setUpcEan( const TQString& s ) { m_upcEan = s; fixup(m_upcEan); } void debug() const; @@ -170,32 +170,32 @@ namespace K3bDevice * wrong length. */ static bool checkCrc( const unsigned char*, int ); - static bool checkCrc( const QByteArray& ); + static bool checkCrc( const TQByteArray& ); bool operator==( const CdText& ) const; bool operator!=( const CdText& ) const; private: // TODO: remove this (see above) - void fixup( QString& s ) { s.replace( '/', "_" ); s.replace( '\"', "_" ); } + void fixup( TQString& s ) { s.tqreplace( '/', "_" ); s.tqreplace( '\"', "_" ); } - const QString& textForPackType( int packType, unsigned int track ) const; + const TQString& textForPackType( int packType, unsigned int track ) const; unsigned int textLengthForPackType( int packType ) const; - QByteArray createPackData( int packType, unsigned int& ) const; - void savePack( cdtext_pack* pack, QByteArray& data, unsigned int& dataFill ) const; - void appendByteArray( QByteArray& a, const QByteArray& b ) const; - - QString m_title; - QString m_performer; - QString m_songwriter; - QString m_composer; - QString m_arranger; - QString m_message; - QString m_discId; - QString m_upcEan; + TQByteArray createPackData( int packType, unsigned int& ) const; + void savePack( cdtext_pack* pack, TQByteArray& data, unsigned int& dataFill ) const; + void appendByteArray( TQByteArray& a, const TQByteArray& b ) const; + + TQString m_title; + TQString m_performer; + TQString m_songwriter; + TQString m_composer; + TQString m_arranger; + TQString m_message; + TQString m_discId; + TQString m_upcEan; }; - QCString encodeCdText( const QString& s, bool* illegalChars = 0 ); + TQCString encodeCdText( const TQString& s, bool* illegalChars = 0 ); } #endif diff --git a/libk3bdevice/k3bcrc.cpp b/libk3bdevice/k3bcrc.cpp index f533ae7..e382f9b 100644 --- a/libk3bdevice/k3bcrc.cpp +++ b/libk3bdevice/k3bcrc.cpp @@ -18,7 +18,7 @@ #include <k3bdebug.h> -static Q_UINT16 g_x25Table[1<<8] = { +static TQ_UINT16 g_x25Table[1<<8] = { 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, @@ -54,7 +54,7 @@ static Q_UINT16 g_x25Table[1<<8] = { }; -Q_UINT16 K3bDevice::calcX25( unsigned char* message, unsigned int len, Q_UINT16 crc ) +TQ_UINT16 K3bDevice::calcX25( unsigned char* message, unsigned int len, TQ_UINT16 crc ) { while( len-- ) { crc = (crc<<8) ^ g_x25Table[(crc>>8) ^ (*message++)]; @@ -64,13 +64,13 @@ Q_UINT16 K3bDevice::calcX25( unsigned char* message, unsigned int len, Q_UINT16 } -bool K3bDevice::checkQCrc( unsigned char* subdata ) +bool K3bDevice::checkTQCrc( unsigned char* subdata ) { // Red Book for some reason inverts the CRC bytes subdata[10] ^= 0xff; subdata[11] ^= 0xff; - Q_UINT16 crc = calcX25( subdata, 12 ); + TQ_UINT16 crc = calcX25( subdata, 12 ); // correct the data subdata[10] ^= 0xff; diff --git a/libk3bdevice/k3bcrc.h b/libk3bdevice/k3bcrc.h index ee7d6a6..a352db3 100644 --- a/libk3bdevice/k3bcrc.h +++ b/libk3bdevice/k3bcrc.h @@ -16,7 +16,7 @@ #ifndef _K3B_CRC_H_ #define _K3B_CRC_H_ -#include <qglobal.h> +#include <tqglobal.h> namespace K3bDevice { @@ -24,12 +24,12 @@ namespace K3bDevice // bool check( unsigned char* message, unsigned int len, unsigned char* crc, unsigned int crcLen ); - Q_UINT16 calcX25( unsigned char* message, unsigned int len, Q_UINT16 start = 0x0000 ); + TQ_UINT16 calcX25( unsigned char* message, unsigned int len, TQ_UINT16 start = 0x0000 ); /** * subdata is 12 bytes in long. */ - bool checkQCrc( unsigned char* subdata ); + bool checkTQCrc( unsigned char* subdata ); }; #endif diff --git a/libk3bdevice/k3bdebug.cpp b/libk3bdevice/k3bdebug.cpp index 40774aa..56dc1a0 100644 --- a/libk3bdevice/k3bdebug.cpp +++ b/libk3bdevice/k3bdebug.cpp @@ -84,14 +84,14 @@ K3bDebug& K3bDebug::operator<<( double d ) } -K3bDebug& K3bDebug::operator<<( const QString& s ) +K3bDebug& K3bDebug::operator<<( const TQString& s ) { fprintf( stderr, "%s", s.utf8().data() ); return *this; } -K3bDebug& K3bDebug::operator<<( const QCString& s ) +K3bDebug& K3bDebug::operator<<( const TQCString& s ) { fprintf( stderr, "%s", s.data() ); return *this; diff --git a/libk3bdevice/k3bdebug.h b/libk3bdevice/k3bdebug.h index 8bdd374..a1500ff 100644 --- a/libk3bdevice/k3bdebug.h +++ b/libk3bdevice/k3bdebug.h @@ -17,7 +17,7 @@ #ifndef _K3B_DEBUG_H_ #define _K3B_DEBUG_H_ -#include <qstring.h> +#include <tqstring.h> #include <k3bmsf.h> #include <k3bdevice_export.h> @@ -44,8 +44,8 @@ class LIBK3BDEVICE_EXPORT K3bDebug K3bDebug& operator<<( char ); K3bDebug& operator<<( float ); K3bDebug& operator<<( double ); - K3bDebug& operator<<( const QString& ); - K3bDebug& operator<<( const QCString& ); + K3bDebug& operator<<( const TQString& ); + K3bDebug& operator<<( const TQCString& ); K3bDebug& operator<<( const char* ); K3bDebug& operator<<( const K3b::Msf& ); diff --git a/libk3bdevice/k3bdevice.cpp b/libk3bdevice/k3bdevice.cpp index 45ba7bf..29e7dbe 100644 --- a/libk3bdevice/k3bdevice.cpp +++ b/libk3bdevice/k3bdevice.cpp @@ -25,11 +25,11 @@ #include "k3bscsicommand.h" #include "k3bcrc.h" -#include <qstringlist.h> -#include <qfile.h> -#include <qglobal.h> -#include <qvaluevector.h> -#include <qmutex.h> +#include <tqstringlist.h> +#include <tqfile.h> +#include <tqglobal.h> +#include <tqvaluevector.h> +#include <tqmutex.h> #include <k3bdebug.h> @@ -162,7 +162,7 @@ public: int readCapabilities; int writeCapabilities; int supportedProfiles; - QStringList allNodes; + TQStringList allNodes; #ifdef Q_OS_LINUX int deviceFd; #endif @@ -175,12 +175,12 @@ public: bool openedReadWrite; bool burnfree; - QMutex mutex; - QMutex openCloseMutex; + TQMutex mutex; + TQMutex openCloseMutex; }; -K3bDevice::Device::Device( const QString& devname ) +K3bDevice::Device::Device( const TQString& devname ) : m_bus(-1), m_target(-1), m_lun(-1), @@ -231,7 +231,7 @@ bool K3bDevice::Device::init( bool bCheckWritingModes ) cmd.clear(); ::memset( buf, 0, sizeof(buf) ); struct inquiry* inq = (struct inquiry*)buf; - cmd[0] = MMC_INQUIRY; + cmd[0] = MMC_INTQUIRY; cmd[4] = sizeof(buf); cmd[5] = 0; if( cmd.transport( TR_DIR_READ, buf, sizeof(buf) ) ) { @@ -240,9 +240,9 @@ bool K3bDevice::Device::init( bool bCheckWritingModes ) return false; } else { - m_vendor = QString::fromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace(); - m_description = QString::fromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace(); - m_version = QString::fromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace(); + m_vendor = TQString::tqfromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace(); + m_description = TQString::tqfromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace(); + m_version = TQString::tqfromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace(); } if( m_vendor.isEmpty() ) @@ -555,15 +555,15 @@ int K3bDevice::Device::writeCapabilities() const } -const QString& K3bDevice::Device::devicename() const +const TQString& K3bDevice::Device::devicename() const { return blockDeviceName(); } -QString K3bDevice::Device::busTargetLun() const +TQString K3bDevice::Device::busTargetLun() const { - return QString("%1,%2,%3").arg(m_bus).arg(m_target).arg(m_lun); + return TQString("%1,%2,%3").tqarg(m_bus).tqarg(m_target).tqarg(m_lun); } @@ -843,7 +843,7 @@ K3bDevice::Toc K3bDevice::Device::readToc() const void K3bDevice::Device::readIsrcMcn( K3bDevice::Toc& toc ) const { // read MCN and ISRC of all tracks - QCString mcn; + TQCString mcn; if( readMcn( mcn ) ) { toc.setMcn( mcn ); k3bDebug() << "(K3bDevice::Device) found MCN: " << mcn << endl; @@ -852,7 +852,7 @@ void K3bDevice::Device::readIsrcMcn( K3bDevice::Toc& toc ) const k3bDebug() << "(K3bDevice::Device) no MCN found." << endl; for( unsigned int i = 1; i <= toc.count(); ++i ) { - QCString isrc; + TQCString isrc; if( toc[i-1].type() == Track::AUDIO ) { if( readIsrc( i, isrc ) ) { k3bDebug() << "(K3bDevice::Device) found ISRC for track " << i << ": " << isrc << endl; @@ -1055,19 +1055,19 @@ bool K3bDevice::Device::readRawToc( K3bDevice::Toc& toc ) const // k3bDebug() << "Session | ADR | CONTROL| TNO | POINT | Min | Sec | Frame | Zero | PMIN | PSEC | PFRAME |" << endl; for( unsigned int i = 0; i < (dataLen-4)/(int)sizeof(toc_raw_track_descriptor); ++i ) { - QString s; - s += QString( " %1 |" ).arg( (int)tr[i].session_number, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].adr, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].control, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].tno, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].point, 6, 16 ); - s += QString( " %1 |" ).arg( (int)tr[i].min, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].sec, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].frame, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].zero, 6, 16 ); - s += QString( " %1 |" ).arg( (int)tr[i].p_min, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].p_sec, 6 ); - s += QString( " %1 |" ).arg( (int)tr[i].p_frame, 6 ); + TQString s; + s += TQString( " %1 |" ).tqarg( (int)tr[i].session_number, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].adr, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].control, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].tno, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].point, 6, 16 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].min, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].sec, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].frame, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].zero, 6, 16 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].p_min, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].p_sec, 6 ); + s += TQString( " %1 |" ).tqarg( (int)tr[i].p_frame, 6 ); k3bDebug() << s << endl; } @@ -1649,14 +1649,14 @@ bool K3bDevice::Device::setAutoEjectEnabled( bool enabled ) const } -void K3bDevice::Device::addDeviceNode( const QString& n ) +void K3bDevice::Device::addDeviceNode( const TQString& n ) { - if( !d->allNodes.contains( n ) ) + if( !d->allNodes.tqcontains( n ) ) d->allNodes.append( n ); } -const QStringList& K3bDevice::Device::deviceNodes() const +const TQStringList& K3bDevice::Device::deviceNodes() const { return d->allNodes; } @@ -1677,7 +1677,7 @@ bool K3bDevice::Device::open( bool write ) const if( d->openedReadWrite != write ) close(); - QMutexLocker ml( &d->openCloseMutex ); + TQMutexLocker ml( &d->openCloseMutex ); d->openedReadWrite = write; @@ -1692,7 +1692,7 @@ bool K3bDevice::Device::open( bool write ) const #endif #if defined(Q_OS_LINUX) || defined(Q_OS_NETBSD) if( d->deviceFd == -1 ) - d->deviceFd = openDevice( QFile::encodeName(devicename()), write ); + d->deviceFd = openDevice( TQFile::encodeName(devicename()), write ); return ( d->deviceFd != -1 ); #endif @@ -1701,7 +1701,7 @@ bool K3bDevice::Device::open( bool write ) const void K3bDevice::Device::close() const { - QMutexLocker ml( &d->openCloseMutex ); + TQMutexLocker ml( &d->openCloseMutex ); #ifdef Q_OS_FREEBSD if( d->cam ) { @@ -1967,24 +1967,24 @@ K3bDevice::DiskInfo K3bDevice::Device::diskInfo() const ea0 = ( data[4+13]<<16 | data[4+14] << 8 | data[4+15] ); k3bDebug() << "First sec data area: " << sda.toString() - << " (LBA " << QString::number(sda.lba()) - << ") (" << QString::number(sda.mode1Bytes()) << endl; + << " (LBA " << TQString::number(sda.lba()) + << ") (" << TQString::number(sda.mode1Bytes()) << endl; k3bDebug() << "Last sec data area: " << eda.toString() - << " (LBA " << QString::number(eda.lba()) - << ") (" << QString::number(eda.mode1Bytes()) << " Bytes)" << endl; + << " (LBA " << TQString::number(eda.lba()) + << ") (" << TQString::number(eda.mode1Bytes()) << " Bytes)" << endl; k3bDebug() << "Last sec layer 1: " << ea0.toString() - << " (LBA " << QString::number(ea0.lba()) - << ") (" << QString::number(ea0.mode1Bytes()) << " Bytes)" << endl; + << " (LBA " << TQString::number(ea0.lba()) + << ") (" << TQString::number(ea0.mode1Bytes()) << " Bytes)" << endl; K3b::Msf da0 = ea0 - sda + 1; K3b::Msf da1 = eda - ea0; k3bDebug() << "Layer 1 length: " << da0.toString() - << " (LBA " << QString::number(da0.lba()) - << ") (" << QString::number(da0.mode1Bytes()) << " Bytes)" << endl; + << " (LBA " << TQString::number(da0.lba()) + << ") (" << TQString::number(da0.mode1Bytes()) << " Bytes)" << endl; k3bDebug() << "Layer 2 length: " << da1.toString() - << " (LBA " << QString::number(da1.lba()) - << ") (" << QString::number(da1.mode1Bytes()) << " Bytes)" << endl; + << " (LBA " << TQString::number(da1.lba()) + << ") (" << TQString::number(da1.mode1Bytes()) << " Bytes)" << endl; inf.m_numLayers = ((data[6]&0x60) == 0 ? 1 : 2); @@ -2294,7 +2294,7 @@ int K3bDevice::Device::mediaType() const case 0xA0: m = MEDIA_DVD_PLUS_R; break; case 0xE0: m = MEDIA_DVD_PLUS_R_DL; break; default: - k3bDebug() << "(K3bDevice::Device) unknown dvd media type: " << QString::number(data[4]&0xF0, 8) << endl; + k3bDebug() << "(K3bDevice::Device) unknown dvd media type: " << TQString::number(data[4]&0xF0, 8) << endl; break; // unknown } @@ -3089,10 +3089,10 @@ int K3bDevice::Device::determineMaximalWriteSpeed() const } } - QValueList<int> list = determineSupportedWriteSpeeds(); + TQValueList<int> list = determineSupportedWriteSpeeds(); if( !list.isEmpty() ) { - for( QValueList<int>::const_iterator it = list.constBegin(); it != list.constEnd(); ++it ) - ret = QMAX( ret, *it ); + for( TQValueList<int>::const_iterator it = list.constBegin(); it != list.constEnd(); ++it ) + ret = TQMAX( ret, *it ); } if( ret > 0 ) @@ -3102,9 +3102,9 @@ int K3bDevice::Device::determineMaximalWriteSpeed() const } -QValueList<int> K3bDevice::Device::determineSupportedWriteSpeeds() const +TQValueList<int> K3bDevice::Device::determineSupportedWriteSpeeds() const { - QValueList<int> ret; + TQValueList<int> ret; if( burner() ) { // @@ -3148,7 +3148,7 @@ QValueList<int> K3bDevice::Device::determineSupportedWriteSpeeds() const } -bool K3bDevice::Device::getSupportedWriteSpeedsVia2A( QValueList<int>& list, bool dvd ) const +bool K3bDevice::Device::getSupportedWriteSpeedsVia2A( TQValueList<int>& list, bool dvd ) const { unsigned char* data = 0; unsigned int dataLen = 0; @@ -3194,7 +3194,7 @@ bool K3bDevice::Device::getSupportedWriteSpeedsVia2A( QValueList<int>& list, boo s = fixupDvdWritingSpeed( s ); // sort the list - QValueList<int>::iterator it = list.begin(); + TQValueList<int>::iterator it = list.begin(); while( it != list.end() && *it < s ) ++it; list.insert( it, s ); @@ -3209,7 +3209,7 @@ bool K3bDevice::Device::getSupportedWriteSpeedsVia2A( QValueList<int>& list, boo } -bool K3bDevice::Device::getSupportedWriteSpeedsViaGP( QValueList<int>& list, bool dvd ) const +bool K3bDevice::Device::getSupportedWriteSpeedsViaGP( TQValueList<int>& list, bool dvd ) const { unsigned char* data = 0; unsigned int dataLen = 0; @@ -3243,7 +3243,7 @@ bool K3bDevice::Device::getSupportedWriteSpeedsViaGP( QValueList<int>& list, boo if( dvd ) s = fixupDvdWritingSpeed( s ); - QValueList<int>::iterator it = list.begin(); + TQValueList<int>::iterator it = list.begin(); while( it != list.end() && *it < s ) ++it; // the speed might already have been found in the 2a modepage @@ -3578,9 +3578,9 @@ int K3bDevice::Device::nextWritableAddress() const } -QCString K3bDevice::Device::mediaId( int mediaType ) const +TQCString K3bDevice::Device::mediaId( int mediaType ) const { - QCString id; + TQCString id; if( mediaType & MEDIA_CD_ALL ) { // FIXME: diff --git a/libk3bdevice/k3bdevice.h b/libk3bdevice/k3bdevice.h index 1dcd863..9f564ee 100644 --- a/libk3bdevice/k3bdevice.h +++ b/libk3bdevice/k3bdevice.h @@ -17,9 +17,9 @@ #ifndef K3BDEVICE_H #define K3BDEVICE_H -#include <qstringlist.h> -#include <qvaluelist.h> -#include <qglobal.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> +#include <tqglobal.h> #include <k3bdevicetypes.h> #include <k3bdiskinfo.h> @@ -95,17 +95,17 @@ namespace K3bDevice /** * \return Vendor string as reported by the device's firmware. */ - const QString& vendor() const { return m_vendor; } + const TQString& vendor() const { return m_vendor; } /** * \return Description string as reported by the device's firmware. */ - const QString& description() const { return m_description; } + const TQString& description() const { return m_description; } /** * \return Version string as reported by the device's firmware. */ - const QString& version() const { return m_version; } + const TQString& version() const { return m_version; } /** * Shortcut for \code writesCd() || writesDvd() \endcode @@ -207,13 +207,13 @@ namespace K3bDevice /** * @return the corresponding device name. */ - const QString& devicename() const; + const TQString& devicename() const; /** * for SCSI devices this should be something like /dev/scd0 or /dev/sr0 * for IDE device this should be something like /dev/hdb1 */ - const QString& blockDeviceName() const { return m_blockDevice; } + const TQString& blockDeviceName() const { return m_blockDevice; } /** * This is only valid for SCSI devices. Without devfs it's something @@ -222,24 +222,24 @@ namespace K3bDevice * This is not needed in K3b at all. But cdrecord and cdrdao use the sg devices and * we need it to fixup it's permissions in K3bSetup. */ - const QString& genericDevice() const { return m_genericDevice; } + const TQString& genericDevice() const { return m_genericDevice; } /** * \return All device nodes for this drive. */ - const QStringList& deviceNodes() const; + const TQStringList& deviceNodes() const; /** * \see K3bDevice::Device::deviceNodes() */ - void addDeviceNode( const QString& ); + void addDeviceNode( const TQString& ); /** * Makes only sense to use with scsi devices * @return a string for use with the cdrtools * @deprecated */ - QString busTargetLun() const; + TQString busTargetLun() const; int scsiBus() const { return m_bus; } int scsiId() const { return m_target; } @@ -250,7 +250,7 @@ namespace K3bDevice /** * \deprecated the cdrdao driver has no place in this library. It will be removed. */ - const QString& cdrdaoDriver() const { return m_cdrdaoDriver; } + const TQString& cdrdaoDriver() const { return m_cdrdaoDriver; } /** * returns: 0 auto (no cdrdao-driver selected) @@ -281,7 +281,7 @@ namespace K3bDevice * Use this if cdrdao is not able to autodetect the nessessary driver. * \deprecated the cdrdao driver has no place in this library. It will be removed. */ - void setCdrdaoDriver( const QString& d ) { m_cdrdaoDriver = d; } + void setCdrdaoDriver( const TQString& d ) { m_cdrdaoDriver = d; } /** * Only used if the cdrdao-driver is NOT set to "auto". @@ -443,7 +443,7 @@ namespace K3bDevice * * This only works with MMC3 compliant drives. */ - QValueList<int> determineSupportedWriteSpeeds() const; + TQValueList<int> determineSupportedWriteSpeeds() const; /** * @returnes the speed in kb/s or 0 on failure. @@ -558,7 +558,7 @@ namespace K3bDevice * if true is returned dataLen specifies the actual length of *data which needs to be * deleted after using. */ - bool mechanismStatus( unsigned char** data, unsigned int& dataLen ) const; + bool mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const; /** * Read a single feature. @@ -669,9 +669,9 @@ namespace K3bDevice unsigned int subchannelParam, unsigned int trackNumber ) const; - bool readIsrc( unsigned int track, QCString& isrc ) const; + bool readIsrc( unsigned int track, TQCString& isrc ) const; - bool readMcn( QCString& mcn ) const; + bool readMcn( TQCString& mcn ) const; /** * MMC command Read Buffer Capacity @@ -761,7 +761,7 @@ namespace K3bDevice /** * A Device can only be constructed the the DeviceManager. */ - Device( const QString& devname ); + Device( const TQString& devname ); /** * Determines the device's capabilities. This needs to be called once before @@ -787,15 +787,15 @@ namespace K3bDevice */ int rawTocDataWithBcdValues( unsigned char* data, unsigned int dataLen ) const; - bool getSupportedWriteSpeedsVia2A( QValueList<int>& list, bool dvd ) const; - bool getSupportedWriteSpeedsViaGP( QValueList<int>& list, bool dvd ) const; + bool getSupportedWriteSpeedsVia2A( TQValueList<int>& list, bool dvd ) const; + bool getSupportedWriteSpeedsViaGP( TQValueList<int>& list, bool dvd ) const; - QCString mediaId( int mediaType ) const; + TQCString mediaId( int mediaType ) const; - QString m_vendor; - QString m_description; - QString m_version; - QString m_cdrdaoDriver; + TQString m_vendor; + TQString m_description; + TQString m_version; + TQString m_cdrdaoDriver; int m_cdTextCapable; int m_maxReadSpeed; int m_maxWriteSpeed; @@ -813,9 +813,9 @@ namespace K3bDevice int m_writeModes; // only needed on FreeBSD - QString m_passDevice; - QString m_blockDevice; - QString m_genericDevice; + TQString m_passDevice; + TQString m_blockDevice; + TQString m_genericDevice; class Private; Private* d; diff --git a/libk3bdevice/k3bdevice_mmc.cpp b/libk3bdevice/k3bdevice_mmc.cpp index 77db530..f4258ae 100644 --- a/libk3bdevice/k3bdevice_mmc.cpp +++ b/libk3bdevice/k3bdevice_mmc.cpp @@ -74,7 +74,7 @@ bool K3bDevice::Device::getFeature( unsigned char** data, unsigned int& dataLen, cmd[7] = dataLen>>8; cmd[8] = dataLen; if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) { - dataLen = QMIN( dataLen, from4Byte( *data ) + 4 ); + dataLen = TQMIN( dataLen, from4Byte( *data ) + 4 ); return true; } else { @@ -105,7 +105,7 @@ int K3bDevice::Device::featureCurrent( unsigned int feature ) const } -bool K3bDevice::Device::readIsrc( unsigned int track, QCString& isrc ) const +bool K3bDevice::Device::readIsrc( unsigned int track, TQCString& isrc ) const { unsigned char* data = 0; unsigned int dataLen = 0; @@ -117,7 +117,7 @@ bool K3bDevice::Device::readIsrc( unsigned int track, QCString& isrc ) const isrcValid = (data[8+4]>>7 & 0x1); if( isrcValid ) { - isrc = QCString( reinterpret_cast<char*>(data[8+5]), 13 ); + isrc = TQCString( reinterpret_cast<char*>(data[8+5]), 13 ); // TODO: check the range of the chars @@ -133,7 +133,7 @@ bool K3bDevice::Device::readIsrc( unsigned int track, QCString& isrc ) const } -bool K3bDevice::Device::readMcn( QCString& mcn ) const +bool K3bDevice::Device::readMcn( TQCString& mcn ) const { unsigned char* data = 0; unsigned int dataLen = 0; @@ -145,7 +145,7 @@ bool K3bDevice::Device::readMcn( QCString& mcn ) const mcnValid = (data[8+4]>>7 & 0x1); if( mcnValid ) - mcn = QCString( reinterpret_cast<char*>(data[8+5]), 14 ); + mcn = TQCString( reinterpret_cast<char*>(data[8+5]), 14 ); } delete [] data; @@ -227,7 +227,7 @@ bool K3bDevice::Device::getPerformance( unsigned char** data, unsigned int& data if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) { k3bDebug() << "(K3bDevice::Device) " << blockDeviceName() << ": GET PERFORMANCE successful with reported length: " << from4Byte( *data ) << endl; - dataLen = QMIN( dataLen, from4Byte( *data ) + 4 ); + dataLen = TQMIN( dataLen, from4Byte( *data ) + 4 ); return true; } else { @@ -326,7 +326,7 @@ bool K3bDevice::Device::readTrackInformation( unsigned char** data, unsigned int cmd[7] = dataLen>>8; cmd[8] = dataLen; if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) { - dataLen = QMIN( dataLen, from2Byte( *data ) + 2u ); + dataLen = TQMIN( dataLen, from2Byte( *data ) + 2u ); return true; } else { @@ -526,7 +526,7 @@ bool K3bDevice::Device::readSubChannel( unsigned char** data, unsigned int& data cmd[7] = dataLen>>8; cmd[8] = dataLen; if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) { - dataLen = QMIN( dataLen, from2Byte( (*data)+2 ) + 4u ); + dataLen = TQMIN( dataLen, from2Byte( (*data)+2 ) + 4u ); return true; } else { @@ -606,7 +606,7 @@ bool K3bDevice::Device::readTocPmaAtip( unsigned char** data, unsigned int& data cmd[7] = dataLen>>8; cmd[8] = dataLen; if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) { - dataLen = QMIN( dataLen, from2Byte( *data ) + 2u ); + dataLen = TQMIN( dataLen, from2Byte( *data ) + 2u ); if( (dataLen-4) % descLen || dataLen < 4+descLen ) { // useless length delete [] *data; @@ -626,7 +626,7 @@ bool K3bDevice::Device::readTocPmaAtip( unsigned char** data, unsigned int& data } -bool K3bDevice::Device::mechanismStatus( unsigned char** data, unsigned int& dataLen ) const +bool K3bDevice::Device::mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const { unsigned char header[2048]; ::memset( header, 0, 2048 ); @@ -663,7 +663,7 @@ bool K3bDevice::Device::mechanismStatus( unsigned char** data, unsigned int& dat cmd[8] = dataLen>>8; cmd[9] = dataLen; if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) { - dataLen = QMIN( dataLen, from4Byte( (*data)+6 ) + 8 ); + dataLen = TQMIN( dataLen, from4Byte( (*data)+6 ) + 8 ); return true; } else { @@ -712,7 +712,7 @@ bool K3bDevice::Device::modeSense( unsigned char** pageData, unsigned int& pageL cmd[7] = pageLen>>8; cmd[8] = pageLen; if( cmd.transport( TR_DIR_READ, *pageData, pageLen ) == 0 ) { - pageLen = QMIN( pageLen, from2Byte( *pageData ) + 2u ); + pageLen = TQMIN( pageLen, from2Byte( *pageData ) + 2u ); return true; } else { @@ -811,7 +811,7 @@ bool K3bDevice::Device::readFormatCapacity( int wantedFormat, K3b::Msf& r, if( format == wantedFormat ) { // found the descriptor - r = QMAX( (int)from4Byte( &buffer[i] ), r.lba() ); + r = TQMAX( (int)from4Byte( &buffer[i] ), r.lba() ); success = true; } } @@ -849,7 +849,7 @@ bool K3bDevice::Device::readDiscInformation( unsigned char** data, unsigned int& cmd[7] = dataLen>>8; cmd[8] = dataLen; if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) { - dataLen = QMIN( dataLen, from2Byte( *data ) + 2u ); + dataLen = TQMIN( dataLen, from2Byte( *data ) + 2u ); return true; } else { @@ -905,7 +905,7 @@ bool K3bDevice::Device::readDiscStructure( unsigned char** data, unsigned int& d cmd[8] = dataLen>>8; cmd[9] = dataLen; if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) { - dataLen = QMIN( dataLen, from2Byte( *data ) + 2u ); + dataLen = TQMIN( dataLen, from2Byte( *data ) + 2u ); return true; } else { diff --git a/libk3bdevice/k3bdeviceglobals.cpp b/libk3bdevice/k3bdeviceglobals.cpp index c778130..4d36916 100644 --- a/libk3bdevice/k3bdeviceglobals.cpp +++ b/libk3bdevice/k3bdeviceglobals.cpp @@ -20,12 +20,12 @@ #include <klocale.h> #include <k3bdebug.h> -#include <qstringlist.h> +#include <tqstringlist.h> -QString K3bDevice::deviceTypeString( int t ) +TQString K3bDevice::deviceTypeString( int t ) { - QStringList s; + TQStringList s; if( t & K3bDevice::DEVICE_CD_R ) s += i18n("CD-R"); if( t & K3bDevice::DEVICE_CD_RW ) @@ -68,9 +68,9 @@ QString K3bDevice::deviceTypeString( int t ) } -QString K3bDevice::writingModeString( int m ) +TQString K3bDevice::writingModeString( int m ) { - QStringList s; + TQStringList s; if( m & K3bDevice::WRITINGMODE_SAO ) s += i18n("SAO"); if( m & K3bDevice::WRITINGMODE_TAO ) @@ -108,12 +108,12 @@ QString K3bDevice::writingModeString( int m ) } -QString K3bDevice::mediaTypeString( int m, bool simple ) +TQString K3bDevice::mediaTypeString( int m, bool simple ) { if( m == K3bDevice::MEDIA_UNKNOWN ) return i18n("Unknown"); - QStringList s; + TQStringList s; if( m & MEDIA_NONE ) s += i18n("No media"); if( m & MEDIA_DVD_ROM ) @@ -183,7 +183,7 @@ QString K3bDevice::mediaTypeString( int m, bool simple ) void K3bDevice::debugBitfield( unsigned char* data, long len ) { for( int i = 0; i < len; ++i ) { - QString index, bitString; + TQString index, bitString; index.sprintf( "%4i", i ); for( int bp = 7; bp >= 0; --bp ) bitString[7-bp] = ( data[i] & (1<<bp) ? '1' : '0' ); diff --git a/libk3bdevice/k3bdeviceglobals.h b/libk3bdevice/k3bdeviceglobals.h index 5e167ad..3903a38 100644 --- a/libk3bdevice/k3bdeviceglobals.h +++ b/libk3bdevice/k3bdeviceglobals.h @@ -17,24 +17,24 @@ #ifndef _K3B_DEVICE_GLOBALS_H_ #define _K3B_DEVICE_GLOBALS_H_ -#include <qstring.h> +#include <tqstring.h> #include <k3bmsf.h> #include "k3bdevice_export.h" namespace K3bDevice { - typedef Q_UINT8 uint8; - typedef Q_UINT16 uint16; - typedef Q_UINT32 uint32; + typedef TQ_UINT8 uint8; + typedef TQ_UINT16 uint16; + typedef TQ_UINT32 uint32; class Device; - LIBK3BDEVICE_EXPORT QString deviceTypeString( int ); - LIBK3BDEVICE_EXPORT QString writingModeString( int ); + LIBK3BDEVICE_EXPORT TQString deviceTypeString( int ); + LIBK3BDEVICE_EXPORT TQString writingModeString( int ); /** * @param simplyfied if true the formatting state of DVD media is left out. */ - LIBK3BDEVICE_EXPORT QString mediaTypeString( int, bool simplyfied = false ); + LIBK3BDEVICE_EXPORT TQString mediaTypeString( int, bool simplyfied = false ); LIBK3BDEVICE_EXPORT void debugBitfield( unsigned char* data, long len ); LIBK3BDEVICE_EXPORT uint16 from2Byte( unsigned char* ); diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp index b7c04d0..fcf5bfc 100644 --- a/libk3bdevice/k3bdevicemanager.cpp +++ b/libk3bdevice/k3bdevicemanager.cpp @@ -22,12 +22,12 @@ #include "k3bmmc.h" #include "k3bdebug.h" -#include <qstring.h> -#include <qstringlist.h> -#include <qptrlist.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqptrlist.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> #include <kprocess.h> #include <kapplication.h> @@ -106,21 +106,21 @@ typedef unsigned char u8; class K3bDevice::DeviceManager::Private { public: - QPtrList<K3bDevice::Device> allDevices; - QPtrList<K3bDevice::Device> cdReader; - QPtrList<K3bDevice::Device> cdWriter; - QPtrList<K3bDevice::Device> dvdReader; - QPtrList<K3bDevice::Device> dvdWriter; - QPtrList<K3bDevice::Device> bdReader; - QPtrList<K3bDevice::Device> bdWriter; + TQPtrList<K3bDevice::Device> allDevices; + TQPtrList<K3bDevice::Device> cdReader; + TQPtrList<K3bDevice::Device> cdWriter; + TQPtrList<K3bDevice::Device> dvdReader; + TQPtrList<K3bDevice::Device> dvdWriter; + TQPtrList<K3bDevice::Device> bdReader; + TQPtrList<K3bDevice::Device> bdWriter; bool checkWritingModes; }; -K3bDevice::DeviceManager::DeviceManager( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bDevice::DeviceManager::DeviceManager( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private; } @@ -139,7 +139,7 @@ void K3bDevice::DeviceManager::setCheckWritingModes( bool b ) } -K3bDevice::Device* K3bDevice::DeviceManager::deviceByName( const QString& name ) +K3bDevice::Device* K3bDevice::DeviceManager::deviceByName( const TQString& name ) { return findDevice( name ); } @@ -147,7 +147,7 @@ K3bDevice::Device* K3bDevice::DeviceManager::deviceByName( const QString& name ) K3bDevice::Device* K3bDevice::DeviceManager::findDevice( int bus, int id, int lun ) { - QPtrListIterator<K3bDevice::Device> it( d->allDevices ); + TQPtrListIterator<K3bDevice::Device> it( d->allDevices ); while( it.current() ) { if( it.current()->scsiBus() == bus && @@ -162,15 +162,15 @@ K3bDevice::Device* K3bDevice::DeviceManager::findDevice( int bus, int id, int lu } -K3bDevice::Device* K3bDevice::DeviceManager::findDevice( const QString& devicename ) +K3bDevice::Device* K3bDevice::DeviceManager::findDevice( const TQString& devicename ) { if( devicename.isEmpty() ) { k3bDebug() << "(K3bDevice::DeviceManager) request for empty device!" << endl; return 0; } - QPtrListIterator<K3bDevice::Device> it( d->allDevices ); + TQPtrListIterator<K3bDevice::Device> it( d->allDevices ); while( it.current() ) { - if( it.current()->deviceNodes().contains(devicename) ) + if( it.current()->deviceNodes().tqcontains(devicename) ) return it.current(); ++it; @@ -180,49 +180,49 @@ K3bDevice::Device* K3bDevice::DeviceManager::findDevice( const QString& devicena } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::cdWriter() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::cdWriter() const { return d->cdWriter; } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::cdReader() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::cdReader() const { return d->cdReader; } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::dvdWriter() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::dvdWriter() const { return d->dvdWriter; } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::dvdReader() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::dvdReader() const { return d->dvdReader; } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::blueRayReader() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::blueRayReader() const { return d->bdReader; } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::blueRayWriters() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::blueRayWriters() const { return d->bdWriter; } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::burningDevices() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::burningDevices() const { return cdWriter(); } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::readingDevices() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::readingDevices() const { return cdReader(); } -const QPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::allDevices() const +const TQPtrList<K3bDevice::Device>& K3bDevice::DeviceManager::allDevices() const { return d->allDevices; } @@ -263,19 +263,19 @@ void K3bDevice::DeviceManager::LinuxDeviceScan() } #endif - QFile info("/proc/sys/dev/cdrom/info"); - QString line,devstring; + TQFile info("/proc/sys/dev/cdrom/info"); + TQString line,devstring; if( info.open(IO_ReadOnly) ) { info.readLine(line,80); // CD-ROM information, Id: cdrom.c 3.12 2000/10/18 info.readLine(line,80); // - QRegExp re("[\t\n:]+"); + TQRegExp re("[\t\n:]+"); while( info.readLine( line, 80 ) > 0 ) { - if( line.contains("drive name") > 0 ) { + if( line.tqcontains("drive name") > 0 ) { int i = 1; - QString dev; + TQString dev; while( !(dev = line.section(re, i, i)).isEmpty() ) { - if( addDevice( QString("/dev/%1").arg(dev) ) ) { + if( addDevice( TQString("/dev/%1").tqarg(dev) ) ) { devstring += dev + "|"; } // according to the LINUX ALLOCATED DEVICES document (http://www.lanana.org/docs/device-list/), @@ -285,7 +285,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan() // each physical device the next line should be better // else if ( dev.startsWith("sr") ) if ( dev.startsWith("sr") ) { - if( addDevice(QString("/dev/%1").arg(dev.replace(QRegExp("r"),"cd"))) ) + if( addDevice(TQString("/dev/%1").tqarg(dev.tqreplace(TQRegExp("r"),"cd"))) ) devstring += dev + "|"; } ++i; @@ -304,7 +304,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan() // k3bDebug() << "(K3bDevice::DeviceManager) SCANNING FOR GENERIC DEVICES." << endl; for( int i = 0; i < 16; i++ ) { - QString sgDev = resolveSymLink( QString("/dev/sg%1").arg(i) ); + TQString sgDev = resolveSymLink( TQString("/dev/sg%1").tqarg(i) ); int bus = -1, id = -1, lun = -1; if( determineBusIdLun( sgDev, bus, id, lun ) ) { if( Device* dev = findDevice( bus, id, lun ) ) { @@ -324,7 +324,7 @@ void K3bDevice::DeviceManager::NetBSDDeviceScan() int i; - // Whole disk mask (According to cd(4), the AMD64, i386 and BeBox ports use + // Whole disk tqmask (According to cd(4), the AMD64, i386 and BeBox ports use // 'd' as whole-disk partition, the rest uses 'c'.) #if defined(__i386__) || defined (__amd64__) || defined (__bebox__) @@ -338,7 +338,7 @@ void K3bDevice::DeviceManager::NetBSDDeviceScan() for (i = 0; i < 10; i++ ) // cd(4) claims there are max. 10 CD devices. { snprintf(devicename,11,"/dev/rcd%d%c",i, slicename); - addDevice(QString(devicename)); + addDevice(TQString(devicename)); } } @@ -357,7 +357,7 @@ void K3bDevice::DeviceManager::BSDDeviceScan() int need_close = 0; int skip_device = 0; int bus, target, lun; - QString dev1, dev2; + TQString dev1, dev2; if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) { @@ -380,7 +380,7 @@ void K3bDevice::DeviceManager::BSDDeviceScan() break; } - if ((ccb.ccb_h.status != CAM_REQ_CMP) + if ((ccb.ccb_h.status != CAM_RETQ_CMP) || ((ccb.cdm.status != CAM_DEV_MATCH_LAST) && (ccb.cdm.status != CAM_DEV_MATCH_MORE))) { k3bDebug() << "(BSDDeviceScan) got CAM error " << ccb.ccb_h.status << ", CDM error %d" << ccb.cdm.status << endl; break; @@ -400,8 +400,8 @@ void K3bDevice::DeviceManager::BSDDeviceScan() skip_device = 0; if (need_close) { - QString pass = dev1; - QString dev = "/dev/" + dev2; + TQString pass = dev1; + TQString dev = "/dev/" + dev2; if (dev2.startsWith("pass")) { pass = dev2; @@ -439,9 +439,9 @@ void K3bDevice::DeviceManager::BSDDeviceScan() break; if (need_close > 1) - dev1 = periph_result->periph_name + QString::number(periph_result->unit_number); + dev1 = periph_result->periph_name + TQString::number(periph_result->unit_number); else - dev2 = periph_result->periph_name + QString::number(periph_result->unit_number); + dev2 = periph_result->periph_name + TQString::number(periph_result->unit_number); need_close++; break; @@ -454,13 +454,13 @@ void K3bDevice::DeviceManager::BSDDeviceScan() } } - } while ((ccb.ccb_h.status == CAM_REQ_CMP) + } while ((ccb.ccb_h.status == CAM_RETQ_CMP) && (ccb.cdm.status == CAM_DEV_MATCH_MORE)); if (need_close) { - QString pass = dev1; - QString dev = "/dev/" + dev2; + TQString pass = dev1; + TQString dev = "/dev/" + dev2; if (dev2.startsWith("pass")) { pass = dev2; @@ -489,7 +489,7 @@ void K3bDevice::DeviceManager::printDevices() { k3bDebug() << "Devices:" << endl << "------------------------------" << endl; - QPtrListIterator<Device> it( allDevices() ); + TQPtrListIterator<Device> it( allDevices() ); for( ; *it; ++it ) { Device* dev = *it; k3bDebug() << "Blockdevice: " << dev->blockDeviceName() << endl @@ -520,7 +520,7 @@ void K3bDevice::DeviceManager::clear() // to make sure no one crashes lets keep the devices around until the changed // signals return - QPtrList<K3bDevice::Device> tmp = d->allDevices; + TQPtrList<K3bDevice::Device> tmp = d->allDevices; tmp.setAutoDelete( true ); d->allDevices.clear(); @@ -542,19 +542,19 @@ bool K3bDevice::DeviceManager::readConfig( KConfig* c ) c->setGroup( "Devices" ); - QStringList deviceSearchPath = c->readListEntry( "device_search_path" ); - for( QStringList::const_iterator it = deviceSearchPath.constBegin(); + TQStringList deviceSearchPath = c->readListEntry( "device_search_path" ); + for( TQStringList::const_iterator it = deviceSearchPath.constBegin(); it != deviceSearchPath.constEnd(); ++it ) addDevice( *it ); // // Iterate over all devices and check if we have a config entry // - for( QPtrListIterator<K3bDevice::Device> it( d->allDevices ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( d->allDevices ); *it; ++it ) { K3bDevice::Device* dev = *it; - QString configEntryName = dev->vendor() + " " + dev->description(); - QStringList list = c->readListEntry( configEntryName ); + TQString configEntryName = dev->vendor() + " " + dev->description(); + TQStringList list = c->readListEntry( configEntryName ); if( !list.isEmpty() ) { k3bDebug() << "(K3bDevice::DeviceManager) found config entry for devicetype: " << configEntryName << endl; @@ -587,25 +587,25 @@ bool K3bDevice::DeviceManager::saveConfig( KConfig* c ) // c->setGroup( "Devices" ); - QStringList deviceSearchPath = c->readListEntry( "device_search_path" ); + TQStringList deviceSearchPath = c->readListEntry( "device_search_path" ); // remove duplicate entries (caused by buggy old implementations) - QStringList saveDeviceSearchPath; - for( QStringList::const_iterator it = deviceSearchPath.constBegin(); it != deviceSearchPath.constEnd(); ++it ) - if( !saveDeviceSearchPath.contains( *it ) ) + TQStringList saveDeviceSearchPath; + for( TQStringList::const_iterator it = deviceSearchPath.constBegin(); it != deviceSearchPath.constEnd(); ++it ) + if( !saveDeviceSearchPath.tqcontains( *it ) ) saveDeviceSearchPath.append( *it ); - for( QPtrListIterator<K3bDevice::Device> it( d->allDevices ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( d->allDevices ); *it; ++it ) { K3bDevice::Device* dev = *it; // update device search path - if( !saveDeviceSearchPath.contains( dev->blockDeviceName() ) ) + if( !saveDeviceSearchPath.tqcontains( dev->blockDeviceName() ) ) saveDeviceSearchPath.append( dev->blockDeviceName() ); // save the device type settings - QString configEntryName = dev->vendor() + " " + dev->description(); - QStringList list; - list << QString::number(dev->maxReadSpeed()) - << QString::number(dev->maxWriteSpeed()) + TQString configEntryName = dev->vendor() + " " + dev->description(); + TQStringList list; + list << TQString::number(dev->maxReadSpeed()) + << TQString::number(dev->maxWriteSpeed()) << dev->cdrdaoDriver(); if( dev->cdrdaoDriver() != "auto" ) @@ -624,7 +624,7 @@ bool K3bDevice::DeviceManager::saveConfig( KConfig* c ) } -bool K3bDevice::DeviceManager::testForCdrom( const QString& devicename ) +bool K3bDevice::DeviceManager::testForCdrom( const TQString& devicename ) { #ifdef Q_OS_FREEBSD Q_UNUSED(devicename); @@ -659,7 +659,7 @@ bool K3bDevice::DeviceManager::testForCdrom( const QString& devicename ) ::memset( buf, 0, sizeof(buf) ); ScsiCommand cmd( cdromfd ); - cmd[0] = MMC_INQUIRY; + cmd[0] = MMC_INTQUIRY; cmd[4] = sizeof(buf); cmd[5] = 0; @@ -680,7 +680,7 @@ bool K3bDevice::DeviceManager::testForCdrom( const QString& devicename ) #endif } -K3bDevice::Device* K3bDevice::DeviceManager::addDevice( const QString& devicename ) +K3bDevice::Device* K3bDevice::DeviceManager::addDevice( const TQString& devicename ) { #ifdef Q_OS_FREEBSD return 0; @@ -689,7 +689,7 @@ K3bDevice::Device* K3bDevice::DeviceManager::addDevice( const QString& devicenam K3bDevice::Device* device = 0; // resolve all symlinks - QString resolved = resolveSymLink( devicename ); + TQString resolved = resolveSymLink( devicename ); k3bDebug() << devicename << " resolved to " << resolved << endl; if ( K3bDevice::Device* oldDev = findDevice(resolved) ) { @@ -735,7 +735,7 @@ K3bDevice::Device* K3bDevice::DeviceManager::addDevice( const QString& devicenam K3bDevice::Device* K3bDevice::DeviceManager::addDevice( K3bDevice::Device* device ) { - const QString devicename = device->devicename(); + const TQString devicename = device->devicename(); if( !device->init() ) { k3bDebug() << "Could not initialize device " << devicename << endl; @@ -777,7 +777,7 @@ K3bDevice::Device* K3bDevice::DeviceManager::addDevice( K3bDevice::Device* devic } -void K3bDevice::DeviceManager::removeDevice( const QString& dev ) +void K3bDevice::DeviceManager::removeDevice( const TQString& dev ) { if( Device* device = findDevice( dev ) ) { d->cdReader.removeRef( device ); @@ -796,7 +796,7 @@ void K3bDevice::DeviceManager::removeDevice( const QString& dev ) } -bool K3bDevice::DeviceManager::determineBusIdLun( const QString& dev, int& bus, int& id, int& lun ) +bool K3bDevice::DeviceManager::determineBusIdLun( const TQString& dev, int& bus, int& id, int& lun ) { #ifdef Q_OS_FREEBSD Q_UNUSED(dev); @@ -887,16 +887,16 @@ bool K3bDevice::DeviceManager::determineBusIdLun( const QString& dev, int& bus, } -QString K3bDevice::DeviceManager::resolveSymLink( const QString& path ) +TQString K3bDevice::DeviceManager::resolveSymLink( const TQString& path ) { char resolved[PATH_MAX]; - if( !realpath( QFile::encodeName(path), resolved ) ) + if( !realpath( TQFile::encodeName(path), resolved ) ) { k3bDebug() << "Could not resolve " << path << endl; return path; } - return QString::fromLatin1( resolved ); + return TQString::tqfromLatin1( resolved ); } diff --git a/libk3bdevice/k3bdevicemanager.h b/libk3bdevice/k3bdevicemanager.h index 4656538..258afa2 100644 --- a/libk3bdevice/k3bdevicemanager.h +++ b/libk3bdevice/k3bdevicemanager.h @@ -17,11 +17,11 @@ #ifndef K3BDEVICEMANAGER_H #define K3BDEVICEMANAGER_H -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qmemarray.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqmemarray.h> +#include <tqptrlist.h> #include "k3bdevice_export.h" #include <kdebug.h> @@ -47,15 +47,16 @@ namespace K3bDevice { * K3bDevice::Device* dev = manager->findDevice( "/dev/cdrom" ); * \endcode */ - class LIBK3BDEVICE_EXPORT DeviceManager : public QObject + class LIBK3BDEVICE_EXPORT DeviceManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Creates a new DeviceManager */ - DeviceManager( QObject* parent = 0, const char* name = 0 ); + DeviceManager( TQObject* tqparent = 0, const char* name = 0 ); virtual ~DeviceManager(); /** @@ -72,15 +73,15 @@ namespace K3bDevice { void setCheckWritingModes( bool b ); /** - * \deprecated use findDevice( const QString& ) + * \deprecated use findDevice( const TQString& ) */ - Device* deviceByName( const QString& ); + Device* deviceByName( const TQString& ); /** * Search an SCSI device by SCSI bus, id, and lun. * * \note This method does not initialize new devices. - * Devices cannot be found until they have been added via addDevice(const QString&) + * Devices cannot be found until they have been added via addDevice(const TQString&) * or scanBus(). * * \return The corresponding device or 0 if there is no such device. @@ -91,81 +92,81 @@ namespace K3bDevice { * Search a device by blockdevice name. * * \note This method does not initialize new devices. - * Devices cannot be found until they have been added via addDevice(const QString&) + * Devices cannot be found until they have been added via addDevice(const TQString&) * or scanBus(). * * \return The corresponding device or 0 if there is no such device. */ - Device* findDevice( const QString& devicename ); + Device* findDevice( const TQString& devicename ); /** * Before getting the devices do a @ref scanBus(). * \return List of all cd writer devices. * \deprecated use cdWriter() */ - const QPtrList<Device>& burningDevices() const; + const TQPtrList<Device>& burningDevices() const; /** * \return List of all reader devices without writer devices. * \deprecated use cdReader() **/ - const QPtrList<Device>& readingDevices() const; + const TQPtrList<Device>& readingDevices() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all devices. */ - const QPtrList<Device>& allDevices() const; + const TQPtrList<Device>& allDevices() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all cd writer devices. */ - const QPtrList<Device>& cdWriter() const; + const TQPtrList<Device>& cdWriter() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all cd reader devices. */ - const QPtrList<Device>& cdReader() const; + const TQPtrList<Device>& cdReader() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all DVD writer devices. */ - const QPtrList<Device>& dvdWriter() const; + const TQPtrList<Device>& dvdWriter() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all DVD reader devices. */ - const QPtrList<Device>& dvdReader() const; + const TQPtrList<Device>& dvdReader() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all Blue Ray reader devices. */ - const QPtrList<Device>& blueRayReader() const; + const TQPtrList<Device>& blueRayReader() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all Blue Ray writer devices. */ - const QPtrList<Device>& blueRayWriters() const; + const TQPtrList<Device>& blueRayWriters() const; /** * Reads the device information from the config file. @@ -209,14 +210,14 @@ namespace K3bDevice { * * \return The device if it could be found or 0 otherwise. */ - virtual Device* addDevice( const QString& dev ); + virtual Device* addDevice( const TQString& dev ); /** * Remove a device from the device manager. Basicly this method * only makes sense in combination with the HalConnection. Connect * it to the deviceRemoved signal. */ - virtual void removeDevice( const QString& dev ); + virtual void removeDevice( const TQString& dev ); signals: /** @@ -226,9 +227,9 @@ namespace K3bDevice { void changed(); private: - bool testForCdrom( const QString& ); - bool determineBusIdLun( const QString &dev, int& bus, int& id, int& lun ); - QString resolveSymLink( const QString& path ); + bool testForCdrom( const TQString& ); + bool determineBusIdLun( const TQString &dev, int& bus, int& id, int& lun ); + TQString resolveSymLink( const TQString& path ); class Private; Private* d; diff --git a/libk3bdevice/k3bdiskinfo.cpp b/libk3bdevice/k3bdiskinfo.cpp index 6c91d19..534e74b 100644 --- a/libk3bdevice/k3bdiskinfo.cpp +++ b/libk3bdevice/k3bdiskinfo.cpp @@ -22,7 +22,7 @@ #include <k3bdebug.h> #include <kio/global.h> -#include <qstringlist.h> +#include <tqstringlist.h> K3bDevice::DiskInfo::DiskInfo() diff --git a/libk3bdevice/k3bdiskinfo.h b/libk3bdevice/k3bdiskinfo.h index ed7c382..d653852 100644 --- a/libk3bdevice/k3bdiskinfo.h +++ b/libk3bdevice/k3bdiskinfo.h @@ -23,7 +23,7 @@ #include <k3bmsf.h> #include "k3bdevice_export.h" -#include <qcstring.h> +#include <tqcstring.h> class kdbgstream; @@ -148,7 +148,7 @@ namespace K3bDevice */ K3b::Msf firstLayerSize() const; - const QCString& mediaId() const { return m_mediaId; } + const TQCString& mediaId() const { return m_mediaId; } void debug() const; @@ -171,7 +171,7 @@ namespace K3bDevice K3b::Msf m_usedCapacity; K3b::Msf m_firstLayerSize; - QCString m_mediaId; + TQCString m_mediaId; friend class Device; }; diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp index 2b0877b..d57b346 100644 --- a/libk3bdevice/k3bhalconnection.cpp +++ b/libk3bdevice/k3bhalconnection.cpp @@ -19,7 +19,7 @@ #include <k3bdebug.h> #include <klocale.h> -#include <qtimer.h> +#include <tqtimer.h> // We acknowledge the the dbus API is unstable #define DBUS_API_SUBJECT_TO_CHANGE @@ -28,7 +28,7 @@ #include <hal/libhal.h> -static char** qstringListToArray( const QStringList& s ) +static char** qstringListToArray( const TQStringList& s ) { char** a = new char*[s.count()]; for( unsigned int i = 0; i < s.count(); ++i ) { @@ -72,20 +72,20 @@ class K3bDevice::HalConnection::Private public: Private() : halContext(0), - dBusQtConnection(0), + dBusTQtConnection(0), bOpen(false) { } LibHalContext* halContext; DBusConnection* connection; - DBusQt::Connection* dBusQtConnection; + DBusTQt::Connection* dBusTQtConnection; bool bOpen; - QMap<QCString, QString> udiDeviceMap; - QMap<QString, QCString> deviceUdiMap; + TQMap<TQCString, TQString> udiDeviceMap; + TQMap<TQString, TQCString> deviceUdiMap; - QMap<QCString, QCString> deviceMediumUdiMap; + TQMap<TQCString, TQCString> deviceMediumUdiMap; }; @@ -101,8 +101,8 @@ K3bDevice::HalConnection* K3bDevice::HalConnection::instance() } -K3bDevice::HalConnection::HalConnection( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bDevice::HalConnection::HalConnection( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); } @@ -142,7 +142,7 @@ bool K3bDevice::HalConnection::open() return false; } - setupDBusQtConnection( d->connection ); + setupDBusTQtConnection( d->connection ); libhal_ctx_set_dbus_connection( d->halContext, d->connection ); @@ -181,18 +181,18 @@ void K3bDevice::HalConnection::close() libhal_ctx_free( d->halContext ); // delete the connection (may be 0 if open() failed) - delete d->dBusQtConnection; + delete d->dBusTQtConnection; d->halContext = 0; - d->dBusQtConnection = 0; + d->dBusTQtConnection = 0; d->bOpen = false; } } -QStringList K3bDevice::HalConnection::devices() const +TQStringList K3bDevice::HalConnection::devices() const { - return QStringList( d->udiDeviceMap.values() ); + return TQStringList( d->udiDeviceMap.values() ); } @@ -205,7 +205,7 @@ void K3bDevice::HalConnection::addDevice( const char* udi ) if( libhal_device_query_capability( d->halContext, udi, "storage.cdrom", 0 ) ) { char* dev = libhal_device_get_property_string( d->halContext, udi, "block.device", 0 ); if( dev ) { - QString s( dev ); + TQString s( dev ); libhal_free_string( dev ); if( !s.isEmpty() ) { @@ -220,15 +220,15 @@ void K3bDevice::HalConnection::addDevice( const char* udi ) if( libhal_device_property_exists( d->halContext, udi, "block.storage_device", 0 ) ) { char* deviceUdi = libhal_device_get_property_string( d->halContext, udi, "block.storage_device", 0 ); if( deviceUdi ) { - QCString du( deviceUdi ); + TQCString du( deviceUdi ); libhal_free_string( deviceUdi ); - if( d->udiDeviceMap.contains( du ) ) { + if( d->udiDeviceMap.tqcontains( du ) ) { // // A new medium has been inserted. Save this medium's udi so we can reuse it later // on for the mount/unmount/eject methods // - d->deviceMediumUdiMap[du] = QCString( udi ); + d->deviceMediumUdiMap[du] = TQCString( udi ); emit mediumChanged( d->udiDeviceMap[du] ); } } @@ -239,7 +239,7 @@ void K3bDevice::HalConnection::addDevice( const char* udi ) void K3bDevice::HalConnection::removeDevice( const char* udi ) { - QMapIterator<QCString, QString> it = d->udiDeviceMap.find( udi ); + TQMapIterator<TQCString, TQString> it = d->udiDeviceMap.tqfind( udi ); if( it != d->udiDeviceMap.end() ) { k3bDebug() << "Unmapping udi " << udi << " from device " << it.data() << endl; emit deviceRemoved( it.data() ); @@ -250,10 +250,10 @@ void K3bDevice::HalConnection::removeDevice( const char* udi ) if( libhal_device_property_exists( d->halContext, udi, "block.storage_device", 0 ) ) { char* deviceUdi = libhal_device_get_property_string( d->halContext, udi, "block.storage_device", 0 ); if( deviceUdi ) { - QCString du( deviceUdi ); + TQCString du( deviceUdi ); libhal_free_string( deviceUdi ); - if( d->udiDeviceMap.contains( du ) ) { + if( d->udiDeviceMap.tqcontains( du ) ) { // // A medium has been removed/ejected. // @@ -276,11 +276,11 @@ int K3bDevice::HalConnection::lock( Device* dev ) DBusMessage* reply = 0; DBusError error; - if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) ) { + if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) ) { return org_freedesktop_Hal_Device_Volume_NoSuchDevice; } - QCString udi = d->deviceUdiMap[dev->blockDeviceName()]; + TQCString udi = d->deviceUdiMap[dev->blockDeviceName()]; if( !( dmesg = dbus_message_new_method_call( "org.freedesktop.Hal", udi.data(), "org.freedesktop.Hal.Device", @@ -335,11 +335,11 @@ int K3bDevice::HalConnection::unlock( Device* dev ) DBusMessage* reply = 0; DBusError error; - if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) ) { + if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) ) { return org_freedesktop_Hal_Device_Volume_NoSuchDevice; } - QCString udi = d->deviceUdiMap[dev->blockDeviceName()]; + TQCString udi = d->deviceUdiMap[dev->blockDeviceName()]; if( !( dmesg = dbus_message_new_method_call( "org.freedesktop.Hal", udi.data(), "org.freedesktop.Hal.Device", @@ -382,9 +382,9 @@ int K3bDevice::HalConnection::unlock( Device* dev ) int K3bDevice::HalConnection::mount( K3bDevice::Device* dev, - const QString& mountPoint, - const QString& fstype, - const QStringList& options ) + const TQString& mountPoint, + const TQString& fstype, + const TQStringList& options ) { // // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the kdebase package @@ -394,13 +394,13 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev, DBusMessage* reply = 0; DBusError error; - if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) ) + if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) ) return org_freedesktop_Hal_NoSuchDevice; - if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) ) + if( !d->deviceMediumUdiMap.tqcontains( d->deviceUdiMap[dev->blockDeviceName()] ) ) return org_freedesktop_Hal_Device_Volume_NoSuchDevice; - QCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]]; + TQCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]]; if( !( dmesg = dbus_message_new_method_call( "org.freedesktop.Hal", mediumUdi.data(), "org.freedesktop.Hal.Device.Volume", @@ -411,8 +411,8 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev, char** poptions = qstringListToArray( options ); - QByteArray strMountPoint = mountPoint.local8Bit(); - QByteArray strFstype = fstype.local8Bit(); + TQByteArray strMountPoint = mountPoint.local8Bit(); + TQByteArray strFstype = fstype.local8Bit(); if( !dbus_message_append_args( dmesg, DBUS_TYPE_STRING, strMountPoint.data(), @@ -464,7 +464,7 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev, int K3bDevice::HalConnection::unmount( K3bDevice::Device* dev, - const QStringList& options ) + const TQStringList& options ) { // // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the kdebase package @@ -474,13 +474,13 @@ int K3bDevice::HalConnection::unmount( K3bDevice::Device* dev, DBusMessage* reply = 0; DBusError error; - if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) ) + if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) ) return org_freedesktop_Hal_NoSuchDevice; - if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) ) + if( !d->deviceMediumUdiMap.tqcontains( d->deviceUdiMap[dev->blockDeviceName()] ) ) return org_freedesktop_Hal_Device_Volume_NoSuchDevice; - QCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]]; + TQCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]]; if( !( dmesg = dbus_message_new_method_call( "org.freedesktop.Hal", mediumUdi.data(), "org.freedesktop.Hal.Device.Volume", @@ -535,7 +535,7 @@ int K3bDevice::HalConnection::unmount( K3bDevice::Device* dev, int K3bDevice::HalConnection::eject( K3bDevice::Device* dev, - const QStringList& options ) + const TQStringList& options ) { // // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the kdebase package @@ -545,13 +545,13 @@ int K3bDevice::HalConnection::eject( K3bDevice::Device* dev, DBusMessage* reply = 0; DBusError error; - if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) ) + if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) ) return org_freedesktop_Hal_NoSuchDevice; - if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) ) + if( !d->deviceMediumUdiMap.tqcontains( d->deviceUdiMap[dev->blockDeviceName()] ) ) return org_freedesktop_Hal_Device_Volume_NoSuchDevice; - QCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]]; + TQCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]]; if( !( dmesg = dbus_message_new_method_call( "org.freedesktop.Hal", mediumUdi.data(), "org.freedesktop.Hal.Device.Volume", @@ -601,10 +601,10 @@ int K3bDevice::HalConnection::eject( K3bDevice::Device* dev, } -void K3bDevice::HalConnection::setupDBusQtConnection( DBusConnection* dbusConnection ) +void K3bDevice::HalConnection::setupDBusTQtConnection( DBusConnection* dbusConnection ) { - d->dBusQtConnection = new DBusQt::Connection( this ); - d->dBusQtConnection->dbus_connection_setup_with_qt_main( dbusConnection ); + d->dBusTQtConnection = new DBusTQt::Connection( this ); + d->dBusTQtConnection->dbus_connection_setup_with_qt_main( dbusConnection ); } #include "k3bhalconnection.moc" diff --git a/libk3bdevice/k3bhalconnection.h b/libk3bdevice/k3bhalconnection.h index 583bbf2..882b7b4 100644 --- a/libk3bdevice/k3bhalconnection.h +++ b/libk3bdevice/k3bhalconnection.h @@ -22,9 +22,9 @@ #include "k3bdevice_export.h" -#include <qobject.h> -#include <qmap.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqmap.h> +#include <tqstringlist.h> class DBusConnection; @@ -44,9 +44,10 @@ namespace K3bDevice { * This class does not deal with K3b devices but with system device names * such as /dev/cdrom. These device names can be used in DeviceManager::findDevice(). */ - class LIBK3BDEVICE_EXPORT HalConnection : public QObject + class LIBK3BDEVICE_EXPORT HalConnection : public TQObject { Q_OBJECT + TQ_OBJECT public: ~HalConnection(); @@ -71,7 +72,7 @@ namespace K3bDevice { /** * \return a list of optical devices as reported by HAL. */ - QStringList devices() const; + TQStringList devices() const; /** * \internal @@ -143,9 +144,9 @@ namespace K3bDevice { * \see ErrorCode */ int mount( Device*, - const QString& mountPoint = QString::null, - const QString& fstype = QString::null, - const QStringList& options = QStringList() ); + const TQString& mountPoint = TQString(), + const TQString& fstype = TQString(), + const TQStringList& options = TQStringList() ); /** * Unmounts a device via HAL @@ -159,7 +160,7 @@ namespace K3bDevice { * \see ErrorCode */ int unmount( Device*, - const QStringList& options = QStringList() ); + const TQStringList& options = TQStringList() ); /** * Unmounts a device via HAL @@ -173,7 +174,7 @@ namespace K3bDevice { * \see ErrorCode */ int eject( Device*, - const QStringList& options = QStringList() ); + const TQStringList& options = TQStringList() ); signals: /** @@ -181,7 +182,7 @@ namespace K3bDevice { * * \param dev The block device name of the new drive. */ - void deviceAdded( const QString& dev ); + void deviceAdded( const TQString& dev ); /** * This signal gets emitted whenever HAL detects that an optical drive @@ -189,7 +190,7 @@ namespace K3bDevice { * * \param dev The block device name of the drive. */ - void deviceRemoved( const QString& dev ); + void deviceRemoved( const TQString& dev ); /** * This signal gets emitted whenever a new medium is inserted into a @@ -197,13 +198,13 @@ namespace K3bDevice { * * \param dev The block device name of the drive the medium is or was inserted into. */ - void mediumChanged( const QString& dev ); + void mediumChanged( const TQString& dev ); private: /** * HalConnection is a signelton class. Use the instance() method to create it. */ - HalConnection( QObject* parent = 0, const char* name = 0 ); + HalConnection( TQObject* tqparent = 0, const char* name = 0 ); /** * Tries to open a connection to HAL. @@ -216,7 +217,7 @@ namespace K3bDevice { class Private; Private* d; - void setupDBusQtConnection( DBusConnection* dbusConnection ); + void setupDBusTQtConnection( DBusConnection* dbusConnection ); }; } diff --git a/libk3bdevice/k3bmmc.h b/libk3bdevice/k3bmmc.h index ebe2171..76c9927 100644 --- a/libk3bdevice/k3bmmc.h +++ b/libk3bdevice/k3bmmc.h @@ -42,7 +42,7 @@ namespace K3bDevice */ typedef struct disc_info { - Q_UINT16 length; + TQ_UINT16 length; #ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN unsigned char reserved1 : 3; unsigned char erasable : 1; @@ -86,7 +86,7 @@ namespace K3bDevice unsigned char n_sessions_m; unsigned char first_track_m; unsigned char last_track_m; - Q_UINT32 disc_id; + TQ_UINT32 disc_id; /* * Last session lead-in start time @@ -214,7 +214,7 @@ namespace K3bDevice /** * Based on the cdrecord struct cd_mode_page_2A - * MM Capabilities and Mechanical Status Page + * MM Capabilities and Mechanical tqStatus Page */ #ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN diff --git a/libk3bdevice/k3bmsf.cpp b/libk3bdevice/k3bmsf.cpp index c7257a1..c8f6c70 100644 --- a/libk3bdevice/k3bmsf.cpp +++ b/libk3bdevice/k3bmsf.cpp @@ -14,7 +14,7 @@ */ #include "k3bmsf.h" -#include <qregexp.h> +#include <tqregexp.h> #include <math.h> @@ -156,9 +156,9 @@ K3b::Msf& K3b::Msf::operator--() } -QString K3b::Msf::toString( bool showFrames ) const +TQString K3b::Msf::toString( bool showFrames ) const { - QString str; + TQString str; if( showFrames ) str.sprintf( "%.2i:%.2i:%.2i", m_minutes, m_seconds, m_frames ); @@ -219,7 +219,7 @@ void K3b::Msf::makeValid() -QRegExp K3b::Msf::regExp() +TQRegExp K3b::Msf::regExp() { // // An MSF can have the following formats: @@ -228,7 +228,7 @@ QRegExp K3b::Msf::regExp() // 100:23:72 (minutes:seconds:frames) // 100:23.72 (minutes:seconds.frames) // - static QRegExp rx( "(\\d+)(?::([0-5]?\\d)(?:[:\\.]((?:[0-6]?\\d)|(?:7[0-4])))?)?" ); + static TQRegExp rx( "(\\d+)(?::([0-5]?\\d)(?:[:\\.]((?:[0-6]?\\d)|(?:7[0-4])))?)?" ); return rx; } @@ -239,9 +239,9 @@ K3b::Msf K3b::Msf::fromSeconds( double ms ) } -K3b::Msf K3b::Msf::fromString( const QString& s, bool* ok ) +K3b::Msf K3b::Msf::fromString( const TQString& s, bool* ok ) { - QRegExp rx = regExp(); + TQRegExp rx = regExp(); K3b::Msf msf; diff --git a/libk3bdevice/k3bmsf.h b/libk3bdevice/k3bmsf.h index d2209c3..973f6c3 100644 --- a/libk3bdevice/k3bmsf.h +++ b/libk3bdevice/k3bmsf.h @@ -17,8 +17,8 @@ #ifndef _K3B_MSF_H_ #define _K3B_MSF_H_ -#include <qstring.h> -#include <qregexp.h> +#include <tqstring.h> +#include <tqregexp.h> #include <kdebug.h> #include <kio/global.h> @@ -65,7 +65,7 @@ namespace K3b void addSeconds( int s ); void addFrames( int f ); - QString toString( bool showFrames = true ) const; + TQString toString( bool showFrames = true ) const; KIO::filesize_t mode1Bytes() const; KIO::filesize_t mode2Form1Bytes() const; @@ -83,7 +83,7 @@ namespace K3b * \li 100:23:57 - treated as 100 minutes, 23 seconds, and 57 frames * \li 100:23.57 - treated as 100 minutes, 23 seconds, and 57 frames */ - static Msf fromString( const QString&, bool* ok = 0 ); + static Msf fromString( const TQString&, bool* ok = 0 ); /** * @param ms seconds @@ -91,7 +91,7 @@ namespace K3b */ static Msf fromSeconds( double ms ); - static QRegExp regExp(); + static TQRegExp regExp(); private: void makeValid(); diff --git a/libk3bdevice/k3bscsicommand.cpp b/libk3bdevice/k3bscsicommand.cpp index 2b34217..710b8a3 100644 --- a/libk3bdevice/k3bscsicommand.cpp +++ b/libk3bdevice/k3bscsicommand.cpp @@ -19,7 +19,7 @@ #include <k3bdebug.h> -QString K3bDevice::commandString( const unsigned char& command ) +TQString K3bDevice::commandString( const unsigned char& command ) { if( command == MMC_BLANK ) return "BLANK"; @@ -35,8 +35,8 @@ QString K3bDevice::commandString( const unsigned char& command ) return "GET EVENT STATUS NOTIFICATION"; if( command == MMC_GET_PERFORMANCE ) return "GET PERFORMANCE"; - if( command == MMC_INQUIRY ) - return "INQUIRY"; + if( command == MMC_INTQUIRY ) + return "INTQUIRY"; if( command == MMC_LOAD_UNLOAD_MEDIUM ) return "LOAD/UNLOAD MEDIUM"; if( command == MMC_MECHANISM_STATUS ) @@ -130,7 +130,7 @@ QString K3bDevice::commandString( const unsigned char& command ) } -QString K3bDevice::ScsiCommand::senseKeyToString( int key ) +TQString K3bDevice::ScsiCommand::senseKeyToString( int key ) { switch( key ) { case 0x0: @@ -168,13 +168,13 @@ QString K3bDevice::ScsiCommand::senseKeyToString( int key ) void K3bDevice::ScsiCommand::debugError( int command, int errorCode, int senseKey, int asc, int ascq ) { if( m_printErrors ) { k3bDebug() << "(K3bDevice::ScsiCommand) failed: " << endl - << " command: " << QString("%1 (%2)") - .arg( K3bDevice::commandString( command ) ) - .arg( QString::number(command, 16) ) << endl - << " errorcode: " << QString::number(errorCode, 16) << endl + << " command: " << TQString("%1 (%2)") + .tqarg( K3bDevice::commandString( command ) ) + .tqarg( TQString::number(command, 16) ) << endl + << " errorcode: " << TQString::number(errorCode, 16) << endl << " sense key: " << senseKeyToString(senseKey) << endl - << " asc: " << QString::number(asc, 16) << endl - << " ascq: " << QString::number(ascq, 16) << endl; + << " asc: " << TQString::number(asc, 16) << endl + << " ascq: " << TQString::number(ascq, 16) << endl; } } diff --git a/libk3bdevice/k3bscsicommand.h b/libk3bdevice/k3bscsicommand.h index 11a9860..7a718d1 100644 --- a/libk3bdevice/k3bscsicommand.h +++ b/libk3bdevice/k3bscsicommand.h @@ -16,8 +16,8 @@ #ifndef _K3B_SCSI_COMMAND_H_ #define _K3B_SCSI_COMMAND_H_ -#include <qglobal.h> -#include <qstring.h> +#include <tqglobal.h> +#include <tqstring.h> #include "k3bdevice.h" @@ -31,7 +31,7 @@ namespace K3bDevice const unsigned char MMC_GET_CONFIGURATION = 0x46; const unsigned char MMC_GET_EVENT_STATUS_NOTIFICATION = 0x4A; const unsigned char MMC_GET_PERFORMANCE = 0xAC; - const unsigned char MMC_INQUIRY = 0x12; + const unsigned char MMC_INTQUIRY = 0x12; const unsigned char MMC_LOAD_UNLOAD_MEDIUM = 0xA6; const unsigned char MMC_MECHANISM_STATUS = 0xBD; const unsigned char MMC_MODE_SELECT = 0x55; @@ -78,7 +78,7 @@ namespace K3bDevice const unsigned char MMC_WRITE_AND_VERIFY_10 = 0x2E; const unsigned char MMC_WRITE_BUFFER = 0x3B; - QString commandString( const unsigned char& command ); + TQString commandString( const unsigned char& command ); enum TransportDirection { TR_DIR_NONE, @@ -127,7 +127,7 @@ namespace K3bDevice size_t len = 0 ); private: - static QString senseKeyToString( int key ); + static TQString senseKeyToString( int key ); void debugError( int command, int errorCode, int senseKey, int asc, int ascq ); class Private; diff --git a/libk3bdevice/k3bscsicommand_bsd.cpp b/libk3bdevice/k3bscsicommand_bsd.cpp index 84e12f9..eb7f3a3 100644 --- a/libk3bdevice/k3bscsicommand_bsd.cpp +++ b/libk3bdevice/k3bscsicommand_bsd.cpp @@ -83,14 +83,14 @@ int K3bDevice::ScsiCommand::transport( TransportDirection dir, d->ccb.ccb_h.target_id = m_device->handle()->target_id; d->ccb.ccb_h.target_lun = m_device->handle()->target_lun; - k3bDebug() << "(K3bDevice::ScsiCommand) transport command " << QString::number((int)d->ccb.csio.cdb_io.cdb_bytes[0], 16) << ", length: " << (int)d->ccb.csio.cdb_len << endl; + k3bDebug() << "(K3bDevice::ScsiCommand) transport command " << TQString::number((int)d->ccb.csio.cdb_io.cdb_bytes[0], 16) << ", length: " << (int)d->ccb.csio.cdb_len << endl; int ret=0; - int direction = CAM_DEV_QFRZDIS; + int direction = CAM_DEV_TQFRZDIS; if (!len) direction |= CAM_DIR_NONE; else direction |= (dir & TR_DIR_READ)?CAM_DIR_IN : CAM_DIR_OUT; - cam_fill_csio (&(d->ccb.csio), 1, 0 /* NULL */, direction, MSG_SIMPLE_Q_TAG, (u_int8_t *)data, len, sizeof(d->ccb.csio.sense_data), d->ccb.csio.cdb_len, 30*1000); + cam_fill_csio (&(d->ccb.csio), 1, 0 /* NULL */, direction, MSG_SIMPLE_TQ_TAG, (u_int8_t *)data, len, sizeof(d->ccb.csio.sense_data), d->ccb.csio.cdb_len, 30*1000); unsigned char * sense = (unsigned char *)&d->ccb.csio.sense_data; ret = cam_send_ccb(m_device->handle(), &d->ccb); @@ -118,7 +118,7 @@ int K3bDevice::ScsiCommand::transport( TransportDirection dir, return result ? result : ret; } - else if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { + else if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_RETQ_CMP) { if( needToClose ) m_device->close(); m_device->usageUnlock(); @@ -165,7 +165,7 @@ int K3bDevice::ScsiCommand::transport( TransportDirection dir, return -1; } - if ((d->ccb.ccb_h.status&CAM_STATUS_MASK) != CAM_REQ_CMP) + if ((d->ccb.ccb_h.status&CAM_STATUS_MASK) != CAM_RETQ_CMP) { k3bDebug() << "(K3bDevice::ScsiCommand) transport failed (3): " << ret << endl; errno=EIO,-1; diff --git a/libk3bdevice/k3btoc.cpp b/libk3bdevice/k3btoc.cpp index 570bc9e..3ee39f1 100644 --- a/libk3bdevice/k3btoc.cpp +++ b/libk3bdevice/k3btoc.cpp @@ -17,17 +17,17 @@ #include "k3btoc.h" #include "k3bdebug.h" -#include <qstring.h> +#include <tqstring.h> K3bDevice::Toc::Toc() - : QValueList<K3bDevice::Track>() + : TQValueList<K3bDevice::Track>() { } K3bDevice::Toc::Toc( const Toc& toc ) - : QValueList<K3bDevice::Track>( toc ) + : TQValueList<K3bDevice::Track>( toc ) { m_firstSector = toc.firstSector(); } @@ -44,7 +44,7 @@ K3bDevice::Toc& K3bDevice::Toc::operator=( const Toc& toc ) m_firstSector = toc.firstSector(); - QValueList<K3bDevice::Track>::operator=( toc ); + TQValueList<K3bDevice::Track>::operator=( toc ); return *this; } @@ -125,7 +125,7 @@ int K3bDevice::Toc::sessions() const void K3bDevice::Toc::clear() { - QValueList<Track>::clear(); + TQValueList<Track>::clear(); m_mcn.resize( 0 ); m_firstSector = 0; } @@ -152,12 +152,12 @@ void K3bDevice::Toc::debug() const bool K3bDevice::Toc::operator==( const Toc& other ) const { return( m_firstSector == other.m_firstSector && - QValueList<Track>::operator==( other ) ); + TQValueList<Track>::operator==( other ) ); } bool K3bDevice::Toc::operator!=( const Toc& other ) const { return( m_firstSector != other.m_firstSector || - QValueList<Track>::operator!=( other ) ); + TQValueList<Track>::operator!=( other ) ); } diff --git a/libk3bdevice/k3btoc.h b/libk3bdevice/k3btoc.h index adfba74..45923f6 100644 --- a/libk3bdevice/k3btoc.h +++ b/libk3bdevice/k3btoc.h @@ -17,14 +17,14 @@ #ifndef K3BTOC_H #define K3BTOC_H -#include <qvaluelist.h> -#include <qcstring.h> +#include <tqvaluelist.h> +#include <tqcstring.h> #include <k3bmsf.h> #include "k3btrack.h" #include "k3bdevice_export.h" -class QString; +class TQString; namespace K3bDevice { @@ -42,7 +42,7 @@ namespace K3bDevice * The Toc deletes all its tracks when it is deleted and * deletes removed tracks. */ - class LIBK3BDEVICE_EXPORT Toc : public QValueList<K3bTrack> + class LIBK3BDEVICE_EXPORT Toc : public TQValueList<K3bTrack> { public: Toc(); @@ -58,7 +58,7 @@ namespace K3bDevice */ unsigned int discId() const; - const QCString& mcn() const { return m_mcn; } + const TQCString& mcn() const { return m_mcn; } /** * determine the contents type based on the tracks' types. @@ -81,7 +81,7 @@ namespace K3bDevice void setFirstSector( int i ) { m_firstSector = i; } - void setMcn( const QCString& mcn ) { m_mcn = mcn; } + void setMcn( const TQCString& mcn ) { m_mcn = mcn; } void clear(); @@ -94,7 +94,7 @@ namespace K3bDevice unsigned int m_discId; K3b::Msf m_firstSector; - QCString m_mcn; + TQCString m_mcn; }; } diff --git a/libk3bdevice/k3btrack.h b/libk3bdevice/k3btrack.h index f68cc86..7e42b03 100644 --- a/libk3bdevice/k3btrack.h +++ b/libk3bdevice/k3btrack.h @@ -18,8 +18,8 @@ #ifndef K3BTRACK_H #define K3BTRACK_H -#include <qcstring.h> -#include <qvaluevector.h> +#include <tqcstring.h> +#include <tqvaluevector.h> #include <k3bmsf.h> #include "k3bdevice_export.h" @@ -75,8 +75,8 @@ namespace K3bDevice bool recordedIncremental() const { return m_preEmphasis; } bool recordedUninterrupted() const { return !recordedIncremental(); } - const QCString& isrc() const { return m_isrc; } - void setIsrc( const QCString& s ) { m_isrc = s; } + const TQCString& isrc() const { return m_isrc; } + void setIsrc( const TQCString& s ) { m_isrc = s; } const K3b::Msf& firstSector() const { return m_firstSector; } const K3b::Msf& lastSector() const { return m_lastSector; } @@ -120,7 +120,7 @@ namespace K3bDevice * All indices. Normally this list is empty as indices are rarely used. * Starts with index 2 (since index 1 are all other sectors FIXME) */ - const QValueVector<K3b::Msf>& indices() const { return m_indices; } + const TQValueVector<K3b::Msf>& indices() const { return m_indices; } bool operator==( const Track& ) const; bool operator!=( const Track& ) const; @@ -140,9 +140,9 @@ namespace K3bDevice int m_session; - QValueVector<K3b::Msf> m_indices; + TQValueVector<K3b::Msf> m_indices; - QCString m_isrc; + TQCString m_isrc; }; } diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp index 7351ffc..437f188 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp @@ -25,8 +25,8 @@ #include <kconfig.h> #include <kdialog.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <alsa/asoundlib.h> #include <alsa/pcm.h> @@ -46,7 +46,7 @@ public: snd_pcm_t *pcm_playback; bool error; - QString lastErrorMessage; + TQString lastErrorMessage; bool swap; @@ -54,8 +54,8 @@ public: }; -K3bAlsaOutputPlugin::K3bAlsaOutputPlugin( QObject* parent, const char* name ) - : K3bAudioOutputPlugin( parent, name ) +K3bAlsaOutputPlugin::K3bAlsaOutputPlugin( TQObject* tqparent, const char* name ) + : K3bAudioOutputPlugin( tqparent, name ) { d = new Private; } @@ -109,7 +109,7 @@ bool K3bAlsaOutputPlugin::recoverFromError( int err ) if( err == -EPIPE ) { err = snd_pcm_prepare( d->pcm_playback ); if( err < 0 ) { - d->lastErrorMessage = i18n("Internal Alsa problem: %1").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Internal Alsa problem: %1").tqarg(snd_strerror(err)); return false; } } @@ -121,7 +121,7 @@ bool K3bAlsaOutputPlugin::recoverFromError( int err ) // unable to wake up pcm device, restart it err = snd_pcm_prepare( d->pcm_playback ); if( err < 0 ) { - d->lastErrorMessage = i18n("Internal Alsa problem: %1").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Internal Alsa problem: %1").tqarg(snd_strerror(err)); return false; } } @@ -149,11 +149,11 @@ bool K3bAlsaOutputPlugin::init() cleanup(); KConfigGroup c( k3bcore->config(), "Alsa Output Plugin" ); - QString alsaDevice = c.readEntry( "output device", "default" ); + TQString alsaDevice = c.readEntry( "output device", "default" ); int err = snd_pcm_open( &d->pcm_playback, alsaDevice.local8Bit(), SND_PCM_STREAM_PLAYBACK, 0 ); if( err < 0 ) { - d->lastErrorMessage = i18n("Could not open alsa audio device '%1' (%2).").arg(alsaDevice).arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not open alsa audio device '%1' (%2).").tqarg(alsaDevice).tqarg(snd_strerror(err)); d->error = true; return false; } @@ -174,20 +174,20 @@ bool K3bAlsaOutputPlugin::setupHwParams() int err = 0; if( ( err = snd_pcm_hw_params_malloc( &hw_params ) ) < 0 ) { - d->lastErrorMessage = i18n("Could not allocate hardware parameter structure (%1)").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not allocate hardware parameter structure (%1)").tqarg(snd_strerror(err)); d->error = true; return false; } if( (err = snd_pcm_hw_params_any( d->pcm_playback, hw_params )) < 0) { - d->lastErrorMessage = i18n("Could not initialize hardware parameter structure (%1).").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not initialize hardware parameter structure (%1).").tqarg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; } if( (err = snd_pcm_hw_params_set_access( d->pcm_playback, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { - d->lastErrorMessage = i18n("Could not set access type (%1).").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set access type (%1).").tqarg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; @@ -195,7 +195,7 @@ bool K3bAlsaOutputPlugin::setupHwParams() if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_BE)) < 0) { if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) { - d->lastErrorMessage = i18n("Could not set sample format (%1).").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set sample format (%1).").tqarg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; @@ -208,7 +208,7 @@ bool K3bAlsaOutputPlugin::setupHwParams() d->sampleRate = 44100; if( (err = snd_pcm_hw_params_set_rate_near( d->pcm_playback, hw_params, &d->sampleRate, 0)) < 0) { - d->lastErrorMessage = i18n("Could not set sample rate (%1).").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set sample rate (%1).").tqarg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; @@ -217,14 +217,14 @@ bool K3bAlsaOutputPlugin::setupHwParams() kdDebug() << "(K3bAlsaOutputPlugin) samplerate set to " << d->sampleRate << endl; if( (err = snd_pcm_hw_params_set_channels( d->pcm_playback, hw_params, 2)) < 0) { - d->lastErrorMessage = i18n("Could not set channel count (%1).").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set channel count (%1).").tqarg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; } if( (err = snd_pcm_hw_params( d->pcm_playback, hw_params )) < 0) { - d->lastErrorMessage = i18n("Could not set parameters (%1).").arg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set parameters (%1).").tqarg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; @@ -236,28 +236,28 @@ bool K3bAlsaOutputPlugin::setupHwParams() } -QString K3bAlsaOutputPlugin::lastErrorMessage() const +TQString K3bAlsaOutputPlugin::lastErrorMessage() const { return d->lastErrorMessage; } -K3bPluginConfigWidget* K3bAlsaOutputPlugin::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bAlsaOutputPlugin::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bAlsaOutputPluginConfigWidget( parent, name ); + return new K3bAlsaOutputPluginConfigWidget( tqparent, name ); } -K3bAlsaOutputPluginConfigWidget::K3bAlsaOutputPluginConfigWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bAlsaOutputPluginConfigWidget::K3bAlsaOutputPluginConfigWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { - QHBoxLayout* l = new QHBoxLayout( this ); + TQHBoxLayout* l = new TQHBoxLayout( this ); l->setSpacing( KDialog::spacingHint() ); l->setAutoAdd( true ); - (void)new QLabel( i18n("Alsa device:"), this ); + (void)new TQLabel( i18n("Alsa device:"), this ); m_comboDevice = new KComboBox( this ); m_comboDevice->setEditable( true ); diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.h b/plugins/audiooutput/alsa/k3balsaoutputplugin.h index 7e59b1e..b0fce65 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.h +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.h @@ -25,20 +25,20 @@ class KComboBox; class K3bAlsaOutputPlugin : public K3bAudioOutputPlugin { public: - K3bAlsaOutputPlugin( QObject* parent = 0, const char* name = 0 ); + K3bAlsaOutputPlugin( TQObject* tqparent = 0, const char* name = 0 ); ~K3bAlsaOutputPlugin(); int pluginSystemVersion() const { return 3; } - QCString soundSystem() const { return "alsa"; } + TQCString soundSystem() const { return "alsa"; } bool init(); void cleanup(); - QString lastErrorMessage() const; + TQString lastErrorMessage() const; int write( char* data, int len ); - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: @@ -53,9 +53,10 @@ class K3bAlsaOutputPlugin : public K3bAudioOutputPlugin class K3bAlsaOutputPluginConfigWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bAlsaOutputPluginConfigWidget( QWidget* parent = 0, const char* name = 0 ); + K3bAlsaOutputPluginConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAlsaOutputPluginConfigWidget(); public slots: diff --git a/plugins/audiooutput/arts/k3bartsoutputplugin.cpp b/plugins/audiooutput/arts/k3bartsoutputplugin.cpp index 893571a..e3ce210 100644 --- a/plugins/audiooutput/arts/k3bartsoutputplugin.cpp +++ b/plugins/audiooutput/arts/k3bartsoutputplugin.cpp @@ -24,8 +24,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3bartsoutputplugin, K3bPluginFactory<K3bArtsOutputPlugin>( "k3bartsoutputplugin" ) ) -K3bArtsOutputPlugin::K3bArtsOutputPlugin( QObject* parent, const char* name ) - : K3bAudioOutputPlugin( parent, name ), +K3bArtsOutputPlugin::K3bArtsOutputPlugin( TQObject* tqparent, const char* name ) + : K3bAudioOutputPlugin( tqparent, name ), m_initialized(false), m_lastErrorCode(0) { @@ -83,8 +83,8 @@ bool K3bArtsOutputPlugin::init() } -QString K3bArtsOutputPlugin::lastErrorMessage() const +TQString K3bArtsOutputPlugin::lastErrorMessage() const { - return QString::fromLocal8Bit( arts_error_text(m_lastErrorCode) ); + return TQString::fromLocal8Bit( arts_error_text(m_lastErrorCode) ); } diff --git a/plugins/audiooutput/arts/k3bartsoutputplugin.h b/plugins/audiooutput/arts/k3bartsoutputplugin.h index 57a2b22..8778187 100644 --- a/plugins/audiooutput/arts/k3bartsoutputplugin.h +++ b/plugins/audiooutput/arts/k3bartsoutputplugin.h @@ -24,16 +24,16 @@ class K3bArtsOutputPlugin : public K3bAudioOutputPlugin { public: - K3bArtsOutputPlugin( QObject* parent = 0, const char* name = 0 ); + K3bArtsOutputPlugin( TQObject* tqparent = 0, const char* name = 0 ); ~K3bArtsOutputPlugin(); int pluginSystemVersion() const { return 3; } - QCString soundSystem() const { return "arts"; } + TQCString soundSystem() const { return "arts"; } bool init(); void cleanup(); - QString lastErrorMessage() const; + TQString lastErrorMessage() const; int write( char* data, int len ); diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp b/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp index fd47c52..d4ab6a9 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp @@ -31,8 +31,8 @@ extern "C" { K_EXPORT_COMPONENT_FACTORY( libk3bffmpegdecoder, K3bPluginFactory<K3bFFMpegDecoderFactory>( "k3bffmpegdecoder" ) ) -K3bFFMpegDecoderFactory::K3bFFMpegDecoderFactory( QObject* parent, const char* name ) - : K3bAudioDecoderFactory( parent, name ) +K3bFFMpegDecoderFactory::K3bFFMpegDecoderFactory( TQObject* tqparent, const char* name ) + : K3bAudioDecoderFactory( tqparent, name ) { } @@ -42,10 +42,10 @@ K3bFFMpegDecoderFactory::~K3bFFMpegDecoderFactory() } -K3bAudioDecoder* K3bFFMpegDecoderFactory::createDecoder( QObject* parent, +K3bAudioDecoder* K3bFFMpegDecoderFactory::createDecoder( TQObject* tqparent, const char* name ) const { - return new K3bFFMpegDecoder( parent, name ); + return new K3bFFMpegDecoder( tqparent, name ); } @@ -66,8 +66,8 @@ bool K3bFFMpegDecoderFactory::canDecode( const KURL& url ) -K3bFFMpegDecoder::K3bFFMpegDecoder( QObject* parent, const char* name ) - : K3bAudioDecoder( parent, name ), +K3bFFMpegDecoder::K3bFFMpegDecoder( TQObject* tqparent, const char* name ) + : K3bAudioDecoder( tqparent, name ), m_file(0) { } @@ -78,7 +78,7 @@ K3bFFMpegDecoder::~K3bFFMpegDecoder() } -QString K3bFFMpegDecoder::fileType() const +TQString K3bFFMpegDecoder::fileType() const { return m_type; } diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h index 1c21827..59d7ef0 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h +++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h @@ -24,9 +24,10 @@ class K3bFFMpegFile; class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory { Q_OBJECT + TQ_OBJECT public: - K3bFFMpegDecoderFactory( QObject* parent = 0, const char* name = 0 ); + K3bFFMpegDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); ~K3bFFMpegDecoderFactory(); bool canDecode( const KURL& filename ); @@ -35,7 +36,7 @@ class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory bool multiFormatDecoder() const { return true; } - K3bAudioDecoder* createDecoder( QObject* parent = 0, + K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const; }; @@ -43,12 +44,13 @@ class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory class K3bFFMpegDecoder : public K3bAudioDecoder { Q_OBJECT + TQ_OBJECT public: - K3bFFMpegDecoder( QObject* parent = 0, const char* name = 0 ); + K3bFFMpegDecoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bFFMpegDecoder(); - QString fileType() const; + TQString fileType() const; void cleanup(); @@ -61,7 +63,7 @@ class K3bFFMpegDecoder : public K3bAudioDecoder private: K3bFFMpegFile* m_file; - QString m_type; + TQString m_type; }; #endif diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp index 514fd67..898c47d 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -48,12 +48,12 @@ public: char* outputBufferPos; int outputBufferSize; AVPacket packet; - Q_UINT8* packetData; + TQ_UINT8* packetData; int packetSize; }; -K3bFFMpegFile::K3bFFMpegFile( const QString& filename ) +K3bFFMpegFile::K3bFFMpegFile( const TQString& filename ) : m_filename(filename) { d = new Private; @@ -187,7 +187,7 @@ int K3bFFMpegFile::type() const } -QString K3bFFMpegFile::typeComment() const +TQString K3bFFMpegFile::typeComment() const { switch( type() ) { case CODEC_ID_WMAV1: @@ -199,45 +199,45 @@ QString K3bFFMpegFile::typeComment() const case CODEC_ID_AAC: return i18n("Advanced Audio Coding (AAC)"); default: - return QString::fromLocal8Bit( d->codec->name ); + return TQString::fromLocal8Bit( d->codec->name ); } } -QString K3bFFMpegFile::title() const +TQString K3bFFMpegFile::title() const { // FIXME: is this UTF8 or something?? if( d->formatContext->title[0] != '\0' ) - return QString::fromLocal8Bit( d->formatContext->title ); + return TQString::fromLocal8Bit( d->formatContext->title ); else - return QString::null; + return TQString(); } -QString K3bFFMpegFile::author() const +TQString K3bFFMpegFile::author() const { // FIXME: is this UTF8 or something?? if( d->formatContext->author[0] != '\0' ) - return QString::fromLocal8Bit( d->formatContext->author ); + return TQString::fromLocal8Bit( d->formatContext->author ); else - return QString::null; + return TQString(); } -QString K3bFFMpegFile::comment() const +TQString K3bFFMpegFile::comment() const { // FIXME: is this UTF8 or something?? if( d->formatContext->comment[0] != '\0' ) - return QString::fromLocal8Bit( d->formatContext->comment ); + return TQString::fromLocal8Bit( d->formatContext->comment ); else - return QString::null; + return TQString(); } int K3bFFMpegFile::read( char* buf, int bufLen ) { if( fillOutputBuffer() > 0 ) { - int len = QMIN(bufLen, d->outputBufferSize); + int len = TQMIN(bufLen, d->outputBufferSize); ::memcpy( buf, d->outputBufferPos, len ); // TODO: only swap if needed @@ -316,7 +316,7 @@ bool K3bFFMpegFile::seek( const K3b::Msf& msf ) d->packetSize = 0; double seconds = (double)msf.totalFrames()/75.0; - Q_UINT64 timestamp = (Q_UINT64)(seconds * (double)AV_TIME_BASE); + TQ_UINT64 timestamp = (TQ_UINT64)(seconds * (double)AV_TIME_BASE); // FIXME: do we really need the start_time and why? #if LIBAVFORMAT_BUILD >= 4619 @@ -353,7 +353,7 @@ K3bFFMpegWrapper* K3bFFMpegWrapper::instance() } -K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const +K3bFFMpegFile* K3bFFMpegWrapper::open( const TQString& filename ) const { K3bFFMpegFile* file = new K3bFFMpegFile( filename ); if( file->open() ) { diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h index 63b5f58..60d6dd3 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h @@ -30,7 +30,7 @@ class K3bFFMpegFile public: ~K3bFFMpegFile(); - const QString& filename() const { return m_filename; } + const TQString& filename() const { return m_filename; } bool open(); void close(); @@ -43,21 +43,21 @@ class K3bFFMpegFile * ffmpeg internal enumeration */ int type() const; - QString typeComment() const; + TQString typeComment() const; - QString title() const; - QString author() const; - QString comment() const; + TQString title() const; + TQString author() const; + TQString comment() const; int read( char* buf, int bufLen ); bool seek( const K3b::Msf& ); private: - K3bFFMpegFile( const QString& filename ); + K3bFFMpegFile( const TQString& filename ); int readPacket(); int fillOutputBuffer(); - QString m_filename; + TQString m_filename; class Private; Private* d; @@ -72,7 +72,7 @@ class K3bFFMpegWrapper /** * returns 0 on failure. */ - K3bFFMpegFile* open( const QString& filename ) const; + K3bFFMpegFile* open( const TQString& filename ) const; static K3bFFMpegWrapper* instance(); diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp index 762403f..4e537b0 100644 --- a/plugins/decoder/flac/k3bflacdecoder.cpp +++ b/plugins/decoder/flac/k3bflacdecoder.cpp @@ -17,9 +17,9 @@ #include <k3bpluginfactory.h> -#include <qbuffer.h> -#include <qfile.h> -#include <qstringlist.h> +#include <tqbuffer.h> +#include <tqfile.h> +#include <tqstringlist.h> #include <kurl.h> #include <kdebug.h> @@ -52,7 +52,7 @@ class K3bFLACDecoder::Private #endif { public: - void open(QFile* f) { + void open(TQFile* f) { file = f; file->open(IO_ReadOnly); @@ -72,14 +72,14 @@ public: comments = 0; } - Private(QFile* f) + Private(TQFile* f) #ifdef LEGACY_FLAC : FLAC::Decoder::SeekableStream(), #else : FLAC::Decoder::Stream(), #endif comments(0) { - internalBuffer = new QBuffer(); + internalBuffer = new TQBuffer(); internalBuffer->open(IO_ReadWrite); open(f); @@ -93,8 +93,8 @@ public: bool seekToFrame(int frame); - QFile* file; - QBuffer* internalBuffer; + TQFile* file; + TQBuffer* internalBuffer; FLAC::Metadata::VorbisComment* comments; unsigned rate; unsigned channels; @@ -240,8 +240,8 @@ FLAC__StreamDecoderWriteStatus K3bFLACDecoder::Private::write_callback(const FLA return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } -K3bFLACDecoder::K3bFLACDecoder( QObject* parent, const char* name ) - : K3bAudioDecoder( parent, name ) +K3bFLACDecoder::K3bFLACDecoder( TQObject* tqparent, const char* name ) + : K3bAudioDecoder( tqparent, name ) { d = 0; } @@ -256,10 +256,10 @@ void K3bFLACDecoder::cleanup() { if (d) { d->cleanup(); - d->open(new QFile(filename())); + d->open(new TQFile(filename())); } else - d = new Private(new QFile(filename())); + d = new Private(new TQFile(filename())); } bool K3bFLACDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate, int& ch ) @@ -274,9 +274,9 @@ bool K3bFLACDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate, int if( d->comments != 0 ) { kdDebug() << "(K3bFLACDecoder) unpacking Vorbis tags" << endl; for( unsigned int i = 0; i < d->comments->get_num_comments(); ++i ) { - QString key = QString::fromUtf8( d->comments->get_comment(i).get_field_name(), + TQString key = TQString::fromUtf8( d->comments->get_comment(i).get_field_name(), d->comments->get_comment(i).get_field_name_length() ); - QString value = QString::fromUtf8( d->comments->get_comment(i).get_field_value(), + TQString value = TQString::fromUtf8( d->comments->get_comment(i).get_field_value(), d->comments->get_comment(i).get_field_value_length() ); if( key.upper() == "TITLE" ) @@ -291,7 +291,7 @@ bool K3bFLACDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate, int if ((d->comments == 0) || (d->comments->get_num_comments() == 0)) { // no Vorbis comments, check for ID3 tags kdDebug() << "(K3bFLACDecoder) using taglib to read tag" << endl; - TagLib::FLAC::File f( QFile::encodeName(filename()) ); + TagLib::FLAC::File f( TQFile::encodeName(filename()) ); if( f.isOpen() ) { addMetaInfo( META_TITLE, TStringToQString( f.tag()->title() ) ); addMetaInfo( META_ARTIST, TStringToQString( f.tag()->artist() ) ); @@ -348,7 +348,7 @@ int K3bFLACDecoder::decodeInternal( char* _data, int maxLen ) #endif bytesAvailable = d->internalBuffer->size() - d->internalBuffer->at(); - bytesToCopy = QMIN(maxLen, bytesAvailable); + bytesToCopy = TQMIN(maxLen, bytesAvailable); bytesCopied = (int)d->internalBuffer->readBlock(_data, bytesToCopy); if(bytesCopied == bytesAvailable) { @@ -367,45 +367,45 @@ bool K3bFLACDecoder::seekInternal( const K3b::Msf& pos ) } -QString K3bFLACDecoder::fileType() const +TQString K3bFLACDecoder::fileType() const { return i18n("FLAC"); } -QStringList K3bFLACDecoder::supportedTechnicalInfos() const +TQStringList K3bFLACDecoder::supportedTechnicalInfos() const { - return QStringList::split( ";", + return TQStringList::split( ";", i18n("Channels") + ";" + i18n("Sampling Rate") + ";" + i18n("Sample Size") ); } -QString K3bFLACDecoder::technicalInfo( const QString& info ) const +TQString K3bFLACDecoder::technicalInfo( const TQString& info ) const { if( d->comments != 0 ) { if( info == i18n("Vendor") ) #ifdef FLAC_NEWER_THAN_1_1_1 - return QString::fromUtf8((char*)d->comments->get_vendor_string()); + return TQString::fromUtf8((char*)d->comments->get_vendor_string()); #else - return QString::fromUtf8(d->comments->get_vendor_string().get_field()); + return TQString::fromUtf8(d->comments->get_vendor_string().get_field()); #endif else if( info == i18n("Channels") ) - return QString::number(d->channels); + return TQString::number(d->channels); else if( info == i18n("Sampling Rate") ) - return i18n("%1 Hz").arg(d->rate); + return i18n("%1 Hz").tqarg(d->rate); else if( info == i18n("Sample Size") ) - return i18n("%1 bits").arg(d->bitsPerSample); + return i18n("%1 bits").tqarg(d->bitsPerSample); } - return QString::null; + return TQString(); } -K3bFLACDecoderFactory::K3bFLACDecoderFactory( QObject* parent, const char* name ) - : K3bAudioDecoderFactory( parent, name ) +K3bFLACDecoderFactory::K3bFLACDecoderFactory( TQObject* tqparent, const char* name ) + : K3bAudioDecoderFactory( tqparent, name ) { } @@ -415,10 +415,10 @@ K3bFLACDecoderFactory::~K3bFLACDecoderFactory() } -K3bAudioDecoder* K3bFLACDecoderFactory::createDecoder( QObject* parent, +K3bAudioDecoder* K3bFLACDecoderFactory::createDecoder( TQObject* tqparent, const char* name ) const { - return new K3bFLACDecoder( parent, name ); + return new K3bFLACDecoder( tqparent, name ); } @@ -429,7 +429,7 @@ bool K3bFLACDecoderFactory::canDecode( const KURL& url ) // Note: since file is created on the stack it will be closed automatically // by its destructor when this method (i.e. canDecode) returns. - QFile file(url.path()); + TQFile file(url.path()); if(!file.open(IO_ReadOnly)) { kdDebug() << "(K3bFLACDecoder) Could not open file " << url.path() << endl; @@ -482,11 +482,11 @@ bool K3bFLACDecoderFactory::canDecode( const KURL& url ) } else { kdDebug() << "(K3bFLACDecoder) " << url.path() << ": wrong format:" << endl << " channels: " - << QString::number(info.get_channels()) << endl + << TQString::number(info.get_channels()) << endl << " samplerate: " - << QString::number(info.get_sample_rate()) << endl + << TQString::number(info.get_sample_rate()) << endl << " bits/sample: " - << QString::number(info.get_bits_per_sample()) << endl; + << TQString::number(info.get_bits_per_sample()) << endl; return false; } } diff --git a/plugins/decoder/flac/k3bflacdecoder.h b/plugins/decoder/flac/k3bflacdecoder.h index aace651..2e3bccf 100644 --- a/plugins/decoder/flac/k3bflacdecoder.h +++ b/plugins/decoder/flac/k3bflacdecoder.h @@ -24,16 +24,17 @@ class KURL; class K3bFLACDecoderFactory : public K3bAudioDecoderFactory { Q_OBJECT + TQ_OBJECT public: - K3bFLACDecoderFactory( QObject* parent = 0, const char* name = 0 ); + K3bFLACDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); ~K3bFLACDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( QObject* parent = 0, + K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const; }; @@ -41,18 +42,19 @@ class K3bFLACDecoderFactory : public K3bAudioDecoderFactory class K3bFLACDecoder : public K3bAudioDecoder { Q_OBJECT + TQ_OBJECT public: - K3bFLACDecoder( QObject* parent = 0, const char* name = 0 ); + K3bFLACDecoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bFLACDecoder(); void cleanup(); bool seekInternal( const K3b::Msf& ); - QString fileType() const; - QStringList supportedTechnicalInfos() const; - QString technicalInfo( const QString& ) const; + TQString fileType() const; + TQStringList supportedTechnicalInfos() const; + TQString technicalInfo( const TQString& ) const; protected: bool analyseFileInternal( K3b::Msf& frames, int& samplerate, int& ch ); diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp index ea3d014..0f23d4e 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp @@ -20,8 +20,8 @@ #include <k3bpluginfactory.h> -#include <qfile.h> -#include <qstringlist.h> +#include <tqfile.h> +#include <tqstringlist.h> #include <kurl.h> #include <kdebug.h> @@ -57,8 +57,8 @@ public: -K3bLibsndfileDecoder::K3bLibsndfileDecoder( QObject* parent, const char* name ) - : K3bAudioDecoder( parent, name ) +K3bLibsndfileDecoder::K3bLibsndfileDecoder( TQObject* tqparent, const char* name ) + : K3bAudioDecoder( tqparent, name ) { d = new Private(); } @@ -70,10 +70,10 @@ K3bLibsndfileDecoder::~K3bLibsndfileDecoder() } -QString K3bLibsndfileDecoder::fileType() const +TQString K3bLibsndfileDecoder::fileType() const { if( d->format_info.name ) - return QString::fromLocal8Bit(d->format_info.name); + return TQString::fromLocal8Bit(d->format_info.name); else return "-"; } @@ -87,7 +87,7 @@ bool K3bLibsndfileDecoder::openFile() cleanup(); d->sndinfo.format = 0; - d->sndfile = sf_open (QFile::encodeName(filename()), SFM_READ, &d->sndinfo); + d->sndfile = sf_open (TQFile::encodeName(filename()), SFM_READ, &d->sndinfo); if ( !d->sndfile ) { kdDebug() << "(K3bLibsndfileDecoder::openLibsndfileFile) : " << sf_strerror(d->sndfile) << endl; return false; @@ -124,8 +124,8 @@ bool K3bLibsndfileDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerat addMetaInfo( META_ARTIST, sf_get_string(d->sndfile, SF_STR_ARTIST) ); addMetaInfo( META_COMMENT, sf_get_string(d->sndfile, SF_STR_COMMENT) ); - addTechnicalInfo( i18n("Channels"), QString::number(d->sndinfo.channels) ); - addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").arg(d->sndinfo.samplerate) ); + addTechnicalInfo( i18n("Channels"), TQString::number(d->sndinfo.channels) ); + addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").tqarg(d->sndinfo.samplerate) ); frames = (unsigned long)ceil(d->sndinfo.frames / d->sndinfo.samplerate * 75.0); samplerate = d->sndinfo.samplerate; @@ -202,8 +202,8 @@ void K3bLibsndfileDecoder::cleanup() /********************************************************/ -K3bLibsndfileDecoderFactory::K3bLibsndfileDecoderFactory( QObject* parent, const char* name ) - : K3bAudioDecoderFactory( parent, name ) +K3bLibsndfileDecoderFactory::K3bLibsndfileDecoderFactory( TQObject* tqparent, const char* name ) + : K3bAudioDecoderFactory( tqparent, name ) { } @@ -213,10 +213,10 @@ K3bLibsndfileDecoderFactory::~K3bLibsndfileDecoderFactory() } -K3bAudioDecoder* K3bLibsndfileDecoderFactory::createDecoder( QObject* parent, +K3bAudioDecoder* K3bLibsndfileDecoderFactory::createDecoder( TQObject* tqparent, const char* name ) const { - return new K3bLibsndfileDecoder( parent, name ); + return new K3bLibsndfileDecoder( tqparent, name ); } @@ -224,7 +224,7 @@ bool K3bLibsndfileDecoderFactory::canDecode( const KURL& url ) { SF_INFO infos; infos.format = 0; - SNDFILE* sndfile = sf_open (QFile::encodeName(url.path()), SFM_READ, &infos); + SNDFILE* sndfile = sf_open (TQFile::encodeName(url.path()), SFM_READ, &infos); //is it supported by libsndfile? if ( !sndfile ) { diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h index 7ffbe2d..005cb0b 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h @@ -25,9 +25,10 @@ class KURL; class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory { Q_OBJECT + TQ_OBJECT public: - K3bLibsndfileDecoderFactory( QObject* parent = 0, const char* name = 0 ); + K3bLibsndfileDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); ~K3bLibsndfileDecoderFactory(); bool canDecode( const KURL& filename ); @@ -36,7 +37,7 @@ class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory bool multiFormatDecoder() const { return true; } - K3bAudioDecoder* createDecoder( QObject* parent = 0, + K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const; }; @@ -44,12 +45,13 @@ class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory class K3bLibsndfileDecoder : public K3bAudioDecoder { Q_OBJECT + TQ_OBJECT public: - K3bLibsndfileDecoder( QObject* parent = 0, const char* name = 0 ); + K3bLibsndfileDecoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bLibsndfileDecoder(); void cleanup(); - QString fileType() const; + TQString fileType() const; protected: bool analyseFileInternal( K3b::Msf& frames, int& samplerate, int& ch ); diff --git a/plugins/decoder/mp3/k3bmad.cpp b/plugins/decoder/mp3/k3bmad.cpp index cb4cf6c..74aeee3 100644 --- a/plugins/decoder/mp3/k3bmad.cpp +++ b/plugins/decoder/mp3/k3bmad.cpp @@ -15,7 +15,7 @@ #include "k3bmad.h" -#include <qfile.h> +#include <tqfile.h> #include <kdebug.h> @@ -52,7 +52,7 @@ K3bMad::~K3bMad() } -bool K3bMad::open( const QString& filename ) +bool K3bMad::open( const TQString& filename ) { cleanup(); @@ -105,7 +105,7 @@ bool K3bMad::fillStreamBuffer() } // Fill-in the buffer. - Q_LONG result = m_inputFile.readBlock( (char*)readStart, readSize ); + TQ_LONG result = m_inputFile.readBlock( (char*)readStart, readSize ); if( result < 0 ) { kdDebug() << "(K3bMad) read error on bitstream)" << endl; m_bInputError = true; @@ -192,7 +192,7 @@ bool K3bMad::seekFirstHeader() // take way to long for non-mp3 files. // bool headerFound = findNextHeader(); - QIODevice::Offset inputPos = streamPos(); + TQIODevice::Offset inputPos = streamPos(); while( !headerFound && !m_inputFile.atEnd() && streamPos() <= inputPos+1024 ) { @@ -222,19 +222,19 @@ bool K3bMad::eof() const } -QIODevice::Offset K3bMad::inputPos() const +TQIODevice::Offset K3bMad::inputPos() const { return m_inputFile.at(); } -QIODevice::Offset K3bMad::streamPos() const +TQIODevice::Offset K3bMad::streamPos() const { return inputPos() - (madStream->bufend - madStream->this_frame + 1); } -bool K3bMad::inputSeek( QIODevice::Offset pos ) +bool K3bMad::inputSeek( TQIODevice::Offset pos ) { return m_inputFile.at( pos ); } diff --git a/plugins/decoder/mp3/k3bmad.h b/plugins/decoder/mp3/k3bmad.h index a4d9aae..d526c1d 100644 --- a/plugins/decoder/mp3/k3bmad.h +++ b/plugins/decoder/mp3/k3bmad.h @@ -20,7 +20,7 @@ extern "C" { #include <mad.h> } -#include <qfile.h> +#include <tqfile.h> class K3bMad @@ -29,7 +29,7 @@ public: K3bMad(); ~K3bMad(); - bool open( const QString& filename ); + bool open( const TQString& filename ); /** * @return true if the mad stream contains data @@ -59,13 +59,13 @@ public: * care about the status of the mad stream. Use streamPos() * in that case. */ - QIODevice::Offset inputPos() const; + TQIODevice::Offset inputPos() const; /** * Current absolut position of the decoder stream. */ - QIODevice::Offset streamPos() const; - bool inputSeek( QIODevice::Offset pos ); + TQIODevice::Offset streamPos() const; + bool inputSeek( TQIODevice::Offset pos ); void initMad(); void cleanup(); @@ -80,7 +80,7 @@ public: mad_timer_t* madTimer; private: - QFile m_inputFile; + TQFile m_inputFile; bool m_madStructuresInitialized; unsigned char* m_inputBuffer; bool m_bInputError; diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp index e3aef56..6f606c8 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.cpp +++ b/plugins/decoder/mp3/k3bmaddecoder.cpp @@ -35,9 +35,9 @@ #include <kdebug.h> #include <klocale.h> -#include <qstring.h> -#include <qfile.h> -#include <qvaluevector.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqvaluevector.h> #include <stdlib.h> #include <cmath> @@ -70,7 +70,7 @@ public: K3bMad* handle; - QValueVector<unsigned long long> seekPositions; + TQValueVector<unsigned long long> seekPositions; bool bOutputFinished; @@ -86,8 +86,8 @@ public: -K3bMadDecoder::K3bMadDecoder( QObject* parent, const char* name ) - : K3bAudioDecoder( parent, name ) +K3bMadDecoder::K3bMadDecoder( TQObject* tqparent, const char* name ) + : K3bAudioDecoder( tqparent, name ) { d = new MadDecoderPrivate(); d->handle = new K3bMad(); @@ -102,10 +102,10 @@ K3bMadDecoder::~K3bMadDecoder() } -QString K3bMadDecoder::metaInfo( MetaDataField f ) +TQString K3bMadDecoder::metaInfo( MetaDataField f ) { #ifdef HAVE_TAGLIB - TagLib::MPEG::File file( QFile::encodeName( filename() ).data() ); + TagLib::MPEG::File file( TQFile::encodeName( filename() ).data() ); if ( file.tag() ) { switch( f ) { @@ -116,11 +116,11 @@ QString K3bMadDecoder::metaInfo( MetaDataField f ) case META_COMMENT: return TStringToQString( file.tag()->comment() ); default: - return QString::null; + return TQString(); } } else { - return QString::null; + return TQString(); } #else @@ -370,7 +370,7 @@ bool K3bMadDecoder::seekInternal( const K3b::Msf& pos ) } -QString K3bMadDecoder::fileType() const +TQString K3bMadDecoder::fileType() const { switch( d->firstHeader.layer ) { case MAD_LAYER_I: @@ -384,9 +384,9 @@ QString K3bMadDecoder::fileType() const } } -QStringList K3bMadDecoder::supportedTechnicalInfos() const +TQStringList K3bMadDecoder::supportedTechnicalInfos() const { - return QStringList::split( ";", + return TQStringList::split( ";", i18n("Channels") + ";" + i18n("Sampling Rate") + ";" + i18n("Bitrate") + ";" + @@ -398,7 +398,7 @@ QStringList K3bMadDecoder::supportedTechnicalInfos() const } -QString K3bMadDecoder::technicalInfo( const QString& name ) const +TQString K3bMadDecoder::technicalInfo( const TQString& name ) const { if( name == i18n("Channels") ) { switch( d->firstHeader.mode ) { @@ -415,12 +415,12 @@ QString K3bMadDecoder::technicalInfo( const QString& name ) const } } else if( name == i18n("Sampling Rate") ) - return i18n("%1 Hz").arg(d->firstHeader.samplerate); + return i18n("%1 Hz").tqarg(d->firstHeader.samplerate); else if( name == i18n("Bitrate") ) { if( d->vbr ) return i18n("VBR"); else - return i18n("%1 bps").arg(d->firstHeader.bitrate); + return i18n("%1 bps").tqarg(d->firstHeader.bitrate); } else if( name == i18n("Layer") ){ switch( d->firstHeader.layer ) { @@ -453,12 +453,12 @@ QString K3bMadDecoder::technicalInfo( const QString& name ) const else if( name == i18n("CRC") ) return ( d->firstHeader.flags & MAD_FLAG_PROTECTION ? i18n("Yes") : i18n("No") ); else - return QString::null; + return TQString(); } -K3bMadDecoderFactory::K3bMadDecoderFactory( QObject* parent, const char* name ) - : K3bAudioDecoderFactory( parent, name ) +K3bMadDecoderFactory::K3bMadDecoderFactory( TQObject* tqparent, const char* name ) + : K3bAudioDecoderFactory( tqparent, name ) { } @@ -468,10 +468,10 @@ K3bMadDecoderFactory::~K3bMadDecoderFactory() } -K3bAudioDecoder* K3bMadDecoderFactory::createDecoder( QObject* parent, +K3bAudioDecoder* K3bMadDecoderFactory::createDecoder( TQObject* tqparent, const char* name ) const { - return new K3bMadDecoder( parent, name ); + return new K3bMadDecoder( tqparent, name ); } @@ -484,14 +484,14 @@ bool K3bMadDecoderFactory::canDecode( const KURL& url ) // It always takes waves for mp3 files so we introduce this hack to // filter out wave files. :( // - QFile f( url.path() ); + TQFile f( url.path() ); if( !f.open( IO_ReadOnly ) ) return false; char buffer[12]; if( f.readBlock( buffer, 12 ) != 12 ) return false; - if( !qstrncmp( buffer, "RIFF", 4 ) && - !qstrncmp( buffer + 8, "WAVE", 4 ) ) + if( !tqstrncmp( buffer, "RIFF", 4 ) && + !tqstrncmp( buffer + 8, "WAVE", 4 ) ) return false; f.close(); @@ -510,7 +510,7 @@ bool K3bMadDecoderFactory::canDecode( const KURL& url ) unsigned int s = handle.madFrame->header.samplerate; // - // find 4 more mp3 headers (random value since 2 was not enough) + // tqfind 4 more mp3 headers (random value since 2 was not enough) // This way we get most of the mp3 files while sorting out // for example wave files. // diff --git a/plugins/decoder/mp3/k3bmaddecoder.h b/plugins/decoder/mp3/k3bmaddecoder.h index 91e0f6c..8eef755 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.h +++ b/plugins/decoder/mp3/k3bmaddecoder.h @@ -27,16 +27,17 @@ extern "C" { class K3bMadDecoderFactory : public K3bAudioDecoderFactory { Q_OBJECT + TQ_OBJECT public: - K3bMadDecoderFactory( QObject* parent = 0, const char* name = 0 ); + K3bMadDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); ~K3bMadDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( QObject* parent = 0, + K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const; }; @@ -44,20 +45,21 @@ class K3bMadDecoderFactory : public K3bAudioDecoderFactory class K3bMadDecoder : public K3bAudioDecoder { Q_OBJECT + TQ_OBJECT public: - K3bMadDecoder( QObject* parent = 0, const char* name = 0 ); + K3bMadDecoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bMadDecoder(); - QString metaInfo( MetaDataField ); + TQString metaInfo( MetaDataField ); void cleanup(); bool seekInternal( const K3b::Msf& ); - QString fileType() const; - QStringList supportedTechnicalInfos() const; - QString technicalInfo( const QString& ) const; + TQString fileType() const; + TQStringList supportedTechnicalInfos() const; + TQString technicalInfo( const TQString& ) const; protected: bool analyseFileInternal( K3b::Msf& frames, int& samplerate, int& ch ); diff --git a/plugins/decoder/musepack/k3bmpcdecoder.cpp b/plugins/decoder/musepack/k3bmpcdecoder.cpp index 0cdf644..6975bee 100644 --- a/plugins/decoder/musepack/k3bmpcdecoder.cpp +++ b/plugins/decoder/musepack/k3bmpcdecoder.cpp @@ -26,8 +26,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3bmpcdecoder, K3bPluginFactory<K3bMpcDecoderFactory>( "libk3bmpcdecoder" ) ) -K3bMpcDecoderFactory::K3bMpcDecoderFactory( QObject* parent, const char* name ) - : K3bAudioDecoderFactory( parent, name ) +K3bMpcDecoderFactory::K3bMpcDecoderFactory( TQObject* tqparent, const char* name ) + : K3bAudioDecoderFactory( tqparent, name ) { } @@ -37,10 +37,10 @@ K3bMpcDecoderFactory::~K3bMpcDecoderFactory() } -K3bAudioDecoder* K3bMpcDecoderFactory::createDecoder( QObject* parent, +K3bAudioDecoder* K3bMpcDecoderFactory::createDecoder( TQObject* tqparent, const char* name ) const { - return new K3bMpcDecoder( parent, name ); + return new K3bMpcDecoder( tqparent, name ); } @@ -55,8 +55,8 @@ bool K3bMpcDecoderFactory::canDecode( const KURL& url ) -K3bMpcDecoder::K3bMpcDecoder( QObject* parent, const char* name ) - : K3bAudioDecoder( parent, name ) +K3bMpcDecoder::K3bMpcDecoder( TQObject* tqparent, const char* name ) + : K3bAudioDecoder( tqparent, name ) { m_mpc = new K3bMpcWrapper(); } @@ -68,7 +68,7 @@ K3bMpcDecoder::~K3bMpcDecoder() } -QString K3bMpcDecoder::fileType() const +TQString K3bMpcDecoder::fileType() const { return i18n("Musepack"); } diff --git a/plugins/decoder/musepack/k3bmpcdecoder.h b/plugins/decoder/musepack/k3bmpcdecoder.h index 74dc509..d0f6935 100644 --- a/plugins/decoder/musepack/k3bmpcdecoder.h +++ b/plugins/decoder/musepack/k3bmpcdecoder.h @@ -24,16 +24,17 @@ class K3bMpcWrapper; class K3bMpcDecoderFactory : public K3bAudioDecoderFactory { Q_OBJECT + TQ_OBJECT public: - K3bMpcDecoderFactory( QObject* parent = 0, const char* name = 0 ); + K3bMpcDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); ~K3bMpcDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( QObject* parent = 0, + K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const; }; @@ -41,12 +42,13 @@ class K3bMpcDecoderFactory : public K3bAudioDecoderFactory class K3bMpcDecoder : public K3bAudioDecoder { Q_OBJECT + TQ_OBJECT public: - K3bMpcDecoder( QObject* parent = 0, const char* name = 0 ); + K3bMpcDecoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bMpcDecoder(); - QString fileType() const; + TQString fileType() const; protected: bool analyseFileInternal( K3b::Msf& frames, int& samplerate, int& ch ); diff --git a/plugins/decoder/musepack/k3bmpcwrapper.cpp b/plugins/decoder/musepack/k3bmpcwrapper.cpp index 9f54b28..75153b5 100644 --- a/plugins/decoder/musepack/k3bmpcwrapper.cpp +++ b/plugins/decoder/musepack/k3bmpcwrapper.cpp @@ -16,31 +16,31 @@ #include "k3bmpcwrapper.h" #include <kdebug.h> -#include <qfile.h> +#include <tqfile.h> mpc_int32_t read_impl( void* data, void* ptr, mpc_int32_t size ) { - QFile* input = static_cast<QFile*>( data ); + TQFile* input = static_cast<TQFile*>( data ); return input->readBlock( (char*)ptr, size ); } mpc_bool_t seek_impl( void* data, mpc_int32_t offset ) { - QFile* input = static_cast<QFile*>( data ); + TQFile* input = static_cast<TQFile*>( data ); return input->at( offset ); } mpc_int32_t tell_impl( void* data ) { - QFile* input = static_cast<QFile*>( data ); + TQFile* input = static_cast<TQFile*>( data ); return input->at(); } mpc_int32_t get_size_impl( void* data ) { - QFile* input = static_cast<QFile*>( data ); + TQFile* input = static_cast<TQFile*>( data ); return input->size(); } @@ -64,7 +64,7 @@ static int shift_signed( MPC_SAMPLE_FORMAT val, int shift ) K3bMpcWrapper::K3bMpcWrapper() { - m_input = new QFile(); + m_input = new TQFile(); m_reader = new mpc_reader; m_reader->read = read_impl; @@ -91,7 +91,7 @@ K3bMpcWrapper::~K3bMpcWrapper() } -bool K3bMpcWrapper::open( const QString& filename ) +bool K3bMpcWrapper::open( const TQString& filename ) { close(); diff --git a/plugins/decoder/musepack/k3bmpcwrapper.h b/plugins/decoder/musepack/k3bmpcwrapper.h index 743e25f..e0f42de 100644 --- a/plugins/decoder/musepack/k3bmpcwrapper.h +++ b/plugins/decoder/musepack/k3bmpcwrapper.h @@ -20,13 +20,13 @@ #include <config.h> #endif -#include <qstring.h> +#include <tqstring.h> #include <k3bmsf.h> #include MPC_HEADER_FILE -class QFile; +class TQFile; class K3bMpcWrapper @@ -35,7 +35,7 @@ class K3bMpcWrapper K3bMpcWrapper(); ~K3bMpcWrapper(); - bool open( const QString& filename ); + bool open( const TQString& filename ); void close(); int decode( char*, int max ); @@ -46,10 +46,10 @@ class K3bMpcWrapper int samplerate() const; unsigned int channels() const; - QFile* input() const { return m_input; } + TQFile* input() const { return m_input; } private: - QFile* m_input; + TQFile* m_input; mpc_reader* m_reader; mpc_decoder* m_decoder; mpc_streaminfo* m_info; diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp index 15ca665..29b3805 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp @@ -19,8 +19,8 @@ #include <k3bpluginfactory.h> -#include <qfile.h> -#include <qstringlist.h> +#include <tqfile.h> +#include <tqstringlist.h> #include <kurl.h> #include <kdebug.h> @@ -51,8 +51,8 @@ public: }; -K3bOggVorbisDecoder::K3bOggVorbisDecoder( QObject* parent, const char* name ) - : K3bAudioDecoder( parent, name ) +K3bOggVorbisDecoder::K3bOggVorbisDecoder( TQObject* tqparent, const char* name ) + : K3bAudioDecoder( tqparent, name ) { d = new Private(); } @@ -67,7 +67,7 @@ K3bOggVorbisDecoder::~K3bOggVorbisDecoder() bool K3bOggVorbisDecoder::openOggVorbisFile() { if( !d->isOpen ) { - FILE* file = fopen( QFile::encodeName(filename()), "r" ); + FILE* file = fopen( TQFile::encodeName(filename()), "r" ); if( !file ) { kdDebug() << "(K3bOggVorbisDecoder) Could not open file " << filename() << endl; return false; @@ -104,8 +104,8 @@ bool K3bOggVorbisDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate // add meta tags for( int i = 0; i < d->vComment->comments; ++i ) { - QString comment = QString::fromUtf8( d->vComment->user_comments[i] ); - QStringList values = QStringList::split( "=", comment ); + TQString comment = TQString::fromUtf8( d->vComment->user_comments[i] ); + TQStringList values = TQStringList::split( "=", comment ); if( values.count() > 1 ) { if( values[0].lower() == "title" ) addMetaInfo( META_TITLE, values[1] ); @@ -118,15 +118,15 @@ bool K3bOggVorbisDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate // add technical infos - addTechnicalInfo( i18n("Version"), QString::number(d->vInfo->version) ); - addTechnicalInfo( i18n("Channels"), QString::number(d->vInfo->channels) ); - addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").arg(d->vInfo->rate) ); + addTechnicalInfo( i18n("Version"), TQString::number(d->vInfo->version) ); + addTechnicalInfo( i18n("Channels"), TQString::number(d->vInfo->channels) ); + addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").tqarg(d->vInfo->rate) ); if( d->vInfo->bitrate_upper > 0 ) - addTechnicalInfo( i18n("Bitrate Upper"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_upper) ); + addTechnicalInfo( i18n("Bitrate Upper"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_upper) ); if( d->vInfo->bitrate_nominal > 0 ) - addTechnicalInfo( i18n("Bitrate Nominal"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_nominal) ); + addTechnicalInfo( i18n("Bitrate Nominal"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_nominal) ); if( d->vInfo->bitrate_lower > 0 ) - addTechnicalInfo( i18n("Bitrate Lower"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_lower) ); + addTechnicalInfo( i18n("Bitrate Lower"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_lower) ); frames = K3b::Msf::fromSeconds(seconds); samplerate = d->vInfo->rate; @@ -203,14 +203,14 @@ bool K3bOggVorbisDecoder::seekInternal( const K3b::Msf& pos ) } -QString K3bOggVorbisDecoder::fileType() const +TQString K3bOggVorbisDecoder::fileType() const { return i18n("Ogg-Vorbis"); } -K3bOggVorbisDecoderFactory::K3bOggVorbisDecoderFactory( QObject* parent, const char* name ) - : K3bAudioDecoderFactory( parent, name ) +K3bOggVorbisDecoderFactory::K3bOggVorbisDecoderFactory( TQObject* tqparent, const char* name ) + : K3bAudioDecoderFactory( tqparent, name ) { } @@ -220,16 +220,16 @@ K3bOggVorbisDecoderFactory::~K3bOggVorbisDecoderFactory() } -K3bAudioDecoder* K3bOggVorbisDecoderFactory::createDecoder( QObject* parent, +K3bAudioDecoder* K3bOggVorbisDecoderFactory::createDecoder( TQObject* tqparent, const char* name ) const { - return new K3bOggVorbisDecoder( parent, name ); + return new K3bOggVorbisDecoder( tqparent, name ); } bool K3bOggVorbisDecoderFactory::canDecode( const KURL& url ) { - FILE* file = fopen( QFile::encodeName(url.path()), "r" ); + FILE* file = fopen( TQFile::encodeName(url.path()), "r" ); if( !file ) { kdDebug() << "(K3bOggVorbisDecoder) Could not open file " << url.path() << endl; return false; diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.h b/plugins/decoder/ogg/k3boggvorbisdecoder.h index 20ae094..47c1709 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.h +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.h @@ -26,16 +26,17 @@ class KURL; class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory { Q_OBJECT + TQ_OBJECT public: - K3bOggVorbisDecoderFactory( QObject* parent = 0, const char* name = 0 ); + K3bOggVorbisDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); ~K3bOggVorbisDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( QObject* parent = 0, + K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const; }; @@ -46,14 +47,15 @@ class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory class K3bOggVorbisDecoder : public K3bAudioDecoder { Q_OBJECT + TQ_OBJECT public: - K3bOggVorbisDecoder( QObject* parent = 0, const char* name = 0 ); + K3bOggVorbisDecoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bOggVorbisDecoder(); void cleanup(); - QString fileType() const; + TQString fileType() const; protected: bool analyseFileInternal( K3b::Msf& frames, int& samplerate, int& ch ); diff --git a/plugins/decoder/skeleton.cpp b/plugins/decoder/skeleton.cpp index 940814b..7b627b1 100644 --- a/plugins/decoder/skeleton.cpp +++ b/plugins/decoder/skeleton.cpp @@ -23,8 +23,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3b<name>decoder, K3bPluginFactory<K3b<name>DecoderFactory>( "libk3b<name>decoder" ) ) -K3b<name>DecoderFactory::K3b<name>DecoderFactory( QObject* parent, const char* name ) - : K3bAudioDecoderFactory( parent, name ) +K3b<name>DecoderFactory::K3b<name>DecoderFactory( TQObject* tqparent, const char* name ) + : K3bAudioDecoderFactory( tqparent, name ) { } @@ -34,10 +34,10 @@ K3b<name>DecoderFactory::~K3b<name>DecoderFactory() } -K3bAudioDecoder* K3b<name>DecoderFactory::createDecoder( QObject* parent, +K3bAudioDecoder* K3b<name>DecoderFactory::createDecoder( TQObject* tqparent, const char* name ) const { - return new K3b<name>Decoder( parent, name ); + return new K3b<name>Decoder( tqparent, name ); } @@ -52,8 +52,8 @@ bool K3b<name>DecoderFactory::canDecode( const KURL& url ) -K3b<name>Decoder::K3b<name>Decoder( QObject* parent, const char* name ) - : K3bAudioDecoder( parent, name ) +K3b<name>Decoder::K3b<name>Decoder( TQObject* tqparent, const char* name ) + : K3bAudioDecoder( tqparent, name ) { } @@ -63,7 +63,7 @@ K3b<name>Decoder::~K3b<name>Decoder() } -QString K3b<name>Decoder::fileType() const +TQString K3b<name>Decoder::fileType() const { // PUT YOUR CODE HERE } diff --git a/plugins/decoder/skeleton.h b/plugins/decoder/skeleton.h index 00f5d15..7b22113 100644 --- a/plugins/decoder/skeleton.h +++ b/plugins/decoder/skeleton.h @@ -22,16 +22,17 @@ class K3b<name>DecoderFactory : public K3bAudioDecoderFactory { Q_OBJECT + TQ_OBJECT public: - K3b<name>DecoderFactory( QObject* parent = 0, const char* name = 0 ); + K3b<name>DecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); ~K3b<name>DecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( QObject* parent = 0, + K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const; }; @@ -39,12 +40,13 @@ class K3b<name>DecoderFactory : public K3bAudioDecoderFactory class K3b<name>Decoder : public K3bAudioDecoder { Q_OBJECT + TQ_OBJECT public: - K3b<name>Decoder( QObject* parent = 0, const char* name = 0 ); + K3b<name>Decoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3b<name>Decoder(); - QString fileType() const; + TQString fileType() const; protected: bool analyseFileInternal( K3b::Msf& frames, int& samplerate, int& ch ); diff --git a/plugins/decoder/wave/k3bwavedecoder.cpp b/plugins/decoder/wave/k3bwavedecoder.cpp index 6494e5c..21f385e 100644 --- a/plugins/decoder/wave/k3bwavedecoder.cpp +++ b/plugins/decoder/wave/k3bwavedecoder.cpp @@ -19,8 +19,8 @@ #include <k3bpluginfactory.h> -#include <qfile.h> -#include <qcstring.h> +#include <tqfile.h> +#include <tqcstring.h> #include <kdebug.h> #include <klocale.h> @@ -50,7 +50,7 @@ static unsigned long le_a_to_u_long( unsigned char* a ) { * Otherwise 0 is returned. * leave file seek pointer past WAV header. */ -static unsigned long identifyWaveFile( QFile* f, int* samplerate = 0, int* channels = 0, int* samplesize = 0 ) +static unsigned long identifyWaveFile( TQFile* f, int* samplerate = 0, int* channels = 0, int* samplesize = 0 ) { typedef struct { unsigned char ckid[4]; @@ -85,7 +85,7 @@ static unsigned long identifyWaveFile( QFile* f, int* samplerate = 0, int* chann kdDebug() << "(K3bWaveDecoder) unable to read from " << f->name() << endl; return 0; } - if( qstrncmp( (char*)chunk.ckid, WAV_RIFF_MAGIC, 4 ) ) { + if( tqstrncmp( (char*)chunk.ckid, WAV_RIFF_MAGIC, 4 ) ) { kdDebug() << "(K3bWaveDecoder) " << f->name() << ": not a RIFF file." << endl; return 0; } @@ -95,7 +95,7 @@ static unsigned long identifyWaveFile( QFile* f, int* samplerate = 0, int* chann kdDebug() << "(K3bWaveDecoder) unable to read from " << f->name() << endl; return 0; } - if( qstrncmp( (char*)riff.wave, WAV_WAVE_MAGIC, 4 ) ) { + if( tqstrncmp( (char*)riff.wave, WAV_WAVE_MAGIC, 4 ) ) { kdDebug() << "(K3bWaveDecoder) " << f->name() << ": not a WAVE file." << endl; return 0; } @@ -106,7 +106,7 @@ static unsigned long identifyWaveFile( QFile* f, int* samplerate = 0, int* chann kdDebug() << "(K3bWaveDecoder) unable to read from " << f->name() << endl; return 0; } - if( qstrncmp( (char*)chunk.ckid, WAV_FMT_MAGIC, 4 ) ) { + if( tqstrncmp( (char*)chunk.ckid, WAV_FMT_MAGIC, 4 ) ) { kdDebug() << "(K3bWaveDecoder) " << f->name() << ": could not find format chunk." << endl; return 0; } @@ -152,7 +152,7 @@ static unsigned long identifyWaveFile( QFile* f, int* samplerate = 0, int* chann } // skip chunk data of unknown chunk - if( qstrncmp( (char*)chunk.ckid, WAV_DATA_MAGIC, 4 ) ) { + if( tqstrncmp( (char*)chunk.ckid, WAV_DATA_MAGIC, 4 ) ) { kdDebug() << "(K3bWaveDecoder) skipping chunk: " << (char*)chunk.ckid << endl; if( !f->at( f->at() + le_a_to_u_long(chunk.cksize) ) ) { kdDebug() << "(K3bWaveDecoder) " << f->name() << ": could not seek in file." << endl; @@ -183,7 +183,7 @@ public: bufferSize(0) { } - QFile* file; + TQFile* file; long headerLength; int sampleRate; @@ -197,11 +197,11 @@ public: }; -K3bWaveDecoder::K3bWaveDecoder( QObject* parent, const char* name ) - : K3bAudioDecoder( parent, name ) +K3bWaveDecoder::K3bWaveDecoder( TQObject* tqparent, const char* name ) + : K3bAudioDecoder( tqparent, name ) { d = new Private(); - d->file = new QFile(); + d->file = new TQFile(); } @@ -216,7 +216,7 @@ int K3bWaveDecoder::decodeInternal( char* _data, int maxLen ) { int read = 0; - maxLen = QMIN( maxLen, (int)(d->size - d->alreadyRead) ); + maxLen = TQMIN( maxLen, (int)(d->size - d->alreadyRead) ); if( d->sampleSize == 16 ) { read = d->file->readBlock( _data, maxLen ); @@ -243,7 +243,7 @@ int K3bWaveDecoder::decodeInternal( char* _data, int maxLen ) d->bufferSize = maxLen/2; } - read = d->file->readBlock( d->buffer, QMIN(maxLen/2, d->bufferSize) ); + read = d->file->readBlock( d->buffer, TQMIN(maxLen/2, d->bufferSize) ); d->alreadyRead += read; // stretch samples to 16 bit @@ -330,36 +330,36 @@ void K3bWaveDecoder::cleanup() } -QString K3bWaveDecoder::fileType() const +TQString K3bWaveDecoder::fileType() const { return i18n("WAVE"); } -QStringList K3bWaveDecoder::supportedTechnicalInfos() const +TQStringList K3bWaveDecoder::supportedTechnicalInfos() const { - return QStringList::split( ";", + return TQStringList::split( ";", i18n("Channels") + ";" + i18n("Sampling Rate") + ";" + i18n("Sample Size") ); } -QString K3bWaveDecoder::technicalInfo( const QString& name ) const +TQString K3bWaveDecoder::technicalInfo( const TQString& name ) const { if( name == i18n("Channels") ) - return QString::number(d->channels); + return TQString::number(d->channels); else if( name == i18n("Sampling Rate") ) - return i18n("%1 Hz").arg(d->sampleRate); + return i18n("%1 Hz").tqarg(d->sampleRate); else if( name == i18n("Sample Size") ) - return i18n("%1 bits").arg(d->sampleSize); + return i18n("%1 bits").tqarg(d->sampleSize); else - return QString::null; + return TQString(); } -K3bWaveDecoderFactory::K3bWaveDecoderFactory( QObject* parent, const char* name ) - : K3bAudioDecoderFactory( parent, name ) +K3bWaveDecoderFactory::K3bWaveDecoderFactory( TQObject* tqparent, const char* name ) + : K3bAudioDecoderFactory( tqparent, name ) { } @@ -369,16 +369,16 @@ K3bWaveDecoderFactory::~K3bWaveDecoderFactory() } -K3bAudioDecoder* K3bWaveDecoderFactory::createDecoder( QObject* parent, +K3bAudioDecoder* K3bWaveDecoderFactory::createDecoder( TQObject* tqparent, const char* name ) const { - return new K3bWaveDecoder( parent, name ); + return new K3bWaveDecoder( tqparent, name ); } bool K3bWaveDecoderFactory::canDecode( const KURL& url ) { - QFile f( url.path() ); + TQFile f( url.path() ); if( !f.open( IO_ReadOnly ) ) { kdDebug() << "(K3bWaveDecoder) could not open file " << url.path() << endl; return false; diff --git a/plugins/decoder/wave/k3bwavedecoder.h b/plugins/decoder/wave/k3bwavedecoder.h index 3f92e9a..ddef738 100644 --- a/plugins/decoder/wave/k3bwavedecoder.h +++ b/plugins/decoder/wave/k3bwavedecoder.h @@ -20,25 +20,26 @@ #include <k3b_export.h> #include <kurl.h> -#include <qcstring.h> +#include <tqcstring.h> -class QFile; +class TQFile; class LIBK3B_EXPORT K3bWaveDecoderFactory : public K3bAudioDecoderFactory { Q_OBJECT + TQ_OBJECT public: - K3bWaveDecoderFactory( QObject* parent = 0, const char* name = 0 ); + K3bWaveDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); ~K3bWaveDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( QObject* parent = 0, + K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const; }; @@ -46,20 +47,21 @@ class LIBK3B_EXPORT K3bWaveDecoderFactory : public K3bAudioDecoderFactory class LIBK3B_EXPORT K3bWaveDecoder : public K3bAudioDecoder { Q_OBJECT + TQ_OBJECT public: - K3bWaveDecoder( QObject* parent = 0, const char* name = 0 ); + K3bWaveDecoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bWaveDecoder(); void cleanup(); bool seekInternal( const K3b::Msf& ); - QString fileType() const; + TQString fileType() const; - QStringList supportedTechnicalInfos() const; + TQStringList supportedTechnicalInfos() const; - QString technicalInfo( const QString& ) const; + TQString technicalInfo( const TQString& ) const; protected: bool analyseFileInternal( K3b::Msf& frames, int& samplerate, int& channels ); diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui index dd32d08..0e59525 100644 --- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bExternalEncoderConfigWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bExternalEncoderConfigWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <p>K3b comes with a selection of predefined external applications that depends on the installed applications.</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Name</string> @@ -86,9 +86,9 @@ <cstring>m_viewEncoders</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -104,14 +104,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonRemove</cstring> </property> @@ -119,7 +119,7 @@ <string>Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonEdit</cstring> </property> @@ -127,7 +127,7 @@ <string>Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonAdd</cstring> </property> @@ -141,7 +141,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui index 9f3fb5a..d6a472b 100644 --- a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bExternalEncoderEditWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bExternalEncoderEditWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -41,7 +41,7 @@ <cstring>m_editName</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -49,7 +49,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -59,7 +59,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -105,7 +105,7 @@ Please insert the command used to encode the audio data. The command has to read </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -116,7 +116,7 @@ Please insert the command used to encode the audio data. The command has to read <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkSwapByteOrder</cstring> </property> @@ -131,7 +131,7 @@ Please insert the command used to encode the audio data. The command has to read <p>If the resulting audio file sounds bad it is highly likely that the byte order is wrong and this option has to be checked.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkWriteWaveHeader</cstring> </property> @@ -154,7 +154,7 @@ Please insert the command used to encode the audio data. The command has to read <tabstop>m_editExtension</tabstop> <tabstop>m_editCommand</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index 4eb0218..52cd0d0 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -28,8 +28,8 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqregexp.h> +#include <tqfile.h> #include <sys/types.h> #include <sys/wait.h> @@ -57,10 +57,10 @@ static const char s_riffHeader[] = -static K3bExternalEncoderCommand commandByExtension( const QString& extension ) +static K3bExternalEncoderCommand commandByExtension( const TQString& extension ) { - QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); - for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) + TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); + for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) if( (*it).extension == extension ) return *it; @@ -78,8 +78,8 @@ public: } K3bProcess* process; - QString fileName; - QString extension; + TQString fileName; + TQString extension; K3b::Msf length; K3bExternalEncoderCommand cmd; @@ -87,20 +87,20 @@ public: bool initialized; // the metaData we support - QString artist; - QString title; - QString comment; - QString trackNumber; - QString cdArtist; - QString cdTitle; - QString cdComment; - QString year; - QString genre; + TQString artist; + TQString title; + TQString comment; + TQString trackNumber; + TQString cdArtist; + TQString cdTitle; + TQString cdComment; + TQString year; + TQString genre; }; -K3bExternalEncoder::K3bExternalEncoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3bExternalEncoder::K3bExternalEncoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { d = new Private(); } @@ -113,7 +113,7 @@ K3bExternalEncoder::~K3bExternalEncoder() } -void K3bExternalEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value ) +void K3bExternalEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value ) { switch( f ) { case META_TRACK_TITLE: @@ -168,7 +168,7 @@ void K3bExternalEncoder::slotExternalProgramFinished( KProcess* p ) } -bool K3bExternalEncoder::openFile( const QString& ext, const QString& filename, const K3b::Msf& length ) +bool K3bExternalEncoder::openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length ) { d->fileName = filename; d->extension = ext; @@ -176,8 +176,8 @@ bool K3bExternalEncoder::openFile( const QString& ext, const QString& filename, d->length = length; // delete existing files as some programs (like flac for example) might refuse to overwrite files - if( QFile::exists( filename ) ) - QFile::remove( filename ); + if( TQFile::exists( filename ) ) + TQFile::remove( filename ); return true; } @@ -189,7 +189,7 @@ void K3bExternalEncoder::closeFile() } -bool K3bExternalEncoder::initEncoderInternal( const QString& extension ) +bool K3bExternalEncoder::initEncoderInternal( const TQString& extension ) { d->initialized = true; @@ -207,42 +207,42 @@ bool K3bExternalEncoder::initEncoderInternal( const QString& extension ) d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotExternalProgramFinished(KProcess*)) ); - connect( d->process, SIGNAL(stderrLine(const QString&)), - this, SLOT(slotExternalProgramOutputLine(const QString&)) ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), - this, SLOT(slotExternalProgramOutputLine(const QString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotExternalProgramFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), + this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), + this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) ); // create the commandline - QStringList params = QStringList::split( ' ', d->cmd.command, false ); - for( QStringList::iterator it = params.begin(); it != params.end(); ++it ) { - (*it).replace( "%f", d->fileName ); - (*it).replace( "%a", d->artist ); - (*it).replace( "%t", d->title ); - (*it).replace( "%c", d->comment ); - (*it).replace( "%y", d->year ); - (*it).replace( "%m", d->cdTitle ); - (*it).replace( "%r", d->cdArtist ); - (*it).replace( "%x", d->cdComment ); - (*it).replace( "%n", d->trackNumber ); - (*it).replace( "%g", d->genre ); + TQStringList params = TQStringList::split( ' ', d->cmd.command, false ); + for( TQStringList::iterator it = params.begin(); it != params.end(); ++it ) { + (*it).tqreplace( "%f", d->fileName ); + (*it).tqreplace( "%a", d->artist ); + (*it).tqreplace( "%t", d->title ); + (*it).tqreplace( "%c", d->comment ); + (*it).tqreplace( "%y", d->year ); + (*it).tqreplace( "%m", d->cdTitle ); + (*it).tqreplace( "%r", d->cdArtist ); + (*it).tqreplace( "%x", d->cdComment ); + (*it).tqreplace( "%n", d->trackNumber ); + (*it).tqreplace( "%g", d->genre ); *d->process << *it; } kdDebug() << "***** external parameters:" << endl; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; // set one general error message - setLastError( i18n("Command failed: %1").arg( s ) ); + setLastError( i18n("Command failed: %1").tqarg( s ) ); if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { if( d->cmd.writeWaveHeader ) @@ -251,9 +251,9 @@ bool K3bExternalEncoder::initEncoderInternal( const QString& extension ) return true; } else { - QString commandName = d->cmd.command.section( QRegExp("\\s+"), 0 ); + TQString commandName = d->cmd.command.section( TQRegExp("\\s+"), 0 ); if( !KStandardDirs::findExe( commandName ).isEmpty() ) - setLastError( i18n("Could not find program '%1'").arg(commandName) ); + setLastError( i18n("Could not find program '%1'").tqarg(commandName) ); return false; } @@ -271,8 +271,8 @@ bool K3bExternalEncoder::writeWaveHeader() } // write the wave size - Q_INT32 dataSize( d->length.audioBytes() ); - Q_INT32 wavSize( dataSize + 44 - 8 ); + TQ_INT32 dataSize( d->length.audioBytes() ); + TQ_INT32 wavSize( dataSize + 44 - 8 ); char c[4]; c[0] = (wavSize >> 0 ) & 0xff; @@ -305,7 +305,7 @@ bool K3bExternalEncoder::writeWaveHeader() } -long K3bExternalEncoder::encodeInternal( const char* data, Q_ULONG len ) +long K3bExternalEncoder::encodeInternal( const char* data, TQ_ULONG len ) { if( !d->initialized ) if( !initEncoderInternal( d->extension ) ) @@ -347,33 +347,33 @@ long K3bExternalEncoder::encodeInternal( const char* data, Q_ULONG len ) } -void K3bExternalEncoder::slotExternalProgramOutputLine( const QString& line ) +void K3bExternalEncoder::slotExternalProgramOutputLine( const TQString& line ) { kdDebug() << "(" << d->cmd.name << ") " << line << endl; } -QStringList K3bExternalEncoder::extensions() const +TQStringList K3bExternalEncoder::extensions() const { - QStringList el; - QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); - for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) + TQStringList el; + TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); + for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) el.append( (*it).extension ); return el; } -QString K3bExternalEncoder::fileTypeComment( const QString& ext ) const +TQString K3bExternalEncoder::fileTypeComment( const TQString& ext ) const { return commandByExtension( ext ).name; } -K3bPluginConfigWidget* K3bExternalEncoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bExternalEncoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bExternalEncoderSettingsWidget( parent, name ); + return new K3bExternalEncoderSettingsWidget( tqparent, name ); } diff --git a/plugins/encoder/external/k3bexternalencoder.h b/plugins/encoder/external/k3bexternalencoder.h index 1612927..266299f 100644 --- a/plugins/encoder/external/k3bexternalencoder.h +++ b/plugins/encoder/external/k3bexternalencoder.h @@ -27,38 +27,39 @@ class KProcess; class K3bExternalEncoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3bExternalEncoder( QObject* parent = 0, const char* name = 0 ); + K3bExternalEncoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bExternalEncoder(); - QStringList extensions() const; + TQStringList extensions() const; - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent, const char* name ) const; /** * reimplemented since the external program is intended to write the file * TODO: allow writing to stdout. */ - bool openFile( const QString& ext, const QString& filename, const K3b::Msf& length ); + bool openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length ); void closeFile(); class Command; private slots: void slotExternalProgramFinished( KProcess* ); - void slotExternalProgramOutputLine( const QString& ); + void slotExternalProgramOutputLine( const TQString& ); private: void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension ); - long encodeInternal( const char* data, Q_ULONG len ); - void setMetaDataInternal( MetaDataField, const QString& ); + bool initEncoderInternal( const TQString& extension ); + long encodeInternal( const char* data, TQ_ULONG len ); + void setMetaDataInternal( MetaDataField, const TQString& ); bool writeWaveHeader(); class Private; diff --git a/plugins/encoder/external/k3bexternalencodercommand.cpp b/plugins/encoder/external/k3bexternalencodercommand.cpp index 5dcfb23..57a0858 100644 --- a/plugins/encoder/external/k3bexternalencodercommand.cpp +++ b/plugins/encoder/external/k3bexternalencodercommand.cpp @@ -23,17 +23,17 @@ #include <kstandarddirs.h> -QValueList<K3bExternalEncoderCommand> K3bExternalEncoderCommand::readCommands() +TQValueList<K3bExternalEncoderCommand> K3bExternalEncoderCommand::readCommands() { KConfig* c = k3bcore->config(); c->setGroup( "K3bExternalEncoderPlugin" ); - QValueList<K3bExternalEncoderCommand> cl; + TQValueList<K3bExternalEncoderCommand> cl; - QStringList cmds = c->readListEntry( "commands" ); - for( QStringList::iterator it = cmds.begin(); it != cmds.end(); ++it ) { - QStringList cmdString = c->readListEntry( "command_" + *it ); + TQStringList cmds = c->readListEntry( "commands" ); + for( TQStringList::iterator it = cmds.begin(); it != cmds.end(); ++it ) { + TQStringList cmdString = c->readListEntry( "command_" + *it ); K3bExternalEncoderCommand cmd; cmd.name = cmdString[0]; cmd.extension = cmdString[1]; diff --git a/plugins/encoder/external/k3bexternalencodercommand.h b/plugins/encoder/external/k3bexternalencodercommand.h index 3351191..7e9db51 100644 --- a/plugins/encoder/external/k3bexternalencodercommand.h +++ b/plugins/encoder/external/k3bexternalencodercommand.h @@ -16,8 +16,8 @@ #ifndef _K3B_EXTERNAL_ENCODER_COMMAND_H_ #define _K3B_EXTERNAL_ENCODER_COMMAND_H_ -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> class K3bExternalEncoderCommand { @@ -27,14 +27,14 @@ public: writeWaveHeader(false) { } - QString name; - QString extension; - QString command; + TQString name; + TQString extension; + TQString command; bool swapByteOrder; bool writeWaveHeader; - static QValueList<K3bExternalEncoderCommand> readCommands(); + static TQValueList<K3bExternalEncoderCommand> readCommands(); }; #endif diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index 3ab59c7..3daf9ad 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -17,10 +17,10 @@ #include <k3bcore.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qlistview.h> -#include <qpushbutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqpushbutton.h> #include <klineedit.h> #include <kmessagebox.h> @@ -30,12 +30,12 @@ -K3bExternalEncoderEditDialog::K3bExternalEncoderEditDialog( QWidget* parent ) +K3bExternalEncoderEditDialog::K3bExternalEncoderEditDialog( TQWidget* tqparent ) : KDialogBase( Swallow, i18n("Editing external audio encoder"), Ok|Cancel, Ok, - parent ) + tqparent ) { m_editW = new base_K3bExternalEncoderEditWidget( this ); setMainWidget( m_editW ); @@ -86,7 +86,7 @@ void K3bExternalEncoderEditDialog::slotOk() i18n("Please specify the command line."), i18n("No command line specified") ); } - else if( !m_editW->m_editCommand->text().contains( "%f" ) ) { + else if( !m_editW->m_editCommand->text().tqcontains( "%f" ) ) { KMessageBox::error( this, i18n("Please add the output filename (%f) to the command line."), i18n("No filename specified") ); @@ -105,28 +105,28 @@ void K3bExternalEncoderEditDialog::slotOk() class K3bExternalEncoderSettingsWidget::Private { public: - QMap<QListViewItem*, K3bExternalEncoderCommand> commands; + TQMap<TQListViewItem*, K3bExternalEncoderCommand> commands; }; -K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { d = new Private(); w = new base_K3bExternalEncoderConfigWidget( this ); - QHBoxLayout* lay = new QHBoxLayout( this ); + TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); lay->addWidget( w ); - connect( w->m_viewEncoders, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged()) ); - connect( w->m_buttonAdd, SIGNAL(clicked()), - this, SLOT(slotNewCommand()) ); - connect( w->m_buttonEdit, SIGNAL(clicked()), - this, SLOT(slotEditCommand()) ); - connect( w->m_buttonRemove, SIGNAL(clicked()), - this, SLOT(slotRemoveCommand()) ); + connect( w->m_viewEncoders, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged()) ); + connect( w->m_buttonAdd, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotNewCommand()) ); + connect( w->m_buttonEdit, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotEditCommand()) ); + connect( w->m_buttonRemove, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRemoveCommand()) ); m_editDlg = new K3bExternalEncoderEditDialog( this ); } @@ -143,9 +143,9 @@ void K3bExternalEncoderSettingsWidget::slotNewCommand() // clear the dialog m_editDlg->setCommand( K3bExternalEncoderCommand() ); - if( m_editDlg->exec() == QDialog::Accepted ) { + if( m_editDlg->exec() == TQDialog::Accepted ) { K3bExternalEncoderCommand cmd = m_editDlg->currentCommand(); - d->commands.insert( new QListViewItem( w->m_viewEncoders, + d->commands.insert( new TQListViewItem( w->m_viewEncoders, w->m_viewEncoders->lastItem(), cmd.name, cmd.extension, @@ -164,9 +164,9 @@ void K3bExternalEncoderSettingsWidget::slotSelectionChanged() void K3bExternalEncoderSettingsWidget::slotEditCommand() { - if( QListViewItem* item = w->m_viewEncoders->selectedItem() ) { + if( TQListViewItem* item = w->m_viewEncoders->selectedItem() ) { m_editDlg->setCommand( d->commands[item] ); - if( m_editDlg->exec() == QDialog::Accepted ) { + if( m_editDlg->exec() == TQDialog::Accepted ) { d->commands[item] = m_editDlg->currentCommand(); } } @@ -175,7 +175,7 @@ void K3bExternalEncoderSettingsWidget::slotEditCommand() void K3bExternalEncoderSettingsWidget::slotRemoveCommand() { - if( QListViewItem* item = w->m_viewEncoders->selectedItem() ) { + if( TQListViewItem* item = w->m_viewEncoders->selectedItem() ) { d->commands.erase( item ); delete item; } @@ -187,11 +187,11 @@ void K3bExternalEncoderSettingsWidget::loadConfig() d->commands.clear(); w->m_viewEncoders->clear(); - QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); - for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); + TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); + for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) { K3bExternalEncoderCommand& cmd = *it; - d->commands.insert( new QListViewItem( w->m_viewEncoders, + d->commands.insert( new TQListViewItem( w->m_viewEncoders, w->m_viewEncoders->lastItem(), cmd.name, cmd.extension, @@ -207,10 +207,10 @@ void K3bExternalEncoderSettingsWidget::saveConfig() c->deleteGroup( "K3bExternalEncoderPlugin", true ); c->setGroup( "K3bExternalEncoderPlugin" ); - QStringList cmdNames; - for( QMapIterator<QListViewItem*, K3bExternalEncoderCommand> it = d->commands.begin(); + TQStringList cmdNames; + for( TQMapIterator<TQListViewItem*, K3bExternalEncoderCommand> it = d->commands.begin(); it != d->commands.end(); ++it ) { - QStringList cmd; + TQStringList cmd; cmd << it.data().name << it.data().extension << it.data().command; if( it.data().swapByteOrder ) cmd << "swap"; diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.h b/plugins/encoder/external/k3bexternalencoderconfigwidget.h index 4f6dd47..c8c607a 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.h +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.h @@ -27,9 +27,10 @@ class K3bExternalEncoderEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bExternalEncoderEditDialog( QWidget* parent ); + K3bExternalEncoderEditDialog( TQWidget* tqparent ); ~K3bExternalEncoderEditDialog(); K3bExternalEncoderCommand currentCommand() const; @@ -46,9 +47,10 @@ class K3bExternalEncoderEditDialog : public KDialogBase class K3bExternalEncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bExternalEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bExternalEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bExternalEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui index 199895e..81cb521 100644 --- a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui +++ b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bLameEncoderSettingsWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,11 +20,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_mainTab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -35,7 +35,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_groupVariableBitrate</cstring> </property> @@ -46,15 +46,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioQualityLevel</cstring> </property> @@ -65,7 +65,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelQualityLevel</cstring> </property> @@ -77,13 +77,13 @@ <property name="text"> <string>textLabel1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_qualityLevelFrame</cstring> </property> @@ -116,22 +116,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -143,11 +143,11 @@ <property name="text"> <string>high quality</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -160,7 +160,7 @@ <string>small file</string> </property> </widget> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_sliderQuality</cstring> </property> @@ -191,22 +191,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioManual</cstring> </property> @@ -214,7 +214,7 @@ <string>Manual settings:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelManualSettings</cstring> </property> @@ -229,15 +229,15 @@ <property name="text"> <string>textLabel2</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -259,14 +259,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>5</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonManualSettings</cstring> </property> @@ -283,7 +283,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -294,7 +294,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -324,9 +324,9 @@ <p><b>This setting has no influence on the size of the resulting file.</b></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -335,7 +335,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -348,7 +348,7 @@ <string>fast encoding</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -360,7 +360,7 @@ <property name="text"> <string>high quality</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -368,7 +368,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -387,7 +387,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkCopyright</cstring> </property> @@ -398,7 +398,7 @@ <string>Mark the encoded file as being copyrighted.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkOriginal</cstring> </property> @@ -409,7 +409,7 @@ <string>Mark the encoded file as being a copy.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkISO</cstring> </property> @@ -424,7 +424,7 @@ This results in many wasted bits for high bitrate encodings but will ensure strict ISO compatibility. This compatibility might be important for hardware players.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkError</cstring> </property> @@ -473,7 +473,7 @@ This results in many wasted bits for high bitrate encodings but will ensure <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui index a3bff90..e0ac569 100644 --- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui +++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bManualBitrateSettingsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bManualBitrateSettingsWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioConstantBitrate</cstring> </property> @@ -41,9 +41,9 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -73,7 +73,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioVariableBitrate</cstring> </property> @@ -81,7 +81,7 @@ <string>Variable Bitrate</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5</cstring> </property> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -134,7 +134,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>m_checkBitrateMaximum</cstring> </property> @@ -142,7 +142,7 @@ <string>Maximum bitrate:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>m_checkBitrateMinimum</cstring> </property> @@ -150,7 +150,7 @@ <string>Minimum bitrate:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>m_checkBitrateAverage</cstring> </property> @@ -166,7 +166,7 @@ <string>Average bitrate:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>m_spinAverageBitrate</cstring> </property> @@ -190,7 +190,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -269,5 +269,5 @@ The input will be encoded as a mono signal. If it was a stereo signal, it will b <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index 089c7d0..19cbf16 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -28,18 +28,18 @@ #include <kcombobox.h> #include <kdialogbase.h> -#include <qlayout.h> -#include <qcstring.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qgroupbox.h> -#include <qbuttongroup.h> -#include <qtextcodec.h> -#include <qfile.h> -#include <qslider.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqcstring.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> +#include <tqgroupbox.h> +#include <tqbuttongroup.h> +#include <tqtextcodec.h> +#include <tqfile.h> +#include <tqslider.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <stdio.h> #include <lame/lame.h> @@ -135,15 +135,15 @@ public: char buffer[8000]; - QString filename; + TQString filename; FILE* fid; }; -K3bLameEncoder::K3bLameEncoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3bLameEncoder::K3bLameEncoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { d = new Private(); } @@ -157,12 +157,12 @@ K3bLameEncoder::~K3bLameEncoder() } -bool K3bLameEncoder::openFile( const QString& extension, const QString& filename, const K3b::Msf& length ) +bool K3bLameEncoder::openFile( const TQString& extension, const TQString& filename, const K3b::Msf& length ) { closeFile(); d->filename = filename; - d->fid = ::fopen( QFile::encodeName( filename ), "w+" ); + d->fid = ::fopen( TQFile::encodeName( filename ), "w+" ); if( d->fid ) return initEncoder( extension, length ); else @@ -187,13 +187,13 @@ void K3bLameEncoder::closeFile() } -const QString& K3bLameEncoder::filename() const +const TQString& K3bLameEncoder::filename() const { return d->filename; } -bool K3bLameEncoder::initEncoderInternal( const QString&, const K3b::Msf& length ) +bool K3bLameEncoder::initEncoderInternal( const TQString&, const K3b::Msf& length ) { KConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); @@ -226,7 +226,7 @@ bool K3bLameEncoder::initEncoderInternal( const QString&, const K3b::Msf& length // // Mode // - QString mode = c->readEntry( "Mode", "stereo" ); + TQString mode = c->readEntry( "Mode", "stereo" ); if( mode == "stereo" ) lame_set_mode( d->flags, STEREO ); else if( mode == "joint" ) @@ -323,7 +323,7 @@ bool K3bLameEncoder::initEncoderInternal( const QString&, const K3b::Msf& length } -long K3bLameEncoder::encodeInternal( const char* data, Q_ULONG len ) +long K3bLameEncoder::encodeInternal( const char* data, TQ_ULONG len ) { // FIXME: we may have to swap data here int size = lame_encode_buffer_interleaved( d->flags, @@ -355,11 +355,11 @@ void K3bLameEncoder::finishEncoderInternal() } -void K3bLameEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value ) +void K3bLameEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value ) { // let's not use UTF-8 here since I don't know how to tell lame... // FIXME: when we use the codec we only get garbage. Why? - QTextCodec* codec = 0;//QTextCodec::codecForName( "ISO8859-1" ); + TQTextCodec* codec = 0;//TQTextCodec::codecForName( "ISO8859-1" ); // if( !codec ) // kdDebug() << "(K3bLameEncoder) could not find codec ISO8859-1." << endl; @@ -398,8 +398,8 @@ void K3bLameEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, cons -K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { m_w = new base_K3bLameEncoderSettingsWidget( this ); m_w->m_sliderQuality->setRange( 0, 9 ); @@ -411,26 +411,26 @@ K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( QWidget* parent, con m_manualSettingsDlg->setMainWidget( m_brW ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); + m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); + m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); + m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); - QHBoxLayout* lay = new QHBoxLayout( this ); + TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); lay->addWidget( m_w ); // TODO: add whatsthis help for the quality level. - // QString qualityLevelWhatsThis = i18n("<p>"); + // TQString qualityLevelWhatsThis = i18n("<p>"); - connect( m_w->m_buttonManualSettings, SIGNAL(clicked()), - this, SLOT(slotShowManualSettings()) ); - connect( m_w->m_sliderQuality, SIGNAL(valueChanged(int)), - this, SLOT(slotQualityLevelChanged(int)) ); + connect( m_w->m_buttonManualSettings, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotShowManualSettings()) ); + connect( m_w->m_sliderQuality, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotQualityLevelChanged(int)) ); updateManualSettingsLabel(); slotQualityLevelChanged( 5 ); @@ -452,7 +452,7 @@ void K3bLameEncoderSettingsWidget::slotShowManualSettings() int av = m_brW->m_spinAverageBitrate->value(); int mode = m_brW->m_comboMode->currentItem(); - if( m_manualSettingsDlg->exec() == QDialog::Rejected ) { + if( m_manualSettingsDlg->exec() == TQDialog::Rejected ) { m_brW->m_radioConstantBitrate->setChecked( constant ); m_brW->m_comboConstantBitrate->setCurrentItem( constBitrate ); m_brW->m_comboMaximumBitrate->setCurrentItem( max ); @@ -469,11 +469,11 @@ void K3bLameEncoderSettingsWidget::updateManualSettingsLabel() { if( m_brW->m_radioConstantBitrate->isChecked() ) m_w->m_labelManualSettings->setText( i18n("Constant Bitrate: %1 kbps (%2)") - .arg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()]) - .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); + .tqarg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()]) + .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); else m_w->m_labelManualSettings->setText( i18n("Variable Bitrate (%1)") - .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); + .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); } @@ -488,7 +488,7 @@ void K3bLameEncoderSettingsWidget::loadConfig() KConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); - QString mode = c->readEntry( "Mode", "stereo" ); + TQString mode = c->readEntry( "Mode", "stereo" ); if( mode == "stereo" ) m_brW->m_comboMode->setCurrentItem( 0 ); else if( mode == "joint" ) @@ -507,9 +507,9 @@ void K3bLameEncoderSettingsWidget::loadConfig() else m_brW->m_radioConstantBitrate->setChecked( true ); - m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Constant Bitrate", 128 )) ); - m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Maximum Bitrate", 224 )) ); - m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Minimum Bitrate", 32 )) ); + m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Constant Bitrate", 128 )) ); + m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Maximum Bitrate", 224 )) ); + m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Minimum Bitrate", 32 )) ); m_brW->m_spinAverageBitrate->setValue( c->readNumEntry( "Average Bitrate", 128) ); m_brW->m_checkBitrateMaximum->setChecked( c->readBoolEntry( "Use Maximum Bitrate", false ) ); @@ -535,7 +535,7 @@ void K3bLameEncoderSettingsWidget::saveConfig() KConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); - QString mode; + TQString mode; switch( m_brW->m_comboMode->currentItem() ) { case 0: mode = "stereo"; @@ -574,19 +574,19 @@ void K3bLameEncoderSettingsWidget::saveConfig() -QStringList K3bLameEncoder::extensions() const +TQStringList K3bLameEncoder::extensions() const { - return QStringList( "mp3" ); + return TQStringList( "mp3" ); } -QString K3bLameEncoder::fileTypeComment( const QString& ) const +TQString K3bLameEncoder::fileTypeComment( const TQString& ) const { return "MPEG1 Layer III (mp3)"; } -long long K3bLameEncoder::fileSize( const QString&, const K3b::Msf& msf ) const +long long K3bLameEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { KConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); @@ -617,10 +617,10 @@ long long K3bLameEncoder::fileSize( const QString&, const K3b::Msf& msf ) const } -K3bPluginConfigWidget* K3bLameEncoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bLameEncoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bLameEncoderSettingsWidget( parent, name ); + return new K3bLameEncoderSettingsWidget( tqparent, name ); } diff --git a/plugins/encoder/lame/k3blameencoder.h b/plugins/encoder/lame/k3blameencoder.h index 424ea64..25f5975 100644 --- a/plugins/encoder/lame/k3blameencoder.h +++ b/plugins/encoder/lame/k3blameencoder.h @@ -30,32 +30,33 @@ class KDialogBase; class K3bLameEncoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3bLameEncoder( QObject* parent = 0, const char* name = 0 ); + K3bLameEncoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bLameEncoder(); - bool openFile( const QString& extension, const QString& filename, const K3b::Msf& length ); + bool openFile( const TQString& extension, const TQString& filename, const K3b::Msf& length ); bool isOpen() const; void closeFile(); - const QString& filename() const; + const TQString& filename() const; - QStringList extensions() const; + TQStringList extensions() const; - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; - long long fileSize( const QString&, const K3b::Msf& msf ) const; + long long fileSize( const TQString&, const K3b::Msf& msf ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension, const K3b::Msf& length ); - long encodeInternal( const char* data, Q_ULONG len ); - void setMetaDataInternal( MetaDataField, const QString& ); + bool initEncoderInternal( const TQString& extension, const K3b::Msf& length ); + long encodeInternal( const char* data, TQ_ULONG len ); + void setMetaDataInternal( MetaDataField, const TQString& ); class Private; Private* d; @@ -65,9 +66,10 @@ class K3bLameEncoder : public K3bAudioEncoder class K3bLameEncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bLameEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bLameEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bLameEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui index 3e31265..d669f1e 100644 --- a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui +++ b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bOggVorbisEncoderSettingsWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -31,15 +31,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioQualityLevel</cstring> </property> @@ -56,7 +56,7 @@ <string><p>Vorbis' audio quality is not best measured in kilobits per second, but on a scale from -1 to 10 called "quality". <p>For now, quality -1 is roughly equivalent to 45kbps average, 5 is roughly 160kbps, and 10 gives about 400kbps. Most people seeking very-near-CD-quality audio encode at a quality of 5 or, for lossless stereo coupling, 6. The default setting is quality 3, which at approximately 110kbps gives a smaller filesize and significantly better fidelity than .mp3 compression at 128kbps. <p><em>This explanation was copied from the www.vorbis.com FAQ.</em></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelQualityLevel</cstring> </property> @@ -68,13 +68,13 @@ <property name="text"> <string>textLabel1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame6</cstring> </property> @@ -101,22 +101,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_slideQualityLevel</cstring> </property> @@ -136,7 +136,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -148,11 +148,11 @@ <property name="text"> <string>high quality</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -179,14 +179,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioManual</cstring> </property> @@ -194,9 +194,9 @@ <string>M&anual settings:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -212,14 +212,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -239,7 +239,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_checkBitrateUpper</cstring> </property> @@ -247,7 +247,7 @@ <string>&Upper bitrate:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_checkBitrateLower</cstring> </property> @@ -295,7 +295,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -303,7 +303,7 @@ <string>kbps</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -311,7 +311,7 @@ <string>kbps</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -319,7 +319,7 @@ <string>kbps</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_checkBitrateNominal</cstring> </property> @@ -383,7 +383,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index 54e6ecb..22f49a6 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -26,15 +26,15 @@ #include <kdebug.h> #include <knuminput.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qslider.h> -#include <qlcdnumber.h> -#include <qcheckbox.h> -#include <qcstring.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqslider.h> +#include <tqlcdnumber.h> +#include <tqcheckbox.h> +#include <tqcstring.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlabel.h> #include <vorbis/vorbisenc.h> @@ -124,8 +124,8 @@ public: }; -K3bOggVorbisEncoder::K3bOggVorbisEncoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3bOggVorbisEncoder::K3bOggVorbisEncoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { d = new Private(); } @@ -138,7 +138,7 @@ K3bOggVorbisEncoder::~K3bOggVorbisEncoder() } -bool K3bOggVorbisEncoder::initEncoderInternal( const QString&, const K3b::Msf& ) +bool K3bOggVorbisEncoder::initEncoderInternal( const TQString&, const K3b::Msf& ) { cleanup(); @@ -194,7 +194,7 @@ bool K3bOggVorbisEncoder::initEncoderInternal( const QString&, const K3b::Msf& ) vorbis_comment_init( d->vorbisComment ); // add the encoder tag (so everybody knows we did it! ;) - vorbis_comment_add_tag( d->vorbisComment, QCString("ENCODER").data(), QCString("K3bOggVorbisEncoderPlugin").data() ); + vorbis_comment_add_tag( d->vorbisComment, TQCString("ENCODER").data(), TQCString("K3bOggVorbisEncoderPlugin").data() ); // set up the analysis state and auxiliary encoding storage d->vorbisDspState = new vorbis_dsp_state; @@ -251,7 +251,7 @@ bool K3bOggVorbisEncoder::writeOggHeaders() // This ensures the actual // audio data will start on a new page, as per spec // - QByteArray data; + TQByteArray data; while( ogg_stream_flush( d->oggStream, d->oggPage ) ) { writeData( (char*)d->oggPage->header, d->oggPage->header_len ); writeData( (char*)d->oggPage->body, d->oggPage->body_len ); @@ -263,7 +263,7 @@ bool K3bOggVorbisEncoder::writeOggHeaders() } -long K3bOggVorbisEncoder::encodeInternal( const char* data, Q_ULONG len ) +long K3bOggVorbisEncoder::encodeInternal( const char* data, TQ_ULONG len ) { if( !d->headersWritten ) if( !writeOggHeaders() ) @@ -328,10 +328,10 @@ void K3bOggVorbisEncoder::finishEncoderInternal() } -void K3bOggVorbisEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value ) +void K3bOggVorbisEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value ) { if( d->vorbisComment ) { - QCString key; + TQCString key; switch( f ) { case META_TRACK_TITLE: @@ -426,13 +426,13 @@ void K3bOggVorbisEncoder::loadConfig() -K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { w = new base_K3bOggVorbisEncoderSettingsWidget( this ); - QString ttQuality = i18n("Controls the quality of the encoded files."); - QString wsQuality = i18n("<p>Vorbis' audio quality is not best measured in kilobits per second, " + TQString ttQuality = i18n("Controls the quality of the encoded files."); + TQString wsQuality = i18n("<p>Vorbis' audio quality is not best measured in kilobits per second, " "but on a scale from -1 to 10 called <em>quality</em>." "<p>For now, quality -1 is roughly equivalent to 45kbps average, " "5 is roughly 160kbps, and 10 gives about 400kbps. " @@ -442,21 +442,21 @@ K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( QWidget* p "than .mp3 compression at 128kbps." "<p><em>This explanation is based on the one from the www.vorbis.com FAQ.</em>"); - QToolTip::add( w->m_radioQualityLevel, ttQuality ); - QToolTip::add( w->m_labelQualityLevel, ttQuality ); - QToolTip::add( w->m_slideQualityLevel, ttQuality ); - QWhatsThis::add( w->m_radioQualityLevel, wsQuality ); - QWhatsThis::add( w->m_labelQualityLevel, wsQuality ); - QWhatsThis::add( w->m_slideQualityLevel, wsQuality ); + TQToolTip::add( w->m_radioQualityLevel, ttQuality ); + TQToolTip::add( w->m_labelQualityLevel, ttQuality ); + TQToolTip::add( w->m_slideQualityLevel, ttQuality ); + TQWhatsThis::add( w->m_radioQualityLevel, wsQuality ); + TQWhatsThis::add( w->m_labelQualityLevel, wsQuality ); + TQWhatsThis::add( w->m_slideQualityLevel, wsQuality ); - QHBoxLayout* lay = new QHBoxLayout( this ); + TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); lay->addWidget( w ); - connect( w->m_slideQualityLevel, SIGNAL(valueChanged(int)), - this, SLOT(slotQualityLevelChanged(int)) ); + connect( w->m_slideQualityLevel, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotQualityLevelChanged(int)) ); slotQualityLevelChanged( 4 ); } @@ -469,8 +469,8 @@ K3bOggVorbisEncoderSettingsWidget::~K3bOggVorbisEncoderSettingsWidget() void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val ) { - w->m_labelQualityLevel->setText( QString::number(val) + " " - + i18n("(targetted VBR of %1)").arg(s_rough_average_quality_level_bitrates[val+1]) ); + w->m_labelQualityLevel->setText( TQString::number(val) + " " + + i18n("(targetted VBR of %1)").tqarg(s_rough_average_quality_level_bitrates[val+1]) ); } @@ -510,13 +510,13 @@ void K3bOggVorbisEncoderSettingsWidget::saveConfig() } -QString K3bOggVorbisEncoder::fileTypeComment( const QString& ) const +TQString K3bOggVorbisEncoder::fileTypeComment( const TQString& ) const { return i18n("Ogg-Vorbis"); } -long long K3bOggVorbisEncoder::fileSize( const QString&, const K3b::Msf& msf ) const +long long K3bOggVorbisEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { KConfig* c = k3bcore->config(); c->setGroup( "K3bOggVorbisEncoderPlugin" ); @@ -545,10 +545,10 @@ long long K3bOggVorbisEncoder::fileSize( const QString&, const K3b::Msf& msf ) c } -K3bPluginConfigWidget* K3bOggVorbisEncoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bOggVorbisEncoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bOggVorbisEncoderSettingsWidget( parent, name ); + return new K3bOggVorbisEncoderSettingsWidget( tqparent, name ); } diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.h b/plugins/encoder/ogg/k3boggvorbisencoder.h index 0148713..801021f 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.h +++ b/plugins/encoder/ogg/k3boggvorbisencoder.h @@ -27,28 +27,29 @@ class base_K3bOggVorbisEncoderSettingsWidget; class K3bOggVorbisEncoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3bOggVorbisEncoder( QObject* parent = 0, const char* name = 0 ); + K3bOggVorbisEncoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bOggVorbisEncoder(); - QStringList extensions() const { return QStringList("ogg"); } + TQStringList extensions() const { return TQStringList("ogg"); } - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; - long long fileSize( const QString&, const K3b::Msf& msf ) const; + long long fileSize( const TQString&, const K3b::Msf& msf ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: void loadConfig(); void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension, const K3b::Msf& length ); - long encodeInternal( const char* data, Q_ULONG len ); - void setMetaDataInternal( MetaDataField, const QString& ); + bool initEncoderInternal( const TQString& extension, const K3b::Msf& length ); + long encodeInternal( const char* data, TQ_ULONG len ); + void setMetaDataInternal( MetaDataField, const TQString& ); bool writeOggHeaders(); void cleanup(); @@ -62,9 +63,10 @@ class K3bOggVorbisEncoder : public K3bAudioEncoder class K3bOggVorbisEncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bOggVorbisEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bOggVorbisEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bOggVorbisEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp index 7a46caf..ef1a1c9 100644 --- a/plugins/encoder/skeleton.cpp +++ b/plugins/encoder/skeleton.cpp @@ -25,8 +25,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3b<name>encoder, K3bPluginFactory<K3b<name>Encoder>( "libk3b<name>encoder" ) ) -K3b<name>Encoder::K3b<name>Encoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3b<name>Encoder::K3b<name>Encoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { } @@ -36,14 +36,14 @@ K3b<name>Encoder::~K3b<name>Encoder() } -bool K3b<name>Encoder::initEncoderInternal( const QString& ) +bool K3b<name>Encoder::initEncoderInternal( const TQString& ) { // PUT YOUR CODE HERE return false; } -long K3b<name>Encoder::encodeInternal( const char* data, Q_ULONG len ) +long K3b<name>Encoder::encodeInternal( const char* data, TQ_ULONG len ) { // PUT YOUR CODE HERE return false; @@ -56,43 +56,43 @@ void K3b<name>Encoder::finishEncoderInternal() } -void K3b<name>Encoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value ) +void K3b<name>Encoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value ) { // PUT YOUR CODE HERE } -QStringList K3b<name>Encoder::extensions() const +TQStringList K3b<name>Encoder::extensions() const { // PUT YOUR CODE HERE - return QStringList( "" ); + return TQStringList( "" ); } -QString K3b<name>Encoder::fileTypeComment( const QString& ) const +TQString K3b<name>Encoder::fileTypeComment( const TQString& ) const { // PUT YOUR CODE HERE return ""; } -long long K3b<name>Encoder::fileSize( const QString&, const K3b::Msf& msf ) const +long long K3b<name>Encoder::fileSize( const TQString&, const K3b::Msf& msf ) const { // PUT YOUR CODE HERE return -1; } -K3bPluginConfigWidget* K3b<name>Encoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3b<name>Encoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3b<name>EncoderSettingsWidget( parent, name ); + return new K3b<name>EncoderSettingsWidget( tqparent, name ); } -K3b<name>EncoderSettingsWidget::K3b<name>EncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3b<name>EncoderSettingsWidget::K3b<name>EncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { } diff --git a/plugins/encoder/skeleton.h b/plugins/encoder/skeleton.h index 78c733e..49258f3 100644 --- a/plugins/encoder/skeleton.h +++ b/plugins/encoder/skeleton.h @@ -24,36 +24,38 @@ class K3b<name>Encoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3b<name>Encoder( QObject* parent = 0, const char* name = 0 ); + K3b<name>Encoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3b<name>Encoder(); - QStringList extensions() const; + TQStringList extensions() const; - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; - long long fileSize( const QString&, const K3b::Msf& msf ) const; + long long fileSize( const TQString&, const K3b::Msf& msf ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension ); - long encodeInternal( const char* data, Q_ULONG len ); - void setMetaDataInternal( MetaDataField, const QString& ); + bool initEncoderInternal( const TQString& extension ); + long encodeInternal( const char* data, TQ_ULONG len ); + void setMetaDataInternal( MetaDataField, const TQString& ); }; class K3b<name>EncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3b<name>EncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3b<name>EncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3b<name>EncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui index 7d8ee43..7fb8008 100644 --- a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui +++ b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>base_K3bSoxEncoderConfigWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkManual</cstring> </property> @@ -28,9 +28,9 @@ <string>Manual settings (used for all file types)</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -46,22 +46,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>10</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -69,7 +69,7 @@ <string>Sample rate:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>Signed Linear</string> @@ -121,7 +121,7 @@ <p><b>U-law</b> (actually shorthand for mu-law) and <b>A-law</b> are the U.S. and international standards for logarithmic telephone sound compression. When uncompressed u-law has roughly the precision of 14-bit PCM audio and A-law has roughly the precision of 13-bit PCM audio. A-law and u-law data is sometimes encoded using a reversed bit-ordering (i.e. MSB becomes LSB).<br> <b>ADPCM </b> is a form of sound compression that has a good compromise between good sound quality and fast encoding/decoding time. It is used for telephone sound compression and places where full fidelity is not as important. When uncompressed it has roughly the precision of 16-bit PCM audio. Popular versions of ADPCM include G.726, MS ADPCM, and IMA ADPCM. It has different meanings in different file handlers. In .wav files it represents MS ADPCM files, in all others it means G.726 ADPCM. <br> <b>IMA ADPCM</b> is a specific form of ADPCM compression, slightly simpler and slightly lower fidelity than Microsoft's flavor of ADPCM. IMA ADPCM is also called DVI ADPCM.<br> <b>GSM</b> is a standard used for telephone sound compression in European countries and is gaining popularity because of its good quality. It is usually CPU intensive to work with GSM audio data.</p> <p><em>Description based on the SoX manpage</em></p></string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_editSamplerate</cstring> </property> @@ -135,7 +135,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -143,7 +143,7 @@ <string>Data size:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -151,7 +151,7 @@ <string>Data encoding:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -159,7 +159,7 @@ <string>Channels:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>1 (mono)</string> @@ -182,7 +182,7 @@ <bool>false</bool> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>Bytes</string> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>250</width> <height>16</height> @@ -254,5 +254,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index ecae2e4..d170ab8 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -27,13 +27,13 @@ #include <kconfig.h> #include <klocale.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qvalidator.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqvalidator.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include <sys/types.h> #include <sys/wait.h> @@ -50,19 +50,19 @@ class K3bSoxProgram : public K3bExternalProgram : K3bExternalProgram( "sox" ) { } - bool scan( const QString& p ) { + bool scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append("sox"); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -73,10 +73,10 @@ class K3bSoxProgram : public K3bExternalProgram vp << path << "-h"; if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "sox: SoX Version" ); + int pos = out.output().tqfind( "sox: SoX Version" ); if ( pos < 0 ) - pos = out.output().find( "sox: SoX v" ); // newer sox versions - int endPos = out.output().find( "\n", pos ); + pos = out.output().tqfind( "sox: SoX v" ); // newer sox versions + int endPos = out.output().tqfind( "\n", pos ); if( pos > 0 && endPos > 0 ) { pos += 17; bin = new K3bExternalBin( this ); @@ -88,8 +88,8 @@ class K3bSoxProgram : public K3bExternalProgram return true; } else { - pos = out.output().find( "sox: Version" ); - endPos = out.output().find( "\n", pos ); + pos = out.output().tqfind( "sox: Version" ); + endPos = out.output().tqfind( "\n", pos ); if( pos > 0 && endPos > 0 ) { pos += 13; bin = new K3bExternalBin( this ); @@ -118,12 +118,12 @@ public: } K3bProcess* process; - QString fileName; + TQString fileName; }; -K3bSoxEncoder::K3bSoxEncoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3bSoxEncoder::K3bSoxEncoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { if( k3bcore->externalBinManager()->program( "sox" ) == 0 ) k3bcore->externalBinManager()->addProgram( new K3bSoxProgram() ); @@ -160,7 +160,7 @@ void K3bSoxEncoder::slotSoxFinished( KProcess* p ) } -bool K3bSoxEncoder::openFile( const QString& ext, const QString& filename, const K3b::Msf& ) +bool K3bSoxEncoder::openFile( const TQString& ext, const TQString& filename, const K3b::Msf& ) { d->fileName = filename; return initEncoderInternal( ext ); @@ -173,7 +173,7 @@ void K3bSoxEncoder::closeFile() } -bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) +bool K3bSoxEncoder::initEncoderInternal( const TQString& extension ) { const K3bExternalBin* soxBin = k3bcore->externalBinManager()->binObject( "sox" ); if( soxBin ) { @@ -182,12 +182,12 @@ bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotSoxFinished(KProcess*)) ); - connect( d->process, SIGNAL(stderrLine(const QString&)), - this, SLOT(slotSoxOutputLine(const QString&)) ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), - this, SLOT(slotSoxOutputLine(const QString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotSoxFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), + this, TQT_SLOT(slotSoxOutputLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), + this, TQT_SLOT(slotSoxOutputLine(const TQString&)) ); // input settings *d->process << soxBin->path @@ -204,13 +204,13 @@ bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) KConfig* c = k3bcore->config(); c->setGroup( "K3bSoxEncoderPlugin" ); if( c->readBoolEntry( "manual settings", false ) ) { - *d->process << "-r" << QString::number( c->readNumEntry( "samplerate", 44100 ) ) - << "-c" << QString::number( c->readNumEntry( "channels", 2 ) ); + *d->process << "-r" << TQString::number( c->readNumEntry( "samplerate", 44100 ) ) + << "-c" << TQString::number( c->readNumEntry( "channels", 2 ) ); int size = c->readNumEntry( "data size", 16 ); - *d->process << ( size == 8 ? QString("-b") : ( size == 32 ? QString("-l") : QString("-w") ) ); + *d->process << ( size == 8 ? TQString("-b") : ( size == 32 ? TQString("-l") : TQString("-w") ) ); - QString encoding = c->readEntry( "data encoding", "signed" ); + TQString encoding = c->readEntry( "data encoding", "signed" ); if( encoding == "unsigned" ) *d->process << "-u"; else if( encoding == "u-law" ) @@ -232,9 +232,9 @@ bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) *d->process << d->fileName; kdDebug() << "***** sox parameters:" << endl; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -249,7 +249,7 @@ bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) } -long K3bSoxEncoder::encodeInternal( const char* data, Q_ULONG len ) +long K3bSoxEncoder::encodeInternal( const char* data, TQ_ULONG len ) { if( d->process ) { if( d->process->isRunning() ) @@ -262,15 +262,15 @@ long K3bSoxEncoder::encodeInternal( const char* data, Q_ULONG len ) } -void K3bSoxEncoder::slotSoxOutputLine( const QString& line ) +void K3bSoxEncoder::slotSoxOutputLine( const TQString& line ) { kdDebug() << "(sox) " << line << endl; } -QStringList K3bSoxEncoder::extensions() const +TQStringList K3bSoxEncoder::extensions() const { - static QStringList s_extensions; + static TQStringList s_extensions; if( s_extensions.isEmpty() ) { s_extensions << "au" << "8svx" @@ -296,11 +296,11 @@ QStringList K3bSoxEncoder::extensions() const if( k3bcore->externalBinManager()->foundBin( "sox" ) ) return s_extensions; else - return QStringList(); // no sox -> no encoding + return TQStringList(); // no sox -> no encoding } -QString K3bSoxEncoder::fileTypeComment( const QString& ext ) const +TQString K3bSoxEncoder::fileTypeComment( const TQString& ext ) const { if( ext == "au" ) return i18n("Sun AU"); @@ -345,7 +345,7 @@ QString K3bSoxEncoder::fileTypeComment( const QString& ext ) const } -long long K3bSoxEncoder::fileSize( const QString&, const K3b::Msf& msf ) const +long long K3bSoxEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { // for now we make a rough assumption based on the settings KConfig* c = k3bcore->config(); @@ -364,21 +364,21 @@ long long K3bSoxEncoder::fileSize( const QString&, const K3b::Msf& msf ) const } -K3bPluginConfigWidget* K3bSoxEncoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bSoxEncoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bSoxEncoderSettingsWidget( parent, name ); + return new K3bSoxEncoderSettingsWidget( tqparent, name ); } -K3bSoxEncoderSettingsWidget::K3bSoxEncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bSoxEncoderSettingsWidget::K3bSoxEncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { w = new base_K3bSoxEncoderConfigWidget( this ); - w->m_editSamplerate->setValidator( new QIntValidator( w->m_editSamplerate ) ); + w->m_editSamplerate->setValidator( new TQIntValidator( TQT_TQOBJECT(w->m_editSamplerate) ) ); - QHBoxLayout* lay = new QHBoxLayout( this ); + TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); lay->addWidget( w ); @@ -401,9 +401,9 @@ void K3bSoxEncoderSettingsWidget::loadConfig() int channels = c->readNumEntry( "channels", 2 ); w->m_comboChannels->setCurrentItem( channels == 4 ? 2 : channels-1 ); - w->m_editSamplerate->setText( QString::number( c->readNumEntry( "samplerate", 44100 ) ) ); + w->m_editSamplerate->setText( TQString::number( c->readNumEntry( "samplerate", 44100 ) ) ); - QString encoding = c->readEntry( "data encoding", "signed" ); + TQString encoding = c->readEntry( "data encoding", "signed" ); if( encoding == "unsigned" ) w->m_comboEncoding->setCurrentItem(1); else if( encoding == "u-law" ) @@ -448,7 +448,7 @@ void K3bSoxEncoderSettingsWidget::saveConfig() c->writeEntry( "samplerate", w->m_editSamplerate->text().toInt() ); - QString enc; + TQString enc; switch( w->m_comboEncoding->currentItem() ) { case 1: enc = "unsigned"; diff --git a/plugins/encoder/sox/k3bsoxencoder.h b/plugins/encoder/sox/k3bsoxencoder.h index 555f44e..1a923c9 100644 --- a/plugins/encoder/sox/k3bsoxencoder.h +++ b/plugins/encoder/sox/k3bsoxencoder.h @@ -27,36 +27,37 @@ class KProcess; class K3bSoxEncoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3bSoxEncoder( QObject* parent = 0, const char* name = 0 ); + K3bSoxEncoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bSoxEncoder(); - QStringList extensions() const; + TQStringList extensions() const; - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; - long long fileSize( const QString&, const K3b::Msf& msf ) const; + long long fileSize( const TQString&, const K3b::Msf& msf ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; /** * reimplemented since sox writes the file itself */ - bool openFile( const QString& ext, const QString& filename, const K3b::Msf& ); + bool openFile( const TQString& ext, const TQString& filename, const K3b::Msf& ); void closeFile(); private slots: void slotSoxFinished( KProcess* ); - void slotSoxOutputLine( const QString& ); + void slotSoxOutputLine( const TQString& ); private: void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension ); - long encodeInternal( const char* data, Q_ULONG len ); + bool initEncoderInternal( const TQString& extension ); + long encodeInternal( const char* data, TQ_ULONG len ); class Private; Private* d; @@ -66,9 +67,10 @@ class K3bSoxEncoder : public K3bAudioEncoder class K3bSoxEncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bSoxEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bSoxEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bSoxEncoderSettingsWidget(); public slots: diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index 1fb39a6..c776b0e 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -35,19 +35,19 @@ #include <kmimetype.h> #include <kdialog.h> -#include <qstring.h> -#include <qfile.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qpushbutton.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qpair.h> -#include <qvaluelist.h> -#include <qlayout.h> -#include <qptrdict.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqpair.h> +#include <tqvaluelist.h> +#include <tqlayout.h> +#include <tqptrdict.h> @@ -58,15 +58,15 @@ class K3bAudioMetainfoRenamerPluginWidget::Private { public: K3bDataDoc* doc; - QString pattern; + TQString pattern; KComboBox* comboPattern; K3bListView* viewFiles; // KProgressDialog* progressDialog; - QPushButton* scanButton; + TQPushButton* scanButton; - QValueList< QPair<K3bFileItem*, QCheckListItem*> > renamableItems; - QPtrDict<QListViewItem> dirItemDict; + TQValueList< TQPair<K3bFileItem*, TQCheckListItem*> > renamableItems; + TQPtrDict<TQListViewItem> dirItemDict; // long long scannedSize; // int progressCounter; @@ -74,16 +74,16 @@ public: K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc* doc, - QWidget* parent, + TQWidget* tqparent, const char* name ) - : QWidget( parent, name ) + : TQWidget( tqparent, name ) { d = new Private(); d->doc = dynamic_cast<K3bDataDoc*>(doc); // d->progressDialog = 0; // pattern group - QGroupBox* patternGroup = new QGroupBox( 2, Qt::Horizontal, + TQGroupBox* patternGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("Rename Pattern"), this ); patternGroup->setInsideMargin( KDialog::marginHint() ); patternGroup->setInsideSpacing( KDialog::spacingHint() ); @@ -91,10 +91,10 @@ K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc d->comboPattern = new KComboBox( patternGroup ); d->comboPattern->setEditable( true ); - d->scanButton = new QPushButton( i18n("Scan"), patternGroup ); + d->scanButton = new TQPushButton( i18n("Scan"), patternGroup ); // the files view - QGroupBox* filesGroup = new QGroupBox( 1, Qt::Horizontal, + TQGroupBox* filesGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Found Files"), this ); filesGroup->setInsideMargin( KDialog::marginHint() ); filesGroup->setInsideSpacing( KDialog::spacingHint() ); @@ -104,18 +104,18 @@ K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc d->viewFiles->addColumn( i18n("Old Name") ); d->viewFiles->setNoItemText( i18n("Please click the Scan button to search for renameable files.") ); - // layout - QVBoxLayout* box = new QVBoxLayout( this ); + // tqlayout + TQVBoxLayout* box = new TQVBoxLayout( this ); box->setMargin( 0 ); box->setSpacing( KDialog::spacingHint() ); box->addWidget( patternGroup ); box->addWidget( filesGroup ); - connect( d->scanButton, SIGNAL(clicked()), this, SLOT(slotScanClicked()) ); + connect( d->scanButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScanClicked()) ); - QToolTip::add( d->scanButton, i18n("Scan for renamable files") ); - QWhatsThis::add( d->comboPattern, i18n("<qt>This specifies how the files should be renamed. " + TQToolTip::add( d->scanButton, i18n("Scan for renamable files") ); + TQWhatsThis::add( d->comboPattern, i18n("<qt>This specifies how the files should be renamed. " "Currently only the special strings <em>%a</em> (Artist), " "<em>%n</em> (Track number), and <em>%t</em> (Title) ," "are supported.") ); @@ -128,13 +128,13 @@ K3bAudioMetainfoRenamerPluginWidget::~K3bAudioMetainfoRenamerPluginWidget() } -QString K3bAudioMetainfoRenamerPluginWidget::title() const +TQString K3bAudioMetainfoRenamerPluginWidget::title() const { return i18n("Rename Audio Files"); } -QString K3bAudioMetainfoRenamerPluginWidget::subTitle() const +TQString K3bAudioMetainfoRenamerPluginWidget::subTitle() const { return i18n("Based on meta info"); } @@ -197,25 +197,25 @@ void K3bAudioMetainfoRenamerPluginWidget::slotScanClicked() } -void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, QListViewItem* viewRoot ) +void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewItem* viewRoot ) { kdDebug() << "(K3bAudioMetainfoRenamerPluginWidget) scanning dir " << dir->k3bName() << endl; d->dirItemDict.insert( dir, viewRoot ); - for( QPtrListIterator<K3bDataItem> it( dir->children() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); it.current(); ++it ) { K3bDataItem* item = it.current(); if( item->isFile() ) { if( item->isRenameable() ) { - QString newName = createNewName( (K3bFileItem*)item ); + TQString newName = createNewName( (K3bFileItem*)item ); if( !newName.isEmpty() ) { - QCheckListItem* fileViewItem = new QCheckListItem( viewRoot, + TQCheckListItem* fileViewItem = new TQCheckListItem( viewRoot, newName, - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); fileViewItem->setText(1, item->k3bName() ); fileViewItem->setOn(true); - d->renamableItems.append( qMakePair( (K3bFileItem*)item, fileViewItem ) ); + d->renamableItems.append( tqMakePair( (K3bFileItem*)item, fileViewItem ) ); } } @@ -224,7 +224,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, QListViewIte // if( d->progressCounter > 50 ) { // d->progressCounter = 0; // d->progressDialog->progressBar()->setProgress( 100*d->scannedSize/d->doc->root()->k3bSize() ); -// qApp->processEvents(); +// tqApp->processEvents(); // } } else if( item->isDir() ) { @@ -243,9 +243,9 @@ void K3bAudioMetainfoRenamerPluginWidget::activate() KMessageBox::sorry( this, i18n("Please click the Scan button to search for renameable files.") ); } else { - for( QValueList< QPair<K3bFileItem*, QCheckListItem*> >::iterator it = d->renamableItems.begin(); + for( TQValueList< TQPair<K3bFileItem*, TQCheckListItem*> >::iterator it = d->renamableItems.begin(); it != d->renamableItems.end(); ++it ) { - QPair<K3bFileItem*, QCheckListItem*>& item = *it; + TQPair<K3bFileItem*, TQCheckListItem*>& item = *it; if( item.second->isOn() ) item.first->setK3bName( item.second->text(0) ); @@ -259,14 +259,14 @@ void K3bAudioMetainfoRenamerPluginWidget::activate() } -QString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) +TQString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) { KMimeType::Ptr mimetype = KMimeType::findByPath( item->localPath() ); // sometimes ogg-vorbis files go as "application/x-ogg" if( mimetype != 0 && - ( mimetype->name().contains( "audio" ) || mimetype->name().contains("ogg") ) ) { + ( mimetype->name().tqcontains( "audio" ) || mimetype->name().tqcontains("ogg") ) ) { - QString artist, title, track; + TQString artist, title, track; KFileMetaInfo metaInfo( item->localPath() ); if( metaInfo.isValid() ) { @@ -285,7 +285,7 @@ QString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) track = track.sprintf("%02d",trackItem.string().toInt()); } - QString newName; + TQString newName; for( unsigned int i = 0; i < d->pattern.length(); ++i ) { if( d->pattern[i] == '%' ) { @@ -294,17 +294,17 @@ QString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) if( i < d->pattern.length() ) { if( d->pattern[i] == 'a' ) { if( artist.isEmpty() ) - return QString::null; + return TQString(); newName.append(artist); } else if( d->pattern[i] == 'n' ) { if( title.isEmpty() ) - return QString::null; + return TQString(); newName.append(track); } else if( d->pattern[i] == 't' ) { if( title.isEmpty() ) - return QString::null; + return TQString(); newName.append(title); } else { @@ -324,7 +324,7 @@ QString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) // remove white spaces from end and beginning newName = newName.stripWhiteSpace(); - QString extension = item->k3bName().mid( item->k3bName().findRev(".") ); + TQString extension = item->k3bName().mid( item->k3bName().tqfindRev(".") ); if( !newName.isEmpty() ) { // @@ -334,9 +334,9 @@ QString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) kdDebug() << "(K3bAudioMetainfoRenamerPluginWidget) file with name " << newName << extension << " already exists" << endl; int i = 1; - while( existsOtherItemWithSameName( item, newName + QString( " (%1)").arg(i) + extension ) ) + while( existsOtherItemWithSameName( item, newName + TQString( " (%1)").tqarg(i) + extension ) ) i++; - newName.append( QString( " (%1)").arg(i) ); + newName.append( TQString( " (%1)").tqarg(i) ); } // append extension @@ -346,20 +346,20 @@ QString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) return newName; } else - return QString::null; + return TQString(); } -bool K3bAudioMetainfoRenamerPluginWidget::existsOtherItemWithSameName( K3bFileItem* item, const QString& name ) +bool K3bAudioMetainfoRenamerPluginWidget::existsOtherItemWithSameName( K3bFileItem* item, const TQString& name ) { - K3bDirItem* dir = item->parent(); - K3bDataItem* otherItem = dir->find( name ); + K3bDirItem* dir = item->tqparent(); + K3bDataItem* otherItem = dir->tqfind( name ); if( otherItem && otherItem != item ) return true; - QListViewItem* dirViewItem = d->dirItemDict[dir]; - QListViewItem* current = dirViewItem->firstChild(); - while( current && current->parent() == dirViewItem ) { + TQListViewItem* dirViewItem = d->dirItemDict[dir]; + TQListViewItem* current = dirViewItem->firstChild(); + while( current && current->tqparent() == dirViewItem ) { if( current->text(0) == name ) return true; current = current->nextSibling(); @@ -370,9 +370,9 @@ bool K3bAudioMetainfoRenamerPluginWidget::existsOtherItemWithSameName( K3bFileIt -K3bAudioMetainfoRenamerPlugin::K3bAudioMetainfoRenamerPlugin( QObject* parent, +K3bAudioMetainfoRenamerPlugin::K3bAudioMetainfoRenamerPlugin( TQObject* tqparent, const char* name ) - : K3bProjectPlugin( DATA_PROJECTS, true, parent, name ) + : K3bProjectPlugin( DATA_PROJECTS, true, tqparent, name ) { setText( i18n("Rename Audio Files") ); setToolTip( i18n("Rename audio files based on their meta info.") ); @@ -384,9 +384,9 @@ K3bAudioMetainfoRenamerPlugin::~K3bAudioMetainfoRenamerPlugin() } -K3bProjectPluginGUIBase* K3bAudioMetainfoRenamerPlugin::createGUI( K3bDoc* doc, QWidget* parent, const char* name ) +K3bProjectPluginGUIBase* K3bAudioMetainfoRenamerPlugin::createGUI( K3bDoc* doc, TQWidget* tqparent, const char* name ) { - return new K3bAudioMetainfoRenamerPluginWidget( doc, parent, name ); + return new K3bAudioMetainfoRenamerPluginWidget( doc, tqparent, name ); } #include "k3baudiometainforenamerplugin.moc" diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h index b387aa5..66f5167 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h @@ -18,27 +18,28 @@ #include <k3bprojectplugin.h> -#include <qwidget.h> +#include <tqwidget.h> class K3bDataDoc; class K3bDirItem; class K3bFileItem; -class QListViewItem; +class TQListViewItem; -class K3bAudioMetainfoRenamerPluginWidget : public QWidget, public K3bProjectPluginGUIBase +class K3bAudioMetainfoRenamerPluginWidget : public TQWidget, public K3bProjectPluginGUIBase { Q_OBJECT + TQ_OBJECT public: - K3bAudioMetainfoRenamerPluginWidget( K3bDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bAudioMetainfoRenamerPluginWidget( K3bDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioMetainfoRenamerPluginWidget(); - QWidget* qWidget() { return this; } + TQWidget* qWidget() { return this; } - QString title() const; - QString subTitle() const; + TQString title() const; + TQString subTitle() const; void loadDefaults(); void readSettings( KConfigBase* ); @@ -50,9 +51,9 @@ class K3bAudioMetainfoRenamerPluginWidget : public QWidget, public K3bProjectPlu void slotScanClicked(); private: - void scanDir( K3bDirItem*, QListViewItem* parent ); - QString createNewName( K3bFileItem* ); - bool existsOtherItemWithSameName( K3bFileItem*, const QString& ); + void scanDir( K3bDirItem*, TQListViewItem* tqparent ); + TQString createNewName( K3bFileItem* ); + bool existsOtherItemWithSameName( K3bFileItem*, const TQString& ); class Private; Private* d; @@ -62,14 +63,15 @@ class K3bAudioMetainfoRenamerPluginWidget : public QWidget, public K3bProjectPlu class K3bAudioMetainfoRenamerPlugin : public K3bProjectPlugin { Q_OBJECT + TQ_OBJECT public: - K3bAudioMetainfoRenamerPlugin( QObject* parent, const char* name ); + K3bAudioMetainfoRenamerPlugin( TQObject* tqparent, const char* name ); ~K3bAudioMetainfoRenamerPlugin(); int pluginSystemVersion() const { return 3; } - K3bProjectPluginGUIBase* createGUI( K3bDoc*, QWidget* = 0, const char* = 0 ); + K3bProjectPluginGUIBase* createGUI( K3bDoc*, TQWidget* = 0, const char* = 0 ); }; diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp index e523eb3..844071b 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp @@ -38,15 +38,15 @@ #include <klocale.h> #include <kconfig.h> -#include <qstring.h> +#include <tqstring.h> K_EXPORT_COMPONENT_FACTORY( libk3baudioprojectcddbplugin, K3bPluginFactory<K3bAudioProjectCddbPlugin>( "libk3baudioprojectcddbplugin" ) ) -K3bAudioProjectCddbPlugin::K3bAudioProjectCddbPlugin( QObject* parent, +K3bAudioProjectCddbPlugin::K3bAudioProjectCddbPlugin( TQObject* tqparent, const char* name ) - : K3bProjectPlugin( AUDIO_CD, false, parent, name ), + : K3bProjectPlugin( AUDIO_CD, false, tqparent, name ), m_cddb(0), m_progress(0) { @@ -61,25 +61,25 @@ K3bAudioProjectCddbPlugin::~K3bAudioProjectCddbPlugin() } -void K3bAudioProjectCddbPlugin::activate( K3bDoc* doc, QWidget* parent ) +void K3bAudioProjectCddbPlugin::activate( K3bDoc* doc, TQWidget* tqparent ) { m_doc = dynamic_cast<K3bAudioDoc*>( doc ); - m_parentWidget = parent; + m_parentWidget = tqparent; m_canceled = false; if( !m_doc || m_doc->numOfTracks() == 0 ) { - KMessageBox::sorry( parent, i18n("Please select a non-empty audio project for a cddb query.") ); + KMessageBox::sorry( tqparent, i18n("Please select a non-empty audio project for a cddb query.") ); } else { if( !m_cddb ) { m_cddb = new K3bCddb( this ); - connect( m_cddb, SIGNAL(queryFinished(int)), - this, SLOT(slotCddbQueryFinished(int)) ); + connect( m_cddb, TQT_SIGNAL(queryFinished(int)), + this, TQT_SLOT(slotCddbQueryFinished(int)) ); } if( !m_progress ) { - m_progress = new K3bProgressDialog( i18n("Query Cddb"), parent, i18n("Audio Project") ); - connect( m_progress, SIGNAL(cancelClicked()), - this, SLOT(slotCancelClicked()) ); + m_progress = new K3bProgressDialog( i18n("Query Cddb"), tqparent, i18n("Audio Project") ); + connect( m_progress, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(slotCancelClicked()) ); } // read the k3b config :) @@ -141,7 +141,7 @@ void K3bAudioProjectCddbPlugin::slotCddbQueryFinished( int error ) } } - // make sure the progress dialog does not get deleted by it's parent + // make sure the progress dialog does not get deleted by it's tqparent delete m_progress; m_doc = 0; m_parentWidget = 0; diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h index a0e7880..40aabd5 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h @@ -22,19 +22,20 @@ class K3bCddb; class K3bAudioDoc; class K3bProgressDialog; -class QWidget; +class TQWidget; class K3bAudioProjectCddbPlugin : public K3bProjectPlugin { Q_OBJECT + TQ_OBJECT public: - K3bAudioProjectCddbPlugin( QObject* parent, const char* name ); + K3bAudioProjectCddbPlugin( TQObject* tqparent, const char* name ); ~K3bAudioProjectCddbPlugin(); int pluginSystemVersion() const { return 3; } - void activate( K3bDoc* doc, QWidget* parent ); + void activate( K3bDoc* doc, TQWidget* tqparent ); private slots: void slotCddbQueryFinished( int result ); @@ -44,7 +45,7 @@ class K3bAudioProjectCddbPlugin : public K3bProjectPlugin K3bCddb* m_cddb; K3bAudioDoc* m_doc; K3bProgressDialog* m_progress; - QWidget* m_parentWidget; + TQWidget* m_parentWidget; bool m_canceled; }; diff --git a/src/fastscale/scale.cpp b/src/fastscale/scale.cpp index e2332fe..35928de 100644 --- a/src/fastscale/scale.cpp +++ b/src/fastscale/scale.cpp @@ -6,7 +6,7 @@ // ImageMagick code begin // ---------------------- -// This code is ImageMagick's resize code, adapted for QImage, with +// This code is ImageMagick's resize code, adapted for TQImage, with // fastfloat class added as an optimization. // The original license text follows. @@ -69,9 +69,9 @@ #endif #endif -// Qt -#include <qimage.h> -#include <qcolor.h> +// TQt +#include <tqimage.h> +#include <tqcolor.h> #include <kdeversion.h> #include <kcpuinfo.h> @@ -86,8 +86,8 @@ namespace ImageUtils { -#define Max QMAX -#define Min QMIN +#define Max TQMAX +#define Min TQMIN // mustn't be less than used precision (i.e. 1/fastfloat::RATIO) #define MagickEpsilon 0.0002 @@ -423,7 +423,7 @@ static fastfloat Triangle(const fastfloat x,const fastfloat) return(0.0); } -static void HorizontalFilter(const QImage& source,QImage& destination, +static void HorizontalFilter(const TQImage& source,TQImage& destination, const fastfloat x_factor,const fastfloat blur, ContributionInfo *contribution, Filter filter, fastfloat filtersupport) { @@ -492,23 +492,23 @@ static void HorizontalFilter(const QImage& source,QImage& destination, { int px = contribution[i].pixel; int py = y; - QRgb p = reinterpret_cast< QRgb* >( source.jumpTable()[ py ])[ px ]; - red+=contribution[i].weight*qRed(p); - green+=contribution[i].weight*qGreen(p); - blue+=contribution[i].weight*qBlue(p); - alpha+=contribution[i].weight*qAlpha(p); + TQRgb p = reinterpret_cast< TQRgb* >( const_cast<TQImage&>(source).jumpTable()[ py ])[ px ]; + red+=contribution[i].weight*tqRed(p); + green+=contribution[i].weight*tqGreen(p); + blue+=contribution[i].weight*tqBlue(p); + alpha+=contribution[i].weight*tqAlpha(p); } - QRgb pix = qRgba( + TQRgb pix = tqRgba( fasttolong( red < 0 ? 0 : red > 255 ? 255 : red + 0.5 ), fasttolong( green < 0 ? 0 : green > 255 ? 255 : green + 0.5 ), fasttolong( blue < 0 ? 0 : blue > 255 ? 255 : blue + 0.5 ), fasttolong( alpha < 0 ? 0 : alpha > 255 ? 255 : alpha + 0.5 )); - reinterpret_cast< QRgb* >( destination.jumpTable()[ y ])[ x ] = pix; + reinterpret_cast< TQRgb* >( destination.jumpTable()[ y ])[ x ] = pix; } } } -static void VerticalFilter(const QImage& source,QImage& destination, +static void VerticalFilter(const TQImage& source,TQImage& destination, const fastfloat y_factor,const fastfloat blur, ContributionInfo *contribution, Filter filter, fastfloat filtersupport ) { @@ -577,23 +577,23 @@ static void VerticalFilter(const QImage& source,QImage& destination, { int px = x; int py = contribution[i].pixel; - QRgb p = reinterpret_cast< QRgb* >( source.jumpTable()[ py ])[ px ]; - red+=contribution[i].weight*qRed(p); - green+=contribution[i].weight*qGreen(p); - blue+=contribution[i].weight*qBlue(p); - alpha+=contribution[i].weight*qAlpha(p); + TQRgb p = reinterpret_cast< TQRgb* >( const_cast<TQImage&>(source).jumpTable()[ py ])[ px ]; + red+=contribution[i].weight*tqRed(p); + green+=contribution[i].weight*tqGreen(p); + blue+=contribution[i].weight*tqBlue(p); + alpha+=contribution[i].weight*tqAlpha(p); } - QRgb pix = qRgba( + TQRgb pix = tqRgba( fasttolong( red < 0 ? 0 : red > 255 ? 255 : red + 0.5 ), fasttolong( green < 0 ? 0 : green > 255 ? 255 : green + 0.5 ), fasttolong( blue < 0 ? 0 : blue > 255 ? 255 : blue + 0.5 ), fasttolong( alpha < 0 ? 0 : alpha > 255 ? 255 : alpha + 0.5 )); - reinterpret_cast< QRgb* >( destination.jumpTable()[ y ])[ x ] = pix; + reinterpret_cast< TQRgb* >( destination.jumpTable()[ y ])[ x ] = pix; } } } -static QImage ResizeImage(const QImage& image,const int columns, +static TQImage ResizeImage(const TQImage& image,const int columns, const int rows, Filter filter, fastfloat filtersupport, double blur) { ContributionInfo @@ -611,7 +611,7 @@ static QImage ResizeImage(const QImage& image,const int columns, */ if ((columns == image.width()) && (rows == image.height()) && (blur == 1.0)) return image.copy(); - QImage resize_image( columns, rows, 32 ); + TQImage resize_image( columns, rows, 32 ); resize_image.setAlphaBuffer( image.hasAlphaBuffer()); /* Allocate filter contribution info. @@ -638,20 +638,20 @@ static QImage ResizeImage(const QImage& image,const int columns, if (((fastfloat) columns*(image.height()+rows)) > ((fastfloat) rows*(image.width()+columns))) { - QImage source_image( columns, image.height(), 32 ); + TQImage source_image( columns, image.height(), 32 ); source_image.setAlphaBuffer( image.hasAlphaBuffer()); - HorizontalFilter(image,source_image,x_factor,blur, + HorizontalFilter(image,source_image,x_factor,blur, contribution,filter,filtersupport); - VerticalFilter(source_image,resize_image,y_factor, + VerticalFilter(source_image,resize_image,y_factor, blur,contribution,filter,filtersupport); } else { - QImage source_image( image.width(), rows, 32 ); + TQImage source_image( image.width(), rows, 32 ); source_image.setAlphaBuffer( image.hasAlphaBuffer()); - VerticalFilter(image,source_image,y_factor,blur, + VerticalFilter(image,source_image,y_factor,blur, contribution,filter,filtersupport); - HorizontalFilter(source_image,resize_image,x_factor, + HorizontalFilter(source_image,resize_image,x_factor, blur,contribution,filter,filtersupport); } /* @@ -724,7 +724,7 @@ static QImage ResizeImage(const QImage& image,const int columns, % % */ -QImage SampleImage(const QImage& image,const int columns, +TQImage SampleImage(const TQImage& image,const int columns, const int rows) { int @@ -756,7 +756,7 @@ QImage SampleImage(const QImage& image,const int columns, // 32bit like the ImageMagick original. This avoids the relatively // expensive conversion. const int d = image.depth() / 8; - QImage sample_image( columns, rows, image.depth()); + TQImage sample_image( columns, rows, image.depth()); sample_image.setAlphaBuffer( image.hasAlphaBuffer()); /* Allocate scan line buffer and column offset buffers. @@ -769,7 +769,7 @@ QImage SampleImage(const QImage& image,const int columns, */ // In the following several code 0.5 needs to be added, otherwise the image // would be moved by half a pixel to bottom-right, just like -// with Qt's QImage::scale() +// with TQt's TQImage::scale() for (x=0; x < (long) sample_image.width(); x++) { x_offset[x]=int((x+0.5)*image.width()/sample_image.width()); @@ -808,7 +808,7 @@ QImage SampleImage(const QImage& image,const int columns, case 4: // 32bit for (x=0; x < (long) sample_image.width(); x++) { - *(QRgb*)q=((QRgb*)pixels)[ x_offset[x] ]; + *(TQRgb*)q=((TQRgb*)pixels)[ x_offset[x] ]; q += d; } break; @@ -848,11 +848,11 @@ QImage SampleImage(const QImage& image,const int columns, /** * This is the normal smoothscale method, based on Imlib2's smoothscale. * - * Originally I took the algorithm used in NetPBM and Qt and added MMX/3dnow - * optimizations. It ran in about 1/2 the time as Qt. Then I ported Imlib's + * Originally I took the algorithm used in NetPBM and TQt and added MMX/3dnow + * optimizations. It ran in about 1/2 the time as TQt. Then I ported Imlib's * C algorithm and it ran at about the same speed as my MMX optimized one... * Finally I ported Imlib's MMX version and it ran in less than half the - * time as my MMX algorithm, (taking only a quarter of the time Qt does). + * time as my MMX algorithm, (taking only a quarter of the time TQt does). * * Changes include formatting, namespaces and other C++'ings, removal of old * #ifdef'ed code, and removal of unneeded border calculation code. @@ -933,7 +933,7 @@ namespace MImageScale{ int* mimageCalcXPoints(int sw, int dw); int* mimageCalcApoints(int s, int d, int up); MImageScaleInfo* mimageFreeScaleInfo(MImageScaleInfo *isi); - MImageScaleInfo *mimageCalcScaleInfo(QImage &img, int sw, int sh, + MImageScaleInfo *mimageCalcScaleInfo(TQImage &img, int sw, int sh, int dw, int dh, char aa, int sow); void mimageSampleRGBA(MImageScaleInfo *isi, unsigned int *dest, int dxx, int dyy, int dx, int dy, int dw, int dh, int dow); @@ -943,7 +943,7 @@ namespace MImageScale{ void mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, int dxx, int dyy, int dx, int dy, int dw, int dh, int dow, int sow); - QImage smoothScale(const QImage& img, int dw, int dh); + TQImage smoothScale(const TQImage& img, int dw, int dh); } #ifdef HAVE_X86_MMX @@ -957,14 +957,14 @@ extern "C" { using namespace MImageScale; -QImage MImageScale::smoothScale(const QImage& image, int dw, int dh) +TQImage MImageScale::smoothScale(const TQImage& image, int dw, int dh) { - QImage img = image.depth() < 32 ? image.convertDepth( 32 ) : image; + TQImage img = image.depth() < 32 ? image.convertDepth( 32 ) : image; int w = img.width(); int h = img.height(); int sow = img.bytesPerLine(); - // handle CroppedQImage + // handle CroppedTQImage if( img.height() > 1 && sow != img.scanLine( 1 ) - img.scanLine( 0 )) sow = img.scanLine( 1 ) - img.scanLine( 0 ); sow = sow / ( img.depth() / 8 ); @@ -972,9 +972,9 @@ QImage MImageScale::smoothScale(const QImage& image, int dw, int dh) MImageScaleInfo *scaleinfo = mimageCalcScaleInfo(img, w, h, dw, dh, true, sow); if(!scaleinfo) - return QImage(); + return TQImage(); - QImage buffer(dw, dh, 32); + TQImage buffer(dw, dh, 32); buffer.setAlphaBuffer(img.hasAlphaBuffer()); #ifdef HAVE_X86_MMX @@ -1139,7 +1139,7 @@ MImageScaleInfo* MImageScale::mimageFreeScaleInfo(MImageScaleInfo *isi) return(NULL); } -MImageScaleInfo* MImageScale::mimageCalcScaleInfo(QImage &img, int sw, int sh, +MImageScaleInfo* MImageScale::mimageCalcScaleInfo(TQImage &img, int sw, int sh, int dw, int dh, char aa, int sow) { MImageScaleInfo *isi; @@ -1250,7 +1250,7 @@ void MImageScale::mimageScaleAARGBA(MImageScaleInfo *isi, unsigned int *dest, g = ((gg * YAP) + (g * INV_YAP)) >> 16; b = ((bb * YAP) + (b * INV_YAP)) >> 16; a = ((aa * YAP) + (a * INV_YAP)) >> 16; - *dptr++ = qRgba(r, g, b, a); + *dptr++ = tqRgba(r, g, b, a); } else{ pix = ypoints[dyy + y] + xpoints[x]; @@ -1267,7 +1267,7 @@ void MImageScale::mimageScaleAARGBA(MImageScaleInfo *isi, unsigned int *dest, g >>= 8; b >>= 8; a >>= 8; - *dptr++ = qRgba(r, g, b, a); + *dptr++ = tqRgba(r, g, b, a); } } } @@ -1291,7 +1291,7 @@ void MImageScale::mimageScaleAARGBA(MImageScaleInfo *isi, unsigned int *dest, g >>= 8; b >>= 8; a >>= 8; - *dptr++ = qRgba(r, g, b, a); + *dptr++ = tqRgba(r, g, b, a); } else *dptr++ = sptr[xpoints[x] ]; @@ -1368,7 +1368,7 @@ void MImageScale::mimageScaleAARGBA(MImageScaleInfo *isi, unsigned int *dest, b >>= 4; a >>= 4; } - *dptr = qRgba(r, g, b, a); + *dptr = tqRgba(r, g, b, a); dptr++; } } @@ -1442,7 +1442,7 @@ void MImageScale::mimageScaleAARGBA(MImageScaleInfo *isi, unsigned int *dest, b >>= 4; a >>= 4; } - *dptr = qRgba(r, g, b, a); + *dptr = tqRgba(r, g, b, a); dptr++; } } @@ -1606,7 +1606,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, r = ((rr * YAP) + (r * INV_YAP)) >> 16; g = ((gg * YAP) + (g * INV_YAP)) >> 16; b = ((bb * YAP) + (b * INV_YAP)) >> 16; - *dptr++ = qRgba(r, g, b, 0xff); + *dptr++ = tqRgba(r, g, b, 0xff); } else{ pix = ypoints[dyy + y] + xpoints[x]; @@ -1620,7 +1620,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, r >>= 8; g >>= 8; b >>= 8; - *dptr++ = qRgba(r, g, b, 0xff); + *dptr++ = tqRgba(r, g, b, 0xff); } } } @@ -1641,7 +1641,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, r >>= 8; g >>= 8; b >>= 8; - *dptr++ = qRgba(r, g, b, 0xff); + *dptr++ = tqRgba(r, g, b, 0xff); } else *dptr++ = sptr[xpoints[x] ]; @@ -1709,7 +1709,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, g >>= 4; b >>= 4; } - *dptr = qRgba(r, g, b, 0xff); + *dptr = tqRgba(r, g, b, 0xff); dptr++; } } @@ -1774,7 +1774,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, g >>= 4; b >>= 4; } - *dptr = qRgba(r, g, b, 0xff); + *dptr = tqRgba(r, g, b, 0xff); dptr++; } } @@ -1913,20 +1913,20 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, // // Imlib2/Mosfet scale - I have really no idea how many pixels it needs // if( filter == Box && blur == 1.0 ) return int( 3 / zoom + 1 ); // // This is support size for ImageMagick's scaling. -// double scale=blur*QMAX(1.0/zoom,1.0); +// double scale=blur*TQMAX(1.0/zoom,1.0); // double support=scale* filtersupport; // if (support <= 0.5) support=0.5+0.000001; // return int( support + 1 ); // } -QImage scale(const QImage& image, int width, int height, - SmoothAlgorithm alg, QImage::ScaleMode mode, double blur ) +TQImage scale(const TQImage& image, int width, int height, + SmoothAlgorithm alg, TQ_ScaleMode mode, double blur ) { if( image.isNull()) return image.copy(); - QSize newSize( image.size() ); - newSize.scale( QSize( width, height ), (QSize::ScaleMode)mode ); // ### remove cast in Qt 4.0 - newSize = newSize.expandedTo( QSize( 1, 1 )); // make sure it doesn't become null + TQSize newSize( image.size() ); + newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 + newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null if ( newSize == image.size() ) return image.copy(); @@ -1968,7 +1968,7 @@ QImage scale(const QImage& image, int width, int height, } return ResizeImage( image.convertDepth( 32 ), width, height, filter, filtersupport, blur ); - // unlike Qt's smoothScale() this function introduces new colors to grayscale images ... oh well + // unlike TQt's smoothScale() this function introduces new colors to grayscale images ... oh well } diff --git a/src/fastscale/scale.h b/src/fastscale/scale.h index 299ac16..f2e17e0 100644 --- a/src/fastscale/scale.h +++ b/src/fastscale/scale.h @@ -1,7 +1,7 @@ // vim: set tabstop=4 shiftwidth=4 noexpandtab /* Gwenview - A simple image viewer for KDE -Copyright 2000-2004 Aurélien Gâteau +Copyright 2000-2004 Aur�lien G�teau This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -21,14 +21,14 @@ Copyright 2000-2004 Aurélien Gâteau #ifndef FAST_SCALE_H #define FAST_SCALE_H -// Qt -#include <qimage.h> +// TQt +#include <tqimage.h> namespace ImageUtils { enum SmoothAlgorithm { SMOOTH_NONE, SMOOTH_FAST, SMOOTH_NORMAL, SMOOTH_BEST }; - QImage scale(const QImage& image, int width, int height, - SmoothAlgorithm alg, QImage::ScaleMode mode = QImage::ScaleFree, double blur = 1.0); + TQImage scale(const TQImage& image, int width, int height, + SmoothAlgorithm alg, TQ_ScaleMode mode = TQ_ScaleFree, double blur = 1.0); } #endif diff --git a/src/k3b.cpp b/src/k3b.cpp index 23a5cd6..f11780b 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -17,21 +17,21 @@ // include files for QT -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qtoolbutton.h> -#include <qstring.h> -#include <qsplitter.h> -#include <qevent.h> -#include <qvaluelist.h> -#include <qfont.h> -#include <qpalette.h> -#include <qwidgetstack.h> -#include <qtimer.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqtoolbutton.h> +#include <tqstring.h> +#include <tqsplitter.h> +#include <tqevent.h> +#include <tqvaluelist.h> +#include <tqfont.h> +#include <tqpalette.h> +#include <tqwidgetstack.h> +#include <tqtimer.h> #include <kdockwidget.h> #include <kkeydialog.h> @@ -131,13 +131,13 @@ class K3bMainWindow::Private public: K3bDoc* lastDoc; - QWidgetStack* documentStack; + TQWidgetStack* documentStack; K3bWelcomeWidget* welcomeWidget; - QWidget* documentHull; + TQWidget* documentHull; - QLabel* leftDocPicLabel; - QLabel* centerDocLabel; - QLabel* rightDocPicLabel; + TQLabel* leftDocPicLabel; + TQLabel* centerDocLabel; + TQLabel* rightDocPicLabel; }; @@ -175,14 +175,14 @@ K3bMainWindow::K3bMainWindow() // disable actions at startup slotStateChanged( "state_project_active", KXMLGUIClient::StateReverse ); - connect( k3bappcore->projectManager(), SIGNAL(newProject(K3bDoc*)), this, SLOT(createClient(K3bDoc*)) ); - connect( k3bcore->deviceManager(), SIGNAL(changed()), this, SLOT(slotCheckSystemTimed()) ); - connect( K3bAudioServer::instance(), SIGNAL(error(const QString&)), this, SLOT(slotAudioServerError(const QString&)) ); + connect( k3bappcore->projectManager(), TQT_SIGNAL(newProject(K3bDoc*)), TQT_TQOBJECT(this), TQT_SLOT(createClient(K3bDoc*)) ); + connect( k3bcore->deviceManager(), TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystemTimed()) ); + connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotAudioServerError(const TQString&)) ); // FIXME: now make sure the welcome screen is displayed completely resize( 780, 550 ); -// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->sizeHint() ) ); -// m_dirTreeDock->resize( QSize( m_dirTreeDock->sizeHint().width(), m_dirTreeDock->height() ) ); +// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->tqsizeHint() ) ); +// m_dirTreeDock->resize( TQSize( m_dirTreeDock->tqsizeHint().width(), m_dirTreeDock->height() ) ); readOptions(); } @@ -196,9 +196,9 @@ K3bMainWindow::~K3bMainWindow() } -void K3bMainWindow::showEvent( QShowEvent* e ) +void K3bMainWindow::showEvent( TQShowEvent* e ) { - slotCheckDockWidgetStatus(); + slotCheckDockWidgettqStatus(); KDockMainWindow::showEvent( e ); } @@ -211,59 +211,59 @@ void K3bMainWindow::initActions() // see the correct solution?) *actionCollection() += *k3bappcore->appDeviceManager()->actionCollection(); - actionFileOpen = KStdAction::open(this, SLOT(slotFileOpen()), actionCollection()); - actionFileOpenRecent = KStdAction::openRecent(this, SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - actionFileSave = KStdAction::save(this, SLOT(slotFileSave()), actionCollection()); - actionFileSaveAs = KStdAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection()); - actionFileSaveAll = new KAction( i18n("Save All"), "save_all", 0, this, SLOT(slotFileSaveAll()), + actionFileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + actionFileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + actionFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + actionFileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + actionFileSaveAll = new KAction( i18n("Save All"), "save_all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAll()), actionCollection(), "file_save_all" ); - actionFileClose = KStdAction::close(this, SLOT(slotFileClose()), actionCollection()); - actionFileCloseAll = new KAction( i18n("Close All"), 0, 0, this, SLOT(slotFileCloseAll()), + actionFileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); + actionFileCloseAll = new KAction( i18n("Close All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileCloseAll()), actionCollection(), "file_close_all" ); - actionFileQuit = KStdAction::quit(this, SLOT(slotFileQuit()), actionCollection()); - actionViewStatusBar = KStdAction::showStatusbar(this, SLOT(slotViewStatusBar()), actionCollection()); - actionSettingsConfigure = KStdAction::preferences(this, SLOT(slotSettingsConfigure()), actionCollection() ); + actionFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + actionViewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection()); + actionSettingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSettingsConfigure()), actionCollection() ); // the tip action - (void)KStdAction::tipOfDay(this, SLOT(slotShowTips()), actionCollection() ); - (void)KStdAction::keyBindings( this, SLOT( slotConfigureKeys() ), actionCollection() ); + (void)KStdAction::tipOfDay(TQT_TQOBJECT(this), TQT_SLOT(slotShowTips()), actionCollection() ); + (void)KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); - KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); setStandardToolBarMenuEnabled(true); - KStdAction::showMenubar( this, SLOT(slotShowMenuBar()), actionCollection() ); + KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() ); actionFileNewMenu = new KActionMenu( i18n("&New Project"), "filenew", actionCollection(), "file_new" ); - actionFileNewAudio = new KAction(i18n("New &Audio CD Project"), "audiocd", 0, this, SLOT(slotNewAudioDoc()), + actionFileNewAudio = new KAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()), actionCollection(), "file_new_audio"); - actionFileNewData = new KAction(i18n("New Data &CD Project"), "datacd", 0, this, SLOT(slotNewDataDoc()), + actionFileNewData = new KAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()), actionCollection(), "file_new_data"); - actionFileNewMixed = new KAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, this, SLOT(slotNewMixedDoc()), + actionFileNewMixed = new KAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMixedDoc()), actionCollection(), "file_new_mixed"); - actionFileNewVcd = new KAction(i18n("New &Video CD Project"), "videocd", 0, this, SLOT(slotNewVcdDoc()), + actionFileNewVcd = new KAction(i18n("New &Video CD Project"), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVcdDoc()), actionCollection(), "file_new_vcd"); - actionFileNewMovix = new KAction(i18n("New &eMovix CD Project"), "emovix", 0, this, SLOT(slotNewMovixDoc()), + actionFileNewMovix = new KAction(i18n("New &eMovix CD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDoc()), actionCollection(), "file_new_movix"); - actionFileNewMovixDvd = new KAction(i18n("New &eMovix DVD Project"), "emovix", 0, this, SLOT(slotNewMovixDvdDoc()), + actionFileNewMovixDvd = new KAction(i18n("New &eMovix DVD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDvdDoc()), actionCollection(), "file_new_movix_dvd"); - actionFileNewDvd = new KAction(i18n("New Data &DVD Project"), "datadvd", 0, this, SLOT(slotNewDvdDoc()), + actionFileNewDvd = new KAction(i18n("New Data &DVD Project"), "datadvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDvdDoc()), actionCollection(), "file_new_dvd"); - actionFileNewVideoDvd = new KAction(i18n("New V&ideo DVD Project"), "videodvd", 0, this, SLOT(slotNewVideoDvdDoc()), + actionFileNewVideoDvd = new KAction(i18n("New V&ideo DVD Project"), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVideoDvdDoc()), actionCollection(), "file_new_video_dvd"); - actionFileContinueMultisession = new KAction( i18n("Continue Multisession Project"), "datacd", 0, this, SLOT(slotContinueMultisession()), + actionFileContinueMultisession = new KAction( i18n("Continue Multisession Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinueMultisession()), actionCollection(), "file_continue_multisession" ); actionFileNewMenu->setDelayed( false ); actionFileNewMenu->insert( actionFileNewData ); actionFileNewMenu->insert( actionFileNewDvd ); actionFileNewMenu->insert( actionFileContinueMultisession ); - actionFileNewMenu->insert( new KActionSeparator( this ) ); + actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( actionFileNewAudio ); - actionFileNewMenu->insert( new KActionSeparator( this ) ); + actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( actionFileNewMixed ); - actionFileNewMenu->insert( new KActionSeparator( this ) ); + actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( actionFileNewVcd ); actionFileNewMenu->insert( actionFileNewVideoDvd ); - actionFileNewMenu->insert( new KActionSeparator( this ) ); + actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( actionFileNewMovix ); actionFileNewMenu->insert( actionFileNewMovixDvd ); @@ -271,54 +271,54 @@ void K3bMainWindow::initActions() - actionProjectAddFiles = new KAction( i18n("&Add Files..."), "filenew", 0, this, SLOT(slotProjectAddFiles()), + actionProjectAddFiles = new KAction( i18n("&Add Files..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()), actionCollection(), "project_add_files"); - KAction* actionClearProject = new KAction( i18n("&Clear Project"), QApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, - this, SLOT(slotClearProject()), actionCollection(), "project_clear_project" ); + KAction* actionClearProject = new KAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, + TQT_TQOBJECT(this), TQT_SLOT(slotClearProject()), actionCollection(), "project_clear_project" ); - actionViewDirTreeView = new KToggleAction(i18n("Show Directories"), 0, this, SLOT(slotShowDirTreeView()), + actionViewDirTreeView = new KToggleAction(i18n("Show Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDirTreeView()), actionCollection(), "view_dir_tree"); - actionViewContentsView = new KToggleAction(i18n("Show Contents"), 0, this, SLOT(slotShowContentsView()), + actionViewContentsView = new KToggleAction(i18n("Show Contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowContentsView()), actionCollection(), "view_contents"); - actionViewDocumentHeader = new KToggleAction(i18n("Show Document Header"), 0, this, SLOT(slotViewDocumentHeader()), + actionViewDocumentHeader = new KToggleAction(i18n("Show Document Header"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDocumentHeader()), actionCollection(), "view_document_header"); - actionToolsBlankCdrw = new KAction( i18n("&Erase CD-RW..."), "erasecd", 0, this, SLOT(slotBlankCdrw()), + actionToolsBlankCdrw = new KAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()), actionCollection(), "tools_blank_cdrw" ); - KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").arg("±"), "formatdvd", 0, this, - SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); - actionToolsWriteCdImage = new KAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, this, SLOT(slotWriteCdImage()), + KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").tqarg("�"), "formatdvd", 0, TQT_TQOBJECT(this), + TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); + actionToolsWriteCdImage = new KAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()), actionCollection(), "tools_write_cd_image" ); - KAction* actionToolsWriteDvdImage = new KAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, this, SLOT(slotWriteDvdIsoImage()), + KAction* actionToolsWriteDvdImage = new KAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteDvdIsoImage()), actionCollection(), "tools_write_dvd_iso" ); - actionCdCopy = new KAction(i18n("&Copy CD..."), "cdcopy", 0, this, SLOT(slotCdCopy()), + actionCdCopy = new KAction(i18n("&Copy CD..."), "cdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCdCopy()), actionCollection(), "tools_copy_cd" ); - KAction* actionToolsDvdCopy = new KAction(i18n("Copy &DVD..."), "dvdcopy", 0, this, SLOT(slotDvdCopy()), + KAction* actionToolsDvdCopy = new KAction(i18n("Copy &DVD..."), "dvdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdCopy()), actionCollection(), "tools_copy_dvd" ); - actionToolsCddaRip = new KAction( i18n("Rip Audio CD..."), "cddarip", 0, this, SLOT(slotCddaRip()), + actionToolsCddaRip = new KAction( i18n("Rip Audio CD..."), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCddaRip()), actionCollection(), "tools_cdda_rip" ); - actionToolsVideoDvdRip = new KAction( i18n("Rip Video DVD..."), "videodvd", 0, this, SLOT(slotVideoDvdRip()), + actionToolsVideoDvdRip = new KAction( i18n("Rip Video DVD..."), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoDvdRip()), actionCollection(), "tools_videodvd_rip" ); - actionToolsVideoCdRip = new KAction( i18n("Rip Video CD..."), "videocd", 0, this, SLOT(slotVideoCdRip()), + actionToolsVideoCdRip = new KAction( i18n("Rip Video CD..."), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoCdRip()), actionCollection(), "tools_videocd_rip" ); - (void)new KAction( i18n("System Check"), 0, 0, this, SLOT(slotCheckSystem()), + (void)new KAction( i18n("System Check"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()), actionCollection(), "help_check_system" ); #ifdef HAVE_K3BSETUP - actionSettingsK3bSetup = new KAction(i18n("&Setup System Permissions..."), "configure", 0, this, SLOT(slotK3bSetup()), + actionSettingsK3bSetup = new KAction(i18n("&Setup System Permissions..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotK3bSetup()), actionCollection(), "settings_k3bsetup" ); #endif #ifdef K3B_DEBUG - (void)new KAction( "Test Media Selection ComboBox", 0, 0, this, - SLOT(slotMediaSelectionTester()), actionCollection(), + (void)new KAction( "Test Media Selection ComboBox", 0, 0, TQT_TQOBJECT(this), + TQT_SLOT(slotMediaSelectionTester()), actionCollection(), "test_media_selection" ); #endif @@ -330,7 +330,7 @@ void K3bMainWindow::initActions() actionFileNewMovix->setToolTip( i18n("Creates a new eMovix CD project") ); actionFileNewVcd->setToolTip( i18n("Creates a new Video CD project") ); actionToolsBlankCdrw->setToolTip( i18n("Open the CD-RW erasing dialog") ); - actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").arg("±") ); + actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").tqarg("�") ); actionCdCopy->setToolTip( i18n("Open the CD copy dialog") ); actionToolsWriteCdImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to CD") ); actionToolsWriteDvdImage->setToolTip( i18n("Write an Iso9660 image to DVD") ); @@ -359,7 +359,7 @@ void K3bMainWindow::initActions() -const QPtrList<K3bDoc>& K3bMainWindow::projects() const +const TQPtrList<K3bDoc>& K3bMainWindow::projects() const { return k3bappcore->projectManager()->projects(); } @@ -387,18 +387,18 @@ void K3bMainWindow::initView() setMainDockWidget( mainDock ); // --- Document Dock ---------------------------------------------------------------------------- - d->documentStack = new QWidgetStack( mainDock ); + d->documentStack = new TQWidgetStack( mainDock ); mainDock->setWidget( d->documentStack ); - d->documentHull = new QWidget( d->documentStack ); + d->documentHull = new TQWidget( d->documentStack ); d->documentStack->addWidget( d->documentHull ); - QGridLayout* documentHullLayout = new QGridLayout( d->documentHull ); + TQGridLayout* documentHullLayout = new TQGridLayout( d->documentHull ); documentHullLayout->setMargin( 2 ); documentHullLayout->setSpacing( 0 ); m_documentHeader = new K3bThemedHeader( d->documentHull ); m_documentHeader->setTitle( i18n("Current Projects") ); - m_documentHeader->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + m_documentHeader->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); m_documentHeader->setLeftPixmap( K3bTheme::PROJECT_LEFT ); m_documentHeader->setRightPixmap( K3bTheme::PROJECT_RIGHT ); @@ -408,7 +408,7 @@ void K3bMainWindow::initView() documentHullLayout->addWidget( m_documentHeader, 0, 0 ); documentHullLayout->addWidget( m_documentTab, 1, 0 ); - connect( m_documentTab, SIGNAL(currentChanged(QWidget*)), this, SLOT(slotCurrentDocChanged()) ); + connect( m_documentTab, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrentDocChanged()) ); d->welcomeWidget = new K3bWelcomeWidget( this, m_documentTab ); m_documentTab->addTab( d->welcomeWidget, i18n("Quickstart") ); @@ -427,8 +427,8 @@ void K3bMainWindow::initView() m_dirTreeDock->setWidget( sidePanel ); m_dirTreeDock->manualDock( mainDock, KDockWidget::DockTop, 4000 ); - connect( m_dirTreeDock, SIGNAL(iMBeingClosed()), this, SLOT(slotDirTreeDockHidden()) ); - connect( m_dirTreeDock, SIGNAL(hasUndocked()), this, SLOT(slotDirTreeDockHidden()) ); + connect( m_dirTreeDock, TQT_SIGNAL(iMBeingClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotDirTreeDockHidden()) ); + connect( m_dirTreeDock, TQT_SIGNAL(hasUndocked()), TQT_TQOBJECT(this), TQT_SLOT(slotDirTreeDockHidden()) ); // --------------------------------------------------------------------------------------------- // --- Contents Dock --------------------------------------------------------------------------- @@ -439,24 +439,24 @@ void K3bMainWindow::initView() m_contentsDock->setWidget( m_dirView ); m_contentsDock->manualDock( m_dirTreeDock, KDockWidget::DockRight, 2000 ); - connect( m_contentsDock, SIGNAL(iMBeingClosed()), this, SLOT(slotContentsDockHidden()) ); - connect( m_contentsDock, SIGNAL(hasUndocked()), this, SLOT(slotContentsDockHidden()) ); + connect( m_contentsDock, TQT_SIGNAL(iMBeingClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotContentsDockHidden()) ); + connect( m_contentsDock, TQT_SIGNAL(hasUndocked()), TQT_TQOBJECT(this), TQT_SLOT(slotContentsDockHidden()) ); // --------------------------------------------------------------------------------------------- // --- filetreecombobox-toolbar ---------------------------------------------------------------- K3bFileTreeComboBox* m_fileTreeComboBox = new K3bFileTreeComboBox( 0 ); - connect( m_fileTreeComboBox, SIGNAL(urlExecuted(const KURL&)), m_dirView, SLOT(showUrl(const KURL& )) ); - connect( m_fileTreeComboBox, SIGNAL(deviceExecuted(K3bDevice::Device*)), m_dirView, - SLOT(showDevice(K3bDevice::Device* )) ); - connect( m_dirView, SIGNAL(urlEntered(const KURL&)), m_fileTreeComboBox, SLOT(setUrl(const KURL&)) ); - connect( m_dirView, SIGNAL(deviceSelected(K3bDevice::Device*)), m_fileTreeComboBox, SLOT(setDevice(K3bDevice::Device*)) ); + connect( m_fileTreeComboBox, TQT_SIGNAL(urlExecuted(const KURL&)), m_dirView, TQT_SLOT(showUrl(const KURL& )) ); + connect( m_fileTreeComboBox, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), m_dirView, + TQT_SLOT(showDevice(K3bDevice::Device* )) ); + connect( m_dirView, TQT_SIGNAL(urlEntered(const KURL&)), m_fileTreeComboBox, TQT_SLOT(setUrl(const KURL&)) ); + connect( m_dirView, TQT_SIGNAL(deviceSelected(K3bDevice::Device*)), m_fileTreeComboBox, TQT_SLOT(setDevice(K3bDevice::Device*)) ); KWidgetAction* fileTreeComboAction = new KWidgetAction( m_fileTreeComboBox, i18n("&Quick Dir Selector"), 0, 0, 0, actionCollection(), "quick_dir_selector" ); fileTreeComboAction->setAutoSized(true); - (void)new KAction( i18n("Go"), "key_enter", 0, m_fileTreeComboBox, SLOT(slotGoUrl()), actionCollection(), "go_url" ); + (void)new KAction( i18n("Go"), "key_enter", 0, TQT_TQOBJECT(m_fileTreeComboBox), TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" ); // --------------------------------------------------------------------------------------------- } @@ -509,7 +509,7 @@ void K3bMainWindow::createClient( K3bDoc* doc ) K3bView* K3bMainWindow::activeView() const { - QWidget* w = m_documentTab->currentPage(); + TQWidget* w = m_documentTab->currentPage(); if( K3bView* view = dynamic_cast<K3bView*>(w) ) return view; else @@ -609,7 +609,7 @@ void K3bMainWindow::readOptions() m_dirView->readConfig( config() ); slotViewDocumentHeader(); - slotCheckDockWidgetStatus(); + slotCheckDockWidgettqStatus(); } @@ -620,7 +620,7 @@ void K3bMainWindow::saveProperties( KConfig* c ) // 3. save the url of the project (might be something like "AudioCD1") in the config // 4. save the status of every project (modified/saved) - QString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + qApp->sessionId() + "/", true ); + TQString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); // FIXME: for some reason the config entries are not properly stored when using the default // KMainWindow session config. Since I was not able to find the bug I use another config object @@ -629,26 +629,26 @@ void K3bMainWindow::saveProperties( KConfig* c ) c->setGroup( "Saved Session" ); // ---------------------------------------------------------- - const QPtrList<K3bDoc>& docs = k3bappcore->projectManager()->projects(); + const TQPtrList<K3bDoc>& docs = k3bappcore->projectManager()->projects(); c->writeEntry( "Number of projects", docs.count() ); int cnt = 1; - for( QPtrListIterator<K3bDoc> it( docs ); *it; ++it ) { + for( TQPtrListIterator<K3bDoc> it( docs ); *it; ++it ) { // the "name" of the project (or the original url if isSaved()) - c->writePathEntry( QString("%1 url").arg(cnt), (*it)->URL().url() ); + c->writePathEntry( TQString("%1 url").tqarg(cnt), (*it)->URL().url() ); // is the doc modified - c->writeEntry( QString("%1 modified").arg(cnt), (*it)->isModified() ); + c->writeEntry( TQString("%1 modified").tqarg(cnt), (*it)->isModified() ); // has the doc already been saved? - c->writeEntry( QString("%1 saved").arg(cnt), (*it)->isSaved() ); + c->writeEntry( TQString("%1 saved").tqarg(cnt), (*it)->isSaved() ); // where does the session management save it? If it's not modified and saved this is // the same as the url KURL saveUrl = (*it)->URL(); if( !(*it)->isSaved() || (*it)->isModified() ) - saveUrl = KURL::fromPathOrURL( saveDir + QString::number(cnt) ); - c->writePathEntry( QString("%1 saveurl").arg(cnt), saveUrl.url() ); + saveUrl = KURL::fromPathOrURL( saveDir + TQString::number(cnt) ); + c->writePathEntry( TQString("%1 saveurl").tqarg(cnt), saveUrl.url() ); // finally save it k3bappcore->projectManager()->saveProject( *it, saveUrl ); @@ -675,7 +675,7 @@ void K3bMainWindow::readProperties( KConfig* c ) // 3. reset the saved urls and the modified state // 4. delete "~/.kde/share/apps/k3b/sessions/" + KApp->sessionId() - QString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + qApp->sessionId() + "/", true ); + TQString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); // FIXME: for some reason the config entries are not properly stored when using the default // KMainWindow session config. Since I was not able to find the bug I use another config object @@ -690,13 +690,13 @@ void K3bMainWindow::readProperties( KConfig* c ) for( int i = 1; i <= cnt; ++i ) { // in this case the constructor works since we saved as url() - KURL url = c->readPathEntry( QString("%1 url").arg(i) ); + KURL url = c->readPathEntry( TQString("%1 url").tqarg(i) ); - bool modified = c->readBoolEntry( QString("%1 modified").arg(i) ); + bool modified = c->readBoolEntry( TQString("%1 modified").tqarg(i) ); - bool saved = c->readBoolEntry( QString("%1 saved").arg(i) ); + bool saved = c->readBoolEntry( TQString("%1 saved").tqarg(i) ); - KURL saveUrl = c->readPathEntry( QString("%1 saveurl").arg(i) ); + KURL saveUrl = c->readPathEntry( TQString("%1 saveurl").tqarg(i) ); // now load the project if( K3bDoc* doc = k3bappcore->projectManager()->openProject( saveUrl ) ) { @@ -711,7 +711,7 @@ void K3bMainWindow::readProperties( KConfig* c ) // remove the temp file if( !saved || modified ) - QFile::remove( saveUrl.path() ); + TQFile::remove( saveUrl.path() ); } // and now remove the temp dir @@ -752,7 +752,7 @@ bool K3bMainWindow::queryClose() // kdDebug() << "(K3bMainWindow::queryClose) main job found: " << job->jobDescription() << endl; // // now job is the major job and jh should be a widget -// QWidget* progressDialog = dynamic_cast<QWidget*>( jh ); +// TQWidget* progressDialog = dynamic_cast<TQWidget*>( jh ); // kdDebug() << "(K3bMainWindow::queryClose) job active: " << job->active() << endl; @@ -774,14 +774,14 @@ bool K3bMainWindow::queryClose() // kdDebug() << "(K3bMainWindow::queryClose) closing progress dialog." << endl; // progressDialog->close(); // // -// // now here we have the problem that due to the whole Qt event thing the exec call (or +// // now here we have the problem that due to the whole TQt event thing the exec call (or // // in this case most likely the startJob call) does not return until we leave this method. -// // That means that the progress dialog might be deleted by it's parent below (when we +// // That means that the progress dialog might be deleted by it's tqparent below (when we // // close docs) before it is deleted by the creator (most likely a projectburndialog). // // That would result in a double deletion and thus a crash. -// // So we just reparent the dialog to 0 here so it's (former) parent won't delete it. +// // So we just reparent the dialog to 0 here so it's (former) tqparent won't delete it. // // -// progressDialog->reparent( 0, QPoint(0,0) ); +// progressDialog->reparent( 0, TQPoint(0,0) ); // } // kdDebug() << "(K3bMainWindow::queryClose) job cleanup done." << endl; @@ -826,7 +826,7 @@ bool K3bMainWindow::canCloseDocument( K3bDoc* doc ) return true; switch ( KMessageBox::warningYesNoCancel( this, - i18n("%1 has unsaved data.").arg( doc->URL().fileName() ), + i18n("%1 has unsaved data.").tqarg( doc->URL().fileName() ), i18n("Closing Project"), KStdGuiItem::save(), KGuiItem( i18n("&Discard"), "editshred" ) ) ) @@ -851,7 +851,7 @@ bool K3bMainWindow::queryExit() ///////////////////////////////////////////////////////////////////// -// SLOT IMPLEMENTATION +// TQT_SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// @@ -879,7 +879,7 @@ void K3bMainWindow::slotFileOpenRecent(const KURL& url) void K3bMainWindow::slotFileSaveAll() { - for( QPtrListIterator<K3bDoc> it( k3bappcore->projectManager()->projects() ); + for( TQPtrListIterator<K3bDoc> it( k3bappcore->projectManager()->projects() ); *it; ++it ) { fileSave( *it ); } @@ -940,7 +940,7 @@ void K3bMainWindow::fileSaveAs( K3bDoc* doc ) bool exists = KIO::NetAccess::exists( url, false, 0 ); if( !exists || ( exists && - KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").arg( url.prettyURL() ), + KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").tqarg( url.prettyURL() ), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) ) { @@ -1030,7 +1030,7 @@ void K3bMainWindow::slotViewStatusBar() } -void K3bMainWindow::slotStatusMsg(const QString &text) +void K3bMainWindow::slotStatusMsg(const TQString &text) { /////////////////////////////////////////////////////////////////// // change status message permanently @@ -1202,7 +1202,7 @@ void K3bMainWindow::slotEditToolbars() { saveMainWindowSettings( m_config, "main_window_settings" ); KEditToolbar dlg( factory() ); - connect(&dlg, SIGNAL(newToolbarConfig()), SLOT(slotNewToolBarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotNewToolBarConfig())); dlg.exec(); } @@ -1220,13 +1220,13 @@ bool K3bMainWindow::eject() } -void K3bMainWindow::slotErrorMessage(const QString& message) +void K3bMainWindow::slotErrorMessage(const TQString& message) { KMessageBox::error( this, message ); } -void K3bMainWindow::slotWarningMessage(const QString& message) +void K3bMainWindow::slotWarningMessage(const TQString& message) { KMessageBox::sorry( this, message ); } @@ -1267,13 +1267,13 @@ void K3bMainWindow::slotProjectAddFiles() K3bView* view = activeView(); if( view ) { - QStringList files = KFileDialog::getOpenFileNames( ":k3b-project-add-files", + TQStringList files = KFileDialog::getOpenFileNames( ":k3b-project-add-files", i18n("*|All Files"), this, i18n("Select Files to Add to Project") ); KURL::List urls; - for( QStringList::ConstIterator it = files.begin(); + for( TQStringList::ConstIterator it = files.begin(); it != files.end(); it++ ) { KURL url; url.setPath(*it); @@ -1364,14 +1364,14 @@ void K3bMainWindow::slotDvdCopy() void K3bMainWindow::slotShowDirTreeView() { m_dirTreeDock->changeHideShowState(); - slotCheckDockWidgetStatus(); + slotCheckDockWidgettqStatus(); } void K3bMainWindow::slotShowContentsView() { m_contentsDock->changeHideShowState(); - slotCheckDockWidgetStatus(); + slotCheckDockWidgettqStatus(); } @@ -1386,7 +1386,7 @@ void K3bMainWindow::slotShowMenuBar() void K3bMainWindow::slotShowTips() { - KTipDialog::showTip( this, QString::null, true ); + KTipDialog::showTip( this, TQString(), true ); } @@ -1402,7 +1402,7 @@ void K3bMainWindow::slotContentsDockHidden() } -void K3bMainWindow::slotCheckDockWidgetStatus() +void K3bMainWindow::slotCheckDockWidgettqStatus() { actionViewContentsView->setChecked( m_contentsDock->isVisible() ); actionViewDirTreeView->setChecked( m_dirTreeDock->isVisible() ); @@ -1468,7 +1468,7 @@ void K3bMainWindow::slotCheckSystemTimed() // run the system check from the event queue so we do not // mess with the device state resetting throughout the app // when called from K3bDeviceManager::changed - QTimer::singleShot( 0, this, SLOT(slotCheckSystem()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()) ); } @@ -1486,17 +1486,17 @@ void K3bMainWindow::addUrls( const KURL::List& urls ) else { // check if the files are all audio we can handle. If so create an audio project bool audio = true; - QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioDecoder" ); + TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioDecoder" ); for( KURL::List::const_iterator it = urls.begin(); it != urls.end(); ++it ) { const KURL& url = *it; - if( QFileInfo(url.path()).isDir() ) { + if( TQFileInfo(url.path()).isDir() ) { audio = false; break; } bool a = false; - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { if( static_cast<K3bAudioDecoderFactory*>(it.current())->canDecode( url ) ) { a = true; break; @@ -1621,7 +1621,7 @@ void K3bMainWindow::slotVideoCdRip() } -void K3bMainWindow::slotAudioServerError( const QString& error ) +void K3bMainWindow::slotAudioServerError( const TQString& error ) { K3bPassivePopup::showPopup( error, i18n("Audio Output Problem") ); } @@ -23,10 +23,10 @@ #include <config.h> #endif -// include files for Qt -#include <qstrlist.h> -#include <qworkspace.h> -#include <qptrlist.h> +// include files for TQt +#include <tqstrlist.h> +#include <tqworkspace.h> +#include <tqptrlist.h> // include files for KDE #include <kapplication.h> @@ -35,7 +35,7 @@ #include <kaction.h> #include <kurl.h> -class QVBox; +class TQVBox; // forward declaration of the K3b classes @@ -62,6 +62,7 @@ namespace K3bDevice { class K3bMainWindow : public KParts::DockMainWindow { Q_OBJECT + TQ_OBJECT public: /** construtor of K3bMainWindow, calls all init functions to create the application. @@ -87,7 +88,7 @@ class K3bMainWindow : public KParts::DockMainWindow */ K3bDoc* activeDoc() const; - const QPtrList<K3bDoc>& projects() const; + const TQPtrList<K3bDoc>& projects() const; bool eject(); void showOptionDialog( int = 0 ); @@ -133,8 +134,8 @@ class K3bMainWindow : public KParts::DockMainWindow void slotVideoCdRip(); void slotK3bSetup(); - void slotErrorMessage(const QString&); - void slotWarningMessage(const QString&); + void slotErrorMessage(const TQString&); + void slotWarningMessage(const TQString&); void slotConfigureKeys(); void slotShowTips(); @@ -143,7 +144,7 @@ class K3bMainWindow : public KParts::DockMainWindow void addUrls( const KURL::List& urls ); signals: - void initializationInfo( const QString& ); + void initializationInfo( const TQString& ); void configChanged( KConfig* c ); protected: @@ -181,7 +182,7 @@ class K3bMainWindow : public KParts::DockMainWindow */ bool canCloseDocument( K3bDoc* ); - virtual void showEvent( QShowEvent* e ); + virtual void showEvent( TQShowEvent* e ); private slots: /** open a file and load it into the document*/ @@ -214,12 +215,12 @@ class K3bMainWindow : public KParts::DockMainWindow void slotViewDocumentHeader(); - void slotCheckDockWidgetStatus(); + void slotCheckDockWidgettqStatus(); /** changes the statusbar contents for the standard label permanently, used to indicate current actions. * @param text the text that is displayed in the statusbar */ - void slotStatusMsg(const QString &text); + void slotStatusMsg(const TQString &text); void slotShowDirTreeView(); void slotShowContentsView(); @@ -234,7 +235,7 @@ class K3bMainWindow : public KParts::DockMainWindow void slotDataClearImportedSession(); void slotEditBootImages(); - void slotAudioServerError( const QString& error ); + void slotAudioServerError( const TQString& error ); void createClient(K3bDoc* doc); @@ -248,7 +249,7 @@ class K3bMainWindow : public KParts::DockMainWindow void fileSaveAs( K3bDoc* doc = 0 ); void closeProject( K3bDoc* ); - /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration * file */ void saveOptions(); @@ -304,7 +305,7 @@ class K3bMainWindow : public KParts::DockMainWindow KToggleAction* actionViewDocumentHeader; // project actions - QPtrList<KAction> m_dataProjectActions; + TQPtrList<KAction> m_dataProjectActions; KDockWidget* mainDock; KDockWidget* m_contentsDock; diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp index c21f746..1cf13ae 100644 --- a/src/k3bappdevicemanager.cpp +++ b/src/k3bappdevicemanager.cpp @@ -31,8 +31,8 @@ #include <kpopupmenu.h> -K3bAppDeviceManager::K3bAppDeviceManager( QObject* parent, const char* name ) - : K3bDevice::DeviceManager( parent, name ), +K3bAppDeviceManager::K3bAppDeviceManager( TQObject* tqparent, const char* name ) + : K3bDevice::DeviceManager( tqparent, name ), m_currentDevice(0), m_ejectRequested(false) { @@ -42,21 +42,21 @@ K3bAppDeviceManager::K3bAppDeviceManager( QObject* parent, const char* name ) // setup actions KActionMenu* devicePopupMenu = new KActionMenu( m_actionCollection, "device_popup" ); - m_actionDiskInfo = new KAction( i18n("Media &Info"), "info", 0, this, SLOT(diskInfo()), + m_actionDiskInfo = new KAction( i18n("Media &Info"), "info", 0, this, TQT_SLOT(diskInfo()), m_actionCollection, "device_diskinfo"); - m_actionUnmount = new KAction( i18n("&Unmount"), "cdrom_unmount", 0, this, SLOT(unmountDisk()), + m_actionUnmount = new KAction( i18n("&Unmount"), "cdrom_unmount", 0, this, TQT_SLOT(unmountDisk()), m_actionCollection, "device_unmount"); - m_actionMount = new KAction( i18n("&Mount"), "cdrom_mount", 0, this, SLOT(mountDisk()), + m_actionMount = new KAction( i18n("&Mount"), "cdrom_mount", 0, this, TQT_SLOT(mountDisk()), m_actionCollection, "device_mount"); - m_actionEject = new KAction( i18n("&Eject"), "", 0, this, SLOT(ejectDisk()), + m_actionEject = new KAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()), m_actionCollection, "device_eject"); - m_actionLoad = new KAction( i18n("L&oad"), "", 0, this, SLOT(loadDisk()), + m_actionLoad = new KAction( i18n("L&oad"), "", 0, this, TQT_SLOT(loadDisk()), m_actionCollection, "device_load"); -// KAction* actionUnlock = new KAction( i18n("Un&lock"), "", 0, this, SLOT(unlockDevice()), +// KAction* actionUnlock = new KAction( i18n("Un&lock"), "", 0, this, TQT_SLOT(unlockDevice()), // m_actionCollection, "device_unlock" ); -// KAction* actionlock = new KAction( i18n("Loc&k"), "", 0, this, SLOT(lockDevice()), +// KAction* actionlock = new KAction( i18n("Loc&k"), "", 0, this, TQT_SLOT(lockDevice()), // m_actionCollection, "device_lock" ); - m_actionSetReadSpeed = new KAction( i18n("Set Read Speed..."), "", 0, this, SLOT(setReadSpeed()), + m_actionSetReadSpeed = new KAction( i18n("Set Read Speed..."), "", 0, this, TQT_SLOT(setReadSpeed()), m_actionCollection, "device_set_read_speed" ); m_actionDiskInfo->setToolTip( i18n("Display generic medium information") ); @@ -85,8 +85,8 @@ K3bAppDeviceManager::K3bAppDeviceManager( QObject* parent, const char* name ) void K3bAppDeviceManager::setMediaCache( K3bMediaCache* c ) { - connect( c, SIGNAL(mediumChanged(K3bDevice::Device*)), - this, SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( c, TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } @@ -110,7 +110,7 @@ void K3bAppDeviceManager::clear() } -void K3bAppDeviceManager::removeDevice( const QString& dev ) +void K3bAppDeviceManager::removeDevice( const TQString& dev ) { if( m_currentDevice == findDevice(dev) ) m_currentDevice = 0; @@ -230,7 +230,7 @@ void K3bAppDeviceManager::setReadSpeed() "and the spinning noise is intrusive." "<p>Be aware that this has no influence on K3b since it will " "change the reading speed again when copying CDs or DVDs.") - .arg(currentDevice()->vendor() + " " + currentDevice()->description()), + .tqarg(currentDevice()->vendor() + " " + currentDevice()->description()), 12, 1, currentDevice()->maxReadSpeed(), diff --git a/src/k3bappdevicemanager.h b/src/k3bappdevicemanager.h index 419a8b3..2fe7925 100644 --- a/src/k3bappdevicemanager.h +++ b/src/k3bappdevicemanager.h @@ -40,9 +40,10 @@ namespace KIO { class K3bAppDeviceManager : public K3bDevice::DeviceManager { Q_OBJECT + TQ_OBJECT public: - K3bAppDeviceManager( QObject* parent = 0, const char* name = 0 ); + K3bAppDeviceManager( TQObject* tqparent = 0, const char* name = 0 ); ~K3bAppDeviceManager(); K3bDevice::Device* currentDevice() const; @@ -59,7 +60,7 @@ class K3bAppDeviceManager : public K3bDevice::DeviceManager void detectingDiskInfo( K3bDevice::Device* ); void diskInfoReady( K3bDevice::DiskInfoDetector* ); - void mountFinished( const QString& mountPoint ); + void mountFinished( const TQString& mountPoint ); void unmountFinished( bool success ); public slots: @@ -71,7 +72,7 @@ class K3bAppDeviceManager : public K3bDevice::DeviceManager /** * \reimplemeted for internal reasons. The API is unaffected. */ - void removeDevice( const QString& ); + void removeDevice( const TQString& ); /** * \reimplemeted for internal reasons. The API is unaffected. diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index 4b517ea..73fd5fb 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -54,10 +54,10 @@ #include <kstartupinfo.h> #include <kmessagebox.h> -#include <qguardedptr.h> -#include <qtimer.h> -#include <qvaluelist.h> -#include <qcstring.h> +#include <tqguardedptr.h> +#include <tqtimer.h> +#include <tqvaluelist.h> +#include <tqcstring.h> K3bApplication::Core* K3bApplication::Core::s_k3bAppCore = 0; @@ -72,22 +72,22 @@ K3bApplication::K3bApplication() KGlobal::locale()->insertCatalogue( "libk3bdevice" ); KGlobal::locale()->insertCatalogue( "libk3b" ); - m_core = new Core( this ); + m_core = new Core( TQT_TQOBJECT(this) ); // TODO: move to K3bCore? // from this point on available through K3bAudioServer::instance() - m_audioServer = new K3bAudioServer( this, "K3bAudioServer" ); + m_audioServer = new K3bAudioServer( TQT_TQOBJECT(this), "K3bAudioServer" ); - connect( m_core, SIGNAL(initializationInfo(const QString&)), - SIGNAL(initializationInfo(const QString&)) ); + connect( m_core, TQT_SIGNAL(initializationInfo(const TQString&)), + TQT_SIGNAL(initializationInfo(const TQString&)) ); - connect( this, SIGNAL(shutDown()), SLOT(slotShutDown()) ); + connect( this, TQT_SIGNAL(shutDown()), TQT_SLOT(slotShutDown()) ); } K3bApplication::~K3bApplication() { - // we must not delete m_mainWindow here, QApplication takes care of it + // we must not delete m_mainWindow here, TQApplication takes care of it } @@ -95,7 +95,7 @@ void K3bApplication::init() { KConfigGroup generalOptions( config(), "General Options" ); - QGuardedPtr<K3bSplash> splash; + TQGuardedPtr<K3bSplash> splash; if( !isRestored() ) { KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -104,13 +104,13 @@ void K3bApplication::init() m_core->m_themeManager->readConfig( config() ); splash = new K3bSplash( 0 ); - splash->connect( this, SIGNAL(initializationInfo(const QString&)), SLOT(addInfo(const QString&)) ); + splash->connect( this, TQT_SIGNAL(initializationInfo(const TQString&)), TQT_SLOT(addInfo(const TQString&)) ); // kill the splash after 5 seconds - QTimer::singleShot( 5000, splash, SLOT(close()) ); + TQTimer::singleShot( 5000, splash, TQT_SLOT(close()) ); splash->show(); - qApp->processEvents(); + tqApp->processEvents(); } } @@ -232,20 +232,20 @@ bool K3bApplication::processCmdLineArgs() showTips = false; dialogOpen = true; if( k3bcore->jobsRunning() == 0 ) { - m_mainWindow->slotWriteCdImage( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "cdimage" ) ) ) ); + m_mainWindow->slotWriteCdImage( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "cdimage" ) ) ) ); } } else if( args->isSet( "dvdimage" ) ) { showTips = false; dialogOpen = true; if( k3bcore->jobsRunning() == 0 ) { - m_mainWindow->slotWriteDvdIsoImage( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "dvdimage" ) ) ) ); + m_mainWindow->slotWriteDvdIsoImage( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "dvdimage" ) ) ) ); } } else if( args->isSet( "image" ) ) { showTips = false; dialogOpen = true; - KURL url = KURL::fromPathOrURL( QFile::decodeName( args->getOption( "image" ) ) ); + KURL url = KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "image" ) ) ); if( k3bcore->jobsRunning() == 0 ) { if( K3b::filesize( url ) > 1000*1024*1024 ) m_mainWindow->slotWriteDvdIsoImage( url ); @@ -256,34 +256,34 @@ bool K3bApplication::processCmdLineArgs() else if( args->isSet("copycd") ) { showTips = false; dialogOpen = true; - qApp->processEvents(); - m_mainWindow->cdCopy( K3b::urlToDevice( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "copycd" ) ) ) ) ); + tqApp->processEvents(); + m_mainWindow->cdCopy( K3b::urlToDevice( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "copycd" ) ) ) ) ); } else if( args->isSet("copydvd") ) { showTips = false; dialogOpen = true; - m_mainWindow->dvdCopy( K3b::urlToDevice( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "copydvd" ) ) ) ) ); + m_mainWindow->dvdCopy( K3b::urlToDevice( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "copydvd" ) ) ) ) ); } else if( args->isSet("erasecd") ) { showTips = false; dialogOpen = true; - m_mainWindow->blankCdrw( K3b::urlToDevice( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "erasecd" ) ) ) ) ); + m_mainWindow->blankCdrw( K3b::urlToDevice( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "erasecd" ) ) ) ) ); } else if( args->isSet("formatdvd") ) { showTips = false; dialogOpen = true; - m_mainWindow->formatDvd( K3b::urlToDevice( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "formatdvd" ) ) ) ) ); + m_mainWindow->formatDvd( K3b::urlToDevice( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "formatdvd" ) ) ) ) ); } // no dialog used here if( args->isSet( "cddarip" ) ) { - m_mainWindow->cddaRip( K3b::urlToDevice( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "cddarip" ) ) ) ) ); + m_mainWindow->cddaRip( K3b::urlToDevice( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "cddarip" ) ) ) ) ); } else if( args->isSet( "videodvdrip" ) ) { - m_mainWindow->videoDvdRip( K3b::urlToDevice( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "videodvdrip" ) ) ) ) ); + m_mainWindow->videoDvdRip( K3b::urlToDevice( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "videodvdrip" ) ) ) ) ); } else if( args->isSet( "videocdrip" ) ) { - m_mainWindow->videoCdRip( K3b::urlToDevice( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "videocdrip" ) ) ) ) ); + m_mainWindow->videoCdRip( K3b::urlToDevice( KURL::fromPathOrURL( TQFile::decodeName( args->getOption( "videocdrip" ) ) ) ) ); } if( !dialogOpen && args->isSet( "burn" ) ) { @@ -297,7 +297,7 @@ bool K3bApplication::processCmdLineArgs() // FIXME: seems not like the right place... if( args->isSet( "ao" ) ) if( !m_audioServer->setOutputMethod( args->getOption( "ao" ) ) ) - K3bPassivePopup::showPopup( i18n("Could not find Audio Output plugin '%1'").arg( args->getOption("ao") ), + K3bPassivePopup::showPopup( i18n("Could not find Audio Output plugin '%1'").tqarg( args->getOption("ao").data() ), i18n("Initialization Problem"), K3bPassivePopup::Warning ); @@ -315,8 +315,8 @@ void K3bApplication::slotShutDown() -K3bApplication::Core::Core( QObject* parent ) - : K3bCore( parent ), +K3bApplication::Core::Core( TQObject* tqparent ) + : K3bCore( tqparent ), m_appDeviceManager(0), m_mediaCache(0) { @@ -382,8 +382,8 @@ void K3bApplication::Core::init() mediaCache()->buildDeviceList( deviceManager() ); - connect( deviceManager(), SIGNAL(changed(K3bDevice::DeviceManager*)), - mediaCache(), SLOT(buildDeviceList(K3bDevice::DeviceManager*)) ); + connect( deviceManager(), TQT_SIGNAL(changed(K3bDevice::DeviceManager*)), + mediaCache(), TQT_SLOT(buildDeviceList(K3bDevice::DeviceManager*)) ); } @@ -424,7 +424,7 @@ bool K3bApplication::Core::internalBlockDevice( K3bDevice::Device* dev ) // // Check if the device is in use // - // FIXME: Use the top level widget as parent + // FIXME: Use the top level widget as tqparent K3bLsofWrapperDialog::checkDevice( dev ); return true; diff --git a/src/k3bapplication.h b/src/k3bapplication.h index 8dafac1..0f64201 100644 --- a/src/k3bapplication.h +++ b/src/k3bapplication.h @@ -20,7 +20,7 @@ #include <kuniqueapplication.h> #include <k3bcore.h> -#include <qmap.h> +#include <tqmap.h> #define k3bappcore K3bApplication::Core::k3bAppCore() @@ -38,6 +38,7 @@ class K3bMediaCache; class K3bApplication : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: K3bApplication(); @@ -51,7 +52,7 @@ class K3bApplication : public KUniqueApplication void init(); signals: - void initializationInfo( const QString& ); + void initializationInfo( const TQString& ); void initializationDone(); private slots: @@ -75,9 +76,10 @@ class K3bApplication : public KUniqueApplication class K3bApplication::Core : public K3bCore { Q_OBJECT + TQ_OBJECT public: - Core( QObject* parent ); + Core( TQObject* tqparent ); ~Core(); void init(); @@ -115,7 +117,7 @@ class K3bApplication::Core : public K3bCore /** * This is used for showing info in the K3b splashscreen */ - void initializationInfo( const QString& ); + void initializationInfo( const TQString& ); /** * Any component may request busy info @@ -124,7 +126,7 @@ class K3bApplication::Core : public K3bCore * * FIXME: this is bad design */ - void busyInfoRequested( const QString& ); + void busyInfoRequested( const TQString& ); /** * FIXME: this is bad design @@ -146,7 +148,7 @@ class K3bApplication::Core : public K3bCore K3bAppDeviceManager* m_appDeviceManager; K3bMediaCache* m_mediaCache; - QMap<K3bDevice::Device*, int> m_deviceBlockMap; + TQMap<K3bDevice::Device*, int> m_deviceBlockMap; static Core* s_k3bAppCore; diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp index 645b3cf..522fc19 100644 --- a/src/k3baudioplayer.cpp +++ b/src/k3baudioplayer.cpp @@ -18,20 +18,20 @@ #include <k3bmsf.h> #include "kcutlabel.h" -#include <qlabel.h> -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qdatetime.h> -#include <qfont.h> -#include <qslider.h> -#include <qlistview.h> -#include <qfile.h> -#include <qpalette.h> -#include <qheader.h> -#include <qevent.h> -#include <qdragobject.h> -#include <qptrlist.h> +#include <tqlabel.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqdatetime.h> +#include <tqfont.h> +#include <tqslider.h> +#include <tqlistview.h> +#include <tqfile.h> +#include <tqpalette.h> +#include <tqheader.h> +#include <tqevent.h> +#include <tqdragobject.h> +#include <tqptrlist.h> #include <kurldrag.h> #include <kiconloader.h> @@ -49,16 +49,16 @@ using namespace std; -K3bPlayListViewItem::K3bPlayListViewItem( const QString& filename, QListView* parent ) - : KListViewItem( parent ), m_filename( filename ) +K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* tqparent ) + : KListViewItem( tqparent ), m_filename( filename ) { m_length = 0; m_bActive = false; } -K3bPlayListViewItem::K3bPlayListViewItem( const QString& filename, QListView* parent, QListViewItem* after ) - : KListViewItem( parent, after ), m_filename( filename ) +K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* tqparent, TQListViewItem* after ) + : KListViewItem( tqparent, after ), m_filename( filename ) { m_length = 0; m_bActive = false; @@ -70,12 +70,12 @@ K3bPlayListViewItem::~K3bPlayListViewItem() } -QString K3bPlayListViewItem::text( int c ) const +TQString K3bPlayListViewItem::text( int c ) const { switch( c ) { case 0: { - int pos = m_filename.findRev("/"); + int pos = m_filename.tqfindRev("/"); if( pos >= 0 ) return m_filename.mid(pos+1); return m_filename; @@ -91,17 +91,17 @@ QString K3bPlayListViewItem::text( int c ) const } -void K3bPlayListViewItem::paintCell( QPainter* p, const QColorGroup& cg, int c, int w, int a ) +void K3bPlayListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int c, int w, int a ) { if( m_bActive ) { // change the color of the text: // change roles: Text, HighlightedText, HighLight - QColorGroup newCg( cg ); + TQColorGroup newCg( cg ); // we assume the user has not configured a very dark color as base color - newCg.setColor( QColorGroup::Text, red ); - newCg.setColor( QColorGroup::Highlight, red ); - newCg.setColor( QColorGroup::HighlightedText, white ); + newCg.setColor( TQColorGroup::Text, red ); + newCg.setColor( TQColorGroup::Highlight, red ); + newCg.setColor( TQColorGroup::HighlightedText, white ); KListViewItem::paintCell( p, newCg, c, w, a ); } @@ -110,8 +110,8 @@ void K3bPlayListViewItem::paintCell( QPainter* p, const QColorGroup& cg, int c, } -K3bPlayListView::K3bPlayListView( QWidget* parent, const char* name ) - : KListView( parent, name ) +K3bPlayListView::K3bPlayListView( TQWidget* tqparent, const char* name ) + : KListView( tqparent, name ) { addColumn( i18n("Filename") ); addColumn( i18n("Length") ); @@ -130,21 +130,21 @@ K3bPlayListView::~K3bPlayListView() } -bool K3bPlayListView::acceptDrag( QDropEvent* e ) const +bool K3bPlayListView::acceptDrag( TQDropEvent* e ) const { // we accept textdrag (urls) and moved items (supported by KListView) return KURLDrag::canDecode(e) || KListView::acceptDrag(e); } -QDragObject* K3bPlayListView::dragObject() +TQDragObject* K3bPlayListView::dragObject() { - QPtrList<QListViewItem> list = selectedItems(); + TQPtrList<TQListViewItem> list = selectedItems(); if( list.isEmpty() ) return 0; - QPtrListIterator<QListViewItem> it(list); + TQPtrListIterator<TQListViewItem> it(list); KURL::List urls; for( ; it.current(); ++it ) @@ -154,8 +154,8 @@ QDragObject* K3bPlayListView::dragObject() } -K3bAudioPlayer::K3bAudioPlayer( QWidget* parent, const char* name ) - : QWidget( parent, name ) +K3bAudioPlayer::K3bAudioPlayer( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) #ifdef WITH_ARTS , m_playObject( Arts::PlayObject::null() ) #endif @@ -164,39 +164,39 @@ K3bAudioPlayer::K3bAudioPlayer( QWidget* parent, const char* name ) // initialize // ------------------------------------------------------------------------ m_labelFilename = new KCutLabel( i18n("no file"), this ); - m_labelOverallTime = new QLabel( "00:00", this ); - m_labelCurrentTime = new QLabel( "00:00", this ); + m_labelOverallTime = new TQLabel( "00:00", this ); + m_labelCurrentTime = new TQLabel( "00:00", this ); m_viewPlayList = new K3bPlayListView( this ); - m_labelOverallTime->setAlignment( AlignHCenter | AlignVCenter ); - m_labelCurrentTime->setAlignment( AlignHCenter | AlignVCenter ); - m_labelOverallTime->setFrameStyle( QFrame::StyledPanel | QFrame::Plain ); - m_labelCurrentTime->setFrameStyle( QFrame::StyledPanel | QFrame::Plain ); - m_labelFilename->setFrameStyle( QFrame::StyledPanel | QFrame::Plain ); - m_labelOverallTime->setPalette( QPalette( QColor(238, 238, 205) ) ); - m_labelCurrentTime->setPalette( QPalette( QColor(238, 238, 205) ) ); - m_labelFilename->setPalette( QPalette( QColor(238, 238, 205) ) ); - - m_buttonPlay = new QToolButton( this ); - m_buttonPause = new QToolButton( this ); - m_buttonStop = new QToolButton( this ); + m_labelOverallTime->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_labelCurrentTime->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_labelOverallTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain ); + m_labelCurrentTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain ); + m_labelFilename->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain ); + m_labelOverallTime->setPalette( TQPalette( TQColor(238, 238, 205) ) ); + m_labelCurrentTime->setPalette( TQPalette( TQColor(238, 238, 205) ) ); + m_labelFilename->setPalette( TQPalette( TQColor(238, 238, 205) ) ); + + m_buttonPlay = new TQToolButton( this ); + m_buttonPause = new TQToolButton( this ); + m_buttonStop = new TQToolButton( this ); m_buttonPlay->setIconSet( SmallIconSet("player_play") ); m_buttonPause->setIconSet( SmallIconSet("player_pause") ); m_buttonStop->setIconSet( SmallIconSet("player_stop") ); - m_buttonForward = new QToolButton( this ); - m_buttonBack = new QToolButton( this ); + m_buttonForward = new TQToolButton( this ); + m_buttonBack = new TQToolButton( this ); m_buttonForward->setIconSet( SmallIconSet("player_end") ); m_buttonBack->setIconSet( SmallIconSet("player_start") ); - m_seekSlider = new QSlider( QSlider::Horizontal, this ); + m_seekSlider = new TQSlider( TQSlider::Horizontal, this ); - m_updateTimer = new QTimer( this ); + m_updateTimer = new TQTimer( this ); // ------------------------------------------------------------------------ - // layout + // tqlayout // ------------------------------------------------------------------------ - QGridLayout* grid = new QGridLayout( this ); + TQGridLayout* grid = new TQGridLayout( this ); grid->setSpacing( 2 ); grid->setMargin( 0 ); @@ -223,10 +223,10 @@ K3bAudioPlayer::K3bAudioPlayer( QWidget* parent, const char* name ) // actions // ------------------------------------------------------------------------ m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", - Key_Delete, this, SLOT(slotRemoveSelected()), + Key_Delete, this, TQT_SLOT(slotRemoveSelected()), this, "audioplayer_remove" ); m_actionClear = new KAction( i18n( "Clear List" ), "editclear", - 0, this, SLOT(clear()), + 0, this, TQT_SLOT(clear()), this, "audioplayer_clear" ); m_contextMenu = new KActionMenu( this, "audio_player_menu" ); @@ -237,26 +237,26 @@ K3bAudioPlayer::K3bAudioPlayer( QWidget* parent, const char* name ) // connections // ------------------------------------------------------------------------ - connect( m_viewPlayList, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotShowContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + connect( m_viewPlayList, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotShowContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); - connect( m_buttonPlay, SIGNAL(clicked()), this, SLOT(play()) ); - connect( m_buttonStop, SIGNAL(clicked()), this, SLOT(stop()) ); - connect( m_buttonPause, SIGNAL(clicked()), this, SLOT(pause()) ); + connect( m_buttonPlay, TQT_SIGNAL(clicked()), this, TQT_SLOT(play()) ); + connect( m_buttonStop, TQT_SIGNAL(clicked()), this, TQT_SLOT(stop()) ); + connect( m_buttonPause, TQT_SIGNAL(clicked()), this, TQT_SLOT(pause()) ); - connect( m_buttonForward, SIGNAL(clicked()), this, SLOT(forward()) ); - connect( m_buttonBack, SIGNAL(clicked()), this, SLOT(back()) ); + connect( m_buttonForward, TQT_SIGNAL(clicked()), this, TQT_SLOT(forward()) ); + connect( m_buttonBack, TQT_SIGNAL(clicked()), this, TQT_SLOT(back()) ); - connect( m_seekSlider, SIGNAL(sliderMoved(int)), this, SLOT(seek(int)) ); - connect( m_seekSlider, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateCurrentTime(int)) ); + connect( m_seekSlider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(seek(int)) ); + connect( m_seekSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotUpdateCurrentTime(int)) ); - connect( m_updateTimer, SIGNAL(timeout()), this, SLOT(slotUpdateDisplay()) ); - connect( m_updateTimer, SIGNAL(timeout()), this, SLOT(slotCheckEnd()) ); + connect( m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateDisplay()) ); + connect( m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckEnd()) ); - connect( m_viewPlayList, SIGNAL(doubleClicked(QListViewItem*)), - this, SLOT(slotPlayItem(QListViewItem*)) ); - connect( m_viewPlayList, SIGNAL(dropped(QDropEvent*,QListViewItem*)), - this, SLOT(slotDropped(QDropEvent*,QListViewItem*)) ); + connect( m_viewPlayList, TQT_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQT_SLOT(slotPlayItem(TQListViewItem*)) ); + connect( m_viewPlayList, TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), + this, TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*)) ); // ------------------------------------------------------------------------ @@ -295,10 +295,10 @@ int K3bAudioPlayer::state() } -void K3bAudioPlayer::playFile( const QString& filename ) +void K3bAudioPlayer::playFile( const TQString& filename ) { clear(); - if( QFile::exists( filename ) ) { + if( TQFile::exists( filename ) ) { K3bPlayListViewItem* item = new K3bPlayListViewItem( filename, m_viewPlayList ); setCurrentItem( item ); play(); @@ -307,10 +307,10 @@ void K3bAudioPlayer::playFile( const QString& filename ) } -void K3bAudioPlayer::playFiles( const QStringList& files ) +void K3bAudioPlayer::playFiles( const TQStringList& files ) { clear(); - QStringList::ConstIterator it = files.begin(); + TQStringList::ConstIterator it = files.begin(); playFile( *it ); ++it; @@ -319,16 +319,16 @@ void K3bAudioPlayer::playFiles( const QStringList& files ) } -void K3bAudioPlayer::enqueueFile( const QString& filename ) +void K3bAudioPlayer::enqueueFile( const TQString& filename ) { - if( QFile::exists( filename ) ) + if( TQFile::exists( filename ) ) (void)new K3bPlayListViewItem( filename, m_viewPlayList, m_viewPlayList->lastChild() ); } -void K3bAudioPlayer::enqueueFiles( const QStringList& files ) +void K3bAudioPlayer::enqueueFiles( const TQStringList& files ) { - for( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) + for( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) enqueueFile( *it ); } @@ -349,7 +349,7 @@ void K3bAudioPlayer::play() return; } - m_playObject = factory.createPlayObject( string(QFile::encodeName(m_currentItem->filename()) ) ); + m_playObject = factory.createPlayObject( string(TQFile::encodeName(m_currentItem->filename()) ) ); if( m_playObject.isNull() ) { kdDebug() << "(K3bAudioPlayer) no aRts module available for: " << m_currentItem->filename() << endl; m_labelFilename->setText( i18n("Unknown file format") ); @@ -374,7 +374,7 @@ void K3bAudioPlayer::play() } -void K3bAudioPlayer::slotPlayItem( QListViewItem* item ) +void K3bAudioPlayer::slotPlayItem( TQListViewItem* item ) { setCurrentItem( item ); play(); @@ -511,9 +511,9 @@ long K3bAudioPlayer::position() // FIXME: let my do some useful stuff! -bool K3bAudioPlayer::supportsMimetype( const QString& mimetype ) +bool K3bAudioPlayer::supportsMimetype( const TQString& mimetype ) { - if( mimetype.contains("audio") || mimetype.contains("ogg") ) + if( mimetype.tqcontains("audio") || mimetype.tqcontains("ogg") ) return true; else return false; @@ -539,7 +539,7 @@ void K3bAudioPlayer::slotCheckEnd() } -void K3bAudioPlayer::setCurrentItem( QListViewItem* item ) +void K3bAudioPlayer::setCurrentItem( TQListViewItem* item ) { if( item == 0 ) { stop(); @@ -579,20 +579,20 @@ void K3bAudioPlayer::slotUpdateLength( long time ) void K3bAudioPlayer::slotUpdateFilename() { if( m_currentItem ) { - QString display = m_currentItem->filename(); - int pos = display.findRev("/"); + TQString display = m_currentItem->filename(); + int pos = display.tqfindRev("/"); if( pos >= 0 ) display = display.mid(pos+1); switch( state() ) { case PLAYING: - display.prepend( QString("(%1) ").arg(i18n("playing")) ); + display.prepend( TQString("(%1) ").tqarg(i18n("playing")) ); break; case PAUSED: - display.prepend( QString("(%1) ").arg(i18n("paused")) ); + display.prepend( TQString("(%1) ").tqarg(i18n("paused")) ); break; case STOPPED: - display.prepend( QString("(%1) ").arg(i18n("stopped")) ); + display.prepend( TQString("(%1) ").tqarg(i18n("stopped")) ); break; default: break; @@ -621,7 +621,7 @@ void K3bAudioPlayer::slotUpdateDisplay() } -void K3bAudioPlayer::slotDropped( QDropEvent* e, QListViewItem* after ) +void K3bAudioPlayer::slotDropped( TQDropEvent* e, TQListViewItem* after ) { if( !after ) after = m_viewPlayList->lastChild(); @@ -630,8 +630,8 @@ void K3bAudioPlayer::slotDropped( QDropEvent* e, QListViewItem* after ) KURLDrag::decode( e, urls ); for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) { - if( QFile::exists( (*it).path() ) ) { - QListViewItem* newItem = new K3bPlayListViewItem( (*it).path(), m_viewPlayList, after ); + if( TQFile::exists( (*it).path() ) ) { + TQListViewItem* newItem = new K3bPlayListViewItem( (*it).path(), m_viewPlayList, after ); after = newItem; } } @@ -640,8 +640,8 @@ void K3bAudioPlayer::slotDropped( QDropEvent* e, QListViewItem* after ) void K3bAudioPlayer::slotRemoveSelected() { - QPtrList<QListViewItem> selected = m_viewPlayList->selectedItems(); - for( QListViewItem* item = selected.first(); item; item = selected.next() ) { + TQPtrList<TQListViewItem> selected = m_viewPlayList->selectedItems(); + for( TQListViewItem* item = selected.first(); item; item = selected.next() ) { if( item == m_currentItem ) setCurrentItem(0); delete item; @@ -649,7 +649,7 @@ void K3bAudioPlayer::slotRemoveSelected() } -void K3bAudioPlayer::slotShowContextMenu( KListView*, QListViewItem* item, const QPoint& p ) +void K3bAudioPlayer::slotShowContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ) { if( item ) m_actionRemove->setEnabled( true ); diff --git a/src/k3baudioplayer.h b/src/k3baudioplayer.h index 1bc28a9..9a4f0f0 100644 --- a/src/k3baudioplayer.h +++ b/src/k3baudioplayer.h @@ -26,14 +26,14 @@ #include <arts/kartsdispatcher.h> #endif -class QTimer; -class QLabel; -class QToolButton; -class QSlider; -class QPainter; -class QColorGroup; -class QDropEvent; -class QDragObject; +class TQTimer; +class TQLabel; +class TQToolButton; +class TQSlider; +class TQPainter; +class TQColorGroup; +class TQDropEvent; +class TQDragObject; class KAction; class KActionMenu; @@ -45,30 +45,30 @@ class KActionMenu; class K3bPlayListViewItem : public KListViewItem { public: - K3bPlayListViewItem( const QString&, QListView* parent ); - K3bPlayListViewItem( const QString&, QListView* parent, QListViewItem* after ); + K3bPlayListViewItem( const TQString&, TQListView* tqparent ); + K3bPlayListViewItem( const TQString&, TQListView* tqparent, TQListViewItem* after ); ~K3bPlayListViewItem(); /** @returns the filename for the first column and the * length in format 00:00.00 for the second column */ - virtual QString text( int c ) const; + virtual TQString text( int c ) const; void setLength( unsigned long l ) { m_length = l; } unsigned long length() const { return m_length; } - const QString& filename() const { return m_filename; } + const TQString& filename() const { return m_filename; } /** - * reimplemented from QListViewItem + * reimplemented from TQListViewItem * takes the m_bActive flag into account. */ - virtual void paintCell( QPainter*, const QColorGroup&, int, int, int ); + virtual void paintCell( TQPainter*, const TQColorGroup&, int, int, int ); void setActive( bool a ) { m_bActive = a; } protected: /** path to the associated file */ - QString m_filename; + TQString m_filename; /** length in frames (1/75 second) */ unsigned long m_length; @@ -85,14 +85,15 @@ class K3bPlayListViewItem : public KListViewItem class K3bPlayListView : public KListView { Q_OBJECT + TQ_OBJECT public: - K3bPlayListView( QWidget* parent = 0, const char* name = 0 ); + K3bPlayListView( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bPlayListView(); protected: - bool acceptDrag( QDropEvent* e ) const; - QDragObject* dragObject(); + bool acceptDrag( TQDropEvent* e ) const; + TQDragObject* dragObject(); }; @@ -101,15 +102,16 @@ Q_OBJECT /** * @author Sebastian Trueg */ -class K3bAudioPlayer : public QWidget +class K3bAudioPlayer : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bAudioPlayer( QWidget* parent = 0, const char* name = 0 ); + K3bAudioPlayer( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioPlayer(); - bool supportsMimetype( const QString& mimetype ); + bool supportsMimetype( const TQString& mimetype ); /** * length of current playing in seconds @@ -129,17 +131,17 @@ Q_OBJECT int state(); signals: - void started( const QString& filename ); + void started( const TQString& filename ); void started(); void stopped(); void paused(); void ended(); public slots: - void playFile( const QString& filename ); - void playFiles( const QStringList& files ); - void enqueueFile( const QString& filename ); - void enqueueFiles( const QStringList& files ); + void playFile( const TQString& filename ); + void playFiles( const TQStringList& files ); + void enqueueFile( const TQString& filename ); + void enqueueFiles( const TQStringList& files ); /** clears the playlist */ void clear(); @@ -152,8 +154,8 @@ Q_OBJECT void seek( int pos ); /* protected: */ -/* void dragEnterEvent( QDragEnterEvent* e ); */ -/* void dropEvent( QDropEvent* e ); */ +/* void dragEnterEvent( TQDragEnterEvent* e ); */ +/* void dropEvent( TQDropEvent* e ); */ private slots: void slotCheckEnd(); @@ -161,39 +163,39 @@ Q_OBJECT void slotUpdateCurrentTime( int time ); void slotUpdateLength( long time ); void slotUpdateFilename(); - void slotPlayItem( QListViewItem* item ); - void slotDropped( QDropEvent* e, QListViewItem* after ); + void slotPlayItem( TQListViewItem* item ); + void slotDropped( TQDropEvent* e, TQListViewItem* after ); /** * set the actual item. Will set m_currentItem and * handle highlighting of the current item */ - void setCurrentItem( QListViewItem* item ); + void setCurrentItem( TQListViewItem* item ); void slotRemoveSelected(); - void slotShowContextMenu( KListView*, QListViewItem* item, const QPoint& p ); + void slotShowContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ); private: #ifdef WITH_ARTS Arts::PlayObject m_playObject; KArtsDispatcher m_dispatcher; #endif - QString m_filename; + TQString m_filename; - QLabel* m_labelFilename; - QLabel* m_labelCurrentTime; - QLabel* m_labelOverallTime; + TQLabel* m_labelFilename; + TQLabel* m_labelCurrentTime; + TQLabel* m_labelOverallTime; - QToolButton* m_buttonPlay; - QToolButton* m_buttonPause; - QToolButton* m_buttonStop; - QToolButton* m_buttonForward; - QToolButton* m_buttonBack; + TQToolButton* m_buttonPlay; + TQToolButton* m_buttonPause; + TQToolButton* m_buttonStop; + TQToolButton* m_buttonForward; + TQToolButton* m_buttonBack; K3bPlayListView* m_viewPlayList; - QSlider* m_seekSlider; + TQSlider* m_seekSlider; - QTimer* m_updateTimer; + TQTimer* m_updateTimer; K3bPlayListViewItem* m_currentItem; diff --git a/src/k3baudioprojectinterface.cpp b/src/k3baudioprojectinterface.cpp index 1d06d5a..231e968 100644 --- a/src/k3baudioprojectinterface.cpp +++ b/src/k3baudioprojectinterface.cpp @@ -32,51 +32,51 @@ int K3bAudioProjectInterface::trackCount() const } -QString K3bAudioProjectInterface::title() const +TQString K3bAudioProjectInterface::title() const { return m_audioDoc->title(); } -QString K3bAudioProjectInterface::artist() const +TQString K3bAudioProjectInterface::artist() const { return m_audioDoc->artist(); } -QString K3bAudioProjectInterface::trackTitle( int trackNum ) const +TQString K3bAudioProjectInterface::trackTitle( int trackNum ) const { K3bAudioTrack* track = m_audioDoc->getTrack( trackNum ); if( track ) return track->title(); else - return QString::null; + return TQString(); } -QString K3bAudioProjectInterface::trackArtist( int trackNum ) const +TQString K3bAudioProjectInterface::trackArtist( int trackNum ) const { K3bAudioTrack* track = m_audioDoc->getTrack( trackNum ); if( track ) return track->artist(); else - return QString::null; + return TQString(); } -void K3bAudioProjectInterface::setTitle( const QString& title ) +void K3bAudioProjectInterface::setTitle( const TQString& title ) { m_audioDoc->setTitle( title ); } -void K3bAudioProjectInterface::setArtist( const QString& artist ) +void K3bAudioProjectInterface::setArtist( const TQString& artist ) { m_audioDoc->setArtist( artist ); } -void K3bAudioProjectInterface::setTrackTitle( int trackNum, const QString& title ) +void K3bAudioProjectInterface::setTrackTitle( int trackNum, const TQString& title ) { K3bAudioTrack* track = m_audioDoc->getTrack( trackNum ); if( track ) @@ -84,7 +84,7 @@ void K3bAudioProjectInterface::setTrackTitle( int trackNum, const QString& title } -void K3bAudioProjectInterface::setTrackArtist( int trackNum, const QString& artist ) +void K3bAudioProjectInterface::setTrackArtist( int trackNum, const TQString& artist ) { K3bAudioTrack* track = m_audioDoc->getTrack( trackNum ); if( track ) diff --git a/src/k3baudioprojectinterface.h b/src/k3baudioprojectinterface.h index e7d649e..9607e56 100644 --- a/src/k3baudioprojectinterface.h +++ b/src/k3baudioprojectinterface.h @@ -31,30 +31,30 @@ class K3bAudioProjectInterface : public K3bProjectInterface k_dcop: int trackCount() const; - QString title() const; - QString artist() const; - QString trackTitle( int trackNum ) const; - QString trackArtist( int trackNum ) const; + TQString title() const; + TQString artist() const; + TQString trackTitle( int trackNum ) const; + TQString trackArtist( int trackNum ) const; /** * Set the global CD-Text title field. */ - void setTitle( const QString& title ); + void setTitle( const TQString& title ); /** * Set the global CD-Text artist field. */ - void setArtist( const QString& artist ); + void setArtist( const TQString& artist ); /** * Set the track CD-Text title field. */ - void setTrackTitle( int trackNum, const QString& title ); + void setTrackTitle( int trackNum, const TQString& title ); /** * Set the track CD-Text artist field. */ - void setTrackArtist( int trackNum, const QString& artist ); + void setTrackArtist( int trackNum, const TQString& artist ); private: K3bAudioDoc* m_audioDoc; diff --git a/src/k3bburnprogressdialog.cpp b/src/k3bburnprogressdialog.cpp index a5ad3a4..32be32c 100644 --- a/src/k3bburnprogressdialog.cpp +++ b/src/k3bburnprogressdialog.cpp @@ -27,34 +27,34 @@ #include <kprogress.h> #include <klocale.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> -K3bBurnProgressDialog::K3bBurnProgressDialog( QWidget *parent, const char *name, bool showSubProgress, +K3bBurnProgressDialog::K3bBurnProgressDialog( TQWidget *tqparent, const char *name, bool showSubProgress, bool modal, WFlags wf ) - : K3bJobProgressDialog(parent,name, showSubProgress, modal, wf) + : K3bJobProgressDialog(tqparent,name, showSubProgress, modal, wf) { - m_labelWritingSpeed = new QLabel( m_frameExtraInfo, "m_labelWritingSpeed" ); - // m_labelWritingSpeed->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_labelWritingSpeed = new TQLabel( m_frameExtraInfo, "m_labelWritingSpeed" ); + // m_labelWritingSpeed->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_frameExtraInfoLayout->addWidget( m_labelWritingSpeed, 2, 0 ); - m_frameExtraInfoLayout->addWidget( new QLabel( i18n("Estimated writing speed:"), m_frameExtraInfo ), 1, 0 ); + m_frameExtraInfoLayout->addWidget( new TQLabel( i18n("Estimated writing speed:"), m_frameExtraInfo ), 1, 0 ); m_labelWriter = new K3bThemedLabel( m_frameExtraInfo ); - m_labelWriter->setFrameShape( QFrame::StyledPanel ); - m_labelWriter->setFrameShadow( QFrame::Sunken ); + m_labelWriter->setFrameShape( TQFrame::StyledPanel ); + m_labelWriter->setFrameShadow( TQFrame::Sunken ); m_labelWriter->setLineWidth( 1 ); m_labelWriter->setMargin( 5 ); - QFont textLabel14_font( m_labelWriter->font() ); + TQFont textLabel14_font( m_labelWriter->font() ); textLabel14_font.setBold( true ); m_labelWriter->setFont( textLabel14_font ); m_frameExtraInfoLayout->addMultiCellWidget( m_labelWriter, 0, 0, 0, 3 ); - m_frameExtraInfoLayout->addWidget( new QLabel( i18n("Software buffer:"), m_frameExtraInfo ), 1, 2 ); - m_frameExtraInfoLayout->addWidget( new QLabel( i18n("Device buffer:"), m_frameExtraInfo ), 2, 2 ); + m_frameExtraInfoLayout->addWidget( new TQLabel( i18n("Software buffer:"), m_frameExtraInfo ), 1, 2 ); + m_frameExtraInfoLayout->addWidget( new TQLabel( i18n("Device buffer:"), m_frameExtraInfo ), 2, 2 ); m_progressWritingBuffer = new KProgress( m_frameExtraInfo, "m_progressWritingBuffer" ); m_frameExtraInfoLayout->addWidget( m_progressWritingBuffer, 1, 3 ); @@ -83,15 +83,15 @@ void K3bBurnProgressDialog::setBurnJob( K3bBurnJob* burnJob ) K3bJobProgressDialog::setJob(burnJob); if( burnJob ) { - connect( burnJob, SIGNAL(bufferStatus(int)), this, SLOT(slotBufferStatus(int)) ); - connect( burnJob, SIGNAL(deviceBuffer(int)), this, SLOT(slotDeviceBuffer(int)) ); - connect( burnJob, SIGNAL(writeSpeed(int, int)), this, SLOT(slotWriteSpeed(int, int)) ); - connect( burnJob, SIGNAL(burning(bool)), m_progressWritingBuffer, SLOT(setEnabled(bool)) ); - connect( burnJob, SIGNAL(burning(bool)), m_progressDeviceBuffer, SLOT(setEnabled(bool)) ); - connect( burnJob, SIGNAL(burning(bool)), m_labelWritingSpeed, SLOT(setEnabled(bool)) ); + connect( burnJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SLOT(slotBuffertqStatus(int)) ); + connect( burnJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) ); + connect( burnJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SLOT(slotWriteSpeed(int, int)) ); + connect( burnJob, TQT_SIGNAL(burning(bool)), m_progressWritingBuffer, TQT_SLOT(setEnabled(bool)) ); + connect( burnJob, TQT_SIGNAL(burning(bool)), m_progressDeviceBuffer, TQT_SLOT(setEnabled(bool)) ); + connect( burnJob, TQT_SIGNAL(burning(bool)), m_labelWritingSpeed, TQT_SLOT(setEnabled(bool)) ); if( burnJob->writer() ) - m_labelWriter->setText( i18n("Writer: %1 %2").arg(burnJob->writer()->vendor()). + m_labelWriter->setText( i18n("Writer: %1 %2").tqarg(burnJob->writer()->vendor()). arg(burnJob->writer()->description()) ); m_labelWritingSpeed->setText( i18n("no info") ); @@ -112,7 +112,7 @@ void K3bBurnProgressDialog::slotFinished( bool success ) } -void K3bBurnProgressDialog::slotBufferStatus( int b ) +void K3bBurnProgressDialog::slotBuffertqStatus( int b ) { m_progressWritingBuffer->setFormat( "%p%" ); m_progressWritingBuffer->setValue( b ); @@ -128,7 +128,7 @@ void K3bBurnProgressDialog::slotDeviceBuffer( int b ) void K3bBurnProgressDialog::slotWriteSpeed( int s, int multiplicator ) { - m_labelWritingSpeed->setText( QString("%1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) ); + m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) ); } #include "k3bburnprogressdialog.moc" diff --git a/src/k3bburnprogressdialog.h b/src/k3bburnprogressdialog.h index db27ddb..11a0afb 100644 --- a/src/k3bburnprogressdialog.h +++ b/src/k3bburnprogressdialog.h @@ -21,7 +21,7 @@ class K3bBurnJob; class KProgress; -class QLabel; +class TQLabel; /** @@ -30,9 +30,10 @@ class QLabel; class K3bBurnProgressDialog : public K3bJobProgressDialog { Q_OBJECT + TQ_OBJECT public: - K3bBurnProgressDialog( QWidget* parent = 0, const char* name = 0, bool showSubProgress = true, + K3bBurnProgressDialog( TQWidget* tqparent = 0, const char* name = 0, bool showSubProgress = true, bool modal = true, WFlags = 0 ); ~K3bBurnProgressDialog(); @@ -41,15 +42,15 @@ class K3bBurnProgressDialog : public K3bJobProgressDialog { protected slots: void slotWriteSpeed( int, int ); - void slotBufferStatus( int ); + void slotBuffertqStatus( int ); void slotDeviceBuffer( int ); void slotFinished(bool); protected: - QLabel* m_labelWriter; + TQLabel* m_labelWriter; KProgress* m_progressWritingBuffer; KProgress* m_progressDeviceBuffer; - QLabel* m_labelWritingSpeed; + TQLabel* m_labelWritingSpeed; }; #endif diff --git a/src/k3bcontentsview.cpp b/src/k3bcontentsview.cpp index 304ae0d..536fa53 100644 --- a/src/k3bcontentsview.cpp +++ b/src/k3bcontentsview.cpp @@ -17,20 +17,20 @@ #include <k3bthemedheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> K3bContentsView::K3bContentsView( bool withHeader, - QWidget* parent, + TQWidget* tqparent, const char* name ) - : QWidget( parent, name ), + : TQWidget( tqparent, name ), m_header(0), m_centerWidget(0) { if( withHeader ) { - QVBoxLayout* lay = new QVBoxLayout( this ); + TQVBoxLayout* lay = new TQVBoxLayout( this ); lay->setMargin( 2 ); lay->setSpacing( 0 ); @@ -48,22 +48,22 @@ K3bContentsView::~K3bContentsView() } -void K3bContentsView::setMainWidget( QWidget* w ) +void K3bContentsView::setMainWidget( TQWidget* w ) { m_centerWidget = w; - ((QVBoxLayout*)layout())->addWidget( w ); + ((TQVBoxLayout*)tqlayout())->addWidget( w ); } -QWidget* K3bContentsView::mainWidget() +TQWidget* K3bContentsView::mainWidget() { if( !m_centerWidget ) - setMainWidget( new QWidget( this ) ); + setMainWidget( new TQWidget( this ) ); return m_centerWidget; } -void K3bContentsView::setTitle( const QString& s ) +void K3bContentsView::setTitle( const TQString& s ) { if( m_header ) m_header->setTitle( s ); diff --git a/src/k3bcontentsview.h b/src/k3bcontentsview.h index a3b6f45..48c4751 100644 --- a/src/k3bcontentsview.h +++ b/src/k3bcontentsview.h @@ -17,33 +17,34 @@ #ifndef _K3B_CONTENTS_VIEW_H_ #define _K3B_CONTENTS_VIEW_H_ -#include <qwidget.h> +#include <tqwidget.h> #include <k3bthememanager.h> class K3bThemedHeader; -class K3bContentsView : public QWidget +class K3bContentsView : public TQWidget { Q_OBJECT + TQ_OBJECT public: virtual ~K3bContentsView(); protected: K3bContentsView( bool withHeader, - QWidget* parent = 0, + TQWidget* tqparent = 0, const char* name = 0 ); - QWidget* mainWidget(); - void setMainWidget( QWidget* ); - void setTitle( const QString& ); + TQWidget* mainWidget(); + void setMainWidget( TQWidget* ); + void setTitle( const TQString& ); void setLeftPixmap( K3bTheme::PixmapType ); void setRightPixmap( K3bTheme::PixmapType ); private: K3bThemedHeader* m_header; - QWidget* m_centerWidget; + TQWidget* m_centerWidget; }; #endif diff --git a/src/k3bdatamodewidget.cpp b/src/k3bdatamodewidget.cpp index 669da59..6072ebd 100644 --- a/src/k3bdatamodewidget.cpp +++ b/src/k3bdatamodewidget.cpp @@ -20,23 +20,23 @@ #include <klocale.h> #include <kconfig.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> static const int s_autoIndex = 0; static const int s_mode1Index = 1; static const int s_mode2Index = 2; -K3bDataModeWidget::K3bDataModeWidget( QWidget* parent, const char* name ) - : QComboBox( false, parent, name ) +K3bDataModeWidget::K3bDataModeWidget( TQWidget* tqparent, const char* name ) + : TQComboBox( false, tqparent, name ) { insertItem( i18n("Auto"), s_autoIndex ); insertItem( i18n("Mode1"), s_mode1Index ); insertItem( i18n("Mode2"), s_mode2Index ); - QToolTip::add( this,i18n("Select the mode for the data-track") ); - QWhatsThis::add( this, i18n("<p><b>Data Mode</b>" + TQToolTip::add( this,i18n("Select the mode for the data-track") ); + TQWhatsThis::add( this, i18n("<p><b>Data Mode</b>" "<p>Data tracks may be written in two different modes:</p>" "<p><b>Auto</b><br>" "Let K3b select the best suited data mode.</p>" @@ -81,7 +81,7 @@ void K3bDataModeWidget::setDataMode( int mode ) void K3bDataModeWidget::saveConfig( KConfigBase* c ) { - QString datamode; + TQString datamode; if( dataMode() == K3b::MODE1 ) datamode = "mode1"; else if( dataMode() == K3b::MODE2 ) @@ -94,7 +94,7 @@ void K3bDataModeWidget::saveConfig( KConfigBase* c ) void K3bDataModeWidget::loadConfig( KConfigBase* c ) { - QString datamode = c->readEntry( "data_track_mode" ); + TQString datamode = c->readEntry( "data_track_mode" ); if( datamode == "mode1" ) setDataMode( K3b::MODE1 ); else if( datamode == "mode2" ) diff --git a/src/k3bdatamodewidget.h b/src/k3bdatamodewidget.h index 647225f..e5277c9 100644 --- a/src/k3bdatamodewidget.h +++ b/src/k3bdatamodewidget.h @@ -17,18 +17,19 @@ #ifndef _K3B_DATAMODE_WIDGET_H_ #define _K3B_DATAMODE_WIDGET_H_ -#include <qcombobox.h> +#include <tqcombobox.h> class KConfigBase; -class K3bDataModeWidget : public QComboBox +class K3bDataModeWidget : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - K3bDataModeWidget( QWidget* parent = 0, const char* name = 0 ); + K3bDataModeWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataModeWidget(); /** diff --git a/src/k3bdataprojectinterface.cpp b/src/k3bdataprojectinterface.cpp index 6adf07d..bbb2701 100644 --- a/src/k3bdataprojectinterface.cpp +++ b/src/k3bdataprojectinterface.cpp @@ -32,16 +32,16 @@ K3bDataProjectInterface::~K3bDataProjectInterface() } -bool K3bDataProjectInterface::createFolder( const QString& name ) +bool K3bDataProjectInterface::createFolder( const TQString& name ) { return createFolder( name, "/" ); } -bool K3bDataProjectInterface::createFolder( const QString& name, const QString& parent ) +bool K3bDataProjectInterface::createFolder( const TQString& name, const TQString& tqparent ) { - K3bDataItem* p = m_dataDoc->root()->findByPath( parent ); - if( p && p->isDir() && !static_cast<K3bDirItem*>(p)->find( name ) ) { + K3bDataItem* p = m_dataDoc->root()->findByPath( tqparent ); + if( p && p->isDir() && !static_cast<K3bDirItem*>(p)->tqfind( name ) ) { m_dataDoc->addEmptyDir( name, static_cast<K3bDirItem*>(p) ); return true; } @@ -49,21 +49,21 @@ bool K3bDataProjectInterface::createFolder( const QString& name, const QString& } -void K3bDataProjectInterface::addUrl( const QString& url, const QString& parent ) +void K3bDataProjectInterface::addUrl( const TQString& url, const TQString& tqparent ) { - addUrls( QStringList(url), parent ); + addUrls( TQStringList(url), tqparent ); } -void K3bDataProjectInterface::addUrls( const QStringList& urls, const QString& parent ) +void K3bDataProjectInterface::addUrls( const TQStringList& urls, const TQString& tqparent ) { - K3bDataItem* p = m_dataDoc->root()->findByPath( parent ); + K3bDataItem* p = m_dataDoc->root()->findByPath( tqparent ); if( p && p->isDir() ) m_dataDoc->addUrls( KURL::List(urls), static_cast<K3bDirItem*>(p) ); } -bool K3bDataProjectInterface::removeItem( const QString& path ) +bool K3bDataProjectInterface::removeItem( const TQString& path ) { K3bDataItem* p = m_dataDoc->root()->findByPath( path ); if( p && p->isRemoveable() ) { @@ -75,7 +75,7 @@ bool K3bDataProjectInterface::removeItem( const QString& path ) } -bool K3bDataProjectInterface::renameItem( const QString& path, const QString& newName ) +bool K3bDataProjectInterface::renameItem( const TQString& path, const TQString& newName ) { K3bDataItem* p = m_dataDoc->root()->findByPath( path ); if( p && p->isRenameable() && !newName.isEmpty() ) { @@ -87,12 +87,12 @@ bool K3bDataProjectInterface::renameItem( const QString& path, const QString& ne } -void K3bDataProjectInterface::setVolumeID( const QString& id ) +void K3bDataProjectInterface::setVolumeID( const TQString& id ) { m_dataDoc->setVolumeID( id ); } -bool K3bDataProjectInterface::isFolder( const QString& path ) const +bool K3bDataProjectInterface::isFolder( const TQString& path ) const { K3bDataItem* p = m_dataDoc->root()->findByPath( path ); if( p ) @@ -102,13 +102,13 @@ bool K3bDataProjectInterface::isFolder( const QString& path ) const } -QStringList K3bDataProjectInterface::children( const QString& path ) const +TQStringList K3bDataProjectInterface::tqchildren( const TQString& path ) const { - QStringList l; + TQStringList l; K3bDataItem* item = m_dataDoc->root()->findByPath( path ); if( item && item->isDir() ) { - const QPtrList<K3bDataItem>& cl = static_cast<K3bDirItem*>(item)->children(); - for( QPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) + const TQPtrList<K3bDataItem>& cl = static_cast<K3bDirItem*>(item)->tqchildren(); + for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) l.append( it.current()->k3bName() ); } @@ -116,7 +116,7 @@ QStringList K3bDataProjectInterface::children( const QString& path ) const } -bool K3bDataProjectInterface::setSortWeight( const QString& path, long weight ) const +bool K3bDataProjectInterface::setSortWeight( const TQString& path, long weight ) const { K3bDataItem* item = m_dataDoc->root()->findByPath( path ); if( item ) { diff --git a/src/k3bdataprojectinterface.h b/src/k3bdataprojectinterface.h index 689455b..c4edfd8 100644 --- a/src/k3bdataprojectinterface.h +++ b/src/k3bdataprojectinterface.h @@ -19,7 +19,7 @@ #include "k3bprojectinterface.h" -#include <qstringlist.h> +#include <tqstringlist.h> class K3bDataDoc; @@ -37,20 +37,20 @@ class K3bDataProjectInterface : public K3bProjectInterface * Create a new folder in the root of the doc. * This is the same as calling createFolder( name, "/" ) */ - bool createFolder( const QString& name ); + bool createFolder( const TQString& name ); /** * Create a new folder with name @p name in the folder with the - * absolute path @p parent. + * absolute path @p tqparent. * * \return true if the folder was created successfully, false if - * an item with the same name already exists or the parent + * an item with the same name already exists or the tqparent * directory could not be found. * * Example: createFolder( "test", "/foo/bar" ) will create the * folder /foo/bar/test. */ - bool createFolder( const QString& name, const QString& parent ); + bool createFolder( const TQString& name, const TQString& tqparent ); /** * Add urls to a specific folder in the project. @@ -58,15 +58,15 @@ class K3bDataProjectInterface : public K3bProjectInterface * Example: addUrl( "test.txt", "/foo/bar" ) will add the file test.txt * to folder /foo/bar. */ - void addUrl( const QString& url, const QString& parent ); + void addUrl( const TQString& url, const TQString& tqparent ); - void addUrls( const QStringList& urls, const QString& parent ); + void addUrls( const TQStringList& urls, const TQString& tqparent ); /** * Remove an item * \return true if the item was successfully removed. */ - bool removeItem( const QString& path ); + bool removeItem( const TQString& path ); /** * Rename an item @@ -74,29 +74,29 @@ class K3bDataProjectInterface : public K3bProjectInterface * no item could be found at \p path, \p newName is empty, * or the item cannot be renamed for some reason. */ - bool renameItem( const QString& path, const QString& newName ); + bool renameItem( const TQString& path, const TQString& newName ); /** * Set the volume ID of the data project. This is the name shown by Windows * when the CD is inserted. */ - void setVolumeID( const QString& id ); + void setVolumeID( const TQString& id ); /** * \return true if the specified path exists in the project and it is a folder. */ - bool isFolder( const QString& path ) const; + bool isFolder( const TQString& path ) const; /** * \return the names of the child elements of the item determined by path. */ - QStringList children( const QString& path ) const; + TQStringList tqchildren( const TQString& path ) const; /** * Set the sort weight of an item * \return false if the item at \p could not be found. */ - bool setSortWeight( const QString& path, long weight ) const; + bool setSortWeight( const TQString& path, long weight ) const; private: K3bDataDoc* m_dataDoc; diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index 7ffe84c..7e02aed 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -22,10 +22,10 @@ #include <k3bversion.h> #include <k3bglobals.h> -#include <qtextedit.h> -#include <qcursor.h> -#include <qfile.h> -#include <qclipboard.h> +#include <tqtextedit.h> +#include <tqcursor.h> +#include <tqfile.h> +#include <tqclipboard.h> #include <klocale.h> #include <kstdguiitem.h> @@ -35,8 +35,8 @@ #include <kmessagebox.h> -K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( QWidget* parent ) - : KDialogBase( parent, "debugViewDialog", true, i18n("Debugging Output"), Close|User1|User2, Close, +K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "debugViewDialog", true, i18n("Debugging Output"), Close|User1|User2, Close, false, KStdGuiItem::saveAs(), KGuiItem( i18n("Copy"), "editcopy" ) ) @@ -44,11 +44,11 @@ K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( QWidget* parent ) setButtonTip( User1, i18n("Save to file") ); setButtonTip( User2, i18n("Copy to clipboard") ); - debugView = new QTextEdit( this ); + debugView = new TQTextEdit( this ); debugView->setReadOnly(true); - debugView->setTextFormat( QTextEdit::PlainText ); + debugView->setTextFormat( TQTextEdit::PlainText ); debugView->setCurrentFont( KGlobalSettings::fixedFont() ); - debugView->setWordWrap( QTextEdit::NoWrap ); + debugView->setWordWrap( TQTextEdit::NoWrap ); setMainWidget( debugView ); @@ -56,36 +56,36 @@ K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( QWidget* parent ) } -void K3bDebuggingOutputDialog::setOutput( const QMap<QString, QStringList>& map ) +void K3bDebuggingOutputDialog::setOutput( const TQMap<TQString, TQStringList>& map ) { // the following may take some time - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); clear(); // add the debugging output - for( QMap<QString, QStringList>::ConstIterator itMap = map.begin(); itMap != map.end(); ++itMap ) { - const QStringList& list = itMap.data(); + for( TQMap<TQString, TQStringList>::ConstIterator itMap = map.begin(); itMap != map.end(); ++itMap ) { + const TQStringList& list = itMap.data(); debugView->append( itMap.key() + "\n" ); debugView->append( "-----------------------\n" ); - for( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { - QStringList lines = QStringList::split( "\n", *it ); + for( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { + TQStringList lines = TQStringList::split( "\n", *it ); // do every line - QStringList::ConstIterator end( lines.end() ); - for( QStringList::ConstIterator str = lines.begin(); str != end; ++str ) + TQStringList::ConstIterator end( lines.end() ); + for( TQStringList::ConstIterator str = lines.begin(); str != end; ++str ) debugView->append( *str + "\n" ); } m_paragraphMap[itMap.key()] = debugView->paragraphs(); debugView->append( "\n" ); } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } -void K3bDebuggingOutputDialog::addOutput( const QString& app, const QString& msg ) +void K3bDebuggingOutputDialog::addOutput( const TQString& app, const TQString& msg ) { - QMap<QString, int>::Iterator it = m_paragraphMap.find( app ); + TQMap<TQString, int>::Iterator it = m_paragraphMap.tqfind( app ); if( it == m_paragraphMap.end() ) { // create new section @@ -113,41 +113,41 @@ void K3bDebuggingOutputDialog::clear() m_paragraphMap.clear(); addOutput( "System", "K3b Version: " + k3bcore->version() ); - addOutput( "System", "KDE Version: " + QString(KDE::versionString()) ); - addOutput( "System", "QT Version: " + QString(qVersion()) ); + addOutput( "System", "KDE Version: " + TQString(KDE::versionString()) ); + addOutput( "System", "QT Version: " + TQString(qVersion()) ); addOutput( "System", "Kernel: " + K3b::kernelVersion() ); // devices in the logfile - for( QPtrListIterator<K3bDevice::Device> it( k3bcore->deviceManager()->allDevices() ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( k3bcore->deviceManager()->allDevices() ); *it; ++it ) { K3bDevice::Device* dev = *it; addOutput( "Devices", - QString( "%1 (%2, %3) [%5] [%6] [%7]" ) - .arg( dev->vendor() + " " + dev->description() + " " + dev->version() ) - .arg( dev->blockDeviceName() ) - .arg( dev->genericDevice() ) - .arg( K3bDevice::deviceTypeString( dev->type() ) ) - .arg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) ) - .arg( K3bDevice::writingModeString( dev->writingModes() ) ) ); + TQString( "%1 (%2, %3) [%5] [%6] [%7]" ) + .tqarg( dev->vendor() + " " + dev->description() + " " + dev->version() ) + .tqarg( dev->blockDeviceName() ) + .tqarg( dev->genericDevice() ) + .tqarg( K3bDevice::deviceTypeString( dev->type() ) ) + .tqarg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) ) + .tqarg( K3bDevice::writingModeString( dev->writingModes() ) ) ); } } void K3bDebuggingOutputDialog::slotUser1() { - QString filename = KFileDialog::getSaveFileName(); + TQString filename = KFileDialog::getSaveFileName(); if( !filename.isEmpty() ) { - QFile f( filename ); + TQFile f( filename ); if( !f.exists() || KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(filename), + i18n("Do you want to overwrite %1?").tqarg(filename), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { if( f.open( IO_WriteOnly ) ) { - QTextStream t( &f ); + TQTextStream t( &f ); t << debugView->text(); } else { - KMessageBox::error( this, i18n("Could not open file %1").arg(filename) ); + KMessageBox::error( this, i18n("Could not open file %1").tqarg(filename) ); } } } @@ -156,7 +156,7 @@ void K3bDebuggingOutputDialog::slotUser1() void K3bDebuggingOutputDialog::slotUser2() { - QApplication::clipboard()->setText( debugView->text(), QClipboard::Clipboard ); + TQApplication::tqclipboard()->setText( debugView->text(), TQClipboard::Clipboard ); } #include "k3bdebuggingoutputdialog.moc" diff --git a/src/k3bdebuggingoutputdialog.h b/src/k3bdebuggingoutputdialog.h index 0e74b71..6f335a6 100644 --- a/src/k3bdebuggingoutputdialog.h +++ b/src/k3bdebuggingoutputdialog.h @@ -17,28 +17,29 @@ #define _K3B_DEBUGGING_OUTPUT_DIALOG_H_ #include <kdialogbase.h> -#include <qmap.h> +#include <tqmap.h> -class QTextEdit; +class TQTextEdit; class K3bDebuggingOutputDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bDebuggingOutputDialog( QWidget* parent ); + K3bDebuggingOutputDialog( TQWidget* tqparent ); public slots: - void setOutput( const QMap<QString, QStringList>& ); - void addOutput( const QString&, const QString& ); + void setOutput( const TQMap<TQString, TQStringList>& ); + void addOutput( const TQString&, const TQString& ); void clear(); private: void slotUser1(); void slotUser2(); - QTextEdit* debugView; - QMap<QString, int> m_paragraphMap; + TQTextEdit* debugView; + TQMap<TQString, int> m_paragraphMap; }; diff --git a/src/k3bdebuggingoutputfile.cpp b/src/k3bdebuggingoutputfile.cpp index 2f99e96..f1ce1dc 100644 --- a/src/k3bdebuggingoutputfile.cpp +++ b/src/k3bdebuggingoutputfile.cpp @@ -26,48 +26,48 @@ #include <kglobalsettings.h> #include <kapplication.h> -#include <qtextstream.h> +#include <tqtextstream.h> K3bDebuggingOutputFile::K3bDebuggingOutputFile() - : QFile( locateLocal( "appdata", "lastlog.log", true ) ) + : TQFile( locateLocal( "appdata", "lastlog.log", true ) ) { } bool K3bDebuggingOutputFile::open() { - if( !QFile::open( IO_WriteOnly ) ) + if( !TQFile::open( IO_WriteOnly ) ) return false; addOutput( "System", "K3b Version: " + k3bcore->version() ); - addOutput( "System", "KDE Version: " + QString(KDE::versionString()) ); - addOutput( "System", "QT Version: " + QString(qVersion()) ); + addOutput( "System", "KDE Version: " + TQString(KDE::versionString()) ); + addOutput( "System", "QT Version: " + TQString(qVersion()) ); addOutput( "System", "Kernel: " + K3b::kernelVersion() ); // devices in the logfile - for( QPtrListIterator<K3bDevice::Device> it( k3bcore->deviceManager()->allDevices() ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( k3bcore->deviceManager()->allDevices() ); *it; ++it ) { K3bDevice::Device* dev = *it; addOutput( "Devices", - QString( "%1 (%2, %3) [%5] [%6] [%7]" ) - .arg( dev->vendor() + " " + dev->description() + " " + dev->version() ) - .arg( dev->blockDeviceName() ) - .arg( dev->genericDevice() ) - .arg( K3bDevice::deviceTypeString( dev->type() ) ) - .arg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) ) - .arg( K3bDevice::writingModeString( dev->writingModes() ) ) ); + TQString( "%1 (%2, %3) [%5] [%6] [%7]" ) + .tqarg( dev->vendor() + " " + dev->description() + " " + dev->version() ) + .tqarg( dev->blockDeviceName() ) + .tqarg( dev->genericDevice() ) + .tqarg( K3bDevice::deviceTypeString( dev->type() ) ) + .tqarg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) ) + .tqarg( K3bDevice::writingModeString( dev->writingModes() ) ) ); } return true; } -void K3bDebuggingOutputFile::addOutput( const QString& app, const QString& msg ) +void K3bDebuggingOutputFile::addOutput( const TQString& app, const TQString& msg ) { if( !isOpen() ) open(); - QTextStream s( this ); + TQTextStream s( this ); s << "[" << app << "] " << msg << endl; flush(); } diff --git a/src/k3bdebuggingoutputfile.h b/src/k3bdebuggingoutputfile.h index c0af0e5..df9b0a7 100644 --- a/src/k3bdebuggingoutputfile.h +++ b/src/k3bdebuggingoutputfile.h @@ -16,12 +16,25 @@ #ifndef _K3B_DEBUGGING_OUTPUT_FILE_H_ #define _K3B_DEBUGGING_OUTPUT_FILE_H_ -#include <qfile.h> -#include <qobject.h> - -class K3bDebuggingOutputFile : public QObject, public QFile +#include <tqfile.h> +#include <tqobject.h> + +#ifdef Q_MOC_RUN +#define USE_QT4 +#endif // Q_MOC_RUN + +// MOC_SKIP_BEGIN +#ifdef USE_QT4 +class K3bDebuggingOutputFile : public TQFile +#else // USE_QT4 +// MOC_SKIP_END +class K3bDebuggingOutputFile : public TQObject, public TQFile +// MOC_SKIP_BEGIN +#endif // USE_QT4 +// MOC_SKIP_END { Q_OBJECT + TQ_OBJECT public: K3bDebuggingOutputFile(); @@ -32,7 +45,7 @@ class K3bDebuggingOutputFile : public QObject, public QFile bool open(); public slots: - void addOutput( const QString&, const QString& ); + void addOutput( const TQString&, const TQString& ); }; diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp index 12c6ba4..0f0b739 100644 --- a/src/k3bdiroperator.cpp +++ b/src/k3bdiroperator.cpp @@ -28,11 +28,11 @@ #include <kstandarddirs.h> #include <kpopupmenu.h> -#include <qdir.h> +#include <tqdir.h> -K3bDirOperator::K3bDirOperator(const KURL& url, QWidget* parent, const char* name ) - : KDirOperator( url, parent, name ) +K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* tqparent, const char* name ) + : KDirOperator( url, tqparent, name ) { setViewConfig( k3bcore->config(), "file view" ); setMode( KFile::Files ); @@ -49,11 +49,11 @@ K3bDirOperator::K3bDirOperator(const KURL& url, QWidget* parent, const char* nam bmMan->setUpdate( true ); bmMan->setShowNSBookmarks( false ); - m_bmPopup = new KActionMenu( i18n("Bookmarks"), "bookmark", this, "bookmarks" ); + m_bmPopup = new KActionMenu( i18n("Bookmarks"), "bookmark", TQT_TQOBJECT(this), "bookmarks" ); m_bmMenu = new KBookmarkMenu( bmMan, this, m_bmPopup->popupMenu(), actionCollection(), true ); (void)new KAction( i18n("&Add to Project"), SHIFT+Key_Return, - this, SLOT(slotAddFilesToProject()), + TQT_TQOBJECT(this), TQT_SLOT(slotAddFilesToProject()), actionCollection(), "add_file_to_project"); } @@ -64,9 +64,9 @@ K3bDirOperator::~K3bDirOperator() } -void K3bDirOperator::readConfig( KConfig* cfg, const QString& group ) +void K3bDirOperator::readConfig( KConfig* cfg, const TQString& group ) { - QString oldGroup = cfg->group(); + TQString oldGroup = cfg->group(); cfg->setGroup( group ); KDirOperator::readConfig( cfg, group ); @@ -76,11 +76,11 @@ void K3bDirOperator::readConfig( KConfig* cfg, const QString& group ) // There seems to be a bug in the KDELibs which makes setURL crash on // some systems when used with a non-existing url // - QString lastUrl = cfg->readPathEntry( "last url", QDir::home().absPath() ); - while( !QFile::exists(lastUrl) ) { - QString urlUp = lastUrl.section( '/', 0, -2 ); + TQString lastUrl = cfg->readPathEntry( "last url", TQDir::home().absPath() ); + while( !TQFile::exists(lastUrl) ) { + TQString urlUp = lastUrl.section( '/', 0, -2 ); if( urlUp == lastUrl ) - lastUrl = QDir::home().absPath(); + lastUrl = TQDir::home().absPath(); else lastUrl = urlUp; } @@ -93,9 +93,9 @@ void K3bDirOperator::readConfig( KConfig* cfg, const QString& group ) } -void K3bDirOperator::writeConfig( KConfig* cfg, const QString& group ) +void K3bDirOperator::writeConfig( KConfig* cfg, const TQString& group ) { - QString oldGroup = cfg->group(); + TQString oldGroup = cfg->group(); cfg->setGroup( group ); KDirOperator::writeConfig( cfg, group ); @@ -105,25 +105,25 @@ void K3bDirOperator::writeConfig( KConfig* cfg, const QString& group ) } -void K3bDirOperator::openBookmarkURL( const QString& url ) +void K3bDirOperator::openBookmarkURL( const TQString& url ) { setURL( KURL::fromPathOrURL( url ), true ); } -QString K3bDirOperator::currentTitle() const +TQString K3bDirOperator::currentTitle() const { return url().path(-1); } -QString K3bDirOperator::currentURL() const +TQString K3bDirOperator::currentURL() const { return url().path(-1); } -void K3bDirOperator::activatedMenu( const KFileItem*, const QPoint& pos ) +void K3bDirOperator::activatedMenu( const KFileItem*, const TQPoint& pos ) { // both from KDirOperator setupMenu(); @@ -148,7 +148,7 @@ void K3bDirOperator::activatedMenu( const KFileItem*, const QPoint& pos ) void K3bDirOperator::slotAddFilesToProject() { KURL::List files; - for( QPtrListIterator<KFileItem> it( *(selectedItems()) ); it.current(); ++it ) { + for( TQPtrListIterator<KFileItem> it( *(selectedItems()) ); it.current(); ++it ) { files.append( it.current()->url() ); } if( !files.isEmpty() ) diff --git a/src/k3bdiroperator.h b/src/k3bdiroperator.h index b231a8d..eb695d7 100644 --- a/src/k3bdiroperator.h +++ b/src/k3bdiroperator.h @@ -20,8 +20,8 @@ #include <kdiroperator.h> #include <kbookmarkmanager.h> -class QIconViewItem; -class QListViewItem; +class TQIconViewItem; +class TQListViewItem; class KBookmarkMenu; class KActionMenu; @@ -33,35 +33,36 @@ class KActionMenu; class K3bDirOperator : public KDirOperator, public KBookmarkOwner { Q_OBJECT + TQ_OBJECT public: - K3bDirOperator( const KURL& urlName = KURL(), QWidget* parent = 0, const char* name = 0 ); + K3bDirOperator( const KURL& urlName = KURL(), TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDirOperator(); /** * reimplemented from KDirOperator */ - void readConfig( KConfig* cfg, const QString& group ); + void readConfig( KConfig* cfg, const TQString& group ); /** * reimplemented from KDirOperator */ - void writeConfig( KConfig* cfg, const QString& group ); + void writeConfig( KConfig* cfg, const TQString& group ); /** * reimplemented from KBookmarkOwner */ - void openBookmarkURL( const QString& url ); + void openBookmarkURL( const TQString& url ); /** * reimplemented from KBookmarkOwner */ - QString currentTitle() const; + TQString currentTitle() const; /** * reimplemented from KBookmarkOwner */ - QString currentURL() const; + TQString currentURL() const; KActionMenu* bookmarkMenu() const { return m_bmPopup; } @@ -72,7 +73,7 @@ class K3bDirOperator : public KDirOperator, public KBookmarkOwner /** * reimplemented from KDirOperator */ - void activatedMenu( const KFileItem*, const QPoint& ); + void activatedMenu( const KFileItem*, const TQPoint& ); private: KBookmarkMenu* m_bmMenu; diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp index d711300..d2ab1e4 100644 --- a/src/k3bdirview.cpp +++ b/src/k3bdirview.cpp @@ -37,25 +37,25 @@ #include <unistd.h> // QT-includes -#include <qdir.h> -#include <qlistview.h> -#include <qstring.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qpixmap.h> -#include <qstringlist.h> -#include <qstrlist.h> -#include <qheader.h> -#include <qsplitter.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qiconset.h> -#include <qvaluelist.h> -#include <qlabel.h> -#include <qwidgetstack.h> -#include <qscrollview.h> -#include <qpainter.h> -#include <qsimplerichtext.h> +#include <tqdir.h> +#include <tqlistview.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqpixmap.h> +#include <tqstringlist.h> +#include <tqstrlist.h> +#include <tqheader.h> +#include <tqsplitter.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqiconset.h> +#include <tqvaluelist.h> +#include <tqlabel.h> +#include <tqwidgetstack.h> +#include <tqscrollview.h> +#include <tqpainter.h> +#include <tqsimplerichtext.h> // KDE-includes #include <kmimetype.h> @@ -90,8 +90,8 @@ public: -K3bDirView::K3bDirView(K3bFileTreeView* treeView, QWidget *parent, const char *name ) - : QVBox(parent, name), +K3bDirView::K3bDirView(K3bFileTreeView* treeView, TQWidget *tqparent, const char *name ) + : TQVBox(tqparent, name), m_fileTreeView(treeView), m_bViewDiskInfo(false) { @@ -99,12 +99,12 @@ K3bDirView::K3bDirView(K3bFileTreeView* treeView, QWidget *parent, const char *n d->contextMediaInfoRequested = false; if( !m_fileTreeView ) { - m_mainSplitter = new QSplitter( this ); + m_mainSplitter = new TQSplitter( this ); m_fileTreeView = new K3bFileTreeView( m_mainSplitter ); - m_viewStack = new QWidgetStack( m_mainSplitter ); + m_viewStack = new TQWidgetStack( m_mainSplitter ); } else { - m_viewStack = new QWidgetStack( this ); + m_viewStack = new TQWidgetStack( this ); m_mainSplitter = 0; } @@ -128,31 +128,31 @@ K3bDirView::K3bDirView(K3bFileTreeView* treeView, QWidget *parent, const char *n if( m_mainSplitter ) { // split - QValueList<int> sizes = m_mainSplitter->sizes(); + TQValueList<int> sizes = m_mainSplitter->sizes(); int all = sizes[0] + sizes[1]; sizes[1] = all*2/3; sizes[0] = all - sizes[1]; m_mainSplitter->setSizes( sizes ); } - connect( m_fileTreeView, SIGNAL(urlExecuted(const KURL&)), - this, SLOT(slotDirActivated(const KURL&)) ); - connect( m_fileTreeView, SIGNAL(deviceExecuted(K3bDevice::Device*)), - this, SLOT(showDevice(K3bDevice::Device*)) ); - connect( m_fileTreeView, SIGNAL(deviceExecuted(K3bDevice::Device*)), - this, SIGNAL(deviceSelected(K3bDevice::Device*)) ); - connect( m_fileTreeView, SIGNAL(contextMenu(K3bDevice::Device*, const QPoint&)), - this, SLOT(slotFileTreeContextMenu(K3bDevice::Device*, const QPoint&)) ); - - connect( m_fileView, SIGNAL(urlEntered(const KURL&)), m_fileTreeView, SLOT(followUrl(const KURL&)) ); - connect( m_fileView, SIGNAL(urlEntered(const KURL&)), this, SIGNAL(urlEntered(const KURL&)) ); - - connect( k3bappcore->appDeviceManager(), SIGNAL(mountFinished(const QString&)), - this, SLOT(slotMountFinished(const QString&)) ); - connect( k3bappcore->appDeviceManager(), SIGNAL(unmountFinished(bool)), - this, SLOT(slotUnmountFinished(bool)) ); - connect( k3bappcore->appDeviceManager(), SIGNAL(detectingDiskInfo(K3bDevice::Device*)), - this, SLOT(slotDetectingDiskInfo(K3bDevice::Device*)) ); + connect( m_fileTreeView, TQT_SIGNAL(urlExecuted(const KURL&)), + this, TQT_SLOT(slotDirActivated(const KURL&)) ); + connect( m_fileTreeView, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), + this, TQT_SLOT(showDevice(K3bDevice::Device*)) ); + connect( m_fileTreeView, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), + this, TQT_SIGNAL(deviceSelected(K3bDevice::Device*)) ); + connect( m_fileTreeView, TQT_SIGNAL(contextMenu(K3bDevice::Device*, const TQPoint&)), + this, TQT_SLOT(slotFileTreeContextMenu(K3bDevice::Device*, const TQPoint&)) ); + + connect( m_fileView, TQT_SIGNAL(urlEntered(const KURL&)), m_fileTreeView, TQT_SLOT(followUrl(const KURL&)) ); + connect( m_fileView, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SIGNAL(urlEntered(const KURL&)) ); + + connect( k3bappcore->appDeviceManager(), TQT_SIGNAL(mountFinished(const TQString&)), + this, TQT_SLOT(slotMountFinished(const TQString&)) ); + connect( k3bappcore->appDeviceManager(), TQT_SIGNAL(unmountFinished(bool)), + this, TQT_SLOT(slotUnmountFinished(bool)) ); + connect( k3bappcore->appDeviceManager(), TQT_SIGNAL(detectingDiskInfo(K3bDevice::Device*)), + this, TQT_SLOT(slotDetectingDiskInfo(K3bDevice::Device*)) ); } K3bDirView::~K3bDirView() @@ -247,7 +247,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium ) else { if( KMessageBox::questionYesNo( this, i18n("Found %1. Do you want K3b to mount the data part " - "or show all the tracks?").arg( i18n("Video CD") ), + "or show all the tracks?").tqarg( i18n("Video CD") ), i18n("Video CD"), i18n("Mount CD"), i18n("Show Video Tracks") ) == KMessageBox::No ) { @@ -260,7 +260,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium ) else if( medium.content() & K3bMedium::CONTENT_AUDIO ) { if( KMessageBox::questionYesNo( this, i18n("Found %1. Do you want K3b to mount the data part " - "or show all the tracks?").arg( i18n("Audio CD") ), + "or show all the tracks?").tqarg( i18n("Audio CD") ), i18n("Audio CD"), i18n("Mount CD"), i18n("Show Audio Tracks") ) == KMessageBox::No ) { @@ -289,7 +289,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium ) } -void K3bDirView::slotMountFinished( const QString& mp ) +void K3bDirView::slotMountFinished( const TQString& mp ) { if( !mp.isEmpty() ) { slotDirActivated( mp ); @@ -298,9 +298,9 @@ void K3bDirView::slotMountFinished( const QString& mp ) else { m_viewStack->raiseWidget( m_fileView ); K3bPassivePopup::showPopup( i18n("<p>K3b was unable to mount medium <b>%1</b> in device <em>%2 - %3</em>") - .arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() ) - .arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() ) - .arg( k3bappcore->appDeviceManager()->currentDevice()->description() ), + .tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() ) + .tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() ) + .tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ), i18n("Mount Failed"), K3bPassivePopup::Warning ); } @@ -314,16 +314,16 @@ void K3bDirView::slotUnmountFinished( bool success ) } else { K3bPassivePopup::showPopup( i18n("<p>K3b was unable to unmount medium <b>%1</b> in device <em>%2 - %3</em>") - .arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() ) - .arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() ) - .arg( k3bappcore->appDeviceManager()->currentDevice()->description() ), + .tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() ) + .tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() ) + .tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ), i18n("Unmount Failed"), K3bPassivePopup::Warning ); } } -void K3bDirView::slotFileTreeContextMenu( K3bDevice::Device* /*dev*/, const QPoint& p ) +void K3bDirView::slotFileTreeContextMenu( K3bDevice::Device* /*dev*/, const TQPoint& p ) { KAction* a = k3bappcore->appDeviceManager()->actionCollection()->action( "device_popup" ); if( KActionMenu* m = dynamic_cast<KActionMenu*>(a) ) @@ -331,7 +331,7 @@ void K3bDirView::slotFileTreeContextMenu( K3bDevice::Device* /*dev*/, const QPoi } -void K3bDirView::slotDirActivated( const QString& url ) +void K3bDirView::slotDirActivated( const TQString& url ) { // m_urlCombo->insertItem( url, 0 ); slotDirActivated( KURL::fromPathOrURL(url) ); @@ -349,7 +349,7 @@ void K3bDirView::slotDirActivated( const KURL& url ) void K3bDirView::home() { - slotDirActivated( QDir::homeDirPath() ); + slotDirActivated( TQDir::homeDirPath() ); } diff --git a/src/k3bdirview.h b/src/k3bdirview.h index 7d4cdf0..e13899c 100644 --- a/src/k3bdirview.h +++ b/src/k3bdirview.h @@ -17,11 +17,11 @@ #ifndef K3BDIRVIEW_H #define K3BDIRVIEW_H -#include <qvbox.h> +#include <tqvbox.h> #include <k3bmedium.h> -class QSplitter; +class TQSplitter; class KURL; class K3bAudioCdView; class K3bVideoCdView; @@ -29,10 +29,10 @@ class K3bFileView; class K3bVideoDVDRippingView; class KComboBox; class K3bFileTreeView; -class QWidgetStack; +class TQWidgetStack; class K3bDiskInfoView; -class QScrollView; -class QLabel; +class TQScrollView; +class TQLabel; class KConfig; class K3bDeviceBranch; @@ -49,12 +49,13 @@ namespace KIO { /** *@author Sebastian Trueg */ -class K3bDirView : public QVBox +class K3bDirView : public TQVBox { Q_OBJECT + TQ_OBJECT public: - K3bDirView(K3bFileTreeView* tree, QWidget *parent=0, const char *name=0); + K3bDirView(K3bFileTreeView* tree, TQWidget *tqparent=0, const char *name=0); ~K3bDirView(); public slots: @@ -65,21 +66,21 @@ class K3bDirView : public QVBox protected slots: void slotDirActivated( const KURL& ); - void slotDirActivated( const QString& ); - void slotMountFinished( const QString& ); + void slotDirActivated( const TQString& ); + void slotMountFinished( const TQString& ); void slotUnmountFinished( bool ); void showMediumInfo( const K3bMedium& ); void slotDetectingDiskInfo( K3bDevice::Device* dev ); void home(); - void slotFileTreeContextMenu( K3bDevice::Device* dev, const QPoint& p ); + void slotFileTreeContextMenu( K3bDevice::Device* dev, const TQPoint& p ); signals: void urlEntered( const KURL& ); void deviceSelected( K3bDevice::Device* ); private: - QWidgetStack* m_viewStack; - QScrollView* m_scroll; + TQWidgetStack* m_viewStack; + TQScrollView* m_scroll; K3bAudioCdView* m_cdView; K3bVideoCdView* m_videoView; @@ -88,7 +89,7 @@ class K3bDirView : public QVBox K3bDiskInfoView* m_infoView; KComboBox* m_urlCombo; - QSplitter* m_mainSplitter; + TQSplitter* m_mainSplitter; K3bFileTreeView* m_fileTreeView; bool m_bViewDiskInfo; diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp index 4a1208f..bb32911 100644 --- a/src/k3bdiskinfoview.cpp +++ b/src/k3bdiskinfoview.cpp @@ -26,17 +26,17 @@ #include <k3blistview.h> #include <k3biso9660.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qfont.h> -#include <qcolor.h> -#include <qheader.h> -#include <qstring.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qregion.h> -#include <qframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqfont.h> +#include <tqcolor.h> +#include <tqheader.h> +#include <tqstring.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqregion.h> +#include <tqframe.h> #include <kdialog.h> #include <klocale.h> @@ -51,26 +51,26 @@ class K3bDiskInfoView::HeaderViewItem : public KListViewItem { public: - HeaderViewItem( QListView* parent ) - : KListViewItem( parent ) {} - HeaderViewItem( QListViewItem* parent ) - : KListViewItem( parent ) {} - HeaderViewItem( QListView* parent, QListViewItem* after ) - : KListViewItem( parent, after ) {} - HeaderViewItem( QListViewItem* parent, QListViewItem* after ) - : KListViewItem( parent, after ) {} - HeaderViewItem( QListView* parent, const QString& t1 ) - : KListViewItem( parent, t1 ) {} - HeaderViewItem( QListViewItem* parent, const QString& t1 ) - : KListViewItem( parent, t1 ) {} - HeaderViewItem( QListView* parent, QListViewItem* after, const QString& t1 ) - : KListViewItem( parent, after, t1 ) {} - HeaderViewItem( QListViewItem* parent, QListViewItem* after, const QString& t1 ) - : KListViewItem( parent, after, t1 ) {} - - void paintCell( QPainter* p, const QColorGroup & cg, int column, int width, int align ) + HeaderViewItem( TQListView* tqparent ) + : KListViewItem( tqparent ) {} + HeaderViewItem( TQListViewItem* tqparent ) + : KListViewItem( tqparent ) {} + HeaderViewItem( TQListView* tqparent, TQListViewItem* after ) + : KListViewItem( tqparent, after ) {} + HeaderViewItem( TQListViewItem* tqparent, TQListViewItem* after ) + : KListViewItem( tqparent, after ) {} + HeaderViewItem( TQListView* tqparent, const TQString& t1 ) + : KListViewItem( tqparent, t1 ) {} + HeaderViewItem( TQListViewItem* tqparent, const TQString& t1 ) + : KListViewItem( tqparent, t1 ) {} + HeaderViewItem( TQListView* tqparent, TQListViewItem* after, const TQString& t1 ) + : KListViewItem( tqparent, after, t1 ) {} + HeaderViewItem( TQListViewItem* tqparent, TQListViewItem* after, const TQString& t1 ) + : KListViewItem( tqparent, after, t1 ) {} + + void paintCell( TQPainter* p, const TQColorGroup & cg, int column, int width, int align ) { - QFont f ( p->font() ); + TQFont f ( p->font() ); f.setBold( true ); p->setFont( f ); KListViewItem::paintCell( p, cg, column, width, align ); @@ -81,24 +81,24 @@ public: class K3bDiskInfoView::TwoColumnViewItem : public KListViewItem { public: - TwoColumnViewItem( QListView* parent ) - : KListViewItem( parent ) {} - TwoColumnViewItem( QListViewItem* parent ) - : KListViewItem( parent ) {} - TwoColumnViewItem( QListView* parent, QListViewItem* after ) - : KListViewItem( parent, after ) {} - TwoColumnViewItem( QListViewItem* parent, QListViewItem* after ) - : KListViewItem( parent, after ) {} - TwoColumnViewItem( QListView* parent, const QString& t1 ) - : KListViewItem( parent, t1 ) {} - TwoColumnViewItem( QListViewItem* parent, const QString& t1 ) - : KListViewItem( parent, t1 ) {} - TwoColumnViewItem( QListView* parent, QListViewItem* after, const QString& t1 ) - : KListViewItem( parent, after, t1 ) {} - TwoColumnViewItem( QListViewItem* parent, QListViewItem* after, const QString& t1 ) - : KListViewItem( parent, after, t1 ) {} - - void paintCell( QPainter* p, const QColorGroup & cg, int column, int width, int align ) + TwoColumnViewItem( TQListView* tqparent ) + : KListViewItem( tqparent ) {} + TwoColumnViewItem( TQListViewItem* tqparent ) + : KListViewItem( tqparent ) {} + TwoColumnViewItem( TQListView* tqparent, TQListViewItem* after ) + : KListViewItem( tqparent, after ) {} + TwoColumnViewItem( TQListViewItem* tqparent, TQListViewItem* after ) + : KListViewItem( tqparent, after ) {} + TwoColumnViewItem( TQListView* tqparent, const TQString& t1 ) + : KListViewItem( tqparent, t1 ) {} + TwoColumnViewItem( TQListViewItem* tqparent, const TQString& t1 ) + : KListViewItem( tqparent, t1 ) {} + TwoColumnViewItem( TQListView* tqparent, TQListViewItem* after, const TQString& t1 ) + : KListViewItem( tqparent, after, t1 ) {} + TwoColumnViewItem( TQListViewItem* tqparent, TQListViewItem* after, const TQString& t1 ) + : KListViewItem( tqparent, after, t1 ) {} + + void paintCell( TQPainter* p, const TQColorGroup & cg, int column, int width, int align ) { if( column == 1 ) { @@ -111,7 +111,7 @@ public: // TODO: find a way to get the TRUE new width after resizing - // QRect r = p->clipRegion().boundingRect(); + // TQRect r = p->clipRegion().boundingRect(); // r.setWidth( newWidth ); // p->setClipRect( r ); p->setClipping( false ); @@ -124,21 +124,21 @@ public: -K3bDiskInfoView::K3bDiskInfoView( QWidget* parent, const char* name ) +K3bDiskInfoView::K3bDiskInfoView( TQWidget* tqparent, const char* name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_ALL, K3bDevice::MEDIA_ALL|K3bDevice::MEDIA_UNKNOWN, K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE|K3bDevice::STATE_UNKNOWN, - parent, name ) + tqparent, name ) { m_infoView = new KListView( this ); setMainWidget( m_infoView ); m_infoView->setSorting( -1 ); m_infoView->setAllColumnsShowFocus( true ); - m_infoView->setSelectionMode( QListView::NoSelection ); + m_infoView->setSelectionMode( TQListView::NoSelection ); m_infoView->setResizeMode( KListView::AllColumns ); - m_infoView->setAlternateBackground( QColor() ); + m_infoView->setAlternateBackground( TQColor() ); m_infoView->addColumn( "1" ); m_infoView->addColumn( "2" ); @@ -166,7 +166,7 @@ void K3bDiskInfoView::reloadMedium() setTitle( medium().shortString( true ) ); if( medium().diskInfo().diskState() == K3bDevice::STATE_NO_MEDIA ) { - (void)new QListViewItem( m_infoView, i18n("No medium present") ); + (void)new TQListViewItem( m_infoView, i18n("No medium present") ); setRightPixmap( K3bTheme::MEDIA_NONE ); } else { @@ -231,7 +231,7 @@ void K3bDiskInfoView::reloadMedium() // if we have multiple sessions we create a header item for every session KListViewItem* trackItem = 0; if( medium().diskInfo().numSessions() > 1 && medium().toc()[0].session() > 0 ) { - trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").arg(1) ); + trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").tqarg(1) ); lastSession = 1; } else @@ -247,12 +247,12 @@ void K3bDiskInfoView::reloadMedium() lastSession = track.session(); trackItem->setOpen(true); trackItem = new HeaderViewItem( trackHeaderItem, - m_infoView->lastItem()->parent(), - i18n("Session %1").arg(lastSession) ); + m_infoView->lastItem()->tqparent(), + i18n("Session %1").tqarg(lastSession) ); } item = new KListViewItem( trackItem, item ); - QString text; + TQString text; if( track.type() == K3bTrack::AUDIO ) { item->setPixmap( 0, SmallIcon( "sound" ) ); text = i18n("Audio"); @@ -269,21 +269,21 @@ void K3bDiskInfoView::reloadMedium() else text = i18n("Data"); } - item->setText( 0, i18n("%1 (%2)").arg( QString::number(index).rightJustify( 2, ' ' )).arg(text) ); - item->setText( 1, QString( "%1/%2" ) - .arg( track.copyPermitted() ? i18n("copy") : i18n("no copy") ) - .arg( track.type() == K3bTrack::AUDIO + item->setText( 0, i18n("%1 (%2)").tqarg( TQString::number(index).rightJustify( 2, ' ' )).tqarg(text) ); + item->setText( 1, TQString( "%1/%2" ) + .tqarg( track.copyPermitted() ? i18n("copy") : i18n("no copy") ) + .tqarg( track.type() == K3bTrack::AUDIO ? ( track.preEmphasis() ? i18n("preemp") : i18n("no preemp") ) : ( track.recordedIncremental() ? i18n("incremental") : i18n("uninterrupted") ) ) ); item->setText( 2, - QString("%1 - %2") - .arg(track.firstSector().lba()) - .arg(track.lastSector().lba()) ); - item->setText( 3, QString::number( track.length().lba() ) + " (" + track.length().toString() + ")" ); + TQString("%1 - %2") + .tqarg(track.firstSector().lba()) + .tqarg(track.lastSector().lba()) ); + item->setText( 3, TQString::number( track.length().lba() ) + " (" + track.length().toString() + ")" ); #ifdef K3B_DEBUG if( track.type() == K3bTrack::AUDIO ) - item->setText( 4, QString( "%1 (%2)" ).arg(track.index0().toString()).arg(track.index0().lba()) ); + item->setText( 4, TQString( "%1 (%2)" ).tqarg(track.index0().toString()).tqarg(track.index0().lba()) ); #endif ++index; } @@ -320,7 +320,7 @@ void K3bDiskInfoView::reloadMedium() int index = 1; for( unsigned int i = 0; i < medium().cdText().count(); ++i ) { item = new KListViewItem( cdTextHeaderItem, item ); - item->setText( 0, QString::number(index).rightJustify( 2, ' ' ) + " " + + item->setText( 0, TQString::number(index).rightJustify( 2, ' ' ) + " " + medium().cdText().at(i).performer() ); item->setText( 1, medium().cdText().at(i).title() ); item->setText( 2, medium().cdText().at(i).songwriter() ); @@ -339,7 +339,7 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium ) const K3bDevice::DiskInfo& info = medium.diskInfo(); KListViewItem* atipItem = new HeaderViewItem( m_infoView, m_infoView->lastItem(), i18n("Medium") ); - QString typeStr; + TQString typeStr; if( info.mediaType() != K3bDevice::MEDIA_UNKNOWN ) typeStr = K3bDevice::mediaTypeString( info.mediaType() ); else @@ -350,24 +350,24 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium ) if( info.isDvdMedia() ) atipChild = new KListViewItem( atipItem, atipChild, i18n("Media ID:"), - !info.mediaId().isEmpty() ? QString::fromLatin1( info.mediaId() ) : i18n("unknown") ); + !info.mediaId().isEmpty() ? TQString::tqfromLatin1( info.mediaId() ) : i18n("unknown") ); atipChild = new KListViewItem( atipItem, atipChild, i18n("Capacity:"), - i18n("%1 min").arg(info.capacity().toString()), + i18n("%1 min").tqarg(info.capacity().toString()), KIO::convertSize(info.capacity().mode1Bytes()) ); if( !info.empty() ) atipChild = new KListViewItem( atipItem, atipChild, i18n("Used Capacity:"), - i18n("%1 min").arg(info.size().toString()), + i18n("%1 min").tqarg(info.size().toString()), KIO::convertSize(info.size().mode1Bytes()) ); if( info.appendable() ) atipChild = new KListViewItem( atipItem, atipChild, i18n("Remaining:"), - i18n("%1 min").arg( info.remainingSize().toString() ), + i18n("%1 min").tqarg( info.remainingSize().toString() ), KIO::convertSize(info.remainingSize().mode1Bytes()) ); atipChild = new KListViewItem( atipItem, atipChild, @@ -385,7 +385,7 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium ) if( info.isDvdMedia() ) atipChild = new KListViewItem( atipItem, atipChild, i18n("Layers:"), - QString::number( info.numLayers() ) ); + TQString::number( info.numLayers() ) ); if( info.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) { atipChild = new KListViewItem( atipItem, atipChild, @@ -408,16 +408,16 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium ) atipChild = new KListViewItem( atipItem, atipChild, i18n("Sessions:"), - QString::number( info.numSessions() ) ); + TQString::number( info.numSessions() ) ); if( info.mediaType() & K3bDevice::MEDIA_WRITABLE ) { atipChild = new KListViewItem( atipItem, atipChild, i18n("Supported writing speeds:") ); - QString s; + TQString s; if( medium.writingSpeeds().isEmpty() ) s = "-"; else - for( QValueList<int>::const_iterator it = medium.writingSpeeds().begin(); + for( TQValueList<int>::const_iterator it = medium.writingSpeeds().begin(); it != medium.writingSpeeds().end(); ++it ) { if( !s.isEmpty() ) { s.append( "\n" ); @@ -425,9 +425,9 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium ) } if( info.isDvdMedia() ) - s.append( QString().sprintf( "%.1fx (%d KB/s)", (double)*it / 1385.0, *it ) ); + s.append( TQString().sprintf( "%.1fx (%d KB/s)", (double)*it / 1385.0, *it ) ); else - s.append( QString( "%1x (%2 KB/s)" ).arg( *it/175 ).arg( *it ) ); + s.append( TQString( "%1x (%2 KB/s)" ).tqarg( *it/175 ).tqarg( *it ) ); } atipChild->setText( 1, s ); @@ -446,40 +446,40 @@ void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescr iso9660Child = new KListViewItem( iso9660Item, iso9660Child, i18n("System Id:"), iso.systemId.isEmpty() - ? QString("-") + ? TQString("-") : iso.systemId ); iso9660Child = new KListViewItem( iso9660Item, iso9660Child, i18n("Volume Id:"), iso.volumeId.isEmpty() - ? QString("-") + ? TQString("-") : iso.volumeId ); iso9660Child = new KListViewItem( iso9660Item, iso9660Child, i18n("Volume Set Id:"), iso.volumeSetId.isEmpty() - ? QString("-") + ? TQString("-") : iso.volumeSetId ); iso9660Child = new KListViewItem( iso9660Item, iso9660Child, i18n("Publisher Id:"), iso.publisherId.isEmpty() - ? QString("-") + ? TQString("-") : iso.publisherId ); iso9660Child = new KListViewItem( iso9660Item, iso9660Child, i18n("Preparer Id:"), iso.preparerId.isEmpty() - ? QString("-") + ? TQString("-") : iso.preparerId ); iso9660Child = new KListViewItem( iso9660Item, iso9660Child, i18n("Application Id:"), iso.applicationId.isEmpty() - ? QString("-") + ? TQString("-") : iso.applicationId ); // iso9660Child = new KListViewItem( iso9660Item, iso9660Child, // i18n("Volume Size:"), -// QString( "%1 (%2*%3)" ) -// .arg(iso.logicalBlockSize +// TQString( "%1 (%2*%3)" ) +// .tqarg(iso.logicalBlockSize // *iso.volumeSpaceSize) -// .arg(iso.logicalBlockSize) -// .arg(iso.volumeSpaceSize), +// .tqarg(iso.logicalBlockSize) +// .tqarg(iso.volumeSpaceSize), // KIO::convertSize(iso.logicalBlockSize // *iso.volumeSpaceSize) ); @@ -489,7 +489,7 @@ void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescr void K3bDiskInfoView::enableInteraction( bool enable ) { - QListViewItemIterator it( m_infoView ); + TQListViewItemIterator it( m_infoView ); while( it.current() ) { it.current()->setEnabled( enable ); ++it; diff --git a/src/k3bdiskinfoview.h b/src/k3bdiskinfoview.h index 7c817a7..d5cf3a8 100644 --- a/src/k3bdiskinfoview.h +++ b/src/k3bdiskinfoview.h @@ -21,7 +21,7 @@ #include "k3bmediacontentsview.h" #include "k3bmedium.h" -class QLabel; +class TQLabel; class KListView; class K3bIso9660; @@ -33,9 +33,10 @@ namespace K3bDevice { class K3bDiskInfoView : public K3bMediaContentsView { Q_OBJECT + TQ_OBJECT public: - K3bDiskInfoView( QWidget* parent = 0, const char* name = 0 ); + K3bDiskInfoView( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDiskInfoView(); void enableInteraction( bool enable ); diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index 7e11198..9fc0f06 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -28,14 +28,14 @@ #include <k3bprogressdialog.h> #include <k3bdvdformattingjob.h> -#include <qtimer.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qpushbutton.h> -#include <qapplication.h> -#include <qeventloop.h> -#include <qfont.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqpushbutton.h> +#include <tqapplication.h> +#include <tqeventloop.h> +#include <tqfont.h> #include <klocale.h> #include <kconfig.h> @@ -61,7 +61,7 @@ public: int wantedMediaType; int wantedMediaState; - QString wantedMediaTypeString; + TQString wantedMediaTypeString; int result; int dialogVisible; @@ -75,52 +75,52 @@ public: bool waitingDone; - QLabel* labelRequest; - QLabel* labelFoundMedia; - QLabel* pixLabel; + TQLabel* labelRequest; + TQLabel* labelFoundMedia; + TQLabel* pixLabel; K3bProgressDialog* erasingInfoDialog; }; -K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, QWidget* parent, const char* name ) +K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("Waiting for Disk"), KDialogBase::Cancel|KDialogBase::User1|KDialogBase::User2|KDialogBase::User3, - KDialogBase::User3, parent, name, true, true, i18n("Force"), i18n("Eject"), i18n("Load") ) + KDialogBase::User3, tqparent, name, true, true, i18n("Force"), i18n("Eject"), i18n("Load") ) { d = new Private(); d->device = device; // setup the gui // ----------------------------- - d->labelRequest = new QLabel( plainPage() ); - d->labelRequest->setAlignment( Qt::AlignLeft | Qt::AlignVCenter ); - d->labelFoundMedia = new QLabel( plainPage() ); - d->pixLabel = new QLabel( plainPage() ); - d->pixLabel->setAlignment( Qt::AlignHCenter | Qt::AlignTop ); + d->labelRequest = new TQLabel( plainPage() ); + d->labelRequest->tqsetAlignment( TQt::AlignLeft | TQt::AlignVCenter ); + d->labelFoundMedia = new TQLabel( plainPage() ); + d->pixLabel = new TQLabel( plainPage() ); + d->pixLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop ); - QFont f( d->labelFoundMedia->font() ); + TQFont f( d->labelFoundMedia->font() ); f.setBold(true); d->labelFoundMedia->setFont( f ); - QGridLayout* grid = new QGridLayout( plainPage() ); + TQGridLayout* grid = new TQGridLayout( plainPage() ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); grid->addMultiCellWidget( d->pixLabel, 0, 2, 0, 0 ); grid->addColSpacing( 1, 20 ); - grid->addWidget( new QLabel( i18n("Found media:"), plainPage() ), 0, 2 ); + grid->addWidget( new TQLabel( i18n("Found media:"), plainPage() ), 0, 2 ); grid->addWidget( d->labelFoundMedia, 0, 3 ); grid->addMultiCellWidget( d->labelRequest, 1, 1, 2, 3 ); grid->setRowStretch( 2, 1 ); grid->setColStretch( 3, 1 ); // ----------------------------- - connect( k3bappcore->mediaCache(), SIGNAL(mediumChanged(K3bDevice::Device*)), - this, SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); - QToolTip::add( actionButton(KDialogBase::User1), + TQToolTip::add( actionButton(KDialogBase::User1), i18n("Force K3b to continue if it seems not to detect your empty CD/DVD.") ); } @@ -131,7 +131,7 @@ K3bEmptyDiscWaiter::~K3bEmptyDiscWaiter() } -int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const QString& message ) +int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQString& message ) { if ( d->inLoop ) { kdError() << "(K3bEmptyDiscWaiter) Recursive call detected." << endl; @@ -152,11 +152,11 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const QStrin // if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) && (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) ) - d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("±"); + d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").tqarg("�"); else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL ) - d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("±"); + d->wantedMediaTypeString = i18n("DVD%1R(W)").tqarg("�"); else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL ) - d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("±"); + d->wantedMediaTypeString = i18n("Double Layer DVD%1R").tqarg("�"); else d->wantedMediaTypeString = i18n("CD-R(W)"); @@ -164,44 +164,44 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const QStrin if( (d->wantedMediaState & K3bDevice::STATE_COMPLETE) && (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) ) d->labelRequest->setText( i18n("Please insert a complete or appendable %4 medium " "into drive<p><b>%1 %2 (%3)</b>.") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else if( d->wantedMediaState & K3bDevice::STATE_COMPLETE ) d->labelRequest->setText( i18n("Please insert a complete %4 medium " "into drive<p><b>%1 %2 (%3)</b>.") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else if( (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) && (d->wantedMediaState & K3bDevice::STATE_EMPTY) ) d->labelRequest->setText( i18n("Please insert an empty or appendable %4 medium " "into drive<p><b>%1 %2 (%3)</b>.") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else if( d->wantedMediaState & K3bDevice::STATE_INCOMPLETE ) d->labelRequest->setText( i18n("Please insert an appendable %4 medium " "into drive<p><b>%1 %2 (%3)</b>.") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else if( d->wantedMediaState & K3bDevice::STATE_EMPTY ) d->labelRequest->setText( i18n("Please insert an empty %4 medium " "into drive<p><b>%1 %2 (%3)</b>.") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else // fallback case (this should not happen in K3b) d->labelRequest->setText( i18n("Please insert a suitable medium " "into drive<p><b>%1 %2 (%3)</b>.") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) ); } else @@ -225,7 +225,7 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const QStrin // if( !d->waitingDone ) { d->inLoop = true; - QApplication::eventLoop()->enterLoop(); + TQApplication::eventLoop()->enterLoop(); } return d->result; @@ -269,7 +269,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) return; } -// QString mediaState; +// TQString mediaState; // if( medium.diskInfo().diskState() == K3bDevice::STATE_COMPLETE ) // mediaState = i18n("complete"); // else if( medium.diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) @@ -314,9 +314,9 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) job.setForceNoEject( true ); d->erasingInfoDialog->setText( i18n("Preformatting DVD+RW") ); - connect( &job, SIGNAL(finished(bool)), this, SLOT(slotErasingFinished(bool)) ); - connect( &job, SIGNAL(percent(int)), d->erasingInfoDialog, SLOT(setProgress(int)) ); - connect( d->erasingInfoDialog, SIGNAL(cancelClicked()), &job, SLOT(cancel()) ); + connect( &job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotErasingFinished(bool)) ); + connect( &job, TQT_SIGNAL(percent(int)), d->erasingInfoDialog, TQT_SLOT(setProgress(int)) ); + connect( d->erasingInfoDialog, TQT_SIGNAL(cancelClicked()), &job, TQT_SLOT(cancel()) ); job.start( medium.diskInfo() ); d->erasingInfoDialog->exec( true ); } @@ -337,13 +337,13 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) if( formatWithoutAsking || !hasIso || - KMessageBox::warningContinueCancel( parentWidgetToUse(), + KMessageBox::warningContinueCancel( tqparentWidgetToUse(), i18n("Found %1 media in %2 - %3. " "Should it be overwritten?") - .arg("DVD+RW") - .arg(d->device->vendor()) - .arg(d->device->description()), - i18n("Found %1").arg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { + .tqarg("DVD+RW") + .tqarg(d->device->vendor()) + .tqarg(d->device->description()), + i18n("Found %1").tqarg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { finishWaiting( K3bDevice::MEDIA_DVD_PLUS_RW ); } else { @@ -407,13 +407,13 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) if( formatWithoutAsking || !hasIso || - KMessageBox::warningContinueCancel( parentWidgetToUse(), + KMessageBox::warningContinueCancel( tqparentWidgetToUse(), i18n("Found %1 media in %2 - %3. " "Should it be overwritten?") - .arg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType())) - .arg(d->device->vendor()) - .arg(d->device->description()), - i18n("Found %1").arg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { + .tqarg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType())) + .tqarg(d->device->vendor()) + .tqarg(d->device->description()), + i18n("Found %1").tqarg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { finishWaiting( K3bDevice::MEDIA_DVD_RW_OVWR ); } else { @@ -464,13 +464,13 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) kdDebug() << "(K3bEmptyDiscWaiter) ------ DVD-RW needs to be formated." << endl; if( formatWithoutAsking || - KMessageBox::warningContinueCancel( parentWidgetToUse(), + KMessageBox::warningContinueCancel( tqparentWidgetToUse(), i18n("Found %1 media in %2 - %3. " "Should it be formatted?") - .arg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) ) - .arg(d->device->vendor()) - .arg(d->device->description()), - i18n("Found %1").arg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) { + .tqarg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) ) + .tqarg(d->device->vendor()) + .tqarg(d->device->description()), + i18n("Found %1").tqarg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) { kdDebug() << "(K3bEmptyDiscWaiter) ------ formatting DVD-RW." << endl; @@ -492,9 +492,9 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) job.setForceNoEject(true); d->erasingInfoDialog->setText( i18n("Formatting DVD-RW") ); - connect( &job, SIGNAL(finished(bool)), this, SLOT(slotErasingFinished(bool)) ); - connect( &job, SIGNAL(percent(int)), d->erasingInfoDialog, SLOT(setProgress(int)) ); - connect( d->erasingInfoDialog, SIGNAL(cancelClicked()), &job, SLOT(cancel()) ); + connect( &job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotErasingFinished(bool)) ); + connect( &job, TQT_SIGNAL(percent(int)), d->erasingInfoDialog, TQT_SLOT(setProgress(int)) ); + connect( d->erasingInfoDialog, TQT_SIGNAL(cancelClicked()), &job, TQT_SLOT(cancel()) ); job.start( medium.diskInfo() ); d->erasingInfoDialog->exec( true ); } @@ -540,9 +540,9 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) medium.diskInfo().rewritable() ) { if( formatWithoutAsking || - KMessageBox::questionYesNo( parentWidgetToUse(), + KMessageBox::questionYesNo( tqparentWidgetToUse(), i18n("Found rewritable media in %1 - %2. " - "Should it be erased?").arg(d->device->vendor()).arg(d->device->description()), + "Should it be erased?").tqarg(d->device->vendor()).tqarg(d->device->description()), i18n("Found Rewritable Disk"), KGuiItem(i18n("&Erase"), "cdrwblank"), KGuiItem(i18n("E&ject")) ) == KMessageBox::Yes ) { @@ -566,8 +566,8 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) job.setForceNoEject(true); job.setSpeed( 0 ); // Auto job.setWritingApp( erasingApp ); - connect( &job, SIGNAL(finished(bool)), this, SLOT(slotErasingFinished(bool)) ); - connect( d->erasingInfoDialog, SIGNAL(cancelClicked()), &job, SLOT(cancel()) ); + connect( &job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotErasingFinished(bool)) ); + connect( d->erasingInfoDialog, TQT_SIGNAL(cancelClicked()), &job, TQT_SLOT(cancel()) ); job.start(); d->erasingInfoDialog->exec( false ); } @@ -655,7 +655,7 @@ void K3bEmptyDiscWaiter::finishWaiting( int code ) if( d->inLoop ) { d->inLoop = false; kdDebug() << "(K3bEmptyDiscWaiter) exitLoop " << endl; - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); } } @@ -664,9 +664,9 @@ void K3bEmptyDiscWaiter::slotErasingFinished( bool success ) { if( success ) { connect( K3bDevice::reload( d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotReloadingAfterErasingFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotReloadingAfterErasingFinished(K3bDevice::DeviceHandler*)) ); } else { K3bDevice::eject( d->device ); @@ -683,9 +683,9 @@ void K3bEmptyDiscWaiter::slotReloadingAfterErasingFinished( K3bDevice::DeviceHan } -int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, bool appendable, int mediaType, QWidget* parent ) +int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, bool appendable, int mediaType, TQWidget* tqparent ) { - K3bEmptyDiscWaiter d( device, parent ? parent : qApp->activeWindow() ); + K3bEmptyDiscWaiter d( device, tqparent ? tqparent : TQT_TQWIDGET(tqApp->activeWindow()) ); int mediaState = K3bDevice::STATE_EMPTY; if( appendable ) mediaState |= K3bDevice::STATE_INCOMPLETE; return d.waitForDisc( mediaState, mediaType ); @@ -695,19 +695,19 @@ int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, bool appendable, int me int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, int mediaState, int mediaType, - const QString& message, - QWidget* parent ) + const TQString& message, + TQWidget* tqparent ) { - K3bEmptyDiscWaiter d( device, parent ? parent : qApp->activeWindow() ); + K3bEmptyDiscWaiter d( device, tqparent ? tqparent : TQT_TQWIDGET(tqApp->activeWindow()) ); return d.waitForDisc( mediaState, mediaType, message ); } void K3bEmptyDiscWaiter::prepareErasingDialog() { - // we hide the emptydiskwaiter so the info dialog needs to have the same parent + // we hide the emptydiskwaiter so the info dialog needs to have the same tqparent if( !d->erasingInfoDialog ) - d->erasingInfoDialog = new K3bProgressDialog( QString::null, parentWidget() ); + d->erasingInfoDialog = new K3bProgressDialog( TQString(), tqparentWidget() ); // // hide the dialog @@ -719,32 +719,32 @@ void K3bEmptyDiscWaiter::prepareErasingDialog() } -QWidget* K3bEmptyDiscWaiter::parentWidgetToUse() +TQWidget* K3bEmptyDiscWaiter::tqparentWidgetToUse() { // we might also show dialogs if the discwaiter widget is not visible yet if( d->dialogVisible ) return this; else - return parentWidget(); + return tqparentWidget(); } int K3bEmptyDiscWaiter::waitForMedia( K3bDevice::Device* device, int mediaState, int mediaType, - const QString& message ) + const TQString& message ) { // this is only needed for the formatting return wait( device, mediaState, mediaType, message, d->erasingInfoDialog ); } -bool K3bEmptyDiscWaiter::questionYesNo( const QString& text, - const QString& caption, - const QString& yesText, - const QString& noText ) +bool K3bEmptyDiscWaiter::questionYesNo( const TQString& text, + const TQString& caption, + const TQString& yesText, + const TQString& noText ) { - return ( KMessageBox::questionYesNo( parentWidgetToUse(), + return ( KMessageBox::questionYesNo( tqparentWidgetToUse(), text, caption, yesText.isEmpty() ? KStdGuiItem::yes() : KGuiItem(yesText), @@ -752,8 +752,8 @@ bool K3bEmptyDiscWaiter::questionYesNo( const QString& text, } -void K3bEmptyDiscWaiter::blockingInformation( const QString& text, - const QString& caption ) +void K3bEmptyDiscWaiter::blockingInformation( const TQString& text, + const TQString& caption ) { KMessageBox::information( this, text, caption ); } diff --git a/src/k3bemptydiscwaiter.h b/src/k3bemptydiscwaiter.h index ce3bced..79a8674 100644 --- a/src/k3bemptydiscwaiter.h +++ b/src/k3bemptydiscwaiter.h @@ -38,6 +38,7 @@ namespace K3bDevice { class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler { Q_OBJECT + TQ_OBJECT public: ~K3bEmptyDiscWaiter(); @@ -61,21 +62,21 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler int waitForMedia( K3bDevice::Device*, int mediaState = K3bDevice::STATE_EMPTY, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - const QString& message = QString::null ); + const TQString& message = TQString() ); /** * @reimplemented from K3bJobHandler */ - bool questionYesNo( const QString& text, - const QString& caption = QString::null, - const QString& yesText = QString::null, - const QString& noText = QString::null ); + bool questionYesNo( const TQString& text, + const TQString& caption = TQString(), + const TQString& yesText = TQString(), + const TQString& noText = TQString() ); /** * reimplemented from K3bJobHandler */ - void blockingInformation( const QString& text, - const QString& caption = QString::null ); + void blockingInformation( const TQString& text, + const TQString& caption = TQString() ); /** * This only openes a dialog if the first check failed. @@ -83,7 +84,7 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler static int wait( K3bDevice::Device* device, bool appendable = false, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - QWidget* parent = 0 ); + TQWidget* tqparent = 0 ); /** * Starts the emptydiskwaiter. @@ -95,8 +96,8 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler static int wait( K3bDevice::Device*, int mediaState, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - const QString& message = QString::null, - QWidget* parent = 0 ); + const TQString& message = TQString(), + TQWidget* tqparent = 0 ); protected slots: void slotCancel(); @@ -113,23 +114,23 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler /** * Use the static wait methods. */ - explicit K3bEmptyDiscWaiter( K3bDevice::Device* device, QWidget* parent = 0, const char* name = 0 ); + explicit K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* tqparent = 0, const char* name = 0 ); int waitForDisc( int mediaState = K3bDevice::STATE_EMPTY, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - const QString& message = QString::null ); + const TQString& message = TQString() ); /** * Nobody closes this dialog but itself! */ - void closeEvent( QCloseEvent* ) {} + void closeEvent( TQCloseEvent* ) {} private: void finishWaiting( int ); void prepareErasingDialog(); - QWidget* parentWidgetToUse(); + TQWidget* tqparentWidgetToUse(); class Private; Private* d; diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp index ce9b6b7..3710d25 100644 --- a/src/k3bfiletreecombobox.cpp +++ b/src/k3bfiletreecombobox.cpp @@ -22,16 +22,16 @@ #include <k3bcore.h> #include <k3bglobals.h> -#include <qrect.h> -#include <qapplication.h> -#include <qstyle.h> -#include <qlistbox.h> -#include <qheader.h> -#include <qevent.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qdrawutil.h> -#include <qdir.h> +#include <tqrect.h> +#include <tqapplication.h> +#include <tqstyle.h> +#include <tqlistbox.h> +#include <tqheader.h> +#include <tqevent.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqdrawutil.h> +#include <tqdir.h> #include <kdebug.h> #include <kiconloader.h> @@ -53,8 +53,8 @@ public: }; -K3bFileTreeComboBox::K3bFileTreeComboBox( QWidget* parent, const char* name ) - : KComboBox( true, parent, name ) +K3bFileTreeComboBox::K3bFileTreeComboBox( TQWidget* tqparent, const char* name ) + : KComboBox( true, tqparent, name ) { d = new Private; @@ -63,23 +63,23 @@ K3bFileTreeComboBox::K3bFileTreeComboBox( QWidget* parent, const char* name ) m_fileTreeView = new K3bFileTreeView( this ); m_fileTreeView->hide(); - m_fileTreeView->reparent( this, WType_Popup, QPoint(0,0), false ); + m_fileTreeView->reparent( this, WType_Popup, TQPoint(0,0), false ); m_fileTreeView->header()->hide(); m_fileTreeView->installEventFilter(this); m_fileTreeView->addDefaultBranches(); m_fileTreeView->addCdDeviceBranches( k3bcore->deviceManager() ); - // HACK! Why the hell is QComboBox that closed??? + // HACK! Why the hell is TQComboBox that closed??? listBox()->insertItem( "HACK" ); - connect( m_fileTreeView, SIGNAL(deviceExecuted(K3bDevice::Device*)), - this, SLOT(slotDeviceExecuted(K3bDevice::Device*)) ); - connect( m_fileTreeView, SIGNAL(urlExecuted(const KURL&)), - this, SLOT(slotUrlExecuted(const KURL&)) ); + connect( m_fileTreeView, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), + this, TQT_SLOT(slotDeviceExecuted(K3bDevice::Device*)) ); + connect( m_fileTreeView, TQT_SIGNAL(urlExecuted(const KURL&)), + this, TQT_SLOT(slotUrlExecuted(const KURL&)) ); - connect( lineEdit(), SIGNAL(returnPressed()), - this, SLOT(slotGoUrl()) ); + connect( lineEdit(), TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(slotGoUrl()) ); // TODO: subclass KURLCompletition to support the dev:/ stuff and block any non-local urls } @@ -120,9 +120,9 @@ void K3bFileTreeComboBox::setDevice( K3bDevice::Device* dev ) } -void K3bFileTreeComboBox::setEditText( const QPixmap& pix, const QString& t ) +void K3bFileTreeComboBox::setEditText( const TQPixmap& pix, const TQString& t ) { - // QComboBox::changeItem() doesn't honor the pixmap when + // TQComboBox::changeItem() doesn't honor the pixmap when // using an editable combobox, so we just remove and insert setUpdatesEnabled( false ); @@ -144,7 +144,7 @@ void K3bFileTreeComboBox::setCurrentItem( int ) } -void K3bFileTreeComboBox::setCurrentText( const QString& ) +void K3bFileTreeComboBox::setCurrentText( const TQString& ) { } @@ -154,15 +154,15 @@ void K3bFileTreeComboBox::popup() // code mainly from qcombobox.cpp m_fileTreeView->triggerUpdate(); - int w = QMAX( m_fileTreeView->sizeHint().width(), width() ); - int h = m_fileTreeView->sizeHint().height(); - QRect screen = QApplication::desktop()->availableGeometry( this ); + int w = TQMAX( m_fileTreeView->tqsizeHint().width(), width() ); + int h = m_fileTreeView->tqsizeHint().height(); + TQRect screen = TQApplication::desktop()->availableGeometry( this ); int sx = screen.x(); // screen pos int sy = screen.y(); int sw = screen.width(); // screen width int sh = screen.height(); // screen height - QPoint pos = mapToGlobal( QPoint(0,height()) ); - // ## Similar code is in QPopupMenu + TQPoint pos = mapToGlobal( TQPoint(0,height()) ); + // ## Similar code is in TQPopupMenu int x = pos.x(); int y = pos.y(); @@ -174,10 +174,10 @@ void K3bFileTreeComboBox::popup() if (y + h > sy+sh && y - h - height() >= 0 ) y = y - h - height(); - QRect rect = - style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxListBoxPopup, - QStyleOption( x, y, w, h ) ); + TQRect rect = + tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxListBoxPopup, + TQStyleOption( x, y, w, h ) ); // work around older styles that don't implement the combobox // listbox popup subcontrol if ( rect.isNull() ) @@ -198,13 +198,13 @@ void K3bFileTreeComboBox::popdown() { m_fileTreeView->hide(); d->poppedUp = false; - repaint(); // repaint the arrow + tqrepaint(); // tqrepaint the arrow } void K3bFileTreeComboBox::slotGoUrl() { - QString p = currentText(); + TQString p = currentText(); // check for a media url or a device string if( K3bDevice::Device* dev = K3b::urlToDevice( p ) ) { @@ -213,10 +213,10 @@ void K3bFileTreeComboBox::slotGoUrl() } // check for our own internal format - else if( p.contains("/dev/") ) { - int pos1 = p.findRev('('); - int pos2 = p.findRev(')'); - QString devStr = p.mid( pos1+1, pos2-pos1-1 ); + else if( p.tqcontains("/dev/") ) { + int pos1 = p.tqfindRev('('); + int pos2 = p.tqfindRev(')'); + TQString devStr = p.mid( pos1+1, pos2-pos1-1 ); if( K3bDevice::Device* dev = k3bcore->deviceManager()->findDevice( devStr ) ) { emit deviceExecuted( dev ); return; @@ -234,18 +234,18 @@ void K3bFileTreeComboBox::slotGoUrl() // TODO: move this to k3bglobals // to expand another user's home dir we need a tilde followed by a user name - static QRegExp someUsersHomeDir( "\\~([^/]+)" ); + static TQRegExp someUsersHomeDir( "\\~([^/]+)" ); int pos = 0; while( ( pos = someUsersHomeDir.search( p, pos ) ) != -1 ) { KUser user( someUsersHomeDir.cap(1) ); if( user.isValid() ) - p.replace( pos, someUsersHomeDir.cap(1).length() + 1, user.homeDir() ); + p.tqreplace( pos, someUsersHomeDir.cap(1).length() + 1, user.homeDir() ); else ++pos; // skip this ~ } // now replace the unmatched tildes with our home dir - p.replace( "~", K3b::prepareDir( QDir::homeDirPath() ) ); + p.tqreplace( "~", K3b::prepareDir( TQDir::homeDirPath() ) ); lineEdit()->setText( p ); @@ -255,34 +255,34 @@ void K3bFileTreeComboBox::slotGoUrl() } -bool K3bFileTreeComboBox::eventFilter( QObject* o, QEvent* e ) +bool K3bFileTreeComboBox::eventFilter( TQObject* o, TQEvent* e ) { if( dynamic_cast<K3bFileTreeView*>(o) == m_fileTreeView ) { - if( e->type() == QEvent::DragLeave ) { + if( e->type() == TQEvent::DragLeave ) { // the user dragged a dir from the filetree // now popdown(); return true; } - else if( e->type() == QEvent::KeyPress ) { - QKeyEvent *k = (QKeyEvent *)e; - if( k->key() == Qt::Key_Escape ) { + else if( e->type() == TQEvent::KeyPress ) { + TQKeyEvent *k = (TQKeyEvent *)e; + if( k->key() == TQt::Key_Escape ) { popdown(); return true; } } - else if( e->type() == QEvent::MouseButtonPress ) { - QMouseEvent* me = (QMouseEvent*)e; - if ( !m_fileTreeView->rect().contains( me->pos() ) ) { - QRect arrowRect = style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxArrow); - arrowRect = QStyle::visualRect(arrowRect, this); + else if( e->type() == TQEvent::MouseButtonPress ) { + TQMouseEvent* me = (TQMouseEvent*)e; + if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).tqcontains( me->pos() ) ) { + TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxArrow); + arrowRect = TQStyle::tqvisualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. - arrowRect.setHeight( QMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); + arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( arrowRect.contains( mapFromGlobal(me->globalPos()) ) ) { + if ( arrowRect.tqcontains( mapFromGlobal(me->globalPos()) ) ) { d->ignoreNextMouseClick = true; // in the case we hit the arrow button } popdown(); @@ -297,90 +297,90 @@ bool K3bFileTreeComboBox::eventFilter( QObject* o, QEvent* e ) } -void K3bFileTreeComboBox::mousePressEvent( QMouseEvent* e ) +void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e ) { // mainly from qcombobox.cpp - if ( e->button() != LeftButton ) + if ( e->button() != Qt::LeftButton ) return; if ( d->ignoreNextMouseClick ) { d->ignoreNextMouseClick = FALSE; return; } - QRect arrowRect = style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxArrow); - arrowRect = QStyle::visualRect(arrowRect, this); + TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxArrow); + arrowRect = TQStyle::tqvisualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. - arrowRect.setHeight( QMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); + arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( arrowRect.contains( e->pos() ) ) { + if ( arrowRect.tqcontains( e->pos() ) ) { popup(); - repaint( FALSE ); + tqrepaint( FALSE ); } } -void K3bFileTreeComboBox::keyPressEvent( QKeyEvent* e ) +void K3bFileTreeComboBox::keyPressEvent( TQKeyEvent* e ) { - if( e->key() == Qt::Key_Escape ) { + if( e->key() == TQt::Key_Escape ) { popdown(); } KComboBox::keyPressEvent(e); } -void K3bFileTreeComboBox::paintEvent( QPaintEvent* ) +void K3bFileTreeComboBox::paintEvent( TQPaintEvent* ) { // a lot of code from qcombobox.cpp // we only need this since there is no way to change the status of the arrow-button - QPainter p( this ); - const QColorGroup & g = colorGroup(); + TQPainter p( this ); + const TQColorGroup & g = tqcolorGroup(); p.setPen(g.text()); - QStyle::SFlags flags = QStyle::Style_Default; + TQStyle::SFlags flags = TQStyle::Style_Default; if (isEnabled()) - flags |= QStyle::Style_Enabled; + flags |= TQStyle::Style_Enabled; if (hasFocus()) - flags |= QStyle::Style_HasFocus; + flags |= TQStyle::Style_HasFocus; if ( width() < 5 || height() < 5 ) { qDrawShadePanel( &p, rect(), g, FALSE, 2, - &g.brush( QColorGroup::Button ) ); + &g.brush( TQColorGroup::Button ) ); return; } - // bool reverse = QApplication::reverseLayout(); + // bool reverse = TQApplication::reverseLayout(); - style().drawComplexControl( QStyle::CC_ComboBox, &p, this, rect(), g, - flags, QStyle::SC_All, + tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, + flags, TQStyle::SC_All, (d->poppedUp ? - QStyle::SC_ComboBoxArrow : - QStyle::SC_None )); + TQStyle::SC_ComboBoxArrow : + TQStyle::SC_None )); - QRect re = style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxEditField ); - re = QStyle::visualRect(re, this); + TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxEditField ); + re = TQStyle::tqvisualRect(re, this); p.setClipRect( re ); -// QListBoxItem * item = listBox()->item( 0 ); +// TQListBoxItem * item = listBox()->item( 0 ); // if ( item ) { -// // we calculate the QListBoxTexts height (ignoring strut) +// // we calculate the TQListBoxTexts height (ignoring strut) // int itemh = d->listBox()->fontMetrics().lineSpacing() + 2; // p.translate( re.x(), re.y() + (re.height() - itemh)/2 ); // item->paint( &p ); // } // } else if ( d->listBox() && d->listBox()->item( 0 ) ) { p.setClipping( FALSE ); - QListBoxItem * item = listBox()->item( 0 ); - const QPixmap *pix = item->pixmap(); + TQListBoxItem * item = listBox()->item( 0 ); + const TQPixmap *pix = item->pixmap(); if ( pix ) { p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(), - colorGroup().brush( QColorGroup::Base ) ); + tqcolorGroup().brush( TQColorGroup::Base ) ); p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix->height() ) / 2, *pix ); } diff --git a/src/k3bfiletreecombobox.h b/src/k3bfiletreecombobox.h index 50bc683..9e4af1f 100644 --- a/src/k3bfiletreecombobox.h +++ b/src/k3bfiletreecombobox.h @@ -19,10 +19,10 @@ #include <kcombobox.h> class K3bFileTreeView; -class QEvent; -class QKeyEvent; -class QMouseEvent; -class QPaintEvent; +class TQEvent; +class TQKeyEvent; +class TQMouseEvent; +class TQPaintEvent; namespace K3bDevice { class Device; @@ -31,16 +31,17 @@ namespace K3bDevice { class K3bFileTreeComboBox : public KComboBox { Q_OBJECT + TQ_OBJECT public: - K3bFileTreeComboBox( QWidget* parent = 0, const char* name = 0 ); + K3bFileTreeComboBox( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bFileTreeComboBox(); void popup(); void popdown(); void setCurrentItem( int ); - void setCurrentText( const QString& ); + void setCurrentText( const TQString& ); public slots: void setDevice( K3bDevice::Device* ); @@ -56,13 +57,13 @@ class K3bFileTreeComboBox : public KComboBox void slotUrlExecuted( const KURL& url ); protected: - bool eventFilter( QObject*, QEvent* ); - void keyPressEvent( QKeyEvent* ); - void mousePressEvent( QMouseEvent* ); - void paintEvent( QPaintEvent* ); + bool eventFilter( TQObject*, TQEvent* ); + void keyPressEvent( TQKeyEvent* ); + void mousePressEvent( TQMouseEvent* ); + void paintEvent( TQPaintEvent* ); private: - void setEditText( const QPixmap& pix, const QString& t ); + void setEditText( const TQPixmap& pix, const TQString& t ); class Private; Private* d; diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 36c86c3..ce91619 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -35,24 +35,24 @@ #include <kapplication.h> #include <kglobalsettings.h> -#include <qdir.h> -#include <qevent.h> -#include <qdragobject.h> -#include <qcursor.h> -#include <qnamespace.h> -#include <qmap.h> -#include <qptrdict.h> -#include <qpainter.h> -#include <qfont.h> -#include <qstyle.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqdir.h> +#include <tqevent.h> +#include <tqdragobject.h> +#include <tqcursor.h> +#include <tqnamespace.h> +#include <tqmap.h> +#include <tqptrdict.h> +#include <tqpainter.h> +#include <tqfont.h> +#include <tqstyle.h> +#include <tqlabel.h> +#include <tqlayout.h> K3bDeviceBranch::K3bDeviceBranch( KFileTreeView* view, K3bDevice::Device* dev, KFileTreeViewItem* item ) : KFileTreeBranch( view, KURL( "media:/" + dev->blockDeviceName() ), - QString("%1 - %2").arg(dev->vendor()).arg(dev->description()), + TQString("%1 - %2").tqarg(dev->vendor()).tqarg(dev->description()), ( dev->burner() ? SmallIcon("cdwriter_unmount") : SmallIcon("cdrom_unmount") ), @@ -67,8 +67,8 @@ K3bDeviceBranch::K3bDeviceBranch( KFileTreeView* view, K3bDevice::Device* dev, K root()->setExpandable(false); updateLabel(); - connect( k3bappcore->mediaCache(), SIGNAL(mediumChanged(K3bDevice::Device*)), - this, SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } @@ -98,14 +98,14 @@ void K3bDeviceBranch::setCurrent( bool c ) void K3bDeviceBranch::updateLabel() { if( m_showBlockDeviceName ) - setName( QString("%1 %2 (%3)") - .arg(m_device->vendor()) - .arg(m_device->description()) - .arg(m_device->blockDeviceName()) ); + setName( TQString("%1 %2 (%3)") + .tqarg(m_device->vendor()) + .tqarg(m_device->description()) + .tqarg(m_device->blockDeviceName()) ); else - setName( QString("%1 %2") - .arg(m_device->vendor()) - .arg(m_device->description()) ); + setName( TQString("%1 %2") + .tqarg(m_device->vendor()) + .tqarg(m_device->description()) ); if( k3bappcore->mediaCache() ) { root()->setMultiLinesEnabled( true ); @@ -135,8 +135,8 @@ void K3bDeviceBranch::showBlockDeviceName( bool b ) K3bFileTreeBranch::K3bFileTreeBranch( KFileTreeView* view, const KURL& url, - const QString& name, - const QPixmap& pix, + const TQString& name, + const TQPixmap& pix, bool showHidden, KFileTreeViewItem* item ) : KFileTreeBranch( view, url, name, pix, showHidden, @@ -151,10 +151,10 @@ K3bFileTreeBranch::K3bFileTreeBranch( KFileTreeView* view, -K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeViewItem* parent, +K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeViewItem* tqparent, K3bDevice::Device* dev, K3bDeviceBranch* branch ) - : KFileTreeViewItem( parent, + : KFileTreeViewItem( tqparent, new KFileItem( KURL( "media:/" + dev->blockDeviceName() ), "inode/directory", S_IFDIR ), @@ -165,10 +165,10 @@ K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeViewItem* parent, } -K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeView* parent, +K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeView* tqparent, K3bDevice::Device* dev, K3bDeviceBranch* branch ) - : KFileTreeViewItem( parent, + : KFileTreeViewItem( tqparent, new KFileItem( KURL( "media:/" + dev->blockDeviceName() ), "inode/directory", S_IFDIR ), @@ -182,21 +182,21 @@ K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeView* parent, void K3bDeviceBranchViewItem::setCurrent( bool c ) { m_bCurrent = c; - repaint(); + tqrepaint(); } -void K3bDeviceBranchViewItem::paintCell( QPainter* p, const QColorGroup& cg, int /* col */, int width, int align ) +void K3bDeviceBranchViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int /* col */, int width, int align ) { p->save(); int xpos = 1; int ypos = 1; - QFontMetrics fm( p->fontMetrics() ); + TQFontMetrics fm( p->fontMetrics() ); if( isSelected() ) { p->fillRect( 0, 0, width, height(), - cg.brush( QColorGroup::Highlight ) ); + cg.brush( TQColorGroup::Highlight ) ); p->setPen( cg.highlightedText() ); } else { @@ -210,39 +210,39 @@ void K3bDeviceBranchViewItem::paintCell( QPainter* p, const QColorGroup& cg, int } if( m_bCurrent ) { - QFont f( listView()->font() ); + TQFont f( listView()->font() ); f.setBold( true ); p->setFont( f ); } ypos += fm.ascent(); - QString line1 = text(0).left( text(0).find('\n') ); + TQString line1 = text(0).left( text(0).tqfind('\n') ); p->drawText( xpos, ypos, line1 ); - QFont f( listView()->font() ); + TQFont f( listView()->font() ); f.setItalic( true ); f.setBold( false ); f.setPointSize( f.pointSize() - 2 ); p->setFont( f ); ypos += p->fontMetrics().height() + 1; - QString line2 = text(0).mid( text(0).find('\n')+1 ); + TQString line2 = text(0).mid( text(0).tqfind('\n')+1 ); p->drawText( xpos - p->fontMetrics().leftBearing( line2[0] ), ypos, line2 ); - // from QListViewItem + // from TQListViewItem if( isOpen() && childCount() ) { int textheight = fm.size( align, text(0) ).height() + 2 * listView()->itemMargin(); - textheight = QMAX( textheight, QApplication::globalStrut().height() ); + textheight = TQMAX( textheight, TQApplication::globalStrut().height() ); if ( textheight % 2 > 0 ) textheight++; if ( textheight < height() ) { int w = listView()->treeStepSize() / 2; - listView()->style().drawComplexControl( QStyle::CC_ListView, p, listView(), - QRect( 0, textheight, w + 1, height() - textheight + 1 ), cg, - QStyle::Style_Enabled, - QStyle::SC_ListViewExpand, - (uint)QStyle::SC_All, QStyleOption( this ) ); + listView()->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, listView(), + TQRect( 0, textheight, w + 1, height() - textheight + 1 ), cg, + TQStyle::Style_Enabled, + TQStyle::SC_ListViewExpand, + (uint)TQStyle::SC_All, TQStyleOption( this ) ); } } @@ -252,16 +252,16 @@ void K3bDeviceBranchViewItem::paintCell( QPainter* p, const QColorGroup& cg, int int K3bDeviceBranchViewItem::widthHint() const { - QFont f( listView()->font() ); + TQFont f( listView()->font() ); if ( m_bCurrent ) { f.setBold( true ); } - int w = QFontMetrics(f).width( text(0).left( text(0).find('\n') ) ); + int w = TQFontMetrics(f).width( text(0).left( text(0).tqfind('\n') ) ); f.setItalic( true ); f.setBold( false ); f.setPointSize( f.pointSize() - 2 ); - w = QMAX( w, QFontMetrics(f).width( text(0).mid( text(0).find('\n')+1 ) ) ); + w = TQMAX( w, TQFontMetrics(f).width( text(0).mid( text(0).tqfind('\n')+1 ) ) ); w++; // see paintCell @@ -272,26 +272,26 @@ int K3bDeviceBranchViewItem::widthHint() const } -QString K3bDeviceBranchViewItem::key( int column, bool ascending ) const +TQString K3bDeviceBranchViewItem::key( int column, bool ascending ) const { return "0" + KFileTreeViewItem::key( column, ascending ); } -K3bFileTreeViewItem::K3bFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch ) - : KFileTreeViewItem( parent, item, branch ) +K3bFileTreeViewItem::K3bFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch ) + : KFileTreeViewItem( tqparent, item, branch ) { } -K3bFileTreeViewItem::K3bFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) - : KFileTreeViewItem( parent, item, branch ) +K3bFileTreeViewItem::K3bFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) + : KFileTreeViewItem( tqparent, item, branch ) { } -QString K3bFileTreeViewItem::key( int column, bool ascending ) const +TQString K3bFileTreeViewItem::key( int column, bool ascending ) const { return "1" + KFileTreeViewItem::key( column, ascending ); } @@ -300,26 +300,26 @@ QString K3bFileTreeViewItem::key( int column, bool ascending ) const class K3bDeviceTreeToolTip : public K3bToolTip { public: - K3bDeviceTreeToolTip( QWidget* parent, K3bFileTreeView* lv ); + K3bDeviceTreeToolTip( TQWidget* tqparent, K3bFileTreeView* lv ); - void maybeTip( const QPoint &pos ); + void maybeTip( const TQPoint &pos ); private: K3bFileTreeView* m_view; }; -K3bDeviceTreeToolTip::K3bDeviceTreeToolTip( QWidget* parent, K3bFileTreeView* lv ) - : K3bToolTip( parent ), +K3bDeviceTreeToolTip::K3bDeviceTreeToolTip( TQWidget* tqparent, K3bFileTreeView* lv ) + : K3bToolTip( tqparent ), m_view( lv ) { setTipTimeout( 500 ); } -void K3bDeviceTreeToolTip::maybeTip( const QPoint& pos ) +void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos ) { - if( !parentWidget() || !m_view ) + if( !tqparentWidget() || !m_view ) return; K3bDeviceBranchViewItem* item = dynamic_cast<K3bDeviceBranchViewItem*>( m_view->itemAt( pos ) ); @@ -328,24 +328,24 @@ void K3bDeviceTreeToolTip::maybeTip( const QPoint& pos ) K3bDevice::Device* dev = static_cast<K3bDeviceBranch*>( item->branch() )->device(); - QFrame* tooltip = new QFrame( parentWidget() ); - tooltip->setFrameStyle( QFrame::Panel | QFrame::Raised ); - tooltip->setFrameShape( QFrame::StyledPanel ); - QGridLayout* lay = new QGridLayout( tooltip, 2, 2, tooltip->frameWidth()*2 /*margin*/, 6 /*spacing*/ ); + TQFrame* tooltip = new TQFrame( tqparentWidget() ); + tooltip->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); + tooltip->setFrameShape( TQFrame::StyledPanel ); + TQGridLayout* lay = new TQGridLayout( tooltip, 2, 2, tooltip->frameWidth()*2 /*margin*/, 6 /*spacing*/ ); - QString text = k3bappcore->mediaCache()->medium( dev ).longString(); - int detailsStart = text.find( "<p>", 3 ); - QString details = text.mid( detailsStart ); + TQString text = k3bappcore->mediaCache()->medium( dev ).longString(); + int detailsStart = text.tqfind( "<p>", 3 ); + TQString details = text.mid( detailsStart ); text.truncate( detailsStart ); - QLabel* label = new QLabel( text, tooltip ); + TQLabel* label = new TQLabel( text, tooltip ); label->setMargin( 9 ); lay->addMultiCellWidget( label, 0, 0, 0, 1 ); - label = new QLabel( details, tooltip ); + label = new TQLabel( details, tooltip ); label->setMargin( 9 ); - label->setAlignment( Qt::Vertical ); + label->tqsetAlignment( Qt::Vertical ); lay->addMultiCellWidget( label, 1, 2, 0, 0 ); - label = new QLabel( tooltip ); + label = new TQLabel( tooltip ); lay->addWidget( label, 2, 1 ); lay->setColStretch( 0, 1 ); @@ -374,7 +374,7 @@ void K3bDeviceTreeToolTip::maybeTip( const QPoint& pos ) } // the tooltip will take care of deleting the widget - tip( m_view->itemRect( item ), tooltip ); + tip( m_view->tqitemRect( item ), tooltip ); } @@ -387,8 +387,8 @@ public: currentDeviceBranch(0) { } - QPtrDict<K3bDeviceBranch> deviceBranchDict; - QMap<KFileTreeBranch*, K3bDevice::Device*> branchDeviceMap; + TQPtrDict<K3bDeviceBranch> deviceBranchDict; + TQMap<KFileTreeBranch*, K3bDevice::Device*> branchDeviceMap; K3bDevice::DeviceManager* deviceManager; K3bDeviceBranch* currentDeviceBranch; @@ -396,8 +396,8 @@ public: K3bDeviceTreeToolTip* toolTip; }; -K3bFileTreeView::K3bFileTreeView( QWidget *parent, const char *name ) - : KFileTreeView( parent, name ) +K3bFileTreeView::K3bFileTreeView( TQWidget *tqparent, const char *name ) + : KFileTreeView( tqparent, name ) { d = new Private(); @@ -405,7 +405,7 @@ K3bFileTreeView::K3bFileTreeView( QWidget *parent, const char *name ) addColumn( i18n("Directories") ); setDragEnabled( true ); - setAlternateBackground( QColor() ); + setAlternateBackground( TQColor() ); setFullWidth(true); // setRootIsDecorated(true); setSorting(0); @@ -413,15 +413,15 @@ K3bFileTreeView::K3bFileTreeView( QWidget *parent, const char *name ) m_dirOnlyMode = true; m_menuEnabled = false; - connect( this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotItemExecuted(QListViewItem*)) ); - connect( this, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(slotItemExecuted(QListViewItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem* , const QPoint& )), - this, SLOT(slotContextMenu(KListView*, QListViewItem* , const QPoint& )) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem* , const TQPoint& )), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem* , const TQPoint& )) ); // we always simulate the single click slotSettingsChangedK3b(KApplication::SETTINGS_MOUSE); if( kapp ) - connect( kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChangedK3b(int)) ); + connect( kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChangedK3b(int)) ); initActions(); } @@ -449,11 +449,11 @@ void K3bFileTreeView::initActions() // m_devicePopupMenu = new KActionMenu( m_actionCollection, "device_popup_menu" ); // m_urlPopupMenu = new KActionMenu( m_actionCollection, "url_popup_menu" ); -// KAction* actionDiskInfo = new KAction( i18n("&Disk Info"), "info", 0, this, SLOT(slotShowDiskInfo()), +// KAction* actionDiskInfo = new KAction( i18n("&Disk Info"), "info", 0, this, TQT_SLOT(slotShowDiskInfo()), // m_actionCollection, "disk_info"); -// KAction* actionUnmount = new KAction( i18n("&Unmount"), "cdrom_unmount", 0, this, SLOT(slotUnmountDisk()), +// KAction* actionUnmount = new KAction( i18n("&Unmount"), "cdrom_unmount", 0, this, TQT_SLOT(slotUnmountDisk()), // m_actionCollection, "disk_unmount"); -// KAction* actionEject = new KAction( i18n("&Eject"), "", 0, this, SLOT(slotEjectDisk()), +// KAction* actionEject = new KAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()), // m_actionCollection, "disk_eject"); // m_devicePopupMenu->insert( actionDiskInfo ); @@ -466,7 +466,7 @@ void K3bFileTreeView::initActions() void K3bFileTreeView::addDefaultBranches() { - KURL home = KURL::fromPathOrURL( QDir::homeDirPath() ); + KURL home = KURL::fromPathOrURL( TQDir::homeDirPath() ); KURL root = KURL( "file:/" ); KFileTreeBranch* treeBranch = addBranch( new K3bFileTreeBranch( this, root, i18n("Root"), SmallIcon("folder_red") ) ); @@ -480,7 +480,7 @@ void K3bFileTreeView::addCdDeviceBranches( K3bDevice::DeviceManager* dm ) kdDebug() << "(K3bFileTreeView::addCdDeviceBranches)" << endl; // remove all previous added device branches - for( QMap<KFileTreeBranch*, K3bDevice::Device*>::Iterator it = d->branchDeviceMap.begin(); + for( TQMap<KFileTreeBranch*, K3bDevice::Device*>::Iterator it = d->branchDeviceMap.begin(); it != d->branchDeviceMap.end(); ++it ) { removeBranch( it.key() ); } @@ -489,7 +489,7 @@ void K3bFileTreeView::addCdDeviceBranches( K3bDevice::DeviceManager* dm ) d->branchDeviceMap.clear(); d->deviceBranchDict.clear(); - for( QPtrListIterator<K3bDevice::Device> it( dm->allDevices() ); *it; ++it ) + for( TQPtrListIterator<K3bDevice::Device> it( dm->allDevices() ); *it; ++it ) addDeviceBranch( *it ); if( dm != d->deviceManager ) { @@ -498,12 +498,12 @@ void K3bFileTreeView::addCdDeviceBranches( K3bDevice::DeviceManager* dm ) d->deviceManager = dm; // make sure we get changes to the config - connect( dm, SIGNAL(changed(K3bDevice::DeviceManager*)), - this, SLOT(addCdDeviceBranches(K3bDevice::DeviceManager*)) ); + connect( dm, TQT_SIGNAL(changed(K3bDevice::DeviceManager*)), + this, TQT_SLOT(addCdDeviceBranches(K3bDevice::DeviceManager*)) ); if( K3bAppDeviceManager* appDevM = dynamic_cast<K3bAppDeviceManager*>( dm ) ) - connect( appDevM, SIGNAL(currentDeviceChanged(K3bDevice::Device*)), - this, SLOT(setCurrentDevice(K3bDevice::Device*)) ); + connect( appDevM, TQT_SIGNAL(currentDeviceChanged(K3bDevice::Device*)), + this, TQT_SLOT(setCurrentDevice(K3bDevice::Device*)) ); } K3bDevice::Device* currentDevice = k3bappcore->appDeviceManager()->currentDevice(); @@ -528,7 +528,7 @@ void K3bFileTreeView::addDeviceBranch( K3bDevice::Device* dev ) // search for an equal device int equalCnt = 0; K3bDeviceBranch* equalBranch = 0; - for( QMap<KFileTreeBranch*, K3bDevice::Device*>::Iterator it = d->branchDeviceMap.begin(); + for( TQMap<KFileTreeBranch*, K3bDevice::Device*>::Iterator it = d->branchDeviceMap.begin(); it != d->branchDeviceMap.end(); ++it ) { K3bDevice::Device* itDev = it.data(); K3bDeviceBranch* itBranch = (K3bDeviceBranch*)it.key(); @@ -566,7 +566,7 @@ KFileTreeBranch* K3bFileTreeView::addBranch( KFileTreeBranch* branch ) } -KFileTreeBranch* K3bFileTreeView::addBranch( const KURL& url, const QString& name, const QPixmap& pix, bool showHidden ) +KFileTreeBranch* K3bFileTreeView::addBranch( const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden ) { KFileTreeBranch* newBranch = KFileTreeView::addBranch( url, name, pix, showHidden ); newBranch->setChildRecurse( false ); @@ -576,10 +576,10 @@ KFileTreeBranch* K3bFileTreeView::addBranch( const KURL& url, const QString& nam } -void K3bFileTreeView::slotItemExecuted( QListViewItem* item ) +void K3bFileTreeView::slotItemExecuted( TQListViewItem* item ) { KFileTreeViewItem* treeItem = static_cast<KFileTreeViewItem*>(item); - if( d->branchDeviceMap.contains( treeItem->branch() ) && + if( d->branchDeviceMap.tqcontains( treeItem->branch() ) && treeItem == treeItem->branch()->root() ) { K3bDevice::Device* dev = d->branchDeviceMap[treeItem->branch()]; k3bappcore->appDeviceManager()->setCurrentDevice( dev ); @@ -601,7 +601,7 @@ void K3bFileTreeView::followUrl( const KURL& url ) // TODO: first try the current branch KFileTreeBranchIterator it( branches() ); for( ; *it; ++it ) { - if( !d->branchDeviceMap.contains( *it ) ) + if( !d->branchDeviceMap.tqcontains( *it ) ) if( KFileTreeViewItem* item = (*it)->findTVIByURL( url ) ) { setCurrentItem( item ); setSelected(item, true); @@ -612,13 +612,13 @@ void K3bFileTreeView::followUrl( const KURL& url ) } -void K3bFileTreeView::slotContextMenu( KListView*, QListViewItem* item, const QPoint& p ) +void K3bFileTreeView::slotContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ) { KFileTreeViewItem* treeItem = dynamic_cast<KFileTreeViewItem*>(item); if( treeItem ) { K3bDevice::Device* device = 0; - QMap<KFileTreeBranch*, K3bDevice::Device*>::iterator devIt = - d->branchDeviceMap.find( treeItem->branch() ); + TQMap<KFileTreeBranch*, K3bDevice::Device*>::iterator devIt = + d->branchDeviceMap.tqfind( treeItem->branch() ); if( devIt != d->branchDeviceMap.end() ) device = devIt.data(); @@ -641,7 +641,7 @@ K3bDevice::Device* K3bFileTreeView::selectedDevice() const { KFileTreeViewItem* treeItem = dynamic_cast<KFileTreeViewItem*>(selectedItem()); if( treeItem ) { - if( d->branchDeviceMap.contains( treeItem->branch() ) ) + if( d->branchDeviceMap.tqcontains( treeItem->branch() ) ) return d->branchDeviceMap[treeItem->branch()]; } return 0; @@ -652,7 +652,7 @@ KURL K3bFileTreeView::selectedUrl() const { KFileTreeViewItem* treeItem = dynamic_cast<KFileTreeViewItem*>(selectedItem()); if( treeItem ) { - if( !d->branchDeviceMap.contains( treeItem->branch() ) ) + if( !d->branchDeviceMap.tqcontains( treeItem->branch() ) ) return treeItem->url(); } return KURL(); @@ -684,7 +684,7 @@ void K3bFileTreeView::setSelectedDevice( K3bDevice::Device* dev ) K3bDeviceBranch* K3bFileTreeView::branch( K3bDevice::Device* dev ) { - return d->deviceBranchDict.find( (void*)dev ); + return d->deviceBranchDict.tqfind( (void*)dev ); } @@ -693,19 +693,19 @@ void K3bFileTreeView::slotSettingsChangedK3b(int category) // we force single click like konqueror does. This really should be done in KFileTreeView if( category == KApplication::SETTINGS_MOUSE ) { - disconnect(this, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int)), - this, SLOT(slotMouseButtonClickedK3b(int, QListViewItem*, const QPoint &, int))); + disconnect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), + this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); if( !KGlobalSettings::singleClick() ) - connect(this, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int)), - this, SLOT(slotMouseButtonClickedK3b(int, QListViewItem*, const QPoint &, int))); + connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), + this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); } } -void K3bFileTreeView::slotMouseButtonClickedK3b( int btn, QListViewItem *item, const QPoint &pos, int c ) +void K3bFileTreeView::slotMouseButtonClickedK3b( int btn, TQListViewItem *item, const TQPoint &pos, int c ) { - if( (btn == LeftButton) && item ) + if( (btn == Qt::LeftButton) && item ) emitExecute(item, pos, c); } @@ -716,13 +716,13 @@ void K3bFileTreeView::updateMinimumWidth() // only handle the device branches, we don't care about the folders. // int w = 0; - for( QMap<KFileTreeBranch*, K3bDevice::Device*>::Iterator it = d->branchDeviceMap.begin(); + for( TQMap<KFileTreeBranch*, K3bDevice::Device*>::Iterator it = d->branchDeviceMap.begin(); it != d->branchDeviceMap.end(); ++it ) { - w = QMAX( w, static_cast<K3bDeviceBranchViewItem*>( it.key()->root() )->widthHint() ); + w = TQMAX( w, static_cast<K3bDeviceBranchViewItem*>( it.key()->root() )->widthHint() ); } // width of the items + scrollbar width + the frame + a little eyecandy spacing - setMinimumWidth( w + verticalScrollBar()->sizeHint().width() + 2*frameWidth() + 2 ); + setMinimumWidth( w + verticalScrollBar()->tqsizeHint().width() + 2*frameWidth() + 2 ); } #include "k3bfiletreeview.moc" diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h index 31a25c4..b44af66 100644 --- a/src/k3bfiletreeview.h +++ b/src/k3bfiletreeview.h @@ -23,9 +23,9 @@ class KFileTreeBranch; class KActionCollection; class KActionMenu; -class QPoint; -class QDropEvent; -class QDragEnterEvent; +class TQPoint; +class TQDropEvent; +class TQDragEnterEvent; namespace K3bDevice { class Device; @@ -40,6 +40,7 @@ namespace KIO { class K3bDeviceBranch : public KFileTreeBranch { Q_OBJECT + TQ_OBJECT public: K3bDeviceBranch( KFileTreeView*, K3bDevice::Device* dev, KFileTreeViewItem* item = 0 ); @@ -72,8 +73,8 @@ class K3bFileTreeBranch : public KFileTreeBranch public: K3bFileTreeBranch( KFileTreeView*, const KURL& url, - const QString& name, - const QPixmap& pix, + const TQString& name, + const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem* item = 0 ); }; @@ -85,11 +86,11 @@ class K3bDeviceBranchViewItem : public KFileTreeViewItem K3bDeviceBranchViewItem( KFileTreeViewItem*, K3bDevice::Device*, K3bDeviceBranch* ); K3bDeviceBranchViewItem( KFileTreeView*, K3bDevice::Device*, K3bDeviceBranch* ); - QString key( int column, bool ascending ) const; + TQString key( int column, bool ascending ) const; void setCurrent( bool ); - void paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ); + void paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ); int widthHint() const; @@ -106,7 +107,7 @@ class K3bFileTreeViewItem : public KFileTreeViewItem K3bFileTreeViewItem( KFileTreeViewItem*, KFileItem*, KFileTreeBranch* ); K3bFileTreeViewItem( KFileTreeView *, KFileItem*, KFileTreeBranch* ); - QString key( int column, bool ascending ) const; + TQString key( int column, bool ascending ) const; }; @@ -116,14 +117,15 @@ class K3bFileTreeViewItem : public KFileTreeViewItem class K3bFileTreeView : public KFileTreeView { Q_OBJECT + TQ_OBJECT public: - K3bFileTreeView( QWidget *parent = 0, const char *name = 0 ); + K3bFileTreeView( TQWidget *tqparent = 0, const char *name = 0 ); ~K3bFileTreeView(); virtual KFileTreeBranch* addBranch( KFileTreeBranch* ); - virtual KFileTreeBranch* addBranch( const KURL& url, const QString& name, const QPixmap& , bool showHidden = false ); + virtual KFileTreeBranch* addBranch( const KURL& url, const TQString& name, const TQPixmap& , bool showHidden = false ); K3bDeviceBranch* branch( K3bDevice::Device* dev ); @@ -173,15 +175,15 @@ class K3bFileTreeView : public KFileTreeView void deviceExecuted( K3bDevice::Device* dev ); /** only gets emitted if the menu is disabled */ - void contextMenu( K3bDevice::Device*, const QPoint& ); + void contextMenu( K3bDevice::Device*, const TQPoint& ); /** only gets emitted if the menu is disabled */ - void contextMenu( const KURL& url, const QPoint& ); + void contextMenu( const KURL& url, const TQPoint& ); private slots: - void slotItemExecuted( QListViewItem* item ); - void slotContextMenu( KListView*, QListViewItem*, const QPoint& ); + void slotItemExecuted( TQListViewItem* item ); + void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); void slotSettingsChangedK3b(int category); - void slotMouseButtonClickedK3b( int btn, QListViewItem *item, const QPoint &pos, int c ); + void slotMouseButtonClickedK3b( int btn, TQListViewItem *item, const TQPoint &pos, int c ); private: void initActions(); diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp index 04ce435..f423b96 100644 --- a/src/k3bfileview.cpp +++ b/src/k3bfileview.cpp @@ -20,13 +20,13 @@ #include "k3btoolbox.h" #include "k3bapplication.h" -#include <qwidget.h> -#include <qdragobject.h> -#include <qlayout.h> -#include <qdir.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qtoolbutton.h> +#include <tqwidget.h> +#include <tqdragobject.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqtoolbutton.h> #include <kfiledetailview.h> #include <klistview.h> @@ -43,8 +43,8 @@ #include <kprogress.h> -K3bFileView::K3bFileView(QWidget *parent, const char *name ) - : K3bContentsView( false, parent, name) +K3bFileView::K3bFileView(TQWidget *tqparent, const char *name ) + : K3bContentsView( false, tqparent, name) { setupGUI(); } @@ -63,15 +63,15 @@ KActionCollection* K3bFileView::actionCollection() const void K3bFileView::setupGUI() { - QVBoxLayout* layout = new QVBoxLayout( this ); - // layout->setAutoAdd( true ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + // tqlayout->setAutoAdd( true ); - m_dirOp = new K3bDirOperator( KURL::fromPathOrURL(QDir::home().absPath()), this ); + m_dirOp = new K3bDirOperator( KURL::fromPathOrURL(TQDir::home().absPath()), this ); m_toolBox = new K3bToolBox( this ); - layout->addWidget( m_toolBox ); - layout->addWidget( m_dirOp ); - layout->setStretchFactor( m_dirOp, 1 ); + tqlayout->addWidget( m_toolBox ); + tqlayout->addWidget( m_dirOp ); + tqlayout->setStretchFactor( m_dirOp, 1 ); // setup actions KAction* actionHome = m_dirOp->actionCollection()->action("home"); @@ -100,7 +100,7 @@ void K3bFileView::setupGUI() m_toolBox->addWidget( m_dirOp->progressBar() ); m_filterWidget->setEditable( true ); - QString filter = i18n("*|All Files"); + TQString filter = i18n("*|All Files"); filter += "\n" + i18n("audio/x-mp3 audio/x-wav application/x-ogg |Sound Files"); filter += "\n" + i18n("audio/x-wav |Wave Sound Files"); filter += "\n" + i18n("audio/x-mp3 |MP3 Sound Files"); @@ -108,16 +108,16 @@ void K3bFileView::setupGUI() filter += "\n" + i18n("video/mpeg |MPEG Video Files"); m_filterWidget->setFilter(filter); - connect( m_filterWidget, SIGNAL(filterChanged()), SLOT(slotFilterChanged()) ); + connect( m_filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged()) ); - connect( m_dirOp, SIGNAL(fileHighlighted(const KFileItem*)), this, SLOT(slotFileHighlighted(const KFileItem*)) ); - connect( m_dirOp, SIGNAL(urlEntered(const KURL&)), this, SIGNAL(urlEntered(const KURL&)) ); - connect( m_dirOp, SIGNAL(fileSelected(const KFileItem*)), m_dirOp, SLOT(slotAddFilesToProject()) ); + connect( m_dirOp, TQT_SIGNAL(fileHighlighted(const KFileItem*)), this, TQT_SLOT(slotFileHighlighted(const KFileItem*)) ); + connect( m_dirOp, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SIGNAL(urlEntered(const KURL&)) ); + connect( m_dirOp, TQT_SIGNAL(fileSelected(const KFileItem*)), m_dirOp, TQT_SLOT(slotAddFilesToProject()) ); slotFileHighlighted(0); } -void K3bFileView::setDir( const QString& dir ) +void K3bFileView::setDir( const TQString& dir ) { KURL url; url.setPath(dir); @@ -147,11 +147,11 @@ void K3bFileView::slotFileHighlighted( const KFileItem* ) void K3bFileView::slotFilterChanged() { - QString filter = m_filterWidget->currentFilter(); + TQString filter = m_filterWidget->currentFilter(); m_dirOp->clearFilter(); - if( filter.find( '/' ) > -1 ) { - QStringList types = QStringList::split( " ", filter ); + if( filter.tqfind( '/' ) > -1 ) { + TQStringList types = TQStringList::split( " ", filter ); types.prepend( "inode/directory" ); m_dirOp->setMimeFilter( types ); } diff --git a/src/k3bfileview.h b/src/k3bfileview.h index f89d3b8..923125a 100644 --- a/src/k3bfileview.h +++ b/src/k3bfileview.h @@ -22,7 +22,7 @@ class K3bDirOperator; -class QDragObject; +class TQDragObject; class KURL; class KFileFilterCombo; class KFileItem; @@ -37,9 +37,10 @@ class K3bToolBox; class K3bFileView : public K3bContentsView { Q_OBJECT + TQ_OBJECT public: - K3bFileView(QWidget *parent=0, const char *name=0); + K3bFileView(TQWidget *tqparent=0, const char *name=0); ~K3bFileView(); void setUrl( const KURL &url, bool forward = true ); @@ -53,7 +54,7 @@ class K3bFileView : public K3bContentsView void urlEntered( const KURL& url ); public slots: - void setDir( const QString& ); + void setDir( const TQString& ); void saveConfig( KConfig* c ); void readConfig( KConfig* c ); void setAutoUpdate( bool ); diff --git a/src/k3bfirstrun.cpp b/src/k3bfirstrun.cpp index 23a285a..37eee7a 100644 --- a/src/k3bfirstrun.cpp +++ b/src/k3bfirstrun.cpp @@ -22,11 +22,11 @@ #include <kiconloader.h> #include <kconfig.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> -void K3bFirstRun::run( QWidget* parent ) +void K3bFirstRun::run( TQWidget* tqparent ) { if( !k3bcore->config()->readBoolEntry( "First run", true ) ) return; @@ -41,18 +41,18 @@ void K3bFirstRun::run( QWidget* parent ) if( si.allInstalled() ) return; - K3bFirstRun dlg( parent ); - if( dlg.exec() == QDialog::Accepted ) - si.install( parent ); + K3bFirstRun dlg( tqparent ); + if( dlg.exec() == TQDialog::Accepted ) + si.install( tqparent ); } -K3bFirstRun::K3bFirstRun( QWidget* parent ) +K3bFirstRun::K3bFirstRun( TQWidget* tqparent ) : KDialogBase( Plain, i18n("First Run"), Ok|Cancel, Ok, - parent, + tqparent, 0, true, true ) @@ -60,15 +60,15 @@ K3bFirstRun::K3bFirstRun( QWidget* parent ) setButtonOK( i18n("Enable Konqueror integration") ); setButtonCancel( i18n("No Konqueror integration") ); - QFrame* plain = plainPage(); - QLabel* label = new QLabel( i18n("<p>K3b can integrate itself into Konqueror. This integration " + TQFrame* plain = plainPage(); + TQLabel* label = new TQLabel( i18n("<p>K3b can integrate itself into Konqueror. This integration " "allows to start K3b from the context menu in the file manager." "<p><em>The Konqueror integration can always be disabled and " "enabled again from the K3b settings.</em>"), plain ); - QLabel* pixLabel = new QLabel( plain ); + TQLabel* pixLabel = new TQLabel( plain ); pixLabel->setPixmap( DesktopIcon( "konqueror" ) ); - QHBoxLayout* lay = new QHBoxLayout( plain ); + TQHBoxLayout* lay = new TQHBoxLayout( plain ); lay->setMargin( 0 ); lay->setSpacing( spacingHint() ); lay->addWidget( pixLabel ); diff --git a/src/k3bfirstrun.h b/src/k3bfirstrun.h index d59c931..d67f688 100644 --- a/src/k3bfirstrun.h +++ b/src/k3bfirstrun.h @@ -22,12 +22,13 @@ class K3bFirstRun : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - static void run( QWidget* parent = 0 ); + static void run( TQWidget* tqparent = 0 ); private: - K3bFirstRun( QWidget* parent ); + K3bFirstRun( TQWidget* tqparent ); ~K3bFirstRun(); }; diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp index 808de32..9200114 100644 --- a/src/k3bflatbutton.cpp +++ b/src/k3bflatbutton.cpp @@ -21,22 +21,22 @@ #include <kiconloader.h> #include <kglobal.h> -#include <qpainter.h> -#include <qtooltip.h> -#include <qfontmetrics.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqtooltip.h> +#include <tqfontmetrics.h> +#include <tqpixmap.h> -K3bFlatButton::K3bFlatButton( QWidget *parent, const char *name ) - : QFrame( parent, name/*, WNoAutoErase*/ ), +K3bFlatButton::K3bFlatButton( TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name/*, WNoAutoErase*/ ), m_pressed(false) { init(); } -K3bFlatButton::K3bFlatButton( const QString& text, QWidget *parent, const char *name ) - : QFrame( parent, name/*, WNoAutoErase*/ ), +K3bFlatButton::K3bFlatButton( const TQString& text, TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name/*, WNoAutoErase*/ ), m_pressed(false) { init(); @@ -44,16 +44,16 @@ K3bFlatButton::K3bFlatButton( const QString& text, QWidget *parent, const char * } -K3bFlatButton::K3bFlatButton( KAction* a, QWidget *parent, const char *name ) - : QFrame( parent, name/*, WNoAutoErase*/ ), +K3bFlatButton::K3bFlatButton( KAction* a, TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name/*, WNoAutoErase*/ ), m_pressed(false) { init(); setText( a->text() ); - QToolTip::add( this, a->toolTip() ); + TQToolTip::add( this, a->toolTip() ); setPixmap( KGlobal::iconLoader()->loadIcon( a->icon(), KIcon::NoGroup, 32 ) ); - connect( this, SIGNAL(clicked()), a, SLOT(activate()) ); + connect( this, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) ); } @@ -64,15 +64,15 @@ void K3bFlatButton::init() { setHover(false); setMargin(5); - setFrameStyle( QFrame::Box|QFrame::Plain ); + setFrameStyle( TQFrame::Box|TQFrame::Plain ); - connect( k3bappcore->themeManager(), SIGNAL(themeChanged()), this, SLOT(slotThemeChanged()) ); - connect( kapp, SIGNAL(appearanceChanged()), this, SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), this, TQT_SLOT(slotThemeChanged()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(slotThemeChanged()) ); slotThemeChanged(); } -void K3bFlatButton::setText( const QString& s ) +void K3bFlatButton::setText( const TQString& s ) { m_text = s; m_text.remove( '&' ); @@ -81,28 +81,28 @@ void K3bFlatButton::setText( const QString& s ) } -void K3bFlatButton::setPixmap( const QPixmap& p ) +void K3bFlatButton::setPixmap( const TQPixmap& p ) { m_pixmap = p; update(); } -void K3bFlatButton::enterEvent( QEvent* ) +void K3bFlatButton::enterEvent( TQEvent* ) { setHover(true); } -void K3bFlatButton::leaveEvent( QEvent* ) +void K3bFlatButton::leaveEvent( TQEvent* ) { setHover(false); } -void K3bFlatButton::mousePressEvent( QMouseEvent* e ) +void K3bFlatButton::mousePressEvent( TQMouseEvent* e ) { - if( e->button() == QMouseEvent::LeftButton ) { + if( e->button() == Qt::LeftButton ) { emit pressed(); m_pressed = true; } @@ -111,9 +111,9 @@ void K3bFlatButton::mousePressEvent( QMouseEvent* e ) } -void K3bFlatButton::mouseReleaseEvent( QMouseEvent* e ) +void K3bFlatButton::mouseReleaseEvent( TQMouseEvent* e ) { - if( e->button() == QMouseEvent::LeftButton ) { + if( e->button() == Qt::LeftButton ) { if( m_pressed ) emit clicked(); m_pressed = false; @@ -139,52 +139,52 @@ void K3bFlatButton::setHover( bool b ) } -QSize K3bFlatButton::sizeHint() const +TQSize K3bFlatButton::tqsizeHint() const { // height: pixmap + 5 spacing + font height + frame width // width: max( pixmap, text) + frame width - return QSize( QMAX( m_pixmap.width(), fontMetrics().width( m_text ) ) + frameWidth()*2, + return TQSize( TQMAX( m_pixmap.width(), fontMetrics().width( m_text ) ) + frameWidth()*2, m_pixmap.height() + fontMetrics().height() + 5 + frameWidth()*2 ); } -void K3bFlatButton::drawContents( QPainter* p ) +void K3bFlatButton::drawContents( TQPainter* p ) { - QRect rect = contentsRect(); + TQRect rect = contentsRect(); // if( m_hover ) // p->fillRect( rect, m_foreColor ); -// else if( parentWidget() ) { -// QRect r( mapToParent( QPoint(lineWidth(), lineWidth()) ), -// mapToParent( QPoint(width()-2*lineWidth(), height()-2*lineWidth() )) ); +// else if( tqparentWidget() ) { +// TQRect r( mapToParent( TQPoint(lineWidth(), lineWidth()) ), +// mapToParent( TQPoint(width()-2*lineWidth(), height()-2*lineWidth() )) ); -// parentWidget()->repaint( r ); +// tqparentWidget()->tqrepaint( r ); // } p->save(); - QRect textRect = fontMetrics().boundingRect( m_text ); - int textX = QMAX( 0, ( rect.width() - textRect.width() ) / 2 ); + TQRect textRect = fontMetrics().boundingRect( m_text ); + int textX = TQMAX( 0, ( rect.width() - textRect.width() ) / 2 ); int textY = textRect.height(); if( !m_pixmap.isNull() ) { p->translate( rect.left(), rect.top() ); - textX = QMAX( textX, (m_pixmap.width() - textRect.width()) / 2 ); + textX = TQMAX( textX, (m_pixmap.width() - textRect.width()) / 2 ); textY += 5 + m_pixmap.height(); - int pixX = QMAX( QMAX( 0, (textRect.width() - m_pixmap.width()) / 2 ), + int pixX = TQMAX( TQMAX( 0, (textRect.width() - m_pixmap.width()) / 2 ), ( rect.width() - m_pixmap.width() ) / 2 ); p->drawPixmap( pixX, 0, m_pixmap ); p->drawText( textX, textY, m_text ); } else - p->drawText( rect, Qt::AlignCenter, m_text ); + p->drawText( rect, TQt::AlignCenter, m_text ); p->restore(); } -void K3bFlatButton::setColors( const QColor& fore, const QColor& back ) +void K3bFlatButton::setColors( const TQColor& fore, const TQColor& back ) { m_foreColor = fore; m_backColor = back; diff --git a/src/k3bflatbutton.h b/src/k3bflatbutton.h index a3dc97e..b3f97cf 100644 --- a/src/k3bflatbutton.h +++ b/src/k3bflatbutton.h @@ -16,36 +16,37 @@ #ifndef FLATBUTTON_H #define FLATBUTTON_H -#include <qframe.h> -#include <qcolor.h> -#include <qpixmap.h> +#include <tqframe.h> +#include <tqcolor.h> +#include <tqpixmap.h> -class QEvent; -class QMouseEvent; -class QPainter; +class TQEvent; +class TQMouseEvent; +class TQPainter; class KAction; /** @author Sebastian Trueg */ -class K3bFlatButton : public QFrame +class K3bFlatButton : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bFlatButton( QWidget *parent = 0, const char *name = 0 ); - K3bFlatButton( const QString& text, QWidget *parent = 0, const char *name = 0 ); - K3bFlatButton( KAction*, QWidget *parent = 0, const char *name = 0 ); + K3bFlatButton( TQWidget *tqparent = 0, const char *name = 0 ); + K3bFlatButton( const TQString& text, TQWidget *tqparent = 0, const char *name = 0 ); + K3bFlatButton( KAction*, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bFlatButton(); - QSize sizeHint() const; + TQSize tqsizeHint() const; public slots: - void setColors( const QColor& fore, const QColor& back ); - void setText( const QString& ); - void setPixmap( const QPixmap& ); + void setColors( const TQColor& fore, const TQColor& back ); + void setText( const TQString& ); + void setPixmap( const TQPixmap& ); signals: void pressed(); @@ -57,19 +58,19 @@ class K3bFlatButton : public QFrame private: void init(); - void mousePressEvent(QMouseEvent* e); - void mouseReleaseEvent(QMouseEvent* e); - void enterEvent( QEvent* ); - void leaveEvent( QEvent* ); - void drawContents( QPainter* ); + void mousePressEvent(TQMouseEvent* e); + void mouseReleaseEvent(TQMouseEvent* e); + void enterEvent( TQEvent* ); + void leaveEvent( TQEvent* ); + void drawContents( TQPainter* ); void setHover( bool ); bool m_pressed; - QColor m_backColor; - QColor m_foreColor; - QString m_text; - QPixmap m_pixmap; + TQColor m_backColor; + TQColor m_foreColor; + TQString m_text; + TQPixmap m_pixmap; bool m_hover; }; diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp index 4784c7f..1dc7a0f 100644 --- a/src/k3binteractiondialog.cpp +++ b/src/k3binteractiondialog.cpp @@ -25,18 +25,18 @@ #include <k3btoolbutton.h> #include <k3bmultichoicedialog.h> -#include <qlabel.h> -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qstring.h> -#include <qpoint.h> -#include <qfont.h> -#include <qpopupmenu.h> -#include <qeventloop.h> -#include <qapplication.h> -#include <qtimer.h> +#include <tqlabel.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqstring.h> +#include <tqpoint.h> +#include <tqfont.h> +#include <tqpopupmenu.h> +#include <tqeventloop.h> +#include <tqapplication.h> +#include <tqtimer.h> #include <klocale.h> #include <kdebug.h> @@ -49,16 +49,16 @@ #include <kdeversion.h> -K3bInteractionDialog::K3bInteractionDialog( QWidget* parent, +K3bInteractionDialog::K3bInteractionDialog( TQWidget* tqparent, const char* name, - const QString& title, - const QString& subTitle, + const TQString& title, + const TQString& subTitle, int buttonMask, int defaultButton, - const QString& configGroup, + const TQString& configGroup, bool modal, WFlags fl ) - : KDialog( parent, name, modal, fl ), + : KDialog( tqparent, name, modal, fl ), m_mainWidget(0), m_defaultButton(defaultButton), m_configGroup(configGroup), @@ -69,7 +69,7 @@ K3bInteractionDialog::K3bInteractionDialog( QWidget* parent, { installEventFilter( this ); - mainGrid = new QGridLayout( this ); + mainGrid = new TQGridLayout( this ); mainGrid->setSpacing( spacingHint() ); mainGrid->setMargin( marginHint() ); @@ -82,31 +82,31 @@ K3bInteractionDialog::K3bInteractionDialog( QWidget* parent, // settings buttons // --------------------------------------------------------------------------------------------------- if( !m_configGroup.isEmpty() ) { - QHBoxLayout* layout2 = new QHBoxLayout( 0, 0, spacingHint(), "layout2"); + TQHBoxLayout* tqlayout2 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout2"); m_buttonLoadSettings = new K3bToolButton( /*i18n("User Defaults"), */this ); ((K3bToolButton*)m_buttonLoadSettings)->setIconSet( SmallIconSet( "revert" ) ); - QPopupMenu* userDefaultsPopup = new QPopupMenu( m_buttonLoadSettings ); - userDefaultsPopup->insertItem( i18n("Load default settings"), this, SLOT(slotLoadK3bDefaults()) ); - userDefaultsPopup->insertItem( i18n("Load saved settings"), this, SLOT(slotLoadUserDefaults()) ); - userDefaultsPopup->insertItem( i18n("Load last used settings"), this, SLOT(slotLoadLastSettings()) ); - ((QToolButton*)m_buttonLoadSettings)->setPopup( userDefaultsPopup ); + TQPopupMenu* userDefaultsPopup = new TQPopupMenu( m_buttonLoadSettings ); + userDefaultsPopup->insertItem( i18n("Load default settings"), this, TQT_SLOT(slotLoadK3bDefaults()) ); + userDefaultsPopup->insertItem( i18n("Load saved settings"), this, TQT_SLOT(slotLoadUserDefaults()) ); + userDefaultsPopup->insertItem( i18n("Load last used settings"), this, TQT_SLOT(slotLoadLastSettings()) ); + ((TQToolButton*)m_buttonLoadSettings)->setPopup( userDefaultsPopup ); ((K3bToolButton*)m_buttonLoadSettings)->setInstantMenu( true ); - layout2->addWidget( m_buttonLoadSettings ); + tqlayout2->addWidget( m_buttonLoadSettings ); - m_buttonSaveSettings = new QToolButton( /*i18n("Save User Defaults"), */this, "m_buttonSaveSettings" ); - ((QToolButton*)m_buttonSaveSettings)->setIconSet( SmallIconSet( "filesave" ) ); - layout2->addWidget( m_buttonSaveSettings ); + m_buttonSaveSettings = new TQToolButton( /*i18n("Save User Defaults"), */this, "m_buttonSaveSettings" ); + ((TQToolButton*)m_buttonSaveSettings)->setIconSet( SmallIconSet( "filesave" ) ); + tqlayout2->addWidget( m_buttonSaveSettings ); - mainGrid->addLayout( layout2, 2, 0 ); + mainGrid->addLayout( tqlayout2, 2, 0 ); } - QSpacerItem* spacer = new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); mainGrid->addItem( spacer, 2, 1 ); // action buttons // --------------------------------------------------------------------------------------------------- - QHBoxLayout* layout5 = new QHBoxLayout( 0, 0, spacingHint(), "layout5"); + TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout5"); if( buttonMask & START_BUTTON ) { KGuiItem startItem = KStdGuiItem::ok(); @@ -115,7 +115,7 @@ K3bInteractionDialog::K3bInteractionDialog( QWidget* parent, setButtonText( START_BUTTON, i18n("Start"), i18n("Start the task") ); - QFont fnt( m_buttonStart->font() ); + TQFont fnt( m_buttonStart->font() ); fnt.setBold(true); m_buttonStart->setFont( fnt ); } @@ -149,33 +149,33 @@ K3bInteractionDialog::K3bInteractionDialog( QWidget* parent, case 0: // KDE default default: if ( m_buttonStart ) - layout5->addWidget( m_buttonStart ); + tqlayout5->addWidget( m_buttonStart ); if ( m_buttonSave ) - layout5->addWidget( m_buttonSave ); + tqlayout5->addWidget( m_buttonSave ); if ( m_buttonCancel ) - layout5->addWidget( m_buttonCancel ); + tqlayout5->addWidget( m_buttonCancel ); break; case 1: // something different if ( m_buttonCancel ) - layout5->addWidget( m_buttonCancel ); + tqlayout5->addWidget( m_buttonCancel ); if ( m_buttonSave ) - layout5->addWidget( m_buttonSave ); + tqlayout5->addWidget( m_buttonSave ); if ( m_buttonStart ) - layout5->addWidget( m_buttonStart ); + tqlayout5->addWidget( m_buttonStart ); break; case 2: // GTK-Style if ( m_buttonSave ) - layout5->addWidget( m_buttonSave ); + tqlayout5->addWidget( m_buttonSave ); if ( m_buttonCancel ) - layout5->addWidget( m_buttonCancel ); + tqlayout5->addWidget( m_buttonCancel ); if ( m_buttonStart ) - layout5->addWidget( m_buttonStart ); + tqlayout5->addWidget( m_buttonStart ); break; } - mainGrid->addLayout( layout5, 2, 2 ); + mainGrid->addLayout( tqlayout5, 2, 2 ); mainGrid->setRowStretch( 1, 1 ); @@ -200,9 +200,9 @@ void K3bInteractionDialog::show() } -QSize K3bInteractionDialog::sizeHint() const +TQSize K3bInteractionDialog::tqsizeHint() const { - QSize s = KDialog::sizeHint(); + TQSize s = KDialog::tqsizeHint(); // I want the dialogs to look good. // That means their height should never outgrow their width if( s.height() > s.width() ) @@ -215,22 +215,22 @@ QSize K3bInteractionDialog::sizeHint() const void K3bInteractionDialog::initConnections() { if( m_buttonStart ) { - connect( m_buttonStart, SIGNAL(clicked()), - this, SLOT(slotStartClickedInternal()) ); + connect( m_buttonStart, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotStartClickedInternal()) ); } if( m_buttonSave ) { -// connect( m_buttonSave, SIGNAL(clicked()), -// this, SLOT(slotSaveLastSettings()) ); - connect( m_buttonSave, SIGNAL(clicked()), - this, SLOT(slotSaveClicked()) ); +// connect( m_buttonSave, TQT_SIGNAL(clicked()), +// this, TQT_SLOT(slotSaveLastSettings()) ); + connect( m_buttonSave, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSaveClicked()) ); } if( m_buttonCancel ) - connect( m_buttonCancel, SIGNAL(clicked()), - this, SLOT(slotCancelClicked()) ); + connect( m_buttonCancel, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCancelClicked()) ); if( !m_configGroup.isEmpty() ) { - connect( m_buttonSaveSettings, SIGNAL(clicked()), - this, SLOT(slotSaveUserDefaults()) ); + connect( m_buttonSaveSettings, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSaveUserDefaults()) ); } } @@ -240,14 +240,14 @@ void K3bInteractionDialog::initToolTipsAndWhatsThis() if( !m_configGroup.isEmpty() ) { // ToolTips // ------------------------------------------------------------------------- - QToolTip::add( m_buttonLoadSettings, i18n("Load default or saved settings") ); - QToolTip::add( m_buttonSaveSettings, i18n("Save current settings to reuse them later") ); + TQToolTip::add( m_buttonLoadSettings, i18n("Load default or saved settings") ); + TQToolTip::add( m_buttonSaveSettings, i18n("Save current settings to reuse them later") ); // What's This info // ------------------------------------------------------------------------- - QWhatsThis::add( m_buttonLoadSettings, i18n("<p>Load a set of settings either from the default K3b settings, " + TQWhatsThis::add( m_buttonLoadSettings, i18n("<p>Load a set of settings either from the default K3b settings, " "settings saved before, or the last used ones.") ); - QWhatsThis::add( m_buttonSaveSettings, i18n("<p>Saves the current settings of the action dialog." + TQWhatsThis::add( m_buttonSaveSettings, i18n("<p>Saves the current settings of the action dialog." "<p>These settings can be loaded with the <em>Load saved settings</em> " "button." "<p><b>The K3b defaults are not overwritten by this.</b>") ); @@ -255,7 +255,7 @@ void K3bInteractionDialog::initToolTipsAndWhatsThis() } -void K3bInteractionDialog::setTitle( const QString& title, const QString& subTitle ) +void K3bInteractionDialog::setTitle( const TQString& title, const TQString& subTitle ) { m_dialogHeader->setTitle( title, subTitle ); @@ -263,17 +263,17 @@ void K3bInteractionDialog::setTitle( const QString& title, const QString& subTit } -void K3bInteractionDialog::setMainWidget( QWidget* w ) +void K3bInteractionDialog::setMainWidget( TQWidget* w ) { - w->reparent( this, QPoint(0,0) ); + w->reparent( this, TQPoint(0,0) ); mainGrid->addMultiCellWidget( w, 1, 1, 0, 2 ); m_mainWidget = w; } -QWidget* K3bInteractionDialog::mainWidget() +TQWidget* K3bInteractionDialog::mainWidget() { if( !m_mainWidget ) { - setMainWidget( new QWidget( this ) ); + setMainWidget( new TQWidget( this ) ); } return m_mainWidget; } @@ -324,7 +324,7 @@ void K3bInteractionDialog::slotStartClickedInternal() "dialog is opened again." "<p><em>Be aware that this choice can always be changed from the K3b " "configuration dialog.</em>"), - QMessageBox::Question, + TQMessageBox::Question, this, 0, 3, @@ -382,12 +382,12 @@ void K3bInteractionDialog::setDefaultButton( int button ) } -bool K3bInteractionDialog::eventFilter( QObject* o, QEvent* ev ) +bool K3bInteractionDialog::eventFilter( TQObject* o, TQEvent* ev ) { if( dynamic_cast<K3bInteractionDialog*>(o) == this && - ev->type() == QEvent::KeyPress ) { + ev->type() == TQEvent::KeyPress ) { - QKeyEvent* kev = dynamic_cast<QKeyEvent*>(ev); + TQKeyEvent* kev = dynamic_cast<TQKeyEvent*>(ev); switch ( kev->key() ) { case Key_Enter: @@ -445,16 +445,16 @@ void K3bInteractionDialog::setButtonGui( int button, void K3bInteractionDialog::setButtonText( int button, - const QString& text, - const QString& tooltip, - const QString& whatsthis ) + const TQString& text, + const TQString& tooltip, + const TQString& whatsthis ) { if( KPushButton* b = getButton( button ) ) { b->setText( text ); - QToolTip::remove( b ); - QWhatsThis::remove( b ); - QToolTip::add( b, tooltip ); - QWhatsThis::add( b, whatsthis ); + TQToolTip::remove( b ); + TQWhatsThis::remove( b ); + TQToolTip::add( b, tooltip ); + TQWhatsThis::add( b, whatsthis ); } } @@ -479,44 +479,44 @@ void K3bInteractionDialog::setButtonShown( int button, bool shown ) } -void K3bInteractionDialog::setStartButtonText( const QString& text, - const QString& tooltip, - const QString& whatsthis ) +void K3bInteractionDialog::setStartButtonText( const TQString& text, + const TQString& tooltip, + const TQString& whatsthis ) { if( m_buttonStart ) { m_buttonStart->setText( text ); - QToolTip::remove( m_buttonStart ); - QWhatsThis::remove( m_buttonStart ); - QToolTip::add( m_buttonStart, tooltip ); - QWhatsThis::add( m_buttonStart, whatsthis ); + TQToolTip::remove( m_buttonStart ); + TQWhatsThis::remove( m_buttonStart ); + TQToolTip::add( m_buttonStart, tooltip ); + TQWhatsThis::add( m_buttonStart, whatsthis ); } } -void K3bInteractionDialog::setCancelButtonText( const QString& text, - const QString& tooltip, - const QString& whatsthis ) +void K3bInteractionDialog::setCancelButtonText( const TQString& text, + const TQString& tooltip, + const TQString& whatsthis ) { if( m_buttonCancel ) { m_buttonCancel->setText( text ); - QToolTip::remove( m_buttonCancel ); - QWhatsThis::remove( m_buttonCancel ); - QToolTip::add( m_buttonCancel, tooltip ); - QWhatsThis::add( m_buttonCancel, whatsthis ); + TQToolTip::remove( m_buttonCancel ); + TQWhatsThis::remove( m_buttonCancel ); + TQToolTip::add( m_buttonCancel, tooltip ); + TQWhatsThis::add( m_buttonCancel, whatsthis ); } } -void K3bInteractionDialog::setSaveButtonText( const QString& text, - const QString& tooltip, - const QString& whatsthis ) +void K3bInteractionDialog::setSaveButtonText( const TQString& text, + const TQString& tooltip, + const TQString& whatsthis ) { if( m_buttonSave ) { m_buttonSave->setText( text ); - QToolTip::remove( m_buttonSave ); - QWhatsThis::remove( m_buttonSave ); - QToolTip::add( m_buttonSave, tooltip ); - QWhatsThis::add( m_buttonSave, whatsthis ); + TQToolTip::remove( m_buttonSave ); + TQWhatsThis::remove( m_buttonSave ); + TQToolTip::add( m_buttonSave, tooltip ); + TQWhatsThis::add( m_buttonSave, whatsthis ); } } @@ -567,7 +567,7 @@ int K3bInteractionDialog::exec( bool returnOnHide ) { m_exitLoopOnHide = returnOnHide; - // the following code is mainly taken from QDialog::exec + // the following code is mainly taken from TQDialog::exec if( m_inLoop ) { kdError() << "(K3bInteractionDialog::exec) Recursive call detected." << endl; @@ -584,12 +584,12 @@ int K3bInteractionDialog::exec( bool returnOnHide ) loadStartupSettings(); show(); if( m_delayedInit ) - QTimer::singleShot( 0, this, SLOT(slotDelayedInit()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotDelayedInit()) ); else init(); m_inLoop = true; - QApplication::eventLoop()->enterLoop(); + TQApplication::eventLoop()->enterLoop(); if( !wasShowModal ) clearWFlags( WShowModal ); @@ -612,7 +612,7 @@ void K3bInteractionDialog::hide() if( m_inLoop && m_exitLoopOnHide ) { m_inLoop = false; - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); } } @@ -621,7 +621,7 @@ bool K3bInteractionDialog::close( bool alsoDelete ) { if( m_inLoop && !m_exitLoopOnHide ) { m_inLoop = false; - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); } return KDialog::close( alsoDelete ); @@ -632,7 +632,7 @@ void K3bInteractionDialog::done( int r ) { if( m_inLoop && !m_exitLoopOnHide ) { m_inLoop = false; - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); } return KDialog::done( r ); diff --git a/src/k3binteractiondialog.h b/src/k3binteractiondialog.h index 2bdb426..7e06465 100644 --- a/src/k3binteractiondialog.h +++ b/src/k3binteractiondialog.h @@ -19,10 +19,10 @@ #include <kdialog.h> -class QGridLayout; -class QLabel; +class TQGridLayout; +class TQLabel; class KPushButton; -class QButton; +class TQButton; class K3bThemedHeader; class KConfigBase; class KGuiItem; @@ -38,6 +38,7 @@ class KGuiItem; class K3bInteractionDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: /** @@ -50,19 +51,19 @@ class K3bInteractionDialog : public KDialog * @param defaultButton may also be null to deactivate the feature * @param configgroup The config group used for the loadUserDefaults and saveUserDefaults methods */ - K3bInteractionDialog( QWidget* parent = 0, + K3bInteractionDialog( TQWidget* tqparent = 0, const char* name = 0, - const QString& title = QString::null, - const QString& subTitle = QString::null, + const TQString& title = TQString(), + const TQString& subTitle = TQString(), int buttonMask = START_BUTTON|CANCEL_BUTTON, int defaultButton = START_BUTTON, - const QString& configgroup = QString::null, + const TQString& configgroup = TQString(), bool modal = true, WFlags fl = 0 ); virtual ~K3bInteractionDialog(); - void setMainWidget( QWidget* w ); - void setTitle( const QString& title, const QString& subTitle = QString::null ); + void setMainWidget( TQWidget* w ); + void setTitle( const TQString& title, const TQString& subTitle = TQString() ); void setDefaultButton( int b ); /** @@ -96,7 +97,7 @@ class K3bInteractionDialog : public KDialog /** * If no mainWidget has been set a plain page will be created. */ - QWidget* mainWidget(); + TQWidget* mainWidget(); enum Buttons { START_BUTTON = 1, @@ -104,9 +105,9 @@ class K3bInteractionDialog : public KDialog CANCEL_BUTTON = 4 }; - QSize sizeHint() const; + TQSize tqsizeHint() const; - const QString& configGroup() const { return m_configGroup; } + const TQString& configGroup() const { return m_configGroup; } /** * K3b's dialogs use this method to determine if it is safe to hide when starting @@ -139,35 +140,35 @@ class K3bInteractionDialog : public KDialog /** * \deprecated use setButtonText */ - void setStartButtonText( const QString& text, - const QString& tooltip = QString::null, - const QString& whatsthis = QString::null ); + void setStartButtonText( const TQString& text, + const TQString& tooltip = TQString(), + const TQString& whatsthis = TQString() ); /** * \deprecated use setButtonText */ - void setCancelButtonText( const QString& text, - const QString& tooltip = QString::null, - const QString& whatsthis = QString::null ); + void setCancelButtonText( const TQString& text, + const TQString& tooltip = TQString(), + const TQString& whatsthis = TQString() ); /** * \deprecated use setButtonText */ - void setSaveButtonText( const QString& text, - const QString& tooltip = QString::null, - const QString& whatsthis = QString::null ); + void setSaveButtonText( const TQString& text, + const TQString& tooltip = TQString(), + const TQString& whatsthis = TQString() ); void setButtonGui( int button, const KGuiItem& ); void setButtonText( int button, - const QString& text, - const QString& tooltip = QString::null, - const QString& whatsthis = QString::null ); + const TQString& text, + const TQString& tooltip = TQString(), + const TQString& whatsthis = TQString() ); void setButtonEnabled( int button, bool enabled ); void setButtonShown( int button, bool enabled ); /** - * If set true the init() method will be called via a QTimer to ensure event + * If set true the init() method will be called via a TQTimer to ensure event * handling be done before (default: false). */ void setDelayedInitialization( bool b ) { m_delayedInit = b; } @@ -231,9 +232,9 @@ class K3bInteractionDialog : public KDialog virtual void init() {} /** - * reimplemented from QDialog + * reimplemented from TQDialog */ - virtual bool eventFilter( QObject*, QEvent* ); + virtual bool eventFilter( TQObject*, TQEvent* ); protected slots: /** @@ -261,14 +262,14 @@ class K3bInteractionDialog : public KDialog KPushButton* m_buttonStart; KPushButton* m_buttonSave; KPushButton* m_buttonCancel; - QWidget* m_mainWidget; + TQWidget* m_mainWidget; - QButton* m_buttonLoadSettings; - QButton* m_buttonSaveSettings; + TQButton* m_buttonLoadSettings; + TQButton* m_buttonSaveSettings; - QGridLayout* mainGrid; + TQGridLayout* mainGrid; int m_defaultButton; - QString m_configGroup; + TQString m_configGroup; bool m_exitLoopOnHide; bool m_inLoop; diff --git a/src/k3binterface.cpp b/src/k3binterface.cpp index c95e598..cd6f4d7 100644 --- a/src/k3binterface.cpp +++ b/src/k3binterface.cpp @@ -26,8 +26,8 @@ #include <k3bglobals.h> #include <dcopclient.h> -#include <qptrlist.h> -#include <qtimer.h> +#include <tqptrlist.h> +#include <tqtimer.h> @@ -105,11 +105,11 @@ DCOPRef K3bInterface::openProject( const KURL& url ) return DCOPRef(); } -QValueList<DCOPRef> K3bInterface::projects() +TQValueList<DCOPRef> K3bInterface::projects() { - QValueList<DCOPRef> lst; - const QPtrList<K3bDoc>& docs = k3bappcore->projectManager()->projects(); - for( QPtrListIterator<K3bDoc> it( docs ); it.current(); ++it ) + TQValueList<DCOPRef> lst; + const TQPtrList<K3bDoc>& docs = k3bappcore->projectManager()->projects(); + for( TQPtrListIterator<K3bDoc> it( docs ); it.current(); ++it ) lst.append( DCOPRef( kapp->dcopClient()->appId(), k3bappcore->projectManager()->dcopInterface( it.current() )->objId() ) ); return lst; @@ -143,28 +143,28 @@ void K3bInterface::copyDvd( const KURL& dev ) void K3bInterface::copyCd() { // HACK since we want this method to return immediately - QTimer::singleShot( 0, m_main, SLOT(slotCdCopy()) ); + TQTimer::singleShot( 0, m_main, TQT_SLOT(slotCdCopy()) ); } void K3bInterface::copyDvd() { // HACK since we want this method to return immediately - QTimer::singleShot( 0, m_main, SLOT(slotDvdCopy()) ); + TQTimer::singleShot( 0, m_main, TQT_SLOT(slotDvdCopy()) ); } void K3bInterface::eraseCdrw() { // HACK since we want this method to return immediately - QTimer::singleShot( 0, m_main, SLOT(slotBlankCdrw()) ); + TQTimer::singleShot( 0, m_main, TQT_SLOT(slotBlankCdrw()) ); } void K3bInterface::formatDvd() { // HACK since we want this method to return immediately - QTimer::singleShot( 0, m_main, SLOT(slotFormatDvd()) ); + TQTimer::singleShot( 0, m_main, TQT_SLOT(slotFormatDvd()) ); } diff --git a/src/k3binterface.h b/src/k3binterface.h index b54e2ef..4079a5d 100644 --- a/src/k3binterface.h +++ b/src/k3binterface.h @@ -19,7 +19,7 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kurl.h> @@ -63,7 +63,7 @@ class K3bInterface : public DCOPObject DCOPRef openProject( const KURL& url ); - QValueList<DCOPRef> projects(); + TQValueList<DCOPRef> projects(); void copyCd(); void copyDvd(); diff --git a/src/k3bjobinterface.cpp b/src/k3bjobinterface.cpp index 60e4436..2f524ac 100644 --- a/src/k3bjobinterface.cpp +++ b/src/k3bjobinterface.cpp @@ -17,12 +17,12 @@ #include <k3bjob.h> -#include <qcstring.h> -#include <qdatastream.h> +#include <tqcstring.h> +#include <tqdatastream.h> -K3bJobInterface::K3bJobInterface( QObject* parent ) - : QObject( parent ), +K3bJobInterface::K3bJobInterface( TQObject* tqparent ) + : TQObject( tqparent ), DCOPObject( "K3bJobInterface" ), m_job( 0 ) { @@ -38,22 +38,22 @@ void K3bJobInterface::setJob( K3bJob* job ) m_lastProgress = m_lastSubProgress = 0; if( m_job ) { - connect( m_job, SIGNAL(newTask(const QString&)), this, SLOT(slotNewTask(const QString&)) ); - connect( m_job, SIGNAL(newSubTask(const QString&)), this, SLOT(slotNewSubTask(const QString&)) ); - connect( m_job, SIGNAL(infoMessage(const QString&, int)), this, SLOT(slotInfoMessage(const QString&, int)) ); - connect( m_job, SIGNAL(finished(bool)), this, SLOT(slotFinished(bool)) ); - connect( m_job, SIGNAL(started()), this, SLOT(slotStarted()) ); - connect( m_job, SIGNAL(canceled()), this, SLOT(slotCanceled()) ); - connect( m_job, SIGNAL(percent(int)), this, SLOT(slotProgress(int)) ); - connect( m_job, SIGNAL(subPercent(int)), this, SLOT(slotSubProgress(int)) ); - connect( m_job, SIGNAL(nextTrack(int, int)), this, SLOT(slotNextTrack(int, int)) ); + connect( m_job, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SLOT(slotNewTask(const TQString&)) ); + connect( m_job, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); + connect( m_job, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SLOT(slotInfoMessage(const TQString&, int)) ); + connect( m_job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotFinished(bool)) ); + connect( m_job, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()) ); + connect( m_job, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); + connect( m_job, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotProgress(int)) ); + connect( m_job, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotSubProgress(int)) ); + connect( m_job, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) ); if( m_job->inherits( "K3bBurnJob" ) ) { - connect( m_job, SIGNAL(bufferStatus(int)), this, SLOT(slotBuffer(int)) ); - connect( m_job, SIGNAL(deviceBuffer(int)), this, SLOT(slotDeviceBuffer(int)) ); + connect( m_job, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SLOT(slotBuffer(int)) ); + connect( m_job, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) ); } - connect( m_job, SIGNAL(destroyed()), this, SLOT(slotDestroyed()) ); + connect( m_job, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); } } @@ -64,52 +64,52 @@ bool K3bJobInterface::jobRunning() const } -QString K3bJobInterface::jobDescription() const +TQString K3bJobInterface::jobDescription() const { if( m_job ) return m_job->jobDescription(); else - return QString::null; + return TQString(); } -QString K3bJobInterface::jobDetails() const +TQString K3bJobInterface::jobDetails() const { if( m_job ) return m_job->jobDetails(); else - return QString::null; + return TQString(); } void K3bJobInterface::slotStarted() { m_lastProgress = m_lastSubProgress = 0; - emitDCOPSignal( "started()", QByteArray() ); + emitDCOPSignal( "started()", TQByteArray() ); } void K3bJobInterface::slotCanceled() { - emitDCOPSignal( "canceled()", QByteArray() ); + emitDCOPSignal( "canceled()", TQByteArray() ); } void K3bJobInterface::slotFinished( bool success ) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << success; emitDCOPSignal( "finished(bool)", params ); } -void K3bJobInterface::slotInfoMessage( const QString& message, int type ) +void K3bJobInterface::slotInfoMessage( const TQString& message, int type ) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << message << type; - emitDCOPSignal( "infoMessage(QString)", params ); + emitDCOPSignal( "infoMessage(TQString)", params ); } @@ -117,8 +117,8 @@ void K3bJobInterface::slotProgress( int val ) { if( m_lastProgress != val ) { m_lastProgress = val; - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << val; emitDCOPSignal( "progress(int)", params ); } @@ -129,36 +129,36 @@ void K3bJobInterface::slotSubProgress( int val ) { if( m_lastSubProgress != val ) { m_lastSubProgress = val; - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << val; emitDCOPSignal( "subProgress(int)", params ); } } -void K3bJobInterface::slotNewTask( const QString& task ) +void K3bJobInterface::slotNewTask( const TQString& task ) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << task; - emitDCOPSignal( "newTask(QString)", params ); + emitDCOPSignal( "newTask(TQString)", params ); } -void K3bJobInterface::slotNewSubTask( const QString& task ) +void K3bJobInterface::slotNewSubTask( const TQString& task ) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << task; - emitDCOPSignal( "newSubTask(QString)", params ); + emitDCOPSignal( "newSubTask(TQString)", params ); } void K3bJobInterface::slotBuffer( int val ) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << val; emitDCOPSignal( "buffer(int)", params ); } @@ -166,8 +166,8 @@ void K3bJobInterface::slotBuffer( int val ) void K3bJobInterface::slotDeviceBuffer( int val ) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << val; emitDCOPSignal( "deviceBuffer(int)", params ); } @@ -175,8 +175,8 @@ void K3bJobInterface::slotDeviceBuffer( int val ) void K3bJobInterface::slotNextTrack( int track, int numTracks ) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << track << numTracks; emitDCOPSignal( "nextTrack(int,int)", params ); } diff --git a/src/k3bjobinterface.h b/src/k3bjobinterface.h index 0d27ac2..e62d465 100644 --- a/src/k3bjobinterface.h +++ b/src/k3bjobinterface.h @@ -16,7 +16,7 @@ #ifndef _K3B_JOB_INTERFACE_H_ #define _K3B_JOB_INTERFACE_H_ -#include <qobject.h> +#include <tqobject.h> #include <dcopobject.h> class K3bJob; @@ -28,31 +28,32 @@ class K3bJob; * This may be used for example in a karamba theme with a non-volitile * DCOP connection. */ -class K3bJobInterface : public QObject, public DCOPObject +class K3bJobInterface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: - K3bJobInterface( QObject* parent ); + K3bJobInterface( TQObject* tqparent ); void setJob( K3bJob* ); k_dcop: bool jobRunning() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; k_dcop_signals: void started(); void canceled(); void finished( bool ); - void infoMessage( const QString&, int ); + void infoMessage( const TQString&, int ); void progress( int ); void subProgress( int ); - void newTask( const QString& ); - void newSubTask( const QString& ); + void newTask( const TQString& ); + void newSubTask( const TQString& ); void buffer( int ); void deviceBuffer( int ); void nextTrack( int track, int numTracks ); @@ -61,11 +62,11 @@ class K3bJobInterface : public QObject, public DCOPObject void slotStarted(); void slotCanceled(); void slotFinished( bool ); - void slotInfoMessage( const QString&, int ); + void slotInfoMessage( const TQString&, int ); void slotProgress( int ); void slotSubProgress( int ); - void slotNewTask( const QString& ); - void slotNewSubTask( const QString& ); + void slotNewTask( const TQString& ); + void slotNewSubTask( const TQString& ); void slotBuffer( int ); void slotDeviceBuffer( int ); void slotNextTrack( int track, int numTracks ); diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index 351f1d9..e74a0d5 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -32,25 +32,25 @@ #include <k3bversion.h> #include <k3bthememanager.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qdatetime.h> -#include <qstring.h> -#include <qhbox.h> -#include <qheader.h> -#include <qscrollbar.h> -#include <qpoint.h> -#include <qfontmetrics.h> -#include <qtimer.h> -#include <qfont.h> -#include <qeventloop.h> -#include <qfile.h> -#include <qapplication.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqdatetime.h> +#include <tqstring.h> +#include <tqhbox.h> +#include <tqheader.h> +#include <tqscrollbar.h> +#include <tqpoint.h> +#include <tqfontmetrics.h> +#include <tqtimer.h> +#include <tqfont.h> +#include <tqeventloop.h> +#include <tqfile.h> +#include <tqapplication.h> #include <kprogress.h> #include <klocale.h> @@ -78,11 +78,11 @@ public: -K3bJobProgressDialog::K3bJobProgressDialog( QWidget* parent, +K3bJobProgressDialog::K3bJobProgressDialog( TQWidget* tqparent, const char* name, bool showSubProgress, bool modal, WFlags fl ) - : KDialog( parent, name, modal, fl ), + : KDialog( tqparent, name, modal, fl ), in_loop(false), m_osd(0) { @@ -96,9 +96,9 @@ K3bJobProgressDialog::K3bJobProgressDialog( QWidget* parent, } m_job = 0; - m_timer = new QTimer( this ); + m_timer = new TQTimer( this ); - connect( m_timer, SIGNAL(timeout()), this, SLOT(slotUpdateTime()) ); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime()) ); } @@ -114,40 +114,40 @@ K3bJobProgressDialog::~K3bJobProgressDialog() void K3bJobProgressDialog::setupGUI() { - QVBoxLayout* mainLayout = new QVBoxLayout( this, 11, 6, "mainLayout"); + TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 11, 6, "mainLayout"); // header // ------------------------------------------------------------------------------------------ - QFrame* headerFrame = new QFrame( this, "headerFrame" ); - headerFrame->setFrameShape( QFrame::StyledPanel ); - headerFrame->setFrameShadow( QFrame::Sunken ); + TQFrame* headerFrame = new TQFrame( this, "headerFrame" ); + headerFrame->setFrameShape( TQFrame::StyledPanel ); + headerFrame->setFrameShadow( TQFrame::Sunken ); headerFrame->setLineWidth( 1 ); headerFrame->setMargin( 1 ); - QHBoxLayout* headerLayout = new QHBoxLayout( headerFrame ); + TQHBoxLayout* headerLayout = new TQHBoxLayout( headerFrame ); headerLayout->setMargin( 2 ); // to make sure the frame gets displayed headerLayout->setSpacing( 0 ); m_pixLabel = new K3bThemedLabel( headerFrame ); headerLayout->addWidget( m_pixLabel ); - QFrame* frame4 = new QFrame( headerFrame, "frame4" ); - frame4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 1, 0, frame4->sizePolicy().hasHeightForWidth() ) ); - frame4->setFrameShape( QFrame::NoFrame ); - frame4->setFrameShadow( QFrame::Raised ); - QVBoxLayout* frame4Layout = new QVBoxLayout( frame4, 6, 3, "frame4Layout"); + TQFrame* frame4 = new TQFrame( headerFrame, "frame4" ); + frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame4->sizePolicy().hasHeightForWidth() ) ); + frame4->setFrameShape( TQFrame::NoFrame ); + frame4->setFrameShadow( TQFrame::Raised ); + TQVBoxLayout* frame4Layout = new TQVBoxLayout( frame4, 6, 3, "frame4Layout"); m_labelJob = new K3bThemedLabel( frame4 ); m_labelJob->setMinimumVisibleText( 40 ); - QFont m_labelJob_font( m_labelJob->font() ); + TQFont m_labelJob_font( m_labelJob->font() ); m_labelJob_font.setPointSize( m_labelJob_font.pointSize() + 2 ); m_labelJob_font.setBold( true ); m_labelJob->setFont( m_labelJob_font ); - m_labelJob->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_labelJob->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); frame4Layout->addWidget( m_labelJob ); m_labelJobDetails = new K3bThemedLabel( frame4 ); - m_labelJobDetails->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 1, m_labelJobDetails->sizePolicy().hasHeightForWidth() ) ); - m_labelJobDetails->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_labelJobDetails->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelJobDetails->sizePolicy().hasHeightForWidth() ) ); + m_labelJobDetails->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); frame4Layout->addWidget( m_labelJobDetails ); headerLayout->addWidget( frame4 ); @@ -166,31 +166,31 @@ void K3bJobProgressDialog::setupGUI() // progress header // ------------------------------------------------------------------------------------------ - QFrame* progressHeaderFrame = new QFrame( this, "progressHeaderFrame" ); - progressHeaderFrame->setFrameShape( QFrame::StyledPanel ); - progressHeaderFrame->setFrameShadow( QFrame::Sunken ); + TQFrame* progressHeaderFrame = new TQFrame( this, "progressHeaderFrame" ); + progressHeaderFrame->setFrameShape( TQFrame::StyledPanel ); + progressHeaderFrame->setFrameShadow( TQFrame::Sunken ); progressHeaderFrame->setLineWidth( 1 ); progressHeaderFrame->setMargin( 1 ); - QHBoxLayout* progressHeaderLayout = new QHBoxLayout( progressHeaderFrame ); + TQHBoxLayout* progressHeaderLayout = new TQHBoxLayout( progressHeaderFrame ); progressHeaderLayout->setMargin( 2 ); progressHeaderLayout->setSpacing( 0 ); - QFrame* frame5 = new QFrame( progressHeaderFrame, "frame5" ); - frame5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 1, 0, frame5->sizePolicy().hasHeightForWidth() ) ); - frame5->setFrameShape( QFrame::NoFrame ); - frame5->setFrameShadow( QFrame::Raised ); - QVBoxLayout* frame5Layout = new QVBoxLayout( frame5, 6, 3, "frame5Layout"); + TQFrame* frame5 = new TQFrame( progressHeaderFrame, "frame5" ); + frame5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame5->sizePolicy().hasHeightForWidth() ) ); + frame5->setFrameShape( TQFrame::NoFrame ); + frame5->setFrameShadow( TQFrame::Raised ); + TQVBoxLayout* frame5Layout = new TQVBoxLayout( frame5, 6, 3, "frame5Layout"); m_labelTask = new K3bThemedLabel( frame5 ); - QFont m_labelTask_font( m_labelTask->font() ); + TQFont m_labelTask_font( m_labelTask->font() ); m_labelTask_font.setPointSize( m_labelTask_font.pointSize() + 2 ); m_labelTask_font.setBold( true ); m_labelTask->setFont( m_labelTask_font ); frame5Layout->addWidget( m_labelTask ); m_labelElapsedTime = new K3bThemedLabel( frame5 ); - m_labelElapsedTime->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 1, m_labelElapsedTime->sizePolicy().hasHeightForWidth() ) ); + m_labelElapsedTime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelElapsedTime->sizePolicy().hasHeightForWidth() ) ); frame5Layout->addWidget( m_labelElapsedTime ); progressHeaderLayout->addWidget( frame5 ); @@ -198,73 +198,73 @@ void K3bJobProgressDialog::setupGUI() mainLayout->addWidget( progressHeaderFrame ); // ------------------------------------------------------------------------------------------ - QHBoxLayout* layout3 = new QHBoxLayout( 0, 0, 6, "layout3"); + TQHBoxLayout* tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); m_labelSubTask = new KCutLabel( this, "m_labelSubTask" ); - layout3->addWidget( m_labelSubTask ); + tqlayout3->addWidget( m_labelSubTask ); - m_labelSubProcessedSize = new QLabel( this, "m_labelSubProcessedSize" ); - m_labelSubProcessedSize->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); - layout3->addWidget( m_labelSubProcessedSize ); - mainLayout->addLayout( layout3 ); + m_labelSubProcessedSize = new TQLabel( this, "m_labelSubProcessedSize" ); + m_labelSubProcessedSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + tqlayout3->addWidget( m_labelSubProcessedSize ); + mainLayout->addLayout( tqlayout3 ); m_progressSubPercent = new KProgress( this, "m_progressSubPercent" ); mainLayout->addWidget( m_progressSubPercent ); - QHBoxLayout* layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); + TQHBoxLayout* tqlayout4 = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); - QLabel* textLabel5 = new QLabel( i18n("Overall progress:"), this, "textLabel5" ); - layout4->addWidget( textLabel5 ); + TQLabel* textLabel5 = new TQLabel( i18n("Overall progress:"), this, "textLabel5" ); + tqlayout4->addWidget( textLabel5 ); - m_labelProcessedSize = new QLabel( this, "m_labelProcessedSize" ); - m_labelProcessedSize->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); - layout4->addWidget( m_labelProcessedSize ); - mainLayout->addLayout( layout4 ); + m_labelProcessedSize = new TQLabel( this, "m_labelProcessedSize" ); + m_labelProcessedSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + tqlayout4->addWidget( m_labelProcessedSize ); + mainLayout->addLayout( tqlayout4 ); m_progressPercent = new KProgress( this, "m_progressPercent" ); mainLayout->addWidget( m_progressPercent ); - m_frameExtraInfo = new QFrame( this, "m_frameExtraInfo" ); - m_frameExtraInfo->setFrameShape( QFrame::NoFrame ); - m_frameExtraInfo->setFrameShadow( QFrame::Raised ); - m_frameExtraInfoLayout = new QGridLayout( m_frameExtraInfo ); + m_frameExtraInfo = new TQFrame( this, "m_frameExtraInfo" ); + m_frameExtraInfo->setFrameShape( TQFrame::NoFrame ); + m_frameExtraInfo->setFrameShadow( TQFrame::Raised ); + m_frameExtraInfoLayout = new TQGridLayout( m_frameExtraInfo ); m_frameExtraInfoLayout->setMargin(0); m_frameExtraInfoLayout->setSpacing( spacingHint() ); mainLayout->addWidget( m_frameExtraInfo ); - QFrame* line2 = new QFrame( this, "line2" ); - line2->setFrameShape( QFrame::HLine ); - line2->setFrameShadow( QFrame::Sunken ); + TQFrame* line2 = new TQFrame( this, "line2" ); + line2->setFrameShape( TQFrame::HLine ); + line2->setFrameShadow( TQFrame::Sunken ); mainLayout->addWidget( line2 ); - QHBoxLayout* layout5 = new QHBoxLayout( 0, 0, 6, "layout5"); - QSpacerItem* spacer = new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ); - layout5->addItem( spacer ); + TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5"); + TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + tqlayout5->addItem( spacer ); m_buttonCancel = new KPushButton( KStdGuiItem::cancel(), this, "m_buttonCancel" ); - layout5->addWidget( m_buttonCancel ); + tqlayout5->addWidget( m_buttonCancel ); m_buttonClose = new KPushButton( KStdGuiItem::close(), this ); - layout5->addWidget( m_buttonClose ); - m_buttonShowDebug = new QPushButton( i18n("Show Debugging Output"), this ); - layout5->addWidget( m_buttonShowDebug ); + tqlayout5->addWidget( m_buttonClose ); + m_buttonShowDebug = new TQPushButton( i18n("Show Debugging Output"), this ); + tqlayout5->addWidget( m_buttonShowDebug ); - mainLayout->addLayout( layout5 ); + mainLayout->addLayout( tqlayout5 ); m_pixLabel->setThemePixmap( K3bTheme::PROGRESS_WORKING ); slotThemeChanged(); - connect( k3bappcore->themeManager(), SIGNAL(themeChanged()), - this, SLOT(slotThemeChanged()) ); - connect( kapp, SIGNAL(appearanceChanged()), - this, SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), + this, TQT_SLOT(slotThemeChanged()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), + this, TQT_SLOT(slotThemeChanged()) ); } void K3bJobProgressDialog::show() { if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "hide main window while writing", false ) ) - if( QWidget* w = kapp->mainWidget() ) + if( TQWidget* w = kapp->mainWidget() ) w->hide(); if( m_osd ) { @@ -276,18 +276,18 @@ void K3bJobProgressDialog::show() } -void K3bJobProgressDialog::setExtraInfo( QWidget *extra ) +void K3bJobProgressDialog::setExtraInfo( TQWidget *extra ) { - extra->reparent( m_frameExtraInfo, QPoint(0,0) ); + extra->reparent( m_frameExtraInfo, TQPoint(0,0) ); m_frameExtraInfoLayout->addWidget( extra, 0, 0 ); } -void K3bJobProgressDialog::closeEvent( QCloseEvent* e ) +void K3bJobProgressDialog::closeEvent( TQCloseEvent* e ) { if( m_buttonClose->isVisible() ) { KDialog::closeEvent( e ); - if( QWidget* w = kapp->mainWidget() ) + if( TQWidget* w = kapp->mainWidget() ) w->show(); if( !m_plainCaption.isEmpty() ) @@ -306,27 +306,27 @@ void K3bJobProgressDialog::closeEvent( QCloseEvent* e ) void K3bJobProgressDialog::setupConnections() { - connect( m_buttonCancel, SIGNAL(clicked()), this, SLOT(slotCancelButtonPressed()) ); - connect( m_buttonClose, SIGNAL(clicked()), this, SLOT(close()) ); - connect( m_buttonShowDebug, SIGNAL(clicked()), this, SLOT(slotShowDebuggingOutput()) ); + connect( m_buttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCancelButtonPressed()) ); + connect( m_buttonClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); + connect( m_buttonShowDebug, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowDebuggingOutput()) ); } void K3bJobProgressDialog::slotProcessedSize( int processed, int size ) { - m_labelProcessedSize->setText( i18n("%1 of %2 MB").arg( processed ).arg( size ) ); + m_labelProcessedSize->setText( i18n("%1 of %2 MB").tqarg( processed ).tqarg( size ) ); } void K3bJobProgressDialog::slotProcessedSubSize( int processedTrackSize, int trackSize ) { - m_labelSubProcessedSize->setText( i18n("%1 of %2 MB").arg(processedTrackSize).arg(trackSize) ); + m_labelSubProcessedSize->setText( i18n("%1 of %2 MB").tqarg(processedTrackSize).tqarg(trackSize) ); } -void K3bJobProgressDialog::slotInfoMessage( const QString& infoString, int type ) +void K3bJobProgressDialog::slotInfoMessage( const TQString& infoString, int type ) { - QListViewItem* currentInfoItem = new QListViewItem( m_viewInfo, m_viewInfo->lastItem(), QString::null, infoString ); + TQListViewItem* currentInfoItem = new TQListViewItem( m_viewInfo, m_viewInfo->lastItem(), TQString(), infoString ); currentInfoItem->setSelectable( false ); // set the icon @@ -360,8 +360,8 @@ void K3bJobProgressDialog::slotFinished( bool success ) m_pixLabel->setThemePixmap( K3bTheme::PROGRESS_SUCCESS ); m_labelTask->setText( i18n("Success.") ); - m_labelTask->setPaletteForegroundColor( Qt::darkGreen ); - m_labelSubTask->setText( QString::null ); + m_labelTask->setPaletteForegroundColor( TQt::darkGreen ); + m_labelSubTask->setText( TQString() ); m_progressPercent->setValue(100); m_progressSubPercent->setValue(100); @@ -378,7 +378,7 @@ void K3bJobProgressDialog::slotFinished( bool success ) else { m_pixLabel->setThemePixmap( K3bTheme::PROGRESS_FAIL ); - m_labelTask->setPaletteForegroundColor( Qt::red ); + m_labelTask->setPaletteForegroundColor( TQt::red ); if( m_bCanceled ) { m_labelTask->setText( i18n("Canceled.") ); @@ -434,23 +434,23 @@ void K3bJobProgressDialog::setJob( K3bJob* job ) if( job ) { // connect to all the shit - connect( job, SIGNAL(infoMessage(const QString&,int)), this, SLOT(slotInfoMessage(const QString&,int)) ); + connect( job, TQT_SIGNAL(infoMessage(const TQString&,int)), this, TQT_SLOT(slotInfoMessage(const TQString&,int)) ); - connect( job, SIGNAL(percent(int)), m_progressPercent, SLOT(setValue(int)) ); - connect( job, SIGNAL(percent(int)), this, SLOT(slotProgress(int)) ); - connect( job, SIGNAL(subPercent(int)), m_progressSubPercent, SLOT(setValue(int)) ); + connect( job, TQT_SIGNAL(percent(int)), m_progressPercent, TQT_SLOT(setValue(int)) ); + connect( job, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotProgress(int)) ); + connect( job, TQT_SIGNAL(subPercent(int)), m_progressSubPercent, TQT_SLOT(setValue(int)) ); - connect( job, SIGNAL(processedSubSize(int, int)), this, SLOT(slotProcessedSubSize(int, int)) ); - connect( job, SIGNAL(processedSize(int, int)), this, SLOT(slotProcessedSize(int, int)) ); + connect( job, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SLOT(slotProcessedSubSize(int, int)) ); + connect( job, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotProcessedSize(int, int)) ); - connect( job, SIGNAL(newTask(const QString&)), this, SLOT(slotNewTask(const QString&)) ); - connect( job, SIGNAL(newSubTask(const QString&)), this, SLOT(slotNewSubTask(const QString&)) ); - connect( job, SIGNAL(started()), this, SLOT(slotStarted()) ); - connect( job, SIGNAL(finished(bool)), this, SLOT(slotFinished(bool)) ); - connect( job, SIGNAL(canceled()), this, SLOT(slotCanceled()) ); + connect( job, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SLOT(slotNewTask(const TQString&)) ); + connect( job, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); + connect( job, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()) ); + connect( job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotFinished(bool)) ); + connect( job, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); - connect( job, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SLOT(slotDebuggingOutput(const QString&, const QString&)) ); + connect( job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SLOT(slotDebuggingOutput(const TQString&, const TQString&)) ); m_labelJob->setText( m_job->jobDescription() ); m_labelJobDetails->setText( m_job->jobDetails() ); @@ -467,8 +467,8 @@ void K3bJobProgressDialog::setJob( K3bJob* job ) if( m_osd ) { m_osd->setText( job->jobDescription() ); // FIXME: use a setJob method and let the osd also change the text color to red/green - // connect( job, SIGNAL(newTask(const QString&)), m_osd, SLOT(setText(const QString&)) ); - connect( job, SIGNAL(percent(int)), m_osd, SLOT(setProgress(int)) ); + // connect( job, TQT_SIGNAL(newTask(const TQString&)), m_osd, TQT_SLOT(setText(const TQString&)) ); + connect( job, TQT_SIGNAL(percent(int)), m_osd, TQT_SLOT(setProgress(int)) ); } } } @@ -486,14 +486,14 @@ void K3bJobProgressDialog::slotCancelButtonPressed() } -void K3bJobProgressDialog::slotNewSubTask(const QString& name) +void K3bJobProgressDialog::slotNewSubTask(const TQString& name) { m_labelSubTask->setText(name); m_labelSubProcessedSize->setText(""); m_progressSubPercent->setValue(0); } -void K3bJobProgressDialog::slotNewTask(const QString& name) +void K3bJobProgressDialog::slotNewTask(const TQString& name) { m_labelTask->setText( name ); } @@ -503,7 +503,7 @@ void K3bJobProgressDialog::slotStarted() { d->lastProgress = 0; m_timer->start( 1000 ); - m_startTime = QTime::currentTime(); + m_startTime = TQTime::currentTime(); if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) m_plainCaption = w->caption(); @@ -513,19 +513,19 @@ void K3bJobProgressDialog::slotStarted() void K3bJobProgressDialog::slotUpdateTime() { - int elapsed = m_startTime.secsTo( QTime::currentTime() ); + int elapsed = m_startTime.secsTo( TQTime::currentTime() ); - QString s = i18n("Elapsed time: %1 h").arg( QTime().addSecs(elapsed).toString() ); + TQString s = i18n("Elapsed time: %1 h").tqarg( TQTime().addSecs(elapsed).toString() ); if( d->lastProgress > 0 && d->lastProgress < 100 ) { int rem = m_startTime.secsTo( m_lastProgressUpdateTime ) * (100-d->lastProgress) / d->lastProgress; - s += " / " + i18n("Remaining: %1 h").arg( QTime().addSecs(rem).toString() ); + s += " / " + i18n("Remaining: %1 h").tqarg( TQTime().addSecs(rem).toString() ); } m_labelElapsedTime->setText( s ); } -void K3bJobProgressDialog::slotDebuggingOutput( const QString& type, const QString& output ) +void K3bJobProgressDialog::slotDebuggingOutput( const TQString& type, const TQString& output ) { m_debugOutputMap[type].append(output); m_logFile.addOutput( type, output ); @@ -544,17 +544,17 @@ void K3bJobProgressDialog::slotProgress( int percent ) { if( percent > d->lastProgress ) { d->lastProgress = percent; - m_lastProgressUpdateTime = QTime::currentTime(); + m_lastProgressUpdateTime = TQTime::currentTime(); if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) { - w->setPlainCaption( QString( "(%1%) %2" ).arg(percent).arg(m_plainCaption) ); + w->setPlainCaption( TQString( "(%1%) %2" ).tqarg(percent).tqarg(m_plainCaption) ); } - setCaption( QString( "(%1%) %2" ).arg(percent).arg(m_job->jobDescription()) ); + setCaption( TQString( "(%1%) %2" ).tqarg(percent).tqarg(m_job->jobDescription()) ); } } -void K3bJobProgressDialog::keyPressEvent( QKeyEvent *e ) +void K3bJobProgressDialog::keyPressEvent( TQKeyEvent *e ) { e->accept(); @@ -579,9 +579,9 @@ void K3bJobProgressDialog::keyPressEvent( QKeyEvent *e ) } -QSize K3bJobProgressDialog::sizeHint() const +TQSize K3bJobProgressDialog::tqsizeHint() const { - QSize s = layout()->totalSizeHint(); + TQSize s = tqlayout()->totalSizeHint(); if( s.width() < s.height() ) s.setWidth( s.height() ); return s; @@ -599,7 +599,7 @@ int K3bJobProgressDialog::startJob( K3bJob* job ) return -1; } - // the following code is mainly taken from QDialog::exec + // the following code is mainly taken from TQDialog::exec if ( in_loop ) { kdError() << "(K3bJobProgressDialog::startJob) Recursive call detected." << endl; @@ -619,7 +619,7 @@ int K3bJobProgressDialog::startJob( K3bJob* job ) m_job->start(); in_loop = true; - QApplication::eventLoop()->enterLoop(); + TQApplication::eventLoop()->enterLoop(); if ( !wasShowModal ) clearWFlags( WShowModal ); @@ -636,7 +636,7 @@ int K3bJobProgressDialog::startJob( K3bJob* job ) void K3bJobProgressDialog::hide() { // we need to reimplement this since - // QDialog does not know if we are in a loop from startJob + // TQDialog does not know if we are in a loop from startJob if ( isHidden() ) return; @@ -645,7 +645,7 @@ void K3bJobProgressDialog::hide() if ( in_loop ) { in_loop = FALSE; - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); } } @@ -653,16 +653,16 @@ void K3bJobProgressDialog::hide() int K3bJobProgressDialog::waitForMedia( K3bDevice::Device* device, int mediaState, int mediaType, - const QString& message ) + const TQString& message ) { return K3bEmptyDiscWaiter::wait( device, mediaState, mediaType, message, this ); } -bool K3bJobProgressDialog::questionYesNo( const QString& text, - const QString& caption, - const QString& yesText, - const QString& noText ) +bool K3bJobProgressDialog::questionYesNo( const TQString& text, + const TQString& caption, + const TQString& yesText, + const TQString& noText ) { return ( KMessageBox::questionYesNo( this, text, @@ -672,8 +672,8 @@ bool K3bJobProgressDialog::questionYesNo( const QString& text, } -void K3bJobProgressDialog::blockingInformation( const QString& text, - const QString& caption ) +void K3bJobProgressDialog::blockingInformation( const TQString& text, + const TQString& caption ) { KMessageBox::information( this, text, caption ); } @@ -682,14 +682,14 @@ void K3bJobProgressDialog::blockingInformation( const QString& text, void K3bJobProgressDialog::slotThemeChanged() { if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { - static_cast<QWidget*>(child( "frame4" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - static_cast<QWidget*>(child( "frame4" ))->setPaletteForegroundColor( theme->backgroundColor() ); - static_cast<QWidget*>(child( "frame5" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - static_cast<QWidget*>(child( "frame5" ))->setPaletteForegroundColor( theme->backgroundColor() ); - static_cast<QWidget*>(child( "progressHeaderFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - static_cast<QWidget*>(child( "progressHeaderFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); - static_cast<QWidget*>(child( "headerFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - static_cast<QWidget*>(child( "headerFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); + TQT_TQWIDGET(child( "frame4" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + TQT_TQWIDGET(child( "frame4" ))->setPaletteForegroundColor( theme->backgroundColor() ); + TQT_TQWIDGET(child( "frame5" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + TQT_TQWIDGET(child( "frame5" ))->setPaletteForegroundColor( theme->backgroundColor() ); + TQT_TQWIDGET(child( "progressHeaderFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + TQT_TQWIDGET(child( "progressHeaderFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); + TQT_TQWIDGET(child( "headerFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + TQT_TQWIDGET(child( "headerFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); } } diff --git a/src/k3bjobprogressdialog.h b/src/k3bjobprogressdialog.h index 5bc1af2..dc58501 100644 --- a/src/k3bjobprogressdialog.h +++ b/src/k3bjobprogressdialog.h @@ -23,25 +23,25 @@ #include <k3bjobhandler.h> -#include <qdatetime.h> -#include <qfile.h> +#include <tqdatetime.h> +#include <tqfile.h> -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; class KListView; -class QFrame; -class QGroupBox; -class QLabel; -class QListViewItem; +class TQFrame; +class TQGroupBox; +class TQLabel; +class TQListViewItem; class KProgress; -class QPushButton; -class QTimer; +class TQPushButton; +class TQTimer; class K3bJob; class KCutLabel; -class QCloseEvent; -class QGridLayout; -class QKeyEvent; +class TQCloseEvent; +class TQGridLayout; +class TQKeyEvent; class K3bJobProgressOSD; class K3bThemedLabel; @@ -49,9 +49,10 @@ class K3bThemedLabel; class K3bJobProgressDialog : public KDialog, public K3bJobHandler { Q_OBJECT + TQ_OBJECT public: - K3bJobProgressDialog( QWidget* parent = 0, + K3bJobProgressDialog( TQWidget* tqparent = 0, const char* name = 0, bool showSubProgress = true, bool modal = FALSE, @@ -59,7 +60,7 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler virtual ~K3bJobProgressDialog(); virtual void setJob( K3bJob* job ); - void setExtraInfo( QWidget *extra ); + void setExtraInfo( TQWidget *extra ); /** * reimplemented for internal reasons @@ -78,7 +79,7 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler */ int startJob( K3bJob* job = 0 ); - QSize sizeHint() const; + TQSize tqsizeHint() const; /** * @reimplemented from K3bJobHandler @@ -86,29 +87,29 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler int waitForMedia( K3bDevice::Device*, int mediaState = K3bDevice::STATE_EMPTY, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - const QString& message = QString::null ); + const TQString& message = TQString() ); /** * @reimplemented from K3bJobHandler */ - bool questionYesNo( const QString& text, - const QString& caption = QString::null, - const QString& yesText = QString::null, - const QString& noText = QString::null ); + bool questionYesNo( const TQString& text, + const TQString& caption = TQString(), + const TQString& yesText = TQString(), + const TQString& noText = TQString() ); /** * reimplemented from K3bJobHandler */ - void blockingInformation( const QString& text, - const QString& caption = QString::null ); + void blockingInformation( const TQString& text, + const TQString& caption = TQString() ); protected slots: virtual void slotProcessedSize( int processed, int size ); virtual void slotProcessedSubSize( int processed, int size ); - virtual void slotInfoMessage( const QString& infoString, int type ); - virtual void slotDebuggingOutput( const QString&, const QString& ); - virtual void slotNewSubTask(const QString& name); - virtual void slotNewTask(const QString& name); + virtual void slotInfoMessage( const TQString& infoString, int type ); + virtual void slotDebuggingOutput( const TQString&, const TQString& ); + virtual void slotNewSubTask(const TQString& name); + virtual void slotNewTask(const TQString& name); virtual void slotFinished(bool); virtual void slotCanceled(); virtual void slotStarted(); @@ -123,8 +124,8 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler virtual void slotThemeChanged(); protected: - void closeEvent( QCloseEvent* ); - void keyPressEvent( QKeyEvent* e ); + void closeEvent( TQCloseEvent* ); + void keyPressEvent( TQKeyEvent* e ); void setupGUI(); void setupConnections(); @@ -135,34 +136,34 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler K3bThemedLabel* m_labelTask; K3bThemedLabel* m_labelElapsedTime; KCutLabel* m_labelSubTask; - QLabel* m_labelSubProcessedSize; + TQLabel* m_labelSubProcessedSize; KProgress* m_progressSubPercent; - QLabel* m_labelProcessedSize; + TQLabel* m_labelProcessedSize; KProgress* m_progressPercent; - QFrame* m_frameExtraInfo; - QPushButton* m_buttonCancel; - QPushButton* m_buttonClose; - QPushButton* m_buttonShowDebug; + TQFrame* m_frameExtraInfo; + TQPushButton* m_buttonCancel; + TQPushButton* m_buttonClose; + TQPushButton* m_buttonShowDebug; K3bThemedLabel* m_pixLabel; - QGridLayout* m_frameExtraInfoLayout; + TQGridLayout* m_frameExtraInfoLayout; private: class Private; Private* d; K3bJob* m_job; - QTimer* m_timer; - QTime m_startTime; - QTime m_lastProgressUpdateTime; + TQTimer* m_timer; + TQTime m_startTime; + TQTime m_lastProgressUpdateTime; K3bDebuggingOutputFile m_logFile; - QMap<QString, QStringList> m_debugOutputMap; + TQMap<TQString, TQStringList> m_debugOutputMap; bool m_bCanceled; - QString m_plainCaption; + TQString m_plainCaption; bool in_loop; diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp index 0797c3a..99a8f0b 100644 --- a/src/k3bjobprogressosd.cpp +++ b/src/k3bjobprogressosd.cpp @@ -26,22 +26,22 @@ #include <klocale.h> #include <kpopupmenu.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qapplication.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqapplication.h> #include <X11/Xlib.h> -K3bJobProgressOSD::K3bJobProgressOSD( QWidget* parent, const char* name ) - : QWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ), +K3bJobProgressOSD::K3bJobProgressOSD( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ), m_dirty(true), m_progress(0), m_dragging(false), m_screen(0), m_position(s_outerMargin, s_outerMargin) { - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); setBackgroundMode( NoBackground ); // dummy size @@ -50,10 +50,10 @@ K3bJobProgressOSD::K3bJobProgressOSD( QWidget* parent, const char* name ) // make sure we are always visible KWin::setOnAllDesktops( winId(), true ); - connect( k3bappcore->themeManager(), SIGNAL(themeChanged()), - this, SLOT(refresh()) ); - connect( kapp, SIGNAL(appearanceChanged()), - this, SLOT(refresh()) ); + connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), + this, TQT_SLOT(refresh()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), + this, TQT_SLOT(refresh()) ); } @@ -70,11 +70,11 @@ void K3bJobProgressOSD::show() if( m_dirty ) renderOSD(); - QWidget::show(); + TQWidget::show(); } -void K3bJobProgressOSD::setText( const QString& text ) +void K3bJobProgressOSD::setText( const TQString& text ) { if( m_text != text ) { m_text = text; @@ -92,7 +92,7 @@ void K3bJobProgressOSD::setProgress( int p ) } -void K3bJobProgressOSD::setPosition( const QPoint& p ) +void K3bJobProgressOSD::setPosition( const TQPoint& p ) { m_position = p; reposition(); @@ -118,21 +118,21 @@ void K3bJobProgressOSD::renderOSD() // calculate needed size if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { - QPixmap icon = KGlobal::iconLoader()->loadIcon( "k3b", KIcon::NoGroup, 32 ); + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "k3b", KIcon::NoGroup, 32 ); int margin = 10; int textWidth = fontMetrics().width( m_text ); // do not change the size every time the text changes, just in case we are too small - QSize newSize( QMAX( QMAX( 2*margin + icon.width() + margin + textWidth, 100 ), width() ), - QMAX( 2*margin + icon.height(), 2*margin + fontMetrics().height()*2 ) ); + TQSize newSize( TQMAX( TQMAX( 2*margin + icon.width() + margin + textWidth, 100 ), width() ), + TQMAX( 2*margin + icon.height(), 2*margin + fontMetrics().height()*2 ) ); m_osdBuffer.resize( newSize ); - QPainter p( &m_osdBuffer ); + TQPainter p( &m_osdBuffer ); p.setPen( theme->foregroundColor() ); // draw the background and the frame - QRect thisRect( 0, 0, newSize.width(), newSize.height() ); + TQRect thisRect( 0, 0, newSize.width(), newSize.height() ); p.fillRect( thisRect, theme->backgroundColor() ); p.drawRect( thisRect ); @@ -140,14 +140,14 @@ void K3bJobProgressOSD::renderOSD() p.drawPixmap( margin, (newSize.height()-icon.height())/2, icon ); // draw the text - QSize textSize = fontMetrics().size( 0, m_text ); + TQSize textSize = fontMetrics().size( 0, m_text ); int textX = 2*margin + icon.width(); int textY = margin + fontMetrics().ascent(); p.drawText( textX, textY, m_text ); // draw the progress textY += fontMetrics().descent() + 4; - QRect progressRect( textX, textY, newSize.width()-textX-margin, newSize.height()-textY-margin ); + TQRect progressRect( textX, textY, newSize.width()-textX-margin, newSize.height()-textY-margin ); p.drawRect( progressRect ); progressRect.setWidth( m_progress > 0 ? m_progress*progressRect.width()/100 : 0 ); p.fillRect( progressRect, theme->foregroundColor() ); @@ -164,19 +164,19 @@ void K3bJobProgressOSD::renderOSD() void K3bJobProgressOSD::setScreen( int screen ) { - const int n = QApplication::desktop()->numScreens(); + const int n = TQApplication::desktop()->numScreens(); m_screen = (screen >= n) ? n-1 : screen; reposition(); } -void K3bJobProgressOSD::reposition( QSize newSize ) +void K3bJobProgressOSD::reposition( TQSize newSize ) { if( !newSize.isValid() ) newSize = size(); - QPoint newPos = m_position; - const QRect& screen = QApplication::desktop()->screenGeometry( m_screen ); + TQPoint newPos = m_position; + const TQRect& screen = TQApplication::desktop()->screenGeometry( m_screen ); // now to properly resize if put into one of the corners we interpret the position // depending on the quadrant @@ -201,21 +201,21 @@ void K3bJobProgressOSD::reposition( QSize newSize ) } -void K3bJobProgressOSD::paintEvent( QPaintEvent* ) +void K3bJobProgressOSD::paintEvent( TQPaintEvent* ) { bitBlt( this, 0, 0, &m_osdBuffer ); } -void K3bJobProgressOSD::mousePressEvent( QMouseEvent* e ) +void K3bJobProgressOSD::mousePressEvent( TQMouseEvent* e ) { m_dragOffset = e->pos(); - if( e->button() == LeftButton && !m_dragging ) { + if( e->button() == Qt::LeftButton && !m_dragging ) { grabMouse( KCursor::sizeAllCursor() ); m_dragging = true; } - else if( e->button() == RightButton ) { + else if( e->button() == Qt::RightButton ) { KPopupMenu m; if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->globalPos() ) ) hide(); @@ -223,7 +223,7 @@ void K3bJobProgressOSD::mousePressEvent( QMouseEvent* e ) } -void K3bJobProgressOSD::mouseReleaseEvent( QMouseEvent* ) +void K3bJobProgressOSD::mouseReleaseEvent( TQMouseEvent* ) { if( m_dragging ) { m_dragging = false; @@ -232,16 +232,16 @@ void K3bJobProgressOSD::mouseReleaseEvent( QMouseEvent* ) } -void K3bJobProgressOSD::mouseMoveEvent( QMouseEvent* e ) +void K3bJobProgressOSD::mouseMoveEvent( TQMouseEvent* e ) { if( m_dragging && this == mouseGrabber() ) { // check if the osd has been dragged out of the current screen - int currentScreen = QApplication::desktop()->screenNumber( e->globalPos() ); + int currentScreen = TQApplication::desktop()->screenNumber( e->globalPos() ); if( currentScreen != -1 ) m_screen = currentScreen; - const QRect& screen = QApplication::desktop()->screenGeometry( m_screen ); + const TQRect& screen = TQApplication::desktop()->screenGeometry( m_screen ); // make sure the position is valid m_position = fixupPosition( e->globalPos() - m_dragOffset - screen.topLeft() ); @@ -260,10 +260,10 @@ void K3bJobProgressOSD::mouseMoveEvent( QMouseEvent* e ) } -QPoint K3bJobProgressOSD::fixupPosition( const QPoint& pp ) +TQPoint K3bJobProgressOSD::fixupPosition( const TQPoint& pp ) { - QPoint p(pp); - const QRect& screen = QApplication::desktop()->screenGeometry( m_screen ); + TQPoint p(pp); + const TQRect& screen = TQApplication::desktop()->screenGeometry( m_screen ); int maxY = screen.height() - height() - s_outerMargin; int maxX = screen.width() - width() - s_outerMargin; diff --git a/src/k3bjobprogressosd.h b/src/k3bjobprogressosd.h index 1bb9221..8d7d886 100644 --- a/src/k3bjobprogressosd.h +++ b/src/k3bjobprogressosd.h @@ -16,11 +16,11 @@ #ifndef _K3B_JOB_PROGRESS_OSD_H_ #define _K3B_JOB_PROGRESS_OSD_H_ -#include <qwidget.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqpixmap.h> -class QPaintEvent; -class QMouseEvent; +class TQPaintEvent; +class TQMouseEvent; class KConfigBase; /** @@ -28,23 +28,24 @@ class KConfigBase; * * Insprired by Amarok's OSD (I also took a bit of their code. :) */ -class K3bJobProgressOSD : public QWidget +class K3bJobProgressOSD : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bJobProgressOSD( QWidget* parent = 0, const char* name = 0 ); + K3bJobProgressOSD( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bJobProgressOSD(); int screen() const { return m_screen; } - const QPoint& position() const { return m_position; } + const TQPoint& position() const { return m_position; } void readSettings( KConfigBase* ); void saveSettings( KConfigBase* ); public slots: void setScreen( int ); - void setText( const QString& ); + void setText( const TQString& ); void setProgress( int ); /** @@ -53,17 +54,17 @@ class K3bJobProgressOSD : public QWidget * If for example the x coordinate is bigger than half the screen * width it refers to the left edge of the widget. */ - void setPosition( const QPoint& ); + void setPosition( const TQPoint& ); void show(); protected: - void paintEvent( QPaintEvent* ); - void mousePressEvent( QMouseEvent* ); - void mouseReleaseEvent( QMouseEvent* ); - void mouseMoveEvent( QMouseEvent* ); + void paintEvent( TQPaintEvent* ); + void mousePressEvent( TQMouseEvent* ); + void mouseReleaseEvent( TQMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); void renderOSD(); - void reposition( QSize size = QSize() ); + void reposition( TQSize size = TQSize() ); protected slots: void refresh(); @@ -72,17 +73,17 @@ class K3bJobProgressOSD : public QWidget /** * Ensure that the position is inside m_screen */ - QPoint fixupPosition( const QPoint& p ); + TQPoint fixupPosition( const TQPoint& p ); static const int s_outerMargin = 15; - QPixmap m_osdBuffer; + TQPixmap m_osdBuffer; bool m_dirty; - QString m_text; + TQString m_text; int m_progress; bool m_dragging; - QPoint m_dragOffset; + TQPoint m_dragOffset; int m_screen; - QPoint m_position; + TQPoint m_position; }; #endif diff --git a/src/k3blsofwrapper.cpp b/src/k3blsofwrapper.cpp index 56d5d5b..0362de6 100644 --- a/src/k3blsofwrapper.cpp +++ b/src/k3blsofwrapper.cpp @@ -19,13 +19,13 @@ #include <k3bprocess.h> #include <k3bglobals.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqfileinfo.h> #include <sys/types.h> #include <unistd.h> -static K3bLsofWrapper::Process createProcess( const QString& name, int pid ) +static K3bLsofWrapper::Process createProcess( const TQString& name, int pid ) { K3bLsofWrapper::Process p; p.name = name; @@ -37,8 +37,8 @@ static K3bLsofWrapper::Process createProcess( const QString& name, int pid ) class K3bLsofWrapper::Private { public: - QValueList<Process> apps; - QString lsofBin; + TQValueList<Process> apps; + TQString lsofBin; }; @@ -77,10 +77,10 @@ bool K3bLsofWrapper::checkDevice( K3bDevice::Device* dev ) // // now process its output - QStringList l = QStringList::split( "\n", out.output() ); - for( QStringList::iterator it = l.begin(); it != l.end(); ++it ) { + TQStringList l = TQStringList::split( "\n", out.output() ); + for( TQStringList::iterator it = l.begin(); it != l.end(); ++it ) { int pid = (*it).mid(1).toInt(); - QString app = (*(++it)).mid(1); + TQString app = (*(++it)).mid(1); kdDebug() << "(K3bLsofWrapper) matched: app: " << app << " pid: " << pid << endl; @@ -93,7 +93,7 @@ bool K3bLsofWrapper::checkDevice( K3bDevice::Device* dev ) } -const QValueList<K3bLsofWrapper::Process>& K3bLsofWrapper::usingApplications() const +const TQValueList<K3bLsofWrapper::Process>& K3bLsofWrapper::usingApplications() const { return d->apps; } diff --git a/src/k3blsofwrapper.h b/src/k3blsofwrapper.h index 8ab11dc..aeaa51c 100644 --- a/src/k3blsofwrapper.h +++ b/src/k3blsofwrapper.h @@ -16,7 +16,7 @@ #ifndef _K3B_LSOF_WRAPPER_H_ #define _K3B_LSOF_WRAPPER_H_ -#include <qvaluelist.h> +#include <tqvaluelist.h> namespace K3bDevice { class Device; @@ -38,7 +38,7 @@ class K3bLsofWrapper bool checkDevice( K3bDevice::Device* ); struct Process { - QString name; + TQString name; int pid; }; @@ -47,7 +47,7 @@ class K3bLsofWrapper * handle on the device used in the last successful call * to checkDevice. */ - const QValueList<Process>& usingApplications() const; + const TQValueList<Process>& usingApplications() const; private: bool findLsofExecutable(); diff --git a/src/k3blsofwrapperdialog.cpp b/src/k3blsofwrapperdialog.cpp index e081e38..280def8 100644 --- a/src/k3blsofwrapperdialog.cpp +++ b/src/k3blsofwrapperdialog.cpp @@ -23,28 +23,28 @@ #include <klocale.h> #include <kmessagebox.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <sys/types.h> #include <signal.h> -static QString joinProcessNames( const QValueList<K3bLsofWrapper::Process>& apps ) +static TQString joinProcessNames( const TQValueList<K3bLsofWrapper::Process>& apps ) { - QStringList l; - for( QValueList<K3bLsofWrapper::Process>::const_iterator it = apps.begin(); + TQStringList l; + for( TQValueList<K3bLsofWrapper::Process>::const_iterator it = apps.begin(); it != apps.end(); ++it ) l.append( (*it).name ); return l.join( ", " ); } -K3bLsofWrapperDialog::K3bLsofWrapperDialog( QWidget* parent ) +K3bLsofWrapperDialog::K3bLsofWrapperDialog( TQWidget* tqparent ) : KDialogBase( KDialogBase::Swallow, i18n("Device in use"), Close|User1|User2, Close, - parent, + tqparent, 0, true, true, @@ -56,8 +56,8 @@ K3bLsofWrapperDialog::K3bLsofWrapperDialog( QWidget* parent ) m_label = new K3bRichTextLabel( this ); setMainWidget( m_label ); - connect( this, SIGNAL(user1Clicked()), SLOT(slotQuitOtherApps()) ); - connect( this, SIGNAL(user2Clicked()), SLOT(slotCheckDevice()) ); + connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotQuitOtherApps()) ); + connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotCheckDevice()) ); } @@ -70,7 +70,7 @@ bool K3bLsofWrapperDialog::slotCheckDevice() { K3bLsofWrapper lsof; if( lsof.checkDevice( m_device ) ) { - const QValueList<K3bLsofWrapper::Process>& apps = lsof.usingApplications(); + const TQValueList<K3bLsofWrapper::Process>& apps = lsof.usingApplications(); if( apps.count() > 0 ) { m_label->setText( i18n("<p>Device <b>'%1'</b> is already in use by other applications " "(<em>%2</em>)." @@ -79,9 +79,9 @@ bool K3bLsofWrapperDialog::slotCheckDevice() "<p><em>Hint: Sometimes shutting down an application does not " "happen instantly. In that case you might have to use the '%3' " "button.") - .arg( m_device->vendor() + " - " + m_device->description() ) - .arg( joinProcessNames(apps) ) - .arg( actionButton( User2 )->text() ) ); + .tqarg( m_device->vendor() + " - " + m_device->description() ) + .tqarg( joinProcessNames(apps) ) + .tqarg( actionButton( User2 )->text() ) ); return true; } } @@ -97,12 +97,12 @@ void K3bLsofWrapperDialog::slotQuitOtherApps() { K3bLsofWrapper lsof; if( lsof.checkDevice( m_device ) ) { - const QValueList<K3bLsofWrapper::Process>& apps = lsof.usingApplications(); + const TQValueList<K3bLsofWrapper::Process>& apps = lsof.usingApplications(); if( apps.count() > 0 ) { if( KMessageBox::warningYesNo( this, i18n("<p>Do you really want K3b to kill the following processes: <em>") + joinProcessNames(apps) ) == KMessageBox::Yes ) { - for( QValueList<K3bLsofWrapper::Process>::const_iterator it = apps.begin(); + for( TQValueList<K3bLsofWrapper::Process>::const_iterator it = apps.begin(); it != apps.end(); ++it ) ::kill( (*it).pid, SIGTERM ); } @@ -116,9 +116,9 @@ void K3bLsofWrapperDialog::slotQuitOtherApps() } -void K3bLsofWrapperDialog::checkDevice( K3bDevice::Device* dev, QWidget* parent ) +void K3bLsofWrapperDialog::checkDevice( K3bDevice::Device* dev, TQWidget* tqparent ) { - K3bLsofWrapperDialog dlg( parent ); + K3bLsofWrapperDialog dlg( tqparent ); dlg.m_device = dev; if( dlg.slotCheckDevice() ) dlg.exec(); diff --git a/src/k3blsofwrapperdialog.h b/src/k3blsofwrapperdialog.h index e00da0b..ed08ded 100644 --- a/src/k3blsofwrapperdialog.h +++ b/src/k3blsofwrapperdialog.h @@ -26,6 +26,7 @@ namespace K3bDevice { class K3bLsofWrapperDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ~K3bLsofWrapperDialog(); @@ -37,14 +38,14 @@ class K3bLsofWrapperDialog : public KDialogBase * * If the device is not in use this method simply returns. */ - static void checkDevice( K3bDevice::Device* dev, QWidget* parent = 0 ); + static void checkDevice( K3bDevice::Device* dev, TQWidget* tqparent = 0 ); private slots: bool slotCheckDevice(); void slotQuitOtherApps(); private: - K3bLsofWrapperDialog( QWidget* parent ); + K3bLsofWrapperDialog( TQWidget* tqparent ); K3bDevice::Device* m_device; K3bRichTextLabel* m_label; diff --git a/src/k3bmediacache.cpp b/src/k3bmediacache.cpp index fa9f51b..98eac9f 100644 --- a/src/k3bmediacache.cpp +++ b/src/k3bmediacache.cpp @@ -25,22 +25,22 @@ #include <kapplication.h> #include <klocale.h> -#include <qthread.h> -#include <qmutex.h> -#include <qevent.h> +#include <tqthread.h> +#include <tqmutex.h> +#include <tqevent.h> // //////////////////////////////////////////////////////////////////////////////// // MEDIA CACHE SUPPORT CLASSES // //////////////////////////////////////////////////////////////////////////////// -class K3bMediaCache::MediaChangeEvent : public QCustomEvent +class K3bMediaCache::MediaChangeEvent : public TQCustomEvent { public: static const int EventCode; MediaChangeEvent( K3bDevice::Device* dev ) - : QCustomEvent( EventCode ), + : TQCustomEvent( EventCode ), m_device( dev ) {} K3bDevice::Device* device() const { return m_device; } @@ -49,7 +49,7 @@ private: K3bDevice::Device* m_device; }; -const int K3bMediaCache::MediaChangeEvent::EventCode = QEvent::User + 22; +const int K3bMediaCache::MediaChangeEvent::EventCode = TQEvent::User + 22; class K3bMediaCache::DeviceEntry @@ -62,7 +62,7 @@ public: int blockedId; - QMutex mutex; + TQMutex mutex; K3bMediaCache::PollThread* thread; @@ -74,7 +74,7 @@ public: }; -class K3bMediaCache::PollThread : public QThread +class K3bMediaCache::PollThread : public TQThread { public: PollThread( K3bMediaCache::DeviceEntry* de ) @@ -140,7 +140,7 @@ void K3bMediaCache::PollThread::run() // inform the media cache about the media change // if( m_deviceEntry->blockedId == 0 ) - QApplication::postEvent( m_deviceEntry->cache, + TQApplication::postEvent( m_deviceEntry->cache, new K3bMediaCache::MediaChangeEvent( m_deviceEntry->medium.device() ) ); // the information is valid. let the info go. @@ -148,7 +148,7 @@ void K3bMediaCache::PollThread::run() } if( m_deviceEntry->blockedId == 0 ) - QThread::sleep( 2 ); + TQThread::sleep( 2 ); } } @@ -161,8 +161,8 @@ void K3bMediaCache::PollThread::run() // //////////////////////////////////////////////////////////////////////////////// -K3bMediaCache::K3bMediaCache( QObject* parent ) - : QObject( parent ) +K3bMediaCache::K3bMediaCache( TQObject* tqparent ) + : TQObject( tqparent ) { } @@ -282,26 +282,26 @@ K3bDevice::CdText K3bMediaCache::cdText( K3bDevice::Device* dev ) } -QValueList<int> K3bMediaCache::writingSpeeds( K3bDevice::Device* dev ) +TQValueList<int> K3bMediaCache::writingSpeeds( K3bDevice::Device* dev ) { if( DeviceEntry* e = findDeviceEntry( dev ) ) { e->mutex.lock(); - QValueList<int> ws = e->medium.writingSpeeds(); + TQValueList<int> ws = e->medium.writingSpeeds(); e->mutex.unlock(); return ws; } else - return QValueList<int>(); + return TQValueList<int>(); } -QString K3bMediaCache::mediumString( K3bDevice::Device* device, bool useContent ) +TQString K3bMediaCache::mediumString( K3bDevice::Device* device, bool useContent ) { if( DeviceEntry* e = findDeviceEntry( device ) ) { return e->medium.shortString( useContent ); } else - return QString::null; + return TQString(); } @@ -310,13 +310,13 @@ void K3bMediaCache::clearDeviceList() kdDebug() << k_funcinfo << endl; // make all the threads stop - for( QMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.begin(); + for( TQMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.begin(); it != m_deviceMap.end(); ++it ) { it.data()->blockedId = 1; } // and remove them - for( QMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.begin(); + for( TQMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.begin(); it != m_deviceMap.end(); ++it ) { kdDebug() << k_funcinfo << " waiting for info thread " << it.key()->blockDeviceName() << " to finish" << endl; it.data()->thread->wait(); @@ -330,23 +330,23 @@ void K3bMediaCache::clearDeviceList() void K3bMediaCache::buildDeviceList( K3bDevice::DeviceManager* dm ) { // remember blocked ids - QMap<K3bDevice::Device*, int> blockedIds; - for( QMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.begin(); + TQMap<K3bDevice::Device*, int> blockedIds; + for( TQMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.begin(); it != m_deviceMap.end(); ++it ) blockedIds.insert( it.key(), it.data()->blockedId ); clearDeviceList(); - const QPtrList<K3bDevice::Device>& devices = dm->allDevices(); - for( QPtrListIterator<K3bDevice::Device> it( devices ); *it; ++it ) { + const TQPtrList<K3bDevice::Device>& devices = dm->allDevices(); + for( TQPtrListIterator<K3bDevice::Device> it( devices ); *it; ++it ) { m_deviceMap.insert( *it, new DeviceEntry( this, *it ) ); - QMap<K3bDevice::Device*, int>::const_iterator bi_it = blockedIds.find( *it ); + TQMap<K3bDevice::Device*, int>::const_iterator bi_it = blockedIds.tqfind( *it ); if( bi_it != blockedIds.end() ) m_deviceMap[*it]->blockedId = bi_it.data(); } // start all the polling threads - for( QMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.begin(); + for( TQMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.begin(); it != m_deviceMap.end(); ++it ) { if( !it.data()->blockedId ) it.data()->thread->start(); @@ -356,7 +356,7 @@ void K3bMediaCache::buildDeviceList( K3bDevice::DeviceManager* dm ) K3bMediaCache::DeviceEntry* K3bMediaCache::findDeviceEntry( K3bDevice::Device* dev ) { - QMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.find( dev ); + TQMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.tqfind( dev ); if( it != m_deviceMap.end() ) return it.data(); else @@ -364,7 +364,7 @@ K3bMediaCache::DeviceEntry* K3bMediaCache::findDeviceEntry( K3bDevice::Device* d } -void K3bMediaCache::customEvent( QCustomEvent* e ) +void K3bMediaCache::customEvent( TQCustomEvent* e ) { if( e->type() == MediaChangeEvent::EventCode ) emit mediumChanged( static_cast<MediaChangeEvent*>( e )->device() ); diff --git a/src/k3bmediacache.h b/src/k3bmediacache.h index dd0dd0d..ad13fdb 100644 --- a/src/k3bmediacache.h +++ b/src/k3bmediacache.h @@ -17,9 +17,9 @@ #ifndef _K3B_MEDIA_CACHE_H_ #define _K3B_MEDIA_CACHE_H_ -#include <qobject.h> +#include <tqobject.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <k3bdevice.h> #include <k3btoc.h> @@ -32,7 +32,7 @@ namespace K3bDevice { class DeviceManager; } -class QCustomEvent; +class TQCustomEvent; /** @@ -48,12 +48,13 @@ class QCustomEvent; * * To start the media caching call buildDeviceList(). */ -class K3bMediaCache : public QObject +class K3bMediaCache : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bMediaCache( QObject* parent = 0 ); + K3bMediaCache( TQObject* tqparent = 0 ); ~K3bMediaCache(); /** @@ -101,12 +102,12 @@ class K3bMediaCache : public QObject /** * Read cached supported writing speeds. */ - QValueList<int> writingSpeeds( K3bDevice::Device* ); + TQValueList<int> writingSpeeds( K3bDevice::Device* ); /** * \see K3bMedium::shortString() */ - QString mediumString( K3bDevice::Device* device, bool useContent = true ); + TQString mediumString( K3bDevice::Device* device, bool useContent = true ); signals: /** @@ -139,10 +140,10 @@ class K3bMediaCache : public QObject class DeviceEntry; class MediaChangeEvent; - QMap<K3bDevice::Device*, DeviceEntry*> m_deviceMap; + TQMap<K3bDevice::Device*, DeviceEntry*> m_deviceMap; DeviceEntry* findDeviceEntry( K3bDevice::Device* ); - void customEvent( QCustomEvent* ); + void customEvent( TQCustomEvent* ); }; #endif diff --git a/src/k3bmediacontentsview.cpp b/src/k3bmediacontentsview.cpp index 4f42595..2a2671a 100644 --- a/src/k3bmediacontentsview.cpp +++ b/src/k3bmediacontentsview.cpp @@ -18,10 +18,10 @@ #include <k3bmediacache.h> #include <k3bapplication.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qwidgetstack.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqwidgetstack.h> class K3bMediaContentsView::Private @@ -40,9 +40,9 @@ K3bMediaContentsView::K3bMediaContentsView( bool withHeader, int mediumContent, int mediumTypes, int mediumState, - QWidget* parent, + TQWidget* tqparent, const char* name ) - : K3bContentsView( withHeader, parent, name ) + : K3bContentsView( withHeader, tqparent, name ) { d = new Private; d->supportedMediumContent = mediumContent; @@ -50,8 +50,8 @@ K3bMediaContentsView::K3bMediaContentsView( bool withHeader, d->supportedMediumStates = mediumState; d->autoReload = true; - connect( k3bappcore->mediaCache(), SIGNAL(mediumChanged(K3bDevice::Device*)), - this, SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } @@ -131,9 +131,9 @@ void K3bMediaContentsView::enableInteraction( bool enable ) void K3bMediaContentsView::slotMediumChanged( K3bDevice::Device* dev ) { - // FIXME: derive a K3bContentsStack from QWidgetStack and let it set an active flag + // FIXME: derive a K3bContentsStack from TQWidgetStack and let it set an active flag // to replace this hack - if( QWidgetStack* stack = dynamic_cast<QWidgetStack*>( parentWidget() ) ) + if( TQWidgetStack* stack = dynamic_cast<TQWidgetStack*>( tqparentWidget() ) ) if( stack->visibleWidget() != this ) return; diff --git a/src/k3bmediacontentsview.h b/src/k3bmediacontentsview.h index 7e60838..310e180 100644 --- a/src/k3bmediacontentsview.h +++ b/src/k3bmediacontentsview.h @@ -34,6 +34,7 @@ class K3bThemedHeader; class K3bMediaContentsView : public K3bContentsView { Q_OBJECT + TQ_OBJECT public: virtual ~K3bMediaContentsView(); @@ -90,7 +91,7 @@ class K3bMediaContentsView : public K3bContentsView int mediumContent, int mediumTypes, int mediumState, - QWidget* parent = 0, + TQWidget* tqparent = 0, const char* name = 0 ); /** diff --git a/src/k3bmediaselectioncombobox.cpp b/src/k3bmediaselectioncombobox.cpp index df51566..f9a398f 100644 --- a/src/k3bmediaselectioncombobox.cpp +++ b/src/k3bmediaselectioncombobox.cpp @@ -27,19 +27,19 @@ #include <kdebug.h> #include <klocale.h> -#include <qfont.h> -#include <qmap.h> -#include <qvaluevector.h> -#include <qtooltip.h> -#include <qlistbox.h> +#include <tqfont.h> +#include <tqmap.h> +#include <tqvaluevector.h> +#include <tqtooltip.h> +#include <tqlistbox.h> -class K3bMediaSelectionComboBox::ToolTip : public QToolTip +class K3bMediaSelectionComboBox::ToolTip : public TQToolTip { public: ToolTip( K3bMediaSelectionComboBox* box ); - void maybeTip( const QPoint &pos ); + void maybeTip( const TQPoint &pos ); private: K3bMediaSelectionComboBox* m_box; @@ -47,24 +47,24 @@ private: K3bMediaSelectionComboBox::ToolTip::ToolTip( K3bMediaSelectionComboBox* box ) - : QToolTip( box->listBox()->viewport() ), + : TQToolTip( box->listBox()->viewport() ), m_box( box ) { } -void K3bMediaSelectionComboBox::ToolTip::maybeTip( const QPoint& pos ) +void K3bMediaSelectionComboBox::ToolTip::maybeTip( const TQPoint& pos ) { - if( !parentWidget() || !m_box ) + if( !tqparentWidget() || !m_box ) return; - QListBoxItem* item = m_box->listBox()->itemAt( pos ); + TQListBoxItem* item = m_box->listBox()->itemAt( pos ); if( !item ) return; int index = m_box->listBox()->index( item ); if( K3bDevice::Device* dev = m_box->deviceAt( index ) ) { - tip( m_box->listBox()->itemRect( item ), + tip( m_box->listBox()->tqitemRect( item ), m_box->mediumToolTip( k3bappcore->mediaCache()->medium( dev ) ) ); } } @@ -80,24 +80,24 @@ public: : ignoreDevice( 0 ) { } - QMap<K3bDevice::Device*, int> deviceIndexMap; - QValueVector<K3bDevice::Device*> devices; + TQMap<K3bDevice::Device*, int> deviceIndexMap; + TQValueVector<K3bDevice::Device*> devices; K3bDevice::Device* ignoreDevice; // medium strings for every entry - QMap<QString, int> mediaStringMap; + TQMap<TQString, int> mediaStringMap; int wantedMediumType; int wantedMediumState; int wantedMediumContent; - QFont font; + TQFont font; }; -K3bMediaSelectionComboBox::K3bMediaSelectionComboBox( QWidget* parent ) - : KComboBox( false, parent ) +K3bMediaSelectionComboBox::K3bMediaSelectionComboBox( TQWidget* tqparent ) + : KComboBox( false, tqparent ) { d = new Private(); @@ -108,14 +108,14 @@ K3bMediaSelectionComboBox::K3bMediaSelectionComboBox( QWidget* parent ) d->font = font(); - connect( this, SIGNAL(activated(int)), - this, SLOT(slotActivated(int)) ); - connect( k3bcore->deviceManager(), SIGNAL(changed(K3bDevice::DeviceManager*)), - this, SLOT(slotDeviceManagerChanged(K3bDevice::DeviceManager*)) ); - connect( k3bappcore->mediaCache(), SIGNAL(mediumChanged(K3bDevice::Device*)), - this, SLOT(slotMediumChanged(K3bDevice::Device*)) ); - connect( this, SIGNAL(selectionChanged(K3bDevice::Device*)), - this, SLOT(slotUpdateToolTip(K3bDevice::Device*)) ); + 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( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( this, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotUpdateToolTip(K3bDevice::Device*)) ); updateMedia(); @@ -146,9 +146,9 @@ K3bDevice::Device* K3bMediaSelectionComboBox::selectedDevice() const } -QValueList<K3bDevice::Device*> K3bMediaSelectionComboBox::allDevices() const +TQValueList<K3bDevice::Device*> K3bMediaSelectionComboBox::allDevices() const { - QValueList<K3bDevice::Device*> l; + TQValueList<K3bDevice::Device*> l; for( unsigned int i = 0; i < d->devices.count(); ++i ) l.append( d->devices[i] ); return l; @@ -157,7 +157,7 @@ QValueList<K3bDevice::Device*> K3bMediaSelectionComboBox::allDevices() const void K3bMediaSelectionComboBox::setSelectedDevice( K3bDevice::Device* dev ) { - if( dev && d->deviceIndexMap.contains( dev ) ) { + if( dev && d->deviceIndexMap.tqcontains( dev ) ) { setCurrentItem( d->deviceIndexMap[dev] ); emit selectionChanged( dev ); } @@ -234,7 +234,7 @@ void K3bMediaSelectionComboBox::clear() void K3bMediaSelectionComboBox::showNoMediumMessage() { // make it italic - QFont f( d->font ); + TQFont f( d->font ); f.setItalic( true ); setFont( f ); @@ -248,7 +248,7 @@ void K3bMediaSelectionComboBox::updateMedia() setFont( d->font ); // remember set of devices - QValueVector<K3bDevice::Device*> oldDevices = d->devices; + TQValueVector<K3bDevice::Device*> oldDevices = d->devices; // remember last selected medium K3bDevice::Device* selected = selectedDevice(); @@ -264,7 +264,7 @@ void K3bMediaSelectionComboBox::updateMedia() bool rwOnly = !( wantedMediumType() & (K3bDevice::MEDIA_CD_ROM|K3bDevice::MEDIA_DVD_ROM) ); bool dvdOnly = !( wantedMediumType() & (K3bDevice::MEDIA_CD_ROM|K3bDevice::MEDIA_WRITABLE_CD) ); - QPtrList<K3bDevice::Device> devices = k3bcore->deviceManager()->allDevices(); + TQPtrList<K3bDevice::Device> devices = k3bcore->deviceManager()->allDevices(); if( dvdOnly ) { if( rwOnly ) devices = k3bcore->deviceManager()->dvdWriter(); @@ -276,7 +276,7 @@ void K3bMediaSelectionComboBox::updateMedia() else devices = k3bcore->deviceManager()->cdReader(); - for( QPtrListIterator<K3bDevice::Device> it( devices ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( devices ); *it; ++it ) { if ( d->ignoreDevice == *it ) { continue; } @@ -298,7 +298,7 @@ void K3bMediaSelectionComboBox::updateMedia() emit selectionChanged( 0 ); } } - else if( selected && d->deviceIndexMap.contains( selected ) ) { + else if( selected && d->deviceIndexMap.tqcontains( selected ) ) { setCurrentItem( d->deviceIndexMap[selected] ); } else { @@ -340,17 +340,17 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev ) // Otherwise we show the contents type since this might also be used // for source selection. // - QString s = mediumString( k3bappcore->mediaCache()->medium( dev ) ); + TQString s = mediumString( k3bappcore->mediaCache()->medium( dev ) ); // // Now let's see if this string is already contained in the list // and if so add the device name to both // - if( d->mediaStringMap.contains( s ) ) { + if( d->mediaStringMap.tqcontains( s ) ) { // // insert the modified string // - insertItem( s + QString(" (%1 - %2)").arg(dev->vendor()).arg(dev->description()) ); + insertItem( s + TQString(" (%1 - %2)").tqarg(dev->vendor()).tqarg(dev->description()) ); // // change the already existing string if we did not already do so @@ -358,7 +358,7 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev ) // int prevIndex = d->mediaStringMap[s]; if( prevIndex >= 0 ) - changeItem( text(prevIndex) + QString(" (%1 - %2)").arg(d->devices[prevIndex]->vendor()).arg(d->devices[prevIndex]->description()), + changeItem( text(prevIndex) + TQString(" (%1 - %2)").tqarg(d->devices[prevIndex]->vendor()).tqarg(d->devices[prevIndex]->description()), prevIndex ); // @@ -419,21 +419,21 @@ bool K3bMediaSelectionComboBox::showMedium( const K3bMedium& m ) const } -QString K3bMediaSelectionComboBox::mediumString( const K3bMedium& medium ) const +TQString K3bMediaSelectionComboBox::mediumString( const K3bMedium& medium ) const { return medium.shortString( d->wantedMediumState != K3bDevice::STATE_EMPTY ); } -QString K3bMediaSelectionComboBox::mediumToolTip( const K3bMedium& m ) const +TQString K3bMediaSelectionComboBox::mediumToolTip( const K3bMedium& m ) const { return m.longString(); } -QString K3bMediaSelectionComboBox::noMediumMessage() const +TQString K3bMediaSelectionComboBox::noMediumMessage() const { - QString stateString; + TQString stateString; if( d->wantedMediumContent == K3bMedium::CONTENT_ALL ) { if( d->wantedMediumState == K3bDevice::STATE_EMPTY ) stateString = i18n("an empty %1 medium"); @@ -469,7 +469,7 @@ QString K3bMediaSelectionComboBox::noMediumMessage() const // this is basically the same as in K3bEmptyDiskWaiter // FIXME: include things like only rewritable dvd or cd since we will probably need that - QString mediumString; + TQString mediumString; if( d->wantedMediumType == (K3bDevice::MEDIA_CD_ALL|K3bDevice::MEDIA_DVD_ALL) ) mediumString = i18n("CD or DVD"); else if( d->wantedMediumType == K3bDevice::MEDIA_CD_ALL ) @@ -478,11 +478,11 @@ QString K3bMediaSelectionComboBox::noMediumMessage() const mediumString = i18n("DVD"); else if( (d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD) && (d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD) ) - mediumString = i18n("CD-R(W) or DVD%1R(W)").arg("±"); + mediumString = i18n("CD-R(W) or DVD%1R(W)").tqarg("±"); else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_SL ) - mediumString = i18n("DVD%1R(W)").arg("±"); + mediumString = i18n("DVD%1R(W)").tqarg("±"); else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_DL ) - mediumString = i18n("Double Layer DVD%1R").arg("±"); + mediumString = i18n("Double Layer DVD%1R").tqarg("±"); else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD ) mediumString = i18n("CD-R(W)"); else if( d->wantedMediumType & K3bDevice::MEDIA_DVD_ROM ) @@ -490,16 +490,16 @@ QString K3bMediaSelectionComboBox::noMediumMessage() const else mediumString = i18n("CD-ROM"); - return i18n("Please insert %1...").arg( stateString.arg( mediumString ) ); + return i18n("Please insert %1...").tqarg( stateString.tqarg( mediumString ) ); } void K3bMediaSelectionComboBox::slotUpdateToolTip( K3bDevice::Device* dev ) { // update the tooltip for the combobox (the tooltip for the dropdown box is created in the constructor) - QToolTip::remove( this ); + TQToolTip::remove( this ); if( dev ) - QToolTip::add( this, mediumToolTip( k3bappcore->mediaCache()->medium( dev ) ) ); + TQToolTip::add( this, mediumToolTip( k3bappcore->mediaCache()->medium( dev ) ) ); } #include "k3bmediaselectioncombobox.moc" diff --git a/src/k3bmediaselectioncombobox.h b/src/k3bmediaselectioncombobox.h index 8a592c9..b40011f 100644 --- a/src/k3bmediaselectioncombobox.h +++ b/src/k3bmediaselectioncombobox.h @@ -34,9 +34,10 @@ namespace K3bDevice { class K3bMediaSelectionComboBox : public KComboBox { Q_OBJECT + TQ_OBJECT public: - K3bMediaSelectionComboBox( QWidget* parent ); + K3bMediaSelectionComboBox( TQWidget* tqparent ); virtual ~K3bMediaSelectionComboBox(); /** @@ -45,7 +46,7 @@ class K3bMediaSelectionComboBox : public KComboBox */ K3bDevice::Device* selectedDevice() const; - QValueList<K3bDevice::Device*> allDevices() const; + TQValueList<K3bDevice::Device*> allDevices() const; int wantedMediumType() const; int wantedMediumState() const; @@ -113,9 +114,9 @@ class K3bMediaSelectionComboBox : public KComboBox protected: void updateMedia(); virtual bool showMedium( const K3bMedium& ) const; - virtual QString mediumString( const K3bMedium& ) const; - virtual QString mediumToolTip( const K3bMedium& ) const; - virtual QString noMediumMessage() const; + virtual TQString mediumString( const K3bMedium& ) const; + virtual TQString mediumToolTip( const K3bMedium& ) const; + virtual TQString noMediumMessage() const; private: void updateMedium( K3bDevice::Device* ); diff --git a/src/k3bmediaselectiondialog.cpp b/src/k3bmediaselectiondialog.cpp index 3607297..d4aacf5 100644 --- a/src/k3bmediaselectiondialog.cpp +++ b/src/k3bmediaselectiondialog.cpp @@ -20,25 +20,25 @@ #include <klocale.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> -K3bMediaSelectionDialog::K3bMediaSelectionDialog( QWidget* parent, - const QString& title, - const QString& text, +K3bMediaSelectionDialog::K3bMediaSelectionDialog( TQWidget* tqparent, + const TQString& title, + const TQString& text, bool modal ) : KDialogBase( KDialogBase::Plain, title.isEmpty() ? i18n("Medium Selection") : title, Ok|Cancel, Ok, - parent, + tqparent, 0, modal ) { - QGridLayout* lay = new QGridLayout( plainPage() ); + TQGridLayout* lay = new TQGridLayout( plainPage() ); - QLabel* label = new QLabel( text.isEmpty() ? i18n("Please select a medium:") : text, plainPage() ); + TQLabel* label = new TQLabel( text.isEmpty() ? i18n("Please select a medium:") : text, plainPage() ); m_combo = new K3bMediaSelectionComboBox( plainPage() ); // lay->setMargin( marginHint() ); @@ -47,8 +47,8 @@ K3bMediaSelectionDialog::K3bMediaSelectionDialog( QWidget* parent, lay->addWidget( m_combo, 1, 0 ); lay->setRowStretch( 2, 1 ); - connect( m_combo, SIGNAL(selectionChanged(K3bDevice::Device*)), - this, SLOT(slotSelectionChanged(K3bDevice::Device*)) ); + connect( m_combo, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); slotSelectionChanged( m_combo->selectedDevice() ); } @@ -90,11 +90,11 @@ void K3bMediaSelectionDialog::slotSelectionChanged( K3bDevice::Device* dev ) K3bDevice::Device* K3bMediaSelectionDialog::selectMedium( int type, int state, int content, - QWidget* parent, - const QString& title, const QString& text, + TQWidget* tqparent, + const TQString& title, const TQString& text, bool* canceled ) { - K3bMediaSelectionDialog dlg( parent, title, text ); + K3bMediaSelectionDialog dlg( tqparent, title, text ); dlg.setWantedMediumType( type ); dlg.setWantedMediumState( state ); dlg.setWantedMediumContent( content ); @@ -117,11 +117,11 @@ K3bDevice::Device* K3bMediaSelectionDialog::selectMedium( int type, int state, i K3bDevice::Device* K3bMediaSelectionDialog::selectMedium( int type, int state, - QWidget* parent, - const QString& title, const QString& text, + TQWidget* tqparent, + const TQString& title, const TQString& text, bool* canceled ) { - return selectMedium( type, state, K3bMedium::CONTENT_ALL, parent, title, text, canceled ); + return selectMedium( type, state, K3bMedium::CONTENT_ALL, tqparent, title, text, canceled ); } #include "k3bmediaselectiondialog.moc" diff --git a/src/k3bmediaselectiondialog.h b/src/k3bmediaselectiondialog.h index 317767d..e197ef5 100644 --- a/src/k3bmediaselectiondialog.h +++ b/src/k3bmediaselectiondialog.h @@ -27,14 +27,15 @@ namespace K3bDevice { class K3bMediaSelectionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Do not use the constructor. Use the static method instead. */ - K3bMediaSelectionDialog( QWidget* parent = 0, - const QString& title = QString::null, - const QString& text = QString::null, + K3bMediaSelectionDialog( TQWidget* tqparent = 0, + const TQString& title = TQString(), + const TQString& text = TQString(), bool modal = false ); ~K3bMediaSelectionDialog(); @@ -66,15 +67,15 @@ class K3bMediaSelectionDialog : public KDialogBase * If only one medium of the wanted type is found the method returns immideately * without showing the dialog. */ - static K3bDevice::Device* selectMedium( int type, int state, QWidget* parent = 0, - const QString& title = QString::null, - const QString& text = QString::null, + static K3bDevice::Device* selectMedium( int type, int state, TQWidget* tqparent = 0, + const TQString& title = TQString(), + const TQString& text = TQString(), bool* canceled = 0 ); static K3bDevice::Device* selectMedium( int type, int state, int content = K3bMedium::CONTENT_ALL, - QWidget* parent = 0, - const QString& title = QString::null, - const QString& text = QString::null, + TQWidget* tqparent = 0, + const TQString& title = TQString(), + const TQString& text = TQString(), bool* canceled = 0 ); private slots: diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp index 18d6257..9795cfd 100644 --- a/src/k3bmedium.cpp +++ b/src/k3bmedium.cpp @@ -38,7 +38,7 @@ public: K3bDevice::DiskInfo diskInfo; K3bDevice::Toc toc; K3bDevice::CdText cdText; - QValueList<int> writingSpeeds; + TQValueList<int> writingSpeeds; K3bIso9660SimplePrimaryDescriptor isoDesc; int content; }; @@ -124,7 +124,7 @@ const K3bDevice::CdText& K3bMedium::cdText() const } -const QValueList<int>& K3bMedium::writingSpeeds() const +const TQValueList<int>& K3bMedium::writingSpeeds() const { return d->writingSpeeds; } @@ -268,9 +268,9 @@ void K3bMedium::analyseContent() char buffer[8]; if ( vcdInfoFile->read( 0, buffer, 8 ) == 8 && - ( !qstrncmp( buffer, "VIDEO_CD", 8 ) || - !qstrncmp( buffer, "SUPERVCD", 8 ) || - !qstrncmp( buffer, "HQ-VCD ", 8 ) ) ) + ( !tqstrncmp( buffer, "VIDEO_CD", 8 ) || + !tqstrncmp( buffer, "SUPERVCD", 8 ) || + !tqstrncmp( buffer, "HQ-VCD ", 8 ) ) ) d->content |= CONTENT_VIDEO_CD; } } @@ -279,9 +279,9 @@ void K3bMedium::analyseContent() } -QString K3bMedium::shortString( bool useContent ) const +TQString K3bMedium::shortString( bool useContent ) const { - QString mediaTypeString = K3bDevice::mediaTypeString( diskInfo().mediaType(), true ); + TQString mediaTypeString = K3bDevice::mediaTypeString( diskInfo().mediaType(), true ); if( diskInfo().diskState() == K3bDevice::STATE_UNKNOWN ) { return i18n("No medium information"); @@ -292,7 +292,7 @@ QString K3bMedium::shortString( bool useContent ) const } else if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ) { - return i18n("Empty %1 medium").arg( mediaTypeString ); + return i18n("Empty %1 medium").tqarg( mediaTypeString ); } else { @@ -301,40 +301,40 @@ QString K3bMedium::shortString( bool useContent ) const if( toc().contentType() == K3bDevice::AUDIO || toc().contentType() == K3bDevice::MIXED ) { if( !cdText().performer().isEmpty() || !cdText().title().isEmpty() ) { - return QString("%1 - %2 (%3)") - .arg( cdText().performer() ) - .arg( cdText().title() ) - .arg( toc().contentType() == K3bDevice::AUDIO ? i18n("Audio CD") : i18n("Mixed CD") ); + return TQString("%1 - %2 (%3)") + .tqarg( cdText().performer() ) + .tqarg( cdText().title() ) + .tqarg( toc().contentType() == K3bDevice::AUDIO ? i18n("Audio CD") : i18n("Mixed CD") ); } else if( toc().contentType() == K3bDevice::AUDIO ) { return i18n("Audio CD"); } else { - return i18n("%1 (Mixed CD)").arg( beautifiedVolumeId() ); + return i18n("%1 (Mixed CD)").tqarg( beautifiedVolumeId() ); } } // DATA CD and DVD else if( !volumeId().isEmpty() ) { if( content() & CONTENT_VIDEO_DVD ) { - return QString("%1 (%2)").arg( beautifiedVolumeId() ).arg( i18n("Video DVD") ); + return TQString("%1 (%2)").tqarg( beautifiedVolumeId() ).tqarg( i18n("Video DVD") ); } else if( content() & CONTENT_VIDEO_CD ) { - return QString("%1 (%2)").arg( beautifiedVolumeId() ).arg( i18n("Video CD") ); + return TQString("%1 (%2)").tqarg( beautifiedVolumeId() ).tqarg( i18n("Video CD") ); } else if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) { - return i18n("%1 (Appendable Data %2)").arg( beautifiedVolumeId(), mediaTypeString ); + return i18n("%1 (Appendable Data %2)").tqarg( beautifiedVolumeId(), mediaTypeString ); } else { - return i18n("%1 (Complete Data %2)").arg( beautifiedVolumeId(), mediaTypeString ); + return i18n("%1 (Complete Data %2)").tqarg( beautifiedVolumeId(), mediaTypeString ); } } else { if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) { - return i18n("Appendable Data %1").arg( mediaTypeString ); + return i18n("Appendable Data %1").tqarg( mediaTypeString ); } else { - return i18n("Complete Data %1").arg( mediaTypeString ); + return i18n("Complete Data %1").tqarg( mediaTypeString ); } } } @@ -342,29 +342,29 @@ QString K3bMedium::shortString( bool useContent ) const // without content else { if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) { - return i18n("Appendable %1 medium").arg( mediaTypeString ); + return i18n("Appendable %1 medium").tqarg( mediaTypeString ); } else { - return i18n("Complete %1 medium").arg( mediaTypeString ); + return i18n("Complete %1 medium").tqarg( mediaTypeString ); } } } } -QString K3bMedium::longString() const +TQString K3bMedium::longString() const { - QString s = QString("<p><nobr><b>%1 %2</b> (%3)</nobr>" + TQString s = TQString("<p><nobr><b>%1 %2</b> (%3)</nobr>" "<p>") - .arg( d->device->vendor() ) - .arg( d->device->description() ) - .arg( d->device->blockDeviceName() ) + .tqarg( d->device->vendor() ) + .tqarg( d->device->description() ) + .tqarg( d->device->blockDeviceName() ) + shortString( true ); if( diskInfo().diskState() == K3bDevice::STATE_COMPLETE || diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) { s += "<br>" + i18n("%1 in %n track", "%1 in %n tracks", toc().count() ) - .arg( KIO::convertSize(diskInfo().size().mode1Bytes() ) ); + .tqarg( KIO::convertSize(diskInfo().size().mode1Bytes() ) ); if( diskInfo().numSessions() > 1 ) s += i18n(" and %n session", " and %n sessions", diskInfo().numSessions() ); } @@ -372,30 +372,30 @@ QString K3bMedium::longString() const if( diskInfo().diskState() == K3bDevice::STATE_EMPTY || diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) s += "<br>" + i18n("Free space: %1") - .arg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) ); + .tqarg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) ); if( !diskInfo().empty() && diskInfo().rewritable() ) s += "<br>" + i18n("Capacity: %1") - .arg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) ); + .tqarg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) ); return s; } -const QString& K3bMedium::volumeId() const +const TQString& K3bMedium::volumeId() const { return iso9660Descriptor().volumeId; } -QString K3bMedium::beautifiedVolumeId() const +TQString K3bMedium::beautifiedVolumeId() const { - const QString& oldId = volumeId(); - QString newId; + const TQString& oldId = volumeId(); + TQString newId; bool newWord = true; for( unsigned int i = 0; i < oldId.length(); ++i ) { - QChar c = oldId[i]; + TQChar c = oldId[i]; // // first let's handle the cases where we do not change // the id anyway @@ -411,7 +411,7 @@ QString K3bMedium::beautifiedVolumeId() const return oldId; // replace underscore with space - else if( c.unicode() == 95 ) { + else if( c.tqunicode() == 95 ) { newId.append( ' ' ); newWord = true; } diff --git a/src/k3bmedium.h b/src/k3bmedium.h index 22b8c00..7b649ff 100644 --- a/src/k3bmedium.h +++ b/src/k3bmedium.h @@ -67,8 +67,8 @@ class K3bMedium * media. In that case refer to K3bDevice::Device::maxWriteSpeed * combined with a manual speed selection. */ - const QValueList<int>& writingSpeeds() const; - const QString& volumeId() const; + const TQValueList<int>& writingSpeeds() const; + const TQString& volumeId() const; /** * This method tries to make a volume identificator witch uses a reduced character set @@ -77,7 +77,7 @@ class K3bMedium * * Volume ids already containing spaces or lower case characters are left unchanged. */ - QString beautifiedVolumeId() const; + TQString beautifiedVolumeId() const; /** * Content type. May be combined by a binary OR. @@ -109,7 +109,7 @@ class K3bMedium * \param useContent if true the content of the CD/DVD will be used, otherwise * the string will simply be something like "empty DVD-R medium". */ - QString shortString( bool useContent = true ) const; + TQString shortString( bool useContent = true ) const; /** * \return A HTML formatted string decribing this medium. This includes the device, the @@ -117,7 +117,7 @@ class K3bMedium * tracks. * This string may be used for tooltips or short descriptions. */ - QString longString() const; + TQString longString() const; bool operator==( const K3bMedium& other ); bool operator!=( const K3bMedium& other ); diff --git a/src/k3bminibutton.cpp b/src/k3bminibutton.cpp index 0d0a1db..9626e47 100644 --- a/src/k3bminibutton.cpp +++ b/src/k3bminibutton.cpp @@ -20,14 +20,14 @@ #include "k3bminibutton.h" -#include <qpainter.h> +#include <tqpainter.h> -K3bMiniButton::K3bMiniButton( QWidget *parent, const char * name ) - :QPushButton( parent, name ), +K3bMiniButton::K3bMiniButton( TQWidget *tqparent, const char * name ) + :TQPushButton( tqparent, name ), m_mouseOver( false ) { - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); } K3bMiniButton::~K3bMiniButton() @@ -35,9 +35,9 @@ K3bMiniButton::~K3bMiniButton() } -void K3bMiniButton::drawButton( QPainter* p ) +void K3bMiniButton::drawButton( TQPainter* p ) { - p->fillRect( 0,0, width(), height(), QBrush(colorGroup().brush(QColorGroup::Background)) ); + p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) ); p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() ); if( m_mouseOver && !isDown() ){ p->setPen( white ); @@ -45,12 +45,12 @@ void K3bMiniButton::drawButton( QPainter* p ) p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->lineTo( width() - 1, height() - 1 ); p->lineTo( 0, height() - 1 ); } if( isOn() || isDown() ){ - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->moveTo( 0, height() - 1 ); p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); @@ -61,17 +61,17 @@ void K3bMiniButton::drawButton( QPainter* p ) } } -void K3bMiniButton::enterEvent( QEvent * ) +void K3bMiniButton::enterEvent( TQEvent * ) { m_mouseOver = true; - repaint(); + tqrepaint(); } -void K3bMiniButton::leaveEvent( QEvent * ) +void K3bMiniButton::leaveEvent( TQEvent * ) { m_mouseOver = false; - repaint(); + tqrepaint(); } #include "k3bminibutton.moc" diff --git a/src/k3bminibutton.h b/src/k3bminibutton.h index b3d38a0..c04ab67 100644 --- a/src/k3bminibutton.h +++ b/src/k3bminibutton.h @@ -21,28 +21,29 @@ #ifndef _K3B_MINI_BUTTON_H_ #define _K3B_MINI_BUTTON_H_ -#include <qpushbutton.h> +#include <tqpushbutton.h> -class QPainter; -class QEvent; +class TQPainter; +class TQEvent; /** * K3bMiniButton is a minimalistic button mainly used * to show a pixmap. */ -class K3bMiniButton : public QPushButton +class K3bMiniButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - K3bMiniButton( QWidget *parent=0, const char *name=0 ); + K3bMiniButton( TQWidget *tqparent=0, const char *name=0 ); virtual ~K3bMiniButton(); protected: - virtual void drawButton( QPainter * ); - virtual void enterEvent( QEvent * ); - virtual void leaveEvent( QEvent * ); + virtual void drawButton( TQPainter * ); + virtual void enterEvent( TQEvent * ); + virtual void leaveEvent( TQEvent * ); private: bool m_mouseOver; diff --git a/src/k3bmusicbrainz.cpp b/src/k3bmusicbrainz.cpp index f0415af..6fd9d9e 100644 --- a/src/k3bmusicbrainz.cpp +++ b/src/k3bmusicbrainz.cpp @@ -31,8 +31,8 @@ class K3bMusicBrainz::Private public: musicbrainz_t mb; - QStringList titles; - QStringList artists; + TQStringList titles; + TQStringList artists; }; @@ -51,7 +51,7 @@ K3bMusicBrainz::~K3bMusicBrainz() } -int K3bMusicBrainz::query( const QCString& trm ) +int K3bMusicBrainz::query( const TQCString& trm ) { d->titles.clear(); d->artists.clear(); @@ -69,11 +69,11 @@ int K3bMusicBrainz::query( const QCString& trm ) unsigned int i = 1; while( mb_Select(d->mb, (char*)MBS_Rewind) && mb_Select1( d->mb, (char*)MBS_SelectTrack, i ) ) { - QCString data(256); + TQCString data(256); mb_GetResultData( d->mb, (char*)MBE_TrackGetArtistName, data.data(), 256 ); - d->artists.append( QString::fromUtf8( data ).stripWhiteSpace() ); + d->artists.append( TQString::fromUtf8( data ).stripWhiteSpace() ); mb_GetResultData( d->mb, (char*)MBE_TrackGetTrackName, data.data(), 256 ); - d->titles.append( QString::fromUtf8( data ).stripWhiteSpace() ); + d->titles.append( TQString::fromUtf8( data ).stripWhiteSpace() ); ++i; } @@ -89,13 +89,13 @@ int K3bMusicBrainz::query( const QCString& trm ) } -const QString& K3bMusicBrainz::title( unsigned int i ) const +const TQString& K3bMusicBrainz::title( unsigned int i ) const { return d->titles[i]; } -const QString& K3bMusicBrainz::artist( unsigned int i ) const +const TQString& K3bMusicBrainz::artist( unsigned int i ) const { return d->artists[i]; } diff --git a/src/k3bmusicbrainz.h b/src/k3bmusicbrainz.h index 6cf5d06..bcf629c 100644 --- a/src/k3bmusicbrainz.h +++ b/src/k3bmusicbrainz.h @@ -20,8 +20,8 @@ #ifdef HAVE_MUSICBRAINZ -#include <qcstring.h> -#include <qstring.h> +#include <tqcstring.h> +#include <tqstring.h> /** @@ -38,10 +38,10 @@ class K3bMusicBrainz /** * \return number of found results. */ - int query( const QCString& trm ); + int query( const TQCString& trm ); - const QString& title( unsigned int i = 0 ) const; - const QString& artist( unsigned int i = 0 ) const; + const TQString& title( unsigned int i = 0 ) const; + const TQString& artist( unsigned int i = 0 ) const; private: class Private; diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp index d1865cf..384615a 100644 --- a/src/k3bpassivepopup.cpp +++ b/src/k3bpassivepopup.cpp @@ -28,14 +28,14 @@ #include <kpushbutton.h> #include <kactivelabel.h> -#include <qtimer.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qmainwindow.h> -#include <qmessagebox.h> -#include <qstyle.h> -#include <qtooltip.h> -#include <qfont.h> +#include <tqtimer.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqmainwindow.h> +#include <tqmessagebox.h> +#include <tqstyle.h> +#include <tqtooltip.h> +#include <tqfont.h> static const char* const sticky_xpm[] = { @@ -49,33 +49,33 @@ static const char* const sticky_xpm[] = { "#####" }; -static QPixmap themedMessageBoxIcon( K3bPassivePopup::MessageType mt ) +static TQPixmap themedMessageBoxIcon( K3bPassivePopup::MessageType mt ) { - QString icon_name; - QMessageBox::Icon qIcon; + TQString icon_name; + TQMessageBox::Icon qIcon; switch( mt ) { case K3bPassivePopup::Information: - qIcon = QMessageBox::Information; + qIcon = TQMessageBox::Information; icon_name = "messagebox_info"; break; case K3bPassivePopup::Warning: - qIcon = QMessageBox::Warning; + qIcon = TQMessageBox::Warning; icon_name = "messagebox_warning"; break; case K3bPassivePopup::Error: - qIcon = QMessageBox::Critical; + qIcon = TQMessageBox::Critical; icon_name = "messagebox_critical"; break; default: - return QPixmap(); + return TQPixmap(); 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( qIcon ); + return TQMessageBox::standardIcon( qIcon ); else return ret; } @@ -88,59 +88,59 @@ public: int showEffect; K3bTimeoutWidget* timeoutWidget; - QLabel* titleLabel; + TQLabel* titleLabel; KActiveLabel* messageLabel; - QLabel* pixmapLabel; + TQLabel* pixmapLabel; K3bMiniButton* closeButton; K3bMiniButton* stickyButton; }; -K3bPassivePopup::K3bPassivePopup( QWidget* parent ) - : QFrame( parent ) +K3bPassivePopup::K3bPassivePopup( TQWidget* tqparent ) + : TQFrame( tqparent ) { d = new Private; d->timeout = 6000; d->showEffect = 0; - setFrameStyle( QFrame::StyledPanel | QFrame::Raised ); - // setWFlags( Qt::WX11BypassWM ); + setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); + // setWFlags( TQt::WX11BypassWM ); - QVBoxLayout* mainLay = new QVBoxLayout( this ); + TQVBoxLayout* mainLay = new TQVBoxLayout( this ); mainLay->setMargin( frameWidth() ); mainLay->setSpacing( 0 ); - QGridLayout* grid = new QGridLayout; + TQGridLayout* grid = new TQGridLayout; grid->setMargin( 9 ); grid->setSpacing( 6 ); - d->titleLabel = new QLabel( this ); + d->titleLabel = new TQLabel( this ); d->titleLabel->setMargin( 5 ); - d->titleLabel->setAlignment( Qt::AlignCenter ); - QFont fnt( d->titleLabel->font() ); + d->titleLabel->tqsetAlignment( TQt::AlignCenter ); + TQFont fnt( d->titleLabel->font() ); fnt.setBold( true ); d->titleLabel->setFont( fnt ); d->messageLabel = new KActiveLabel( this ); - d->pixmapLabel = new QLabel( this ); - d->pixmapLabel->setAlignment( Qt::AlignTop ); + d->pixmapLabel = new TQLabel( this ); + d->pixmapLabel->tqsetAlignment( TQt::AlignTop ); d->timeoutWidget = new K3bTimeoutWidget( this ); - connect( d->timeoutWidget, SIGNAL(timeout()), this, SLOT(slotClose()) ); + connect( d->timeoutWidget, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClose()) ); d->closeButton = new K3bMiniButton( d->titleLabel ); - d->closeButton->setPixmap( style().stylePixmap( QStyle::SP_TitleBarCloseButton, this ) ); + d->closeButton->setPixmap( tqstyle().stylePixmap( TQStyle::SP_TitleBarCloseButton, this ) ); d->closeButton->setFixedSize( d->closeButton->pixmap()->width(), d->closeButton->pixmap()->height() ); - QToolTip::add( d->closeButton, i18n("Close") ); - connect( d->closeButton, SIGNAL(clicked()), this, SLOT(slotClose()) ); + TQToolTip::add( d->closeButton, i18n("Close") ); + connect( d->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()) ); d->stickyButton = new K3bMiniButton( d->titleLabel ); d->stickyButton->setToggleButton( true ); d->stickyButton->setPixmap( const_cast< const char** >( sticky_xpm ) ); d->stickyButton->setFixedSize( d->closeButton->pixmap()->width(), d->closeButton->pixmap()->height() ); - QToolTip::add( d->stickyButton, i18n("Keep Open") ); - connect( d->stickyButton, SIGNAL(toggled(bool)), this, SLOT(slotSticky(bool)) ); + TQToolTip::add( d->stickyButton, i18n("Keep Open") ); + connect( d->stickyButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSticky(bool)) ); grid->addWidget( d->pixmapLabel, 0, 0 ); grid->addWidget( d->messageLabel, 0, 1 ); @@ -150,7 +150,7 @@ K3bPassivePopup::K3bPassivePopup( QWidget* parent ) mainLay->addWidget( d->titleLabel ); mainLay->addLayout( grid, 1 ); - QHBoxLayout* titleLay = new QHBoxLayout( d->titleLabel ); + TQHBoxLayout* titleLay = new TQHBoxLayout( d->titleLabel ); titleLay->setMargin( d->titleLabel->margin() ); titleLay->setSpacing( 2 ); titleLay->addStretch(); @@ -162,7 +162,7 @@ K3bPassivePopup::K3bPassivePopup( QWidget* parent ) d->titleLabel->setPaletteForegroundColor( theme->foregroundColor() ); } - setTitle( QString::null ); + setTitle( TQString() ); setMessageType( Information ); } @@ -187,14 +187,14 @@ void K3bPassivePopup::setShowCountdown( bool b ) } -void K3bPassivePopup::setMessage( const QString& m ) +void K3bPassivePopup::setMessage( const TQString& m ) { d->messageLabel->setText( "<qt>" + m ); adjustSize(); } -void K3bPassivePopup::setTitle( const QString& t ) +void K3bPassivePopup::setTitle( const TQString& t ) { d->titleLabel->setText( t ); // d->titleLabel->setShown( !t.isEmpty() ); @@ -218,8 +218,8 @@ void K3bPassivePopup::setMessageType( MessageType m ) void K3bPassivePopup::slideIn() { d->showEffect = K3bWidgetShowEffect::Slide; - connect( K3bWidgetShowEffect::showWidget( this, (K3bWidgetShowEffect::Effect)d->showEffect ), SIGNAL(widgetShown(QWidget*)), - this, SLOT(slotShown()) ); + connect( K3bWidgetShowEffect::showWidget( this, (K3bWidgetShowEffect::Effect)d->showEffect ), TQT_SIGNAL(widgetShown(TQWidget*)), + this, TQT_SLOT(slotShown()) ); } @@ -230,7 +230,7 @@ void K3bPassivePopup::slotShown() d->timeoutWidget->start(); } else - QTimer::singleShot( d->timeout, this, SLOT(slotClose()) ); + TQTimer::singleShot( d->timeout, this, TQT_SLOT(slotClose()) ); } @@ -243,8 +243,8 @@ void K3bPassivePopup::slotHidden() void K3bPassivePopup::slotClose() { if( d->showEffect != 0 ) { - connect( K3bWidgetShowEffect::hideWidget( this, (K3bWidgetShowEffect::Effect)d->showEffect ), SIGNAL(widgetHidden(QWidget*)), - this, SLOT(slotHidden()) ); + connect( K3bWidgetShowEffect::hideWidget( this, (K3bWidgetShowEffect::Effect)d->showEffect ), TQT_SIGNAL(widgetHidden(TQWidget*)), + this, TQT_SLOT(slotHidden()) ); } else deleteLater(); @@ -262,13 +262,13 @@ void K3bPassivePopup::slotSticky( bool b ) } -void K3bPassivePopup::showPopup( const QString& message, - const QString& title, +void K3bPassivePopup::showPopup( const TQString& message, + const TQString& title, MessageType messageType, bool countdown, bool button ) { - K3bPassivePopup* pop = new K3bPassivePopup( static_cast<QMainWindow*>(qApp->mainWidget())->centralWidget() ); + K3bPassivePopup* pop = new K3bPassivePopup( static_cast<TQMainWindow*>(tqApp->mainWidget())->centralWidget() ); pop->setMessage( message ); pop->setTitle( title ); pop->setMessageType( messageType ); diff --git a/src/k3bpassivepopup.h b/src/k3bpassivepopup.h index e567d7e..a2b43c4 100644 --- a/src/k3bpassivepopup.h +++ b/src/k3bpassivepopup.h @@ -16,24 +16,25 @@ #ifndef _K3B_PASSIVE_POPUP_H_ #define _K3B_PASSIVE_POPUP_H_ -#include <qframe.h> +#include <tqframe.h> class K3bTimeoutWidget; class KActiveLabel; class KPushButton; -class QLabel; +class TQLabel; /** * A message box which is closed using a timer or a close button * It will delete itself once it has been closed. */ -class K3bPassivePopup : public QFrame +class K3bPassivePopup : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bPassivePopup( QWidget* parent ); + K3bPassivePopup( TQWidget* tqparent ); ~K3bPassivePopup(); enum MessageType { @@ -48,8 +49,8 @@ class K3bPassivePopup : public QFrame */ void slideIn(); - static void showPopup( const QString& message, - const QString& title = QString::null, + static void showPopup( const TQString& message, + const TQString& title = TQString(), MessageType messageType = Information, bool countdown = true, bool button = true ); @@ -57,8 +58,8 @@ class K3bPassivePopup : public QFrame public slots: void setShowCloseButton( bool b ); void setShowCountdown( bool b ); - void setMessage( const QString& m ); - void setTitle( const QString& t ); + void setMessage( const TQString& m ); + void setTitle( const TQString& t ); void setTimeout( int msecs ); void setMessageType( MessageType m ); diff --git a/src/k3bprojectinterface.cpp b/src/k3bprojectinterface.cpp index 46968fd..9eafe1e 100644 --- a/src/k3bprojectinterface.cpp +++ b/src/k3bprojectinterface.cpp @@ -23,14 +23,14 @@ #include <k3bdevicemanager.h> #include <k3bjob.h> -#include <qtimer.h> +#include <tqtimer.h> //static -QCString K3bProjectInterface::newIfaceName() +TQCString K3bProjectInterface::newIfaceName() { static int s_docIFNumber = 0; - QCString name; + TQCString name; name.setNum( s_docIFNumber++ ); name.prepend("K3bProject-"); return name; @@ -38,7 +38,7 @@ QCString K3bProjectInterface::newIfaceName() K3bProjectInterface::K3bProjectInterface( K3bDoc* doc, const char* name ) - : DCOPObject( name ? QCString(name) : newIfaceName() ), + : DCOPObject( name ? TQCString(name) : newIfaceName() ), m_doc( doc ) { } @@ -48,12 +48,12 @@ K3bProjectInterface::~K3bProjectInterface() { } -void K3bProjectInterface::addUrls( const QStringList& urls ) +void K3bProjectInterface::addUrls( const TQStringList& urls ) { m_doc->addUrls( KURL::List(urls) ); } -void K3bProjectInterface::addUrl( const QString& url ) +void K3bProjectInterface::addUrl( const TQString& url ) { m_doc->addUrl( KURL(url) ); } @@ -61,7 +61,7 @@ void K3bProjectInterface::addUrl( const QString& url ) void K3bProjectInterface::burn() { // we want to return this method immediately - QTimer::singleShot( 0, m_doc->view(), SLOT(slotBurn()) ); + TQTimer::singleShot( 0, m_doc->view(), TQT_SLOT(slotBurn()) ); } @@ -88,7 +88,7 @@ bool K3bProjectInterface::directBurn() } -void K3bProjectInterface::setBurnDevice( const QString& name ) +void K3bProjectInterface::setBurnDevice( const TQString& name ) { if( K3bDevice::Device* dev = k3bcore->deviceManager()->findDevice( name ) ) m_doc->setBurner( dev ); @@ -107,13 +107,13 @@ KIO::filesize_t K3bProjectInterface::size() const } -const QString& K3bProjectInterface::imagePath() const +const TQString& K3bProjectInterface::imagePath() const { return m_doc->tempDir(); } -QString K3bProjectInterface::projectType() const +TQString K3bProjectInterface::projectType() const { switch( m_doc->type() ) { case K3bDoc::AUDIO: diff --git a/src/k3bprojectinterface.h b/src/k3bprojectinterface.h index 8deb848..2a7c38a 100644 --- a/src/k3bprojectinterface.h +++ b/src/k3bprojectinterface.h @@ -19,7 +19,7 @@ #include <dcopobject.h> #include <kio/global.h> -#include <qstringlist.h> +#include <tqstringlist.h> class K3bDoc; @@ -36,11 +36,11 @@ class K3bProjectInterface : public DCOPObject // Generate a name for this interface. Automatically used if name=0 is // passed to the constructor - static QCString newIfaceName(); + static TQCString newIfaceName(); k_dcop: - virtual void addUrls( const QStringList& urls ); - virtual void addUrl( const QString& url ); + virtual void addUrls( const TQStringList& urls ); + virtual void addUrl( const TQString& url ); /** * Opens the burn dialog @@ -55,7 +55,7 @@ class K3bProjectInterface : public DCOPObject */ virtual bool directBurn(); - virtual void setBurnDevice( const QString& blockdevicename ); + virtual void setBurnDevice( const TQString& blockdevicename ); /** * \return the length of the project in blocks (frames). @@ -67,7 +67,7 @@ class K3bProjectInterface : public DCOPObject */ virtual KIO::filesize_t size() const; - virtual const QString& imagePath() const; + virtual const TQString& imagePath() const; /** * \return A string representation of the project type. One of: @@ -82,7 +82,7 @@ class K3bProjectInterface : public DCOPObject * * Be aware that this is not the same as K3bDoc::documentType for historical reasons. */ - virtual QString projectType() const; + virtual TQString projectType() const; private: K3bDoc* m_doc; diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp index 0c6d65f..05ca446 100644 --- a/src/k3bprojectmanager.cpp +++ b/src/k3bprojectmanager.cpp @@ -38,13 +38,13 @@ #include <k3bisooptions.h> #include <k3bdevicemanager.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qtextstream.h> -#include <qdom.h> -#include <qfile.h> -#include <qapplication.h> -#include <qcursor.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqtextstream.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqapplication.h> +#include <tqcursor.h> #include <kurl.h> #include <kdebug.h> @@ -57,9 +57,9 @@ class K3bProjectManager::Private { public: - QPtrList<K3bDoc> projects; + TQPtrList<K3bDoc> projects; K3bDoc* activeProject; - QMap<K3bDoc*, K3bProjectInterface*> projectInterfaceMap; + TQMap<K3bDoc*, K3bProjectInterface*> projectInterfaceMap; int audioUntitledCount; int dataUntitledCount; @@ -74,8 +74,8 @@ public: -K3bProjectManager::K3bProjectManager( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bProjectManager::K3bProjectManager( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); d->activeProject = 0; @@ -96,7 +96,7 @@ K3bProjectManager::~K3bProjectManager() } -const QPtrList<K3bDoc>& K3bProjectManager::projects() const +const TQPtrList<K3bDoc>& K3bProjectManager::projects() const { return d->projects; } @@ -104,13 +104,13 @@ const QPtrList<K3bDoc>& K3bProjectManager::projects() const void K3bProjectManager::addProject( K3bDoc* doc ) { - if( !d->projects.containsRef( doc ) ) { + if( !d->projects.tqcontainsRef( doc ) ) { kdDebug() << "(K3bProjectManager) adding doc " << doc->URL().path() << endl; d->projects.append(doc); - connect( doc, SIGNAL(changed(K3bDoc*)), - this, SLOT(slotProjectChanged(K3bDoc*)) ); + connect( doc, TQT_SIGNAL(changed(K3bDoc*)), + this, TQT_SLOT(slotProjectChanged(K3bDoc*)) ); emit newProject( doc ); } @@ -120,15 +120,15 @@ void K3bProjectManager::addProject( K3bDoc* doc ) void K3bProjectManager::removeProject( K3bDoc* doc ) { // - // QPtrList.findRef seems to be buggy. Everytime we search for the + // TQPtrList.tqfindRef seems to be buggy. Everytime we search for the // first added item it is not found! // - for( QPtrListIterator<K3bDoc> it( d->projects ); + for( TQPtrListIterator<K3bDoc> it( d->projects ); it.current(); ++it ) { if( it.current() == doc ) { // remove the DCOP interface - QMap<K3bDoc*, K3bProjectInterface*>::iterator it = d->projectInterfaceMap.find( doc ); + TQMap<K3bDoc*, K3bProjectInterface*>::iterator it = d->projectInterfaceMap.tqfind( doc ); if( it != d->projectInterfaceMap.end() ) { // delete the interface delete it.data(); @@ -147,7 +147,7 @@ void K3bProjectManager::removeProject( K3bDoc* doc ) K3bDoc* K3bProjectManager::findByUrl( const KURL& url ) { - for( QPtrListIterator<K3bDoc> it( d->projects ); + for( TQPtrListIterator<K3bDoc> it( d->projects ); it.current(); ++it ) { K3bDoc* doc = it.current(); if( doc->URL() == url ) @@ -172,10 +172,10 @@ void K3bProjectManager::setActive( K3bDoc* doc ) } // - // QPtrList.findRef seems to be buggy. Everytime we search for the + // TQPtrList.tqfindRef seems to be buggy. Everytime we search for the // first added item it is not found! // - for( QPtrListIterator<K3bDoc> it( d->projects ); + for( TQPtrListIterator<K3bDoc> it( d->projects ); it.current(); ++it ) { if( it.current() == doc ) { d->activeProject = doc; @@ -194,54 +194,54 @@ K3bDoc* K3bProjectManager::activeProject() const K3bDoc* K3bProjectManager::createEmptyProject( K3bDoc::DocType type ) { K3bDoc* doc = 0; - QString fileName; + TQString fileName; switch( type ) { case K3bDoc::AUDIO: { doc = new K3bAudioDoc( this ); - fileName = i18n("AudioCD%1").arg(d->audioUntitledCount++); + fileName = i18n("AudioCD%1").tqarg(d->audioUntitledCount++); break; } case K3bDoc::DATA: { doc = new K3bDataDoc( this ); - fileName = i18n("DataCD%1").arg(d->dataUntitledCount++); + fileName = i18n("DataCD%1").tqarg(d->dataUntitledCount++); break; } case K3bDoc::MIXED: { doc = new K3bMixedDoc( this ); - fileName=i18n("MixedCD%1").arg(d->mixedUntitledCount++); + fileName=i18n("MixedCD%1").tqarg(d->mixedUntitledCount++); break; } case K3bDoc::VCD: { doc = new K3bVcdDoc( this ); - fileName=i18n("VideoCD%1").arg(d->vcdUntitledCount++); + fileName=i18n("VideoCD%1").tqarg(d->vcdUntitledCount++); break; } case K3bDoc::MOVIX: { doc = new K3bMovixDoc( this ); - fileName=i18n("eMovixCD%1").arg(d->movixUntitledCount++); + fileName=i18n("eMovixCD%1").tqarg(d->movixUntitledCount++); break; } case K3bDoc::MOVIX_DVD: { doc = new K3bMovixDvdDoc( this ); - fileName=i18n("eMovixDVD%1").arg(d->movixDvdUntitledCount++); + fileName=i18n("eMovixDVD%1").tqarg(d->movixDvdUntitledCount++); break; } case K3bDoc::DVD: { doc = new K3bDvdDoc( this ); - fileName = i18n("DataDVD%1").arg(d->dvdUntitledCount++); + fileName = i18n("DataDVD%1").tqarg(d->dvdUntitledCount++); break; } case K3bDoc::VIDEODVD: { doc = new K3bVideoDvdDoc( this ); - fileName = i18n("VideoDVD%1").arg(d->videoDvdUntitledCount++); + fileName = i18n("VideoDVD%1").tqarg(d->videoDvdUntitledCount++); break; } } @@ -275,9 +275,9 @@ void K3bProjectManager::loadDefaults( K3bDoc* doc ) { KConfig* c = kapp->config(); - QString oldGroup = c->group(); + TQString oldGroup = c->group(); - QString cg = "default " + doc->typeString() + " settings"; + TQString cg = "default " + doc->typeString() + " settings"; // earlier K3b versions loaded the saved settings // so that is what we do as a default @@ -290,7 +290,7 @@ void K3bProjectManager::loadDefaults( K3bDoc* doc ) c->setGroup( cg ); - QString mode = c->readEntry( "writing_mode" ); + TQString mode = c->readEntry( "writing_mode" ); if ( mode == "dao" ) doc->setWritingMode( K3b::DAO ); else if( mode == "tao" ) @@ -352,7 +352,7 @@ void K3bProjectManager::loadDefaults( K3bDoc* doc ) dataDoc->setIsoOptions( K3bIsoOptions::load( c, false ) ); - QString datamode = c->readEntry( "data_track_mode" ); + TQString datamode = c->readEntry( "data_track_mode" ); if( datamode == "mode1" ) dataDoc->setDataMode( K3b::MODE1 ); else if( datamode == "mode2" ) @@ -362,7 +362,7 @@ void K3bProjectManager::loadDefaults( K3bDoc* doc ) dataDoc->setVerifyData( c->readBoolEntry( "verify data", false ) ); - QString s = c->readEntry( "multisession mode" ); + TQString s = c->readEntry( "multisession mode" ); if( s == "none" ) dataDoc->setMultiSessionMode( K3bDataDoc::NONE ); else if( s == "start" ) @@ -399,7 +399,7 @@ void K3bProjectManager::loadDefaults( K3bDoc* doc ) else mixedDoc->setMixedType( K3bMixedDoc::DATA_SECOND_SESSION ); - QString datamode = c->readEntry( "data_track_mode" ); + TQString datamode = c->readEntry( "data_track_mode" ); if( datamode == "mode1" ) mixedDoc->dataDoc()->setDataMode( K3b::MODE1 ); else if( datamode == "mode2" ) @@ -449,7 +449,7 @@ void K3bProjectManager::loadDefaults( K3bDoc* doc ) K3bProjectInterface* K3bProjectManager::dcopInterface( K3bDoc* doc ) { - QMap<K3bDoc*, K3bProjectInterface*>::iterator it = d->projectInterfaceMap.find( doc ); + TQMap<K3bDoc*, K3bProjectInterface*>::iterator it = d->projectInterfaceMap.tqfind( doc ); if( it == d->projectInterfaceMap.end() ) { K3bProjectInterface* dcopInterface = 0; if( doc->type() == K3bDoc::DATA || doc->type() == K3bDoc::DVD ) @@ -470,15 +470,15 @@ K3bProjectInterface* K3bProjectManager::dcopInterface( K3bDoc* doc ) K3bDoc* K3bProjectManager::openProject( const KURL& url ) { - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); - QString tmpfile; + TQString tmpfile; KIO::NetAccess::download( url, tmpfile, 0L ); // /////////////////////////////////////////////// // first check if it's a store or an old plain xml file bool success = false; - QDomDocument xmlDoc; + TQDomDocument xmlDoc; // try opening a store KoStore* store = KoStore::createStore( tmpfile, KoStore::Read ); @@ -486,7 +486,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url ) if( !store->bad() ) { // try opening the document inside the store if( store->open( "maindata.xml" ) ) { - QIODevice* dev = store->device(); + TQIODevice* dev = store->device(); dev->open( IO_ReadOnly ); if( xmlDoc.setContent( dev ) ) success = true; @@ -500,7 +500,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url ) if( !success ) { // try reading an old plain document - QFile f( tmpfile ); + TQFile f( tmpfile ); if ( f.open( IO_ReadOnly ) ) { // // First check if this is really an xml file beacuse if this is a very big file @@ -510,14 +510,14 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url ) if( f.readBlock( test, 5 ) ) { if( ::strncmp( test, "<?xml", 5 ) ) { kdDebug() << "(K3bDoc) " << url.path() << " seems to be no xml file." << endl; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return 0; } f.reset(); } else { kdDebug() << "(K3bDoc) could not read from file." << endl; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return 0; } if( xmlDoc.setContent( &f ) ) @@ -531,7 +531,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url ) if( !success ) { kdDebug() << "(K3bDoc) could not open file " << url.path() << endl; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return 0; } @@ -555,7 +555,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url ) type = K3bDoc::VIDEODVD; else { kdDebug() << "(K3bDoc) unknown doc type: " << xmlDoc.doctype().name() << endl; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return 0; } @@ -564,7 +564,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url ) // --------- // load the data into the document - QDomElement root = xmlDoc.documentElement(); + TQDomElement root = xmlDoc.documentElement(); if( newDoc->loadDocumentData( &root ) ) { newDoc->setURL( url ); newDoc->setSaved( true ); @@ -585,7 +585,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url ) newDoc = 0; } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return newDoc; } @@ -593,7 +593,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url ) bool K3bProjectManager::saveProject( K3bDoc* doc, const KURL& url ) { - QString tmpfile; + TQString tmpfile; KIO::NetAccess::download( url, tmpfile, 0L ); bool success = false; @@ -609,16 +609,16 @@ bool K3bProjectManager::saveProject( K3bDoc* doc, const KURL& url ) store->open( "maindata.xml" ); // save the data in the document - QDomDocument xmlDoc( "k3b_" + doc->typeString() + "_project" ); + TQDomDocument xmlDoc( "k3b_" + doc->typeString() + "_project" ); xmlDoc.appendChild( xmlDoc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - QDomElement docElem = xmlDoc.createElement( "k3b_" + doc->typeString() + "_project" ); + TQDomElement docElem = xmlDoc.createElement( "k3b_" + doc->typeString() + "_project" ); xmlDoc.appendChild( docElem ); success = doc->saveDocumentData( &docElem ); if( success ) { KoStoreDevice dev(store); dev.open( IO_WriteOnly ); - QTextStream xmlStream( &dev ); + TQTextStream xmlStream( &dev ); xmlDoc.save( xmlStream, 0 ); doc->setURL( url ); diff --git a/src/k3bprojectmanager.h b/src/k3bprojectmanager.h index 60d9c80..15e8fdb 100644 --- a/src/k3bprojectmanager.h +++ b/src/k3bprojectmanager.h @@ -16,8 +16,8 @@ #ifndef _K3B_PROJECT_MANAGER_H_ #define _K3B_PROJECT_MANAGER_H_ -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> #include <k3bdoc.h> @@ -25,15 +25,16 @@ class KURL; class K3bProjectInterface; -class K3bProjectManager : public QObject +class K3bProjectManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bProjectManager( QObject* parent = 0, const char* name = 0 ); + K3bProjectManager( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bProjectManager(); - const QPtrList<K3bDoc>& projects() const; + const TQPtrList<K3bDoc>& projects() const; /** * Create a new project including loading user defaults and creating diff --git a/src/k3bprojecttabwidget.cpp b/src/k3bprojecttabwidget.cpp index d86fad4..31d0b9c 100644 --- a/src/k3bprojecttabwidget.cpp +++ b/src/k3bprojecttabwidget.cpp @@ -28,8 +28,8 @@ #include <kurldrag.h> #include <klocale.h> -#include <qevent.h> -#include <qtabbar.h> +#include <tqevent.h> +#include <tqtabbar.h> class K3bProjectTabWidget::ProjectData @@ -54,13 +54,13 @@ public: -K3bProjectTabWidget::K3bProjectTabWidget( QWidget *parent, const char *name, WFlags f ) - : QTabWidget( parent, name, f ) +K3bProjectTabWidget::K3bProjectTabWidget( TQWidget *tqparent, const char *name, WFlags f ) + : TQTabWidget( tqparent, name, f ) { tabBar()->setAcceptDrops(true); tabBar()->installEventFilter( this ); - m_projectActionMenu = new KActionMenu( i18n("Project"), this ); + m_projectActionMenu = new KActionMenu( i18n("Project"), TQT_TQOBJECT(this) ); } @@ -69,60 +69,60 @@ K3bProjectTabWidget::~K3bProjectTabWidget() } -void K3bProjectTabWidget::addTab( QWidget* child, const QString& label ) +void K3bProjectTabWidget::addTab( TQWidget* child, const TQString& label ) { - QTabWidget::addTab( child, label ); + TQTabWidget::addTab( child, label ); tabBar()->setShown( count() != 1 ); } -void K3bProjectTabWidget::addTab( QWidget* child, const QIconSet& iconset, const QString& label ) +void K3bProjectTabWidget::addTab( TQWidget* child, const TQIconSet& iconset, const TQString& label ) { - QTabWidget::addTab( child, iconset, label ); + TQTabWidget::addTab( child, iconset, label ); tabBar()->setShown( count() != 1 ); } -void K3bProjectTabWidget::addTab( QWidget* child, QTab* tab ) +void K3bProjectTabWidget::addTab( TQWidget* child, TQTab* tab ) { - QTabWidget::addTab( child, tab ); + TQTabWidget::addTab( child, tab ); tabBar()->setShown( count() != 1 ); } -void K3bProjectTabWidget::insertTab( QWidget* child, const QString& label, int index ) +void K3bProjectTabWidget::insertTab( TQWidget* child, const TQString& label, int index ) { - QTabWidget::insertTab( child, label, index ); + TQTabWidget::insertTab( child, label, index ); tabBar()->setShown( count() != 1 ); } -void K3bProjectTabWidget::insertTab( QWidget* child, const QIconSet& iconset, const QString& label, int index ) +void K3bProjectTabWidget::insertTab( TQWidget* child, const TQIconSet& iconset, const TQString& label, int index ) { - QTabWidget::insertTab( child, iconset, label, index ); + TQTabWidget::insertTab( child, iconset, label, index ); tabBar()->setShown( count() != 1 ); } -void K3bProjectTabWidget::insertTab( QWidget* child, QTab* tab, int index ) +void K3bProjectTabWidget::insertTab( TQWidget* child, TQTab* tab, int index ) { - QTabWidget::insertTab( child, tab, index ); + TQTabWidget::insertTab( child, tab, index ); tabBar()->setShown( count() != 1 ); } -void K3bProjectTabWidget::removePage( QWidget* w ) +void K3bProjectTabWidget::removePage( TQWidget* w ) { - QTabWidget::removePage( w ); + TQTabWidget::removePage( w ); tabBar()->setShown( count() != 1 ); } void K3bProjectTabWidget::insertTab( K3bDoc* doc ) { - QTabWidget::insertTab( doc->view(), doc->URL().fileName() ); - connect( k3bappcore->projectManager(), SIGNAL(projectSaved(K3bDoc*)), this, SLOT(slotDocSaved(K3bDoc*)) ); - connect( doc, SIGNAL(changed(K3bDoc*)), this, SLOT(slotDocChanged(K3bDoc*)) ); + TQTabWidget::insertTab( doc->view(), doc->URL().fileName() ); + connect( k3bappcore->projectManager(), TQT_SIGNAL(projectSaved(K3bDoc*)), this, TQT_SLOT(slotDocSaved(K3bDoc*)) ); + connect( doc, TQT_SIGNAL(changed(K3bDoc*)), this, TQT_SLOT(slotDocChanged(K3bDoc*)) ); m_projectDataMap[doc] = ProjectData( doc ); @@ -154,16 +154,16 @@ void K3bProjectTabWidget::slotDocChanged( K3bDoc* doc ) void K3bProjectTabWidget::slotDocSaved( K3bDoc* doc ) { - setTabIconSet( doc->view(), QIconSet() ); + setTabIconSet( doc->view(), TQIconSet() ); changeTab( doc->view(), doc->URL().fileName() ); } -K3bDoc* K3bProjectTabWidget::projectAt( const QPoint& pos ) const +K3bDoc* K3bProjectTabWidget::projectAt( const TQPoint& pos ) const { - QTab* tab = tabBar()->selectTab( pos ); + TQTab* tab = tabBar()->selectTab( pos ); if( tab ) { - QWidget* w = page( tabBar()->indexOf( tab->identifier() ) ); + TQWidget* w = page( tabBar()->indexOf( tab->identifier() ) ); if( K3bView* view = dynamic_cast<K3bView*>(w) ) return view->doc(); } @@ -172,15 +172,15 @@ K3bDoc* K3bProjectTabWidget::projectAt( const QPoint& pos ) const } -bool K3bProjectTabWidget::eventFilter( QObject* o, QEvent* e ) +bool K3bProjectTabWidget::eventFilter( TQObject* o, TQEvent* e ) { - if( o == tabBar() ) { - if( e->type() == QEvent::MouseButtonPress ) { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tabBar()) ) { + if( e->type() == TQEvent::MouseButtonPress ) { + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); if( me->button() == Qt::RightButton ) { if( projectAt( me->pos() ) ) { // we need change the tab because the actions work on the current tab - QTab* clickedTab = tabBar()->selectTab( me->pos() ); + TQTab* clickedTab = tabBar()->selectTab( me->pos() ); if( clickedTab ) { tabBar()->setCurrentTab( clickedTab ); @@ -192,14 +192,14 @@ bool K3bProjectTabWidget::eventFilter( QObject* o, QEvent* e ) } } - else if( e->type() == QEvent::DragMove ) { - QDragMoveEvent* de = static_cast<QDragMoveEvent*>(e); + else if( e->type() == TQEvent::DragMove ) { + TQDragMoveEvent* de = static_cast<TQDragMoveEvent*>(e); de->accept( KURLDrag::canDecode(de) && projectAt(de->pos()) ); return true; } - else if( e->type() == QEvent::Drop ) { - QDropEvent* de = static_cast<QDropEvent*>(e); + else if( e->type() == TQEvent::Drop ) { + TQDropEvent* de = static_cast<TQDropEvent*>(e); KURL::List l; if( KURLDrag::decode( de, l ) ) { if( K3bDoc* doc = projectAt( de->pos() ) ) @@ -209,7 +209,7 @@ bool K3bProjectTabWidget::eventFilter( QObject* o, QEvent* e ) } } - return QTabWidget::eventFilter( o, e ); + return TQTabWidget::eventFilter( o, e ); } #include "k3bprojecttabwidget.moc" diff --git a/src/k3bprojecttabwidget.h b/src/k3bprojecttabwidget.h index 048a8bc..4cadf33 100644 --- a/src/k3bprojecttabwidget.h +++ b/src/k3bprojecttabwidget.h @@ -17,7 +17,7 @@ #ifndef K3BPROJECTTABWIDGET_H #define K3BPROJECTTABWIDGET_H -#include <qtabwidget.h> +#include <tqtabwidget.h> #include <kurl.h> class KAction; @@ -31,38 +31,39 @@ class K3bDoc; * * @author Sebastian Trueg */ -class K3bProjectTabWidget : public QTabWidget +class K3bProjectTabWidget : public TQTabWidget { Q_OBJECT + TQ_OBJECT public: - K3bProjectTabWidget( QWidget *parent = 0, const char *name = 0, WFlags = 0 ); + K3bProjectTabWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags = 0 ); ~K3bProjectTabWidget(); void insertTab( K3bDoc* ); - void addTab( QWidget * child, const QString & label ); - void addTab( QWidget * child, const QIconSet & iconset, const QString & label ); - void addTab( QWidget * child, QTab * tab ); - void insertTab( QWidget * child, const QString & label, int index = -1 ); - void insertTab( QWidget * child, const QIconSet & iconset, const QString & label, int index = -1 ); - void insertTab( QWidget * child, QTab * tab, int index = -1 ); + void addTab( TQWidget * child, const TQString & label ); + void addTab( TQWidget * child, const TQIconSet & iconset, const TQString & label ); + void addTab( TQWidget * child, TQTab * tab ); + void insertTab( TQWidget * child, const TQString & label, int index = -1 ); + void insertTab( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index = -1 ); + void insertTab( TQWidget * child, TQTab * tab, int index = -1 ); /** * \return the project for the tab at position \p pos or 0 in case the tab is * not a project tab. */ - K3bDoc* projectAt( const QPoint& pos ) const; + K3bDoc* projectAt( const TQPoint& pos ) const; /** * inserts the given action into the popup menu for the tabs */ void insertAction( KAction* ); - bool eventFilter( QObject* o, QEvent* e ); + bool eventFilter( TQObject* o, TQEvent* e ); public slots: - void removePage( QWidget* ); + void removePage( TQWidget* ); private slots: void slotDocChanged( K3bDoc* ); @@ -72,7 +73,7 @@ class K3bProjectTabWidget : public QTabWidget KActionMenu* m_projectActionMenu; class ProjectData; - QMap<K3bDoc*, ProjectData> m_projectDataMap; + TQMap<K3bDoc*, ProjectData> m_projectDataMap; }; #endif diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp index 82122e2..dd409e1 100644 --- a/src/k3bservicemenuinstaller.cpp +++ b/src/k3bservicemenuinstaller.cpp @@ -26,10 +26,10 @@ class K3bServiceInstaller::Private { public: - QString app; - QStringList allServiceMenus; - QStringList allServiceMenuFiles; - QString konqiServicemenusFolder; + TQString app; + TQStringList allServiceMenus; + TQStringList allServiceMenuFiles; + TQString konqiServicemenusFolder; void update() { // the list of installable servicemenus the application provides @@ -49,7 +49,7 @@ public: }; -K3bServiceInstaller::K3bServiceInstaller( const QString& appname ) +K3bServiceInstaller::K3bServiceInstaller( const TQString& appname ) { d = new Private; d->app = appname; @@ -77,7 +77,7 @@ bool K3bServiceInstaller::allInstalled() const } -bool K3bServiceInstaller::install( QWidget* parent ) +bool K3bServiceInstaller::install( TQWidget* tqparent ) { d->update(); @@ -87,11 +87,11 @@ bool K3bServiceInstaller::install( QWidget* parent ) for( unsigned int i = 0; i < d->allServiceMenus.count(); ++i ) if( !KIO::NetAccess::file_copy( KURL::fromPathOrURL( d->allServiceMenus[i] ), KURL::fromPathOrURL( d->konqiServicemenusFolder + d->allServiceMenuFiles[i] ), -1, - true, false, parent ) ) + true, false, tqparent ) ) success = false; - if( !success && parent ) - KMessageBox::error( parent, + if( !success && tqparent ) + KMessageBox::error( tqparent, KIO::NetAccess::lastErrorString(), i18n("Failed to copy service menu files") ); @@ -99,19 +99,19 @@ bool K3bServiceInstaller::install( QWidget* parent ) } -bool K3bServiceInstaller::remove( QWidget* parent ) +bool K3bServiceInstaller::remove( TQWidget* tqparent ) { d->update(); bool success = true; for( unsigned int i = 0; i < d->allServiceMenuFiles.count(); ++i ) - if( KIO::NetAccess::exists( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], true, parent ) ) - if( !KIO::NetAccess::del( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], parent ) ) + if( KIO::NetAccess::exists( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], true, tqparent ) ) + if( !KIO::NetAccess::del( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], tqparent ) ) success = false; - if( !success && parent ) - KMessageBox::error( parent, + if( !success && tqparent ) + KMessageBox::error( tqparent, KIO::NetAccess::lastErrorString(), i18n("Failed to remove service menu files") ); diff --git a/src/k3bservicemenuinstaller.h b/src/k3bservicemenuinstaller.h index 6e06caf..271d314 100644 --- a/src/k3bservicemenuinstaller.h +++ b/src/k3bservicemenuinstaller.h @@ -16,9 +16,9 @@ #ifndef _K3B_SERVICE_MENU_INSTALLER_H_ #define _K3B_SERVICE_MENU_INSTALLER_H_ -#include <qstring.h> +#include <tqstring.h> -class QWidget; +class TQWidget; /** @@ -29,7 +29,7 @@ class QWidget; class K3bServiceInstaller { public: - K3bServiceInstaller( const QString& appname = "k3b" ); + K3bServiceInstaller( const TQString& appname = "k3b" ); ~K3bServiceInstaller(); /** @@ -38,14 +38,14 @@ class K3bServiceInstaller bool allInstalled() const; /** - * If parent != 0 a messagebox will be shown in case of an error. + * If tqparent != 0 a messagebox will be shown in case of an error. */ - bool install( QWidget* parent = 0 ); + bool install( TQWidget* tqparent = 0 ); /** - * If parent != 0 a messagebox will be shown in case of an error. + * If tqparent != 0 a messagebox will be shown in case of an error. */ - bool remove( QWidget* parent = 0 ); + bool remove( TQWidget* tqparent = 0 ); private: class Private; diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp index 8e40352..6a39807 100644 --- a/src/k3bsidepanel.cpp +++ b/src/k3bsidepanel.cpp @@ -21,14 +21,14 @@ #include <kiconloader.h> #include <kdebug.h> -#include <qtoolbutton.h> -#include <qframe.h> -#include <qlayout.h> +#include <tqtoolbutton.h> +#include <tqframe.h> +#include <tqlayout.h> -K3bSidePanel::K3bSidePanel( K3bMainWindow* m, QWidget* parent, const char* name ) - : QToolBox( parent, name ), +K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* tqparent, const char* name ) + : TQToolBox( tqparent, name ), m_mainWindow(m) { // our first widget is the tree view @@ -36,14 +36,14 @@ K3bSidePanel::K3bSidePanel( K3bMainWindow* m, QWidget* parent, const char* name addItem( m_fileTreeView, SmallIconSet( "folder_open" ), i18n("Folders") ); // CD projects - QFrame* cdProjectsFrame = createPanel(); + TQFrame* cdProjectsFrame = createPanel(); addItem( cdProjectsFrame, SmallIconSet( "cdrom_unmount" ), i18n("CD Tasks") ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_audio" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_data" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_mixed" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_vcd" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_movix" ) ); - QGridLayout* grid = (QGridLayout*)cdProjectsFrame->layout(); + TQGridLayout* grid = (TQGridLayout*)cdProjectsFrame->tqlayout(); grid->setRowSpacing( grid->numRows(), 15 ); addButton( cdProjectsFrame, m_mainWindow->action( "tools_copy_cd" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "tools_write_cd_image" ) ); @@ -51,12 +51,12 @@ K3bSidePanel::K3bSidePanel( K3bMainWindow* m, QWidget* parent, const char* name grid->setRowStretch( grid->numRows()+1, 1 ); // DVD projects - QFrame* dvdProjectsFrame = createPanel(); + TQFrame* dvdProjectsFrame = createPanel(); addItem( dvdProjectsFrame, SmallIconSet( "dvd_unmount" ), i18n("DVD Tasks") ); addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_dvd" ) ); addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_video_dvd" ) ); addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_movix_dvd" ) ); - grid = (QGridLayout*)dvdProjectsFrame->layout(); + grid = (TQGridLayout*)dvdProjectsFrame->tqlayout(); grid->setRowSpacing( grid->numRows(), 15 ); addButton( dvdProjectsFrame, m_mainWindow->action( "tools_copy_dvd" ) ); addButton( dvdProjectsFrame, m_mainWindow->action( "tools_write_dvd_iso" ) ); @@ -74,31 +74,31 @@ K3bSidePanel::~K3bSidePanel() } -QFrame* K3bSidePanel::createPanel() +TQFrame* K3bSidePanel::createPanel() { - QFrame* frame = new QFrame( this ); - frame->setPaletteBackgroundColor( Qt::white ); - QGridLayout* grid = new QGridLayout( frame ); + TQFrame* frame = new TQFrame( this ); + frame->setPaletteBackgroundColor( TQt::white ); + TQGridLayout* grid = new TQGridLayout( frame ); grid->setMargin( 5 ); grid->setSpacing( 5 ); return frame; } -void K3bSidePanel::addButton( QFrame* frame, KAction* a ) +void K3bSidePanel::addButton( TQFrame* frame, KAction* a ) { if( a ) { - QToolButton* b = new QToolButton( frame ); + TQToolButton* b = new TQToolButton( frame ); b->setTextLabel( a->toolTip(), true ); b->setTextLabel( a->text(), false ); b->setIconSet( a->iconSet(KIcon::Small) ); b->setUsesTextLabel( true ); b->setAutoRaise( true ); - b->setTextPosition( QToolButton::BesideIcon ); + b->setTextPosition( TQToolButton::BesideIcon ); - connect( b, SIGNAL(clicked()), a, SLOT(activate()) ); + connect( b, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) ); - QGridLayout* grid = (QGridLayout*)(frame->layout()); + TQGridLayout* grid = (TQGridLayout*)(frame->tqlayout()); grid->addWidget( b, grid->numRows(), 0 ); } else diff --git a/src/k3bsidepanel.h b/src/k3bsidepanel.h index 2be17ff..29b1ebc 100644 --- a/src/k3bsidepanel.h +++ b/src/k3bsidepanel.h @@ -16,20 +16,21 @@ #ifndef _K3B_SIDE_PANEL_H_ #define _K3B_SIDE_PANEL_H_ -#include <qtoolbox.h> +#include <tqtoolbox.h> class K3bMainWindow; class K3bFileTreeView; -class QFrame; +class TQFrame; class KAction; -class K3bSidePanel : public QToolBox +class K3bSidePanel : public TQToolBox { Q_OBJECT + TQ_OBJECT public: - K3bSidePanel( K3bMainWindow*, QWidget* parent = 0, const char* name = 0 ); + K3bSidePanel( K3bMainWindow*, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bSidePanel(); /** @@ -42,8 +43,8 @@ class K3bSidePanel : public QToolBox K3bMainWindow* m_mainWindow; K3bFileTreeView* m_fileTreeView; - QFrame* createPanel(); - void addButton( QFrame* frame, KAction* action ); + TQFrame* createPanel(); + void addButton( TQFrame* frame, KAction* action ); }; #endif diff --git a/src/k3bsplash.cpp b/src/k3bsplash.cpp index dc49bf5..ff39d85 100644 --- a/src/k3bsplash.cpp +++ b/src/k3bsplash.cpp @@ -18,21 +18,21 @@ #include <k3bthememanager.h> #include <k3bapplication.h> -#include <qapplication.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qevent.h> -#include <qstring.h> -#include <qfontmetrics.h> -#include <qpainter.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqevent.h> +#include <tqstring.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> #include <kstandarddirs.h> #include <kapplication.h> #include <kaboutdata.h> -K3bSplash::K3bSplash( QWidget* parent, const char* name ) - : QVBox( parent, name, +K3bSplash::K3bSplash( TQWidget* tqparent, const char* name ) + : TQVBox( tqparent, name, WStyle_Customize| WDestructiveClose| /* WStyle_Splash|*/ @@ -43,28 +43,28 @@ K3bSplash::K3bSplash( QWidget* parent, const char* name ) setMargin( 0 ); setSpacing( 0 ); - QLabel* copyrightLabel = new QLabel( kapp->aboutData()->copyrightStatement(), this ); + TQLabel* copyrightLabel = new TQLabel( kapp->aboutData()->copyrightStatement(), this ); copyrightLabel->setMargin( 5 ); copyrightLabel->setPaletteBackgroundColor( black ); copyrightLabel->setPaletteForegroundColor( white ); - copyrightLabel->setAlignment( AlignRight ); + copyrightLabel->tqsetAlignment( AlignRight ); - QLabel* picLabel = new QLabel( this ); + TQLabel* picLabel = new TQLabel( this ); if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { picLabel->setPaletteBackgroundColor( theme->backgroundColor() ); picLabel->setPixmap( theme->pixmap( K3bTheme::SPLASH ) ); } - m_infoBox = new QLabel( this ); + m_infoBox = new TQLabel( this ); m_infoBox->setMargin( 5 ); m_infoBox->setPaletteBackgroundColor( black ); m_infoBox->setPaletteForegroundColor( white ); - // Set geometry, with support for Xinerama systems - QRect r; - r.setSize(sizeHint()); - int ps = QApplication::desktop()->primaryScreen(); - r.moveCenter( QApplication::desktop()->screenGeometry(ps).center() ); + // Set tqgeometry, with support for Xinerama systems + TQRect r; + r.setSize(tqsizeHint()); + int ps = TQApplication::desktop()->primaryScreen(); + r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() ); setGeometry(r); } @@ -74,7 +74,7 @@ K3bSplash::~K3bSplash() } -void K3bSplash::mousePressEvent( QMouseEvent* ) +void K3bSplash::mousePressEvent( TQMouseEvent* ) { close(); } @@ -82,47 +82,47 @@ void K3bSplash::mousePressEvent( QMouseEvent* ) void K3bSplash::show() { - QVBox::show(); + TQVBox::show(); // make sure the splash screen is shown immediately - qApp->processEvents(); + tqApp->processEvents(); } -void K3bSplash::addInfo( const QString& s ) +void K3bSplash::addInfo( const TQString& s ) { m_infoBox->setText( s ); - qApp->processEvents(); + tqApp->processEvents(); } -// void K3bSplash::paintEvent( QPaintEvent* e ) +// void K3bSplash::paintEvent( TQPaintEvent* e ) // { // // first let the window paint the background and the child widget -// QWidget::paintEvent( e ); +// TQWidget::paintEvent( e ); // // now create the text we want to display // // find the lower left corner and paint it on top of the pixmap -// QPainter p( this ); -// p.setPen( Qt::blue ); +// TQPainter p( this ); +// p.setPen( TQt::blue ); -// QFontMetrics fm = p.fontMetrics(); +// TQFontMetrics fm = p.fontMetrics(); -// QString line1 = QString( "K3b version %1" ).arg(VERSION); -// QString line2( "(c) 2001 by Sebastian Trueg" ); -// QString line3( "licenced under the GPL" ); +// TQString line1 = TQString( "K3b version %1" ).tqarg(VERSION); +// TQString line2( "(c) 2001 by Sebastian Trueg" ); +// TQString line3( "licenced under the GPL" ); -// QRect rect1 = fm.boundingRect( line1 ); -// QRect rect2 = fm.boundingRect( line2 ); -// QRect rect3 = fm.boundingRect( line3 ); +// TQRect rect1 = fm.boundingRect( line1 ); +// TQRect rect2 = fm.boundingRect( line2 ); +// TQRect rect3 = fm.boundingRect( line3 ); // int textH = rect1.height() + rect2.height() + rect3.height() + 2 * fm.leading() + 2 + rect2.height() /*hack because the boundingRect method seems not to work properly! :-(*/; -// int textW = QMAX( rect1.width(), QMAX( rect2.width(), rect3.width() ) ) + 2; +// int textW = TQMAX( rect1.width(), TQMAX( rect2.width(), rect3.width() ) ) + 2; // int startX = 10; // int startY = height() - 10 - textH; -// p.drawText( startX, startY, textW, textH, 0, QString("%1\n%2\n%3").arg(line1).arg(line2).arg(line3) ); +// p.drawText( startX, startY, textW, textH, 0, TQString("%1\n%2\n%3").tqarg(line1).tqarg(line2).tqarg(line3) ); // } diff --git a/src/k3bsplash.h b/src/k3bsplash.h index c4e6979..a08b421 100644 --- a/src/k3bsplash.h +++ b/src/k3bsplash.h @@ -17,32 +17,33 @@ #ifndef K3BSPLASH_H #define K3BSPLASH_H -#include <qvbox.h> +#include <tqvbox.h> -class QLabel; -class QMouseEvent; -class QPaintEvent; -class QString; +class TQLabel; +class TQMouseEvent; +class TQPaintEvent; +class TQString; -class K3bSplash : public QVBox +class K3bSplash : public TQVBox { Q_OBJECT + TQ_OBJECT public: - K3bSplash( QWidget* parent = 0, const char* name = 0 ); + K3bSplash( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bSplash(); public slots: void show(); - void addInfo( const QString& ); + void addInfo( const TQString& ); protected: - void mousePressEvent( QMouseEvent* ); - // void paintEvent( QPaintEvent* ); + void mousePressEvent( TQMouseEvent* ); + // void paintEvent( TQPaintEvent* ); private: - QLabel* m_infoBox; + TQLabel* m_infoBox; }; #endif diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index b6e603d..9d6bb36 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -37,58 +37,58 @@ #include <kaboutdata.h> #include <kaction.h> -#include <qlabel.h> -#include <qhbox.h> -#include <qfile.h> -#include <qtimer.h> -#include <qevent.h> -#include <qtooltip.h> +#include <tqlabel.h> +#include <tqhbox.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqevent.h> +#include <tqtooltip.h> -K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent ) - : QObject(parent), - m_mainWindow(parent) +K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* tqparent ) + : TQObject(tqparent), + m_mainWindow(tqparent) { // setup free temp space box - QHBox* boxFreeTemp = new QHBox( m_mainWindow->statusBar() ); + TQHBox* boxFreeTemp = new TQHBox( m_mainWindow->statusBar() ); boxFreeTemp->setSpacing(2); - m_labelProjectInfo = new QLabel( m_mainWindow->statusBar() ); + m_labelProjectInfo = new TQLabel( m_mainWindow->statusBar() ); - m_pixFreeTemp = new QLabel( boxFreeTemp ); - (void)new QLabel( i18n("Temp:"), boxFreeTemp ); + m_pixFreeTemp = new TQLabel( boxFreeTemp ); + (void)new TQLabel( i18n("Temp:"), boxFreeTemp ); m_pixFreeTemp->setPixmap( SmallIcon("folder_green") ); - m_labelFreeTemp = new QLabel( boxFreeTemp ); + m_labelFreeTemp = new TQLabel( boxFreeTemp ); boxFreeTemp->installEventFilter( this ); // setup info area - m_labelInfoMessage = new QLabel( " ", m_mainWindow->statusBar() ); + m_labelInfoMessage = new TQLabel( " ", m_mainWindow->statusBar() ); // setup version info - m_versionBox = new QLabel( QString("K3b %1").arg(kapp->aboutData()->version()), m_mainWindow->statusBar() ); + m_versionBox = new TQLabel( TQString("K3b %1").tqarg(kapp->aboutData()->version()), m_mainWindow->statusBar() ); m_versionBox->installEventFilter( this ); // setup the statusbar m_mainWindow->statusBar()->addWidget( m_labelInfoMessage, 1 ); // for showing some info m_mainWindow->statusBar()->addWidget( m_labelProjectInfo, 0, true ); // a spacer item - m_mainWindow->statusBar()->addWidget( new QLabel( " ", m_mainWindow->statusBar() ), 0, true ); + m_mainWindow->statusBar()->addWidget( new TQLabel( " ", m_mainWindow->statusBar() ), 0, true ); m_mainWindow->statusBar()->addWidget( boxFreeTemp, 0, true ); // a spacer item - m_mainWindow->statusBar()->addWidget( new QLabel( " ", m_mainWindow->statusBar() ), 0, true ); + m_mainWindow->statusBar()->addWidget( new TQLabel( " ", m_mainWindow->statusBar() ), 0, true ); m_mainWindow->statusBar()->addWidget( m_versionBox, 0, true ); - connect( m_mainWindow, SIGNAL(configChanged(KConfig*)), this, SLOT(update()) ); - connect( m_mainWindow->actionCollection(), SIGNAL(actionStatusText(const QString&)), - this, SLOT(showActionStatusText(const QString&)) ); - connect( m_mainWindow->actionCollection(), SIGNAL(clearStatusText()), - this, SLOT(clearActionStatusText()) ); - connect( k3bappcore->projectManager(), SIGNAL(activeProjectChanged(K3bDoc*)), - this, SLOT(slotActiveProjectChanged(K3bDoc*)) ); - connect( k3bappcore->projectManager(), SIGNAL(projectChanged(K3bDoc*)), - this, SLOT(slotActiveProjectChanged(K3bDoc*)) ); - connect( (m_updateTimer = new QTimer( this )), SIGNAL(timeout()), this, SLOT(slotUpdateProjectStats()) ); + connect( m_mainWindow, TQT_SIGNAL(configChanged(KConfig*)), this, TQT_SLOT(update()) ); + connect( m_mainWindow->actionCollection(), TQT_SIGNAL(actionStatusText(const TQString&)), + this, TQT_SLOT(showActionStatusText(const TQString&)) ); + connect( m_mainWindow->actionCollection(), TQT_SIGNAL(clearStatusText()), + this, TQT_SLOT(clearActionStatusText()) ); + connect( k3bappcore->projectManager(), TQT_SIGNAL(activeProjectChanged(K3bDoc*)), + this, TQT_SLOT(slotActiveProjectChanged(K3bDoc*)) ); + connect( k3bappcore->projectManager(), TQT_SIGNAL(projectChanged(K3bDoc*)), + this, TQT_SLOT(slotActiveProjectChanged(K3bDoc*)) ); + connect( (m_updateTimer = new TQTimer( this )), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateProjectStats()) ); update(); } @@ -101,10 +101,10 @@ K3bStatusBarManager::~K3bStatusBarManager() void K3bStatusBarManager::update() { - QString path = K3b::defaultTempPath(); + TQString path = K3b::defaultTempPath(); - if( !QFile::exists( path ) ) - path.truncate( path.findRev('/') ); + if( !TQFile::exists( path ) ) + path.truncate( path.tqfindRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) @@ -112,14 +112,14 @@ void K3bStatusBarManager::update() else m_labelFreeTemp->setText(i18n("No info")); - if( path != QToolTip::textFor( m_labelFreeTemp->parentWidget() ) ) { - QToolTip::remove( m_labelFreeTemp->parentWidget() ); - QToolTip::add( m_labelFreeTemp->parentWidget(), path ); + if( path != TQToolTip::textFor( m_labelFreeTemp->tqparentWidget() ) ) { + TQToolTip::remove( m_labelFreeTemp->tqparentWidget() ); + TQToolTip::add( m_labelFreeTemp->tqparentWidget(), path ); } } -void K3bStatusBarManager::slotFreeTempSpace(const QString&, +void K3bStatusBarManager::slotFreeTempSpace(const TQString&, unsigned long kbSize, unsigned long, unsigned long kbAvail) @@ -134,11 +134,11 @@ void K3bStatusBarManager::slotFreeTempSpace(const QString&, m_pixFreeTemp->setPixmap( SmallIcon("folder_green") ); // update the display every second - QTimer::singleShot( 2000, this, SLOT(update()) ); + TQTimer::singleShot( 2000, this, TQT_SLOT(update()) ); } -void K3bStatusBarManager::showActionStatusText( const QString& text ) +void K3bStatusBarManager::showActionStatusText( const TQString& text ) { m_mainWindow->statusBar()->message( text ); } @@ -150,24 +150,24 @@ void K3bStatusBarManager::clearActionStatusText() } -bool K3bStatusBarManager::eventFilter( QObject* o, QEvent* e ) +bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e ) { - if( e->type() == QEvent::MouseButtonDblClick ) { - if( o == m_labelFreeTemp->parentWidget() ) + if( e->type() == TQEvent::MouseButtonDblClick ) { + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->tqparentWidget()) ) m_mainWindow->showOptionDialog( 0 ); // FIXME: use an enumeration for the option pages - else if( o == m_versionBox ) + else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) ) if( KAction* a = m_mainWindow->action( "help_about_app" ) ) a->activate(); } - return QObject::eventFilter( o, e ); + return TQObject::eventFilter( o, e ); } -static QString dataDocStats( K3bDataDoc* dataDoc ) +static TQString dataDocStats( K3bDataDoc* dataDoc ) { return i18n("1 file in %1", "%n files in %1", dataDoc->root()->numFiles() ) - .arg( i18n("1 folder", "%n folders", dataDoc->root()->numDirs()+1 ) ); + .tqarg( i18n("1 folder", "%n folders", dataDoc->root()->numDirs()+1 ) ); } @@ -181,7 +181,7 @@ void K3bStatusBarManager::slotActiveProjectChanged( K3bDoc* doc ) } } else if( !doc ) { - m_labelProjectInfo->setText( QString() ); + m_labelProjectInfo->setText( TQString() ); } } @@ -199,7 +199,7 @@ void K3bStatusBarManager::slotUpdateProjectStats() case K3bDoc::DATA: { K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); - m_labelProjectInfo->setText( i18n("Data CD (%1)").arg(dataDocStats(dataDoc)) ); + m_labelProjectInfo->setText( i18n("Data CD (%1)").tqarg(dataDocStats(dataDoc)) ); break; } @@ -207,7 +207,7 @@ void K3bStatusBarManager::slotUpdateProjectStats() K3bAudioDoc* audioDoc = static_cast<K3bMixedDoc*>( doc )->audioDoc(); K3bDataDoc* dataDoc = static_cast<K3bMixedDoc*>( doc )->dataDoc(); m_labelProjectInfo->setText( i18n("Mixed CD (1 track and %1)", "Mixed CD (%n tracks and %1)", audioDoc->numOfTracks() ) - .arg( dataDocStats(dataDoc)) ); + .tqarg( dataDocStats(dataDoc)) ); break; } @@ -219,31 +219,31 @@ void K3bStatusBarManager::slotUpdateProjectStats() case K3bDoc::MOVIX: { K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); - m_labelProjectInfo->setText( i18n("eMovix CD (%1)").arg(dataDocStats(dataDoc)) ); + m_labelProjectInfo->setText( i18n("eMovix CD (%1)").tqarg(dataDocStats(dataDoc)) ); break; } case K3bDoc::MOVIX_DVD: { K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); - m_labelProjectInfo->setText( i18n("eMovix DVD (%1)").arg(dataDocStats(dataDoc)) ); + m_labelProjectInfo->setText( i18n("eMovix DVD (%1)").tqarg(dataDocStats(dataDoc)) ); break; } case K3bDoc::DVD: { K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); - m_labelProjectInfo->setText( i18n("Data DVD (%1)").arg(dataDocStats(dataDoc)) ); + m_labelProjectInfo->setText( i18n("Data DVD (%1)").tqarg(dataDocStats(dataDoc)) ); break; } case K3bDoc::VIDEODVD: { K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); - m_labelProjectInfo->setText( i18n("Video DVD (%1)").arg(dataDocStats(dataDoc)) ); + m_labelProjectInfo->setText( i18n("Video DVD (%1)").tqarg(dataDocStats(dataDoc)) ); break; } } } else { - m_labelProjectInfo->setText( QString() ); + m_labelProjectInfo->setText( TQString() ); } } diff --git a/src/k3bstatusbarmanager.h b/src/k3bstatusbarmanager.h index d8db737..b73b82b 100644 --- a/src/k3bstatusbarmanager.h +++ b/src/k3bstatusbarmanager.h @@ -18,44 +18,45 @@ #ifndef K3B_STATUSBAR_MANAGER_H #define K3B_STATUSBAR_MANAGER_H -#include <qobject.h> +#include <tqobject.h> -class QLabel; +class TQLabel; class K3bMainWindow; -class QEvent; +class TQEvent; class K3bDoc; -class QTimer; +class TQTimer; -class K3bStatusBarManager : public QObject +class K3bStatusBarManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bStatusBarManager( K3bMainWindow* parent ); + K3bStatusBarManager( K3bMainWindow* tqparent ); ~K3bStatusBarManager(); public slots: void update(); private slots: - void slotFreeTempSpace( const QString&, unsigned long, unsigned long, unsigned long ); - void showActionStatusText( const QString& text ); + void slotFreeTempSpace( const TQString&, unsigned long, unsigned long, unsigned long ); + void showActionStatusText( const TQString& text ); void clearActionStatusText(); void slotActiveProjectChanged( K3bDoc* doc ); void slotUpdateProjectStats(); private: - bool eventFilter( QObject* o, QEvent* e ); + bool eventFilter( TQObject* o, TQEvent* e ); - QLabel* m_labelInfoMessage; - QLabel* m_pixFreeTemp; - QLabel* m_labelFreeTemp; - QLabel* m_versionBox; - QLabel* m_labelProjectInfo; + TQLabel* m_labelInfoMessage; + TQLabel* m_pixFreeTemp; + TQLabel* m_labelFreeTemp; + TQLabel* m_versionBox; + TQLabel* m_labelProjectInfo; K3bMainWindow* m_mainWindow; - QTimer* m_updateTimer; + TQTimer* m_updateTimer; }; #endif diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index 17f9376..5f97c7f 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -34,11 +34,11 @@ #include <k3bthememanager.h> #include <k3bcore.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qfileinfo.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqfileinfo.h> #include <klocale.h> #include <kstandarddirs.h> @@ -56,19 +56,19 @@ #include <fstab.h> -static QString markupString( const QString& s_ ) +static TQString markupString( const TQString& s_ ) { - QString s(s_); - s.replace( '<', "<" ); - s.replace( '>', ">" ); + TQString s(s_); + s.tqreplace( '<', "<" ); + s.tqreplace( '>', ">" ); return s; } K3bSystemProblem::K3bSystemProblem( int t, - const QString& p, - const QString& d, - const QString& s, + const TQString& p, + const TQString& d, + const TQString& s, bool k ) : type(t), problem(p), @@ -79,10 +79,10 @@ K3bSystemProblem::K3bSystemProblem( int t, } -K3bSystemProblemDialog::K3bSystemProblemDialog( const QValueList<K3bSystemProblem>& problems, - QWidget* parent, +K3bSystemProblemDialog::K3bSystemProblemDialog( const TQValueList<K3bSystemProblem>& problems, + TQWidget* tqparent, const char* name ) - : KDialog( parent, name ) + : KDialog( tqparent, name ) { setCaption( i18n("System Configuration Problems") ); @@ -92,13 +92,13 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const QValueList<K3bSystemProble titleFrame->setTitle( i18n("System Configuration Problems"), i18n("1 problem", "%n problems", problems.count() ) ); - m_closeButton = new QPushButton( i18n("Close"), this ); - connect( m_closeButton, SIGNAL(clicked()), this, SLOT(close()) ); - m_checkDontShowAgain = new QCheckBox( i18n("Do not show again"), this ); + m_closeButton = new TQPushButton( i18n("Close"), this ); + connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); + m_checkDontShowAgain = new TQCheckBox( i18n("Do not show again"), this ); #ifdef HAVE_K3BSETUP - m_k3bsetupButton = new QPushButton( i18n("Start K3bSetup2"), this ); - connect( m_k3bsetupButton, SIGNAL(clicked()), this, SLOT(slotK3bSetup()) ); + m_k3bsetupButton = new TQPushButton( i18n("Start K3bSetup2"), this ); + connect( m_k3bsetupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotK3bSetup()) ); #endif // setup the problem view @@ -108,14 +108,14 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const QValueList<K3bSystemProble view->setTextFormat(RichText); - // layout everything - QGridLayout* grid = new QGridLayout( this ); + // tqlayout everything + TQGridLayout* grid = new TQGridLayout( this ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); grid->addMultiCellWidget( titleFrame, 0, 0, 0, 1 ); grid->addMultiCellWidget( view, 1, 1, 0, 1 ); grid->addWidget( m_checkDontShowAgain, 2, 0 ); - QHBoxLayout* buttonBox = new QHBoxLayout; + TQHBoxLayout* buttonBox = new TQHBoxLayout; buttonBox->setSpacing( spacingHint() ); buttonBox->setMargin( 0 ); #ifdef HAVE_K3BSETUP @@ -126,9 +126,9 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const QValueList<K3bSystemProble grid->setColStretch( 0, 1 ); grid->setRowStretch( 1, 1 ); - QString text = "<html>"; + TQString text = "<html>"; - for( QValueList<K3bSystemProblem>::const_iterator it = problems.begin(); + for( TQValueList<K3bSystemProblem>::const_iterator it = problems.begin(); it != problems.end(); ++it ) { const K3bSystemProblem& p = *it; @@ -157,7 +157,7 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const QValueList<K3bSystemProble } -void K3bSystemProblemDialog::closeEvent( QCloseEvent* e ) +void K3bSystemProblemDialog::closeEvent( TQCloseEvent* e ) { if( m_checkDontShowAgain->isChecked() ) { KConfigGroup grp( kapp->config(), "General Options" ); @@ -168,10 +168,10 @@ void K3bSystemProblemDialog::closeEvent( QCloseEvent* e ) } -void K3bSystemProblemDialog::checkSystem( QWidget* parent, +void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent, const char* name ) { - QValueList<K3bSystemProblem> problems; + TQValueList<K3bSystemProblem> problems; if( k3bcore->deviceManager()->cdWriter().isEmpty() ) { problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, @@ -186,16 +186,16 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, // 1. cdrecord, cdrdao if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Unable to find %1 executable").arg("cdrecord"), + i18n("Unable to tqfind %1 executable").tqarg("cdrecord"), i18n("K3b uses cdrecord to actually write CDs."), - i18n("Install the cdrtools package which contains " + i18n("Install the cdrtools package which tqcontains " "cdrecord."), false ) ); } else { if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "outdated" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, - i18n("Used %1 version %2 is outdated").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version), + i18n("Used %1 version %2 is outdated").tqarg("cdrecord").tqarg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version), i18n("Although K3b supports all cdrtools versions since " "1.10 it is highly recommended to at least use " "version 2.0."), @@ -210,23 +210,23 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, // Since kernel 2.6.8 older cdrecord versions are not able to use the SCSI subsystem when running suid root anymore // So far we ignore the suid root issue with kernel >= 2.6.8 and cdrecord < 2.01.01a02 // - // Kernel 2.6.16.something seems to introduce another problem which was apparently worked around in cdrecord 2.01.01a05 + // Kernel 2.6.16.something seems to introduce another problem which was aptqparently worked around in cdrecord 2.01.01a05 // if( K3b::simpleKernelVersion() >= K3bVersion( 2, 6, 8 ) && k3bcore->externalBinManager()->binObject( "cdrecord" )->version < K3bVersion( 2, 1, 1, "a05" ) && !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "wodim" ) ) { if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) ) problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("%1 will be run with root privileges on kernel >= 2.6.8").arg("cdrecord <= 2.01.01a05"), + i18n("%1 will be run with root privileges on kernel >= 2.6.8").tqarg("cdrecord <= 2.01.01a05"), i18n("Since Linux kernel 2.6.8 %1 will not work when run suid " - "root for security reasons anymore.").arg("cdrecord <= 2.01.01a05"), - QString::null, + "root for security reasons anymore.").tqarg("cdrecord <= 2.01.01a05"), + TQString(), true ) ); } #ifdef CDRECORD_SUID_ROOT_CHECK else if( !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) && getuid() != 0 ) // not root problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("%1 will be run without root privileges").arg("cdrecord"), + i18n("%1 will be run without root privileges").tqarg("cdrecord"), i18n("It is highly recommended to configure cdrecord " "to run with root privileges. Only then cdrecord " "runs with high priority which increases the overall " @@ -234,7 +234,7 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, "it allows changing the size of the used burning buffer. " "A lot of user problems could be solved this way. This is also " "true when using SuSE's resmgr."), - QString::null, + TQString(), true ) ); #endif // CDRECORD_SUID_ROOT_CHECK #endif @@ -242,7 +242,7 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, } if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Unable to find %1 executable").arg("cdrdao"), + i18n("Unable to tqfind %1 executable").tqarg("cdrdao"), i18n("K3b uses cdrdao to actually write CDs."), i18n("Install the cdrdao package."), false ) ); @@ -253,11 +253,11 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, #ifdef CDRECORD_SUID_ROOT_CHECK if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "suidroot" ) && getuid() != 0 ) problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("%1 will be run without root privileges").arg("cdrdao"), + i18n("%1 will be run without root privileges").tqarg("cdrdao"), i18n("It is highly recommended to configure cdrdao " "to run with root privileges to increase the " "overall stability of the burning process."), - QString::null, + TQString(), true ) ); #endif // CDRECORD_SUID_ROOT_CHECK #endif @@ -268,7 +268,7 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) { if( !k3bcore->externalBinManager()->foundBin( "growisofs" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Unable to find %1 executable").arg("growisofs"), + i18n("Unable to tqfind %1 executable").tqarg("growisofs"), i18n("K3b uses growisofs to actually write dvds. " "Without growisofs you will not be able to write dvds. " "Make sure to install at least version 5.10."), @@ -278,46 +278,46 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, else { if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 10 ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), + i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), i18n("K3b needs at least growisofs version 5.10 to write dvds. " "All older versions will not work and K3b will refuse to use them."), - i18n("Install a more recent version of %1.").arg("growisofs"), + i18n("Install a more recent version of %1.").tqarg("growisofs"), false ) ); } else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, - i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), + i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), i18n("K3b will not be able to copy DVDs on-the-fly or write a DVD+RW in multiple " "sessions using a growisofs " "version older than 5.12."), - i18n("Install a more recent version of %1.").arg("growisofs"), + i18n("Install a more recent version of %1.").tqarg("growisofs"), false ) ); } else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 7, 0 ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, - i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), + i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), i18n("It is highly recommended to use growisofs 7.0 or higher. " "K3b won't be able to write a DVD+RW in multiple " "sessions using a growisofs version older than 7.0." ), - i18n("Install a more recent version of %1.").arg("growisofs"), + i18n("Install a more recent version of %1.").tqarg("growisofs"), false ) ); } // for now we ignore the suid root bit becasue of the memorylocked issue // else if( !k3bcore->externalBinManager()->binObject( "growisofs" )->hasFeature( "suidroot" ) ) { // problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, -// i18n("%1 will be run without root privileges").arg("growisofs"), +// i18n("%1 will be run without root privileges").tqarg("growisofs"), // i18n("It is highly recommended to configure growisofs " // "to run with root privileges. Only then growisofs " // "runs with high priority which increases the overall " // "stability of the burning process."), -// QString::null, +// TQString(), // true ) ); // } } if( !k3bcore->externalBinManager()->foundBin( "dvd+rw-format" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Unable to find %1 executable").arg("dvd+rw-format"), + i18n("Unable to tqfind %1 executable").tqarg("dvd+rw-format"), i18n("K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."), i18n("Install the dvd+rw-tools package."), false ) ); @@ -330,11 +330,11 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, else if( k3bcore->externalBinManager()->binObject( "mkisofs" )->hasFeature( "outdated" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, i18n("Used %1 version %2 is outdated") - .arg("mkisofs") - .arg(k3bcore->externalBinManager()->binObject( "mkisofs" )->version), + .tqarg("mkisofs") + .tqarg(k3bcore->externalBinManager()->binObject( "mkisofs" )->version), i18n("K3b needs at least mkisofs version 1.14. Older versions may introduce problems " "when creating data projects."), - i18n("Install a more recent version of %1.").arg("mkisofs"), + i18n("Install a more recent version of %1.").tqarg("mkisofs"), false ) ); } @@ -342,7 +342,7 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, bool atapiReader = false; bool atapiWriter = false; bool dvd_r_dl = false; - for( QPtrListIterator<K3bDevice::Device> it( k3bcore->deviceManager()->readingDevices() ); + for( TQPtrListIterator<K3bDevice::Device> it( k3bcore->deviceManager()->readingDevices() ); it.current(); ++it ) { if( it.current()->interfaceType() == K3bDevice::IDE ) atapiReader = true; @@ -352,12 +352,12 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, // check automounted devices - QPtrList<K3bDevice::Device> automountedDevices = checkForAutomounting(); - for( QPtrListIterator<K3bDevice::Device> it( automountedDevices ); + TQPtrList<K3bDevice::Device> automountedDevices = checkForAutomounting(); + for( TQPtrListIterator<K3bDevice::Device> it( automountedDevices ); it.current(); ++it ) { problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, i18n("Device %1 - %2 is automounted.") - .arg(it.current()->vendor()).arg(it.current()->description()), + .tqarg(it.current()->vendor()).tqarg(it.current()->description()), i18n("K3b is not able to unmount automounted devices. Thus, especially " "DVD+RW rewriting might fail. There is no need to report this as " "a bug or feature wish; it is not possible to solve this problem " @@ -394,16 +394,16 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, !( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "plain-atapi" ) && K3b::plainAtapiSupport() ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("%1 %2 does not support ATAPI").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), + i18n("%1 %2 does not support ATAPI").tqarg("cdrecord").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), i18n("The configured version of %1 does not " "support writing to ATAPI devices without " "SCSI emulation and there is at least one writer " "in your system not configured to use " - "SCSI emulation.").arg("cdrecord"), + "SCSI emulation.").tqarg("cdrecord"), i18n("The best and recommended solution is to enable " "ide-scsi (SCSI emulation) for all devices. " "This way you won't have any problems. Or you install " - "(or select as the default) a more recent version of %1.").arg("cdrtools"), + "(or select as the default) a more recent version of %1.").tqarg("cdrtools"), false ) ); } } @@ -412,22 +412,22 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "hacked-atapi" ) && !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "plain-atapi") ) { - // FIXME: replace ">" with ">" + // FIXME: tqreplace ">" with ">" problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, i18n("%1 %2 does not support ATAPI") - .arg("cdrdao").arg(k3bcore->externalBinManager()->binObject("cdrdao")->version), + .tqarg("cdrdao").tqarg(k3bcore->externalBinManager()->binObject("cdrdao")->version), i18n("The configured version of %1 does not " "support writing to ATAPI devices without " "SCSI emulation and there is at least one writer " "in your system not configured to use " - "SCSI emulation.").arg("cdrdao"), + "SCSI emulation.").tqarg("cdrdao"), K3b::simpleKernelVersion() > K3bVersion( 2, 5, 0 ) ? i18n("Install cdrdao >= 1.1.8 which supports writing to " "ATAPI devices directly.") : i18n("The best, and recommended, solution is to use " "ide-scsi (SCSI emulation) for all writer devices: " "this way you will not have any problems; or, you can install " - "(or select as the default) a more recent version of %1.").arg("cdrdao"), + "(or select as the default) a more recent version of %1.").tqarg("cdrdao"), false ) ); } } @@ -437,63 +437,63 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, if( dvd_r_dl && k3bcore->externalBinManager()->foundBin( "growisofs" ) ) { if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 6, 0 ) ) problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, - i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), + i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), i18n("K3b won't be able to write DVD-R Dual Layer media using a growisofs " "version older than 6.0."), i18n("Install a more recent version of growisofs."), false ) ); } - for( QPtrListIterator<K3bDevice::Device> it( k3bcore->deviceManager()->allDevices() ); + for( TQPtrListIterator<K3bDevice::Device> it( k3bcore->deviceManager()->allDevices() ); it.current(); ++it ) { K3bDevice::Device* dev = it.current(); - if( !QFileInfo( dev->blockDeviceName() ).isWritable() ) + if( !TQFileInfo( dev->blockDeviceName() ).isWritable() ) problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("No write access to device %1").arg(dev->blockDeviceName()), + i18n("No write access to device %1").tqarg(dev->blockDeviceName()), i18n("K3b needs write access to all the devices to perform certain tasks. " - "Without it you might encounter problems with %1 - %2").arg(dev->vendor()).arg(dev->description()), + "Without it you might encounter problems with %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()), i18n("Make sure you have write access to %1. In case you are not using " - "devfs or udev K3bSetup is able to do this for you.").arg(dev->blockDeviceName()), + "devfs or udev K3bSetup is able to do this for you.").tqarg(dev->blockDeviceName()), false ) ); if( !dev->genericDevice().isEmpty() && - !QFileInfo( dev->genericDevice() ).isWritable() ) + !TQFileInfo( dev->genericDevice() ).isWritable() ) problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("No write access to generic SCSI device %1").arg(dev->genericDevice()), + i18n("No write access to generic SCSI device %1").tqarg(dev->genericDevice()), i18n("Without write access to the generic device you might " - "encounter problems with Audio CD ripping from %1 - %2").arg(dev->vendor()).arg(dev->description()), + "encounter problems with Audio CD ripping from %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()), i18n("Make sure you have write access to %1. In case you are not using " - "devfs or udev K3bSetup is able to do this for you.").arg(dev->genericDevice()), + "devfs or udev K3bSetup is able to do this for you.").tqarg(dev->genericDevice()), false ) ); if( dev->interfaceType() == K3bDevice::IDE && !dmaActivated( dev ) ) problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("DMA disabled on device %1 - %2").arg(dev->vendor()).arg(dev->description()), + i18n("DMA disabled on device %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()), i18n("With most modern CD/DVD devices enabling DMA highly increases " "read/write performance. If you experience very low writing speeds " "this is probably the cause."), - i18n("Enable DMA temporarily as root with 'hdparm -d 1 %1'.").arg(dev->blockDeviceName()) ) ); + i18n("Enable DMA temporarily as root with 'hdparm -d 1 %1'.").tqarg(dev->blockDeviceName()) ) ); } // // Check if the user specified some user parameters and warn about it // - const QMap<QString, K3bExternalProgram*>& programMap = k3bcore->externalBinManager()->programs(); - for( QMap<QString, K3bExternalProgram*>::const_iterator it = programMap.constBegin(); + const TQMap<TQString, K3bExternalProgram*>& programMap = k3bcore->externalBinManager()->programs(); + for( TQMap<TQString, K3bExternalProgram*>::const_iterator it = programMap.constBegin(); it != programMap.constEnd(); ++it ) { const K3bExternalProgram* p = it.data(); if( !p->userParameters().isEmpty() ) { problems.append( K3bSystemProblem( K3bSystemProblem::WARNING, - i18n("User parameters specified for external program %1").arg(p->name()), + i18n("User parameters specified for external program %1").tqarg(p->name()), i18n("Sometimes it may be nessessary to specify user parameters in addition to " "the parameters generated by K3b. This is simply a warning to make sure that " "these parameters are really wanted and won't be part of some bug report."), i18n("To remove the user parameters for the external program %1 open the " "K3b settings page 'Programs' and choose the tab 'User Parameters'.") - .arg(p->name()), + .tqarg(p->name()), false ) ); } } @@ -503,9 +503,9 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, // the legal restrictions with many distros // /* - QPtrList<K3bPlugin> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" ); + TQPtrList<K3bPlugin> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" ); bool haveMp3Decoder = false; - for( QPtrListIterator<K3bPlugin> it( plugins ); *it; ++it ) { + for( TQPtrListIterator<K3bPlugin> it( plugins ); *it; ++it ) { if( it.current()->pluginInfo().name() == "K3b MAD Decoder" ) { haveMp3Decoder = true; break; @@ -566,7 +566,7 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, kdDebug() << "(K3bCore) System problems:" << endl; - for( QValueList<K3bSystemProblem>::const_iterator it = problems.begin(); + for( TQValueList<K3bSystemProblem>::const_iterator it = problems.begin(); it != problems.end(); ++it ) { const K3bSystemProblem& p = *it; @@ -594,7 +594,7 @@ void K3bSystemProblemDialog::checkSystem( QWidget* parent, static K3bSystemProblemDialog* s_openDlg = 0; if( s_openDlg ) s_openDlg->close(); - K3bSystemProblemDialog dlg( problems, parent, name ); + K3bSystemProblemDialog dlg( problems, tqparent, name ); s_openDlg = &dlg; dlg.exec(); s_openDlg = 0; @@ -616,7 +616,7 @@ void K3bSystemProblemDialog::slotK3bSetup() int K3bSystemProblemDialog::dmaActivated( K3bDevice::Device* dev ) { - QString hdparm = K3b::findExe( "hdparm" ); + TQString hdparm = K3b::findExe( "hdparm" ); if( hdparm.isEmpty() ) return -1; @@ -633,18 +633,18 @@ int K3bSystemProblemDialog::dmaActivated( K3bDevice::Device* dev ) // // But we ignore the on/off since it might be translated // - if( out.output().contains( "1 (" ) ) + if( out.output().tqcontains( "1 (" ) ) return 1; - else if( out.output().contains( "0 (" ) ) + else if( out.output().tqcontains( "0 (" ) ) return 0; else return -1; } -QPtrList<K3bDevice::Device> K3bSystemProblemDialog::checkForAutomounting() +TQPtrList<K3bDevice::Device> K3bSystemProblemDialog::checkForAutomounting() { - QPtrList<K3bDevice::Device> l; + TQPtrList<K3bDevice::Device> l; ::setfsent(); @@ -652,13 +652,13 @@ QPtrList<K3bDevice::Device> K3bSystemProblemDialog::checkForAutomounting() while( (mountInfo = ::getfsent()) ) { // check if the entry corresponds to a device - QString md = K3b::resolveLink( QFile::decodeName( mountInfo->fs_spec ) ); - QString type = QFile::decodeName( mountInfo->fs_vfstype ); + TQString md = K3b::resolveLink( TQFile::decodeName( mountInfo->fs_spec ) ); + TQString type = TQFile::decodeName( mountInfo->fs_vfstype ); if( type == "supermount" || type == "subfs" ) { // parse the device - QStringList opts = QStringList::split( ",", QString::fromLocal8Bit(mountInfo->fs_mntops) ); - for( QStringList::const_iterator it = opts.begin(); it != opts.end(); ++it ) { + TQStringList opts = TQStringList::split( ",", TQString::fromLocal8Bit(mountInfo->fs_mntops) ); + for( TQStringList::const_iterator it = opts.begin(); it != opts.end(); ++it ) { if( (*it).startsWith("dev=") ) { md = (*it).mid( 4 ); break; diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h index ad3e1c3..f884d2a 100644 --- a/src/k3bsystemproblemdialog.h +++ b/src/k3bsystemproblemdialog.h @@ -17,14 +17,14 @@ #ifndef _K3B_SYSTEM_DIALOG_H_ #define _K3B_SYSTEM_DIALOG_H_ -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <kdialog.h> -class QPushButton; -class QCheckBox; -class QCloseEvent; +class TQPushButton; +class TQCheckBox; +class TQCloseEvent; namespace K3bDevice { class Device; } @@ -34,9 +34,9 @@ class K3bSystemProblem { public: K3bSystemProblem( int type = NON_CRITICAL, - const QString& problem = QString::null, - const QString& details = QString::null, - const QString& solution = QString::null, + const TQString& problem = TQString(), + const TQString& details = TQString(), + const TQString& solution = TQString(), bool k3bsetup = false ); enum { @@ -46,9 +46,9 @@ class K3bSystemProblem }; int type; - QString problem; - QString details; - QString solution; + TQString problem; + TQString details; + TQString solution; bool solvableByK3bSetup; }; @@ -68,6 +68,7 @@ class K3bSystemProblem class K3bSystemProblemDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: /** @@ -77,25 +78,25 @@ class K3bSystemProblemDialog : public KDialog * or K3b is started for the first time. */ static bool readCheckSystemConfig(); - static void checkSystem( QWidget* parent = 0, + static void checkSystem( TQWidget* tqparent = 0, const char* name = 0 ); protected: - void closeEvent( QCloseEvent* ); + void closeEvent( TQCloseEvent* ); private slots: void slotK3bSetup(); private: - K3bSystemProblemDialog( const QValueList<K3bSystemProblem>&, - QWidget* parent = 0, + K3bSystemProblemDialog( const TQValueList<K3bSystemProblem>&, + TQWidget* tqparent = 0, const char* name = 0 ); static int dmaActivated( K3bDevice::Device* ); - static QPtrList<K3bDevice::Device> checkForAutomounting(); + static TQPtrList<K3bDevice::Device> checkForAutomounting(); - QPushButton* m_closeButton; - QPushButton* m_k3bsetupButton; - QCheckBox* m_checkDontShowAgain; + TQPushButton* m_closeButton; + TQPushButton* m_k3bsetupButton; + TQCheckBox* m_checkDontShowAgain; }; #endif diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp index ae850e1..b565f21 100644 --- a/src/k3btempdirselectionwidget.cpp +++ b/src/k3btempdirselectionwidget.cpp @@ -18,14 +18,14 @@ #include <k3bglobals.h> #include <k3bcore.h> -#include <qlabel.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qhbox.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qfileinfo.h> +#include <tqlabel.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqhbox.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqfileinfo.h> #include <kconfig.h> #include <klocale.h> @@ -39,32 +39,32 @@ #include <klineedit.h> -K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( QWidget *parent, const char *name ) - : QGroupBox( 4, Qt::Vertical, parent, name ), +K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *tqparent, const char *name ) + : TQGroupBox( 4, Qt::Vertical, tqparent, name ), m_labelCdSize(0), m_defaultImageFileName( "k3b_image.iso" ) { - layout()->setSpacing( KDialog::spacingHint() ); - layout()->setMargin( KDialog::marginHint() ); + tqlayout()->setSpacing( KDialog::spacingHint() ); + tqlayout()->setMargin( KDialog::marginHint() ); - m_imageFileLabel = new QLabel( this ); + m_imageFileLabel = new TQLabel( this ); m_editDirectory = new KURLRequester( this, "m_editDirectory" ); m_imageFileLabel->setBuddy( m_editDirectory ); - QHBox* freeTempSpaceBox = new QHBox( this ); + TQHBox* freeTempSpaceBox = new TQHBox( this ); freeTempSpaceBox->setSpacing( KDialog::spacingHint() ); - (void)new QLabel( i18n( "Free space in temporary directory:" ), freeTempSpaceBox, "TextLabel2" ); - m_labelFreeSpace = new QLabel( " ",freeTempSpaceBox, "m_labelFreeSpace" ); - m_labelFreeSpace->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + (void)new TQLabel( i18n( "Free space in temporary directory:" ), freeTempSpaceBox, "TextLabel2" ); + m_labelFreeSpace = new TQLabel( " ",freeTempSpaceBox, "m_labelFreeSpace" ); + m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - connect( m_editDirectory, SIGNAL(openFileDialog(KURLRequester*)), - this, SLOT(slotTempDirButtonPressed(KURLRequester*)) ); - connect( m_editDirectory, SIGNAL(textChanged(const QString&)), - this, SLOT(slotUpdateFreeTempSpace()) ); - connect( m_editDirectory->lineEdit(), SIGNAL(lostFocus()), - this, SLOT(slotFixTempPath()) ); + connect( m_editDirectory, TQT_SIGNAL(openFileDialog(KURLRequester*)), + this, TQT_SLOT(slotTempDirButtonPressed(KURLRequester*)) ); + connect( m_editDirectory, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_editDirectory->lineEdit(), TQT_SIGNAL(lostFocus()), + this, TQT_SLOT(slotFixTempPath()) ); // choose a default setSelectionMode( DIR ); @@ -74,11 +74,11 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( QWidget *parent, const cha // ToolTips // -------------------------------------------------------------------------------- - QToolTip::add( m_editDirectory, i18n("The directory in which to save the image files") ); + TQToolTip::add( m_editDirectory, i18n("The directory in which to save the image files") ); // What's This info // -------------------------------------------------------------------------------- - QWhatsThis::add( m_editDirectory, i18n("<p>This is the directory in which K3b will save the <em>image files</em>." + TQWhatsThis::add( m_editDirectory, i18n("<p>This is the directory in which K3b will save the <em>image files</em>." "<p>Please make sure that it resides on a partition that has enough free space.") ); } @@ -90,10 +90,10 @@ K3bTempDirSelectionWidget::~K3bTempDirSelectionWidget() unsigned long K3bTempDirSelectionWidget::freeTempSpace() const { - QString path = m_editDirectory->url(); + TQString path = m_editDirectory->url(); - if( !QFile::exists( path ) ) - path.truncate( path.findRev('/') ); + if( !TQFile::exists( path ) ) + path.truncate( path.tqfindRev('/') ); unsigned long size; K3b::kbFreeOnFs( path, size, m_freeTempSpace ); @@ -115,7 +115,7 @@ void K3bTempDirSelectionWidget::slotUpdateFreeTempSpace() else m_labelCdSize->setPaletteForegroundColor( m_labelFreeSpace->paletteForegroundColor() ); } - QTimer::singleShot( 1000, this, SLOT(slotUpdateFreeTempSpace()) ); + TQTimer::singleShot( 1000, this, TQT_SLOT(slotUpdateFreeTempSpace()) ); } @@ -133,16 +133,16 @@ void K3bTempDirSelectionWidget::slotTempDirButtonPressed( KURLRequester* r ) } -void K3bTempDirSelectionWidget::setTempPath( const QString& dir ) +void K3bTempDirSelectionWidget::setTempPath( const TQString& dir ) { m_editDirectory->setURL( dir ); slotUpdateFreeTempSpace(); } -QString K3bTempDirSelectionWidget::tempPath() const +TQString K3bTempDirSelectionWidget::tempPath() const { - QFileInfo fi( m_editDirectory->url() ); + TQFileInfo fi( m_editDirectory->url() ); if( fi.exists() ) { if( m_mode == DIR ) { @@ -164,27 +164,27 @@ QString K3bTempDirSelectionWidget::tempPath() const } -QString K3bTempDirSelectionWidget::plainTempPath() const +TQString K3bTempDirSelectionWidget::plainTempPath() const { return m_editDirectory->url(); } -QString K3bTempDirSelectionWidget::tempDirectory() const +TQString K3bTempDirSelectionWidget::tempDirectory() const { - QString td( m_editDirectory->url() ); + TQString td( m_editDirectory->url() ); // remove a trailing slash while( !td.isEmpty() && td[td.length()-1] == '/' ) td.truncate( td.length()-1 ); - QFileInfo fi( td ); + TQFileInfo fi( td ); if( fi.exists() && fi.isDir() ) return td + "/"; // now we treat the last section as a filename and return the path // in front of it - td.truncate( td.findRev( '/' ) + 1 ); + td.truncate( td.tqfindRev( '/' ) + 1 ); return td; } @@ -208,11 +208,11 @@ void K3bTempDirSelectionWidget::setNeededSize( KIO::filesize_t bytes ) { m_requestedSize = bytes; if( !m_labelCdSize ) { - QHBox* cdSizeBox = new QHBox( this ); + TQHBox* cdSizeBox = new TQHBox( this ); cdSizeBox->setSpacing( KDialog::spacingHint() ); - (void)new QLabel( i18n( "Size of project:" ), cdSizeBox, "TextLabel4" ); - m_labelCdSize = new QLabel( KIO::convertSize(bytes), cdSizeBox, "m_labelCdSize" ); - m_labelCdSize->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + (void)new TQLabel( i18n( "Size of project:" ), cdSizeBox, "TextLabel4" ); + m_labelCdSize = new TQLabel( KIO::convertSize(bytes), cdSizeBox, "m_labelCdSize" ); + m_labelCdSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); } m_labelCdSize->setText( KIO::convertSize(bytes) ); } @@ -237,7 +237,7 @@ void K3bTempDirSelectionWidget::saveConfig( KConfigBase* c ) } -void K3bTempDirSelectionWidget::setDefaultImageFileName( const QString& name ) +void K3bTempDirSelectionWidget::setDefaultImageFileName( const TQString& name ) { if ( !name.isEmpty() ) { bool changeImageName = false; @@ -248,7 +248,7 @@ void K3bTempDirSelectionWidget::setDefaultImageFileName( const QString& name ) } m_defaultImageFileName = name; - if ( !m_defaultImageFileName.contains( '.' ) ) { + if ( !m_defaultImageFileName.tqcontains( '.' ) ) { m_defaultImageFileName += ".iso"; } fixTempPath( changeImageName ); @@ -268,7 +268,7 @@ void K3bTempDirSelectionWidget::fixTempPath( bool forceNewImageName ) // forceNewImageName is true set the default image file name if ( selectionMode() == FILE ) { if ( forceNewImageName || - QFileInfo( plainTempPath() ).isDir() ) { + TQFileInfo( plainTempPath() ).isDir() ) { setTempPath( tempDirectory() + m_defaultImageFileName ); } } diff --git a/src/k3btempdirselectionwidget.h b/src/k3btempdirselectionwidget.h index abad230..f456e6b 100644 --- a/src/k3btempdirselectionwidget.h +++ b/src/k3btempdirselectionwidget.h @@ -17,11 +17,11 @@ #ifndef K3BTEMPDIRSELECTIONWIDGET_H #define K3BTEMPDIRSELECTIONWIDGET_H -#include <qgroupbox.h> +#include <tqgroupbox.h> #include <kio/global.h> -class QTimer; -class QLabel; +class TQTimer; +class TQLabel; class KURLRequester; class KConfigBase; @@ -29,12 +29,13 @@ class KConfigBase; /** *@author Sebastian Trueg */ -class K3bTempDirSelectionWidget : public QGroupBox +class K3bTempDirSelectionWidget : public TQGroupBox { Q_OBJECT + TQ_OBJECT public: - K3bTempDirSelectionWidget( QWidget *parent = 0, const char *name = 0 ); + K3bTempDirSelectionWidget( TQWidget *tqparent = 0, const char *name = 0 ); ~K3bTempDirSelectionWidget(); /** determines if the selection dialog should ask for a dir or a file */ @@ -47,17 +48,17 @@ class K3bTempDirSelectionWidget : public QGroupBox * FIXME: use KIO::filesize_t and return the number of bytes */ unsigned long freeTempSpace() const; - QString tempPath() const; - QString tempDirectory() const; + TQString tempPath() const; + TQString tempDirectory() const; /** * Use this if you don't want K3bTempDirSelectionWidget to modify the * user input based on the mode. */ - QString plainTempPath() const; + TQString plainTempPath() const; public slots: - void setTempPath( const QString& ); + void setTempPath( const TQString& ); void setSelectionMode( int mode ); void setNeededSize( KIO::filesize_t bytes ); @@ -66,7 +67,7 @@ class K3bTempDirSelectionWidget : public QGroupBox * automatically be expended to this filename. * Default is k3b_image.iso */ - void setDefaultImageFileName( const QString& name ); + void setDefaultImageFileName( const TQString& name ); /** * saves the current path as the global default tempd dir. @@ -84,9 +85,9 @@ class K3bTempDirSelectionWidget : public QGroupBox private: void fixTempPath( bool forceNewImageName ); - QLabel* m_imageFileLabel; - QLabel* m_labelCdSize; - QLabel* m_labelFreeSpace; + TQLabel* m_imageFileLabel; + TQLabel* m_labelCdSize; + TQLabel* m_labelFreeSpace; KURLRequester* m_editDirectory; mutable unsigned long m_freeTempSpace; @@ -94,7 +95,7 @@ class K3bTempDirSelectionWidget : public QGroupBox int m_mode; - QString m_defaultImageFileName; + TQString m_defaultImageFileName; }; #endif diff --git a/src/k3bthemedheader.cpp b/src/k3bthemedheader.cpp index 4eb1c28..5808c37 100644 --- a/src/k3bthemedheader.cpp +++ b/src/k3bthemedheader.cpp @@ -19,19 +19,19 @@ #include <k3btitlelabel.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> -K3bThemedHeader::K3bThemedHeader( QWidget* parent ) - : QFrame( parent ) +K3bThemedHeader::K3bThemedHeader( TQWidget* tqparent ) + : TQFrame( tqparent ) { init(); } -K3bThemedHeader::K3bThemedHeader( const QString& title, const QString& subtitle, QWidget* parent ) - : QFrame( parent ) +K3bThemedHeader::K3bThemedHeader( const TQString& title, const TQString& subtitle, TQWidget* tqparent ) + : TQFrame( tqparent ) { setTitle( title ); setSubTitle( subtitle ); @@ -45,13 +45,13 @@ K3bThemedHeader::~K3bThemedHeader() } -void K3bThemedHeader::setTitle( const QString& title, const QString& subtitle ) +void K3bThemedHeader::setTitle( const TQString& title, const TQString& subtitle ) { m_titleLabel->setTitle( title, subtitle ); } -void K3bThemedHeader::setSubTitle( const QString& subtitle ) +void K3bThemedHeader::setSubTitle( const TQString& subtitle ) { m_titleLabel->setSubTitle( subtitle ); } @@ -71,43 +71,43 @@ void K3bThemedHeader::setRightPixmap( K3bTheme::PixmapType p ) } -void K3bThemedHeader::setAlignment( int align ) +void K3bThemedHeader::tqsetAlignment( int align ) { - m_titleLabel->setAlignment( align ); + m_titleLabel->tqsetAlignment( align ); } void K3bThemedHeader::init() { - setFrameShape( QFrame::StyledPanel ); - setFrameShadow( QFrame::Sunken ); + setFrameShape( TQFrame::StyledPanel ); + setFrameShadow( TQFrame::Sunken ); setLineWidth( 1 ); setMargin( 1 ); - QHBoxLayout* layout = new QHBoxLayout( this ); - layout->setMargin( 2 ); // to make sure the frame gets displayed - layout->setSpacing( 0 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); + tqlayout->setMargin( 2 ); // to make sure the frame gets displayed + tqlayout->setSpacing( 0 ); - m_leftLabel = new QLabel( this ); + m_leftLabel = new TQLabel( this ); m_leftLabel->setScaledContents( false ); m_titleLabel = new K3bTitleLabel( this ); - m_rightLabel = new QLabel( this ); + m_rightLabel = new TQLabel( this ); m_rightLabel->setScaledContents( false ); - layout->addWidget( m_leftLabel ); - layout->addWidget( m_titleLabel ); - layout->setStretchFactor( m_titleLabel, 1 ); - layout->addWidget( m_rightLabel ); + tqlayout->addWidget( m_leftLabel ); + tqlayout->addWidget( m_titleLabel ); + tqlayout->setStretchFactor( m_titleLabel, 1 ); + tqlayout->addWidget( m_rightLabel ); m_leftPix = K3bTheme::DIALOG_LEFT; m_rightPix = K3bTheme::DIALOG_RIGHT; slotThemeChanged(); - connect( k3bappcore->themeManager(), SIGNAL(themeChanged()), - this, SLOT(slotThemeChanged()) ); - connect( kapp, SIGNAL(appearanceChanged()), - this, SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), + this, TQT_SLOT(slotThemeChanged()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), + this, TQT_SLOT(slotThemeChanged()) ); } diff --git a/src/k3bthemedheader.h b/src/k3bthemedheader.h index 3dda877..62708ee 100644 --- a/src/k3bthemedheader.h +++ b/src/k3bthemedheader.h @@ -16,26 +16,27 @@ #ifndef _K3B_THEMED_HEADER_H_ #define _K3B_THEMED_HEADER_H_ -#include <qframe.h> +#include <tqframe.h> #include "k3bthememanager.h" class K3bTitleLabel; -class QLabel; +class TQLabel; -class K3bThemedHeader : public QFrame +class K3bThemedHeader : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bThemedHeader( QWidget* parent = 0 ); - K3bThemedHeader( const QString& title, const QString& subtitle, QWidget* parent = 0 ); + K3bThemedHeader( TQWidget* tqparent = 0 ); + K3bThemedHeader( const TQString& title, const TQString& subtitle, TQWidget* tqparent = 0 ); ~K3bThemedHeader(); public slots: - void setTitle( const QString& title, const QString& subtitle = QString::null ); - void setSubTitle( const QString& subtitle ); - void setAlignment( int ); + void setTitle( const TQString& title, const TQString& subtitle = TQString() ); + void setSubTitle( const TQString& subtitle ); + void tqsetAlignment( int ); void setLeftPixmap( K3bTheme::PixmapType ); void setRightPixmap( K3bTheme::PixmapType ); @@ -46,8 +47,8 @@ class K3bThemedHeader : public QFrame void init(); K3bTitleLabel* m_titleLabel; - QLabel* m_leftLabel; - QLabel* m_rightLabel; + TQLabel* m_leftLabel; + TQLabel* m_rightLabel; K3bTheme::PixmapType m_leftPix; K3bTheme::PixmapType m_rightPix; }; diff --git a/src/k3bthemedlabel.cpp b/src/k3bthemedlabel.cpp index d2ea05b..11e5001 100644 --- a/src/k3bthemedlabel.cpp +++ b/src/k3bthemedlabel.cpp @@ -16,41 +16,41 @@ #include "k3bthemedlabel.h" #include "k3bapplication.h" -K3bThemedLabel::K3bThemedLabel( QWidget* parent ) - : KCutLabel( parent ), +K3bThemedLabel::K3bThemedLabel( TQWidget* tqparent ) + : KCutLabel( tqparent ), m_themePixmapCode( -1 ) { slotThemeChanged(); - connect( k3bappcore->themeManager(), SIGNAL(themeChanged()), - this, SLOT(slotThemeChanged()) ); - connect( kapp, SIGNAL(appearanceChanged()), - this, SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), + this, TQT_SLOT(slotThemeChanged()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), + this, TQT_SLOT(slotThemeChanged()) ); } -K3bThemedLabel::K3bThemedLabel( const QString& text, QWidget* parent ) - : KCutLabel( text, parent ), +K3bThemedLabel::K3bThemedLabel( const TQString& text, TQWidget* tqparent ) + : KCutLabel( text, tqparent ), m_themePixmapCode( -1 ) { slotThemeChanged(); - connect( k3bappcore->themeManager(), SIGNAL(themeChanged()), - this, SLOT(slotThemeChanged()) ); - connect( kapp, SIGNAL(appearanceChanged()), - this, SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), + this, TQT_SLOT(slotThemeChanged()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), + this, TQT_SLOT(slotThemeChanged()) ); } -K3bThemedLabel::K3bThemedLabel( K3bTheme::PixmapType pix, QWidget* parent ) - : KCutLabel( parent ) +K3bThemedLabel::K3bThemedLabel( K3bTheme::PixmapType pix, TQWidget* tqparent ) + : KCutLabel( tqparent ) { setThemePixmap( pix ); - connect( k3bappcore->themeManager(), SIGNAL(themeChanged()), - this, SLOT(slotThemeChanged()) ); - connect( kapp, SIGNAL(appearanceChanged()), - this, SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), + this, TQT_SLOT(slotThemeChanged()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), + this, TQT_SLOT(slotThemeChanged()) ); } diff --git a/src/k3bthemedlabel.h b/src/k3bthemedlabel.h index 06d4851..2c6d27f 100644 --- a/src/k3bthemedlabel.h +++ b/src/k3bthemedlabel.h @@ -23,11 +23,12 @@ class K3bThemedLabel : public KCutLabel { Q_OBJECT + TQ_OBJECT public: - K3bThemedLabel( QWidget* parent = 0 ); - K3bThemedLabel( const QString& text, QWidget* parent = 0 ); - K3bThemedLabel( K3bTheme::PixmapType, QWidget* parent = 0 ); + K3bThemedLabel( TQWidget* tqparent = 0 ); + K3bThemedLabel( const TQString& text, TQWidget* tqparent = 0 ); + K3bThemedLabel( K3bTheme::PixmapType, TQWidget* tqparent = 0 ); public slots: void setThemePixmap( K3bTheme::PixmapType ); diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp index 2d7177f..3268018 100644 --- a/src/k3bthememanager.cpp +++ b/src/k3bthememanager.cpp @@ -23,12 +23,12 @@ #include <kdebug.h> #include <kglobal.h> -#include <qpixmap.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqpixmap.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> K3bTheme::K3bTheme() @@ -37,7 +37,7 @@ K3bTheme::K3bTheme() } -QColor K3bTheme::backgroundColor() const +TQColor K3bTheme::backgroundColor() const { if( m_bgColor.isValid() ) return m_bgColor; @@ -46,7 +46,7 @@ QColor K3bTheme::backgroundColor() const } -QColor K3bTheme::foregroundColor() const +TQColor K3bTheme::foregroundColor() const { if( m_fgColor.isValid() ) return m_fgColor; @@ -55,15 +55,15 @@ QColor K3bTheme::foregroundColor() const } -const QPixmap& K3bTheme::pixmap( const QString& name ) const +const TQPixmap& K3bTheme::pixmap( const TQString& name ) const { - QMap<QString, QPixmap>::const_iterator it = m_pixmapMap.find( name ); + TQMap<TQString, TQPixmap>::const_iterator it = m_pixmapMap.tqfind( name ); if( it != m_pixmapMap.end() ) return *it; // try loading the image - if( QFile::exists( m_path + name ) ) - return *m_pixmapMap.insert( name, QPixmap( m_path + name ) ); + if( TQFile::exists( m_path + name ) ) + return *m_pixmapMap.insert( name, TQPixmap( m_path + name ) ); kdDebug() << "(K3bTheme) " << m_name << ": could not load image " << name << endl; @@ -71,15 +71,15 @@ const QPixmap& K3bTheme::pixmap( const QString& name ) const } -const QPixmap& K3bTheme::pixmap( K3bTheme::PixmapType t ) const +const TQPixmap& K3bTheme::pixmap( K3bTheme::PixmapType t ) const { return pixmap( filenameForPixmapType( t ) ); } -QString K3bTheme::filenameForPixmapType( PixmapType t ) +TQString K3bTheme::filenameForPixmapType( PixmapType t ) { - QString name; + TQString name; switch( t ) { case MEDIA_AUDIO: @@ -157,17 +157,17 @@ public: : currentTheme(&emptyTheme) { } - QValueList<K3bTheme*> themes; + TQValueList<K3bTheme*> themes; K3bTheme* currentTheme; - QString currentThemeName; + TQString currentThemeName; K3bTheme emptyTheme; }; -K3bThemeManager::K3bThemeManager( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bThemeManager::K3bThemeManager( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); d->emptyTheme.m_name = "Empty Theme"; @@ -180,7 +180,7 @@ K3bThemeManager::~K3bThemeManager() } -const QValueList<K3bTheme*>& K3bThemeManager::themes() const +const TQValueList<K3bTheme*>& K3bThemeManager::themes() const { return d->themes; } @@ -197,7 +197,7 @@ void K3bThemeManager::readConfig( KConfigBase* c ) KConfigGroup generalOptions( c, "General Options" ); // allow to override the default theme by packaging a default config file - QString defaultTheme = generalOptions.readEntry( "default theme", "quant" ); + TQString defaultTheme = generalOptions.readEntry( "default theme", "quant" ); K3bVersion configVersion( generalOptions.readEntry( "config version", "0.1" ) ); if( configVersion >= K3bVersion("0.98") ) @@ -214,7 +214,7 @@ void K3bThemeManager::saveConfig( KConfigBase* c ) } -void K3bThemeManager::setCurrentTheme( const QString& name ) +void K3bThemeManager::setCurrentTheme( const TQString& name ) { if( name != d->currentThemeName ) { if( K3bTheme* theme = findTheme( name ) ) @@ -240,9 +240,9 @@ void K3bThemeManager::setCurrentTheme( K3bTheme* theme ) } -K3bTheme* K3bThemeManager::findTheme( const QString& name ) const +K3bTheme* K3bThemeManager::findTheme( const TQString& name ) const { - for( QValueList<K3bTheme*>::iterator it = d->themes.begin(); it != d->themes.end(); ++it ) + for( TQValueList<K3bTheme*>::iterator it = d->themes.begin(); it != d->themes.end(); ++it ) if( (*it)->name() == name ) return *it; return 0; @@ -252,30 +252,30 @@ K3bTheme* K3bThemeManager::findTheme( const QString& name ) const void K3bThemeManager::loadThemes() { // first we cleanup the loaded themes - for( QValueList<K3bTheme*>::iterator it = d->themes.begin(); it != d->themes.end(); ++it ) + for( TQValueList<K3bTheme*>::iterator it = d->themes.begin(); it != d->themes.end(); ++it ) delete *it; d->themes.clear(); - QStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/pics" ); + TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/pics" ); // now search for themes. As there may be multiple themes with the same name // we only use the names from this list and then use findResourceDir to make sure // the local is preferred over the global stuff (like testing a theme by copying it // to the .kde dir) - QStringList themeNames; - for( QStringList::const_iterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt ) { - QDir dir( *dirIt ); - QStringList entries = dir.entryList( QDir::Dirs ); + TQStringList themeNames; + for( TQStringList::const_iterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt ) { + TQDir dir( *dirIt ); + TQStringList entries = dir.entryList( TQDir::Dirs ); entries.remove( "." ); entries.remove( ".." ); // every theme dir needs to contain a k3b.theme file - for( QStringList::const_iterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt ) { - QString themeDir = *dirIt + *entryIt + "/"; - if( !themeNames.contains( *entryIt ) && QFile::exists( themeDir + "k3b.theme" ) ) { + for( TQStringList::const_iterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt ) { + TQString themeDir = *dirIt + *entryIt + "/"; + if( !themeNames.tqcontains( *entryIt ) && TQFile::exists( themeDir + "k3b.theme" ) ) { bool themeValid = true; // check for all nessessary pixmaps (this is a little evil hacking) for( int i = 0; i <= K3bTheme::WELCOME_BG; ++i ) { - if( !QFile::exists( themeDir + K3bTheme::filenameForPixmapType( (K3bTheme::PixmapType)i ) ) ) { + if( !TQFile::exists( themeDir + K3bTheme::filenameForPixmapType( (K3bTheme::PixmapType)i ) ) ) { kdDebug() << "(K3bThemeManager) theme misses pixmap: " << K3bTheme::filenameForPixmapType( (K3bTheme::PixmapType)i ) << endl; themeValid = false; break; @@ -289,7 +289,7 @@ void K3bThemeManager::loadThemes() } // now load the themes - for( QStringList::const_iterator themeIt = themeNames.begin(); themeIt != themeNames.end(); ++themeIt ) + for( TQStringList::const_iterator themeIt = themeNames.begin(); themeIt != themeNames.end(); ++themeIt ) loadTheme( *themeIt ); // load the current theme @@ -297,14 +297,14 @@ void K3bThemeManager::loadThemes() } -void K3bThemeManager::loadTheme( const QString& name ) +void K3bThemeManager::loadTheme( const TQString& name ) { - QString path = KGlobal::dirs()->findResource( "data", "k3b/pics/" + name + "/k3b.theme" ); + TQString path = KGlobal::dirs()->findResource( "data", "k3b/pics/" + name + "/k3b.theme" ); if( !path.isEmpty() ) { K3bTheme* t = new K3bTheme(); t->m_name = name; t->m_path = path.left( path.length() - 9 ); - QFileInfo fi( t->m_path ); + TQFileInfo fi( t->m_path ); t->m_local = fi.isWritable(); // load the stuff diff --git a/src/k3bthememanager.h b/src/k3bthememanager.h index f00e62f..618a254 100644 --- a/src/k3bthememanager.h +++ b/src/k3bthememanager.h @@ -16,12 +16,12 @@ #ifndef _K3B_THEME_MANAGER_H_ #define _K3B_THEME_MANAGER_H_ -#include <qobject.h> -#include <qvaluelist.h> -#include <qstring.h> -#include <qmap.h> -#include <qcolor.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqvaluelist.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqcolor.h> +#include <tqpixmap.h> @@ -33,8 +33,8 @@ class K3bTheme public: K3bTheme(); - QColor backgroundColor() const; - QColor foregroundColor() const; + TQColor backgroundColor() const; + TQColor foregroundColor() const; enum PixmapType { MEDIA_AUDIO, /**< Media information header, right side when showing an audio CD. */ @@ -61,19 +61,19 @@ class K3bTheme BG_SCALE /**< Scale the pixmap to fill the welcome widget. */ }; - const QPixmap& pixmap( PixmapType ) const; + const TQPixmap& pixmap( PixmapType ) const; /** * \deprecated use pixmap( PixmapType ) */ - const QPixmap& pixmap( const QString& name ) const; + const TQPixmap& pixmap( const TQString& name ) const; BackgroundMode backgroundMode() const; - const QString& name() const { return m_name; } - const QString& author() const { return m_author; } - const QString& comment() const { return m_comment; } - const QString& version() const { return m_version; } + const TQString& name() const { return m_name; } + const TQString& author() const { return m_author; } + const TQString& comment() const { return m_comment; } + const TQString& version() const { return m_version; } /** * Global themes are installed for all users and cannot be deleted. @@ -85,45 +85,46 @@ class K3bTheme */ bool local() const { return m_local; } - const QString& path() const { return m_path; } + const TQString& path() const { return m_path; } - static QString filenameForPixmapType( PixmapType ); + static TQString filenameForPixmapType( PixmapType ); private: - QString m_path; + TQString m_path; bool m_local; - QString m_name; - QString m_author; - QString m_comment; - QString m_version; - QColor m_bgColor; - QColor m_fgColor; + TQString m_name; + TQString m_author; + TQString m_comment; + TQString m_version; + TQColor m_bgColor; + TQColor m_fgColor; BackgroundMode m_bgMode; - mutable QMap<QString, QPixmap> m_pixmapMap; + mutable TQMap<TQString, TQPixmap> m_pixmapMap; - QPixmap m_emptyPixmap; + TQPixmap m_emptyPixmap; friend class K3bThemeManager; }; -class K3bThemeManager : public QObject +class K3bThemeManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bThemeManager( QObject* parent = 0, const char* name = 0 ); + K3bThemeManager( TQObject* tqparent = 0, const char* name = 0 ); ~K3bThemeManager(); - const QValueList<K3bTheme*>& themes() const; + const TQValueList<K3bTheme*>& themes() const; /** * This is never null. If no theme could be found an empty dummy theme * will be returnes which does not contains any pixmaps. */ K3bTheme* currentTheme() const; - K3bTheme* findTheme( const QString& ) const; + K3bTheme* findTheme( const TQString& ) const; signals: void themeChanged(); @@ -132,12 +133,12 @@ class K3bThemeManager : public QObject public slots: void readConfig( KConfigBase* ); void saveConfig( KConfigBase* ); - void setCurrentTheme( const QString& ); + void setCurrentTheme( const TQString& ); void setCurrentTheme( K3bTheme* ); void loadThemes(); private: - void loadTheme( const QString& name ); + void loadTheme( const TQString& name ); class Private; Private* d; diff --git a/src/k3btimeoutwidget.cpp b/src/k3btimeoutwidget.cpp index 156963f..12453bb 100644 --- a/src/k3btimeoutwidget.cpp +++ b/src/k3btimeoutwidget.cpp @@ -19,9 +19,9 @@ #include <kiconloader.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qbitmap.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqbitmap.h> class K3bTimeoutWidget::Private @@ -30,18 +30,18 @@ public: int timeout; int margin; - QTimer timer; + TQTimer timer; int currentTime; }; -K3bTimeoutWidget::K3bTimeoutWidget( QWidget* parent ) - : QWidget( parent ) +K3bTimeoutWidget::K3bTimeoutWidget( TQWidget* tqparent ) + : TQWidget( tqparent ) { d = new Private; d->timeout = 10000; d->margin = 4; - connect( &d->timer, SIGNAL(timeout()), this, SLOT(timeStep()) ); + connect( &d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeStep()) ); } @@ -88,20 +88,20 @@ void K3bTimeoutWidget::timeStep() } -QSize K3bTimeoutWidget::sizeHint() const +TQSize K3bTimeoutWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -QSize K3bTimeoutWidget::minimumSizeHint() const +TQSize K3bTimeoutWidget::tqminimumSizeHint() const { - int fw = fontMetrics().width( QString::number( d->timeout/1000 ) ); + int fw = fontMetrics().width( TQString::number( d->timeout/1000 ) ); int fh = fontMetrics().height(); - int diam = QMAX( fw, fh ) + 2*d->margin; + int diam = TQMAX( fw, fh ) + 2*d->margin; - return QSize( diam, diam ); + return TQSize( diam, diam ); } @@ -117,32 +117,32 @@ void K3bTimeoutWidget::startTimer() } -void K3bTimeoutWidget::paintEvent( QPaintEvent* ) +void K3bTimeoutWidget::paintEvent( TQPaintEvent* ) { if( d->timer.isActive() ) { - QPainter p(this); + TQPainter p(this); if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { p.setBrush( theme->backgroundColor() ); p.setPen( theme->backgroundColor() ); } - QRect r; - r.setSize( minimumSizeHint() ); + TQRect r; + r.setSize( tqminimumSizeHint() ); r.moveCenter( rect().center() ); p.drawArc( r, 0, 360*16 ); p.drawPie( r, 90*16, 360*16*d->currentTime/d->timeout ); - p.setPen( Qt::black ); - p.drawText( rect(), Qt::AlignCenter, QString::number( (d->timeout - d->currentTime + 500)/1000 ) ); + p.setPen( TQt::black ); + p.drawText( rect(), TQt::AlignCenter, TQString::number( (d->timeout - d->currentTime + 500)/1000 ) ); } } -void K3bTimeoutWidget::resizeEvent( QResizeEvent* e ) +void K3bTimeoutWidget::resizeEvent( TQResizeEvent* e ) { - QWidget::resizeEvent( e ); + TQWidget::resizeEvent( e ); } diff --git a/src/k3btimeoutwidget.h b/src/k3btimeoutwidget.h index 6f47deb..3775332 100644 --- a/src/k3btimeoutwidget.h +++ b/src/k3btimeoutwidget.h @@ -16,22 +16,23 @@ #ifndef _K3B_TIMEOUT_WIDGET_H_ #define _K3B_TIMEOUT_WIDGET_H_ -#include <qwidget.h> +#include <tqwidget.h> -class QPaintEvent; -class QResizeEvent; +class TQPaintEvent; +class TQResizeEvent; -class K3bTimeoutWidget : public QWidget +class K3bTimeoutWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bTimeoutWidget( QWidget* parent ); + K3bTimeoutWidget( TQWidget* tqparent ); ~K3bTimeoutWidget(); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; public slots: void setTimeout( int msecs ); @@ -44,8 +45,8 @@ class K3bTimeoutWidget : public QWidget void timeout(); protected: - void paintEvent( QPaintEvent* ); - void resizeEvent( QResizeEvent* ); + void paintEvent( TQPaintEvent* ); + void resizeEvent( TQResizeEvent* ); private slots: void timeStep(); diff --git a/src/k3btooltip.cpp b/src/k3btooltip.cpp index 570c23b..63ea037 100644 --- a/src/k3btooltip.cpp +++ b/src/k3btooltip.cpp @@ -19,24 +19,24 @@ #include <k3bthememanager.h> #include <k3bapplication.h> -#include <qtimer.h> -#include <qapplication.h> -#include <qlabel.h> +#include <tqtimer.h> +#include <tqapplication.h> +#include <tqlabel.h> #include <kdebug.h> #include <fixx11h.h> -K3bToolTip::K3bToolTip( QWidget* widget ) - : QObject( widget ), +K3bToolTip::K3bToolTip( TQWidget* widget ) + : TQObject( widget ), m_parentWidget( widget ), m_currentTip( 0 ), - m_tipTimer( new QTimer( this ) ), + m_tipTimer( new TQTimer( this ) ), m_tipTimeout( 700 ) { m_parentWidget->installEventFilter( this ); - connect( m_tipTimer, SIGNAL(timeout()), - this, SLOT(slotCheckShowTip()) ); + connect( m_tipTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotCheckShowTip()) ); } @@ -45,9 +45,9 @@ K3bToolTip::~K3bToolTip() } -void K3bToolTip::tip( const QRect& rect, const QString& text, int effect ) +void K3bToolTip::tip( const TQRect& rect, const TQString& text, int effect ) { - QLabel* label = new QLabel( text, parentWidget() ); + TQLabel* label = new TQLabel( text, tqparentWidget() ); label->setMargin( 6 ); if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { label->setPaletteBackgroundColor( theme->backgroundColor() ); @@ -57,9 +57,9 @@ void K3bToolTip::tip( const QRect& rect, const QString& text, int effect ) } -void K3bToolTip::tip( const QRect& rect, const QPixmap& pix, int effect ) +void K3bToolTip::tip( const TQRect& rect, const TQPixmap& pix, int effect ) { - QLabel* label = new QLabel( parentWidget() ); + TQLabel* label = new TQLabel( tqparentWidget() ); label->setMargin( 6 ); if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { label->setPaletteBackgroundColor( theme->backgroundColor() ); @@ -70,7 +70,7 @@ void K3bToolTip::tip( const QRect& rect, const QPixmap& pix, int effect ) } -void K3bToolTip::tip( const QRect& rect, QWidget* w, int effect ) +void K3bToolTip::tip( const TQRect& rect, TQWidget* w, int effect ) { // stop the timer m_tipTimer->stop(); @@ -80,24 +80,24 @@ void K3bToolTip::tip( const QRect& rect, QWidget* w, int effect ) // which screen are we on? int scr; - if( QApplication::desktop()->isVirtualDesktop() ) - scr = QApplication::desktop()->screenNumber( m_parentWidget->mapToGlobal( m_lastMousePos ) ); + if( TQApplication::desktop()->isVirtualDesktop() ) + scr = TQApplication::desktop()->screenNumber( m_parentWidget->mapToGlobal( m_lastMousePos ) ); else - scr = QApplication::desktop()->screenNumber( m_parentWidget ); + scr = TQApplication::desktop()->screenNumber( m_parentWidget ); // make sure the widget is displayed correcly - w->reparent( QApplication::desktop()->screen( scr ), + w->reparent( TQApplication::desktop()->screen( scr ), WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM, - QPoint( 0, 0 ), false ); + TQPoint( 0, 0 ), false ); w->polish(); w->adjustSize(); // positioning code from qtooltip.cpp - QRect screen = QApplication::desktop()->screenGeometry( scr ); + TQRect screen = TQApplication::desktop()->screenGeometry( scr ); // FIXME: why (2,16) and (4,24) below? Why not use the cursors' size? - QPoint p = m_parentWidget->mapToGlobal( m_lastMousePos ) + QPoint( 2, 16 ); + TQPoint p = m_parentWidget->mapToGlobal( m_lastMousePos ) + TQPoint( 2, 16 ); if( p.x() + w->width() > screen.x() + screen.width() ) p.rx() -= 4 + w->width(); @@ -132,28 +132,28 @@ void K3bToolTip::hideTip() } -bool K3bToolTip::eventFilter( QObject* o, QEvent* e ) +bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e ) { - if( o == parentWidget() ) { + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqparentWidget()) ) { switch( e->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::KeyPress: - case QEvent::KeyRelease: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::MouseButtonDblClick: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: // input - turn off tool tip mode hideTip(); m_tipTimer->stop(); break; - case QEvent::MouseMove: { - QMouseEvent* m = (QMouseEvent*)e; + case TQEvent::MouseMove: { + TQMouseEvent* m = (TQMouseEvent*)e; m_lastMousePos = m_parentWidget->mapFromGlobal( m->globalPos() ); m_tipTimer->stop(); if( m_currentTip ) { // see if we have to hide it - if( !m_currentTipRect.contains( m_lastMousePos ) ) { + if( !m_currentTipRect.tqcontains( m_lastMousePos ) ) { hideTip(); // in case we moved the mouse from one tip area to the next without leaving @@ -169,10 +169,10 @@ bool K3bToolTip::eventFilter( QObject* o, QEvent* e ) break; } - case QEvent::Leave: - case QEvent::Hide: - case QEvent::Destroy: - case QEvent::FocusOut: + case TQEvent::Leave: + case TQEvent::Hide: + case TQEvent::Destroy: + case TQEvent::FocusOut: hideTip(); m_tipTimer->stop(); break; diff --git a/src/k3btooltip.h b/src/k3btooltip.h index 878f512..e7b4207 100644 --- a/src/k3btooltip.h +++ b/src/k3btooltip.h @@ -16,51 +16,52 @@ #ifndef _K3B_TOOLTIP_H_ #define _K3B_TOOLTIP_H_ -#include <qobject.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqpixmap.h> #include "k3bwidgetshoweffect.h" -class QTimer; +class TQTimer; /** * More beautiful tooltip */ -class K3bToolTip : public QObject +class K3bToolTip : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bToolTip( QWidget* widget ); + K3bToolTip( TQWidget* widget ); ~K3bToolTip(); - QWidget* parentWidget() const { return m_parentWidget; } + TQWidget* tqparentWidget() const { return m_parentWidget; } public slots: /** - * default is 700 mseconds (same as QToolTip) + * default is 700 mseconds (same as TQToolTip) */ void setTipTimeout( int msec ) { m_tipTimeout = msec; } protected: /** - * \see QToolTip::maybeTip + * \see TQToolTip::maybeTip */ - virtual void maybeTip( const QPoint& ) = 0; + virtual void maybeTip( const TQPoint& ) = 0; /** * Show a tooltip. */ - void tip( const QRect&, const QString&, int effect = K3bWidgetShowEffect::Dissolve ); - void tip( const QRect& rect, const QPixmap& pix, int effect = K3bWidgetShowEffect::Dissolve ); + void tip( const TQRect&, const TQString&, int effect = K3bWidgetShowEffect::Dissolve ); + void tip( const TQRect& rect, const TQPixmap& pix, int effect = K3bWidgetShowEffect::Dissolve ); /** * Use some arbitrary widget as the tooltip * \param effect Use 0 for no effect */ - void tip( const QRect&, QWidget* w, int effect = K3bWidgetShowEffect::Dissolve ); + void tip( const TQRect&, TQWidget* w, int effect = K3bWidgetShowEffect::Dissolve ); - bool eventFilter( QObject* o, QEvent* e ); + bool eventFilter( TQObject* o, TQEvent* e ); private slots: void slotCheckShowTip(); @@ -68,12 +69,12 @@ class K3bToolTip : public QObject private: void hideTip(); - QWidget* m_parentWidget; - QWidget* m_currentTip; - QRect m_currentTipRect; + TQWidget* m_parentWidget; + TQWidget* m_currentTip; + TQRect m_currentTipRect; - QTimer* m_tipTimer; - QPoint m_lastMousePos; + TQTimer* m_tipTimer; + TQPoint m_lastMousePos; int m_tipTimeout; }; diff --git a/src/k3btrm.cpp b/src/k3btrm.cpp index 9d4f24d..1843471 100644 --- a/src/k3btrm.cpp +++ b/src/k3btrm.cpp @@ -29,8 +29,8 @@ class K3bTRM::Private { public: trm_t trm; - QCString sig; - QCString rawSig; + TQCString sig; + TQCString rawSig; }; @@ -79,13 +79,13 @@ bool K3bTRM::finalize() } -const QCString& K3bTRM::rawSignature() const +const TQCString& K3bTRM::rawSignature() const { return d->rawSig; } -const QCString& K3bTRM::signature() const +const TQCString& K3bTRM::signature() const { return d->sig; } diff --git a/src/k3btrm.h b/src/k3btrm.h index 722a769..7474a77 100644 --- a/src/k3btrm.h +++ b/src/k3btrm.h @@ -48,8 +48,8 @@ class K3bTRM */ bool finalize(); - const QCString& rawSignature() const; - const QCString& signature() const; + const TQCString& rawSignature() const; + const TQCString& signature() const; private: class Private; diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index a3915d5..34835de 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -21,16 +21,16 @@ #include <k3bversion.h> #include "k3bthememanager.h" -#include <qpixmap.h> -#include <qtoolbutton.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qsimplerichtext.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qtooltip.h> -#include <qcursor.h> -#include <qimage.h> +#include <tqpixmap.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqsimplerichtext.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqtooltip.h> +#include <tqcursor.h> +#include <tqimage.h> #include <kurl.h> #include <kurldrag.h> @@ -76,17 +76,17 @@ static const char* s_allActions[] = { 0 }; -K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* parent ) - : QWidget( parent->viewport() ) +K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* tqparent ) + : TQWidget( tqparent->viewport() ) { - setWFlags( Qt::WNoAutoErase ); + setWFlags( TQt::WNoAutoErase ); - QFont fnt(font()); + TQFont fnt(font()); fnt.setBold(true); fnt.setPointSize( 16 ); - m_header = new QSimpleRichText( i18n("Welcome to K3b - The CD and DVD Kreator"), fnt ); - m_infoText = new QSimpleRichText( QString::fromUtf8("<qt align=\"center\">K3b %1 (c) 1999 - 2007 Sebastian Trüg") - .arg(kapp->aboutData()->version()), font() ); + m_header = new TQSimpleRichText( i18n("Welcome to K3b - The CD and DVD Kreator"), fnt ); + m_infoText = new TQSimpleRichText( TQString::fromUtf8("<qt align=\"center\">K3b %1 (c) 1999 - 2007 Sebastian Trüg") + .tqarg(kapp->aboutData()->version()), font() ); // set a large width just to be sure no linebreak occurs m_header->setWidth( 800 ); @@ -96,9 +96,9 @@ K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* parent ) m_rows = m_cols = 1; m_buttonMore = new K3bFlatButton( i18n("Further actions..."), this ); - connect( m_buttonMore, SIGNAL(pressed()), parent, SLOT(slotMoreActions()) ); + connect( m_buttonMore, TQT_SIGNAL(pressed()), tqparent, TQT_SLOT(slotMoreActions()) ); - connect( k3bappcore->themeManager(), SIGNAL(themeChanged()), this, SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), this, TQT_SLOT(slotThemeChanged()) ); slotThemeChanged(); } @@ -135,7 +135,7 @@ void K3bWelcomeWidget::Display::removeButton( K3bFlatButton* b ) } -void K3bWelcomeWidget::Display::rebuildGui( const QPtrList<KAction>& actions ) +void K3bWelcomeWidget::Display::rebuildGui( const TQPtrList<KAction>& actions ) { m_actions = actions; rebuildGui(); @@ -146,7 +146,7 @@ static void calculateButtons( int width, int numActions, int buttonWidth, int& c { // always try to avoid horizontal scrollbars int wa = width - 40; - cols = QMAX( 1, QMIN( wa / (buttonWidth+4), numActions ) ); + cols = TQMAX( 1, TQMIN( wa / (buttonWidth+4), numActions ) ); rows = numActions/cols; int over = numActions%cols; if( over ) { @@ -162,7 +162,7 @@ static void calculateButtons( int width, int numActions, int buttonWidth, int& c void K3bWelcomeWidget::Display::rebuildGui() { - // step 1: delete all old buttons in the buttons QPtrList<K3bFlatButton> + // step 1: delete all old buttons in the buttons TQPtrList<K3bFlatButton> m_buttonMap.clear(); m_buttons.setAutoDelete(true); m_buttons.clear(); @@ -171,7 +171,7 @@ void K3bWelcomeWidget::Display::rebuildGui() if( numActions > 0 ) { // create buttons - for( QPtrListIterator<KAction> it( m_actions ); it.current(); ++it ) { + for( TQPtrListIterator<KAction> it( m_actions ); it.current(); ++it ) { KAction* a = it.current(); K3bFlatButton* b = new K3bFlatButton( a, this ); @@ -182,9 +182,9 @@ void K3bWelcomeWidget::Display::rebuildGui() // determine the needed button size (since all buttons should be equal in size // we use the max of all sizes) - m_buttonSize = m_buttons.first()->sizeHint(); - for( QPtrListIterator<K3bFlatButton> it( m_buttons ); it.current(); ++it ) { - m_buttonSize = m_buttonSize.expandedTo( it.current()->sizeHint() ); + m_buttonSize = m_buttons.first()->tqsizeHint(); + for( TQPtrListIterator<K3bFlatButton> it( m_buttons ); it.current(); ++it ) { + m_buttonSize = m_buttonSize.expandedTo( it.current()->tqsizeHint() ); } repositionButtons(); @@ -206,10 +206,10 @@ void K3bWelcomeWidget::Display::repositionButtons() int row = 0; int col = 0; - for( QPtrListIterator<K3bFlatButton> it( m_buttons ); it.current(); ++it ) { + for( TQPtrListIterator<K3bFlatButton> it( m_buttons ); it.current(); ++it ) { K3bFlatButton* b = it.current(); - b->setGeometry( QRect( QPoint( leftMargin + (col*(m_buttonSize.width()+4) + 2 ), + b->setGeometry( TQRect( TQPoint( leftMargin + (col*(m_buttonSize.width()+4) + 2 ), topOffset + (row*(m_buttonSize.height()+4)) + 2 ), m_buttonSize ) ); b->show(); @@ -223,15 +223,15 @@ void K3bWelcomeWidget::Display::repositionButtons() if( col > 0 ) ++row; - m_buttonMore->setGeometry( QRect( QPoint( leftMargin + 2, + m_buttonMore->setGeometry( TQRect( TQPoint( leftMargin + 2, topOffset + (row*(m_buttonSize.height()+4)) + 2 ), - QSize( m_cols*(m_buttonSize.width()+4) - 4, m_buttonMore->height() ) ) ); + TQSize( m_cols*(m_buttonSize.width()+4) - 4, m_buttonMore->height() ) ) ); } -QSizePolicy K3bWelcomeWidget::Display::sizePolicy () const +TQSizePolicy K3bWelcomeWidget::Display::sizePolicy () const { - return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum, true ); + return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum, true ); } @@ -249,19 +249,19 @@ int K3bWelcomeWidget::Display::heightForWidth( int w ) const } -QSize K3bWelcomeWidget::Display::minimumSizeHint() const +TQSize K3bWelcomeWidget::Display::tqminimumSizeHint() const { - QSize size( QMAX(40+m_header->widthUsed(), 40+m_buttonSize.width()), + TQSize size( TQMAX(40+m_header->widthUsed(), 40+m_buttonSize.width()), 20 + m_header->height() + 20 + 10 + m_buttonSize.height() + 10 + m_infoText->height() + 20 ); return size; } -void K3bWelcomeWidget::Display::resizeEvent( QResizeEvent* e ) +void K3bWelcomeWidget::Display::resizeEvent( TQResizeEvent* e ) { m_infoText->setWidth( width() - 20 ); - QWidget::resizeEvent(e); + TQWidget::resizeEvent(e); repositionButtons(); if( e->size() != m_bgPixmap.size() ) updateBgPix(); @@ -290,10 +290,10 @@ void K3bWelcomeWidget::Display::updateBgPix() } -void K3bWelcomeWidget::Display::paintEvent( QPaintEvent* ) +void K3bWelcomeWidget::Display::paintEvent( TQPaintEvent* ) { if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { - QPainter p( this ); + TQPainter p( this ); p.setPen( theme->foregroundColor() ); // draw the background including first filling with the bg color for transparent images @@ -301,7 +301,7 @@ void K3bWelcomeWidget::Display::paintEvent( QPaintEvent* ) p.drawTiledPixmap( rect(), m_bgPixmap ); // rect around the header - QRect rect( 10, 10, QMAX( m_header->widthUsed() + 20, width() - 20 ), m_header->height() + 20 ); + TQRect rect( 10, 10, TQMAX( m_header->widthUsed() + 20, width() - 20 ), m_header->height() + 20 ); p.fillRect( rect, theme->backgroundColor() ); p.drawRect( rect ); @@ -309,33 +309,33 @@ void K3bWelcomeWidget::Display::paintEvent( QPaintEvent* ) p.drawRect( 10, 10, width()-20, height()-20 ); // draw the header text - QColorGroup grp( colorGroup() ); - grp.setColor( QColorGroup::Text, theme->foregroundColor() ); + TQColorGroup grp( tqcolorGroup() ); + grp.setColor( TQColorGroup::Text, theme->foregroundColor() ); int pos = 20; - pos += QMAX( (width()-40-m_header->widthUsed())/2, 0 ); - m_header->draw( &p, pos, 20, QRect(), grp ); + pos += TQMAX( (width()-40-m_header->widthUsed())/2, 0 ); + m_header->draw( &p, pos, 20, TQRect(), grp ); // draw the info box // int boxWidth = 20 + m_infoText->widthUsed(); int boxHeight = 10 + m_infoText->height(); - QRect infoBoxRect( 10/*QMAX( (width()-20-m_infoText->widthUsed())/2, 10 )*/, + TQRect infoBoxRect( 10/*TQMAX( (width()-20-m_infoText->widthUsed())/2, 10 )*/, height()-10-boxHeight, width()-20/*boxWidth*/, boxHeight ); p.fillRect( infoBoxRect, theme->backgroundColor() ); p.drawRect( infoBoxRect ); - m_infoText->draw( &p, infoBoxRect.left()+5, infoBoxRect.top()+5, QRect(), grp ); + m_infoText->draw( &p, infoBoxRect.left()+5, infoBoxRect.top()+5, TQRect(), grp ); } } -void K3bWelcomeWidget::Display::dragEnterEvent( QDragEnterEvent* event ) +void K3bWelcomeWidget::Display::dragEnterEvent( TQDragEnterEvent* event ) { event->accept( KURLDrag::canDecode(event) ); } -void K3bWelcomeWidget::Display::dropEvent( QDropEvent* e ) +void K3bWelcomeWidget::Display::dropEvent( TQDropEvent* e ) { KURL::List urls; KURLDrag::decode( e, urls ); @@ -344,16 +344,16 @@ void K3bWelcomeWidget::Display::dropEvent( QDropEvent* e ) -K3bWelcomeWidget::K3bWelcomeWidget( K3bMainWindow* mw, QWidget* parent, const char* name ) - : QScrollView( parent, name ), +K3bWelcomeWidget::K3bWelcomeWidget( K3bMainWindow* mw, TQWidget* tqparent, const char* name ) + : TQScrollView( tqparent, name ), m_mainWindow( mw ) { main = new Display( this ); addChild( main ); - connect( main, SIGNAL(dropped(const KURL::List&)), m_mainWindow, SLOT(addUrls(const KURL::List&)) ); + connect( main, TQT_SIGNAL(dropped(const KURL::List&)), m_mainWindow, TQT_SLOT(addUrls(const KURL::List&)) ); - connect( kapp, SIGNAL(appearanceChanged()), main, SLOT(update()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), main, TQT_SLOT(update()) ); } @@ -364,7 +364,7 @@ K3bWelcomeWidget::~K3bWelcomeWidget() void K3bWelcomeWidget::loadConfig( KConfigBase* c ) { - QStringList sl = KConfigGroup( c, "Welcome Widget" ).readListEntry( "welcome_actions" ); + TQStringList sl = KConfigGroup( c, "Welcome Widget" ).readListEntry( "welcome_actions" ); if( sl.isEmpty() ) { sl.append( "file_new_audio" ); @@ -375,8 +375,8 @@ void K3bWelcomeWidget::loadConfig( KConfigBase* c ) sl.append( "tools_write_dvd_iso" ); } - QPtrList<KAction> actions; - for( QStringList::const_iterator it = sl.begin(); it != sl.end(); ++it ) + TQPtrList<KAction> actions; + for( TQStringList::const_iterator it = sl.begin(); it != sl.end(); ++it ) if( KAction* a = m_mainWindow->actionCollection()->action( (*it).latin1() ) ) actions.append(a); @@ -390,49 +390,49 @@ void K3bWelcomeWidget::saveConfig( KConfigBase* c ) { KConfigGroup grp( c, "Welcome Widget" ); - QStringList sl; - for( QPtrListIterator<KAction> it( main->m_actions ); it.current(); ++it ) + TQStringList sl; + for( TQPtrListIterator<KAction> it( main->m_actions ); it.current(); ++it ) sl.append( it.current()->name() ); grp.writeEntry( "welcome_actions", sl ); } -void K3bWelcomeWidget::resizeEvent( QResizeEvent* e ) +void K3bWelcomeWidget::resizeEvent( TQResizeEvent* e ) { - QScrollView::resizeEvent( e ); + TQScrollView::resizeEvent( e ); fixSize(); } -void K3bWelcomeWidget::showEvent( QShowEvent* e ) +void K3bWelcomeWidget::showEvent( TQShowEvent* e ) { - QScrollView::showEvent( e ); + TQScrollView::showEvent( e ); fixSize(); } void K3bWelcomeWidget::fixSize() { - QSize s = contentsRect().size(); - s.setWidth( QMAX( main->minimumSizeHint().width(), s.width() ) ); - s.setHeight( QMAX( main->heightForWidth(s.width()), s.height() ) ); + TQSize s = contentsRect().size(); + s.setWidth( TQMAX( main->tqminimumSizeHint().width(), s.width() ) ); + s.setHeight( TQMAX( main->heightForWidth(s.width()), s.height() ) ); main->resize( s ); viewport()->resize( s ); } -void K3bWelcomeWidget::contentsMousePressEvent( QMouseEvent* e ) +void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) { - if( e->button() == QMouseEvent::RightButton ) { - QMap<int, KAction*> map; + if( e->button() == Qt::RightButton ) { + TQMap<int, KAction*> map; KPopupMenu addPop; for ( int i = 0; s_allActions[i]; ++i ) { if ( s_allActions[i][0] != '_' ) { KAction* a = m_mainWindow->actionCollection()->action( s_allActions[i] ); - if ( a && !main->m_actions.containsRef(a) ) { + if ( a && !main->m_actions.tqcontainsRef(a) ) { map.insert( addPop.insertItem( a->iconSet(), a->text() ), a ); } } @@ -443,7 +443,7 @@ void K3bWelcomeWidget::contentsMousePressEvent( QMouseEvent* e ) int r = 0; int removeAction = 0; - QWidget* widgetAtPos = viewport()->childAt(e->pos()); + TQWidget* widgetAtPos = viewport()->tqchildAt(e->pos()); if( widgetAtPos && widgetAtPos->inherits( "K3bFlatButton" ) ) { KPopupMenu pop; removeAction = pop.insertItem( SmallIcon("remove"), i18n("Remove Button") ); @@ -476,14 +476,14 @@ void K3bWelcomeWidget::slotMoreActions() for ( int i = 0; s_allActions[i]; ++i ) { if ( s_allActions[i][0] == '_' ) { - (new KActionSeparator( &popup ))->plug( &popup ); + (new KActionSeparator( TQT_TQOBJECT(&popup) ))->plug( &popup ); } else { m_mainWindow->actionCollection()->action( s_allActions[i] )->plug( &popup ); } } - popup.exec( QCursor::pos() ); + popup.exec( TQCursor::pos() ); } #include "k3bwelcomewidget.moc" diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h index df1945f..41592db 100644 --- a/src/k3bwelcomewidget.h +++ b/src/k3bwelcomewidget.h @@ -17,32 +17,33 @@ #ifndef _K3B_WELCOME_WIDGET_H_ #define _K3B_WELCOME_WIDGET_H_ -#include <qscrollview.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qimage.h> +#include <tqscrollview.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqimage.h> #include <kurl.h> #include <kaction.h> class K3bMainWindow; -class QDropEvent; -class QDragEnterEvent; +class TQDropEvent; +class TQDragEnterEvent; class K3bFlatButton; -class QPaintEvent; -class QResizeEvent; -class QSimpleRichText; +class TQPaintEvent; +class TQResizeEvent; +class TQSimpleRichText; class KConfigBase; -class QMouseEvent; -class QShowEvent; +class TQMouseEvent; +class TQShowEvent; -class K3bWelcomeWidget : public QScrollView +class K3bWelcomeWidget : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - K3bWelcomeWidget( K3bMainWindow*, QWidget* parent = 0, const char* name = 0 ); + K3bWelcomeWidget( K3bMainWindow*, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bWelcomeWidget(); void loadConfig( KConfigBase* c ); @@ -54,9 +55,9 @@ class K3bWelcomeWidget : public QScrollView void slotMoreActions(); protected: - void resizeEvent( QResizeEvent* ); - void showEvent( QShowEvent* ); - void contentsMousePressEvent( QMouseEvent* e ); + void resizeEvent( TQResizeEvent* ); + void showEvent( TQShowEvent* ); + void contentsMousePressEvent( TQMouseEvent* e ); private: void fixSize(); @@ -66,32 +67,33 @@ class K3bWelcomeWidget : public QScrollView }; -class K3bWelcomeWidget::Display : public QWidget +class K3bWelcomeWidget::Display : public TQWidget { Q_OBJECT + TQ_OBJECT public: - Display( K3bWelcomeWidget* parent ); + Display( K3bWelcomeWidget* tqparent ); ~Display(); - QSize minimumSizeHint() const; - QSizePolicy sizePolicy () const; + TQSize tqminimumSizeHint() const; + TQSizePolicy sizePolicy () const; int heightForWidth ( int w ) const; void addAction( KAction* ); void removeAction( KAction* ); void removeButton( K3bFlatButton* ); void rebuildGui(); - void rebuildGui( const QPtrList<KAction>& ); + void rebuildGui( const TQPtrList<KAction>& ); signals: void dropped( const KURL::List& ); protected: - void resizeEvent( QResizeEvent* ); - void paintEvent( QPaintEvent* ); - void dropEvent( QDropEvent* event ); - void dragEnterEvent( QDragEnterEvent* event ); + void resizeEvent( TQResizeEvent* ); + void paintEvent( TQPaintEvent* ); + void dropEvent( TQDropEvent* event ); + void dragEnterEvent( TQDragEnterEvent* event ); private slots: void slotThemeChanged(); @@ -100,23 +102,23 @@ class K3bWelcomeWidget::Display : public QWidget void repositionButtons(); void updateBgPix(); - QSimpleRichText* m_header; - QSimpleRichText* m_infoText; + TQSimpleRichText* m_header; + TQSimpleRichText* m_infoText; - QSize m_buttonSize; + TQSize m_buttonSize; int m_cols; int m_rows; - QPtrList<KAction> m_actions; - QPtrList<K3bFlatButton> m_buttons; - QMap<K3bFlatButton*, KAction*> m_buttonMap; + TQPtrList<KAction> m_actions; + TQPtrList<K3bFlatButton> m_buttons; + TQMap<K3bFlatButton*, KAction*> m_buttonMap; K3bFlatButton* m_buttonMore; bool m_infoTextVisible; - QPixmap m_bgPixmap; - QImage m_bgImage; + TQPixmap m_bgPixmap; + TQImage m_bgImage; friend class K3bWelcomeWidget; }; diff --git a/src/k3bwidgetshoweffect.cpp b/src/k3bwidgetshoweffect.cpp index 1caa971..fb4dc62 100644 --- a/src/k3bwidgetshoweffect.cpp +++ b/src/k3bwidgetshoweffect.cpp @@ -21,12 +21,12 @@ #include "k3bwidgetshoweffect.h" -#include <qpainter.h> -#include <qwidget.h> +#include <tqpainter.h> +#include <tqwidget.h> -K3bWidgetShowEffect::K3bWidgetShowEffect( QWidget* widget, Effect e ) - : QObject( widget ), +K3bWidgetShowEffect::K3bWidgetShowEffect( TQWidget* widget, Effect e ) + : TQObject( widget ), m_effect( e ), m_widget( widget ), m_dissolveSize( 0 ), @@ -63,14 +63,14 @@ void K3bWidgetShowEffect::show( bool effectOnly ) m_widget->polish(); if( m_effect == Dissolve ) { - // necessary to create the mask - m_mask.resize( m_widget->width(), m_widget->height() ); - // make the mask empty and hence will not show widget with show() called below + // necessary to create the tqmask + m_tqmask.resize( m_widget->width(), m_widget->height() ); + // make the tqmask empty and hence will not show widget with show() called below dissolveMask(); m_timerId = startTimer( 1000 / 30 ); } else { - m_widget->move( 0, m_widget->parentWidget()->height() ); + m_widget->move( 0, m_widget->tqparentWidget()->height() ); m_timerId = startTimer( 6 ); } @@ -79,7 +79,7 @@ void K3bWidgetShowEffect::show( bool effectOnly ) } -void K3bWidgetShowEffect::timerEvent( QTimerEvent* ) +void K3bWidgetShowEffect::timerEvent( TQTimerEvent* ) { switch( m_effect ) { case Slide: @@ -96,19 +96,19 @@ void K3bWidgetShowEffect::timerEvent( QTimerEvent* ) void K3bWidgetShowEffect::dissolveMask() { if( m_bShow ) { - m_widget->repaint( false ); - QPainter maskPainter(&m_mask); + m_widget->tqrepaint( false ); + TQPainter tqmaskPainter(&m_tqmask); - m_mask.fill(Qt::black); + m_tqmask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); - maskPainter.drawRect( m_mask.rect() ); + tqmaskPainter.setBrush(TQt::white); + tqmaskPainter.setPen(TQt::white); + tqmaskPainter.drawRect( m_tqmask.rect() ); m_dissolveSize += m_dissolveDelta; if( m_dissolveSize > 0 ) { - maskPainter.setRasterOp( Qt::EraseROP ); + tqmaskPainter.setRasterOp( TQt::EraseROP ); int x, y, s; const int size = 16; @@ -121,7 +121,7 @@ void K3bWidgetShowEffect::dissolveMask() if( s < 0 ) break; - maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } @@ -135,7 +135,7 @@ void K3bWidgetShowEffect::dissolveMask() deleteLater(); } - m_widget->setMask( m_mask ); + m_widget->setMask( m_tqmask ); } else { @@ -153,7 +153,7 @@ void K3bWidgetShowEffect::dissolveMask() void K3bWidgetShowEffect::slideMask() { if( m_bShow ) { - m_widget->move( 0, m_widget->parentWidget()->height() - m_offset ); + m_widget->move( 0, m_widget->tqparentWidget()->height() - m_offset ); m_offset++; if( m_offset > m_widget->height() ) { @@ -167,7 +167,7 @@ void K3bWidgetShowEffect::slideMask() } else { m_offset--; - m_widget->move( 0, m_widget->parentWidget()->height() - m_offset ); + m_widget->move( 0, m_widget->tqparentWidget()->height() - m_offset ); if( m_offset < 0 ) { // finally hide the widget @@ -183,7 +183,7 @@ void K3bWidgetShowEffect::slideMask() -K3bWidgetShowEffect* K3bWidgetShowEffect::showWidget( QWidget* w, Effect m ) +K3bWidgetShowEffect* K3bWidgetShowEffect::showWidget( TQWidget* w, Effect m ) { K3bWidgetShowEffect* e = new K3bWidgetShowEffect( w, m ); e->m_deleteSelf = true; @@ -192,7 +192,7 @@ K3bWidgetShowEffect* K3bWidgetShowEffect::showWidget( QWidget* w, Effect m ) } -K3bWidgetShowEffect* K3bWidgetShowEffect::hideWidget( QWidget* w, Effect m ) +K3bWidgetShowEffect* K3bWidgetShowEffect::hideWidget( TQWidget* w, Effect m ) { K3bWidgetShowEffect* e = new K3bWidgetShowEffect( w, m ); e->m_deleteSelf = true; diff --git a/src/k3bwidgetshoweffect.h b/src/k3bwidgetshoweffect.h index 9e0de9b..9f6d960 100644 --- a/src/k3bwidgetshoweffect.h +++ b/src/k3bwidgetshoweffect.h @@ -22,16 +22,17 @@ #ifndef _K3B_WIDGET_SHOW_EFFECT_H_ #define _K3B_WIDGET_SHOW_EFFECT_H_ -#include <qobject.h> -#include <qbitmap.h> +#include <tqobject.h> +#include <tqbitmap.h> /** * Helper class to show and hide a widget in a fancy way. */ -class K3bWidgetShowEffect : public QObject +class K3bWidgetShowEffect : public TQObject { Q_OBJECT + TQ_OBJECT public: // FIXME: add an effect direction @@ -40,7 +41,7 @@ class K3bWidgetShowEffect : public QObject Slide }; - K3bWidgetShowEffect( QWidget* widget, Effect e = Slide ); + K3bWidgetShowEffect( TQWidget* widget, Effect e = Slide ); ~K3bWidgetShowEffect(); void setEffect( Effect e ) { m_effect = e; } @@ -50,39 +51,39 @@ class K3bWidgetShowEffect : public QObject * \returns the K3bWidgetShowEffect instance used to show the widget. * Can be used to connect to signals. */ - static K3bWidgetShowEffect* showWidget( QWidget* w, Effect ); + static K3bWidgetShowEffect* showWidget( TQWidget* w, Effect ); /** * Using the widget effects the easy way. * \returns the K3bWidgetShowEffect instance used to hide the widget. * Can be used to connect to signals. */ - static K3bWidgetShowEffect* hideWidget( QWidget* w, Effect ); + static K3bWidgetShowEffect* hideWidget( TQWidget* w, Effect ); signals: - void widgetShown( QWidget* ); - void widgetHidden( QWidget* ); + void widgetShown( TQWidget* ); + void widgetHidden( TQWidget* ); public slots: /** - * \param effectOnly If true K3bWidgetShowEffect will not call QWidget::show(). + * \param effectOnly If true K3bWidgetShowEffect will not call TQWidget::show(). * This is only useful in case onw uses K3bWidgetShowEffect - * to reimplement QWidget::show(). In that case the caller + * to reimplement TQWidget::show(). In that case the caller * has to take care of showing the widget. */ void show( bool effectOnly = false ); /** - * \param effectOnly If true K3bWidgetShowEffect will not call QWidget::hide(). + * \param effectOnly If true K3bWidgetShowEffect will not call TQWidget::hide(). * This is only useful in case onw uses K3bWidgetShowEffect - * to reimplement QWidget::hide(). In that case the caller + * to reimplement TQWidget::hide(). In that case the caller * has to take care of hiding the widget by connecting to * K3bWidgetShowEffect::widgetHidden() */ void hide( bool effectOnly = false ); private: - void timerEvent( QTimerEvent* ); + void timerEvent( TQTimerEvent* ); /** * @short Gradually show widget by dissolving from background @@ -95,9 +96,9 @@ class K3bWidgetShowEffect : public QObject void slideMask(); Effect m_effect; - QWidget* m_widget; + TQWidget* m_widget; - QBitmap m_mask; + TQBitmap m_tqmask; int m_dissolveSize; int m_dissolveDelta; diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp index 29a11f9..41a4f22 100644 --- a/src/k3bwriterselectionwidget.cpp +++ b/src/k3bwriterselectionwidget.cpp @@ -32,27 +32,27 @@ #include <kiconloader.h> #include <kinputdialog.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qtooltip.h> -#include <qtoolbutton.h> -#include <qwhatsthis.h> -#include <qmap.h> -#include <qptrvector.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqtooltip.h> +#include <tqtoolbutton.h> +#include <tqwhatsthis.h> +#include <tqmap.h> +#include <tqptrvector.h> +#include <tqcursor.h> +#include <tqapplication.h> class K3bWriterSelectionWidget::MediaSelectionComboBox : public K3bMediaSelectionComboBox { public: - MediaSelectionComboBox( QWidget* parent ) - : K3bMediaSelectionComboBox( parent ), + MediaSelectionComboBox( TQWidget* tqparent ) + : K3bMediaSelectionComboBox( tqparent ), m_overrideDevice( 0 ) { } - void setOverrideDevice( K3bDevice::Device* dev, const QString& s, const QString& t ) { + void setOverrideDevice( K3bDevice::Device* dev, const TQString& s, const TQString& t ) { m_overrideDevice = dev; m_overrideString = s; m_overrideToolTip = t; @@ -69,18 +69,18 @@ public: K3bMediaSelectionComboBox::showMedium( m ) ); } - QString mediumString( const K3bMedium& m ) const { + TQString mediumString( const K3bMedium& m ) const { if( m.device() == m_overrideDevice ) return m_overrideString; else return K3bMediaSelectionComboBox::mediumString( m ); } - QString mediumToolTip( const K3bMedium& m ) const { + TQString mediumToolTip( const K3bMedium& m ) const { if( m.device() == m_overrideDevice ) return m_overrideToolTip; else { - QString s = K3bMediaSelectionComboBox::mediumToolTip( m ); + TQString s = K3bMediaSelectionComboBox::mediumToolTip( m ); if( !m.diskInfo().empty() && !(wantedMediumState() & m.diskInfo().diskState()) ) s.append( "<p><i>" + i18n("Medium will be overwritten.") + "</i>" ); return s; @@ -89,8 +89,8 @@ public: private: K3bDevice::Device* m_overrideDevice; - QString m_overrideString; - QString m_overrideToolTip; + TQString m_overrideString; + TQString m_overrideToolTip; }; @@ -105,31 +105,31 @@ public: int lastSetSpeed; - QMap<int, int> indexSpeedMap; - QMap<int, int> speedIndexMap; + TQMap<int, int> indexSpeedMap; + TQMap<int, int> speedIndexMap; }; -K3bWriterSelectionWidget::K3bWriterSelectionWidget( QWidget *parent, const char *name ) - : QWidget( parent, name ) +K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { d = new Private; d->forceAutoSpeed = false; d->supportedWritingApps = K3b::CDRECORD|K3b::CDRDAO|K3b::GROWISOFS; d->lastSetSpeed = -1; - QGroupBox* groupWriter = new QGroupBox( this ); + TQGroupBox* groupWriter = new TQGroupBox( this ); groupWriter->setTitle( i18n( "Burn Medium" ) ); groupWriter->setColumnLayout(0, Qt::Vertical ); - groupWriter->layout()->setSpacing( 0 ); - groupWriter->layout()->setMargin( 0 ); + groupWriter->tqlayout()->setSpacing( 0 ); + groupWriter->tqlayout()->setMargin( 0 ); - QGridLayout* groupWriterLayout = new QGridLayout( groupWriter->layout() ); - groupWriterLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->tqlayout() ); + groupWriterLayout->tqsetAlignment( TQt::AlignTop ); groupWriterLayout->setSpacing( KDialog::spacingHint() ); groupWriterLayout->setMargin( KDialog::marginHint() ); - QLabel* labelSpeed = new QLabel( groupWriter, "TextLabel1" ); + TQLabel* labelSpeed = new TQLabel( groupWriter, "TextLabel1" ); labelSpeed->setText( i18n( "Speed:" ) ); m_comboSpeed = new KComboBox( false, groupWriter, "m_comboSpeed" ); @@ -138,7 +138,7 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( QWidget *parent, const char m_comboMedium = new MediaSelectionComboBox( groupWriter ); - m_writingAppLabel = new QLabel( i18n("Writing app:"), groupWriter ); + m_writingAppLabel = new TQLabel( i18n("Writing app:"), groupWriter ); m_comboWritingApp = new KComboBox( groupWriter ); groupWriterLayout->addWidget( m_comboMedium, 0, 0 ); @@ -149,8 +149,8 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( QWidget *parent, const char groupWriterLayout->setColStretch( 0, 1 ); - QGridLayout* mainLayout = new QGridLayout( this ); - mainLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* mainLayout = new TQGridLayout( this ); + mainLayout->tqsetAlignment( TQt::AlignTop ); mainLayout->setSpacing( KDialog::spacingHint() ); mainLayout->setMargin( 0 ); @@ -160,25 +160,25 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( QWidget *parent, const char setTabOrder( m_comboMedium, m_comboSpeed ); setTabOrder( m_comboSpeed, m_comboWritingApp ); - connect( m_comboMedium, SIGNAL(selectionChanged(K3bDevice::Device*)), this, SIGNAL(writerChanged()) ); - connect( m_comboMedium, SIGNAL(selectionChanged(K3bDevice::Device*)), - this, SIGNAL(writerChanged(K3bDevice::Device*)) ); - connect( m_comboMedium, SIGNAL(newMedia()), this, SIGNAL(newMedia()) ); - connect( m_comboMedium, SIGNAL(newMedium(K3bDevice::Device*)), this, SIGNAL(newMedium(K3bDevice::Device*)) ); - connect( m_comboMedium, SIGNAL(newMedium(K3bDevice::Device*)), this, SLOT(slotNewBurnMedium(K3bDevice::Device*)) ); - connect( m_comboWritingApp, SIGNAL(activated(int)), this, SLOT(slotWritingAppSelected(int)) ); - connect( this, SIGNAL(writerChanged()), SLOT(slotWriterChanged()) ); - connect( m_comboSpeed, SIGNAL(activated(int)), this, SLOT(slotSpeedChanged(int)) ); + connect( m_comboMedium, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQT_SIGNAL(writerChanged()) ); + connect( m_comboMedium, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQT_SIGNAL(writerChanged(K3bDevice::Device*)) ); + connect( m_comboMedium, TQT_SIGNAL(newMedia()), this, TQT_SIGNAL(newMedia()) ); + connect( m_comboMedium, TQT_SIGNAL(newMedium(K3bDevice::Device*)), this, TQT_SIGNAL(newMedium(K3bDevice::Device*)) ); + connect( m_comboMedium, TQT_SIGNAL(newMedium(K3bDevice::Device*)), this, TQT_SLOT(slotNewBurnMedium(K3bDevice::Device*)) ); + connect( m_comboWritingApp, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWritingAppSelected(int)) ); + connect( this, TQT_SIGNAL(writerChanged()), TQT_SLOT(slotWriterChanged()) ); + connect( m_comboSpeed, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSpeedChanged(int)) ); - QToolTip::add( m_comboMedium, i18n("The medium that will be used for burning") ); - QToolTip::add( m_comboSpeed, i18n("The speed at which to burn the medium") ); - QToolTip::add( m_comboWritingApp, i18n("The external application to actually burn the medium") ); + TQToolTip::add( m_comboMedium, i18n("The medium that will be used for burning") ); + TQToolTip::add( m_comboSpeed, i18n("The speed at which to burn the medium") ); + TQToolTip::add( m_comboWritingApp, i18n("The external application to actually burn the medium") ); - QWhatsThis::add( m_comboMedium, i18n("<p>Select the medium that you want to use for burning." + TQWhatsThis::add( m_comboMedium, i18n("<p>Select the medium that you want to use for burning." "<p>In most cases there will only be one medium available which " "does not leave much choice.") ); - QWhatsThis::add( m_comboSpeed, i18n("<p>Select the speed with which you want to burn." + TQWhatsThis::add( m_comboSpeed, i18n("<p>Select the speed with which you want to burn." "<p><b>Auto</b><br>" "This will choose the maximum writing speed possible with the used " "medium. " @@ -189,7 +189,7 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( QWidget *parent, const char "<p>1x refers to 1385 KB/s for DVD and 175 KB/s for CD.</p>" "<p><b>Caution:</b> Make sure your system is able to send the data " "fast enough to prevent buffer underruns.") ); - QWhatsThis::add( m_comboWritingApp, i18n("<p>K3b uses the command line tools cdrecord, growisofs, and cdrdao " + TQWhatsThis::add( m_comboWritingApp, i18n("<p>K3b uses the command line tools cdrecord, growisofs, and cdrdao " "to actually write a CD or DVD." "<p>Normally K3b chooses the best " "suited application for every task automatically but in some cases it " @@ -251,7 +251,7 @@ void K3bWriterSelectionWidget::slotConfigChanged( KConfigBase* c ) void K3bWriterSelectionWidget::slotRefreshWriterSpeeds() { if( writerDevice() ) { - QValueList<int> speeds = k3bappcore->mediaCache()->writingSpeeds( writerDevice() ); + TQValueList<int> speeds = k3bappcore->mediaCache()->writingSpeeds( writerDevice() ); int lastSpeed = writerSpeed(); @@ -294,7 +294,7 @@ void K3bWriterSelectionWidget::slotRefreshWriterSpeeds() d->haveManualSpeed = true; } else { - for( QValueList<int>::iterator it = speeds.begin(); it != speeds.end(); ++it ) + for( TQValueList<int>::iterator it = speeds.begin(); it != speeds.end(); ++it ) insertSpeedItem( *it ); } } @@ -322,17 +322,17 @@ void K3bWriterSelectionWidget::clearSpeedCombo() void K3bWriterSelectionWidget::insertSpeedItem( int speed ) { - if( !d->speedIndexMap.contains( speed ) ) { + if( !d->speedIndexMap.tqcontains( speed ) ) { d->indexSpeedMap[m_comboSpeed->count()] = speed; d->speedIndexMap[speed] = m_comboSpeed->count(); if( k3bappcore->mediaCache()->diskInfo( writerDevice() ).isDvdMedia() ) m_comboSpeed->insertItem( ( speed%1385 > 0 - ? QString::number( (float)speed/1385.0, 'f', 1 ) // example: DVD+R(W): 2.4x - : QString::number( speed/1385 ) ) + ? TQString::number( (float)speed/1385.0, 'f', 1 ) // example: DVD+R(W): 2.4x + : TQString::number( speed/1385 ) ) + "x" ); else - m_comboSpeed->insertItem( QString("%1x").arg(speed/175) ); + m_comboSpeed->insertItem( TQString("%1x").tqarg(speed/175) ); } } @@ -349,7 +349,7 @@ K3bDevice::Device* K3bWriterSelectionWidget::writerDevice() const } -QValueList<K3bDevice::Device*> K3bWriterSelectionWidget::allDevices() const +TQValueList<K3bDevice::Device*> K3bWriterSelectionWidget::allDevices() const { return m_comboMedium->allDevices(); } @@ -367,7 +367,7 @@ void K3bWriterSelectionWidget::setSpeed( int s ) if( d->haveIgnoreSpeed && s < 0 ) m_comboSpeed->setCurrentItem( 1 ); // Ignore - else if( d->speedIndexMap.contains( s ) ) + else if( d->speedIndexMap.tqcontains( s ) ) m_comboSpeed->setCurrentItem( d->speedIndexMap[s] ); else { m_comboSpeed->setCurrentItem( 0 ); // Auto @@ -511,7 +511,7 @@ void K3bWriterSelectionWidget::loadConfig( KConfigBase* c ) void K3bWriterSelectionWidget::saveConfig( KConfigBase* c ) { c->writeEntry( "writing_speed", writerSpeed() ); - c->writeEntry( "writer_device", writerDevice() ? writerDevice()->devicename() : QString::null ); + c->writeEntry( "writer_device", writerDevice() ? writerDevice()->devicename() : TQString() ); c->writeEntry( "writing_app", m_comboWritingApp->currentText() ); } @@ -530,7 +530,7 @@ void K3bWriterSelectionWidget::setForceAutoSpeed( bool b ) } -void K3bWriterSelectionWidget::setOverrideDevice( K3bDevice::Device* dev, const QString& overrideString, const QString& tooltip ) +void K3bWriterSelectionWidget::setOverrideDevice( K3bDevice::Device* dev, const TQString& overrideString, const TQString& tooltip ) { m_comboMedium->setOverrideDevice( dev, overrideString, tooltip ); } @@ -586,7 +586,7 @@ void K3bWriterSelectionWidget::slotManualSpeed() &ok, this ) * speedFactor; if( ok ) { - writerDevice()->setMaxWriteSpeed( QMAX( newSpeed, writerDevice()->maxWriteSpeed() ) ); + writerDevice()->setMaxWriteSpeed( TQMAX( newSpeed, writerDevice()->maxWriteSpeed() ) ); slotRefreshWriterSpeeds(); setSpeed( newSpeed ); } diff --git a/src/k3bwriterselectionwidget.h b/src/k3bwriterselectionwidget.h index 8174637..acb989e 100644 --- a/src/k3bwriterselectionwidget.h +++ b/src/k3bwriterselectionwidget.h @@ -17,11 +17,11 @@ #ifndef K3BWRITERSELECTIONWIDGET_H #define K3BWRITERSELECTIONWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> class KComboBox; class KConfigBase; -class QLabel; +class TQLabel; class K3bMediaSelectionComboBox; namespace K3bDevice { class Device; @@ -32,21 +32,22 @@ namespace K3bDevice { /** *@author Sebastian Trueg */ -class K3bWriterSelectionWidget : public QWidget +class K3bWriterSelectionWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Creates a writerselectionwidget */ - K3bWriterSelectionWidget( QWidget* parent = 0, const char* name = 0 ); + K3bWriterSelectionWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bWriterSelectionWidget(); int writerSpeed() const; K3bDevice::Device* writerDevice() const; - QValueList<K3bDevice::Device*> allDevices() const; + TQValueList<K3bDevice::Device*> allDevices() const; /** * returns K3b::WritingApp @@ -99,7 +100,7 @@ class K3bWriterSelectionWidget : public QWidget * For example: "Burn to the same device". Set it to 0 in order * to disable the feature. */ - void setOverrideDevice( K3bDevice::Device* dev, const QString& overrideString = QString::null, const QString& tooltip = QString::null ); + void setOverrideDevice( K3bDevice::Device* dev, const TQString& overrideString = TQString(), const TQString& tooltip = TQString() ); /** * Compare K3bMediaSelectionComboBox::setIgnoreDevice @@ -137,7 +138,7 @@ class K3bWriterSelectionWidget : public QWidget KComboBox* m_comboSpeed; MediaSelectionComboBox* m_comboMedium; KComboBox* m_comboWritingApp; - QLabel* m_writingAppLabel; + TQLabel* m_writingAppLabel; class Private; Private* d; diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp index a2bd696..6a8e563 100644 --- a/src/k3bwritingmodewidget.cpp +++ b/src/k3bwritingmodewidget.cpp @@ -22,26 +22,26 @@ #include <klocale.h> #include <kconfig.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> -static const QString s_autoHelp = i18n("Let K3b select the best-suited mode. This is the recommended selection."); -static const QString s_daoHelp = i18n("<em>Disk At Once</em> or more properly <em>Session At Once</em>. " +static const TQString s_autoHelp = i18n("Let K3b select the best-suited mode. This is the recommended selection."); +static const TQString s_daoHelp = i18n("<em>Disk At Once</em> or more properly <em>Session At Once</em>. " "The laser is never turned off while writing the CD or DVD. " "This is the preferred mode to write audio CDs since it allows " "pregaps other than 2 seconds. Not all writers support DAO.<br>" "DVD-R(W)s written in DAO provide the best DVD-Video compatibility."); -static const QString s_taoHelp = i18n("<em>Track At Once</em> should be supported by every CD writer. " +static const TQString s_taoHelp = i18n("<em>Track At Once</em> should be supported by every CD writer. " "The laser will be turned off after every track.<br>" "Most CD writers need this mode for writing multisession CDs."); // TODO: add something like: "No CD-TEXT writing in TAO mode." -static const QString s_rawHelp = i18n("RAW writing mode. The error correction data is created by the " +static const TQString s_rawHelp = i18n("RAW writing mode. The error correction data is created by the " "software instead of the writer device.<br>" "Try this if your CD writer fails to write in DAO and TAO."); -static const QString s_seqHelp = i18n("Incremental sequential is the default writing mode for DVD-R(W). " +static const TQString s_seqHelp = i18n("Incremental sequential is the default writing mode for DVD-R(W). " "It allows multisession DVD-R(W)s. It only applies to DVD-R(W)."); -static const QString s_ovwHelp = i18n("Restricted Overwrite allows to use a DVD-RW just like a DVD-RAM " +static const TQString s_ovwHelp = i18n("Restricted Overwrite allows to use a DVD-RW just like a DVD-RAM " "or a DVD+RW. The media may just be overwritten. It is not possible " "to write multisession DVD-RWs in this mode but K3b uses growisofs " "to grow an ISO9660 filesystem within the first session, thus allowing " @@ -61,16 +61,16 @@ public: }; -K3bWritingModeWidget::K3bWritingModeWidget( int modes, QWidget* parent, const char* name ) - : K3bIntMapComboBox( parent, name ) +K3bWritingModeWidget::K3bWritingModeWidget( int modes, TQWidget* tqparent, const char* name ) + : K3bIntMapComboBox( tqparent, name ) { init(); setSupportedModes( modes ); } -K3bWritingModeWidget::K3bWritingModeWidget( QWidget* parent, const char* name ) - : K3bIntMapComboBox( parent, name ) +K3bWritingModeWidget::K3bWritingModeWidget( TQWidget* tqparent, const char* name ) + : K3bIntMapComboBox( tqparent, name ) { init(); setSupportedModes( K3b::DAO | K3b::TAO | K3b::RAW ); // default: support all CD-R(W) modes @@ -88,9 +88,9 @@ void K3bWritingModeWidget::init() d = new Private(); d->device = 0; - connect( this, SIGNAL(valueChanged(int)), this, SIGNAL(writingModeChanged(int)) ); + connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(writingModeChanged(int)) ); - QToolTip::add( this, i18n("Select the writing mode to use") ); + TQToolTip::add( this, i18n("Select the writing mode to use") ); initWhatsThisHelp(); } @@ -192,7 +192,7 @@ void K3bWritingModeWidget::saveConfig( KConfigBase* c ) void K3bWritingModeWidget::loadConfig( KConfigBase* c ) { - QString mode = c->readEntry( "writing_mode" ); + TQString mode = c->readEntry( "writing_mode" ); if ( mode == "dao" ) setWritingMode( K3b::DAO ); else if( mode == "tao" ) diff --git a/src/k3bwritingmodewidget.h b/src/k3bwritingmodewidget.h index f399f14..6b6ed07 100644 --- a/src/k3bwritingmodewidget.h +++ b/src/k3bwritingmodewidget.h @@ -30,10 +30,11 @@ class KConfigBase; class K3bWritingModeWidget : public K3bIntMapComboBox { Q_OBJECT + TQ_OBJECT public: - K3bWritingModeWidget( QWidget* parent = 0, const char* name = 0 ); - K3bWritingModeWidget( int modes, QWidget* parent = 0, const char* name = 0 ); + K3bWritingModeWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bWritingModeWidget( int modes, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bWritingModeWidget(); int writingMode() const; diff --git a/src/main.cpp b/src/main.cpp index d595281..c19e714 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,10 +27,10 @@ #include <dcopref.h> #include <kurl.h> -#include <qfile.h> -#include <qcstring.h> -#include <qdatastream.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqcstring.h> +#include <tqdatastream.h> +#include <tqtimer.h> #include <stdlib.h> @@ -145,7 +145,7 @@ int main( int argc, char* argv[] ) K3bApplication app; // we need a running app for the init method - QTimer::singleShot( 0, &app, SLOT(init()) ); + TQTimer::singleShot( 0, &app, TQT_SLOT(init()) ); return app.exec(); } diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index 5f4b531..b606fd2 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -34,17 +34,17 @@ #include <kstdguiitem.h> #include <kconfig.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtextview.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qheader.h> -#include <qmap.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqtextview.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqheader.h> +#include <tqmap.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> @@ -60,17 +60,17 @@ public: K3bProgressDialog* erasingDlg; K3bDebuggingOutputDialog* debugDialog; K3bDebuggingOutputFile debugFile; - QMap<int, int> comboTypeMap; - QMap<int, int> typeComboMap; + TQMap<int, int> comboTypeMap; + TQMap<int, int> typeComboMap; bool jobRunning; }; -K3bBlankingDialog::K3bBlankingDialog( QWidget* parent, const char* name ) - : K3bInteractionDialog( parent, name, +K3bBlankingDialog::K3bBlankingDialog( TQWidget* tqparent, const char* name ) + : K3bInteractionDialog( tqparent, name, i18n("Erase CD-RW"), - QString::null, + TQString(), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "CDRW Erasing" ) @@ -80,8 +80,8 @@ K3bBlankingDialog::K3bBlankingDialog( QWidget* parent, const char* name ) setupGui(); - connect( m_writerSelectionWidget, SIGNAL(writerChanged()), this, SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, SLOT(slotWritingAppChanged(int)) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotWritingAppChanged(int)) ); slotWriterChanged(); slotWritingAppChanged( m_writerSelectionWidget->writingApp() ); } @@ -101,21 +101,21 @@ void K3bBlankingDialog::setDevice( K3bDevice::Device* dev ) void K3bBlankingDialog::setupGui() { - QWidget* frame = mainWidget(); + TQWidget* frame = mainWidget(); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); m_writerSelectionWidget->setWantedMediumType( K3bDevice::MEDIA_CD_RW ); m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE ); // --- setup the blanking type button group ----------------------------- - QGroupBox* groupBlankType = new QGroupBox( 1, Qt::Vertical, i18n("&Erase Type"), frame ); - groupBlankType->layout()->setSpacing( spacingHint() ); - groupBlankType->layout()->setMargin( marginHint() ); + TQGroupBox* groupBlankType = new TQGroupBox( 1, Qt::Vertical, i18n("&Erase Type"), frame ); + groupBlankType->tqlayout()->setSpacing( spacingHint() ); + groupBlankType->tqlayout()->setMargin( marginHint() ); - m_comboEraseMode = new QComboBox( groupBlankType ); + m_comboEraseMode = new TQComboBox( groupBlankType ); // ---------------------------------------------------------------------- - QGridLayout* grid = new QGridLayout( frame ); + TQGridLayout* grid = new TQGridLayout( frame ); grid->setSpacing( spacingHint() ); grid->setMargin( 0 ); grid->addWidget( m_writerSelectionWidget, 0, 0 ); @@ -131,13 +131,13 @@ void K3bBlankingDialog::slotStartClicked() d->debugFile.open(); if( d->job == 0 ) { - d->job = new K3bBlankingJob( this, this ); - connect( d->job, SIGNAL(debuggingOutput(const QString&, const QString&)), - d->debugDialog, SLOT(addOutput(const QString&, const QString&)) ); - connect( d->job, SIGNAL(debuggingOutput(const QString&, const QString&)), - &d->debugFile, SLOT(addOutput(const QString&, const QString&)) ); - connect( d->job, SIGNAL(finished(bool)), - this, SLOT(slotJobFinished(bool)) ); + d->job = new K3bBlankingJob( this, TQT_TQOBJECT(this) ); + connect( d->job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + d->debugDialog, TQT_SLOT(addOutput(const TQString&, const TQString&)) ); + connect( d->job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + &d->debugFile, TQT_SLOT(addOutput(const TQString&, const TQString&)) ); + connect( d->job, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotJobFinished(bool)) ); } d->job->setDevice( m_writerSelectionWidget->writerDevice() ); @@ -150,7 +150,7 @@ void K3bBlankingDialog::slotStartClicked() if( !d->erasingDlg ) d->erasingDlg = new K3bProgressDialog( i18n("Erasing CD-RW"), this ); - connect( d->erasingDlg, SIGNAL(cancelClicked()), d->job, SLOT(cancel()) ); + connect( d->erasingDlg, TQT_SIGNAL(cancelClicked()), d->job, TQT_SLOT(cancel()) ); if( !exitLoopOnHide() ) hide(); @@ -200,22 +200,22 @@ void K3bBlankingDialog::slotWriterChanged() setButtonEnabled( START_BUTTON, true ); else { setButtonEnabled( START_BUTTON, false ); - KMessageBox::sorry( this, i18n("%1 does not support CD-RW writing.").arg(dev->devicename()) ); + KMessageBox::sorry( this, i18n("%1 does not support CD-RW writing.").tqarg(dev->devicename()) ); } } void K3bBlankingDialog::slotWritingAppChanged(int app) { - QWhatsThis::remove( m_comboEraseMode ); - QString whatsThisInfo; + TQWhatsThis::remove( m_comboEraseMode ); + TQString whatsThisInfo; - static QString wsComplete = i18n("Erases the complete disk. This takes as long " + static TQString wsComplete = i18n("Erases the complete disk. This takes as long " "as writing the complete CD."); - static QString wsFast = i18n("Erases just the TOC, the PMA, and the pregap."); - static QString wsTrack = i18n("Erases just the last track."); - static QString wsUnclose = i18n("Reopen the last session to make it possible to append " + static TQString wsFast = i18n("Erases just the TOC, the PMA, and the pregap."); + static TQString wsTrack = i18n("Erases just the last track."); + static TQString wsUnclose = i18n("Reopen the last session to make it possible to append " "further data."); - static QString wsSession = i18n("Erases the last session of a multisession CD."); + static TQString wsSession = i18n("Erases the last session of a multisession CD."); int lastMode = d->comboTypeMap[m_comboEraseMode->currentItem()]; @@ -249,10 +249,10 @@ void K3bBlankingDialog::slotWritingAppChanged(int app) whatsThisInfo += "<p><b>" + i18n("Erase Last Session") + "</b><br>" + wsSession; } - QWhatsThis::add( m_comboEraseMode, whatsThisInfo ); + TQWhatsThis::add( m_comboEraseMode, whatsThisInfo ); // try to reset last mode - if( d->typeComboMap.contains( lastMode ) ) + if( d->typeComboMap.tqcontains( lastMode ) ) m_comboEraseMode->setCurrentItem( d->typeComboMap[lastMode] ); else m_comboEraseMode->setCurrentItem( d->typeComboMap[K3bBlankingJob::Fast] ); @@ -270,7 +270,7 @@ void K3bBlankingDialog::loadUserDefaults( KConfigBase* c ) m_writerSelectionWidget->loadConfig( c ); slotWritingAppChanged( m_writerSelectionWidget->writingApp() ); - QString mode = c->readEntry( "erase_mode" ); + TQString mode = c->readEntry( "erase_mode" ); kdDebug() << "(K3bBlankingDialog) slotWritingAppChanged mode: " << mode << endl; m_comboEraseMode->setCurrentItem( d->typeComboMap[K3bBlankingJob::Fast] ); if( mode == "complete" ) @@ -287,7 +287,7 @@ void K3bBlankingDialog::loadUserDefaults( KConfigBase* c ) void K3bBlankingDialog::saveUserDefaults( KConfigBase* c ) { - QString mode; + TQString mode; switch( d->comboTypeMap[m_comboEraseMode->currentItem()] ) { case K3bBlankingJob::Complete: mode = "complete"; @@ -314,17 +314,17 @@ void K3bBlankingDialog::saveUserDefaults( KConfigBase* c ) int K3bBlankingDialog::waitForMedia( K3bDevice::Device* device, int mediaState, int mediaType, - const QString& message ) + const TQString& message ) { // this is only needed for the formatting return K3bEmptyDiscWaiter::wait( device, mediaState, mediaType, message, this ); } -bool K3bBlankingDialog::questionYesNo( const QString& text, - const QString& caption, - const QString& yesText, - const QString& noText ) +bool K3bBlankingDialog::questionYesNo( const TQString& text, + const TQString& caption, + const TQString& yesText, + const TQString& noText ) { return ( KMessageBox::questionYesNo( this, text, @@ -334,8 +334,8 @@ bool K3bBlankingDialog::questionYesNo( const QString& text, } -void K3bBlankingDialog::blockingInformation( const QString& text, - const QString& caption ) +void K3bBlankingDialog::blockingInformation( const TQString& text, + const TQString& caption ) { KMessageBox::information( this, text, caption ); } diff --git a/src/misc/k3bblankingdialog.h b/src/misc/k3bblankingdialog.h index cbd5583..6a0b861 100644 --- a/src/misc/k3bblankingdialog.h +++ b/src/misc/k3bblankingdialog.h @@ -20,9 +20,9 @@ #include "k3binteractiondialog.h" #include <k3bjobhandler.h> -class QGroupBox; -class QComboBox; -class QCloseEvent; +class TQGroupBox; +class TQComboBox; +class TQCloseEvent; class KListView; class K3bWriterSelectionWidget; namespace K3bDevice { @@ -33,9 +33,10 @@ namespace K3bDevice { class K3bBlankingDialog : public K3bInteractionDialog, public K3bJobHandler { Q_OBJECT + TQ_OBJECT public: - K3bBlankingDialog( QWidget*, const char* ); + K3bBlankingDialog( TQWidget*, const char* ); ~K3bBlankingDialog(); /** @@ -44,21 +45,21 @@ Q_OBJECT int waitForMedia( K3bDevice::Device*, int mediaState = K3bDevice::STATE_EMPTY, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - const QString& message = QString::null ); + const TQString& message = TQString() ); /** * @reimplemented from K3bJobHandler */ - bool questionYesNo( const QString& text, - const QString& caption = QString::null, - const QString& yesText = QString::null, - const QString& noText = QString::null ); + bool questionYesNo( const TQString& text, + const TQString& caption = TQString(), + const TQString& yesText = TQString(), + const TQString& noText = TQString() ); /** * reimplemented from K3bJobHandler */ - void blockingInformation( const QString& text, - const QString& caption = QString::null ); + void blockingInformation( const TQString& text, + const TQString& caption = TQString() ); public slots: void setDevice( K3bDevice::Device* ); @@ -77,7 +78,7 @@ Q_OBJECT K3bWriterSelectionWidget* m_writerSelectionWidget; - QComboBox* m_comboEraseMode; + TQComboBox* m_comboEraseMode; class Private; Private* d; diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index 4f1ce3b..66b4171 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -44,39 +44,39 @@ #include <kapplication.h> #include <kiconloader.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qptrlist.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qtabwidget.h> -#include <qwhatsthis.h> -#include <qhbox.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qsizepolicy.h> -#include <qfile.h> -#include <qfileinfo.h> - - -K3bCdCopyDialog::K3bCdCopyDialog( QWidget *parent, const char *name, bool modal ) - : K3bInteractionDialog( parent, name, i18n("CD Copy"), i18n("and CD Cloning"), +#include <tqcheckbox.h> +#include <tqspinbox.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqptrlist.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqtabwidget.h> +#include <tqwhatsthis.h> +#include <tqhbox.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqsizepolicy.h> +#include <tqfile.h> +#include <tqfileinfo.h> + + +K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *tqparent, const char *name, bool modal ) + : K3bInteractionDialog( tqparent, name, i18n("CD Copy"), i18n("and CD Cloning"), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "CD Copy", modal ) { - QWidget* main = mainWidget(); + TQWidget* main = mainWidget(); - QGridLayout* mainGrid = new QGridLayout( main ); + TQGridLayout* mainGrid = new TQGridLayout( main ); mainGrid->setSpacing( spacingHint() ); mainGrid->setMargin( 0 ); - QGroupBox* groupSource = new QGroupBox( 1, Qt::Vertical, i18n("Source Medium"), main ); + TQGroupBox* groupSource = new TQGroupBox( 1, Qt::Vertical, i18n("Source Medium"), main ); groupSource->setInsideSpacing( spacingHint() ); groupSource->setInsideMargin( marginHint() ); m_comboSourceDevice = new K3bMediaSelectionComboBox( groupSource ); @@ -89,36 +89,36 @@ K3bCdCopyDialog::K3bCdCopyDialog( QWidget *parent, const char *name, bool modal m_writerSelectionWidget->setSupportedWritingApps( K3b::CDRECORD ); // tab widget -------------------- - QTabWidget* tabWidget = new QTabWidget( main ); + TQTabWidget* tabWidget = new TQTabWidget( main ); // // option tab -------------------- // - QWidget* optionTab = new QWidget( tabWidget ); - QGridLayout* optionTabGrid = new QGridLayout( optionTab ); + TQWidget* optionTab = new TQWidget( tabWidget ); + TQGridLayout* optionTabGrid = new TQGridLayout( optionTab ); optionTabGrid->setSpacing( spacingHint() ); optionTabGrid->setMargin( marginHint() ); - QGroupBox* groupCopyMode = new QGroupBox( 1, Qt::Vertical, i18n("Copy Mode"), optionTab ); + TQGroupBox* groupCopyMode = new TQGroupBox( 1, Qt::Vertical, i18n("Copy Mode"), optionTab ); groupCopyMode->setInsideMargin( marginHint() ); groupCopyMode->setInsideSpacing( spacingHint() ); - m_comboCopyMode = new QComboBox( groupCopyMode ); + m_comboCopyMode = new TQComboBox( groupCopyMode ); m_comboCopyMode->insertItem( i18n("Normal Copy") ); m_comboCopyMode->insertItem( i18n("Clone Copy") ); - QGroupBox* groupWritingMode = new QGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), optionTab ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - QGroupBox* groupCopies = new QGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); - QLabel* pixLabel = new QLabel( groupCopies ); + TQLabel* pixLabel = new TQLabel( groupCopies ); pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) ); pixLabel->setScaledContents( false ); - m_spinCopies = new QSpinBox( 1, 999, 1, groupCopies ); + m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies ); - QGroupBox* groupOptions = new QGroupBox( 5, Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Settings"), optionTab ); groupOptions->setInsideSpacing( spacingHint() ); groupOptions->setInsideMargin( marginHint() ); m_checkSimulate = K3bStdGuiItems::simulateCheckbox( groupOptions ); @@ -139,8 +139,8 @@ K3bCdCopyDialog::K3bCdCopyDialog( QWidget *parent, const char *name, bool modal // // image tab ------------------ // - QWidget* imageTab = new QWidget( tabWidget ); - QGridLayout* imageTabGrid = new QGridLayout( imageTab ); + TQWidget* imageTab = new TQWidget( tabWidget ); + TQGridLayout* imageTabGrid = new TQGridLayout( imageTab ); imageTabGrid->setSpacing( spacingHint() ); imageTabGrid->setMargin( marginHint() ); @@ -154,35 +154,35 @@ K3bCdCopyDialog::K3bCdCopyDialog( QWidget *parent, const char *name, bool modal // // advanced tab ------------------ // - QWidget* advancedTab = new QWidget( tabWidget ); - QGridLayout* advancedTabGrid = new QGridLayout( advancedTab ); + TQWidget* advancedTab = new TQWidget( tabWidget ); + TQGridLayout* advancedTabGrid = new TQGridLayout( advancedTab ); advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - m_groupAdvancedDataOptions = new QGroupBox( 3, Qt::Vertical, i18n("Data"), advancedTab, "data_options" ); + m_groupAdvancedDataOptions = new TQGroupBox( 3, Qt::Vertical, i18n("Data"), advancedTab, "data_options" ); m_groupAdvancedDataOptions->setInsideSpacing( spacingHint() ); m_groupAdvancedDataOptions->setInsideMargin( marginHint() ); - QHBox* box = new QHBox( m_groupAdvancedDataOptions ); + TQHBox* box = new TQHBox( m_groupAdvancedDataOptions ); box->setSpacing( spacingHint() ); - box->setStretchFactor( new QLabel( i18n("Read retries:"), box ), 1 ); - m_spinDataRetries = new QSpinBox( 1, 128, 1, box ); + box->setStretchFactor( new TQLabel( i18n("Read retries:"), box ), 1 ); + m_spinDataRetries = new TQSpinBox( 1, 128, 1, box ); m_checkIgnoreDataReadErrors = K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( m_groupAdvancedDataOptions ); - m_checkNoCorrection = new QCheckBox( i18n("No error correction"), m_groupAdvancedDataOptions ); + m_checkNoCorrection = new TQCheckBox( i18n("No error correction"), m_groupAdvancedDataOptions ); - m_groupAdvancedAudioOptions = new QGroupBox( 5, Qt::Vertical, i18n("Audio"), advancedTab, "audio_options" ); + m_groupAdvancedAudioOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Audio"), advancedTab, "audio_options" ); m_groupAdvancedAudioOptions->setInsideSpacing( spacingHint() ); m_groupAdvancedAudioOptions->setInsideMargin( marginHint() ); - box = new QHBox( m_groupAdvancedAudioOptions ); + box = new TQHBox( m_groupAdvancedAudioOptions ); box->setSpacing( spacingHint() ); - box->setStretchFactor( new QLabel( i18n("Read retries:"), box ), 1 ); - m_spinAudioRetries = new QSpinBox( 1, 128, 1, box ); + box->setStretchFactor( new TQLabel( i18n("Read retries:"), box ), 1 ); + m_spinAudioRetries = new TQSpinBox( 1, 128, 1, box ); m_checkIgnoreAudioReadErrors = K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( m_groupAdvancedAudioOptions ); - box = new QHBox( m_groupAdvancedAudioOptions ); + box = new TQHBox( m_groupAdvancedAudioOptions ); box->setSpacing( spacingHint() ); - box->setStretchFactor(new QLabel( i18n("Paranoia mode:"), box ), 1 ); + box->setStretchFactor(new TQLabel( i18n("Paranoia mode:"), box ), 1 ); m_comboParanoiaMode = K3bStdGuiItems::paranoiaModeComboBox( box ); - m_checkReadCdText = new QCheckBox( i18n("Copy CD-Text"), m_groupAdvancedAudioOptions ); - m_checkPrefereCdText = new QCheckBox( i18n("Prefer CD-Text"), m_groupAdvancedAudioOptions ); + m_checkReadCdText = new TQCheckBox( i18n("Copy CD-Text"), m_groupAdvancedAudioOptions ); + m_checkPrefereCdText = new TQCheckBox( i18n("Prefer CD-Text"), m_groupAdvancedAudioOptions ); advancedTabGrid->addWidget( m_groupAdvancedDataOptions, 0, 1 ); advancedTabGrid->addWidget( m_groupAdvancedAudioOptions, 0, 0 ); @@ -195,38 +195,38 @@ K3bCdCopyDialog::K3bCdCopyDialog( QWidget *parent, const char *name, bool modal mainGrid->setRowStretch( 2, 1 ); - connect( m_comboSourceDevice, SIGNAL(selectionChanged(K3bDevice::Device*)), this, SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, SIGNAL(selectionChanged(K3bDevice::Device*)), - this, SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); - connect( m_writerSelectionWidget, SIGNAL(writerChanged()), this, SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, SLOT(setDevice(K3bDevice::Device*)) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_checkSimulate, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_comboCopyMode, SIGNAL(activated(int)), this, SLOT(slotToggleAll()) ); - connect( m_checkReadCdText, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - - QToolTip::add( m_checkIgnoreDataReadErrors, i18n("Skip unreadable data sectors") ); - QToolTip::add( m_checkNoCorrection, i18n("Disable the source drive's error correction") ); - QToolTip::add( m_checkPrefereCdText, i18n("Use CD-Text instead of cddb if available.") ); - QToolTip::add( m_checkReadCdText, i18n("Copy CD-Text from the source CD if available.") ); - - QWhatsThis::add( m_checkNoCorrection, i18n("<p>If this option is checked K3b will disable the " + connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQT_SLOT(setDevice(K3bDevice::Device*)) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_comboCopyMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkReadCdText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + + TQToolTip::add( m_checkIgnoreDataReadErrors, i18n("Skip unreadable data sectors") ); + TQToolTip::add( m_checkNoCorrection, i18n("Disable the source drive's error correction") ); + TQToolTip::add( m_checkPrefereCdText, i18n("Use CD-Text instead of cddb if available.") ); + TQToolTip::add( m_checkReadCdText, i18n("Copy CD-Text from the source CD if available.") ); + + TQWhatsThis::add( m_checkNoCorrection, i18n("<p>If this option is checked K3b will disable the " "source drive's ECC/EDC error correction. This way sectors " "that are unreadable by intention can be read." "<p>This may be useful for cloning CDs with copy " "protection based on corrupted sectors.") ); - QWhatsThis::add( m_checkReadCdText, i18n("<p>If this option is checked K3b will search for CD-Text on the source CD. " + TQWhatsThis::add( m_checkReadCdText, i18n("<p>If this option is checked K3b will search for CD-Text on the source CD. " "Disable it if your CD drive has problems with reading CD-Text or you want " "to stick to Cddb info.") ); - QWhatsThis::add( m_checkPrefereCdText, i18n("<p>If this option is checked and K3b finds CD-Text on the source media it will be " + TQWhatsThis::add( m_checkPrefereCdText, i18n("<p>If this option is checked and K3b finds CD-Text on the source media it will be " "copied to the resulting CD ignoring any potentially existing Cddb entries.") ); - QWhatsThis::add( m_checkIgnoreDataReadErrors, i18n("<p>If this option is checked and K3b is not able to read a data sector from the " + TQWhatsThis::add( m_checkIgnoreDataReadErrors, i18n("<p>If this option is checked and K3b is not able to read a data sector from the " "source CD/DVD it will be replaced with zeros on the resulting copy.") ); - QWhatsThis::add( m_comboCopyMode, + TQWhatsThis::add( m_comboCopyMode, "<p><b>" + i18n("Normal Copy") + "</b>" + i18n("<p>This is the normal copy mode recommended for most CD types. " "It allows copying Audio CDs, multi and single session Data CDs, and " @@ -293,23 +293,23 @@ void K3bCdCopyDialog::slotStartClicked() // check for m_tempDirSelectionWidget->tempPath() and // m_tempDirSelectionWidget-tempPath() + ".toc" // - if( QFileInfo( m_tempDirSelectionWidget->tempPath() ).isFile() ) { + if( TQFileInfo( m_tempDirSelectionWidget->tempPath() ).isFile() ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) != KMessageBox::Continue ) return; } - if( QFileInfo( m_tempDirSelectionWidget->tempPath() + ".toc" ).isFile() ) { + if( TQFileInfo( m_tempDirSelectionWidget->tempPath() + ".toc" ).isFile() ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath() + ".toc"), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath() + ".toc"), i18n("File Exists"), i18n("Overwrite") ) != KMessageBox::Continue ) return; } - K3bCloneJob* job = new K3bCloneJob( dlg, this ); + K3bCloneJob* job = new K3bCloneJob( dlg, TQT_TQOBJECT(this) ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -325,7 +325,7 @@ void K3bCdCopyDialog::slotStartClicked() burnJob = job; } else { - K3bCdCopyJob* job = new K3bCdCopyJob( dlg, this ); + K3bCdCopyJob* job = new K3bCdCopyJob( dlg, TQT_TQOBJECT(this) ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -392,7 +392,7 @@ void K3bCdCopyDialog::toggleAll() - static_cast<QWidget*>( child( "audio_options" ) )->setDisabled( m_comboCopyMode->currentItem() == 1 ); + TQT_TQWIDGET( child( "audio_options" ) )->setDisabled( m_comboCopyMode->currentItem() == 1 ); m_checkIgnoreDataReadErrors->setDisabled( m_comboCopyMode->currentItem() == 1 ); @@ -419,7 +419,7 @@ void K3bCdCopyDialog::slotSourceMediumChanged( K3bDevice::Device* dev ) if( k3bappcore->mediaCache()->toc( dev ).contentType() == K3bDevice::DATA ) { m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); m_tempDirSelectionWidget->setDefaultImageFileName( medium.volumeId().lower() - + ( medium.toc().count() == 1 ? QString(".iso") : QString::null ) ); + + ( medium.toc().count() == 1 ? TQString(".iso") : TQString() ) ); } else { m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::DIR ); @@ -502,7 +502,7 @@ void K3bCdCopyDialog::saveUserDefaults( KConfigBase* c ) m_writerSelectionWidget->saveConfig( c ); m_tempDirSelectionWidget->saveConfig( c ); - c->writeEntry( "source_device", m_comboSourceDevice->selectedDevice() ? m_comboSourceDevice->selectedDevice()->devicename() : QString() ); + c->writeEntry( "source_device", m_comboSourceDevice->selectedDevice() ? m_comboSourceDevice->selectedDevice()->devicename() : TQString() ); c->writeEntry( "copy cdtext", m_checkReadCdText->isChecked() ); c->writeEntry( "prefer cdtext", m_checkPrefereCdText->isChecked() ); @@ -512,7 +512,7 @@ void K3bCdCopyDialog::saveUserDefaults( KConfigBase* c ) c->writeEntry( "data retries", m_spinDataRetries->value() ); c->writeEntry( "audio retries", m_spinAudioRetries->value() ); - QString s; + TQString s; if( m_comboCopyMode->currentItem() == 1 ) s = "clone"; else diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h index b7a4bd2..818966c 100644 --- a/src/misc/k3bcdcopydialog.h +++ b/src/misc/k3bcdcopydialog.h @@ -31,12 +31,12 @@ namespace K3bDevice { class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bMediaSelectionComboBox; -class QCheckBox; -class QSpinBox; -class QComboBox; +class TQCheckBox; +class TQSpinBox; +class TQComboBox; class K3bWritingModeWidget; -class QButtonGroup; -class QGroupBox; +class TQButtonGroup; +class TQGroupBox; /** @@ -45,9 +45,10 @@ class QGroupBox; class K3bCdCopyDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bCdCopyDialog(QWidget *parent = 0, const char *name = 0, bool modal = true ); + K3bCdCopyDialog(TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); ~K3bCdCopyDialog(); void setReadingDevice( K3bDevice::Device* ); @@ -72,25 +73,25 @@ class K3bCdCopyDialog : public K3bInteractionDialog K3bWriterSelectionWidget* m_writerSelectionWidget; K3bTempDirSelectionWidget* m_tempDirSelectionWidget; - QCheckBox* m_checkSimulate; - QCheckBox* m_checkCacheImage; - QCheckBox* m_checkDeleteImages; - QCheckBox* m_checkOnlyCreateImage; - QCheckBox* m_checkReadCdText; - QCheckBox* m_checkPrefereCdText; - QCheckBox* m_checkIgnoreDataReadErrors; - QCheckBox* m_checkIgnoreAudioReadErrors; - QCheckBox* m_checkNoCorrection; + TQCheckBox* m_checkSimulate; + TQCheckBox* m_checkCacheImage; + TQCheckBox* m_checkDeleteImages; + TQCheckBox* m_checkOnlyCreateImage; + TQCheckBox* m_checkReadCdText; + TQCheckBox* m_checkPrefereCdText; + TQCheckBox* m_checkIgnoreDataReadErrors; + TQCheckBox* m_checkIgnoreAudioReadErrors; + TQCheckBox* m_checkNoCorrection; K3bMediaSelectionComboBox* m_comboSourceDevice; - QComboBox* m_comboParanoiaMode; - QSpinBox* m_spinCopies; - QSpinBox* m_spinDataRetries; - QSpinBox* m_spinAudioRetries; + TQComboBox* m_comboParanoiaMode; + TQSpinBox* m_spinCopies; + TQSpinBox* m_spinDataRetries; + TQSpinBox* m_spinAudioRetries; K3bWritingModeWidget* m_writingModeWidget; - QComboBox* m_comboCopyMode; + TQComboBox* m_comboCopyMode; - QGroupBox* m_groupAdvancedDataOptions; - QGroupBox* m_groupAdvancedAudioOptions; + TQGroupBox* m_groupAdvancedDataOptions; + TQGroupBox* m_groupAdvancedAudioOptions; }; #endif diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index b071d94..9e3e7e6 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -55,26 +55,26 @@ #include <kinputdialog.h> #include <kurldrag.h> -#include <qheader.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qptrlist.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qfont.h> -#include <qfontmetrics.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qspinbox.h> -#include <qmap.h> -#include <qptrqueue.h> -#include <qpopupmenu.h> -#include <qclipboard.h> +#include <tqheader.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqptrlist.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqfont.h> +#include <tqfontmetrics.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqspinbox.h> +#include <tqmap.h> +#include <tqptrqueue.h> +#include <tqpopupmenu.h> +#include <tqclipboard.h> class K3bCdImageWritingDialog::Private @@ -88,22 +88,22 @@ public: } K3bListViewItem* md5SumItem; - QString lastCheckedFile; + TQString lastCheckedFile; K3bMd5Job* md5Job; bool haveMd5Sum; int foundImageType; - QMap<int,int> imageTypeSelectionMap; - QMap<int,int> imageTypeSelectionMapRev; - QString imageFile; - QString tocFile; + TQMap<int,int> imageTypeSelectionMap; + TQMap<int,int> imageTypeSelectionMapRev; + TQString imageFile; + TQString tocFile; - QTabWidget* optionTabbed; + TQTabWidget* optionTabbed; - QWidget* advancedTab; - QWidget* tempPathTab; + TQWidget* advancedTab; + TQWidget* tempPathTab; bool advancedTabVisible; bool tempPathTabVisible; @@ -111,8 +111,8 @@ public: }; -K3bCdImageWritingDialog::K3bCdImageWritingDialog( QWidget* parent, const char* name, bool modal ) - : K3bInteractionDialog( parent, name, +K3bCdImageWritingDialog::K3bCdImageWritingDialog( TQWidget* tqparent, const char* name, bool modal ) + : K3bInteractionDialog( tqparent, name, i18n("Burn CD Image"), "iso cue toc", START_BUTTON|CANCEL_BUTTON, @@ -126,28 +126,28 @@ K3bCdImageWritingDialog::K3bCdImageWritingDialog( QWidget* parent, const char* n setupGui(); - d->md5Job = new K3bMd5Job( 0, this ); - connect( d->md5Job, SIGNAL(finished(bool)), - this, SLOT(slotMd5JobFinished(bool)) ); - connect( d->md5Job, SIGNAL(percent(int)), - this, SLOT(slotMd5JobPercent(int)) ); - - connect( m_writerSelectionWidget, SIGNAL(writerChanged()), - this, SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), - this, SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, SLOT(setDevice(K3bDevice::Device*)) ); - connect( m_comboImageType, SIGNAL(activated(int)), - this, SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), - this, SLOT(slotToggleAll()) ); - connect( m_editImagePath, SIGNAL(textChanged(const QString&)), - this, SLOT(slotUpdateImage(const QString&)) ); - connect( m_checkDummy, SIGNAL(toggled(bool)), - this, SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), - this, SLOT(slotToggleAll()) ); + d->md5Job = new K3bMd5Job( 0, TQT_TQOBJECT(this) ); + connect( d->md5Job, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotMd5JobFinished(bool)) ); + connect( d->md5Job, TQT_SIGNAL(percent(int)), + this, TQT_SLOT(slotMd5JobPercent(int)) ); + + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), + this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), + this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQT_SLOT(setDevice(K3bDevice::Device*)) ); + connect( m_comboImageType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), + this, TQT_SLOT(slotToggleAll()) ); + connect( m_editImagePath, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotUpdateImage(const TQString&)) ); + connect( m_checkDummy, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotToggleAll()) ); } @@ -165,8 +165,8 @@ void K3bCdImageWritingDialog::init() // last written image because that's what most users want KConfig* c = k3bcore->config(); c->setGroup( configGroup() ); - QString image = c->readPathEntry( "last written image" ); - if( QFile::exists( image ) ) + TQString image = c->readPathEntry( "last written image" ); + if( TQFile::exists( image ) ) m_editImagePath->setURL( image ); } } @@ -174,11 +174,11 @@ void K3bCdImageWritingDialog::init() void K3bCdImageWritingDialog::setupGui() { - QWidget* frame = mainWidget(); + TQWidget* frame = mainWidget(); // image // ----------------------------------------------------------------------- - QGroupBox* groupImageUrl = new QGroupBox( 1, Qt::Horizontal, i18n("Image to Burn"), frame ); + TQGroupBox* groupImageUrl = new TQGroupBox( 1, Qt::Horizontal, i18n("Image to Burn"), frame ); m_editImagePath = new KURLRequester( groupImageUrl ); m_editImagePath->setMode( KFile::File|KFile::ExistingOnly ); m_editImagePath->setCaption( i18n("Choose Image File") ); @@ -192,8 +192,8 @@ void K3bCdImageWritingDialog::setupGui() + "\n" + i18n("*|All Files") ); - QGroupBox* groupImageType = new QGroupBox( 1, Qt::Horizontal, i18n("Image Type"), frame ); - m_comboImageType = new QComboBox( groupImageType ); + TQGroupBox* groupImageType = new TQGroupBox( 1, Qt::Horizontal, i18n("Image Type"), frame ); + m_comboImageType = new TQComboBox( groupImageType ); m_comboImageType->insertItem( i18n("Auto Detection") ); m_comboImageType->insertItem( i18n("ISO9660 Image") ); m_comboImageType->insertItem( i18n("Cue/Bin Image") ); @@ -220,12 +220,12 @@ void K3bCdImageWritingDialog::setupGui() m_infoView->header()->hide(); m_infoView->setNoItemText( i18n("No image file selected") ); m_infoView->setSorting( -1 ); - m_infoView->setAlternateBackground( QColor() ); + m_infoView->setAlternateBackground( TQColor() ); m_infoView->setFullWidth(true); - m_infoView->setSelectionMode( QListView::NoSelection ); + m_infoView->setSelectionMode( TQListView::NoSelection ); - connect( m_infoView, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + connect( m_infoView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); @@ -234,32 +234,32 @@ void K3bCdImageWritingDialog::setupGui() // options // ----------------------------------------------------------------------- - d->optionTabbed = new QTabWidget( frame ); + d->optionTabbed = new TQTabWidget( frame ); - QWidget* optionTab = new QWidget( d->optionTabbed ); - QGridLayout* optionTabLayout = new QGridLayout( optionTab ); - optionTabLayout->setAlignment( Qt::AlignTop ); + TQWidget* optionTab = new TQWidget( d->optionTabbed ); + TQGridLayout* optionTabLayout = new TQGridLayout( optionTab ); + optionTabLayout->tqsetAlignment( TQt::AlignTop ); optionTabLayout->setSpacing( spacingHint() ); optionTabLayout->setMargin( marginHint() ); - QGroupBox* writingModeGroup = new QGroupBox( 1, Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* writingModeGroup = new TQGroupBox( 1,Qt::Vertical, i18n("Writing Mode"), optionTab ); writingModeGroup->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( writingModeGroup ); // copies -------- - QGroupBox* groupCopies = new QGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); - QLabel* pixLabel = new QLabel( groupCopies ); + TQLabel* pixLabel = new TQLabel( groupCopies ); pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) ); pixLabel->setScaledContents( false ); - m_spinCopies = new QSpinBox( groupCopies ); + m_spinCopies = new TQSpinBox( groupCopies ); m_spinCopies->setMinValue( 1 ); m_spinCopies->setMaxValue( 999 ); // -------- copies - QGroupBox* optionGroup = new QGroupBox( 3, Vertical, i18n("Settings"), optionTab ); + TQGroupBox* optionGroup = new TQGroupBox( 3,Qt::Vertical, i18n("Settings"), optionTab ); optionGroup->setInsideMargin( marginHint() ); optionGroup->setInsideSpacing( spacingHint() ); m_checkDummy = K3bStdGuiItems::simulateCheckbox( optionGroup ); @@ -276,8 +276,8 @@ void K3bCdImageWritingDialog::setupGui() // image tab ------------------------------------ - d->tempPathTab = new QWidget( d->optionTabbed ); - QGridLayout* imageTabGrid = new QGridLayout( d->tempPathTab ); + d->tempPathTab = new TQWidget( d->optionTabbed ); + TQGridLayout* imageTabGrid = new TQGridLayout( d->tempPathTab ); imageTabGrid->setSpacing( spacingHint() ); imageTabGrid->setMargin( marginHint() ); @@ -291,16 +291,16 @@ void K3bCdImageWritingDialog::setupGui() // advanced --------------------------------- - d->advancedTab = new QWidget( d->optionTabbed ); - QGridLayout* advancedTabLayout = new QGridLayout( d->advancedTab ); - advancedTabLayout->setAlignment( Qt::AlignTop ); + d->advancedTab = new TQWidget( d->optionTabbed ); + TQGridLayout* advancedTabLayout = new TQGridLayout( d->advancedTab ); + advancedTabLayout->tqsetAlignment( TQt::AlignTop ); advancedTabLayout->setSpacing( spacingHint() ); advancedTabLayout->setMargin( marginHint() ); m_dataModeWidget = new K3bDataModeWidget( d->advancedTab ); m_checkNoFix = K3bStdGuiItems::startMultisessionCheckBox( d->advancedTab ); - advancedTabLayout->addWidget( new QLabel( i18n("Data mode:"), d->advancedTab ), 0, 0 ); + advancedTabLayout->addWidget( new TQLabel( i18n("Data mode:"), d->advancedTab ), 0, 0 ); advancedTabLayout->addWidget( m_dataModeWidget, 0, 1 ); advancedTabLayout->addMultiCellWidget( m_checkNoFix, 1, 1, 0, 2 ); advancedTabLayout->setRowStretch( 2, 1 ); @@ -313,7 +313,7 @@ void K3bCdImageWritingDialog::setupGui() - QGridLayout* grid = new QGridLayout( frame ); + TQGridLayout* grid = new TQGridLayout( frame ); grid->setSpacing( spacingHint() ); grid->setMargin( 0 ); @@ -354,7 +354,7 @@ void K3bCdImageWritingDialog::slotStartClicked() switch( currentImageType() ) { case IMAGE_CDRECORD_CLONE: { - K3bCloneJob* _job = new K3bCloneJob( &dlg, this ); + K3bCloneJob* _job = new K3bCloneJob( &dlg, TQT_TQOBJECT(this) ); _job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); _job->setImagePath( d->imageFile ); _job->setSimulate( m_checkDummy->isChecked() ); @@ -368,7 +368,7 @@ void K3bCdImageWritingDialog::slotStartClicked() case IMAGE_AUDIO_CUE: { - K3bAudioCueFileWritingJob* job_ = new K3bAudioCueFileWritingJob( &dlg, this ); + K3bAudioCueFileWritingJob* job_ = new K3bAudioCueFileWritingJob( &dlg, TQT_TQOBJECT(this) ); job_->setBurnDevice( m_writerSelectionWidget->writerDevice() ); job_->setSpeed( m_writerSelectionWidget->writerSpeed() ); @@ -387,7 +387,7 @@ void K3bCdImageWritingDialog::slotStartClicked() // for now the K3bBinImageWritingJob decides if it's a toc or a cue file case IMAGE_CDRDAO_TOC: { - K3bBinImageWritingJob* job_ = new K3bBinImageWritingJob( &dlg, this ); + K3bBinImageWritingJob* job_ = new K3bBinImageWritingJob( &dlg, TQT_TQOBJECT(this) ); job_->setWriter( m_writerSelectionWidget->writerDevice() ); job_->setSpeed( m_writerSelectionWidget->writerSpeed() ); @@ -456,9 +456,9 @@ void K3bCdImageWritingDialog::slotStartClicked() } -void K3bCdImageWritingDialog::slotUpdateImage( const QString& ) +void K3bCdImageWritingDialog::slotUpdateImage( const TQString& ) { - QString path = imagePath(); + TQString path = imagePath(); // check the image types @@ -471,7 +471,7 @@ void K3bCdImageWritingDialog::slotUpdateImage( const QString& ) d->tocFile.truncate(0); d->imageFile.truncate(0); - QFileInfo info( path ); + TQFileInfo info( path ); if( info.isFile() ) { // ------------------------------------------------ @@ -568,14 +568,14 @@ void K3bCdImageWritingDialog::slotUpdateImage( const QString& ) if( d->foundImageType == IMAGE_UNKNOWN ) { K3bListViewItem* item = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Seems not to be a usable image") ); - item->setForegroundColor( 0, Qt::red ); + item->setForegroundColor( 0, TQt::red ); item->setPixmap( 0, SmallIcon( "stop") ); } } else { K3bListViewItem* item = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("File not found") ); - item->setForegroundColor( 0, Qt::red ); + item->setForegroundColor( 0, TQt::red ); item->setPixmap( 0, SmallIcon( "stop") ); } @@ -588,117 +588,117 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF ) K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Detected:"), i18n("Iso9660 image") ); - isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); + isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); KIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), KIO::convertSize( size ) ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("System Id:"), isoF->primaryDescriptor().systemId.isEmpty() - ? QString("-") + ? TQString("-") : isoF->primaryDescriptor().systemId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Volume Id:"), isoF->primaryDescriptor().volumeId.isEmpty() - ? QString("-") + ? TQString("-") : isoF->primaryDescriptor().volumeId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Volume Set Id:"), isoF->primaryDescriptor().volumeSetId.isEmpty() - ? QString("-") + ? TQString("-") : isoF->primaryDescriptor().volumeSetId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Publisher Id:"), isoF->primaryDescriptor().publisherId.isEmpty() - ? QString("-") + ? TQString("-") : isoF->primaryDescriptor().publisherId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Preparer Id:"), isoF->primaryDescriptor().preparerId.isEmpty() - ? QString("-") : isoF->primaryDescriptor().preparerId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + ? TQString("-") : isoF->primaryDescriptor().preparerId ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Application Id:"), isoF->primaryDescriptor().applicationId.isEmpty() - ? QString("-") + ? TQString("-") : isoF->primaryDescriptor().applicationId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); isoRootItem->setOpen( true ); } -void K3bCdImageWritingDialog::createCdrecordCloneItems( const QString& tocFile, const QString& imageFile ) +void K3bCdImageWritingDialog::createCdrecordCloneItems( const TQString& tocFile, const TQString& imageFile ) { K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Detected:"), i18n("Cdrecord clone image") ); - isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); + isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Image file:"), imageFile ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("TOC file:"), tocFile ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); isoRootItem->setOpen( true ); } -void K3bCdImageWritingDialog::createCueBinItems( const QString& cueFile, const QString& imageFile ) +void K3bCdImageWritingDialog::createCueBinItems( const TQString& cueFile, const TQString& imageFile ) { K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Detected:"), i18n("Cue/bin image") ); - isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); + isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Image file:"), imageFile ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Cue file:"), cueFile ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); isoRootItem->setOpen( true ); } @@ -709,7 +709,7 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp ) K3bListViewItem* rootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Detected:"), i18n("Audio Cue Image") ); - rootItem->setForegroundColor( 0, palette().disabled().foreground() ); + rootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); rootItem->setPixmap( 0, SmallIcon( "sound") ); K3bListViewItem* trackParent = new K3bListViewItem( rootItem, @@ -717,10 +717,10 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp ) cp.toc().length().toString() ); if( !cp.cdText().isEmpty() ) trackParent->setText( 1, - QString("%1 (%2 - %3)") - .arg(trackParent->text(1)) - .arg(cp.cdText().performer()) - .arg(cp.cdText().title()) ); + TQString("%1 (%2 - %3)") + .tqarg(trackParent->text(1)) + .tqarg(cp.cdText().performer()) + .tqarg(cp.cdText().title()) ); unsigned int i = 1; for( K3bDevice::Toc::const_iterator it = cp.toc().begin(); @@ -728,17 +728,17 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp ) K3bListViewItem* trackItem = new K3bListViewItem( trackParent, m_infoView->lastItem(), - i18n("Track") + " " + QString::number(i).rightJustify( 2, '0' ), + i18n("Track") + " " + TQString::number(i).rightJustify( 2, '0' ), " " + ( i < cp.toc().count() ? (*it).length().toString() - : QString("??:??:??") ) ); + : TQString("??:??:??") ) ); if( !cp.cdText().isEmpty() && !cp.cdText()[i-1].isEmpty() ) trackItem->setText( 1, - QString("%1 (%2 - %3)") - .arg(trackItem->text(1)) - .arg(cp.cdText()[i-1].performer()) - .arg(cp.cdText()[i-1].title()) ); + TQString("%1 (%2 - %3)") + .tqarg(trackItem->text(1)) + .tqarg(cp.cdText()[i-1].performer()) + .tqarg(cp.cdText()[i-1].title()) ); ++i; } @@ -753,7 +753,7 @@ void K3bCdImageWritingDialog::toggleAll() // enable the Write-Button if we found a valid image or the user forced an image type setButtonEnabled( START_BUTTON, m_writerSelectionWidget->writerDevice() && currentImageType() != IMAGE_UNKNOWN - && QFile::exists( imagePath() ) ); + && TQFile::exists( imagePath() ) ); // cdrecord clone and cue both need DAO if( m_writerSelectionWidget->writingApp() != K3b::CDRDAO @@ -815,8 +815,8 @@ void K3bCdImageWritingDialog::toggleAll() if( item ) item->setForegroundColor( 1, currentImageType() != d->foundImageType - ? Qt::red - : m_infoView->colorGroup().foreground() ); + ? TQt::red + : m_infoView->tqcolorGroup().foreground() ); } @@ -831,7 +831,7 @@ void K3bCdImageWritingDialog::setImage( const KURL& url ) } -void K3bCdImageWritingDialog::calculateMd5Sum( const QString& file ) +void K3bCdImageWritingDialog::calculateMd5Sum( const TQString& file ) { d->haveMd5Sum = false; @@ -839,7 +839,7 @@ void K3bCdImageWritingDialog::calculateMd5Sum( const QString& file ) d->md5SumItem = new K3bListViewItem( m_infoView, m_infoView->firstChild() ); d->md5SumItem->setText( 0, i18n("Md5 Sum:") ); - d->md5SumItem->setForegroundColor( 0, palette().disabled().foreground() ); + d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); d->md5SumItem->setProgress( 1, 0 ); d->md5SumItem->setPixmap( 0, SmallIcon( "exec") ); @@ -866,7 +866,7 @@ void K3bCdImageWritingDialog::slotMd5JobFinished( bool success ) d->haveMd5Sum = true; } else { - d->md5SumItem->setForegroundColor( 1, Qt::red ); + d->md5SumItem->setForegroundColor( 1, TQt::red ); if( d->md5Job->hasBeenCanceled() ) d->md5SumItem->setText( 1, i18n("Calculation cancelled") ); else @@ -879,12 +879,12 @@ void K3bCdImageWritingDialog::slotMd5JobFinished( bool success ) } -void K3bCdImageWritingDialog::slotContextMenu( KListView*, QListViewItem*, const QPoint& pos ) +void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ) { if( !d->haveMd5Sum ) return; - QPopupMenu popup; + TQPopupMenu popup; int copyItem = popup.insertItem( i18n("Copy checksum to clipboard") ); int compareItem = popup.insertItem( i18n("Compare checksum...") ); @@ -892,22 +892,22 @@ void K3bCdImageWritingDialog::slotContextMenu( KListView*, QListViewItem*, const if( r == compareItem ) { bool ok; - QString md5sumToCompare = KInputDialog::getText( i18n("MD5 Sum Check"), + TQString md5sumToCompare = KInputDialog::getText( i18n("MD5 Sum Check"), i18n("Please insert the MD5 Sum to compare:"), - QString::null, + TQString(), &ok, this ); if( ok ) { if( md5sumToCompare.lower().utf8() == d->md5Job->hexDigest().lower() ) - KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").arg(imagePath()), + KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").tqarg(imagePath()), i18n("MD5 Sums Equal") ); else - KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").arg(imagePath()), + KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").tqarg(imagePath()), i18n("MD5 Sums Differ") ); } } else if( r == copyItem ) { - QApplication::clipboard()->setText( d->md5Job->hexDigest().lower(), QClipboard::Clipboard ); + TQApplication::tqclipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard ); } } @@ -928,12 +928,12 @@ void K3bCdImageWritingDialog::loadUserDefaults( KConfigBase* c ) m_writerSelectionWidget->loadConfig( c ); if( !d->imageForced ) { - QString image = c->readPathEntry( "image path", c->readPathEntry( "last written image" ) ); - if( QFile::exists( image ) ) + TQString image = c->readPathEntry( "image path", c->readPathEntry( "last written image" ) ); + if( TQFile::exists( image ) ) m_editImagePath->setURL( image ); } - QString imageType = c->readEntry( "image type", "auto" ); + TQString imageType = c->readEntry( "image type", "auto" ); int x = 0; if( imageType == "iso9660" ) x = d->imageTypeSelectionMapRev[IMAGE_ISO]; @@ -970,7 +970,7 @@ void K3bCdImageWritingDialog::saveUserDefaults( KConfigBase* c ) c->writeEntry( "copies", m_spinCopies->value() ); - QString imageType; + TQString imageType; if( m_comboImageType->currentItem() == 0 ) imageType = "auto"; else { @@ -1023,19 +1023,19 @@ int K3bCdImageWritingDialog::currentImageType() } -QString K3bCdImageWritingDialog::imagePath() const +TQString K3bCdImageWritingDialog::imagePath() const { return K3b::convertToLocalUrl( KURL::fromPathOrURL( m_editImagePath->url() ) ).path(); } -void K3bCdImageWritingDialog::dragEnterEvent( QDragEnterEvent* e ) +void K3bCdImageWritingDialog::dragEnterEvent( TQDragEnterEvent* e ) { e->accept( KURLDrag::canDecode(e) ); } -void K3bCdImageWritingDialog::dropEvent( QDropEvent* e ) +void K3bCdImageWritingDialog::dropEvent( TQDropEvent* e ) { KURL::List urls; KURLDrag::decode( e, urls ); diff --git a/src/misc/k3bcdimagewritingdialog.h b/src/misc/k3bcdimagewritingdialog.h index 143f023..773697b 100644 --- a/src/misc/k3bcdimagewritingdialog.h +++ b/src/misc/k3bcdimagewritingdialog.h @@ -20,9 +20,9 @@ #include <k3binteractiondialog.h> -class QCheckBox; +class TQCheckBox; class K3bWriterSelectionWidget; -class QLabel; +class TQLabel; class KURL; class KActiveLabel; class KProgress; @@ -31,15 +31,15 @@ class K3bWritingModeWidget; class K3bTempDirSelectionWidget; class KURLRequester; class K3bListView; -class QSpinBox; -class QComboBox; +class TQSpinBox; +class TQComboBox; class K3bIso9660; class K3bCueFileParser; -class QDragEnterEvent; -class QDropEvent; +class TQDragEnterEvent; +class TQDropEvent; class KListView; -class QListViewItem; -class QPoint; +class TQListViewItem; +class TQPoint; /** @@ -48,9 +48,10 @@ class QPoint; class K3bCdImageWritingDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bCdImageWritingDialog( QWidget* = 0, const char* = 0, bool = true ); + K3bCdImageWritingDialog( TQWidget* = 0, const char* = 0, bool = true ); ~K3bCdImageWritingDialog(); void setImage( const KURL& url ); @@ -60,18 +61,18 @@ class K3bCdImageWritingDialog : public K3bInteractionDialog void slotMd5JobPercent( int ); void slotMd5JobFinished( bool ); - void slotContextMenu( KListView*, QListViewItem*, const QPoint& pos ); + void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ); - void slotUpdateImage( const QString& ); + void slotUpdateImage( const TQString& ); protected: void loadUserDefaults( KConfigBase* ); void saveUserDefaults( KConfigBase* ); void loadK3bDefaults(); - void calculateMd5Sum( const QString& ); - void dragEnterEvent( QDragEnterEvent* ); - void dropEvent( QDropEvent* ); + void calculateMd5Sum( const TQString& ); + void dragEnterEvent( TQDragEnterEvent* ); + void dropEvent( TQDropEvent* ); void init(); @@ -88,23 +89,23 @@ class K3bCdImageWritingDialog : public K3bInteractionDialog void setupGui(); void createIso9660InfoItems( K3bIso9660* ); - void createCdrecordCloneItems( const QString&, const QString& ); - void createCueBinItems( const QString&, const QString& ); + void createCdrecordCloneItems( const TQString&, const TQString& ); + void createCueBinItems( const TQString&, const TQString& ); void createAudioCueItems( const K3bCueFileParser& cp ); int currentImageType(); - QString imagePath() const; + TQString imagePath() const; K3bWriterSelectionWidget* m_writerSelectionWidget; - QCheckBox* m_checkDummy; - QCheckBox* m_checkNoFix; - QCheckBox* m_checkCacheImage; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkDummy; + TQCheckBox* m_checkNoFix; + TQCheckBox* m_checkCacheImage; + TQCheckBox* m_checkVerify; K3bDataModeWidget* m_dataModeWidget; K3bWritingModeWidget* m_writingModeWidget; - QSpinBox* m_spinCopies; + TQSpinBox* m_spinCopies; KURLRequester* m_editImagePath; - QComboBox* m_comboImageType; + TQComboBox* m_comboImageType; K3bListView* m_infoView; K3bTempDirSelectionWidget* m_tempDirSelectionWidget; diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index f93abba..999dc3a 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -31,18 +31,18 @@ #include <k3bmediacache.h> #include <k3biso9660.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qtabwidget.h> -#include <qspinbox.h> -#include <qptrlist.h> -#include <qfile.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qhbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqtabwidget.h> +#include <tqspinbox.h> +#include <tqptrlist.h> +#include <tqfile.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqhbox.h> #include <kdebug.h> #include <klocale.h> @@ -55,8 +55,8 @@ -K3bDvdCopyDialog::K3bDvdCopyDialog( QWidget* parent, const char* name, bool modal ) - : K3bInteractionDialog( parent, name, +K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* tqparent, const char* name, bool modal ) + : K3bInteractionDialog( tqparent, name, i18n("DVD Copy"), i18n("No video transcoding!"), START_BUTTON|CANCEL_BUTTON, @@ -64,12 +64,12 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( QWidget* parent, const char* name, bool moda "default dvd copy settings", modal ) { - QWidget* w = mainWidget(); + TQWidget* w = mainWidget(); // // Source group // ////////////////////////////////////////////////////////////////////////// - QGroupBox* groupSource = new QGroupBox( 1, Qt::Vertical, i18n("Source Medium"), w ); + TQGroupBox* groupSource = new TQGroupBox( 1, Qt::Vertical, i18n("Source Medium"), w ); groupSource->setInsideSpacing( spacingHint() ); groupSource->setInsideMargin( marginHint() ); m_comboSourceDevice = new K3bMediaSelectionComboBox( groupSource ); @@ -89,19 +89,19 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( QWidget* parent, const char* name, bool moda // // Option tab // ////////////////////////////////////////////////////////////////////////// - QTabWidget* tabWidget = new QTabWidget( w ); + TQTabWidget* tabWidget = new TQTabWidget( w ); // option tab -------------------- - QWidget* optionTab = new QWidget( tabWidget ); - QGridLayout* optionTabGrid = new QGridLayout( optionTab ); + TQWidget* optionTab = new TQWidget( tabWidget ); + TQGridLayout* optionTabGrid = new TQGridLayout( optionTab ); optionTabGrid->setSpacing( spacingHint() ); optionTabGrid->setMargin( marginHint() ); - QGroupBox* groupWritingMode = new QGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), optionTab ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - QGroupBox* groupOptions = new QGroupBox( 5, Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Settings"), optionTab ); groupOptions->setInsideSpacing( spacingHint() ); groupOptions->setInsideMargin( marginHint() ); m_checkSimulate = K3bStdGuiItems::simulateCheckbox( groupOptions ); @@ -110,13 +110,13 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( QWidget* parent, const char* name, bool moda m_checkDeleteImages = K3bStdGuiItems::removeImagesCheckbox( groupOptions ); m_checkVerifyData = K3bStdGuiItems::verifyCheckBox( groupOptions ); - QGroupBox* groupCopies = new QGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); - QLabel* pixLabel = new QLabel( groupCopies ); + TQLabel* pixLabel = new TQLabel( groupCopies ); pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) ); pixLabel->setScaledContents( false ); - m_spinCopies = new QSpinBox( groupCopies ); + m_spinCopies = new TQSpinBox( groupCopies ); m_spinCopies->setMinValue( 1 ); m_spinCopies->setMaxValue( 999 ); @@ -132,8 +132,8 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( QWidget* parent, const char* name, bool moda // // Image tab // ////////////////////////////////////////////////////////////////////////// - QWidget* imageTab = new QWidget( tabWidget ); - QGridLayout* imageTabGrid = new QGridLayout( imageTab ); + TQWidget* imageTab = new TQWidget( tabWidget ); + TQGridLayout* imageTabGrid = new TQGridLayout( imageTab ); imageTabGrid->setSpacing( spacingHint() ); imageTabGrid->setMargin( marginHint() ); @@ -148,19 +148,19 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( QWidget* parent, const char* name, bool moda // // advanced tab ------------------ // ////////////////////////////////////////////////////////////////////////// - QWidget* advancedTab = new QWidget( tabWidget ); - QGridLayout* advancedTabGrid = new QGridLayout( advancedTab ); + TQWidget* advancedTab = new TQWidget( tabWidget ); + TQGridLayout* advancedTabGrid = new TQGridLayout( advancedTab ); advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - QGroupBox* groupGeneral = new QGroupBox( 2, Qt::Vertical, i18n("General"), advancedTab ); + TQGroupBox* groupGeneral = new TQGroupBox( 2, Qt::Vertical, i18n("General"), advancedTab ); groupGeneral->setInsideSpacing( spacingHint() ); groupGeneral->setInsideMargin( marginHint() ); - QHBox* box = new QHBox( groupGeneral ); + TQHBox* box = new TQHBox( groupGeneral ); box->setSpacing( spacingHint() ); - box->setStretchFactor( new QLabel( i18n("Read retries:"), box ), 1 ); - m_spinRetries = new QSpinBox( 1, 128, 1, box ); - m_checkIgnoreReadErrors = new QCheckBox( i18n("Ignore read errors"), groupGeneral ); + box->setStretchFactor( new TQLabel( i18n("Read retries:"), box ), 1 ); + m_spinRetries = new TQSpinBox( 1, 128, 1, box ); + m_checkIgnoreReadErrors = new TQCheckBox( i18n("Ignore read errors"), groupGeneral ); advancedTabGrid->addWidget( groupGeneral, 0, 0 ); @@ -169,9 +169,9 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( QWidget* parent, const char* name, bool moda // - // setup layout + // setup tqlayout // ////////////////////////////////////////////////////////////////////////// - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( 0 ); grid->setSpacing( spacingHint() ); @@ -190,17 +190,17 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( QWidget* parent, const char* name, bool moda // // setup connections // ////////////////////////////////////////////////////////////////////////// - connect( m_writerSelectionWidget, SIGNAL(writerChanged()), this, SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, SIGNAL(selectionChanged(K3bDevice::Device*)), this, SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, SIGNAL(selectionChanged(K3bDevice::Device*)), - this, SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); - connect( m_checkSimulate, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); - - QToolTip::add( m_checkIgnoreReadErrors, i18n("Skip unreadable sectors") ); - QWhatsThis::add( m_checkIgnoreReadErrors, i18n("<p>If this option is checked and K3b is not able to read a sector from the " + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); + connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + + TQToolTip::add( m_checkIgnoreReadErrors, i18n("Skip unreadable sectors") ); + TQWhatsThis::add( m_checkIgnoreReadErrors, i18n("<p>If this option is checked and K3b is not able to read a sector from the " "source CD/DVD it will be replaced with zeros on the resulting copy.") ); } @@ -253,7 +253,7 @@ void K3bDvdCopyDialog::slotStartClicked() dlg = new K3bBurnProgressDialog( kapp->mainWidget() ); } - K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, this ); + K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, TQT_TQOBJECT(this) ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -315,7 +315,7 @@ void K3bDvdCopyDialog::saveUserDefaults( KConfigBase* c ) m_writingModeWidget->saveConfig( c ); m_tempDirSelectionWidget->saveConfig( c ); - c->writeEntry( "source_device", m_comboSourceDevice->selectedDevice() ? m_comboSourceDevice->selectedDevice()->devicename() : QString() ); + c->writeEntry( "source_device", m_comboSourceDevice->selectedDevice() ? m_comboSourceDevice->selectedDevice()->devicename() : TQString() ); c->writeEntry( "simulate", m_checkSimulate->isChecked() ); c->writeEntry( "on_the_fly", !m_checkCacheImage->isChecked() ); diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h index be696c4..00436cc 100644 --- a/src/misc/k3bdvdcopydialog.h +++ b/src/misc/k3bdvdcopydialog.h @@ -30,17 +30,18 @@ namespace K3bDevice { class K3bTempDirSelectionWidget; class K3bWriterSelectionWidget; class K3bMediaSelectionComboBox; -class QCheckBox; -class QSpinBox; +class TQCheckBox; +class TQSpinBox; class K3bWritingModeWidget; class K3bDvdCopyDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bDvdCopyDialog( QWidget* parent = 0, const char* name = 0, bool modal = true ); + K3bDvdCopyDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); ~K3bDvdCopyDialog(); void setReadingDevice( K3bDevice::Device* ); @@ -65,14 +66,14 @@ class K3bDvdCopyDialog : public K3bInteractionDialog K3bWriterSelectionWidget* m_writerSelectionWidget; K3bTempDirSelectionWidget* m_tempDirSelectionWidget; K3bMediaSelectionComboBox* m_comboSourceDevice; - QCheckBox* m_checkSimulate; - QCheckBox* m_checkDeleteImages; - QCheckBox* m_checkOnlyCreateImage; - QCheckBox* m_checkCacheImage; - QCheckBox* m_checkVerifyData; - QSpinBox* m_spinCopies; - QSpinBox* m_spinRetries; - QCheckBox* m_checkIgnoreReadErrors; + TQCheckBox* m_checkSimulate; + TQCheckBox* m_checkDeleteImages; + TQCheckBox* m_checkOnlyCreateImage; + TQCheckBox* m_checkCacheImage; + TQCheckBox* m_checkVerifyData; + TQSpinBox* m_spinCopies; + TQSpinBox* m_spinRetries; + TQCheckBox* m_checkIgnoreReadErrors; K3bWritingModeWidget* m_writingModeWidget; }; diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index d84c4fc..5289089 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -29,25 +29,25 @@ #include <kconfig.h> #include <kapplication.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qframe.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> -K3bDvdFormattingDialog::K3bDvdFormattingDialog( QWidget* parent, const char* name, bool modal ) - : K3bInteractionDialog( parent, name, +K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* tqparent, const char* name, bool modal ) + : K3bInteractionDialog( tqparent, name, i18n("DVD Formatting"), - i18n("DVD%1RW").arg("±"), + i18n("DVD%1RW").tqarg("�"), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "DVD Formatting", // config group modal ) { - QWidget* frame = mainWidget(); + TQWidget* frame = mainWidget(); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); m_writerSelectionWidget->setWantedMediumType( K3bDevice::MEDIA_REWRITABLE_DVD ); @@ -58,20 +58,20 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( QWidget* parent, const char* nam m_writerSelectionWidget->setSupportedWritingApps( K3b::DVD_RW_FORMAT ); m_writerSelectionWidget->setForceAutoSpeed(true); - QGroupBox* groupWritingMode = new QGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), frame ); - groupWritingMode->layout()->setMargin( marginHint() ); - groupWritingMode->layout()->setSpacing( spacingHint() ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), frame ); + groupWritingMode->tqlayout()->setMargin( marginHint() ); + groupWritingMode->tqlayout()->setSpacing( spacingHint() ); m_writingModeWidget = new K3bWritingModeWidget( K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR, groupWritingMode ); - QGroupBox* groupOptions = new QGroupBox( 2, Qt::Vertical, i18n("Settings"), frame ); - groupOptions->layout()->setMargin( marginHint() ); - groupOptions->layout()->setSpacing( spacingHint() ); - m_checkForce = new QCheckBox( i18n("Force"), groupOptions ); - m_checkQuickFormat = new QCheckBox( i18n("Quick format"), groupOptions ); + TQGroupBox* groupOptions = new TQGroupBox( 2, Qt::Vertical, i18n("Settings"), frame ); + groupOptions->tqlayout()->setMargin( marginHint() ); + groupOptions->tqlayout()->setSpacing( spacingHint() ); + m_checkForce = new TQCheckBox( i18n("Force"), groupOptions ); + m_checkQuickFormat = new TQCheckBox( i18n("Quick format"), groupOptions ); - QGridLayout* grid = new QGridLayout( frame ); + TQGridLayout* grid = new TQGridLayout( frame ); grid->setMargin( 0 ); grid->setSpacing( spacingHint() ); @@ -81,8 +81,8 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( QWidget* parent, const char* nam grid->setRowStretch( 1, 1 ); - QToolTip::add( m_checkForce, i18n("Force formatting of empty DVDs") ); - QWhatsThis::add( m_checkForce, i18n("<p>If this option is checked K3b will format a " + TQToolTip::add( m_checkForce, i18n("Force formatting of empty DVDs") ); + TQWhatsThis::add( m_checkForce, i18n("<p>If this option is checked K3b will format a " "DVD-RW even if it is empty. It may also be used to " "force K3b to format a DVD+RW or a DVD-RW in restricted " "overwrite mode." @@ -92,16 +92,16 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( QWidget* parent, const char* nam "just needs to be overwritten. The same applies to DVD-RW in " "restricted overwrite mode.") ); - QToolTip::add( m_checkQuickFormat, i18n("Try to perform quick formatting") ); - QWhatsThis::add( m_checkQuickFormat, i18n("<p>If this option is checked K3b will tell the writer " + TQToolTip::add( m_checkQuickFormat, i18n("Try to perform quick formatting") ); + TQWhatsThis::add( m_checkQuickFormat, i18n("<p>If this option is checked K3b will tell the writer " "to perform a quick format." "<p>Formatting a DVD-RW completely can take a very long " "time and some DVD writers perform a full format even if " "quick format is enabled." ) ); - connect( m_writerSelectionWidget, SIGNAL(writerChanged()), this, SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQT_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); slotWriterChanged(); } @@ -128,7 +128,7 @@ void K3bDvdFormattingDialog::slotStartClicked() K3bJobProgressDialog d( kapp->mainWidget(), "formattingProgress", false ); - K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, this ); + K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, TQT_TQOBJECT(this) ); job->setDevice( m_writerSelectionWidget->writerDevice() ); job->setMode( m_writingModeWidget->writingMode() ); job->setForce( m_checkForce->isChecked() ); diff --git a/src/misc/k3bdvdformattingdialog.h b/src/misc/k3bdvdformattingdialog.h index 1314ae1..e5d306c 100644 --- a/src/misc/k3bdvdformattingdialog.h +++ b/src/misc/k3bdvdformattingdialog.h @@ -19,7 +19,7 @@ #include <k3binteractiondialog.h> -class QCheckBox; +class TQCheckBox; class K3bWritingModeWidget; class K3bWriterSelectionWidget; namespace K3bDevice { @@ -29,9 +29,10 @@ namespace K3bDevice { class K3bDvdFormattingDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bDvdFormattingDialog( QWidget* = 0, const char* = 0, bool modal = true ); + K3bDvdFormattingDialog( TQWidget* = 0, const char* = 0, bool modal = true ); ~K3bDvdFormattingDialog(); public slots: @@ -48,8 +49,8 @@ class K3bDvdFormattingDialog : public K3bInteractionDialog K3bWriterSelectionWidget* m_writerSelectionWidget; K3bWritingModeWidget* m_writingModeWidget; - QCheckBox* m_checkForce; - QCheckBox* m_checkQuickFormat; + TQCheckBox* m_checkForce; + TQCheckBox* m_checkQuickFormat; }; #endif diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 1832ee5..2c9a2c8 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -47,22 +47,22 @@ #include <kurldrag.h> #include <klineedit.h> -#include <qheader.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qspinbox.h> -#include <qevent.h> -#include <qpopupmenu.h> -#include <qclipboard.h> +#include <tqheader.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqspinbox.h> +#include <tqevent.h> +#include <tqpopupmenu.h> +#include <tqclipboard.h> class K3bIsoImageWritingDialog::Private @@ -76,15 +76,15 @@ public: K3bListViewItem* md5SumItem; bool haveMd5Sum; - QString lastCheckedFile; + TQString lastCheckedFile; bool isIsoImage; bool imageForced; }; -K3bIsoImageWritingDialog::K3bIsoImageWritingDialog( QWidget* parent, const char* name, bool modal ) - : K3bInteractionDialog( parent, name, +K3bIsoImageWritingDialog::K3bIsoImageWritingDialog( TQWidget* tqparent, const char* name, bool modal ) + : K3bInteractionDialog( tqparent, name, i18n("Burn Iso9660 Image"), i18n("to DVD"), START_BUTTON|CANCEL_BUTTON, @@ -102,24 +102,24 @@ K3bIsoImageWritingDialog::K3bIsoImageWritingDialog( QWidget* parent, const char* m_writerSelectionWidget->setSupportedWritingApps( K3b::GROWISOFS ); m_writingModeWidget->setSupportedModes( K3b::DAO|K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR ); - m_md5Job = new K3bMd5Job( 0, this ); - connect( m_md5Job, SIGNAL(finished(bool)), - this, SLOT(slotMd5JobFinished(bool)) ); - connect( m_md5Job, SIGNAL(percent(int)), - this, SLOT(slotMd5JobPercent(int)) ); + m_md5Job = new K3bMd5Job( 0, TQT_TQOBJECT(this) ); + connect( m_md5Job, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotMd5JobFinished(bool)) ); + connect( m_md5Job, TQT_SIGNAL(percent(int)), + this, TQT_SLOT(slotMd5JobPercent(int)) ); updateImageSize( imagePath() ); - connect( m_writerSelectionWidget, SIGNAL(writerChanged()), - this, SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), - this, SLOT(slotWriterChanged()) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), - this, SLOT(slotWriterChanged()) ); - connect( m_editImagePath, SIGNAL(textChanged(const QString&)), - this, SLOT(updateImageSize(const QString&)) ); - connect( m_checkDummy, SIGNAL(toggled(bool)), - this, SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), + this, TQT_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), + this, TQT_SLOT(slotWriterChanged()) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), + this, TQT_SLOT(slotWriterChanged()) ); + connect( m_editImagePath, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(updateImageSize(const TQString&)) ); + connect( m_checkDummy, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotWriterChanged()) ); } @@ -136,8 +136,8 @@ void K3bIsoImageWritingDialog::init() // last written image because that's what most users want KConfig* c = k3bcore->config(); c->setGroup( configGroup() ); - QString image = c->readPathEntry( "last written image" ); - if( QFile::exists( image ) ) + TQString image = c->readPathEntry( "last written image" ); + if( TQFile::exists( image ) ) m_editImagePath->setURL( image ); } } @@ -145,18 +145,18 @@ void K3bIsoImageWritingDialog::init() void K3bIsoImageWritingDialog::setupGui() { - QWidget* frame = mainWidget(); + TQWidget* frame = mainWidget(); // image // ----------------------------------------------------------------------- - QGroupBox* groupImageUrl = new QGroupBox( 1, Qt::Horizontal, i18n("Image to Burn"), frame ); + TQGroupBox* groupImageUrl = new TQGroupBox( 1, Qt::Horizontal, i18n("Image to Burn"), frame ); m_editImagePath = new KURLRequester( groupImageUrl ); m_editImagePath->setMode( KFile::File|KFile::ExistingOnly ); m_editImagePath->setCaption( i18n("Choose Image File") ); m_editImagePath->setFilter( i18n("*.iso *.ISO|ISO9660 Image Files") + "\n" + i18n("*|All Files") ); - connect( m_editImagePath->lineEdit(), SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotWriterChanged() ) ); + connect( m_editImagePath->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotWriterChanged() ) ); // image info // ----------------------------------------------------------------------- @@ -166,43 +166,43 @@ void K3bIsoImageWritingDialog::setupGui() m_infoView->header()->hide(); m_infoView->setNoItemText( i18n("No image file selected") ); m_infoView->setSorting( -1 ); - m_infoView->setAlternateBackground( QColor() ); + m_infoView->setAlternateBackground( TQColor() ); m_infoView->setFullWidth(true); - m_infoView->setSelectionMode( QListView::NoSelection ); + m_infoView->setSelectionMode( TQListView::NoSelection ); - connect( m_infoView, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + connect( m_infoView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); // options // ----------------------------------------------------------------------- - QTabWidget* optionTabbed = new QTabWidget( frame ); + TQTabWidget* optionTabbed = new TQTabWidget( frame ); - QWidget* optionTab = new QWidget( optionTabbed ); - QGridLayout* optionTabLayout = new QGridLayout( optionTab ); - optionTabLayout->setAlignment( Qt::AlignTop ); + TQWidget* optionTab = new TQWidget( optionTabbed ); + TQGridLayout* optionTabLayout = new TQGridLayout( optionTab ); + optionTabLayout->tqsetAlignment( TQt::AlignTop ); optionTabLayout->setSpacing( spacingHint() ); optionTabLayout->setMargin( marginHint() ); - QGroupBox* writingModeGroup = new QGroupBox( 1, Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* writingModeGroup = new TQGroupBox( 1,Qt::Vertical, i18n("Writing Mode"), optionTab ); writingModeGroup->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( writingModeGroup ); // copies -------- - QGroupBox* groupCopies = new QGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); - QLabel* pixLabel = new QLabel( groupCopies ); + TQLabel* pixLabel = new TQLabel( groupCopies ); pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) ); pixLabel->setScaledContents( false ); - m_spinCopies = new QSpinBox( groupCopies ); + m_spinCopies = new TQSpinBox( groupCopies ); m_spinCopies->setMinValue( 1 ); m_spinCopies->setMaxValue( 999 ); // -------- copies - QGroupBox* optionGroup = new QGroupBox( 3, Vertical, i18n("Settings"), optionTab ); + TQGroupBox* optionGroup = new TQGroupBox( 3,Qt::Vertical, i18n("Settings"), optionTab ); optionGroup->setInsideMargin( marginHint() ); optionGroup->setInsideSpacing( spacingHint() ); m_checkDummy = K3bStdGuiItems::simulateCheckbox( optionGroup ); @@ -218,7 +218,7 @@ void K3bIsoImageWritingDialog::setupGui() optionTabbed->addTab( optionTab, i18n("Settings") ); - QGridLayout* grid = new QGridLayout( frame ); + TQGridLayout* grid = new TQGridLayout( frame ); grid->setSpacing( spacingHint() ); grid->setMargin( 0 ); @@ -296,7 +296,7 @@ void K3bIsoImageWritingDialog::slotStartClicked() } -void K3bIsoImageWritingDialog::updateImageSize( const QString& path ) +void K3bIsoImageWritingDialog::updateImageSize( const TQString& path ) { m_md5Job->cancel(); m_infoView->clear(); @@ -304,7 +304,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const QString& path ) d->haveMd5Sum = false; d->isIsoImage = false; - QFileInfo info( path ); + TQFileInfo info( path ); if( info.isFile() ) { KIO::filesize_t imageSize = K3b::filesize( KURL::fromPathOrURL(path) ); @@ -319,59 +319,59 @@ void K3bIsoImageWritingDialog::updateImageSize( const QString& path ) K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Iso9660 image") ); - isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); + isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), KIO::convertSize( imageSize ) ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("System Id:"), isoF.primaryDescriptor().systemId.isEmpty() - ? QString("-") + ? TQString("-") : isoF.primaryDescriptor().systemId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Volume Id:"), isoF.primaryDescriptor().volumeId.isEmpty() - ? QString("-") + ? TQString("-") : isoF.primaryDescriptor().volumeId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Volume Set Id:"), isoF.primaryDescriptor().volumeSetId.isEmpty() - ? QString("-") + ? TQString("-") : isoF.primaryDescriptor().volumeSetId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Publisher Id:"), isoF.primaryDescriptor().publisherId.isEmpty() - ? QString("-") + ? TQString("-") : isoF.primaryDescriptor().publisherId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Preparer Id:"), isoF.primaryDescriptor().preparerId.isEmpty() - ? QString("-") : isoF.primaryDescriptor().preparerId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + ? TQString("-") : isoF.primaryDescriptor().preparerId ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Application Id:"), isoF.primaryDescriptor().applicationId.isEmpty() - ? QString("-") + ? TQString("-") : isoF.primaryDescriptor().applicationId ); - item->setForegroundColor( 0, palette().disabled().foreground() ); + item->setForegroundColor( 0, tqpalette().disabled().foreground() ); isoRootItem->setOpen( true ); @@ -380,7 +380,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const QString& path ) else { K3bListViewItem* item = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Not an Iso9660 image") ); - item->setForegroundColor( 0, Qt::red ); + item->setForegroundColor( 0, TQt::red ); item->setPixmap( 0, SmallIcon( "stop") ); } @@ -433,7 +433,7 @@ void K3bIsoImageWritingDialog::setImage( const KURL& url ) } -void K3bIsoImageWritingDialog::calculateMd5Sum( const QString& file ) +void K3bIsoImageWritingDialog::calculateMd5Sum( const TQString& file ) { d->haveMd5Sum = false; @@ -441,7 +441,7 @@ void K3bIsoImageWritingDialog::calculateMd5Sum( const QString& file ) d->md5SumItem = new K3bListViewItem( m_infoView, m_infoView->firstChild() ); d->md5SumItem->setText( 0, i18n("Md5 Sum:") ); - d->md5SumItem->setForegroundColor( 0, palette().disabled().foreground() ); + d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); d->md5SumItem->setProgress( 1, 0 ); d->md5SumItem->setPixmap( 0, SmallIcon( "exec") ); @@ -468,7 +468,7 @@ void K3bIsoImageWritingDialog::slotMd5JobFinished( bool success ) d->haveMd5Sum = true; } else { - d->md5SumItem->setForegroundColor( 1, Qt::red ); + d->md5SumItem->setForegroundColor( 1, TQt::red ); if( m_md5Job->hasBeenCanceled() ) d->md5SumItem->setText( 1, i18n("Calculation cancelled") ); else @@ -481,12 +481,12 @@ void K3bIsoImageWritingDialog::slotMd5JobFinished( bool success ) } -void K3bIsoImageWritingDialog::slotContextMenu( KListView*, QListViewItem*, const QPoint& pos ) +void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ) { if( !d->haveMd5Sum ) return; - QPopupMenu popup; + TQPopupMenu popup; int copyItem = popup.insertItem( i18n("Copy checksum to clipboard") ); int compareItem = popup.insertItem( i18n("Compare checksum...") ); @@ -494,22 +494,22 @@ void K3bIsoImageWritingDialog::slotContextMenu( KListView*, QListViewItem*, cons if( r == compareItem ) { bool ok; - QString md5sumToCompare = KInputDialog::getText( i18n("MD5 Sum Check"), + TQString md5sumToCompare = KInputDialog::getText( i18n("MD5 Sum Check"), i18n("Please insert the MD5 Sum to compare:"), - QString::null, + TQString(), &ok, this ); if( ok ) { if( md5sumToCompare.lower().utf8() == m_md5Job->hexDigest().lower() ) - KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").arg(imagePath()), + KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").tqarg(imagePath()), i18n("MD5 Sums Equal") ); else - KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").arg(imagePath()), + KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").tqarg(imagePath()), i18n("MD5 Sums Differ") ); } } else if( r == copyItem ) { - QApplication::clipboard()->setText( m_md5Job->hexDigest().lower(), QClipboard::Clipboard ); + TQApplication::tqclipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard ); } } @@ -524,8 +524,8 @@ void K3bIsoImageWritingDialog::loadUserDefaults( KConfigBase* c ) m_writerSelectionWidget->loadConfig( c ); if( !d->imageForced ) { - QString image = c->readPathEntry( "image path", c->readPathEntry( "last written image" ) ); - if( QFile::exists( image ) ) + TQString image = c->readPathEntry( "image path", c->readPathEntry( "last written image" ) ); + if( TQFile::exists( image ) ) m_editImagePath->setURL( image ); } } @@ -554,19 +554,19 @@ void K3bIsoImageWritingDialog::loadK3bDefaults() } -QString K3bIsoImageWritingDialog::imagePath() const +TQString K3bIsoImageWritingDialog::imagePath() const { return K3b::convertToLocalUrl( KURL::fromPathOrURL( m_editImagePath->url() ) ).path(); } -void K3bIsoImageWritingDialog::dragEnterEvent( QDragEnterEvent* e ) +void K3bIsoImageWritingDialog::dragEnterEvent( TQDragEnterEvent* e ) { e->accept( KURLDrag::canDecode(e) ); } -void K3bIsoImageWritingDialog::dropEvent( QDropEvent* e ) +void K3bIsoImageWritingDialog::dropEvent( TQDropEvent* e ) { KURL::List urls; KURLDrag::decode( e, urls ); diff --git a/src/misc/k3bisoimagewritingdialog.h b/src/misc/k3bisoimagewritingdialog.h index caf0f4f..bf629ad 100644 --- a/src/misc/k3bisoimagewritingdialog.h +++ b/src/misc/k3bisoimagewritingdialog.h @@ -20,20 +20,20 @@ #include <k3binteractiondialog.h> -class QCheckBox; +class TQCheckBox; class K3bWriterSelectionWidget; -class QLabel; +class TQLabel; class KURL; class K3bMd5Job; class K3bWritingModeWidget; class KURLRequester; class K3bListView; -class QSpinBox; -class QDragEnterEvent; -class QDropEvent; +class TQSpinBox; +class TQDragEnterEvent; +class TQDropEvent; class KListView; -class QListViewItem; -class QPoint; +class TQListViewItem; +class TQPoint; /** @@ -42,42 +42,43 @@ class QPoint; class K3bIsoImageWritingDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bIsoImageWritingDialog( QWidget* = 0, const char* = 0, bool = true ); + K3bIsoImageWritingDialog( TQWidget* = 0, const char* = 0, bool = true ); ~K3bIsoImageWritingDialog(); void setImage( const KURL& url ); protected slots: void slotStartClicked(); - void updateImageSize( const QString& ); + void updateImageSize( const TQString& ); void slotWriterChanged(); void slotMd5JobPercent( int ); void slotMd5JobFinished( bool ); - void slotContextMenu( KListView*, QListViewItem*, const QPoint& pos ); + void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ); protected: void loadUserDefaults( KConfigBase* ); void saveUserDefaults( KConfigBase* ); void loadK3bDefaults(); - void calculateMd5Sum( const QString& ); - void dragEnterEvent( QDragEnterEvent* ); - void dropEvent( QDropEvent* ); + void calculateMd5Sum( const TQString& ); + void dragEnterEvent( TQDragEnterEvent* ); + void dropEvent( TQDropEvent* ); void init(); private: void setupGui(); - QString imagePath() const; + TQString imagePath() const; K3bMd5Job* m_md5Job; K3bWriterSelectionWidget* m_writerSelectionWidget; - QCheckBox* m_checkDummy; - QCheckBox* m_checkVerify; - QSpinBox* m_spinCopies; + TQCheckBox* m_checkDummy; + TQCheckBox* m_checkVerify; + TQSpinBox* m_spinCopies; K3bWritingModeWidget* m_writingModeWidget; KURLRequester* m_editImagePath; diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui index f46e970..cf2257c 100644 --- a/src/option/base_k3bcddboptiontab.ui +++ b/src/option/base_k3bcddboptiontab.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bCddbOptionTab</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bCddbOptionTab</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_mainTabbed</cstring> </property> @@ -38,7 +38,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -49,7 +49,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_checkUseLocalCddb</cstring> </property> @@ -57,7 +57,7 @@ <string>Use local CDDB directory</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_checkSaveLocalEntries</cstring> </property> @@ -68,7 +68,7 @@ <string>Save entries in local directory (the first directory in the list)</string> </property> </widget> - <widget class="QFrame" row="2" column="0"> + <widget class="TQFrame" row="2" column="0"> <property name="name"> <cstring>m_boxLocalDirectory</cstring> </property> @@ -94,7 +94,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -121,7 +121,7 @@ <bool>true</bool> </property> </widget> - <widget class="QToolButton" row="3" column="2"> + <widget class="TQToolButton" row="3" column="2"> <property name="name"> <cstring>m_buttonLocalDirDown</cstring> </property> @@ -135,7 +135,7 @@ <string>Move directory down</string> </property> </widget> - <widget class="QToolButton" row="0" column="2"> + <widget class="TQToolButton" row="0" column="2"> <property name="name"> <cstring>m_buttonAddLocalDir</cstring> </property> @@ -157,7 +157,7 @@ <string></string> </property> </widget> - <widget class="QToolButton" row="1" column="2"> + <widget class="TQToolButton" row="1" column="2"> <property name="name"> <cstring>m_buttonRemoveLocalDir</cstring> </property> @@ -171,7 +171,7 @@ <string>Remove directory</string> </property> </widget> - <widget class="QToolButton" row="2" column="2"> + <widget class="TQToolButton" row="2" column="2"> <property name="name"> <cstring>m_buttonLocalDirUp</cstring> </property> @@ -195,7 +195,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> @@ -206,7 +206,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -217,7 +217,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="1" column="0"> + <widget class="TQFrame" row="1" column="0"> <property name="name"> <cstring>m_boxCddbServer</cstring> </property> @@ -243,7 +243,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -251,7 +251,7 @@ <string>Server:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>m_comboCddbType</cstring> </property> @@ -328,7 +328,7 @@ <string>Port </string> </property> </widget> - <widget class="QToolButton" row="0" column="4"> + <widget class="TQToolButton" row="0" column="4"> <property name="name"> <cstring>m_buttonAddCddbServer</cstring> </property> @@ -342,7 +342,7 @@ <string>Add server</string> </property> </widget> - <widget class="QToolButton" row="1" column="4"> + <widget class="TQToolButton" row="1" column="4"> <property name="name"> <cstring>m_buttonRemoveCddbServer</cstring> </property> @@ -356,7 +356,7 @@ <string>Remove server</string> </property> </widget> - <widget class="QToolButton" row="2" column="4"> + <widget class="TQToolButton" row="2" column="4"> <property name="name"> <cstring>m_buttonCddbServerUp</cstring> </property> @@ -370,7 +370,7 @@ <string>Move server up</string> </property> </widget> - <widget class="QToolButton" row="3" column="4"> + <widget class="TQToolButton" row="3" column="4"> <property name="name"> <cstring>m_buttonCddbServerDown</cstring> </property> @@ -394,7 +394,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -403,7 +403,7 @@ </spacer> </grid> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_checkRemoteCddb</cstring> </property> @@ -413,7 +413,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -424,7 +424,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupCgi</cstring> </property> @@ -460,7 +460,7 @@ <string>~/cddb/cddb.cgi</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -471,7 +471,7 @@ <string>Path:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_checkManualCgiPath</cstring> </property> @@ -491,7 +491,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>151</height> @@ -551,7 +551,7 @@ <tabstop>m_checkManualCgiPath</tabstop> <tabstop>m_editManualCgiPath</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistview.h</includehint> diff --git a/src/option/base_k3bmiscoptiontab.ui b/src/option/base_k3bmiscoptiontab.ui index 364e91f..4c20c88 100644 --- a/src/option/base_k3bmiscoptiontab.ui +++ b/src/option/base_k3bmiscoptiontab.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bMiscOptionTab</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bMiscOptionTab</cstring> </property> @@ -11,7 +11,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkSaveOnExit</cstring> </property> @@ -33,15 +33,15 @@ <string>Ask to save modified projects on exit</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -65,7 +65,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -76,7 +76,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkSystemConfig</cstring> </property> @@ -90,15 +90,15 @@ <string><p>If this option is checked K3b will check the system configuration for any problems on startup and when the the user changes the settings.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -111,7 +111,7 @@ <cstring>m_comboAudioOutputSystem</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonConfigureAudioOutput</cstring> </property> @@ -123,7 +123,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -134,7 +134,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkShowProgressOSD</cstring> </property> @@ -145,7 +145,7 @@ <string><p>If this option is checked K3b will display the progress in an OSD which always stays on top of all other windows.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkHideMainWindowWhileWriting</cstring> </property> @@ -159,7 +159,7 @@ <string><p>If this option is checked K3b will hide the main window while displaying the progress dialog.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkShowSplash</cstring> </property> @@ -170,7 +170,7 @@ <string>Show the splash screen when K3b starts</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkKonqiIntegration</cstring> </property> @@ -186,7 +186,7 @@ <p><em>Konqueror integration is not enabled by default to prevent unwanted cluttering of the Konqueror menus.</em></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkKeepDialogsOpen</cstring> </property> @@ -200,15 +200,15 @@ <string><p>If this option is checked K3b will not close action dialogs such as the CD Copy dialog after the process has been finished. It will be kept open to start a new process like copying another CD.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -241,7 +241,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>0</height> @@ -273,7 +273,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/option/base_k3bpluginoptiontab.ui b/src/option/base_k3bpluginoptiontab.ui index 18321ee..2e7a2dd 100644 --- a/src/option/base_k3bpluginoptiontab.ui +++ b/src/option/base_k3bpluginoptiontab.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>base_K3bPluginOptionTab</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>m_buttonConfigure</cstring> </property> @@ -38,7 +38,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>411</width> <height>21</height> @@ -50,7 +50,7 @@ <cstring>m_viewPlugins</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -83,7 +83,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>k3blistview.h</includehint> </includehints> diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui index 47a48b4..4809f6f 100644 --- a/src/option/base_k3bthemeoptiontab.ui +++ b/src/option/base_k3bthemeoptiontab.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bThemeOptionTab</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bThemeOptionTab</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -85,7 +85,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -96,9 +96,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -107,7 +107,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_leftPreviewLabel</cstring> </property> @@ -115,7 +115,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_centerPreviewLabel</cstring> </property> @@ -135,11 +135,11 @@ <property name="text"> <string>no Theme selected</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_rightPreviewLabel</cstring> </property> @@ -151,9 +151,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -172,14 +172,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>161</width> <height>2</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonInstallTheme</cstring> </property> @@ -187,7 +187,7 @@ <string>Install New Theme...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonRemoveTheme</cstring> </property> @@ -201,7 +201,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp index 21485cb..3238d41 100644 --- a/src/option/k3bburningoptiontab.cpp +++ b/src/option/k3bburningoptiontab.cpp @@ -19,18 +19,18 @@ #include <k3bstdguiitems.h> #include <k3bglobalsettings.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qtabwidget.h> -#include <qradiobutton.h> -#include <qvalidator.h> -#include <qbuttongroup.h> -#include <qspinbox.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqtabwidget.h> +#include <tqradiobutton.h> +#include <tqvalidator.h> +#include <tqbuttongroup.h> +#include <tqspinbox.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <knuminput.h> #include <kconfig.h> @@ -39,8 +39,8 @@ #include <klineedit.h> -K3bBurningOptionTab::K3bBurningOptionTab( QWidget* parent, const char* name ) - : QWidget( parent, name ) +K3bBurningOptionTab::K3bBurningOptionTab( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { setupGui(); } @@ -53,25 +53,25 @@ K3bBurningOptionTab::~K3bBurningOptionTab() void K3bBurningOptionTab::setupGui() { - QGridLayout* groupAdvancedLayout = new QGridLayout( this ); - groupAdvancedLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupAdvancedLayout = new TQGridLayout( this ); + groupAdvancedLayout->tqsetAlignment( TQt::AlignTop ); groupAdvancedLayout->setSpacing( KDialog::spacingHint() ); groupAdvancedLayout->setMargin( 0 ); - QGroupBox* groupWritingApp = new QGroupBox( 0, Qt::Vertical, i18n("Burning"), this ); - groupWritingApp->layout()->setMargin( 0 ); - QGridLayout* bufferLayout = new QGridLayout( groupWritingApp->layout() ); + TQGroupBox* groupWritingApp = new TQGroupBox( 0, Qt::Vertical, i18n("Burning"), this ); + groupWritingApp->tqlayout()->setMargin( 0 ); + TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->tqlayout() ); bufferLayout->setMargin( KDialog::marginHint() ); bufferLayout->setSpacing( KDialog::spacingHint() ); m_checkBurnfree = K3bStdGuiItems::burnproofCheckbox( groupWritingApp ); - m_checkOverburn = new QCheckBox( i18n("Allow overburning (¬ supported by cdrecord <= 1.10)"), groupWritingApp ); - m_checkForceUnsafeOperations = new QCheckBox( i18n("Force unsafe operations"), groupWritingApp ); - m_checkManualWritingBufferSize = new QCheckBox( i18n("&Manual writing buffer size") + ":", groupWritingApp ); + m_checkOverburn = new TQCheckBox( i18n("Allow overburning (¬ supported by cdrecord <= 1.10)"), groupWritingApp ); + m_checkForceUnsafeOperations = new TQCheckBox( i18n("Force unsafe operations"), groupWritingApp ); + m_checkManualWritingBufferSize = new TQCheckBox( i18n("&Manual writing buffer size") + ":", groupWritingApp ); m_editWritingBufferSize = new KIntNumInput( 4, groupWritingApp ); m_editWritingBufferSize->setSuffix( " " + i18n("MB") ); - m_checkAllowWritingAppSelection = new QCheckBox( i18n("Manual writing application &selection"), groupWritingApp ); + m_checkAllowWritingAppSelection = new TQCheckBox( i18n("Manual writing application &selection"), groupWritingApp ); bufferLayout->addMultiCellWidget( m_checkBurnfree, 0, 0, 0, 2 ); bufferLayout->addMultiCellWidget( m_checkOverburn, 1, 1, 0, 2 ); bufferLayout->addMultiCellWidget( m_checkForceUnsafeOperations, 2, 2, 0, 2 ); @@ -80,32 +80,32 @@ void K3bBurningOptionTab::setupGui() bufferLayout->addMultiCellWidget( m_checkAllowWritingAppSelection, 4, 4, 0, 2 ); bufferLayout->setColStretch( 2, 1 ); - QGroupBox* groupMisc = new QGroupBox( 2, Qt::Vertical, i18n("Miscellaneous"), this ); - m_checkEject = new QCheckBox( i18n("Do not &eject medium after write process"), groupMisc ); - m_checkAutoErasingRewritable = new QCheckBox( i18n("Automatically erase CD-RWs and DVD-RWs"), groupMisc ); + TQGroupBox* groupMisc = new TQGroupBox( 2, Qt::Vertical, i18n("Miscellaneous"), this ); + m_checkEject = new TQCheckBox( i18n("Do not &eject medium after write process"), groupMisc ); + m_checkAutoErasingRewritable = new TQCheckBox( i18n("Automatically erase CD-RWs and DVD-RWs"), groupMisc ); groupAdvancedLayout->addWidget( groupWritingApp, 0, 0 ); groupAdvancedLayout->addWidget( groupMisc, 1, 0 ); groupAdvancedLayout->setRowStretch( 2, 1 ); - connect( m_checkManualWritingBufferSize, SIGNAL(toggled(bool)), - m_editWritingBufferSize, SLOT(setEnabled(bool)) ); - connect( m_checkManualWritingBufferSize, SIGNAL(toggled(bool)), - this, SLOT(slotSetDefaultBufferSizes(bool)) ); + connect( m_checkManualWritingBufferSize, TQT_SIGNAL(toggled(bool)), + m_editWritingBufferSize, TQT_SLOT(setEnabled(bool)) ); + connect( m_checkManualWritingBufferSize, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotSetDefaultBufferSizes(bool)) ); m_editWritingBufferSize->setDisabled( true ); // ----------------------------------------------------------------------- - QToolTip::add( m_checkOverburn, i18n("Allow burning more than the official media capacity") ); - QToolTip::add( m_checkAllowWritingAppSelection, i18n("Allow to choose between cdrecord and cdrdao") ); - QToolTip::add( m_checkAutoErasingRewritable, i18n("Automatically erase CD-RWs and DVD-RWs without asking") ); - QToolTip::add( m_checkEject, i18n("Do not eject the burn medium after a completed burn process") ); - QToolTip::add( m_checkForceUnsafeOperations, i18n("Force K3b to continue some operations otherwise deemed as unsafe") ); + TQToolTip::add( m_checkOverburn, i18n("Allow burning more than the official media capacity") ); + TQToolTip::add( m_checkAllowWritingAppSelection, i18n("Allow to choose between cdrecord and cdrdao") ); + TQToolTip::add( m_checkAutoErasingRewritable, i18n("Automatically erase CD-RWs and DVD-RWs without asking") ); + TQToolTip::add( m_checkEject, i18n("Do not eject the burn medium after a completed burn process") ); + TQToolTip::add( m_checkForceUnsafeOperations, i18n("Force K3b to continue some operations otherwise deemed as unsafe") ); - QWhatsThis::add( m_checkAllowWritingAppSelection, i18n("<p>If this option is checked K3b gives " + TQWhatsThis::add( m_checkAllowWritingAppSelection, i18n("<p>If this option is checked K3b gives " "the possibility to choose between cdrecord " "and cdrdao when writing a cd." "<p>This may be useful if one of the programs " @@ -113,7 +113,7 @@ void K3bBurningOptionTab::setupGui() "<p><b>Be aware that K3b does not support both " "programs in all project types.</b>") ); - QWhatsThis::add( m_checkOverburn, i18n("<p>Each medium has an official maximum capacity which is stored in a read-only " + TQWhatsThis::add( m_checkOverburn, i18n("<p>Each medium has an official maximum capacity which is stored in a read-only " "area of the medium and is guaranteed by the vendor. However, this official " "maximum is not always the actual maximum. Many media have an " "actual total capacity that is slightly larger than the official amount." @@ -124,23 +124,23 @@ void K3bBurningOptionTab::setupGui() "makes sense to first determine the actual maximum capacity of the media brand " "with a simulated burn.") ); - QWhatsThis::add( m_checkAutoErasingRewritable, i18n("<p>If this option is checked K3b will automatically " + TQWhatsThis::add( m_checkAutoErasingRewritable, i18n("<p>If this option is checked K3b will automatically " "erase CD-RWs and format DVD-RWs if one is found instead " "of an empty media before writing.") ); - QWhatsThis::add( m_checkManualWritingBufferSize, i18n("<p>K3b uses a software buffer during the burning process to " + TQWhatsThis::add( m_checkManualWritingBufferSize, i18n("<p>K3b uses a software buffer during the burning process to " "avoid gaps in the data stream due to high system load. The default " "sizes used are %1 MB for CD and %2 MB for DVD burning." "<p>If this option is checked the value specified will be used for both " - "CD and DVD burning.").arg(4).arg(32) ); + "CD and DVD burning.").tqarg(4).tqarg(32) ); - QWhatsThis::add( m_checkEject, i18n("<p>If this option is checked K3b will not eject the medium once the burn process " + TQWhatsThis::add( m_checkEject, i18n("<p>If this option is checked K3b will not eject the medium once the burn process " "finishes. This can be helpful in case one leaves the computer after starting the " "burning and does not want the tray to be open all the time." "<p>However, on Linux systems a freshly burned medium has to be reloaded. Otherwise " "the system will not detect the changes and still treat it as an empty medium.") ); - QWhatsThis::add( m_checkForceUnsafeOperations, i18n("<p>If this option is checked K3b will continue in some situations " + TQWhatsThis::add( m_checkForceUnsafeOperations, i18n("<p>If this option is checked K3b will continue in some situations " "which would otherwise be deemed as unsafe." "<p>This setting for example disables the check for medium speed " "verification. Thus, one can force K3b to burn a high speed medium on " diff --git a/src/option/k3bburningoptiontab.h b/src/option/k3bburningoptiontab.h index 8b71e06..b62274e 100644 --- a/src/option/k3bburningoptiontab.h +++ b/src/option/k3bburningoptiontab.h @@ -17,25 +17,26 @@ #ifndef K3B_BURNING_OPTION_TAB_H #define K3B_BURNING_OPTION_TAB_H -#include <qwidget.h> - -class QCheckBox; -class QLabel; -class QGroupBox; -class QComboBox; -class QString; -class QSpinBox; +#include <tqwidget.h> + +class TQCheckBox; +class TQLabel; +class TQGroupBox; +class TQComboBox; +class TQString; +class TQSpinBox; class KIntNumInput; -class QRadioButton; +class TQRadioButton; -class K3bBurningOptionTab : public QWidget +class K3bBurningOptionTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bBurningOptionTab( QWidget* parent = 0, const char* name = 0 ); + K3bBurningOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bBurningOptionTab(); void saveSettings(); @@ -47,14 +48,14 @@ Q_OBJECT private: void setupGui(); - QCheckBox* m_checkBurnfree; - QCheckBox* m_checkEject; - QCheckBox* m_checkAutoErasingRewritable; - QCheckBox* m_checkOverburn; - QCheckBox* m_checkManualWritingBufferSize; + TQCheckBox* m_checkBurnfree; + TQCheckBox* m_checkEject; + TQCheckBox* m_checkAutoErasingRewritable; + TQCheckBox* m_checkOverburn; + TQCheckBox* m_checkManualWritingBufferSize; KIntNumInput* m_editWritingBufferSize; - QCheckBox* m_checkAllowWritingAppSelection; - QCheckBox* m_checkForceUnsafeOperations; + TQCheckBox* m_checkAllowWritingAppSelection; + TQCheckBox* m_checkForceUnsafeOperations; }; diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 33b2349..1d2f10f 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -15,19 +15,19 @@ #include "k3bcddboptiontab.h" -#include <qvariant.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qtabwidget.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qstringlist.h> -#include <qcombobox.h> -#include <qtoolbutton.h> +#include <tqvariant.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqtabwidget.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqstringlist.h> +#include <tqcombobox.h> +#include <tqtoolbutton.h> #include <kdialog.h> #include <kiconloader.h> @@ -41,29 +41,29 @@ #include <kdeversion.h> -K3bCddbOptionTab::K3bCddbOptionTab( QWidget* parent, const char* name ) - : base_K3bCddbOptionTab( parent, name ) +K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* tqparent, const char* name ) + : base_K3bCddbOptionTab( tqparent, name ) { - // fix all the margins and spacings that have been corrupted by QDesigner ;-) + // fix all the margins and spacings that have been corrupted by TQDesigner ;-) // ----------------------------------------------------------------------------- base_K3bCddbOptionTabLayout->setMargin( 0 ); base_K3bCddbOptionTabLayout->setSpacing( KDialog::spacingHint() ); - m_mainTabbed->page(0)->layout()->setMargin( KDialog::marginHint() ); - m_mainTabbed->page(0)->layout()->setSpacing( KDialog::spacingHint() ); - m_mainTabbed->page(1)->layout()->setMargin( KDialog::marginHint() ); - m_mainTabbed->page(1)->layout()->setSpacing( KDialog::spacingHint() ); + m_mainTabbed->page(0)->tqlayout()->setMargin( KDialog::marginHint() ); + m_mainTabbed->page(0)->tqlayout()->setSpacing( KDialog::spacingHint() ); + m_mainTabbed->page(1)->tqlayout()->setMargin( KDialog::marginHint() ); + m_mainTabbed->page(1)->tqlayout()->setSpacing( KDialog::spacingHint() ); -// m_groupLocalDir->layout()->setMargin( 0 ); +// m_groupLocalDir->tqlayout()->setMargin( 0 ); // m_groupLocalDirLayout->setMargin( KDialog::marginHint() ); // m_groupLocalDirLayout->setSpacing( KDialog::spacingHint() ); -// m_groupCddbServer->layout()->setMargin( 0 ); +// m_groupCddbServer->tqlayout()->setMargin( 0 ); // m_groupCddbServerLayout->setMargin( KDialog::marginHint() ); // m_groupCddbServerLayout->setSpacing( KDialog::spacingHint() ); - m_groupCgi->layout()->setMargin( 0 ); + m_groupCgi->tqlayout()->setMargin( 0 ); m_groupCgiLayout->setMargin( KDialog::marginHint() ); m_groupCgiLayout->setSpacing( KDialog::spacingHint() ); @@ -99,24 +99,24 @@ K3bCddbOptionTab::K3bCddbOptionTab( QWidget* parent, const char* name ) // setup connections // ----------------------------------------------------------------------------- - connect( m_buttonAddLocalDir, SIGNAL(clicked()), this, SLOT(slotLocalDirAdd()) ); - connect( m_buttonRemoveLocalDir, SIGNAL(clicked()), this, SLOT(slotLocalDirRemove()) ); - connect( m_buttonLocalDirUp, SIGNAL(clicked()), this, SLOT(slotLocalDirUp()) ); - connect( m_buttonLocalDirDown, SIGNAL(clicked()), this, SLOT(slotLocalDirDown()) ); - - connect( m_buttonAddCddbServer, SIGNAL(clicked()), this, SLOT(slotCddbServerAdd()) ); - connect( m_buttonRemoveCddbServer, SIGNAL(clicked()), this, SLOT(slotCddbServerRemove()) ); - connect( m_buttonCddbServerUp, SIGNAL(clicked()), this, SLOT(slotCddbServerUp()) ); - connect( m_buttonCddbServerDown, SIGNAL(clicked()), this, SLOT(slotCddbServerDown()) ); - - connect( m_editLocalDir, SIGNAL(textChanged(const QString&)), this, SLOT(enDisableButtons()) ); - connect( m_editCddbServer, SIGNAL(textChanged(const QString&)), this, SLOT(enDisableButtons()) ); - connect( m_viewLocalDir, SIGNAL(selectionChanged()), this, SLOT(enDisableButtons()) ); - connect( m_viewCddbServer, SIGNAL(selectionChanged()), this, SLOT(enDisableButtons()) ); - connect( m_comboCddbType, SIGNAL(highlighted(int)), - this, SLOT(slotServerTypeChanged()) ); - connect( m_comboCddbType, SIGNAL(activated(int)), - this, SLOT(slotServerTypeChanged()) ); + connect( m_buttonAddLocalDir, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirAdd()) ); + connect( m_buttonRemoveLocalDir, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirRemove()) ); + connect( m_buttonLocalDirUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirUp()) ); + connect( m_buttonLocalDirDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirDown()) ); + + connect( m_buttonAddCddbServer, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerAdd()) ); + connect( m_buttonRemoveCddbServer, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerRemove()) ); + connect( m_buttonCddbServerUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerUp()) ); + connect( m_buttonCddbServerDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerDown()) ); + + connect( m_editLocalDir, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(enDisableButtons()) ); + connect( m_editCddbServer, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(enDisableButtons()) ); + connect( m_viewLocalDir, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(enDisableButtons()) ); + connect( m_viewCddbServer, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(enDisableButtons()) ); + connect( m_comboCddbType, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotServerTypeChanged()) ); + connect( m_comboCddbType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotServerTypeChanged()) ); // ----------------------------------------------------------------------------- enDisableButtons(); @@ -135,13 +135,13 @@ void K3bCddbOptionTab::readSettings() c->setGroup( "Cddb" ); // old config <= 0.7.3 - QStringList cddbpServer = c->readListEntry( "cddbp server" ); - QStringList httpServer = c->readListEntry( "http server" ); + TQStringList cddbpServer = c->readListEntry( "cddbp server" ); + TQStringList httpServer = c->readListEntry( "http server" ); // new config - QStringList cddbServer = c->readListEntry( "cddb server" ); + TQStringList cddbServer = c->readListEntry( "cddb server" ); - QStringList localCddbDirs = c->readPathListEntry( "local cddb dirs" ); + TQStringList localCddbDirs = c->readPathListEntry( "local cddb dirs" ); m_checkRemoteCddb->setChecked( c->readBoolEntry( "use remote cddb", true ) ); m_checkUseLocalCddb->setChecked( c->readBoolEntry( "use local cddb query", true ) ); @@ -152,18 +152,18 @@ void K3bCddbOptionTab::readSettings() if( localCddbDirs.isEmpty() ) localCddbDirs.append( "~/.cddb/" ); - for( QStringList::const_iterator it = localCddbDirs.begin(); it != localCddbDirs.end(); ++it ) + for( TQStringList::const_iterator it = localCddbDirs.begin(); it != localCddbDirs.end(); ++it ) (void)new KListViewItem( m_viewLocalDir, m_viewLocalDir->lastItem(), *it ); // old config <= 0.7.3 if( !httpServer.isEmpty() ) { - for( QStringList::iterator it = httpServer.begin(); it != httpServer.end(); ++it ) { + for( TQStringList::iterator it = httpServer.begin(); it != httpServer.end(); ++it ) { cddbServer.append( "Http " + *it ); } } if( !cddbpServer.isEmpty() ) { - for( QStringList::iterator it = cddbpServer.begin(); it != cddbpServer.end(); ++it ) { + for( TQStringList::iterator it = cddbpServer.begin(); it != cddbpServer.end(); ++it ) { cddbServer.append( "Cddbp " + *it ); } } @@ -171,15 +171,15 @@ void K3bCddbOptionTab::readSettings() if( cddbServer.isEmpty() ) cddbServer.append( "Http freedb2.org:80" ); - for( QStringList::const_iterator it = cddbServer.begin(); it != cddbServer.end(); ++it ) { - const QString& s = *it; - QStringList buf = QStringList::split( ":", s.mid( s.find(" ")+1 ) ); - QString server = buf[0]; + for( TQStringList::const_iterator it = cddbServer.begin(); it != cddbServer.end(); ++it ) { + const TQString& s = *it; + TQStringList buf = TQStringList::split( ":", s.mid( s.tqfind(" ")+1 ) ); + TQString server = buf[0]; int port = buf[1].toInt(); if( s.startsWith("Http") ) - (void)new KListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), "Http", server, QString::number(port) ); + (void)new KListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), "Http", server, TQString::number(port) ); else - (void)new KListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), "Cddbp", server, QString::number(port) ); + (void)new KListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), "Cddbp", server, TQString::number(port) ); } enDisableButtons(); @@ -198,16 +198,16 @@ void K3bCddbOptionTab::apply() c->writeEntry( "use manual cgi path", m_checkManualCgiPath->isChecked() ); c->writeEntry( "cgi path", m_editManualCgiPath->text() ); - QStringList cddbServer; - QStringList localCddbDirs; + TQStringList cddbServer; + TQStringList localCddbDirs; - QListViewItemIterator it( m_viewLocalDir ); + TQListViewItemIterator it( m_viewLocalDir ); while( it.current() ) { localCddbDirs.append( it.current()->text(0) ); ++it; } - QListViewItemIterator it1( m_viewCddbServer ); + TQListViewItemIterator it1( m_viewCddbServer ); while( it1.current() ) { cddbServer.append( it1.current()->text(0) + " " + it1.current()->text(1) + ":" + it1.current()->text(2) ); ++it1; @@ -229,8 +229,8 @@ void K3bCddbOptionTab::apply() void K3bCddbOptionTab::slotLocalDirAdd() { if( !m_editLocalDir->text().isEmpty() ) { - QString localDir( m_editLocalDir->text() ); - QListViewItemIterator it( m_viewLocalDir ); + TQString localDir( m_editLocalDir->text() ); + TQListViewItemIterator it( m_viewLocalDir ); while( it.current() ) { if ( it.current()->text(0) == localDir ) return; @@ -246,7 +246,7 @@ void K3bCddbOptionTab::slotLocalDirAdd() void K3bCddbOptionTab::slotLocalDirRemove() { - if( QListViewItem* item = m_viewLocalDir->selectedItem() ) + if( TQListViewItem* item = m_viewLocalDir->selectedItem() ) delete item; enDisableButtons(); @@ -259,7 +259,7 @@ void K3bCddbOptionTab::slotCddbServerAdd() (void)new KListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), m_comboCddbType->currentText(), m_editCddbServer->text(), - QString::number( m_editCddbPort->value() ) ); + TQString::number( m_editCddbPort->value() ) ); enDisableButtons(); } @@ -268,7 +268,7 @@ void K3bCddbOptionTab::slotCddbServerAdd() void K3bCddbOptionTab::slotCddbServerRemove() { - if( QListViewItem* item = m_viewCddbServer->selectedItem() ) + if( TQListViewItem* item = m_viewCddbServer->selectedItem() ) delete item; enDisableButtons(); @@ -306,7 +306,7 @@ void K3bCddbOptionTab::slotServerTypeChanged() void K3bCddbOptionTab::slotLocalDirDown() { - QListViewItem* sel = m_viewLocalDir->selectedItem(); + TQListViewItem* sel = m_viewLocalDir->selectedItem(); m_viewLocalDir->moveItem( sel, 0, sel->nextSibling() ); m_viewLocalDir->setSelected( sel, true ); } @@ -314,7 +314,7 @@ void K3bCddbOptionTab::slotLocalDirDown() void K3bCddbOptionTab::slotLocalDirUp() { - QListViewItem* sel = m_viewLocalDir->selectedItem(); + TQListViewItem* sel = m_viewLocalDir->selectedItem(); m_viewLocalDir->moveItem( sel, 0, sel->itemAbove()->itemAbove() ); m_viewLocalDir->setSelected( sel, true ); } @@ -322,7 +322,7 @@ void K3bCddbOptionTab::slotLocalDirUp() void K3bCddbOptionTab::slotCddbServerDown() { - QListViewItem* sel = m_viewCddbServer->selectedItem(); + TQListViewItem* sel = m_viewCddbServer->selectedItem(); m_viewCddbServer->moveItem( sel, 0, sel->nextSibling() ); m_viewCddbServer->setSelected( sel, true ); } @@ -330,7 +330,7 @@ void K3bCddbOptionTab::slotCddbServerDown() void K3bCddbOptionTab::slotCddbServerUp() { - QListViewItem* sel = m_viewCddbServer->selectedItem(); + TQListViewItem* sel = m_viewCddbServer->selectedItem(); m_viewCddbServer->moveItem( sel, 0, sel->itemAbove()->itemAbove() ); m_viewCddbServer->setSelected( sel, true ); } diff --git a/src/option/k3bcddboptiontab.h b/src/option/k3bcddboptiontab.h index bc89259..2633b0a 100644 --- a/src/option/k3bcddboptiontab.h +++ b/src/option/k3bcddboptiontab.h @@ -22,9 +22,10 @@ class K3bCddbOptionTab : public base_K3bCddbOptionTab { Q_OBJECT + TQ_OBJECT public: - K3bCddbOptionTab( QWidget* parent = 0, const char* name = 0 ); + K3bCddbOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bCddbOptionTab(); public slots: diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index 65607c6..8931fe7 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -19,11 +19,11 @@ #include <k3bglobals.h> #include <k3bcore.h> -#include <qlabel.h> -#include <qstring.h> -#include <qlayout.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqlabel.h> +#include <tqstring.h> +#include <tqlayout.h> +#include <tqcursor.h> +#include <tqapplication.h> #include <kapplication.h> #include <kdialog.h> @@ -32,18 +32,18 @@ #include <kstandarddirs.h> -K3bDeviceOptionTab::K3bDeviceOptionTab( QWidget* parent, const char* name ) - : QWidget( parent, name ) +K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { - QGridLayout* frameLayout = new QGridLayout( this ); + TQGridLayout* frameLayout = new TQGridLayout( this ); frameLayout->setSpacing( KDialog::spacingHint() ); frameLayout->setMargin( 0 ); // Info Label // ------------------------------------------------ - m_labelDevicesInfo = new QLabel( this, "m_labelDevicesInfo" ); - m_labelDevicesInfo->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter | QLabel::AlignLeft ) ); + m_labelDevicesInfo = new TQLabel( this, "m_labelDevicesInfo" ); + m_labelDevicesInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); m_labelDevicesInfo->setText( i18n( "K3b tries to detect all your devices properly. " "You can add devices that have not been detected and change " "the black values by clicking in the list. If K3b is unable " @@ -56,7 +56,7 @@ K3bDeviceOptionTab::K3bDeviceOptionTab( QWidget* parent, const char* name ) frameLayout->addWidget( m_labelDevicesInfo, 0, 0 ); frameLayout->addWidget( m_deviceWidget, 1, 0 ); - connect( m_deviceWidget, SIGNAL(refreshButtonClicked()), this, SLOT(slotRefreshButtonClicked()) ); + connect( m_deviceWidget, TQT_SIGNAL(refreshButtonClicked()), this, TQT_SLOT(slotRefreshButtonClicked()) ); } @@ -84,11 +84,11 @@ void K3bDeviceOptionTab::saveDevices() void K3bDeviceOptionTab::slotRefreshButtonClicked() { - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); k3bcore->deviceManager()->clear(); k3bcore->deviceManager()->scanBus(); m_deviceWidget->init(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } #include "k3bdeviceoptiontab.moc" diff --git a/src/option/k3bdeviceoptiontab.h b/src/option/k3bdeviceoptiontab.h index 492b421..7e900ba 100644 --- a/src/option/k3bdeviceoptiontab.h +++ b/src/option/k3bdeviceoptiontab.h @@ -17,18 +17,19 @@ #ifndef K3B_DEVICE_OPTIONTAB_H #define K3B_DEVICE_OPTIONTAB_H -#include <qwidget.h> +#include <tqwidget.h> -class QLabel; +class TQLabel; class K3bDeviceWidget; -class K3bDeviceOptionTab : public QWidget +class K3bDeviceOptionTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bDeviceOptionTab( QWidget*, const char* name = 0 ); + K3bDeviceOptionTab( TQWidget*, const char* name = 0 ); ~K3bDeviceOptionTab(); void readDevices(); @@ -38,7 +39,7 @@ Q_OBJECT void slotRefreshButtonClicked(); private: - QLabel* m_labelDevicesInfo; + TQLabel* m_labelDevicesInfo; K3bDeviceWidget* m_deviceWidget; }; diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index d7d1e36..2be5054 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -31,16 +31,16 @@ #include <kstandarddirs.h> #include <kio/global.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qheader.h> -#include <qstring.h> -#include <qcolor.h> -#include <qptrlist.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqheader.h> +#include <tqstring.h> +#include <tqcolor.h> +#include <tqptrlist.h> class K3bDeviceWidget::PrivateTempDevice @@ -54,7 +54,7 @@ public: } K3bDevice::Device* device; - QString cdrdaoDriver; + TQString cdrdaoDriver; bool cdTextCapable; bool writer; }; @@ -63,21 +63,21 @@ public: class K3bDeviceWidget::PrivateDeviceViewItem1 : public K3bListViewItem { public: - PrivateDeviceViewItem1( int type, PrivateTempDevice* dev, QListView* view, QListViewItem* after ) + PrivateDeviceViewItem1( int type, PrivateTempDevice* dev, TQListView* view, TQListViewItem* after ) : K3bListViewItem( view, after ), m_type(type) { this->dev = dev; init(); } - PrivateDeviceViewItem1( int type, PrivateTempDevice* dev, QListViewItem* item, QListViewItem* after ) + PrivateDeviceViewItem1( int type, PrivateTempDevice* dev, TQListViewItem* item, TQListViewItem* after ) : K3bListViewItem( item, after ), m_type(type) { this->dev = dev; init(); } - void setText(int col, const QString& text) { + void setText(int col, const TQString& text) { if( col == 1 ) { switch(m_type) { case t_cdrdaoDriver: @@ -91,7 +91,7 @@ public: } } - QString text( int col ) const { + TQString text( int col ) const { switch(m_type) { case t_cdrdaoDriver: return (col == 0 ? i18n("Cdrdao driver:") : dev->cdrdaoDriver ); @@ -114,8 +114,8 @@ public: private: void init() { - static QStringList l; - static QStringList l2; + static TQStringList l; + static TQStringList l2; switch(m_type) { case t_cdrdaoDriver: @@ -144,23 +144,23 @@ private: -K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, QWidget *parent, const char *name ) - : QWidget( parent, name ), m_deviceManager( manager ) +K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), m_deviceManager( manager ) { - QGridLayout* frameLayout = new QGridLayout( this ); + TQGridLayout* frameLayout = new TQGridLayout( this ); frameLayout->setSpacing( KDialog::spacingHint() ); frameLayout->setMargin( 0 ); // buttons // ------------------------------------------------ - QGridLayout* refreshButtonGrid = new QGridLayout; + TQGridLayout* refreshButtonGrid = new TQGridLayout; refreshButtonGrid->setSpacing( KDialog::spacingHint() ); refreshButtonGrid->setMargin(0); - m_buttonRefreshDevices = new QPushButton( i18n( "Refresh" ), this, "m_buttonRefreshDevices" ); - m_buttonAddDevice = new QPushButton( i18n( "Add Device..." ), this, "m_buttonAddDevice" ); - QToolTip::add( m_buttonRefreshDevices, i18n( "Rescan the devices" ) ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + m_buttonRefreshDevices = new TQPushButton( i18n( "Refresh" ), this, "m_buttonRefreshDevices" ); + m_buttonAddDevice = new TQPushButton( i18n( "Add Device..." ), this, "m_buttonAddDevice" ); + TQToolTip::add( m_buttonRefreshDevices, i18n( "Rescan the devices" ) ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); refreshButtonGrid->addItem( spacer, 0, 0 ); refreshButtonGrid->addWidget( m_buttonRefreshDevices, 0, 2 ); refreshButtonGrid->addWidget( m_buttonAddDevice, 0, 1 ); @@ -169,9 +169,9 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, QWidget *pa // Devices Box // ------------------------------------------------ - QGroupBox* groupDevices = new QGroupBox( 1, Qt::Vertical, i18n( "CD/DVD Drives" ), this ); - groupDevices->layout()->setSpacing( KDialog::spacingHint() ); - groupDevices->layout()->setMargin( KDialog::marginHint() ); + TQGroupBox* groupDevices = new TQGroupBox( 1, Qt::Vertical, i18n( "CD/DVD Drives" ), this ); + groupDevices->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupDevices->tqlayout()->setMargin( KDialog::marginHint() ); m_viewDevices = new K3bListView( groupDevices, "m_viewDevicesReader" ); m_viewDevices->addColumn( "V" ); @@ -180,8 +180,8 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, QWidget *pa m_viewDevices->header()->hide(); m_viewDevices->setSorting( -1 ); m_viewDevices->setDoubleClickForEdit(false); - m_viewDevices->setAlternateBackground( QColor() ); - m_viewDevices->setSelectionMode( QListView::NoSelection ); + m_viewDevices->setAlternateBackground( TQColor() ); + m_viewDevices->setSelectionMode( TQListView::NoSelection ); m_viewDevices->setFullWidth(true); // ------------------------------------------------ @@ -198,10 +198,10 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, QWidget *pa // connections // ------------------------------------------------ - // connect( m_buttonRefreshDevices, SIGNAL(clicked()), this, SLOT(slotRefreshDevices()) ); - connect( m_buttonRefreshDevices, SIGNAL(clicked()), this, SIGNAL(refreshButtonClicked()) ); - connect( m_buttonAddDevice, SIGNAL(clicked()), this, SLOT(slotNewDevice()) ); - connect( m_deviceManager, SIGNAL(changed()), this, SLOT(init()) ); + // connect( m_buttonRefreshDevices, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRefreshDevices()) ); + connect( m_buttonRefreshDevices, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(refreshButtonClicked()) ); + connect( m_buttonAddDevice, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewDevice()) ); + connect( m_deviceManager, TQT_SIGNAL(changed()), this, TQT_SLOT(init()) ); // ------------------------------------------------ } @@ -218,7 +218,7 @@ void K3bDeviceWidget::init() m_tempDevices.clear(); // add the reading devices - for( QPtrListIterator<K3bDevice::Device> it( m_deviceManager->allDevices() ); *it; ++it ) + for( TQPtrListIterator<K3bDevice::Device> it( m_deviceManager->allDevices() ); *it; ++it ) m_tempDevices.append( new PrivateTempDevice( *it ) ); updateDeviceListViews(); @@ -229,19 +229,19 @@ void K3bDeviceWidget::updateDeviceListViews() { m_viewDevices->clear(); - // create the parent view items + // create the tqparent view items // ----------------------------------------- - m_writerParentViewItem = new QListViewItem( m_viewDevices, i18n("Writer Drives") ); + m_writerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Writer Drives") ); m_writerParentViewItem->setPixmap( 0, SmallIcon( "cdwriter_unmount" ) ); // spacer item - (void)new QListViewItem( m_viewDevices ); - m_readerParentViewItem = new QListViewItem( m_viewDevices, i18n("Readonly Drives") ); + (void)new TQListViewItem( m_viewDevices ); + m_readerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Readonly Drives") ); m_readerParentViewItem->setPixmap( 0, SmallIcon( "cdrom_unmount" ) ); // ----------------------------------------- - QFont fBold( m_viewDevices->font() ); + TQFont fBold( m_viewDevices->font() ); fBold.setBold(true); - QFont fItalic( m_viewDevices->font() ); + TQFont fItalic( m_viewDevices->font() ); fItalic.setItalic(true); PrivateTempDevice* dev = m_tempDevices.first(); @@ -254,30 +254,30 @@ void K3bDeviceWidget::updateDeviceListViews() // create the read-only info items K3bListViewItem* systemDeviceItem = new K3bListViewItem( devRoot, i18n("System device name:") ); if( dev->device->interfaceType() == K3bDevice::SCSI ) - systemDeviceItem->setText( 1, QString("%1 (%2)").arg(dev->device->devicename()).arg(dev->device->busTargetLun()) ); + systemDeviceItem->setText( 1, TQString("%1 (%2)").tqarg(dev->device->devicename()).tqarg(dev->device->busTargetLun()) ); else systemDeviceItem->setText( 1, dev->device->devicename() ); - systemDeviceItem->setForegroundColor( 1, palette().disabled().foreground() ); + systemDeviceItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); K3bListViewItem* interfaceItem = new K3bListViewItem( devRoot, systemDeviceItem, i18n("Interface type:"), ( dev->device->interfaceType() == K3bDevice::SCSI ? i18n("Generic SCSI") : i18n("ATAPI") ) ); - interfaceItem->setForegroundColor( 1, palette().disabled().foreground() ); + interfaceItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); K3bListViewItem* vendorItem = new K3bListViewItem( devRoot, interfaceItem, i18n("Vendor:"), dev->device->vendor() ); - vendorItem->setForegroundColor( 1, palette().disabled().foreground() ); + vendorItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); K3bListViewItem* modelItem = new K3bListViewItem( devRoot, vendorItem, i18n("Description:"), dev->device->description() ); - modelItem->setForegroundColor( 1, palette().disabled().foreground() ); + modelItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); K3bListViewItem* versionItem = new K3bListViewItem( devRoot, modelItem, i18n("Firmware:"), dev->device->version() ); - versionItem->setForegroundColor( 1, palette().disabled().foreground() ); + versionItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); // drive type @@ -285,33 +285,33 @@ void K3bDeviceWidget::updateDeviceListViews() K3bListViewItem* typeItem = new K3bListViewItem( devRoot, versionItem, i18n("Writes CD-R:"), dev->device->writesCd() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes CD-RW:"), dev->device->writesCdrw() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Reads DVD:"), dev->device->readsDvd() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD-R(W):"), dev->device->writesDvdMinus() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD-R Dual Layer:"), (dev->device->type() & K3bDevice::DEVICE_DVD_R_DL) ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD+R(W):"), dev->device->writesDvdPlus() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD+R Double Layer:"), (dev->device->type() & K3bDevice::DEVICE_DVD_PLUS_R_DL) ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); // -------------------------------- @@ -320,7 +320,7 @@ void K3bDeviceWidget::updateDeviceListViews() typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Buffer Size:"), KIO::convertSizeFromKB(dev->device->bufferSize()) ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); } PrivateDeviceViewItem1* cdrdaoDriverItem = new PrivateDeviceViewItem1( PrivateDeviceViewItem1::t_cdrdaoDriver, @@ -339,14 +339,14 @@ void K3bDeviceWidget::updateDeviceListViews() typeItem = new K3bListViewItem( devRoot, cdTextItem, i18n("Supports Burnfree:"), dev->device->burnfree() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, palette().disabled().foreground() ); + typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); // and at last the write modes (new K3bListViewItem( devRoot, typeItem, i18n("Write modes:"), - K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, palette().disabled().foreground() ); + K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, tqpalette().disabled().foreground() ); } devRoot->setOpen(true); @@ -372,7 +372,7 @@ void K3bDeviceWidget::updateDeviceListViews() void K3bDeviceWidget::slotNewDevice() { bool ok; - QString newDevicename = KInputDialog::getText( i18n("Location of New Drive"), + TQString newDevicename = KInputDialog::getText( i18n("Location of New Drive"), i18n("Please enter the device name where K3b should search\nfor a new drive (example: /dev/cdrom):"), "/dev/", &ok, this ); @@ -383,7 +383,7 @@ void K3bDeviceWidget::slotNewDevice() updateDeviceListViews(); } else - KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename), i18n("Error"), false ); + KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename), i18n("Error"), false ); } } diff --git a/src/option/k3bdevicewidget.h b/src/option/k3bdevicewidget.h index a874c94..b4e1590 100644 --- a/src/option/k3bdevicewidget.h +++ b/src/option/k3bdevicewidget.h @@ -17,34 +17,35 @@ #ifndef K3BDEVICEWIDGET_H #define K3BDEVICEWIDGET_H -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> #include "k3bdevice.h" #include "k3bdevicemanager.h" -class QComboBox; -class QLabel; -class QGroupBox; -class QPushButton; -class QCheckBox; +class TQComboBox; +class TQLabel; +class TQGroupBox; +class TQPushButton; +class TQCheckBox; class K3bListView; -class QString; +class TQString; class KIntNumInput; -class QFrame; -class QListViewItem; -class QString; -class QLineEdit; +class TQFrame; +class TQListViewItem; +class TQString; +class TQLineEdit; /** *@author Sebastian Trueg */ -class K3bDeviceWidget : public QWidget +class K3bDeviceWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bDeviceWidget( K3bDevice::DeviceManager*, QWidget *parent = 0, const char *name = 0 ); + K3bDeviceWidget( K3bDevice::DeviceManager*, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bDeviceWidget(); public slots: @@ -63,16 +64,16 @@ class K3bDeviceWidget : public QWidget class PrivateDeviceViewItem1; /** list to save changes to the devices before applying */ - QPtrList<PrivateTempDevice> m_tempDevices; + TQPtrList<PrivateTempDevice> m_tempDevices; - QListViewItem* m_writerParentViewItem; - QListViewItem* m_readerParentViewItem; + TQListViewItem* m_writerParentViewItem; + TQListViewItem* m_readerParentViewItem; K3bDevice::DeviceManager* m_deviceManager; K3bListView* m_viewDevices; - QPushButton* m_buttonRefreshDevices; - QPushButton* m_buttonAddDevice; + TQPushButton* m_buttonRefreshDevices; + TQPushButton* m_buttonAddDevice; }; #endif diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp index d5c78bc..6be5b19 100644 --- a/src/option/k3bexternalbinoptiontab.cpp +++ b/src/option/k3bexternalbinoptiontab.cpp @@ -24,35 +24,35 @@ #include <kiconloader.h> #include <klistview.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qfile.h> -#include <qptrlist.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqfile.h> +#include <tqptrlist.h> -K3bExternalBinOptionTab::K3bExternalBinOptionTab( K3bExternalBinManager* manager, QWidget* parent, const char* name ) - : QWidget( parent, name ) +K3bExternalBinOptionTab::K3bExternalBinOptionTab( K3bExternalBinManager* manager, TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { m_manager = manager; - QGridLayout* frameLayout = new QGridLayout( this ); + TQGridLayout* frameLayout = new TQGridLayout( this ); frameLayout->setSpacing( KDialog::spacingHint() ); frameLayout->setMargin( 0 ); m_externalBinWidget = new K3bExternalBinWidget( manager, this ); frameLayout->addWidget( m_externalBinWidget, 1, 0 ); - QLabel* m_labelInfo = new QLabel( this, "m_labelInfo" ); + TQLabel* m_labelInfo = new TQLabel( this, "m_labelInfo" ); m_labelInfo->setText( i18n( "Specify the paths to the external programs that K3b needs to work properly, " "or press \"Search\" to let K3b search for the programs." ) ); m_labelInfo->setScaledContents( false ); - m_labelInfo->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter | QLabel::AlignLeft ) ); + m_labelInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); frameLayout->addWidget( m_labelInfo, 0, 0 ); } diff --git a/src/option/k3bexternalbinoptiontab.h b/src/option/k3bexternalbinoptiontab.h index 8622579..9a1c3d9 100644 --- a/src/option/k3bexternalbinoptiontab.h +++ b/src/option/k3bexternalbinoptiontab.h @@ -17,23 +17,24 @@ #ifndef K3B_EXTERNALBIN_OPTIONTAB_H #define K3B_EXTERNALBIN_OPTIONTAB_H -#include <qwidget.h> +#include <tqwidget.h> -class QPushButton; -class QListViewItem; +class TQPushButton; +class TQListViewItem; class KListView; class K3bExternalBinManager; class K3bExternalBinWidget; -class K3bExternalBinOptionTab : public QWidget +class K3bExternalBinOptionTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bExternalBinOptionTab( K3bExternalBinManager*, QWidget*, const char* name = 0 ); + K3bExternalBinOptionTab( K3bExternalBinManager*, TQWidget*, const char* name = 0 ); ~K3bExternalBinOptionTab(); void readSettings(); diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp index e1c62bb..32b8814 100644 --- a/src/option/k3bexternalbinwidget.cpp +++ b/src/option/k3bexternalbinwidget.cpp @@ -16,22 +16,22 @@ #include "k3bexternalbinwidget.h" #include "k3bexternalbinmanager.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <kdebug.h> -#include <qtabwidget.h> -#include <qlayout.h> -#include <qheader.h> -#include <qlabel.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qregexp.h> -#include <qfont.h> -#include <qpainter.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qcursor.h> -#include <qapplication.h> -#include <qbitmap.h> +#include <tqtabwidget.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqregexp.h> +#include <tqfont.h> +#include <tqpainter.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqcursor.h> +#include <tqapplication.h> +#include <tqbitmap.h> #include <kdialog.h> #include <kiconloader.h> @@ -43,10 +43,10 @@ -K3bExternalBinWidget::K3bExternalProgramViewItem::K3bExternalProgramViewItem( K3bExternalProgram* p, QListView* parent ) - : K3bListViewItem( parent ), m_program(p) +K3bExternalBinWidget::K3bExternalProgramViewItem::K3bExternalProgramViewItem( K3bExternalProgram* p, TQListView* tqparent ) + : K3bListViewItem( tqparent ), m_program(p) { - QFont f( listView()->font() ); + TQFont f( listView()->font() ); f.setBold(true); setFont( 0, f ); setBackgroundColor( 0, KGlobalSettings::alternateBackgroundColor() ); @@ -57,8 +57,8 @@ K3bExternalBinWidget::K3bExternalProgramViewItem::K3bExternalProgramViewItem( K3 } -K3bExternalBinWidget::K3bExternalBinViewItem::K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* parent ) - : K3bListViewItem( parent ), m_bin( bin ), m_parent( parent ) +K3bExternalBinWidget::K3bExternalBinViewItem::K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* tqparent ) + : K3bListViewItem( tqparent ), m_bin( bin ), m_parent( tqparent ) { setText( 0, bin->path ); setText( 1, bin->version ); @@ -70,10 +70,10 @@ K3bExternalBinWidget::K3bExternalBinViewItem::K3bExternalBinViewItem( K3bExterna void K3bExternalBinWidget::K3bExternalBinViewItem::setDefault( bool b ) { - static QPixmap s_emptyPix( (int)KIcon::SizeSmall, (int)KIcon::SizeSmall ); + static TQPixmap s_emptyPix( (int)KIcon::SizeSmall, (int)KIcon::SizeSmall ); static bool s_emptyPixInitialized = false; if( !s_emptyPixInitialized ) { - s_emptyPix.setMask( QBitmap( (int)KIcon::SizeSmall, (int)KIcon::SizeSmall, true ) ); + s_emptyPix.setMask( TQBitmap( (int)KIcon::SizeSmall, (int)KIcon::SizeSmall, true ) ); s_emptyPixInitialized = true; } @@ -95,15 +95,15 @@ void K3bExternalBinWidget::K3bExternalBinViewItem::setDefault( bool b ) // ////////////////////////////////////////////////////////// -K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, QWidget* parent, const char* name ) - : QWidget( parent, name ), m_manager( manager ) +K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ), m_manager( manager ) { - QGridLayout* mainGrid = new QGridLayout( this ); + TQGridLayout* mainGrid = new TQGridLayout( this ); mainGrid->setMargin( 0 ); mainGrid->setSpacing( KDialog::spacingHint() ); - m_mainTabWidget = new QTabWidget( this ); - m_rescanButton = new QPushButton( i18n("&Search"), this ); + m_mainTabWidget = new TQTabWidget( this ); + m_rescanButton = new TQPushButton( i18n("&Search"), this ); mainGrid->addMultiCellWidget( m_mainTabWidget, 0, 0, 0, 1 ); mainGrid->addWidget( m_rescanButton, 1, 1 ); mainGrid->setColStretch( 0, 1 ); @@ -112,20 +112,20 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, QWid // setup program tab // ------------------------------------------------------------ - QWidget* programTab = new QWidget( m_mainTabWidget ); - QGridLayout* programTabLayout = new QGridLayout( programTab ); + TQWidget* programTab = new TQWidget( m_mainTabWidget ); + TQGridLayout* programTabLayout = new TQGridLayout( programTab ); programTabLayout->setMargin( KDialog::marginHint() ); programTabLayout->setSpacing( KDialog::spacingHint() ); m_programView = new K3bListView( programTab ); - m_defaultButton = new QPushButton( i18n("Set Default"), programTab ); - QToolTip::add( m_defaultButton, i18n("Change the versions K3b should use.") ); - QWhatsThis::add( m_defaultButton, i18n("<p>If K3b found more than one installed version of a program " + m_defaultButton = new TQPushButton( i18n("Set Default"), programTab ); + TQToolTip::add( m_defaultButton, i18n("Change the versions K3b should use.") ); + TQWhatsThis::add( m_defaultButton, i18n("<p>If K3b found more than one installed version of a program " "it will choose one as the <em>default</em> which will be used " "to do the work. If you want to change the default select the " "wanted version and press this button.") ); programTabLayout->addMultiCellWidget( m_programView, 1, 1, 0, 1 ); programTabLayout->addWidget( m_defaultButton, 0, 1 ); - programTabLayout->addWidget( new QLabel( i18n("Use the 'Default' button to change the versions K3b should use."), + programTabLayout->addWidget( new TQLabel( i18n("Use the 'Default' button to change the versions K3b should use."), programTab ), 0, 0 ); programTabLayout->setColStretch( 0, 1 ); programTabLayout->setRowStretch( 1, 1 ); @@ -135,7 +135,7 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, QWid m_programView->addColumn( i18n("Features") ); m_programView->setAllColumnsShowFocus(true); m_programView->setFullWidth(true); - m_programView->setAlternateBackground( QColor() ); + m_programView->setAlternateBackground( TQColor() ); #if KDE_IS_VERSION(3,4,0) m_programView->setShadeSortColumn( false ); #endif @@ -144,13 +144,13 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, QWid // setup parameters tab // ------------------------------------------------------------ - QWidget* parametersTab = new QWidget( m_mainTabWidget ); - QGridLayout* parametersTabLayout = new QGridLayout( parametersTab ); + TQWidget* parametersTab = new TQWidget( m_mainTabWidget ); + TQGridLayout* parametersTabLayout = new TQGridLayout( parametersTab ); parametersTabLayout->setMargin( KDialog::marginHint() ); parametersTabLayout->setSpacing( KDialog::spacingHint() ); m_parameterView = new K3bListView( parametersTab ); parametersTabLayout->addWidget( m_parameterView, 1, 0 ); - parametersTabLayout->addWidget( new QLabel( i18n("User parameters have to be separated by space."), parametersTab ), 0, 0 ); + parametersTabLayout->addWidget( new TQLabel( i18n("User parameters have to be separated by space."), parametersTab ), 0, 0 ); parametersTabLayout->setRowStretch( 1, 1 ); @@ -158,7 +158,7 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, QWid m_parameterView->addColumn( i18n("Parameters") ); m_parameterView->setAllColumnsShowFocus(true); m_parameterView->setFullWidth(true); - m_parameterView->setDefaultRenameAction( QListView::Accept ); + m_parameterView->setDefaultRenameAction( TQListView::Accept ); m_parameterView->setDoubleClickForEdit( false ); m_mainTabWidget->addTab( parametersTab, i18n("User Parameters") ); @@ -166,13 +166,13 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, QWid // setup search path tab // ------------------------------------------------------------ - QWidget* searchPathTab = new QWidget( m_mainTabWidget ); - QGridLayout* searchPathTabLayout = new QGridLayout( searchPathTab ); + TQWidget* searchPathTab = new TQWidget( m_mainTabWidget ); + TQGridLayout* searchPathTabLayout = new TQGridLayout( searchPathTab ); searchPathTabLayout->setMargin( KDialog::marginHint() ); searchPathTabLayout->setSpacing( KDialog::spacingHint() ); m_searchPathBox = new KEditListBox( i18n("Search Path"), searchPathTab, "searchPathBox", true ); searchPathTabLayout->addWidget( m_searchPathBox, 0, 0 ); - searchPathTabLayout->addWidget( new QLabel( i18n("<qt><b>Hint:</b> to force K3b to use another than the " + searchPathTabLayout->addWidget( new TQLabel( i18n("<qt><b>Hint:</b> to force K3b to use another than the " "default name for the executable specify it in the search path.</qt>"), searchPathTab ), 1, 0 ); @@ -184,9 +184,9 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, QWid m_programRootItems.setAutoDelete( true ); - connect( m_rescanButton, SIGNAL(clicked()), this, SLOT(rescan()) ); - connect( m_defaultButton, SIGNAL(clicked()), this, SLOT(slotSetDefaultButtonClicked()) ); - connect( m_programView, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotProgramSelectionChanged(QListViewItem*)) ); + connect( m_rescanButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rescan()) ); + connect( m_defaultButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetDefaultButtonClicked()) ); + connect( m_programView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotProgramSelectionChanged(TQListViewItem*)) ); slotProgramSelectionChanged( 0 ); } @@ -198,11 +198,11 @@ K3bExternalBinWidget::~K3bExternalBinWidget() void K3bExternalBinWidget::rescan() { - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); saveSearchPath(); m_manager->search(); load(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } @@ -212,14 +212,14 @@ void K3bExternalBinWidget::load() m_parameterView->clear(); // load programs - const QMap<QString, K3bExternalProgram*>& map = m_manager->programs(); - for( QMap<QString, K3bExternalProgram*>::const_iterator it = map.begin(); it != map.end(); ++it ) { + const TQMap<TQString, K3bExternalProgram*>& map = m_manager->programs(); + for( TQMap<TQString, K3bExternalProgram*>::const_iterator it = map.begin(); it != map.end(); ++it ) { K3bExternalProgram* p = it.data(); K3bExternalProgramViewItem* pV = new K3bExternalProgramViewItem( p, m_programView ); m_programRootItems.append( pV ); // populate it - QPtrListIterator<K3bExternalBin> binIt( p->bins() ); + TQPtrListIterator<K3bExternalBin> binIt( p->bins() ); for( ; binIt.current(); ++binIt ) { K3bExternalBin* b = *binIt; @@ -255,11 +255,11 @@ void K3bExternalBinWidget::save() // save the default programs - QListViewItemIterator progIt( m_programView ); + TQListViewItemIterator progIt( m_programView ); while( progIt.current() ) { if( K3bExternalBinViewItem* bV = dynamic_cast<K3bExternalBinViewItem*>( progIt.current() ) ) { if( bV->isDefault() ) - bV->parentProgramItem()->program()->setDefault( bV->bin() ); + bV->tqparentProgramItem()->program()->setDefault( bV->bin() ); } ++progIt; @@ -267,11 +267,11 @@ void K3bExternalBinWidget::save() // save the user parameters - QListViewItemIterator paraIt( m_parameterView ); - QRegExp reSpace( "\\s" ); + TQListViewItemIterator paraIt( m_parameterView ); + TQRegExp reSpace( "\\s" ); while( paraIt.current() ) { K3bExternalProgramViewItem* pV = (K3bExternalProgramViewItem*)paraIt.current(); - pV->program()->setUserParameters( QStringList::split( reSpace, pV->text(1) ) ); + pV->program()->setUserParameters( TQStringList::split( reSpace, pV->text(1) ) ); ++paraIt; } @@ -290,9 +290,9 @@ void K3bExternalBinWidget::slotSetDefaultButtonClicked() K3bExternalBinViewItem* item = dynamic_cast<K3bExternalBinViewItem*>( m_programView->selectedItem() ); if( item ) { // remove all default flags - K3bExternalBinViewItem* bi = (K3bExternalBinViewItem*)item->parentProgramItem()->firstChild(); - QListViewItemIterator it( bi ); - while( it.current() && it.current()->parent() == item->parentProgramItem() ) { + K3bExternalBinViewItem* bi = (K3bExternalBinViewItem*)item->tqparentProgramItem()->firstChild(); + TQListViewItemIterator it( bi ); + while( it.current() && it.current()->tqparent() == item->tqparentProgramItem() ) { ((K3bExternalBinViewItem*)it.current())->setDefault(false); ++it; } @@ -302,7 +302,7 @@ void K3bExternalBinWidget::slotSetDefaultButtonClicked() } -void K3bExternalBinWidget::slotProgramSelectionChanged( QListViewItem* item ) +void K3bExternalBinWidget::slotProgramSelectionChanged( TQListViewItem* item ) { K3bExternalBinViewItem* bV = dynamic_cast<K3bExternalBinViewItem*>( item ); if( bV ) { diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h index fe2e163..14fab6a 100644 --- a/src/option/k3bexternalbinwidget.h +++ b/src/option/k3bexternalbinwidget.h @@ -18,26 +18,27 @@ #define K3B_EXTERNAL_BIN_WIDGET_H -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> #include <k3blistview.h> class K3bExternalBinManager; -class QPushButton; -class QTabWidget; +class TQPushButton; +class TQTabWidget; class KEditListBox; class K3bExternalProgram; class K3bExternalBin; -class K3bExternalBinWidget : public QWidget +class K3bExternalBinWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bExternalBinWidget( K3bExternalBinManager*, QWidget* parent = 0, const char* name = 0 ); + K3bExternalBinWidget( K3bExternalBinManager*, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bExternalBinWidget(); class K3bExternalBinViewItem; @@ -50,28 +51,28 @@ class K3bExternalBinWidget : public QWidget private slots: void slotSetDefaultButtonClicked(); - void slotProgramSelectionChanged( QListViewItem* ); + void slotProgramSelectionChanged( TQListViewItem* ); void saveSearchPath(); private: K3bExternalBinManager* m_manager; - QTabWidget* m_mainTabWidget; + TQTabWidget* m_mainTabWidget; K3bListView* m_programView; K3bListView* m_parameterView; KEditListBox* m_searchPathBox; - QPushButton* m_defaultButton; - QPushButton* m_rescanButton; + TQPushButton* m_defaultButton; + TQPushButton* m_rescanButton; - QPtrList<K3bExternalProgramViewItem> m_programRootItems; + TQPtrList<K3bExternalProgramViewItem> m_programRootItems; }; class K3bExternalBinWidget::K3bExternalProgramViewItem : public K3bListViewItem { public: - K3bExternalProgramViewItem( K3bExternalProgram* p, QListView* parent ); + K3bExternalProgramViewItem( K3bExternalProgram* p, TQListView* tqparent ); K3bExternalProgram* program() const { return m_program; } @@ -84,10 +85,10 @@ class K3bExternalBinWidget::K3bExternalProgramViewItem : public K3bListViewItem class K3bExternalBinWidget::K3bExternalBinViewItem : public K3bListViewItem { public: - K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* parent ); + K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* tqparent ); K3bExternalBin* bin() const { return m_bin; } - K3bExternalProgramViewItem* parentProgramItem() const { return m_parent; } + K3bExternalProgramViewItem* tqparentProgramItem() const { return m_parent; } bool isDefault() const { return m_default; } void setDefault( bool b ); diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index d81e565..d6c7de0 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -24,9 +24,9 @@ #include <k3binteractiondialog.h> #include <k3bintmapcombobox.h> -#include <qcheckbox.h> -#include <qfileinfo.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqfileinfo.h> +#include <tqradiobutton.h> #include <kapplication.h> #include <klocale.h> @@ -38,12 +38,12 @@ #include <kcombobox.h> -K3bMiscOptionTab::K3bMiscOptionTab(QWidget *parent, const char *name ) - : base_K3bMiscOptionTab(parent,name) +K3bMiscOptionTab::K3bMiscOptionTab(TQWidget *tqparent, const char *name ) + : base_K3bMiscOptionTab(tqparent,name) { m_editTempDir->setMode( KFile::Directory ); - connect( m_buttonConfigureAudioOutput, SIGNAL(clicked()), - this, SLOT(slotConfigureAudioOutput()) ); + connect( m_buttonConfigureAudioOutput, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotConfigureAudioOutput()) ); m_comboActionDialogSettings->insertItem( K3bInteractionDialog::LOAD_K3B_DEFAULTS, i18n("Default Settings"), @@ -80,7 +80,7 @@ void K3bMiscOptionTab::readSettings() K3bInteractionDialog::LOAD_SAVED_SETTINGS ) ); m_checkSystemConfig->setChecked( c->readBoolEntry( "check system config", true ) ); - QString tempdir = c->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() ); + TQString tempdir = c->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() ); m_editTempDir->setURL( tempdir ); // if( c->readEntry( "Multiple Instances", "smart" ) == "smart" ) @@ -90,10 +90,10 @@ void K3bMiscOptionTab::readSettings() // Audio Output m_comboAudioOutputSystem->clear(); - QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioOutput" ); - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioOutput" ); + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { K3bAudioOutputPlugin* f = static_cast<K3bAudioOutputPlugin*>( it.current() ); - m_comboAudioOutputSystem->insertItem( QString::fromLocal8Bit(f->soundSystem()) ); + m_comboAudioOutputSystem->insertItem( TQString(TQString::fromLocal8Bit(f->soundSystem())) ); } m_comboAudioOutputSystem->setCurrentItem( c->readEntry( "Audio Output System", "arts" ), false ); @@ -116,18 +116,18 @@ bool K3bMiscOptionTab::saveSettings() c->writeEntry( "check system config", m_checkSystemConfig->isChecked() ); c->writeEntry( "action dialog startup settings", m_comboActionDialogSettings->selectedValue() ); - QString tempDir = m_editTempDir->url(); - QFileInfo fi( tempDir ); + TQString tempDir = m_editTempDir->url(); + TQFileInfo fi( tempDir ); if( fi.isRelative() ) { fi.setFile( fi.absFilePath() ); } if( !fi.exists() ) { - if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").arg(tempDir), + if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").tqarg(tempDir), i18n("Create Directory"), i18n("Create"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { if( !KStandardDirs::makeDir( fi.absFilePath() ) ) { - KMessageBox::error( this, i18n("Unable to create directory %1").arg(tempDir) ); + KMessageBox::error( this, i18n("Unable to create directory %1").tqarg(tempDir) ); return false; } } @@ -147,7 +147,7 @@ bool K3bMiscOptionTab::saveSettings() // check for writing permission if( !fi.isWritable() ) { - KMessageBox::error( this, i18n("You do not have permission to write to %1.").arg(fi.absFilePath()) ); + KMessageBox::error( this, i18n("You do not have permission to write to %1.").tqarg(fi.absFilePath()) ); return false; } @@ -178,7 +178,7 @@ bool K3bMiscOptionTab::saveSettings() void K3bMiscOptionTab::slotConfigureAudioOutput() { - QString system = m_comboAudioOutputSystem->currentText(); + TQString system = m_comboAudioOutputSystem->currentText(); if( K3bAudioOutputPlugin* plugin = K3bAudioServer::findOutputPlugin( system.local8Bit() ) ) { k3bcore->pluginManager()->execPluginDialog( plugin, this ); } diff --git a/src/option/k3bmiscoptiontab.h b/src/option/k3bmiscoptiontab.h index 6e5ded6..1c5de7e 100644 --- a/src/option/k3bmiscoptiontab.h +++ b/src/option/k3bmiscoptiontab.h @@ -19,7 +19,7 @@ #include "base_k3bmiscoptiontab.h" -class QCheckBox; +class TQCheckBox; class KURLRequester; /** @@ -28,9 +28,10 @@ class KURLRequester; class K3bMiscOptionTab : public base_K3bMiscOptionTab { Q_OBJECT + TQ_OBJECT public: - K3bMiscOptionTab(QWidget *parent=0, const char *name=0); + K3bMiscOptionTab(TQWidget *tqparent=0, const char *name=0); ~K3bMiscOptionTab(); void readSettings(); diff --git a/src/option/k3bnotifyoptiontab.cpp b/src/option/k3bnotifyoptiontab.cpp index 60ddc7c..0cc6e5d 100644 --- a/src/option/k3bnotifyoptiontab.cpp +++ b/src/option/k3bnotifyoptiontab.cpp @@ -21,16 +21,16 @@ #include <knotifydialog.h> #include <kdebug.h> -#include <qlayout.h> +#include <tqlayout.h> -K3bNotifyOptionTab::K3bNotifyOptionTab( QWidget* parent, const char* name ) - : QWidget( parent, name ) +K3bNotifyOptionTab::K3bNotifyOptionTab( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { m_notifyWidget = new KNotify::KNotifyWidget( this ); - QHBoxLayout* box = new QHBoxLayout( this ); + TQHBoxLayout* box = new TQHBoxLayout( this ); box->addWidget( m_notifyWidget ); } diff --git a/src/option/k3bnotifyoptiontab.h b/src/option/k3bnotifyoptiontab.h index 03314dc..6eb3fed 100644 --- a/src/option/k3bnotifyoptiontab.h +++ b/src/option/k3bnotifyoptiontab.h @@ -18,19 +18,20 @@ #ifndef _K3B_NOTIFY_OPTIONTAB_H_ #define _K3B_NOTIFY_OPTIONTAB_H_ -#include <qwidget.h> +#include <tqwidget.h> namespace KNotify { class KNotifyWidget; } -class K3bNotifyOptionTab : public QWidget +class K3bNotifyOptionTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bNotifyOptionTab( QWidget* parent = 0, const char* name = 0 ); + K3bNotifyOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bNotifyOptionTab(); void readSettings(); diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index d0ba7ce..91a9fb3 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -26,10 +26,10 @@ #include <k3bsystemproblemdialog.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qtabwidget.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqtabwidget.h> #include <klocale.h> #include <kiconloader.h> @@ -40,8 +40,8 @@ // TODO: handle the default-settings -K3bOptionDialog::K3bOptionDialog(QWidget *parent, const char *name, bool modal ) - : KDialogBase( IconList, i18n("Settings"), Apply|Ok|Cancel, Ok, parent,name, modal, true) +K3bOptionDialog::K3bOptionDialog(TQWidget *tqparent, const char *name, bool modal ) + : KDialogBase( IconList, i18n("Settings"), Apply|Ok|Cancel, Ok, tqparent,name, modal, true) { setupMiscPage(); setupDevicePage(); @@ -126,10 +126,10 @@ void K3bOptionDialog::slotDefault() void K3bOptionDialog::setupBurningPage() { - QFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"), + TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"), KGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); - QGridLayout* _frameLayout = new QGridLayout( frame ); + TQGridLayout* _frameLayout = new TQGridLayout( frame ); _frameLayout->setSpacing( 0 ); _frameLayout->setMargin( 0 ); @@ -140,10 +140,10 @@ void K3bOptionDialog::setupBurningPage() void K3bOptionDialog::setupProgramsPage() { - QFrame* frame = addPage( i18n("Programs"), i18n("Setup External Programs"), + TQFrame* frame = addPage( i18n("Programs"), i18n("Setup External Programs"), KGlobal::instance()->iconLoader()->loadIcon( "exec", KIcon::NoGroup, KIcon::SizeMedium ) ); - QGridLayout* _frameLayout = new QGridLayout( frame ); + TQGridLayout* _frameLayout = new TQGridLayout( frame ); _frameLayout->setSpacing( 0 ); _frameLayout->setMargin( 0 ); @@ -154,13 +154,13 @@ void K3bOptionDialog::setupProgramsPage() void K3bOptionDialog::setupCddbPage() { - QFrame* frame = addPage( i18n("CDDB"), i18n("Setup the CDDB Server"), + TQFrame* frame = addPage( i18n("CDDB"), i18n("Setup the CDDB Server"), KGlobal::instance()->iconLoader()->loadIcon( "connect_established", KIcon::NoGroup, KIcon::SizeMedium ) ); - QGridLayout* mainGrid = new QGridLayout( frame ); + TQGridLayout* mainGrid = new TQGridLayout( frame ); mainGrid->setSpacing(0); mainGrid->setMargin(0); - // QTabWidget *_tab = new QTabWidget( frame ); + // TQTabWidget *_tab = new TQTabWidget( frame ); m_cddbOptionTab = new K3bCddbOptionTab( frame, "cddbremotepage"); // m_cddbLocalTab = new K3bCddbLocalDBTab( frame, "cddblocalpage"); // _tab->addTab( m_cddbOptionTab, i18n("Remote") ); @@ -172,10 +172,10 @@ void K3bOptionDialog::setupCddbPage() void K3bOptionDialog::setupDevicePage() { - QFrame* frame = addPage( i18n("Devices"), i18n("Setup Devices"), + TQFrame* frame = addPage( i18n("Devices"), i18n("Setup Devices"), KGlobal::instance()->iconLoader()->loadIcon( "blockdevice", KIcon::NoGroup, KIcon::SizeMedium ) ); - QHBoxLayout* box = new QHBoxLayout( frame ); + TQHBoxLayout* box = new TQHBoxLayout( frame ); box->setSpacing(0); box->setMargin(0); m_deviceOptionTab = new K3bDeviceOptionTab( frame, "deviceOptionTab" ); @@ -185,10 +185,10 @@ void K3bOptionDialog::setupDevicePage() void K3bOptionDialog::setupMiscPage() { - QFrame* frame = addPage( i18n("Misc"), i18n("Miscellaneous Settings"), + TQFrame* frame = addPage( i18n("Misc"), i18n("Miscellaneous Settings"), KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); - QVBoxLayout* box = new QVBoxLayout( frame ); + TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); box->setMargin( 0 ); @@ -199,10 +199,10 @@ void K3bOptionDialog::setupMiscPage() void K3bOptionDialog::setupNotifyPage() { - QFrame* frame = addPage( i18n("Notifications"), i18n("System Notifications"), + TQFrame* frame = addPage( i18n("Notifications"), i18n("System Notifications"), KGlobal::instance()->iconLoader()->loadIcon( "knotify", KIcon::NoGroup, KIcon::SizeMedium ) ); - QVBoxLayout* box = new QVBoxLayout( frame ); + TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); box->setMargin( 0 ); @@ -213,10 +213,10 @@ void K3bOptionDialog::setupNotifyPage() void K3bOptionDialog::setupPluginPage() { - QFrame* frame = addPage( i18n("Plugins"), i18n("K3b Plugin Configuration"), + TQFrame* frame = addPage( i18n("Plugins"), i18n("K3b Plugin Configuration"), KGlobal::instance()->iconLoader()->loadIcon( "gear", KIcon::NoGroup, KIcon::SizeMedium ) ); - QVBoxLayout* box = new QVBoxLayout( frame ); + TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); box->setMargin( 0 ); @@ -227,10 +227,10 @@ void K3bOptionDialog::setupPluginPage() void K3bOptionDialog::setupThemePage() { - QFrame* frame = addPage( i18n("Themes"), i18n("K3b GUI Themes"), + TQFrame* frame = addPage( i18n("Themes"), i18n("K3b GUI Themes"), KGlobal::instance()->iconLoader()->loadIcon( "style", KIcon::NoGroup, KIcon::SizeMedium ) ); - QVBoxLayout* box = new QVBoxLayout( frame ); + TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); box->setMargin( 0 ); @@ -239,14 +239,14 @@ void K3bOptionDialog::setupThemePage() } -// void K3bOptionDialog::addOptionPage( QWidget* widget, -// const QString& name, -// const QString& header, -// const QPixmap& icon ) +// void K3bOptionDialog::addOptionPage( TQWidget* widget, +// const TQString& name, +// const TQString& header, +// const TQPixmap& icon ) // { -// QFrame* frame = addPage( name, header, icon ); +// TQFrame* frame = addPage( name, header, icon ); -// QVBoxLayout* box = new QVBoxLayout( frame ); +// TQVBoxLayout* box = new TQVBoxLayout( frame ); // box->setSpacing( 0 ); // box->setMargin( 0 ); diff --git a/src/option/k3boptiondialog.h b/src/option/k3boptiondialog.h index 1f417b6..c033504 100644 --- a/src/option/k3boptiondialog.h +++ b/src/option/k3boptiondialog.h @@ -35,17 +35,18 @@ class K3bThemeOptionTab; class K3bOptionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bOptionDialog(QWidget *parent=0, const char *name=0, bool modal = true); + K3bOptionDialog(TQWidget *tqparent=0, const char *name=0, bool modal = true); ~K3bOptionDialog(); enum m_configPageIndex { Burning = 0, Devices = 1, Programs = 2, Cddb = 3 }; -/* void addOptionPage( QWidget* widget, */ -/* const QString& name, */ -/* const QString& header, */ -/* const QPixmap& icon ); */ +/* void addOptionPage( TQWidget* widget, */ +/* const TQString& name, */ +/* const TQString& header, */ +/* const TQPixmap& icon ); */ protected slots: void slotOk(); diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 59d7b74..2e67ae5 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -30,15 +30,15 @@ #include <kglobalsettings.h> #include <kdeversion.h> -#include <qstringlist.h> -#include <qpushbutton.h> +#include <tqstringlist.h> +#include <tqpushbutton.h> class K3bPluginOptionTab::PluginViewItem : public K3bListViewItem { public: - PluginViewItem( K3bPlugin* p, KListViewItem* parent ) - : K3bListViewItem( parent ), + PluginViewItem( K3bPlugin* p, KListViewItem* tqparent ) + : K3bListViewItem( tqparent ), plugin(p) { const K3bPluginInfo& info = p->pluginInfo(); setText( 0, info.name() ); @@ -58,8 +58,8 @@ public: -K3bPluginOptionTab::K3bPluginOptionTab( QWidget* parent, const char* name ) - : base_K3bPluginOptionTab( parent, name ) +K3bPluginOptionTab::K3bPluginOptionTab( TQWidget* tqparent, const char* name ) + : base_K3bPluginOptionTab( tqparent, name ) { #if KDE_IS_VERSION(3,4,0) m_viewPlugins->setShadeSortColumn( false ); @@ -69,12 +69,12 @@ K3bPluginOptionTab::K3bPluginOptionTab( QWidget* parent, const char* name ) m_viewPlugins->addColumn( i18n("Version") ); m_viewPlugins->addColumn( i18n("Description") ); m_viewPlugins->addColumn( i18n("License") ); - m_viewPlugins->setAlternateBackground( QColor() ); + m_viewPlugins->setAlternateBackground( TQColor() ); m_viewPlugins->setAllColumnsShowFocus(true); - connect( m_viewPlugins, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), this, SLOT(slotConfigureButtonClicked()) ); - connect( m_buttonConfigure, SIGNAL(clicked()), this, SLOT(slotConfigureButtonClicked()) ); - connect( m_viewPlugins, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); + connect( m_viewPlugins, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotConfigureButtonClicked()) ); + connect( m_buttonConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigureButtonClicked()) ); + connect( m_viewPlugins, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); } @@ -86,15 +86,15 @@ K3bPluginOptionTab::~K3bPluginOptionTab() void K3bPluginOptionTab::readSettings() { m_viewPlugins->clear(); - QStringList groups = k3bcore->pluginManager()->groups(); - for( QStringList::const_iterator it = groups.begin(); + TQStringList groups = k3bcore->pluginManager()->groups(); + for( TQStringList::const_iterator it = groups.begin(); it != groups.end(); ++it ) { - const QString& group = *it; + const TQString& group = *it; K3bListViewItem* groupViewItem = new K3bListViewItem( m_viewPlugins, m_viewPlugins->lastChild(), group ); - QFont f( font() ); + TQFont f( font() ); f.setBold(true); groupViewItem->setFont( 0, f ); groupViewItem->setBackgroundColor( 0, KGlobalSettings::alternateBackgroundColor() ); @@ -104,8 +104,8 @@ void K3bPluginOptionTab::readSettings() groupViewItem->setBackgroundColor( 4, KGlobalSettings::alternateBackgroundColor() ); groupViewItem->setSelectable( false ); - QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( group ); - for( QPtrListIterator<K3bPlugin> fit( fl ); fit.current(); ++fit ) + TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( group ); + for( TQPtrListIterator<K3bPlugin> fit( fl ); fit.current(); ++fit ) (void)new PluginViewItem( fit.current(), groupViewItem ); groupViewItem->setOpen(true); @@ -123,7 +123,7 @@ bool K3bPluginOptionTab::saveSettings() void K3bPluginOptionTab::slotConfigureButtonClicked() { - QListViewItem* item = m_viewPlugins->selectedItem(); + TQListViewItem* item = m_viewPlugins->selectedItem(); if( PluginViewItem* pi = dynamic_cast<PluginViewItem*>( item ) ) k3bcore->pluginManager()->execPluginDialog( pi->plugin, this ); } diff --git a/src/option/k3bpluginoptiontab.h b/src/option/k3bpluginoptiontab.h index 1fb1821..c9db5af 100644 --- a/src/option/k3bpluginoptiontab.h +++ b/src/option/k3bpluginoptiontab.h @@ -23,9 +23,10 @@ class K3bPluginOptionTab : public base_K3bPluginOptionTab { Q_OBJECT + TQ_OBJECT public: - K3bPluginOptionTab( QWidget* parent = 0, const char* name = 0 ); + K3bPluginOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bPluginOptionTab(); public slots: diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index 4fd3f61..005af83 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -32,9 +32,9 @@ #include <kurlrequesterdlg.h> #include <kdeversion.h> -#include <qlabel.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqfileinfo.h> class K3bThemeOptionTab::Private @@ -46,8 +46,8 @@ public: class ThemeViewItem : public KListViewItem { public: - ThemeViewItem( K3bTheme* theme_, QListView* parent, QListViewItem* after ) - : KListViewItem( parent, after ), + ThemeViewItem( K3bTheme* theme_, TQListView* tqparent, TQListViewItem* after ) + : KListViewItem( tqparent, after ), theme(theme_) { setText( 0, theme->name() ); setText( 1, theme->author() ); @@ -58,8 +58,8 @@ public: K3bTheme* theme; }; -K3bThemeOptionTab::K3bThemeOptionTab(QWidget *parent, const char *name ) - : base_K3bThemeOptionTab(parent,name) +K3bThemeOptionTab::K3bThemeOptionTab(TQWidget *tqparent, const char *name ) + : base_K3bThemeOptionTab(tqparent,name) { d = new Private(); @@ -67,14 +67,14 @@ K3bThemeOptionTab::K3bThemeOptionTab(QWidget *parent, const char *name ) m_viewTheme->setShadeSortColumn( false ); #endif - connect( m_viewTheme, SIGNAL(selectionChanged()), - this, SLOT(selectionChanged()) ); - connect( kapp, SIGNAL(appearanceChanged()), - this, SLOT(selectionChanged()) ); - connect( m_buttonInstallTheme, SIGNAL(clicked()), - this, SLOT(slotInstallTheme()) ); - connect( m_buttonRemoveTheme, SIGNAL(clicked()), - this, SLOT(slotRemoveTheme()) ); + connect( m_viewTheme, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(selectionChanged()) ); + connect( kapp, TQT_SIGNAL(appearanceChanged()), + this, TQT_SLOT(selectionChanged()) ); + connect( m_buttonInstallTheme, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotInstallTheme()) ); + connect( m_buttonRemoveTheme, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRemoveTheme()) ); } @@ -90,8 +90,8 @@ void K3bThemeOptionTab::readSettings() k3bappcore->themeManager()->loadThemes(); - QValueList<K3bTheme*> themes = k3bappcore->themeManager()->themes(); - for( QValueList<K3bTheme*>::const_iterator it = themes.constBegin(); it != themes.constEnd(); ++it ) { + TQValueList<K3bTheme*> themes = k3bappcore->themeManager()->themes(); + for( TQValueList<K3bTheme*>::const_iterator it = themes.constBegin(); it != themes.constEnd(); ++it ) { K3bTheme* theme = *it; ThemeViewItem* item = new ThemeViewItem( theme, m_viewTheme, m_viewTheme->lastItem() ); if( theme == k3bappcore->themeManager()->currentTheme() ) @@ -131,32 +131,32 @@ void K3bThemeOptionTab::selectionChanged() void K3bThemeOptionTab::slotInstallTheme() { - KURL themeURL = KURLRequesterDlg::getURL( QString::null, this, + KURL themeURL = KURLRequesterDlg::getURL( TQString(), this, i18n("Drag or Type Theme URL") ); if( themeURL.url().isEmpty() ) return; - QString themeTmpFile; + TQString themeTmpFile; // themeTmpFile contains the name of the downloaded file if( !KIO::NetAccess::download( themeURL, themeTmpFile, this ) ) { - QString sorryText; + TQString sorryText; if (themeURL.isLocalFile()) sorryText = i18n("Unable to find the icon theme archive %1."); else sorryText = i18n("Unable to download the icon theme archive.\n" "Please check that address %1 is correct."); - KMessageBox::sorry( this, sorryText.arg(themeURL.prettyURL()) ); + KMessageBox::sorry( this, sorryText.tqarg(themeURL.prettyURL()) ); return; } // check if the archive contains a dir with a k3b.theme file - QString themeName; + TQString themeName; KTar archive( themeTmpFile ); archive.open(IO_ReadOnly); const KArchiveDirectory* themeDir = archive.directory(); - QStringList entries = themeDir->entries(); + TQStringList entries = themeDir->entries(); bool validThemeArchive = false; if( entries.count() > 0 ) { if( themeDir->entry(entries.first())->isDirectory() ) { @@ -180,10 +180,10 @@ void K3bThemeOptionTab::slotInstallTheme() KMessageBox::error( this, i18n("The file is not a valid K3b theme archive.") ); } else { - QString themeBasePath = locateLocal( "data", "k3b/pics/" ); + TQString themeBasePath = locateLocal( "data", "k3b/pics/" ); // check if there already is a theme by that name - if( !QFile::exists( themeBasePath + '/' + themeName ) || + if( !TQFile::exists( themeBasePath + '/' + themeName ) || KMessageBox::warningYesNo( this, i18n("A theme with the name '%1' already exists. Do you want to " "overwrite it?"), @@ -206,7 +206,7 @@ void K3bThemeOptionTab::slotRemoveTheme() { ThemeViewItem* item = (ThemeViewItem*)m_viewTheme->selectedItem(); if( item ) { - QString question=i18n("<qt>Are you sure you want to remove the " + TQString question=i18n("<qt>Are you sure you want to remove the " "<strong>%1</strong> icon theme?<br>" "<br>" "This will delete the files installed by this theme.</qt>"). @@ -217,10 +217,10 @@ void K3bThemeOptionTab::slotRemoveTheme() K3bTheme* theme = item->theme; delete item; - QString path = theme->path(); + TQString path = theme->path(); // delete k3b.theme file to avoid it to get loaded - QFile::remove( path + "/k3b.theme" ); + TQFile::remove( path + "/k3b.theme" ); // reread the themes (this will also set the default theme in case we delete the // selected one) diff --git a/src/option/k3bthemeoptiontab.h b/src/option/k3bthemeoptiontab.h index bfb1d72..d247f94 100644 --- a/src/option/k3bthemeoptiontab.h +++ b/src/option/k3bthemeoptiontab.h @@ -26,9 +26,10 @@ class K3bThemeOptionTab : public base_K3bThemeOptionTab { Q_OBJECT + TQ_OBJECT public: - K3bThemeOptionTab( QWidget* parent = 0, const char* name = 0 ); + K3bThemeOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bThemeOptionTab(); void readSettings(); diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 593b404..c236ab8 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bAdvancedDataImageSettings</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bDataCustomFilesystemsWidget</cstring> </property> @@ -18,7 +18,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupIsoSettings</cstring> </property> @@ -50,7 +50,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -61,7 +61,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkRockRidge</cstring> </property> @@ -81,7 +81,7 @@ <p><b>It is highly recommended to use Rock Ridge extensions on every data CD or DVD.</b></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkJoliet</cstring> </property> @@ -99,7 +99,7 @@ <p><b>Caution:</b> With the exception of Linux and FreeBSD, there is no POSIX-like OS that supports Joliet. So <b>never create Joliet-only CDs or DVDs</b> for that reason.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkUdf</cstring> </property> @@ -116,7 +116,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -127,15 +127,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkForceInputCharset</cstring> </property> @@ -156,7 +156,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkPreservePermissions</cstring> </property> @@ -184,7 +184,7 @@ <tabstop>m_checkRockRidge</tabstop> <tabstop>m_checkJoliet</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui index e178d1f..c8d647d 100644 --- a/src/projects/base_k3baudiocdtextallfieldswidget.ui +++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bAudioCdTextAllFieldsWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bAudioCdTextAllFieldsWidget</cstring> </property> @@ -12,7 +12,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -23,9 +23,9 @@ <cstring>m_editMessage</cstring> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -36,7 +36,7 @@ <cstring>m_editSongwriter</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopySongwriter</cstring> </property> @@ -49,7 +49,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -60,9 +60,9 @@ <cstring>m_editUpc_ean</cstring> </property> </widget> - <widget class="QLayoutWidget" row="5" column="1"> + <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -73,7 +73,7 @@ <cstring>m_editComposer</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyComposer</cstring> </property> @@ -86,7 +86,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -97,7 +97,7 @@ <cstring>m_editSongwriter</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -108,7 +108,7 @@ <cstring>m_editComposer</cstring> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -119,9 +119,9 @@ <cstring>m_editDisc_id</cstring> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -132,7 +132,7 @@ <cstring>m_editArranger</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyArranger</cstring> </property> @@ -145,7 +145,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -171,7 +171,7 @@ <cstring>m_editMessage</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -182,9 +182,9 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -195,7 +195,7 @@ <cstring>m_editTitle</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyTitle</cstring> </property> @@ -208,7 +208,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -233,9 +233,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -246,7 +246,7 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyPerformer</cstring> </property> @@ -261,7 +261,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index 50daff2..7478a3e 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -2,7 +2,7 @@ <class>base_K3bAudioCdTextWidget</class> <comment>Widget to edit the global CD-Text in a K3b audio project.</comment> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>K3bAudioCDTextWidget</cstring> </property> @@ -13,7 +13,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupCdText</cstring> </property> @@ -40,7 +40,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -57,7 +57,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -68,9 +68,9 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyPerformer</cstring> </property> @@ -94,9 +94,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -107,7 +107,7 @@ <cstring>m_editTitle</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyTitle</cstring> </property> @@ -120,7 +120,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -133,9 +133,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -151,14 +151,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonMoreFields</cstring> </property> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> @@ -207,14 +207,14 @@ <tabstop>m_editTitle</tabstop> <tabstop>m_editPerformer</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">slotCopyTitle()</slot> <slot access="protected" specifier="pure virtual">slotCopyPerformer()</slot> <slot access="protected" specifier="pure virtual">slotCopyArranger()</slot> <slot access="protected" specifier="pure virtual">slotCopyComposer()</slot> <slot access="protected" specifier="pure virtual">slotCopySongwriter()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index 813b042..4641369 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bAudioTrackWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>K3bAudioTrackWidget</cstring> </property> @@ -15,11 +15,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_mainTab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -30,9 +30,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -43,7 +43,7 @@ <cstring>m_editSongwriter</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -83,7 +83,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -94,7 +94,7 @@ <cstring>m_editArranger</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="2" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -105,7 +105,7 @@ <cstring>m_editComposer</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -121,7 +121,7 @@ <cstring>m_editTitle</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -132,7 +132,7 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -143,7 +143,7 @@ <cstring>m_editIsrc</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>350</width> <height>50</height> @@ -185,7 +185,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -196,7 +196,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkPreemphasis</cstring> </property> @@ -204,10 +204,10 @@ <string>Preemph&asis</string> </property> <property name="whatsThis" stdset="0"> - <string><p>Preemphasis is mainly used in audio processing. Higher frequencies in audio signals usually have lower amplitudes. This can lead to bad signal quality on noisy transmission because the high frequencies might become too weak. To avoid this effect, high frequencies are amplified before transmission (preemphasis); the receiver will then weaken them accordingly for playback.</string> + <string><p>Preemphasis is mainly used in audio processing. Higher frequencies in audio Q_SIGNALS usually have lower amplitudes. This can lead to bad signal quality on noisy transmission because the high frequencies might become too weak. To avoid this effect, high frequencies are amplified before transmission (preemphasis); the receiver will then weaken them accordingly for playback.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkCopyPermitted</cstring> </property> @@ -215,15 +215,15 @@ <string>&Copy permitted</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelPostGap</cstring> </property> @@ -257,7 +257,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>161</width> <height>20</height> @@ -276,7 +276,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>80</height> @@ -322,7 +322,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <tabstop>m_checkPreemphasis</tabstop> <tabstop>m_checkCopyPermitted</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 6ba21f6..f7fab2e 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bBootImageView</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bBootImageView</cstring> </property> @@ -12,15 +12,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> @@ -36,7 +36,7 @@ <string>Boot images:</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonNew</cstring> </property> @@ -47,7 +47,7 @@ <string>Add new boot image</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonDelete</cstring> </property> @@ -104,7 +104,7 @@ <bool>true</bool> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_groupImageType</cstring> </property> @@ -115,7 +115,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioFloppy</cstring> </property> @@ -126,7 +126,7 @@ <string>Emulate a 1440/2880 kb floppy</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioHarddisk</cstring> </property> @@ -137,7 +137,7 @@ <string>Emulate a harddisk</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioNoEmulation</cstring> </property> @@ -150,7 +150,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupOptions</cstring> </property> @@ -169,7 +169,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkNoBoot</cstring> </property> @@ -180,7 +180,7 @@ <string>Do not boot from the emulated floppy/harddisk</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkInfoTable</cstring> </property> @@ -188,15 +188,15 @@ <string>Boot-info-table</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_editLoadSegment</cstring> </property> @@ -207,7 +207,7 @@ <string>0</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_editLoadSize</cstring> </property> @@ -218,7 +218,7 @@ <string>0</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -229,7 +229,7 @@ <string>Boot load segment:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -244,15 +244,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonToggleOptions</cstring> </property> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>261</width> <height>21</height> @@ -279,15 +279,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -295,7 +295,7 @@ <string>Boot catalog:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editBootCataloge</cstring> </property> @@ -384,10 +384,10 @@ <slot>slotOptionsChanged()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotOptionsChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui index 3427ab7..2b0e7f3 100644 --- a/src/projects/base_k3bdataimagesettings.ui +++ b/src/projects/base_k3bdataimagesettings.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bDataImageSettings</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bDataImageSetings</cstring> </property> @@ -15,7 +15,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupVolumeName</cstring> </property> @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editVolumeName</cstring> </property> @@ -34,7 +34,7 @@ <number>32</number> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonMoreVolDescFields</cstring> </property> @@ -44,7 +44,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupFileSystem</cstring> </property> @@ -61,7 +61,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_comboFilesystems</cstring> </property> @@ -77,7 +77,7 @@ <string>File system presets</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonCustomFilesystems</cstring> </property> @@ -87,15 +87,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupSymlinks</cstring> </property> @@ -106,7 +106,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>No Change</string> @@ -162,7 +162,7 @@ Be aware that in case Rock Ridge extensions are disabled (which is not recommend </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupWhitespace</cstring> </property> @@ -173,7 +173,7 @@ Be aware that in case Rock Ridge extensions are disabled (which is not recommend <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>No Change</string> @@ -222,7 +222,7 @@ If this option is checked, K3b will replace all spaces in all filenames with the Example: 'my good file.ext' becomes 'my_good_file.ext'</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editReplace</cstring> </property> @@ -258,7 +258,7 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> @@ -270,5 +270,5 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string> <tabstops> <tabstop>m_editReplace</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui index ce31be9..74b9681 100644 --- a/src/projects/base_k3bdatavolumedescwidget.ui +++ b/src/projects/base_k3bdatavolumedescwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bDataVolumeDescWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bDataVolumeDescWidget</cstring> </property> @@ -18,7 +18,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_editVolumeName</cstring> </property> @@ -26,7 +26,7 @@ <number>32</number> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_editVolumeSetName</cstring> </property> @@ -34,7 +34,7 @@ <number>128</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -45,7 +45,7 @@ <cstring>m_editVolumeSetName</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -56,7 +56,7 @@ <cstring>m_editVolumeName</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_editPublisher</cstring> </property> @@ -64,7 +64,7 @@ <number>128</number> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>m_editPreparer</cstring> </property> @@ -72,7 +72,7 @@ <number>128</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -83,7 +83,7 @@ <cstring>m_editPreparer</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -94,7 +94,7 @@ <cstring>m_editPublisher</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -105,15 +105,15 @@ <cstring>m_spinVolumeSetSize</cstring> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinVolumeSetSize</cstring> </property> @@ -127,21 +127,21 @@ <number>1</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Volume set &number:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>m_spinVolumeSetNumber</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinVolumeSetNumber</cstring> </property> @@ -160,7 +160,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -171,7 +171,7 @@ <cstring>m_editSystem</cstring> </property> </widget> - <widget class="QLineEdit" row="6" column="1"> + <widget class="TQLineEdit" row="6" column="1"> <property name="name"> <cstring>m_editSystem</cstring> </property> @@ -179,7 +179,7 @@ <number>32</number> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -221,7 +221,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLineEdit" row="7" column="1"> + <widget class="TQLineEdit" row="7" column="1"> <property name="name"> <cstring>m_editApplication</cstring> </property> @@ -229,15 +229,15 @@ <number>128</number> </property> </widget> - <widget class="QLayoutWidget" row="11" column="1"> + <widget class="TQLayoutWidget" row="11" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editBiblio</cstring> </property> @@ -245,7 +245,7 @@ <number>37</number> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonFindBiblio</cstring> </property> @@ -258,15 +258,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="9" column="1"> + <widget class="TQLayoutWidget" row="9" column="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editAbstract</cstring> </property> @@ -274,7 +274,7 @@ <number>37</number> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonFindAbstract</cstring> </property> @@ -287,15 +287,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="10" column="1"> + <widget class="TQLayoutWidget" row="10" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editCopyright</cstring> </property> @@ -303,7 +303,7 @@ <number>37</number> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonFindCopyright</cstring> </property> @@ -316,7 +316,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="9" column="0"> + <widget class="TQLabel" row="9" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -324,7 +324,7 @@ <string>Abstract file:</string> </property> </widget> - <widget class="QLabel" row="10" column="0"> + <widget class="TQLabel" row="10" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -332,7 +332,7 @@ <string>Copyright file:</string> </property> </widget> - <widget class="QLabel" row="11" column="0"> + <widget class="TQLabel" row="11" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -366,5 +366,5 @@ <tabstop>m_editSystem</tabstop> <tabstop>m_editApplication</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui index 973dd11..28b093d 100644 --- a/src/projects/base_k3bmovixoptionswidget.ui +++ b/src/projects/base_k3bmovixoptionswidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bMovixOptionsWidget</class> <author>Sebastian trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -9,7 +9,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -42,7 +42,7 @@ <string>Select the font to be used to render subtitles</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -53,15 +53,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkRandomPlay</cstring> </property> @@ -75,7 +75,7 @@ <string><p>If this option is checked the order in which the files are played is determined randomly every time it is played.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkNoDma</cstring> </property> @@ -91,7 +91,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>m_editUnwantedMplayerOptions</cstring> </property> @@ -104,7 +104,7 @@ <pre>opt1 opt2 opt3</pre></string> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>m_editAdditionalMplayerOptions</cstring> </property> @@ -117,7 +117,7 @@ <pre>opt1 opt2 opt3</pre></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -125,7 +125,7 @@ <string>Additional MPlayer options:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -133,7 +133,7 @@ <string>Loop playlist:</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>m_spinLoop</cstring> </property> @@ -150,7 +150,7 @@ <string>How many times should the playlist be looped</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_labelAudioBackground</cstring> </property> @@ -173,7 +173,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -184,7 +184,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_labelKeyboardLayout</cstring> </property> @@ -192,7 +192,7 @@ <string>Keyboard Layout:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -208,7 +208,7 @@ <string>Select the language of the eMovix help screens</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -239,15 +239,15 @@ <cstring>m_comboKeyboardLayout</cstring> </property> <property name="toolTip" stdset="0"> - <string>Select the layout of the keyboard</string> + <string>Select the tqlayout of the keyboard</string> </property> <property name="whatsThis" stdset="0"> - <string><p>The keyboard layout selected here will be used for the eMovix commands like controlling the media player.</string> + <string><p>The keyboard tqlayout selected here will be used for the eMovix commands like controlling the media player.</string> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -266,7 +266,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkEject</cstring> </property> @@ -280,7 +280,7 @@ <string><p>If this option is checked the disk will be ejected after MPlayer has finished.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkShutdown</cstring> </property> @@ -294,7 +294,7 @@ <string><p>If this option is checked the PC will be shut down after MPlayer has finished playing.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkReboot</cstring> </property> @@ -326,7 +326,7 @@ <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 97bf318..4ec9ff3 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -30,24 +30,24 @@ #include <k3bwritingmodewidget.h> #include <k3bexternalbinmanager.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qgrid.h> -#include <qtoolbutton.h> -#include <qptrlist.h> -#include <qstringlist.h> -#include <qpoint.h> -#include <qhbox.h> -#include <qspinbox.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqgrid.h> +#include <tqtoolbutton.h> +#include <tqptrlist.h> +#include <tqstringlist.h> +#include <tqpoint.h> +#include <tqhbox.h> +#include <tqspinbox.h> #include <klocale.h> #include <kstandarddirs.h> @@ -55,17 +55,17 @@ #include <kmessagebox.h> -K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, parent, name, modal ), +K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, tqparent, name, modal ), m_doc(_doc) { prepareGui(); setTitle( i18n("Audio Project"), i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)", - m_doc->numOfTracks() ).arg(m_doc->length().toString()) ); + m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); // create cd-text page @@ -74,27 +74,27 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, QWidget *parent, const // create advanced tab // ---------------------------------------------------------- - QWidget* advancedTab = new QWidget( this ); - QGridLayout* advancedTabGrid = new QGridLayout( advancedTab ); + TQWidget* advancedTab = new TQWidget( this ); + TQGridLayout* advancedTabGrid = new TQGridLayout( advancedTab ); advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - QGroupBox* advancedSettingsGroup = new QGroupBox( 1, Qt::Vertical, i18n("Settings"), advancedTab ); + TQGroupBox* advancedSettingsGroup = new TQGroupBox( 1, Qt::Vertical, i18n("Settings"), advancedTab ); m_checkNormalize = K3bStdGuiItems::normalizeCheckBox( advancedSettingsGroup ); - QGroupBox* advancedGimmickGroup = new QGroupBox( 1, Qt::Vertical, i18n("Gimmicks"), advancedTab ); - m_checkHideFirstTrack = new QCheckBox( i18n( "Hide first track" ), advancedGimmickGroup, "m_checkHideFirstTrack" ); + TQGroupBox* advancedGimmickGroup = new TQGroupBox( 1, Qt::Vertical, i18n("Gimmicks"), advancedTab ); + m_checkHideFirstTrack = new TQCheckBox( i18n( "Hide first track" ), advancedGimmickGroup, "m_checkHideFirstTrack" ); - m_audioRippingGroup = new QGroupBox( 3, Qt::Vertical, i18n("Audio Ripping"), advancedTab ); - QHBox* box = new QHBox( m_audioRippingGroup ); + m_audioRippingGroup = new TQGroupBox( 3, Qt::Vertical, i18n("Audio Ripping"), advancedTab ); + TQHBox* box = new TQHBox( m_audioRippingGroup ); box->setSpacing( spacingHint() ); - box->setStretchFactor(new QLabel( i18n("Paranoia mode:"), box ), 1 ); + box->setStretchFactor(new TQLabel( i18n("Paranoia mode:"), box ), 1 ); m_comboParanoiaMode = K3bStdGuiItems::paranoiaModeComboBox( box ); - box = new QHBox( m_audioRippingGroup ); + box = new TQHBox( m_audioRippingGroup ); box->setSpacing( spacingHint() ); - box->setStretchFactor( new QLabel( i18n("Read retries:"), box ), 1 ); - m_spinAudioRippingReadRetries = new QSpinBox( 1, 128, 1, box ); - m_checkAudioRippingIgnoreReadErrors = new QCheckBox( i18n("Ignore read errors"), m_audioRippingGroup ); + box->setStretchFactor( new TQLabel( i18n("Read retries:"), box ), 1 ); + m_spinAudioRippingReadRetries = new TQSpinBox( 1, 128, 1, box ); + m_checkAudioRippingIgnoreReadErrors = new TQCheckBox( i18n("Ignore read errors"), m_audioRippingGroup ); advancedTabGrid->addWidget( advancedSettingsGroup, 0, 0 ); advancedTabGrid->addWidget( advancedGimmickGroup, 1, 0 ); @@ -103,18 +103,18 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, QWidget *parent, const addPage( advancedTab, i18n("Advanced") ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, SLOT(slotToggleAll()) ); - connect( m_checkNormalize, SIGNAL(toggled(bool)), this, SLOT(slotNormalizeToggled(bool)) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotCacheImageToggled(bool)) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkNormalize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNormalizeToggled(bool)) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCacheImageToggled(bool)) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); // ToolTips // ------------------------------------------------------------------------- - QToolTip::add( m_checkHideFirstTrack, i18n("Hide the first track in the first pregap") ); + TQToolTip::add( m_checkHideFirstTrack, i18n("Hide the first track in the first pregap") ); // What's This info // ------------------------------------------------------------------------- - QWhatsThis::add( m_checkHideFirstTrack, + TQWhatsThis::add( m_checkHideFirstTrack, i18n("<p>If this option is checked K3b will <em>hide</em> the first track." "<p>The audio CD standard uses pregaps before every track on the CD. " "By default these last for 2 seconds and are silent. In DAO mode it " @@ -262,7 +262,7 @@ void K3bAudioBurnDialog::toggleAll() } -void K3bAudioBurnDialog::showEvent( QShowEvent* e ) +void K3bAudioBurnDialog::showEvent( TQShowEvent* e ) { // we only show the audio ripping options when there are audio cd track sources bool showRipOptions = false; @@ -308,7 +308,7 @@ void K3bAudioBurnDialog::slotNormalizeToggled( bool on ) if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize audio tracks when burning on-the-fly. " "The external program used for this task only supports normalizing a set " "of audio files."), - QString::null, + TQString(), i18n("Disable normalization"), i18n("Disable on-the-fly burning"), "audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes ) @@ -327,7 +327,7 @@ void K3bAudioBurnDialog::slotCacheImageToggled( bool on ) if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize audio tracks when burning on-the-fly. " "The external program used for this task only supports normalizing a set " "of audio files."), - QString::null, + TQString(), i18n("Disable normalization"), i18n("Disable on-the-fly burning"), "audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes ) diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h index 47be09f..64355a2 100644 --- a/src/projects/k3baudioburndialog.h +++ b/src/projects/k3baudioburndialog.h @@ -20,20 +20,20 @@ #include "k3bprojectburndialog.h" -#include <qvariant.h> -#include <qwidget.h> +#include <tqvariant.h> +#include <tqwidget.h> -class QCheckBox; -class QComboBox; -class QGroupBox; -class QLabel; -class QLineEdit; -class QSpinBox; +class TQCheckBox; +class TQComboBox; +class TQGroupBox; +class TQLabel; +class TQLineEdit; +class TQSpinBox; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bAudioDoc; class K3bAudioCdTextWidget; -class QShowEvent; +class TQShowEvent; /** @@ -42,9 +42,10 @@ class QShowEvent; class K3bAudioBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bAudioBurnDialog(K3bAudioDoc* doc, QWidget *parent=0, const char *name=0, bool modal = true ); + K3bAudioBurnDialog(K3bAudioDoc* doc, TQWidget *tqparent=0, const char *name=0, bool modal = true ); ~K3bAudioBurnDialog(); protected: @@ -53,7 +54,7 @@ class K3bAudioBurnDialog : public K3bProjectBurnDialog void loadK3bDefaults(); void loadUserDefaults( KConfigBase* ); void saveUserDefaults( KConfigBase* ); - void showEvent( QShowEvent* ); + void showEvent( TQShowEvent* ); void toggleAll(); protected slots: @@ -68,12 +69,12 @@ class K3bAudioBurnDialog : public K3bProjectBurnDialog /** * We need this here to be able to hide/show the group */ - QGroupBox* m_audioRippingGroup; - QCheckBox* m_checkHideFirstTrack; - QCheckBox* m_checkNormalize; - QCheckBox* m_checkAudioRippingIgnoreReadErrors; - QSpinBox* m_spinAudioRippingReadRetries; - QComboBox* m_comboParanoiaMode; + TQGroupBox* m_audioRippingGroup; + TQCheckBox* m_checkHideFirstTrack; + TQCheckBox* m_checkNormalize; + TQCheckBox* m_checkAudioRippingIgnoreReadErrors; + TQSpinBox* m_spinAudioRippingReadRetries; + TQComboBox* m_comboParanoiaMode; K3bAudioCdTextWidget* m_cdtextWidget; K3bAudioDoc* m_doc; }; diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp index 8ee5543..f6237b9 100644 --- a/src/projects/k3baudiocdtextwidget.cpp +++ b/src/projects/k3baudiocdtextwidget.cpp @@ -20,12 +20,12 @@ #include "k3baudiotrack.h" #include <k3bcdtextvalidator.h> -#include <qcheckbox.h> -#include <qtoolbutton.h> -#include <qpushbutton.h> -#include <qptrlist.h> -#include <qlayout.h> -#include <qgroupbox.h> +#include <tqcheckbox.h> +#include <tqtoolbutton.h> +#include <tqpushbutton.h> +#include <tqptrlist.h> +#include <tqlayout.h> +#include <tqgroupbox.h> #include <klineedit.h> #include <klocale.h> @@ -36,8 +36,8 @@ class K3bAudioCdTextWidget::AllFieldsDialog : public KDialogBase { public: - AllFieldsDialog( QWidget* parent ) - : KDialogBase( parent, + AllFieldsDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "cdtext_allfields_dialog", true, i18n("CD-Text"), @@ -52,8 +52,8 @@ public: }; -K3bAudioCdTextWidget::K3bAudioCdTextWidget( QWidget* parent, const char* name ) - : base_K3bAudioCdTextWidget( parent, name ), +K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* tqparent, const char* name ) + : base_K3bAudioCdTextWidget( tqparent, name ), m_doc(0) { m_allFieldsDlg = new AllFieldsDialog( this ); @@ -67,7 +67,7 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( QWidget* parent, const char* name ) m_allFieldsDlg->w->m_buttonCopyComposer->setPixmap( SmallIcon( "editcopy" ) ); m_allFieldsDlg->w->m_buttonCopyArranger->setPixmap( SmallIcon( "editcopy" ) ); - QValidator* cdTextVal = new K3bCdTextValidator( this ); + TQValidator* cdTextVal = new K3bCdTextValidator( TQT_TQOBJECT(this) ); m_editTitle->setValidator( cdTextVal ); m_editPerformer->setValidator( cdTextVal ); @@ -80,19 +80,19 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( QWidget* parent, const char* name ) m_allFieldsDlg->w->m_editSongwriter->setValidator( cdTextVal ); m_allFieldsDlg->w->m_editComposer->setValidator( cdTextVal ); - connect( m_allFieldsDlg->w->m_buttonCopyTitle, SIGNAL(clicked()), - this, SLOT(slotCopyTitle()) ); - connect( m_allFieldsDlg->w->m_buttonCopyPerformer, SIGNAL(clicked()), - this, SLOT(slotCopyPerformer()) ); - connect( m_allFieldsDlg->w->m_buttonCopyArranger, SIGNAL(clicked()), - this, SLOT(slotCopyArranger()) ); - connect( m_allFieldsDlg->w->m_buttonCopySongwriter, SIGNAL(clicked()), - this, SLOT(slotCopySongwriter()) ); - connect( m_allFieldsDlg->w->m_buttonCopyComposer, SIGNAL(clicked()), - this, SLOT(slotCopyComposer()) ); - - connect( m_buttonMoreFields, SIGNAL(clicked()), - this, SLOT(slotMoreFields()) ); + connect( m_allFieldsDlg->w->m_buttonCopyTitle, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopyTitle()) ); + connect( m_allFieldsDlg->w->m_buttonCopyPerformer, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopyPerformer()) ); + connect( m_allFieldsDlg->w->m_buttonCopyArranger, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopyArranger()) ); + connect( m_allFieldsDlg->w->m_buttonCopySongwriter, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopySongwriter()) ); + connect( m_allFieldsDlg->w->m_buttonCopyComposer, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopyComposer()) ); + + connect( m_buttonMoreFields, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotMoreFields()) ); } @@ -143,17 +143,17 @@ void K3bAudioCdTextWidget::slotMoreFields() m_allFieldsDlg->w->m_editPerformer->setText( m_editPerformer->text() ); // save old settings - QString title = m_allFieldsDlg->w->m_editTitle->text(); - QString performer = m_allFieldsDlg->w->m_editPerformer->text(); - QString disc_id = m_allFieldsDlg->w->m_editDisc_id->text(); - QString upc_ean = m_allFieldsDlg->w->m_editUpc_ean->text(); - QString arranger = m_allFieldsDlg->w->m_editArranger->text(); - QString songwriter = m_allFieldsDlg->w->m_editSongwriter->text(); - QString composer = m_allFieldsDlg->w->m_editComposer->text(); - QString message = m_allFieldsDlg->w->m_editMessage->text(); + TQString title = m_allFieldsDlg->w->m_editTitle->text(); + TQString performer = m_allFieldsDlg->w->m_editPerformer->text(); + TQString disc_id = m_allFieldsDlg->w->m_editDisc_id->text(); + TQString upc_ean = m_allFieldsDlg->w->m_editUpc_ean->text(); + TQString arranger = m_allFieldsDlg->w->m_editArranger->text(); + TQString songwriter = m_allFieldsDlg->w->m_editSongwriter->text(); + TQString composer = m_allFieldsDlg->w->m_editComposer->text(); + TQString message = m_allFieldsDlg->w->m_editMessage->text(); // exec dlg - if( m_allFieldsDlg->exec() == QDialog::Accepted ) { + if( m_allFieldsDlg->exec() == TQDialog::Accepted ) { // accept new entries m_editTitle->setText( m_allFieldsDlg->w->m_editTitle->text() ); m_editPerformer->setText( m_allFieldsDlg->w->m_editPerformer->text() ); diff --git a/src/projects/k3baudiocdtextwidget.h b/src/projects/k3baudiocdtextwidget.h index 49b579f..88ff568 100644 --- a/src/projects/k3baudiocdtextwidget.h +++ b/src/projects/k3baudiocdtextwidget.h @@ -25,9 +25,10 @@ class K3bAudioDoc; class K3bAudioCdTextWidget : public base_K3bAudioCdTextWidget { Q_OBJECT + TQ_OBJECT public: - K3bAudioCdTextWidget( QWidget* parent = 0, const char* name = 0 ); + K3bAudioCdTextWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioCdTextWidget(); bool isChecked() const; diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp index d54bb5d..541c946 100644 --- a/src/projects/k3baudiodatasourceeditwidget.cpp +++ b/src/projects/k3baudiodatasourceeditwidget.cpp @@ -19,27 +19,27 @@ #include <k3baudiodatasource.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqtooltip.h> #include <klocale.h> #include <kdialog.h> -K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( QWidget* parent, const char* name ) - : QWidget( parent, name ), +K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ), m_source(0) { m_editor = new K3bAudioEditorWidget( this ); m_editStartOffset = new K3bMsfEdit( this ); m_editEndOffset = new K3bMsfEdit( this ); - QLabel* startLabel = new QLabel( i18n("Start Offset") + ":", this ); - QLabel* endLabel = new QLabel( i18n("End Offset") + ":", this ); - endLabel->setAlignment( Qt::AlignRight ); + TQLabel* startLabel = new TQLabel( i18n("Start Offset") + ":", this ); + TQLabel* endLabel = new TQLabel( i18n("End Offset") + ":", this ); + endLabel->tqsetAlignment( TQt::AlignRight ); - QGridLayout* grid = new QGridLayout( this ); + TQGridLayout* grid = new TQGridLayout( this ); grid->setMargin( 0 ); grid->setSpacing( KDialog::spacingHint() ); @@ -51,16 +51,16 @@ K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( QWidget* parent, con grid->setColStretch( 1, 1 ); // setup connections between the msfedits and the editor - connect( m_editor, SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), - this, SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); + connect( m_editor, TQT_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), + this, TQT_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); - connect( m_editStartOffset, SIGNAL(valueChanged(const K3b::Msf&)), - this, SLOT(slotStartOffsetEdited(const K3b::Msf&)) ); + connect( m_editStartOffset, TQT_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQT_SLOT(slotStartOffsetEdited(const K3b::Msf&)) ); - connect( m_editEndOffset, SIGNAL(valueChanged(const K3b::Msf&)), - this, SLOT(slotEndOffsetEdited(const K3b::Msf&)) ); + connect( m_editEndOffset, TQT_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQT_SLOT(slotEndOffsetEdited(const K3b::Msf&)) ); - QToolTip::add( m_editor, i18n("Drag the edges of the highlighted area to define the portion of the " + TQToolTip::add( m_editor, i18n("Drag the edges of the highlighted area to define the portion of the " "audio source you want to include in the Audio CD track. " "You can also use the input windows to fine-tune your selection.") ); } @@ -101,7 +101,7 @@ void K3bAudioDataSourceEditWidget::loadSource( K3bAudioDataSource* source ) false, false, i18n("Used part of the audio source"), - colorGroup().highlight() ); + tqcolorGroup().highlight() ); m_editStartOffset->setMaxValue( source->originalLength().lba() ); m_editEndOffset->setMaxValue( source->originalLength().lba() ); diff --git a/src/projects/k3baudiodatasourceeditwidget.h b/src/projects/k3baudiodatasourceeditwidget.h index 4c9d1cb..10a7ace 100644 --- a/src/projects/k3baudiodatasourceeditwidget.h +++ b/src/projects/k3baudiodatasourceeditwidget.h @@ -16,7 +16,7 @@ #ifndef _K3B_AUDIODATASOURCE_EDITWIDGET_H_ #define _K3B_AUDIODATASOURCE_EDITWIDGET_H_ -#include <qwidget.h> +#include <tqwidget.h> #include <k3bmsf.h> class K3bAudioDataSource; @@ -27,12 +27,13 @@ class K3bMsfEdit; * Widget to modify the start and end offset of a source or simply change * the length of a silence source. */ -class K3bAudioDataSourceEditWidget : public QWidget +class K3bAudioDataSourceEditWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bAudioDataSourceEditWidget( QWidget* parent = 0, const char* name = 0 ); + K3bAudioDataSourceEditWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioDataSourceEditWidget(); K3b::Msf startOffset() const; diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index 6cf3004..eb70a66 100644 --- a/src/projects/k3baudiodatasourceviewitem.cpp +++ b/src/projects/k3baudiodatasourceviewitem.cpp @@ -23,23 +23,23 @@ #include <kiconloader.h> -K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* parent, +K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* tqparent, K3bAudioDataSourceViewItem* after, K3bAudioDataSource* source ) - : K3bListViewItem( parent, after ), - m_trackViewItem( parent ), + : K3bListViewItem( tqparent, after ), + m_trackViewItem( tqparent ), m_source( source ), m_animationCounter(1) { // italic type - QFont f(listView()->font()); + TQFont f(listView()->font()); f.setItalic( true ); setFont( 3, f ); // setMarginVertical( 2 ); // gray out filename - setForegroundColor( 5, listView()->palette().disabled().foreground() ); + setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); // smaller filename f = listView()->font(); @@ -52,7 +52,7 @@ K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* p } -QString K3bAudioDataSourceViewItem::text( int i ) const +TQString K3bAudioDataSourceViewItem::text( int i ) const { switch( i ) { case 3: @@ -62,12 +62,12 @@ QString K3bAudioDataSourceViewItem::text( int i ) const case 5: return m_source->sourceComment(); default: - return QString::null; + return TQString(); } } -void K3bAudioDataSourceViewItem::setText( int col, const QString& text ) +void K3bAudioDataSourceViewItem::setText( int col, const TQString& text ) { // // See K3bAudioTrackViewItem::setText for an explanation why we have to check if @@ -89,7 +89,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const QString& text ) bool K3bAudioDataSourceViewItem::animate() { if( source()->length() == 0 && source()->isValid() ) { - QString icon = QString( "kde%1" ).arg( m_animationCounter ); + TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter ); setPixmap( 4, SmallIcon( icon ) ); m_animationCounter++; if ( m_animationCounter > 6 ) diff --git a/src/projects/k3baudiodatasourceviewitem.h b/src/projects/k3baudiodatasourceviewitem.h index 14da1de..7b2fb5a 100644 --- a/src/projects/k3baudiodatasourceviewitem.h +++ b/src/projects/k3baudiodatasourceviewitem.h @@ -25,15 +25,15 @@ class K3bAudioTrackViewItem; class K3bAudioDataSourceViewItem : public K3bListViewItem { public: - K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* parent, + K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* tqparent, K3bAudioDataSourceViewItem* after, K3bAudioDataSource* ); K3bAudioDataSource* source() const { return m_source; } K3bAudioTrackViewItem* trackViewItem() const { return m_trackViewItem; } - QString text( int i ) const; - void setText( int col, const QString& text ); + TQString text( int i ) const; + void setText( int col, const TQString& text ); bool animate(); @@ -42,7 +42,7 @@ class K3bAudioDataSourceViewItem : public K3bListViewItem /** * Does nothing becasue we don't want no branches here. */ - void paintBranches( QPainter*, const QColorGroup &, + void paintBranches( TQPainter*, const TQColorGroup &, int, int, int ) {} private: diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index 453f76f..186fdb5 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -15,13 +15,13 @@ #include "k3baudioeditorwidget.h" -#include <qpainter.h> -#include <qcolor.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qapplication.h> -#include <qdesktopwidget.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqcolor.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqapplication.h> +#include <tqdesktopwidget.h> +#include <tqtooltip.h> @@ -33,8 +33,8 @@ public: const K3b::Msf& e, bool sf, bool ef, - const QString& t, - const QBrush& b ) + const TQString& t, + const TQBrush& b ) : id(i), start(s), end(e), @@ -49,8 +49,8 @@ public: K3b::Msf end; bool startFixed; bool endFixed; - QBrush brush; - QString toolTip; + TQBrush brush; + TQString toolTip; bool operator<( const K3bAudioEditorWidget::Range& r ) { return start < r.start; @@ -70,8 +70,8 @@ public: Marker( int i, const K3b::Msf& msf, bool f, - const QColor& c, - const QString& t ) + const TQColor& c, + const TQString& t ) : id(i), pos(msf), fixed(f), @@ -82,25 +82,25 @@ public: int id; K3b::Msf pos; bool fixed; - QColor color; - QString toolTip; + TQColor color; + TQString toolTip; operator K3b::Msf& () { return pos; } }; -class K3bAudioEditorWidget::RangeList : public QPtrList<K3bAudioEditorWidget::Range> +class K3bAudioEditorWidget::RangeList : public TQPtrList<K3bAudioEditorWidget::Range> { public: RangeList() - : QPtrList<Range>() { + : TQPtrList<Range>() { } RangeList( const RangeList& l ) - : QPtrList<Range>( l ) { + : TQPtrList<Range>( l ) { } - int compareItems( QPtrCollection::Item item1, QPtrCollection::Item item2 ) { + int compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { if( *static_cast<Range*>(item1) > *static_cast<Range*>(item2) ) return 1; else if( *static_cast<Range*>(item1) < *static_cast<Range*>(item2) ) @@ -110,22 +110,22 @@ public: } }; -class K3bAudioEditorWidget::ToolTip : public QToolTip +class K3bAudioEditorWidget::ToolTip : public TQToolTip { public: ToolTip( K3bAudioEditorWidget* w ) - : QToolTip( w ), + : TQToolTip( w ), m_editorWidget( w ) { } protected: - void maybeTip( const QPoint& p ) { - QRect r = m_editorWidget->contentsRect(); + void maybeTip( const TQPoint& p ) { + TQRect r = m_editorWidget->contentsRect(); Marker* m = m_editorWidget->findMarker( p ); if( m ) { r.setLeft( p.x() - 1 ); r.setRight( p.x() + 1 ); - tip( r, m->toolTip.isEmpty() ? m->pos.toString() : QString("%1 (%2)").arg(m->toolTip).arg(m->pos.toString()) ); + tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").tqarg(m->toolTip).tqarg(m->pos.toString()) ); } else { Range* range = m_editorWidget->findRange( p ); @@ -134,8 +134,8 @@ protected: r.setRight( m_editorWidget->msfToPos( range->end ) ); tip( r, range->toolTip.isEmpty() - ? QString("%1 - %2").arg(range->start.toString()).arg(range->end.toString()) - : QString("%1 (%2 - %3)").arg(range->toolTip).arg(range->start.toString()).arg(range->end.toString()) ); + ? TQString("%1 - %2").tqarg(range->start.toString()).tqarg(range->end.toString()) + : TQString("%1 (%2 - %3)").tqarg(range->toolTip).tqarg(range->start.toString()).tqarg(range->end.toString()) ); } } } @@ -155,7 +155,7 @@ public: movedRange(0) { } - QBrush selectedRangeBrush; + TQBrush selectedRangeBrush; bool allowOverlappingRanges; bool rangeSelectionEnabled; @@ -168,8 +168,8 @@ public: }; -K3bAudioEditorWidget::K3bAudioEditorWidget( QWidget* parent, const char* name ) - : QFrame( parent, name, Qt::WNoAutoErase ), +K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name, TQt::WNoAutoErase ), m_maxMarkers(1), m_idCnt(1), m_mouseAt(true), @@ -177,12 +177,12 @@ K3bAudioEditorWidget::K3bAudioEditorWidget( QWidget* parent, const char* name ) m_draggedMarker(0) { d = new Private; - d->selectedRangeBrush = colorGroup().highlight(); + d->selectedRangeBrush = TQBrush(tqcolorGroup().highlight()); - setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ); + tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); setFrameStyle( StyledPanel|Sunken ); setMouseTracking(true); - setCursor( Qt::PointingHandCursor ); + setCursor( TQt::PointingHandCursor ); m_margin = 5; @@ -201,23 +201,23 @@ K3bAudioEditorWidget::~K3bAudioEditorWidget() } -QSize K3bAudioEditorWidget::minimumSizeHint() const +TQSize K3bAudioEditorWidget::tqminimumSizeHint() const { constPolish(); // some fixed height minimum and enough space for a tickmark every minute // But never exceed 2/3 of the the screen width, otherwise it just looks ugly // FIXME: this is still bad for long sources and there might be 60 minutes sources! - int maxWidth = QApplication::desktop()->width()*2/3; + int maxWidth = TQApplication::desktop()->width()*2/3; int wantedWidth = 2*m_margin + 2*frameWidth() + (m_length.totalFrames()/75/60 + 1) * fontMetrics().width( "000" ); - return QSize( QMIN( maxWidth, wantedWidth ), + return TQSize( TQMIN( maxWidth, wantedWidth ), 2*m_margin + 12 + 6 /*12 for the tickmarks and 6 for the markers */ + fontMetrics().height() + 2*frameWidth() ); } -QSize K3bAudioEditorWidget::sizeHint() const +TQSize K3bAudioEditorWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -236,13 +236,13 @@ const K3b::Msf K3bAudioEditorWidget::length() const } -void K3bAudioEditorWidget::setSelectedRangeBrush( const QBrush& b ) +void K3bAudioEditorWidget::setSelectedRangeBrush( const TQBrush& b ) { d->selectedRangeBrush = b; } -const QBrush& K3bAudioEditorWidget::selectedRangeBrush() const +const TQBrush& K3bAudioEditorWidget::selectedRangeBrush() const { return d->selectedRangeBrush; } @@ -263,7 +263,7 @@ bool K3bAudioEditorWidget::allowOverlappingRanges() const void K3bAudioEditorWidget::enableRangeSelection( bool b ) { d->rangeSelectionEnabled = b; - repaint( false ); + tqrepaint( false ); } @@ -283,7 +283,7 @@ void K3bAudioEditorWidget::setSelectedRange( K3bAudioEditorWidget::Range* r ) { d->selectedRange = r; if( rangeSelectedEnabled() ) { - repaint( false ); + tqrepaint( false ); emit selectedRangeChanged( d->selectedRange ? d->selectedRange->id : 0 ); } } @@ -300,18 +300,18 @@ int K3bAudioEditorWidget::selectedRange() const int K3bAudioEditorWidget::addRange( const K3b::Msf& start, const K3b::Msf& end, bool startFixed, bool endFixed, - const QString& toolTip, - const QBrush& brush ) + const TQString& toolTip, + const TQBrush& brush ) { if( start > end || end > m_length-1 ) return -1; Range* r = new Range( m_idCnt++, start, end, startFixed, endFixed, toolTip, - brush.style() != QBrush::NoBrush ? brush : QBrush(colorGroup().background()) ); + brush.style() != TQBrush::NoBrush ? brush : TQBrush(tqcolorGroup().background()) ); d->ranges.inSort( r ); // only update the changed range - QRect rect = contentsRect(); + TQRect rect = contentsRect(); rect.setLeft( msfToPos( start ) ); rect.setRight( msfToPos( end ) ); update( rect ); @@ -322,7 +322,7 @@ int K3bAudioEditorWidget::addRange( const K3b::Msf& start, const K3b::Msf& end, int K3bAudioEditorWidget::findRange( int pos ) const { - Range* r = findRange( QPoint( pos, 0 ) ); + Range* r = findRange( TQPoint( pos, 0 ) ); if( r ) return r->id; else @@ -332,7 +332,7 @@ int K3bAudioEditorWidget::findRange( int pos ) const int K3bAudioEditorWidget::findRangeEdge( int pos, bool* end ) const { - Range* r = findRangeEdge( QPoint( pos, 0 ), end ); + Range* r = findRangeEdge( TQPoint( pos, 0 ), end ); if( r ) return r->id; else @@ -356,7 +356,7 @@ bool K3bAudioEditorWidget::modifyRange( int identifier, const K3b::Msf& start, c if( !d->allowOverlappingRanges ) fixupOverlappingRanges( range ); - repaint( false ); + tqrepaint( false ); return true; } @@ -372,8 +372,8 @@ bool K3bAudioEditorWidget::removeRange( int identifier ) emit rangeRemoved( identifier ); - // repaint only the part of the range - QRect rect = contentsRect(); + // tqrepaint only the part of the range + TQRect rect = contentsRect(); rect.setLeft( msfToPos( range->start ) ); rect.setRight( msfToPos( range->end ) ); @@ -409,11 +409,11 @@ K3b::Msf K3bAudioEditorWidget::rangeEnd( int identifier ) const } -QValueList<int> K3bAudioEditorWidget::allRanges() const +TQValueList<int> K3bAudioEditorWidget::allRanges() const { - QValueList<int> l; + TQValueList<int> l; d->ranges.sort(); - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) l.append( (*it)->id ); return l; } @@ -424,16 +424,16 @@ void K3bAudioEditorWidget::setMaxNumberOfMarkers( int i ) m_maxMarkers = i; // remove last markers - while( m_markers.count() > QMAX( 1, m_maxMarkers ) ) { + while( m_markers.count() > TQMAX( 1, m_maxMarkers ) ) { removeMarker( m_markers.getLast()->id ); } } -int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const QString& toolTip, const QColor& color ) +int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const TQString& toolTip, const TQColor& color ) { if( pos < m_length ) { - Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : colorGroup().foreground(), toolTip ); + Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : tqcolorGroup().foreground(), toolTip ); m_markers.inSort( m ); return m->id; } @@ -450,7 +450,7 @@ bool K3bAudioEditorWidget::removeMarker( int identifier ) emit markerRemoved( identifier ); // TODO: in case a marker is bigger than one pixel this needs to be changed - QRect rect = contentsRect(); + TQRect rect = contentsRect(); rect.setLeft( msfToPos( m->pos ) ); rect.setRight( msfToPos( m->pos ) ); delete m; @@ -468,9 +468,9 @@ bool K3bAudioEditorWidget::moveMarker( int identifier, const K3b::Msf& pos ) { if( pos < m_length ) if( Marker* m = getMarker( identifier ) ) { - QRect rect = contentsRect(); - rect.setLeft( QMIN( msfToPos( pos ), msfToPos( m->pos ) ) ); - rect.setRight( QMAX( msfToPos( pos ), msfToPos( m->pos ) ) ); + TQRect rect = contentsRect(); + rect.setLeft( TQMIN( msfToPos( pos ), msfToPos( m->pos ) ) ); + rect.setRight( TQMAX( msfToPos( pos ), msfToPos( m->pos ) ) ); m->pos = pos; @@ -484,20 +484,20 @@ bool K3bAudioEditorWidget::moveMarker( int identifier, const K3b::Msf& pos ) } -void K3bAudioEditorWidget::drawContents( QPainter* p ) +void K3bAudioEditorWidget::drawContents( TQPainter* p ) { // double buffering - QPixmap pix( contentsRect().size() ); - pix.fill( colorGroup().base() ); + TQPixmap pix( contentsRect().size() ); + pix.fill( tqcolorGroup().base() ); - QPainter pixP; - pixP.begin( &pix, this ); + TQPainter pixP; + pixP.tqbegin( &pix, TQT_TQOBJECT(this) ); - QRect drawRect( contentsRect() ); + TQRect drawRect( contentsRect() ); drawRect.setLeft( drawRect.left() + m_margin ); drawRect.setRight( drawRect.right() - m_margin ); - // from minimumSizeHint() + // from tqminimumSizeHint() // int neededHeight = fontMetrics().height() + 12 + 6; // drawRect.setTop( drawRect.top() + (drawRect.height() - neededHeight)/2 ); @@ -510,24 +510,24 @@ void K3bAudioEditorWidget::drawContents( QPainter* p ) pixP.end(); - QRect rect = p->clipRegion().boundingRect(); - QRect pixRect = rect; + TQRect rect = p->clipRegion().boundingRect(); + TQRect pixRect = rect; pixRect.moveBy( -1*frameWidth(), -1*frameWidth() ); bitBlt( this, rect.topLeft(), &pix, pixRect ); } -void K3bAudioEditorWidget::drawAll( QPainter* p, const QRect& drawRect ) +void K3bAudioEditorWidget::drawAll( TQPainter* p, const TQRect& drawRect ) { // we simply draw the ranges one after the other. - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) drawRange( p, drawRect, *it ); // Hack to make sure the currently selected range is always on top if( d->selectedRange ) drawRange( p, drawRect, d->selectedRange ); - for( QPtrListIterator<Marker> it( m_markers ); *it; ++it ) + for( TQPtrListIterator<Marker> it( m_markers ); *it; ++it ) drawMarker( p, drawRect, *it ); @@ -547,7 +547,7 @@ void K3bAudioEditorWidget::drawAll( QPainter* p, const QRect& drawRect ) int minute = 1; int minuteStep = 1; int markerVPos = drawRect.bottom(); - int maxMarkerWidth = fontMetrics().width( QString::number(m_length.minutes()) ); + int maxMarkerWidth = fontMetrics().width( TQString::number(m_length.minutes()) ); int minNeededSpace = maxMarkerWidth + 1; int x = 0; while( minute*60*75 < m_length ) { @@ -556,11 +556,11 @@ void K3bAudioEditorWidget::drawAll( QPainter* p, const QRect& drawRect ) // only draw the mark if we have anough space if( newX - x >= minNeededSpace ) { p->drawLine( newX, markerVPos, newX, markerVPos-5 ); - QRect txtRect( newX-(maxMarkerWidth/2), + TQRect txtRect( newX-(maxMarkerWidth/2), markerVPos - 6 - fontMetrics().height(), maxMarkerWidth, fontMetrics().height() ); - p->drawText( txtRect, Qt::AlignCenter, QString::number(minute) ); + p->drawText( txtRect, TQt::AlignCenter, TQString::number(minute) ); // FIXME: draw second markers if we have enough space @@ -579,7 +579,7 @@ void K3bAudioEditorWidget::drawAll( QPainter* p, const QRect& drawRect ) } -void K3bAudioEditorWidget::drawRange( QPainter* p, const QRect& drawRect, K3bAudioEditorWidget::Range* r ) +void K3bAudioEditorWidget::drawRange( TQPainter* p, const TQRect& drawRect, K3bAudioEditorWidget::Range* r ) { p->save(); @@ -597,7 +597,7 @@ void K3bAudioEditorWidget::drawRange( QPainter* p, const QRect& drawRect, K3bAud } -void K3bAudioEditorWidget::drawMarker( QPainter* p, const QRect& drawRect, K3bAudioEditorWidget::Marker* m ) +void K3bAudioEditorWidget::drawMarker( TQPainter* p, const TQRect& drawRect, K3bAudioEditorWidget::Marker* m ) { p->save(); @@ -607,7 +607,7 @@ void K3bAudioEditorWidget::drawMarker( QPainter* p, const QRect& drawRect, K3bAu int x = msfToPos( m->pos ); p->drawLine( x, drawRect.bottom(), x, drawRect.top() ); - QPointArray points( 3 ); + TQPointArray points( 3 ); points.setPoint( 0, x, drawRect.top() + 6 ); points.setPoint( 1, x-3, drawRect.top() ); points.setPoint( 2, x+3, drawRect.top() ); @@ -621,7 +621,7 @@ void K3bAudioEditorWidget::fixupOverlappingRanges( Range* r ) { // copy the list to avoid problems with the iterator RangeList ranges( d->ranges ); - for( QPtrListIterator<Range> it( ranges ); *it; ++it ) { + for( TQPtrListIterator<Range> it( ranges ); *it; ++it ) { Range* range = *it; if( range != r ) { // remove the range if it is covered completely @@ -659,7 +659,7 @@ void K3bAudioEditorWidget::fixupOverlappingRanges( Range* r ) } -void K3bAudioEditorWidget::mousePressEvent( QMouseEvent* e ) +void K3bAudioEditorWidget::mousePressEvent( TQMouseEvent* e ) { m_draggedRange = 0; m_draggedMarker = 0; @@ -678,11 +678,11 @@ void K3bAudioEditorWidget::mousePressEvent( QMouseEvent* e ) m_draggedMarker = findMarker( e->pos() ); } - QFrame::mousePressEvent(e); + TQFrame::mousePressEvent(e); } -void K3bAudioEditorWidget::mouseReleaseEvent( QMouseEvent* e ) +void K3bAudioEditorWidget::mouseReleaseEvent( TQMouseEvent* e ) { if( !d->allowOverlappingRanges ) { // @@ -690,11 +690,11 @@ void K3bAudioEditorWidget::mouseReleaseEvent( QMouseEvent* e ) // if( m_draggedRange ) { fixupOverlappingRanges( m_draggedRange ); - repaint( false ); + tqrepaint( false ); } else if( d->movedRange ) { fixupOverlappingRanges( d->movedRange ); - repaint( false ); + tqrepaint( false ); } } @@ -702,17 +702,17 @@ void K3bAudioEditorWidget::mouseReleaseEvent( QMouseEvent* e ) m_draggedMarker = 0; d->movedRange = 0; - QFrame::mouseReleaseEvent(e); + TQFrame::mouseReleaseEvent(e); } -void K3bAudioEditorWidget::mouseDoubleClickEvent( QMouseEvent* e ) +void K3bAudioEditorWidget::mouseDoubleClickEvent( TQMouseEvent* e ) { - QFrame::mouseDoubleClickEvent(e); + TQFrame::mouseDoubleClickEvent(e); } -void K3bAudioEditorWidget::mouseMoveEvent( QMouseEvent* e ) +void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e ) { if( m_mouseAt ) emit mouseAt( posToMsf( e->pos().x() ) ); @@ -720,7 +720,7 @@ void K3bAudioEditorWidget::mouseMoveEvent( QMouseEvent* e ) if( e->state() & Qt::LeftButton ) { if( m_draggedRange ) { // determine the position the range's end was dragged to and its other end - K3b::Msf msfPos = QMAX( 0, QMIN( posToMsf( e->pos().x() ), m_length-1 ) ); + K3b::Msf msfPos = TQMAX( 0, TQMIN( posToMsf( e->pos().x() ), m_length-1 ) ); K3b::Msf otherEnd = ( m_draggingRangeEnd ? m_draggedRange->start : m_draggedRange->end ); // move it to the new pos @@ -739,13 +739,13 @@ void K3bAudioEditorWidget::mouseMoveEvent( QMouseEvent* e ) emit rangeChanged( m_draggedRange->id, m_draggedRange->start, m_draggedRange->end ); - repaint( false ); + tqrepaint( false ); } else if( m_draggedMarker ) { m_draggedMarker->pos = posToMsf( e->pos().x() ); emit markerMoved( m_draggedMarker->id, m_draggedMarker->pos ); - repaint( false ); + tqrepaint( false ); } else if( d->movedRange ) { int diff = posToMsf( e->pos().x() ).lba() - d->lastMovePosition.lba(); @@ -763,21 +763,21 @@ void K3bAudioEditorWidget::mouseMoveEvent( QMouseEvent* e ) emit rangeChanged( d->movedRange->id, d->movedRange->start, d->movedRange->end ); - repaint( false ); + tqrepaint( false ); } } else if( findRangeEdge( e->pos() ) || findMarker( e->pos() ) ) - setCursor( Qt::SizeHorCursor ); + setCursor( TQt::SizeHorCursor ); else - setCursor( Qt::PointingHandCursor ); + setCursor( TQt::PointingHandCursor ); - QFrame::mouseMoveEvent(e); + TQFrame::mouseMoveEvent(e); } K3bAudioEditorWidget::Range* K3bAudioEditorWidget::getRange( int i ) const { - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) if( (*it)->id == i ) return *it; @@ -785,11 +785,11 @@ K3bAudioEditorWidget::Range* K3bAudioEditorWidget::getRange( int i ) const } -K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRange( const QPoint& p ) const +K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRange( const TQPoint& p ) const { // TODO: binary search; maybe store start and end positions in sorted lists for quick searching // this might be a stupid approach but we do not have many ranges anyway - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) { + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) { Range* range = *it; int start = msfToPos( range->start ); int end = msfToPos( range->end ); @@ -802,11 +802,11 @@ K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRange( const QPoint& p ) } -K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRangeEdge( const QPoint& p, bool* isEnd ) const +K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRangeEdge( const TQPoint& p, bool* isEnd ) const { // TODO: binary search // this might be a stupid approach but we do not have many ranges anyway - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) { + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) { Range* range = *it; int start = msfToPos( range->start ); int end = msfToPos( range->end ); @@ -833,7 +833,7 @@ K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRangeEdge( const QPoint& K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::getMarker( int i ) const { - for( QPtrListIterator<Marker> it( m_markers ); *it; ++it ) + for( TQPtrListIterator<Marker> it( m_markers ); *it; ++it ) if( (*it)->id == i ) return *it; @@ -841,10 +841,10 @@ K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::getMarker( int i ) const } -K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::findMarker( const QPoint& p ) const +K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::findMarker( const TQPoint& p ) const { // TODO: binary search - for( QPtrListIterator<Marker> it( m_markers ); *it; ++it ) { + for( TQPtrListIterator<Marker> it( m_markers ); *it; ++it ) { Marker* marker = *it; int start = msfToPos( marker->pos ); @@ -860,7 +860,7 @@ K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::findMarker( const QPoint& p K3b::Msf K3bAudioEditorWidget::posToMsf( int p ) const { int w = contentsRect().width() - 2*m_margin; - int x = QMIN( p-frameWidth()-m_margin, w ); + int x = TQMIN( p-frameWidth()-m_margin, w ); return ( (int)((double)(m_length.lba()-1) / (double)w * (double)x) ); } @@ -870,7 +870,7 @@ int K3bAudioEditorWidget::msfToPos( const K3b::Msf& msf ) const { int w = contentsRect().width() - 2*m_margin; int pos = (int)((double)w / (double)(m_length.lba()-1) * (double)msf.lba()); - return frameWidth() + m_margin + QMIN( pos, w-1 ); + return frameWidth() + m_margin + TQMIN( pos, w-1 ); } diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h index 6e939d7..fdb3088 100644 --- a/src/projects/k3baudioeditorwidget.h +++ b/src/projects/k3baudioeditorwidget.h @@ -16,25 +16,26 @@ #ifndef _K3B_AUDIO_EDITOR_WIDGET_H_ #define _K3B_AUDIO_EDITOR_WIDGET_H_ -#include <qframe.h> -#include <qptrlist.h> +#include <tqframe.h> +#include <tqptrlist.h> #include <k3bmsf.h> -class QPainter; +class TQPainter; -class K3bAudioEditorWidget : public QFrame +class K3bAudioEditorWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bAudioEditorWidget( QWidget* parent = 0, const char* name = 0 ); + K3bAudioEditorWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioEditorWidget(); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; /** * For now the Editor has only one parameter: the length data. @@ -53,8 +54,8 @@ class K3bAudioEditorWidget : public QFrame */ int addRange( const K3b::Msf& start, const K3b::Msf& end, bool startFixed = false, bool endFixed = false, - const QString& toolTip = QString::null, - const QBrush& brush = QBrush() ); + const TQString& toolTip = TQString(), + const TQBrush& brush = TQBrush() ); /** * \returns the identifier of the range which spans over x position \a pos or @@ -86,7 +87,7 @@ class K3bAudioEditorWidget : public QFrame * \return A list of all ranges' identifiers sorted ascending by start * offset */ - QValueList<int> allRanges() const; + TQValueList<int> allRanges() const; void setMaxNumberOfMarkers( int ); @@ -95,7 +96,7 @@ class K3bAudioEditorWidget : public QFrame * @return -1 on error or an identifier on success. */ int addMarker( const K3b::Msf& pos, bool fixed = false, - const QString& toolTip = QString::null, const QColor& color = QColor() ); + const TQString& toolTip = TQString(), const TQColor& color = TQColor() ); /** * @return false if the marker does not exist. @@ -140,10 +141,10 @@ class K3bAudioEditorWidget : public QFrame int msfToPos( const K3b::Msf& msf ) const; /** - * Set the brush to paint the selected range. Default is QColorGroup::Highlight + * Set the brush to paint the selected range. Default is TQColorGroup::Highlight */ - void setSelectedRangeBrush( const QBrush& ); - const QBrush& selectedRangeBrush() const; + void setSelectedRangeBrush( const TQBrush& ); + const TQBrush& selectedRangeBrush() const; signals: /** @@ -177,14 +178,14 @@ class K3bAudioEditorWidget : public QFrame class Private; Private* d; - void mousePressEvent( QMouseEvent* e ); - void mouseReleaseEvent( QMouseEvent* e ); - void mouseDoubleClickEvent( QMouseEvent* e ); - void mouseMoveEvent( QMouseEvent* e ); - void drawContents( QPainter* ); - void drawAll( QPainter*, const QRect& ); - void drawRange( QPainter* p, const QRect&, Range* r ); - void drawMarker( QPainter* p, const QRect&, Marker* m ); + void mousePressEvent( TQMouseEvent* e ); + void mouseReleaseEvent( TQMouseEvent* e ); + void mouseDoubleClickEvent( TQMouseEvent* e ); + void mouseMoveEvent( TQMouseEvent* e ); + void drawContents( TQPainter* ); + void drawAll( TQPainter*, const TQRect& ); + void drawRange( TQPainter* p, const TQRect&, Range* r ); + void drawMarker( TQPainter* p, const TQRect&, Marker* m ); /** * Makes sure that \a r does not overlap any other range by modifying and @@ -194,14 +195,14 @@ class K3bAudioEditorWidget : public QFrame Range* getRange( int i ) const; Marker* getMarker( int i ) const; - Range* findRange( const QPoint& p ) const; - Range* findRangeEdge( const QPoint& p, bool* end = 0 ) const; - Marker* findMarker( const QPoint& p ) const; + Range* findRange( const TQPoint& p ) const; + Range* findRangeEdge( const TQPoint& p, bool* end = 0 ) const; + Marker* findMarker( const TQPoint& p ) const; void setSelectedRange( Range* ); int m_maxMarkers; K3b::Msf m_length; - QPtrList<Marker> m_markers; + TQPtrList<Marker> m_markers; int m_idCnt; bool m_mouseAt; diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index dfbcbb9..1e540e2 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -29,11 +29,11 @@ #include <kdebug.h> #include <kmessagebox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qfileinfo.h> -#include <qtimer.h> -#include <qdir.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqfileinfo.h> +#include <tqtimer.h> +#include <tqdir.h> class K3bAudioTrackAddingDialog::AnalyserThread : public K3bThread @@ -54,31 +54,31 @@ public: }; -K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( QWidget* parent, const char* name ) +K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* tqparent, const char* name ) : KDialogBase( Plain, i18n("Please be patient..."), Cancel, Cancel, - parent, + tqparent, name, true, true ), m_bCanceled(false) { - QWidget* page = plainPage(); - QGridLayout* grid = new QGridLayout( page ); + TQWidget* page = plainPage(); + TQGridLayout* grid = new TQGridLayout( page ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - m_infoLabel = new QLabel( page ); + m_infoLabel = new TQLabel( page ); m_busyWidget = new K3bBusyWidget( page ); grid->addWidget( m_infoLabel, 0, 0 ); grid->addWidget( m_busyWidget, 1, 0 ); m_analyserThread = new AnalyserThread(); - m_analyserJob = new K3bThreadJob( m_analyserThread, this, this ); - connect( m_analyserJob, SIGNAL(finished(bool)), this, SLOT(slotAnalysingFinished(bool)) ); + m_analyserJob = new K3bThreadJob( m_analyserThread, this, TQT_TQOBJECT(this) ); + connect( m_analyserJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAnalysingFinished(bool)) ); } @@ -91,48 +91,48 @@ K3bAudioTrackAddingDialog::~K3bAudioTrackAddingDialog() int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, K3bAudioDoc* doc, K3bAudioTrack* afterTrack, - K3bAudioTrack* parentTrack, + K3bAudioTrack* tqparentTrack, K3bAudioDataSource* afterSource, - QWidget* parent ) + TQWidget* tqparent ) { if( urls.isEmpty() ) return 0; - K3bAudioTrackAddingDialog dlg( parent ); + K3bAudioTrackAddingDialog dlg( tqparent ); dlg.m_urls = extractUrlList( urls ); dlg.m_doc = doc; dlg.m_trackAfter = afterTrack; - dlg.m_parentTrack = parentTrack; + dlg.m_parentTrack = tqparentTrack; dlg.m_sourceAfter = afterSource; - dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").arg(doc->URL().fileName()) ); + dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) ); dlg.m_busyWidget->showBusy(true); - QTimer::singleShot( 0, &dlg, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) ); int ret = dlg.exec(); - QString message; + TQString message; if( !dlg.m_unreadableFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Insufficient permissions to read the following files") ) - .arg( dlg.m_unreadableFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Insufficient permissions to read the following files") ) + .tqarg( dlg.m_unreadableFiles.join( "<br>" ) ); if( !dlg.m_notFoundFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Unable to find the following files") ) - .arg( dlg.m_notFoundFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Unable to find the following files") ) + .tqarg( dlg.m_notFoundFiles.join( "<br>" ) ); if( !dlg.m_nonLocalFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("No non-local files supported") ) - .arg( dlg.m_unreadableFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("No non-local files supported") ) + .tqarg( dlg.m_unreadableFiles.join( "<br>" ) ); if( !dlg.m_unsupportedFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br><i>%2</i><br>%3") - .arg( i18n("Unable to handle the following files due to an unsupported format" ) ) - .arg( i18n("You may manually convert these audio files to wave using another " + message += TQString("<p><b>%1:</b><br><i>%2</i><br>%3") + .tqarg( i18n("Unable to handle the following files due to an unsupported format" ) ) + .tqarg( i18n("You may manually convert these audio files to wave using another " "application supporting the audio format and then add the wave files " "to the K3b project.") ) - .arg( dlg.m_unsupportedFiles.join( "<br>" ) ); + .tqarg( dlg.m_unsupportedFiles.join( "<br>" ) ); if( !message.isEmpty() ) - KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); + KMessageBox::detailedSorry( tqparent, i18n("Problems while adding files to the project."), message ); return ret; } @@ -162,14 +162,14 @@ void K3bAudioTrackAddingDialog::slotAddUrls() } } - m_infoLabel->setText( i18n("Analysing file '%1'...").arg( url.fileName() ) ); + m_infoLabel->setText( i18n("Analysing file '%1'...").tqarg( url.fileName() ) ); if( !url.isLocalFile() ) { valid = false; m_nonLocalFiles.append( url.path() ); } else { - QFileInfo fi( url.path() ); + TQFileInfo fi( url.path() ); if( !fi.exists() ) { valid = false; m_notFoundFiles.append( url.path() ); @@ -199,7 +199,7 @@ void K3bAudioTrackAddingDialog::slotAddUrls() // invalid file, next url if( !valid ) { m_urls.remove( m_urls.begin() ); - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } } @@ -251,7 +251,7 @@ void K3bAudioTrackAddingDialog::slotAnalysingFinished( bool /*success*/ ) } } - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } @@ -271,16 +271,16 @@ KURL::List K3bAudioTrackAddingDialog::extractUrlList( const KURL::List& urls ) while( it != allUrls.end() ) { const KURL& url = *it; - QFileInfo fi( url.path() ); + TQFileInfo fi( url.path() ); if( fi.isDir() ) { it = allUrls.remove( it ); // add all files in the dir - QDir dir(fi.filePath()); - QStringList entries = dir.entryList( QDir::Files ); + TQDir dir(fi.filePath()); + TQStringList entries = dir.entryList( TQDir::Files ); KURL::List::iterator oldIt = it; // add all files into the list after the current item - for( QStringList::iterator dirIt = entries.begin(); + for( TQStringList::iterator dirIt = entries.begin(); dirIt != entries.end(); ++dirIt ) it = allUrls.insert( oldIt, KURL::fromPathOrURL( dir.absPath() + "/" + *dirIt ) ); } diff --git a/src/projects/k3baudiotrackaddingdialog.h b/src/projects/k3baudiotrackaddingdialog.h index 4590e95..3482771 100644 --- a/src/projects/k3baudiotrackaddingdialog.h +++ b/src/projects/k3baudiotrackaddingdialog.h @@ -19,11 +19,11 @@ #include <k3bjobhandler.h> #include <kdialogbase.h> #include <kurl.h> -#include <qstringlist.h> +#include <tqstringlist.h> class K3bBusyWidget; -class QLabel; +class TQLabel; class K3bAudioTrack; class K3bAudioDataSource; class K3bThreadJob; @@ -33,6 +33,7 @@ class K3bAudioDoc; class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler { Q_OBJECT + TQ_OBJECT public: ~K3bAudioTrackAddingDialog(); @@ -43,31 +44,31 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler int waitForMedia( K3bDevice::Device*, int = K3bDevice::STATE_EMPTY, int = K3bDevice::MEDIA_WRITABLE_CD, - const QString& = QString::null ) { return 0; } + const TQString& = TQString() ) { return 0; } /** * @reimplemented from K3bJobHandler */ - bool questionYesNo( const QString&, - const QString& = QString::null, - const QString& = QString::null, - const QString& = QString::null ) { return false; } + bool questionYesNo( const TQString&, + const TQString& = TQString(), + const TQString& = TQString(), + const TQString& = TQString() ) { return false; } /** * reimplemented from K3bJobHandler */ - void blockingInformation( const QString&, - const QString& = QString::null ) {} + void blockingInformation( const TQString&, + const TQString& = TQString() ) {} /** - * \return \see QDialog::exec() + * \return \see TQDialog::exec() */ static int addUrls( const KURL::List& urls, K3bAudioDoc* doc, K3bAudioTrack* afterTrack = 0, - K3bAudioTrack* parentTrack = 0, + K3bAudioTrack* tqparentTrack = 0, K3bAudioDataSource* afterSource = 0, - QWidget* parent = 0 ); + TQWidget* tqparent = 0 ); private slots: void slotAddUrls(); @@ -75,17 +76,17 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler void slotCancel(); private: - K3bAudioTrackAddingDialog( QWidget* parent = 0, const char* name = 0 ); + K3bAudioTrackAddingDialog( TQWidget* tqparent = 0, const char* name = 0 ); static KURL::List extractUrlList( const KURL::List& urls ); K3bBusyWidget* m_busyWidget; - QLabel* m_infoLabel; + TQLabel* m_infoLabel; - QStringList m_unreadableFiles; - QStringList m_notFoundFiles; - QStringList m_nonLocalFiles; - QStringList m_unsupportedFiles; + TQStringList m_unreadableFiles; + TQStringList m_notFoundFiles; + TQStringList m_nonLocalFiles; + TQStringList m_unsupportedFiles; KURL::List m_urls; diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp index ecb7796..676e12b 100644 --- a/src/projects/k3baudiotrackdialog.cpp +++ b/src/projects/k3baudiotrackdialog.cpp @@ -14,15 +14,15 @@ */ -#include <qtextedit.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qframe.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qhbox.h> -#include <qwhatsthis.h> +#include <tqtextedit.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqframe.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> #include <kiconloader.h> #include <klocale.h> @@ -54,10 +54,10 @@ // do only show cd-text and options (eventuelle index0) -K3bAudioTrackDialog::K3bAudioTrackDialog( QPtrList<K3bAudioTrack>& tracks, QWidget *parent, const char *name ) +K3bAudioTrackDialog::K3bAudioTrackDialog( TQPtrList<K3bAudioTrack>& tracks, TQWidget *tqparent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Audio Track Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply, - KDialogBase::Ok, parent, name ) + KDialogBase::Ok, tqparent, name ) { m_tracks = tracks; @@ -86,9 +86,9 @@ void K3bAudioTrackDialog::slotApply() void K3bAudioTrackDialog::setupGui() { - QFrame* frame = plainPage(); + TQFrame* frame = plainPage(); - QGridLayout* mainLayout = new QGridLayout( frame ); + TQGridLayout* mainLayout = new TQGridLayout( frame ); mainLayout->setSpacing( spacingHint() ); mainLayout->setMargin( 0 ); diff --git a/src/projects/k3baudiotrackdialog.h b/src/projects/k3baudiotrackdialog.h index 53edc1c..8eb0ce6 100644 --- a/src/projects/k3baudiotrackdialog.h +++ b/src/projects/k3baudiotrackdialog.h @@ -22,7 +22,7 @@ #include <k3bmsf.h> -#include <qptrlist.h> +#include <tqptrlist.h> class K3bAudioTrack; class K3bAudioTrackWidget; @@ -34,9 +34,10 @@ class K3bAudioTrackWidget; class K3bAudioTrackDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackDialog( QPtrList<K3bAudioTrack>&, QWidget *parent=0, const char *name=0); + K3bAudioTrackDialog( TQPtrList<K3bAudioTrack>&, TQWidget *tqparent=0, const char *name=0); ~K3bAudioTrackDialog(); protected slots: @@ -46,7 +47,7 @@ class K3bAudioTrackDialog : public KDialogBase void updateTrackLengthDisplay(); private: - QPtrList<K3bAudioTrack> m_tracks; + TQPtrList<K3bAudioTrack> m_tracks; K3bAudioTrackWidget* m_audioTrackWidget; diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index cac2e7a..1175de7 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -21,10 +21,10 @@ #include <kactionclasses.h> #include <klocale.h> -#include <qslider.h> -#include <qtimer.h> -#include <qmutex.h> -#include <qtooltip.h> +#include <tqslider.h> +#include <tqtimer.h> +#include <tqmutex.h> +#include <tqtooltip.h> class K3bAudioTrackPlayer::Private @@ -41,19 +41,19 @@ public: // just to handle them easily; KActionCollection* actionCollection; - QSlider* seekSlider; - QTimer sliderTimer; + TQSlider* seekSlider; + TQTimer sliderTimer; // used to make sure that no seek and read operation occur in parallel - QMutex mutex; + TQMutex mutex; bool playing; bool paused; }; -K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent, const char* name ) - : QObject( parent, name ), +K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), K3bAudioClient(), m_doc( doc ), m_currentTrack( 0 ) @@ -70,43 +70,43 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent, con d->actionPlay = new KAction( i18n("Play"), "player_play", KShortcut(), - this, SLOT(playPause()), + this, TQT_SLOT(playPause()), d->actionCollection, "play" ); d->actionPause = new KAction( i18n("Pause"), "player_pause", KShortcut(), - this, SLOT(playPause()), + this, TQT_SLOT(playPause()), d->actionCollection, "pause" ); d->actionPlayPause = new KAction( i18n("Play/Pause"), "player_play", KShortcut(), - this, SLOT(playPause()), + this, TQT_SLOT(playPause()), d->actionCollection, "play_pause" ); d->actionStop = new KAction( i18n("Stop"), "player_stop", KShortcut(), - this, SLOT(stop()), + this, TQT_SLOT(stop()), d->actionCollection, "stop" ); d->actionNext = new KAction( i18n("Next"), "player_end", KShortcut(), - this, SLOT(next()), + this, TQT_SLOT(next()), d->actionCollection, "next" ); d->actionPrev = new KAction( i18n("Prev"), "player_start", KShortcut(), - this, SLOT(prev()), + this, TQT_SLOT(prev()), d->actionCollection, "prev" ); - d->seekSlider = new QSlider( 0, 100, 1, 0, Qt::Horizontal, 0, "audiotrackplayerslider" ); - connect( d->seekSlider, SIGNAL(sliderMoved(int)), this, SLOT(slotSeek(int)) ); + d->seekSlider = new TQSlider( 0, 100, 1, 0, Qt::Horizontal, 0, "audiotrackplayerslider" ); + connect( d->seekSlider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotSeek(int)) ); // FIXME: maybe it's not such a good idea to use a KWidgetAction here since this way the player // can only be used once in one widget. If the action would always create a new slider we could plug // the action into several toolboxes and also use it in some resizing or track splitting dialogs. @@ -118,7 +118,7 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent, con d->actionCollection, "seek" ); // this should be done in KWidgetAction but is not yet - connect( d->actionSeek, SIGNAL(enabled(bool)), d->seekSlider, SLOT(setEnabled(bool)) ); + connect( d->actionSeek, TQT_SIGNAL(enabled(bool)), d->seekSlider, TQT_SLOT(setEnabled(bool)) ); d->actionStop->setEnabled(false); d->actionPause->setEnabled(false); @@ -126,18 +126,18 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent, con d->actionPrev->setEnabled(false); d->actionSeek->setEnabled(false); - connect( m_doc, SIGNAL(changed()), - this, SLOT(slotDocChanged()) ); - connect( m_doc, SIGNAL(trackChanged(K3bAudioTrack*)), - this, SLOT(slotTrackChanged(K3bAudioTrack*)) ); - connect( m_doc, SIGNAL(trackRemoved(K3bAudioTrack*)), - this, SLOT(slotTrackRemoved(K3bAudioTrack*)) ); - connect( &d->sliderTimer, SIGNAL(timeout()), - this, SLOT(slotUpdateSlider()) ); + connect( m_doc, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotDocChanged()) ); + connect( m_doc, TQT_SIGNAL(trackChanged(K3bAudioTrack*)), + this, TQT_SLOT(slotTrackChanged(K3bAudioTrack*)) ); + connect( m_doc, TQT_SIGNAL(trackRemoved(K3bAudioTrack*)), + this, TQT_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); + connect( &d->sliderTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotUpdateSlider()) ); // we just stop the player if the audio server has an error. K3bMainWindow will show the error message // This is all very hacky and has to be improved for K3b 2.0. But then we will probably use Phonon anyway... - connect( K3bAudioServer::instance(), SIGNAL(error(const QString&)), this, SLOT(stop()) ); + connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), this, TQT_SLOT(stop()) ); // tooltips d->actionPlay->setToolTip( i18n("Play") ); @@ -183,11 +183,11 @@ void K3bAudioTrackPlayer::playTrack( K3bAudioTrack* track ) { if( track ) { // we show the currently playing track as a tooltip on the slider - QToolTip::remove( d->seekSlider ); - QToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3") - .arg(track->trackNumber()) - .arg(track->artist()) - .arg(track->title()) ); + TQToolTip::remove( d->seekSlider ); + TQToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3") + .tqarg(track->trackNumber()) + .tqarg(track->artist()) + .tqarg(track->title()) ); d->seekSlider->setMaxValue( track->length().totalFrames() ); m_currentTrack = track; d->paused = true; diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h index 92f4f0a..7868500 100644 --- a/src/projects/k3baudiotrackplayer.h +++ b/src/projects/k3baudiotrackplayer.h @@ -16,7 +16,7 @@ #ifndef _K3B_AUDIO_TRACK_PLAYER_H_ #define _K3B_AUDIO_TRACK_PLAYER_H_ -#include <qobject.h> +#include <tqobject.h> #include <k3baudioclient.h> @@ -27,12 +27,13 @@ class K3bAudioTrack; class KAction; -class K3bAudioTrackPlayer : public QObject, public K3bAudioClient +class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent = 0, const char* name = 0 ); + K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioTrackPlayer(); K3bAudioTrack* currentPlayingTrack() const { return m_currentTrack; } diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 1acd370..9ec443a 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -25,49 +25,49 @@ #include <kaction.h> #include <kpopupmenu.h> -#include <qlabel.h> -#include <qframe.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqlayout.h> -K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, QWidget* parent, const char* name ) +K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("Split Audio Track"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, parent, name ), + KDialogBase::Ok, tqparent, name ), m_track(track) { - QFrame* frame = plainPage(); + TQFrame* frame = plainPage(); m_editorWidget = new K3bAudioEditorWidget( frame ); m_msfEditStart = new K3bMsfEdit( frame ); m_msfEditEnd = new K3bMsfEdit( frame ); - QGridLayout* layout = new QGridLayout( frame ); - layout->setMargin( 0 ); - layout->setSpacing( spacingHint() ); + TQGridLayout* tqlayout = new TQGridLayout( frame ); + tqlayout->setMargin( 0 ); + tqlayout->setSpacing( spacingHint() ); // FIXME: After the string freeze replace the text with a better one explaning how to use this dialog - layout->addMultiCellWidget( new QLabel( i18n("Please select the position where the track should be split."), + tqlayout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."), frame ), 0, 0, 0, 3 ); - layout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 ); - layout->addWidget( m_msfEditStart, 2, 1 ); - layout->addWidget( new QLabel( " - ", frame ), 2, 2 ); - layout->addWidget( m_msfEditEnd, 2, 3 ); - layout->addWidget( new QLabel( i18n("Split track at:"), frame ), 2, 0 ); - layout->setColStretch( 0, 1 ); + tqlayout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 ); + tqlayout->addWidget( m_msfEditStart, 2, 1 ); + tqlayout->addWidget( new TQLabel( " - ", frame ), 2, 2 ); + tqlayout->addWidget( m_msfEditEnd, 2, 3 ); + tqlayout->addWidget( new TQLabel( i18n("Split track at:"), frame ), 2, 0 ); + tqlayout->setColStretch( 0, 1 ); m_editorWidget->setAllowOverlappingRanges( false ); m_editorWidget->enableRangeSelection( true ); m_editorWidget->installEventFilter( this ); - connect( m_editorWidget, SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), - this, SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); - connect( m_editorWidget, SIGNAL(selectedRangeChanged(int)), - this, SLOT(slotRangeSelectionChanged(int)) ); - connect( m_msfEditStart, SIGNAL(valueChanged(const K3b::Msf&)), - this, SLOT(slotMsfEditChanged(const K3b::Msf&)) ); - connect( m_msfEditEnd, SIGNAL(valueChanged(const K3b::Msf&)), - this, SLOT(slotMsfEditChanged(const K3b::Msf&)) ); + connect( m_editorWidget, TQT_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), + this, TQT_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); + connect( m_editorWidget, TQT_SIGNAL(selectedRangeChanged(int)), + this, TQT_SLOT(slotRangeSelectionChanged(int)) ); + connect( m_msfEditStart, TQT_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQT_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); + connect( m_msfEditEnd, TQT_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQT_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); setupActions(); @@ -94,11 +94,11 @@ void K3bAudioTrackSplitDialog::setupActions() m_popupMenu = new KPopupMenu( this ); KAction* actionSplitHere = new KAction( i18n("Split Here"), 0, - KShortcut(), this, SLOT(slotSplitHere()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), actionCollection(), "range_split" ); // FIXME: after the message freeze give this action a proper name like "Remove track part" KAction* actionRemoveRange = new KAction( i18n("Remove this Range"), 0, - KShortcut(), this, SLOT(slotRemoveRange()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), actionCollection(), "range_remove" ); actionSplitHere->plug( m_popupMenu ); @@ -148,7 +148,7 @@ void K3bAudioTrackSplitDialog::slotRangeSelectionChanged( int id ) } -void K3bAudioTrackSplitDialog::splitAt( const QPoint& p ) +void K3bAudioTrackSplitDialog::splitAt( const TQPoint& p ) { int id = m_editorWidget->findRange( p.x() ); if( id ) { @@ -160,15 +160,15 @@ void K3bAudioTrackSplitDialog::splitAt( const QPoint& p ) } -bool K3bAudioTrackSplitDialog::eventFilter( QObject* o, QEvent* e ) +bool K3bAudioTrackSplitDialog::eventFilter( TQObject* o, TQEvent* e ) { - if( o == m_editorWidget ) { - if( e->type() == QEvent::MouseButtonDblClick ) { - QMouseEvent* me = static_cast<QMouseEvent*>( e ); + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorWidget) ) { + if( e->type() == TQEvent::MouseButtonDblClick ) { + TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); splitAt( me->pos() ); } - else if( e->type() == QEvent::ContextMenu ) { - QContextMenuEvent* ce = static_cast<QContextMenuEvent*>( e ); + else if( e->type() == TQEvent::ContextMenu ) { + TQContextMenuEvent* ce = TQT_TQCONTEXTMENUEVENT( e ); ce->consume(); m_lastClickPosition = ce->pos(); if( m_editorWidget->findRange( ce->pos().x() ) > 0 ) @@ -193,15 +193,15 @@ void K3bAudioTrackSplitDialog::slotRemoveRange() void K3bAudioTrackSplitDialog::splitTrack( K3bAudioTrack* track, - QWidget* parent, + TQWidget* tqparent, const char* name ) { - K3bAudioTrackSplitDialog d( track, parent, name ); - if( d.exec() == QDialog::Accepted ) { - QValueList<int> ranges = d.m_editorWidget->allRanges(); + K3bAudioTrackSplitDialog d( track, tqparent, name ); + if( d.exec() == TQDialog::Accepted ) { + TQValueList<int> ranges = d.m_editorWidget->allRanges(); // we split the track at all range ends and just delete those that relate to the gaps in between K3b::Msf pos = 0; - for( QValueList<int>::const_iterator it = ranges.constBegin(); + for( TQValueList<int>::const_iterator it = ranges.constBegin(); it != ranges.constEnd(); ++it ) { // delete the unwanted part diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h index c4be91a..ce9b01b 100644 --- a/src/projects/k3baudiotracksplitdialog.h +++ b/src/projects/k3baudiotracksplitdialog.h @@ -34,19 +34,20 @@ class KPopupMenu; class K3bAudioTrackSplitDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackSplitDialog( K3bAudioTrack*, QWidget* parent = 0, const char* name = 0 ); + K3bAudioTrackSplitDialog( K3bAudioTrack*, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioTrackSplitDialog(); - bool eventFilter( QObject* o, QEvent* e ); + bool eventFilter( TQObject* o, TQEvent* e ); KActionCollection* actionCollection() const { return m_actionCollection; } /** * if this method returns true val is filled with the user selected value. */ - static void splitTrack( K3bAudioTrack* track, QWidget* parent = 0, const char* name = 0 ); + static void splitTrack( K3bAudioTrack* track, TQWidget* tqparent = 0, const char* name = 0 ); private slots: void slotRangeModified( int, const K3b::Msf& start, const K3b::Msf& ); @@ -54,7 +55,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase void slotRangeSelectionChanged( int ); void slotSplitHere(); void slotRemoveRange(); - void splitAt( const QPoint& p ); + void splitAt( const TQPoint& p ); private: void setupActions(); @@ -65,7 +66,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase K3bAudioTrack* m_track; KActionCollection* m_actionCollection; KPopupMenu* m_popupMenu; - QPoint m_lastClickPosition; + TQPoint m_lastClickPosition; }; #endif diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp index b537583..0187d33 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.cpp +++ b/src/projects/k3baudiotracktrmlookupdialog.cpp @@ -32,31 +32,31 @@ #include <kglobal.h> #include <kdebug.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qframe.h> -#include <qeventloop.h> -#include <qpushbutton.h> -#include <qapplication.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqframe.h> +#include <tqeventloop.h> +#include <tqpushbutton.h> +#include <tqapplication.h> -K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( QWidget* parent, const char* name ) +K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("MusicBrainz Query"), KDialogBase::Cancel, KDialogBase::Cancel, - parent, + tqparent, name, true, true ) { - QGridLayout* grid = new QGridLayout( plainPage() ); + TQGridLayout* grid = new TQGridLayout( plainPage() ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); - m_infoLabel = new QLabel( plainPage() ); - QLabel* pixLabel = new QLabel( plainPage() ); + m_infoLabel = new TQLabel( plainPage() ); + TQLabel* pixLabel = new TQLabel( plainPage() ); pixLabel->setPixmap( KGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) ); pixLabel->setScaledContents( false ); @@ -68,11 +68,11 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( QWidget* parent, con m_inLoop = false; m_mbJob = new K3bMusicBrainzJob( this ); - connect( m_mbJob, SIGNAL(infoMessage(const QString&, int)), - this, SLOT(slotMbJobInfoMessage(const QString&, int)) ); - connect( m_mbJob, SIGNAL(finished(bool)), this, SLOT(slotMbJobFinished(bool)) ); - connect( m_mbJob, SIGNAL(trackFinished(K3bAudioTrack*, bool)), - this, SLOT(slotTrackFinished(K3bAudioTrack*, bool)) ); + connect( m_mbJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SLOT(slotMbJobInfoMessage(const TQString&, int)) ); + connect( m_mbJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMbJobFinished(bool)) ); + connect( m_mbJob, TQT_SIGNAL(trackFinished(K3bAudioTrack*, bool)), + this, TQT_SLOT(slotTrackFinished(K3bAudioTrack*, bool)) ); } @@ -81,7 +81,7 @@ K3bAudioTrackTRMLookupDialog::~K3bAudioTrackTRMLookupDialog() } -int K3bAudioTrackTRMLookupDialog::lookup( const QPtrList<K3bAudioTrack>& tracks ) +int K3bAudioTrackTRMLookupDialog::lookup( const TQPtrList<K3bAudioTrack>& tracks ) { m_mbJob->setTracks( tracks ); m_mbJob->start(); @@ -90,13 +90,13 @@ int K3bAudioTrackTRMLookupDialog::lookup( const QPtrList<K3bAudioTrack>& tracks setModal( true ); show(); m_inLoop = true; - QApplication::eventLoop()->enterLoop(); + TQApplication::eventLoop()->enterLoop(); return 0; } -void K3bAudioTrackTRMLookupDialog::slotMbJobInfoMessage( const QString& message, int ) +void K3bAudioTrackTRMLookupDialog::slotMbJobInfoMessage( const TQString& message, int ) { m_infoLabel->setText( message ); } @@ -107,7 +107,7 @@ void K3bAudioTrackTRMLookupDialog::slotMbJobFinished( bool ) m_busyWidget->showBusy(false); hide(); if( m_inLoop ) - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); } @@ -122,7 +122,7 @@ void K3bAudioTrackTRMLookupDialog::slotTrackFinished( K3bAudioTrack* track, bool { if( !success ) K3bPassivePopup::showPopup( i18n("Track %1 was not found in the MusicBrainz database.") - .arg( track->trackNumber()), + .tqarg( track->trackNumber()), i18n("Audio Project") ); } diff --git a/src/projects/k3baudiotracktrmlookupdialog.h b/src/projects/k3baudiotracktrmlookupdialog.h index 10a0f32..f0d6718 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.h +++ b/src/projects/k3baudiotracktrmlookupdialog.h @@ -17,9 +17,9 @@ #define _K3B_AUDIOTRACK_TRM_LOOKUP_DIALOG_H_ #include <kdialogbase.h> -#include <qptrlist.h> +#include <tqptrlist.h> -class QLabel; +class TQLabel; class K3bAudioTrack; class K3bMusicBrainzJob; class K3bBusyWidget; @@ -28,24 +28,25 @@ class K3bBusyWidget; class K3bAudioTrackTRMLookupDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackTRMLookupDialog( QWidget* parent = 0, const char* name = 0 ); + K3bAudioTrackTRMLookupDialog( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioTrackTRMLookupDialog(); /** * This will show the dialog and start the lookup */ - int lookup( const QPtrList<K3bAudioTrack>& tracks ); + int lookup( const TQPtrList<K3bAudioTrack>& tracks ); private slots: void slotMbJobFinished( bool ); - void slotMbJobInfoMessage( const QString&, int ); + void slotMbJobInfoMessage( const TQString&, int ); void slotTrackFinished( K3bAudioTrack* track, bool success ); void slotCancel(); private: - QLabel* m_infoLabel; + TQLabel* m_infoLabel; K3bBusyWidget* m_busyWidget; K3bMusicBrainzJob* m_mbJob; bool m_inLoop; diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 1af6a5c..9c15061 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -37,18 +37,18 @@ #include <k3baudiodecoder.h> #include <k3bmsfedit.h> -#include <qheader.h> -#include <qtimer.h> -#include <qdragobject.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qvaluelist.h> +#include <tqheader.h> +#include <tqtimer.h> +#include <tqdragobject.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvaluelist.h> #include <kurl.h> #include <kurldrag.h> @@ -61,18 +61,18 @@ #include <kdialogbase.h> -K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, QWidget* parent, const char* name ) - : K3bListView( parent, name ), +K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* tqparent, const char* name ) + : K3bListView( tqparent, name ), m_doc(doc), m_updatingColumnWidths(false), m_currentMouseOverItem(0), m_currentlyPlayingTrack(0) { - m_player = new K3bAudioTrackPlayer( m_doc, this ); - connect( m_player, SIGNAL(playingTrack(K3bAudioTrack*)), this, - SLOT(showPlayerIndicator(K3bAudioTrack*)) ); - connect( m_player, SIGNAL(paused(bool)), this, SLOT(togglePauseIndicator(bool)) ); - connect( m_player, SIGNAL(stopped()), this, SLOT(removePlayerIndicator()) ); + m_player = new K3bAudioTrackPlayer( m_doc, TQT_TQOBJECT(this) ); + connect( m_player, TQT_SIGNAL(playingTrack(K3bAudioTrack*)), TQT_TQOBJECT(this), + TQT_SLOT(showPlayerIndicator(K3bAudioTrack*)) ); + connect( m_player, TQT_SIGNAL(paused(bool)), TQT_TQOBJECT(this), TQT_SLOT(togglePauseIndicator(bool)) ); + connect( m_player, TQT_SIGNAL(stopped()), TQT_TQOBJECT(this), TQT_SLOT(removePlayerIndicator()) ); setItemMargin( 5 ); setAcceptDrops( true ); @@ -82,7 +82,7 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, QWidget* parent, const c // setSelectionModeExt( KListView::Konqueror ); // FileManager in KDE3 setSelectionModeExt( KListView::Extended ); setItemsMovable( false ); - setAlternateBackground( QColor() ); // disable alternate colors + setAlternateBackground( TQColor() ); // disable alternate colors setNoItemText( i18n("Use drag'n'drop to add audio files to the project.") + "\n" + i18n("After that press the burn button to write the CD." ) ); @@ -90,32 +90,32 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, QWidget* parent, const c setupColumns(); setupActions(); - m_playerItemAnimator = new K3bListViewItemAnimator( this ); + m_playerItemAnimator = new K3bListViewItemAnimator( TQT_TQOBJECT(this) ); - m_animationTimer = new QTimer( this ); - connect( m_animationTimer, SIGNAL(timeout()), this, SLOT(slotAnimation()) ); + m_animationTimer = new TQTimer( this ); + connect( m_animationTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotAnimation()) ); - m_autoOpenTrackTimer = new QTimer( this ); - connect( m_autoOpenTrackTimer, SIGNAL(timeout()), this, SLOT(slotDragTimeout()) ); + m_autoOpenTrackTimer = new TQTimer( this ); + connect( m_autoOpenTrackTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDragTimeout()) ); - connect( this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - this, SLOT(slotDropped(QDropEvent*, QListViewItem*, QListViewItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(showPopupMenu(KListView*, QListViewItem*, const QPoint&)) ); - connect( this, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), - this, SLOT(slotProperties()) ); + connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotProperties()) ); - connect( doc, SIGNAL(changed()), - this, SLOT(slotChanged()) ); - connect( doc, SIGNAL(trackChanged(K3bAudioTrack*)), - this, SLOT(slotTrackChanged(K3bAudioTrack*)) ); - connect( doc, SIGNAL(trackRemoved(K3bAudioTrack*)), - this, SLOT(slotTrackRemoved(K3bAudioTrack*)) ); + connect( doc, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotChanged()) ); + connect( doc, TQT_SIGNAL(trackChanged(K3bAudioTrack*)), + this, TQT_SLOT(slotTrackChanged(K3bAudioTrack*)) ); + connect( doc, TQT_SIGNAL(trackRemoved(K3bAudioTrack*)), + this, TQT_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); slotChanged(); // a little background pix hack because I am simply incapable of doing it another way. :( -// static QPixmap s_bgPix("/tmp/trueg/audio_bg.png"); +// static TQPixmap s_bgPix("/tmp/trueg/audio_bg.png"); // setK3bBackgroundPixmap( s_bgPix, TOP_LEFT ); } @@ -134,8 +134,8 @@ void K3bAudioTrackView::setupColumns() addColumn( i18n("Length") ); addColumn( i18n("Filename") ); - setColumnAlignment( 3, Qt::AlignHCenter ); - setColumnAlignment( 4, Qt::AlignHCenter ); + setColumnAlignment( 3, TQt::AlignHCenter ); + setColumnAlignment( 4, TQt::AlignHCenter ); setColumnWidthMode( 1, Manual ); setColumnWidthMode( 2, Manual ); @@ -155,61 +155,61 @@ void K3bAudioTrackView::setupActions() m_popupMenu = new KPopupMenu( this ); m_actionProperties = new KAction( i18n("Properties"), "misc", - KShortcut(), this, SLOT(slotProperties()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "track_properties" ); m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", - Key_Delete, this, SLOT(slotRemove()), + Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "track_remove" ); m_actionAddSilence = new KAction( i18n("Add Silence") + "...", "misc", - KShortcut(), this, SLOT(slotAddSilence()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), actionCollection(), "track_add_silence" ); m_actionMergeTracks = new KAction( i18n("Merge Tracks"), "misc", - KShortcut(), this, SLOT(slotMergeTracks()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), actionCollection(), "track_merge" ); m_actionSplitSource = new KAction( i18n("Source to Track"), "misc", - KShortcut(), this, SLOT(slotSplitSource()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), actionCollection(), "source_split" ); m_actionSplitTrack = new KAction( i18n("Split Track..."), 0, - KShortcut(), this, SLOT(slotSplitTrack()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), actionCollection(), "track_split" ); m_actionEditSource = new KAction( i18n("Edit Source..."), 0, - KShortcut(), this, SLOT(slotEditSource()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), actionCollection(), "source_edit" ); m_actionPlayTrack = new KAction( i18n("Play Track"), "player_play", - KShortcut(), this, SLOT(slotPlayTrack()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), actionCollection(), "track_play" ); #ifdef HAVE_MUSICBRAINZ - KAction* mbAction = new KAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, this, - SLOT(slotQueryMusicBrainz()), + KAction* mbAction = new KAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), + TQT_SLOT(slotQueryMusicBrainz()), actionCollection(), "project_audio_musicbrainz" ); mbAction->setToolTip( i18n("Try to determine meta information over the internet") ); #endif } -bool K3bAudioTrackView::acceptDrag(QDropEvent* e) const +bool K3bAudioTrackView::acceptDrag(TQDropEvent* e) const { // the first is for built-in item moving, the second for dropping urls, the third for dropping audio tracks return ( KListView::acceptDrag(e) || KURLDrag::canDecode(e) || K3bAudioCdTrackDrag::canDecode(e) ); } -QDragObject* K3bAudioTrackView::dragObject() +TQDragObject* K3bAudioTrackView::dragObject() { - QPtrList<QListViewItem> list = selectedItems(); + TQPtrList<TQListViewItem> list = selectedItems(); if( list.isEmpty() ) return 0; KURL::List urls; - for( QPtrListIterator<QListViewItem> it(list); it.current(); ++it ) { - QListViewItem* item = *it; + for( TQPtrListIterator<TQListViewItem> it(list); it.current(); ++it ) { + TQListViewItem* item = *it; // we simply ignore open track items to not include files twice // we also don't want the invisible source items - QListViewItem* parentItem = K3bListView::parentItem(item); - if( !item->isOpen() && ( !parentItem || parentItem->isOpen() ) ) { + TQListViewItem* tqparentItem = K3bListView::tqparentItem(item); + if( !item->isOpen() && ( !tqparentItem || tqparentItem->isOpen() ) ) { if( K3bAudioDataSourceViewItem* sourceItem = dynamic_cast<K3bAudioDataSourceViewItem*>( item ) ) { if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( sourceItem->source() ) ) urls.append( KURL::fromPathOrURL(file->filename()) ); @@ -230,7 +230,7 @@ QDragObject* K3bAudioTrackView::dragObject() } -void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after ) +void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ) { m_autoOpenTrackTimer->stop(); @@ -249,7 +249,7 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList } } - if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( parent ) ) { + if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( tqparent ) ) { m_dropTrackParent = tv->track(); } @@ -265,22 +265,22 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList if( e->source() == viewport() ) { - bool copyItems = (e->action() == QDropEvent::Copy); + bool copyItems = (e->action() == TQDropEvent::Copy); // 1. tracks (with some of their sources) -> move complete tracks around // 2. sources (multiple sources) -> move the sources to the destination track // 3. tracks and sources (the latter without their track) -> ignore the latter sources - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); // // remove all sources which belong to one of the selected tracks since they will be // moved along with their tracks // - QPtrListIterator<K3bAudioDataSource> srcIt( sources ); + TQPtrListIterator<K3bAudioDataSource> srcIt( sources ); while( srcIt.current() ) { - if( tracks.containsRef( srcIt.current()->track() ) ) + if( tracks.tqcontainsRef( srcIt.current()->track() ) ) sources.removeRef( *srcIt ); else ++srcIt; @@ -289,7 +289,7 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList // // Now move (or copy) all the tracks // - for( QPtrListIterator<K3bAudioTrack> it( tracks ); it.current(); ++it ) { + for( TQPtrListIterator<K3bAudioTrack> it( tracks ); it.current(); ++it ) { K3bAudioTrack* track = *it; if( m_dropTrackParent ) { m_dropTrackParent->merge( copyItems ? track->copy() : track, m_dropSourceAfter ); @@ -311,7 +311,7 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList // // now move (or copy) the sources // - for( QPtrListIterator<K3bAudioDataSource> it( sources ); it.current(); ++it ) { + for( TQPtrListIterator<K3bAudioDataSource> it( sources ); it.current(); ++it ) { K3bAudioDataSource* source = *it; if( m_dropTrackParent ) { if( m_dropSourceAfter ) { @@ -357,12 +357,12 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList K3bDevice::Toc toc; K3bDevice::Device* dev = 0; K3bCddbResultEntry cddb; - QValueList<int> trackNumbers; + TQValueList<int> trackNumbers; K3bAudioCdTrackDrag::decode( e, toc, trackNumbers, cddb, &dev ); // for now we just create one source - for( QValueList<int>::const_iterator it = trackNumbers.begin(); + for( TQValueList<int>::const_iterator it = trackNumbers.begin(); it != trackNumbers.end(); ++it ) { int trackNumber = *it; @@ -394,7 +394,7 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); } } @@ -439,11 +439,11 @@ void K3bAudioTrackView::slotChanged() K3bAudioTrackViewItem* K3bAudioTrackView::getTrackViewItem( K3bAudioTrack* track, bool* isNewItem ) { - QMap<K3bAudioTrack*, K3bAudioTrackViewItem*>::iterator itemIt = m_trackItemMap.find(track); + TQMap<K3bAudioTrack*, K3bAudioTrackViewItem*>::iterator itemIt = m_trackItemMap.tqfind(track); if( itemIt == m_trackItemMap.end() ) { kdDebug() << "(K3bAudioTrackView) new track " << track << endl; K3bAudioTrackViewItem* prevItem = 0; - if( track->prev() && m_trackItemMap.contains( track->prev() ) ) + if( track->prev() && m_trackItemMap.tqcontains( track->prev() ) ) prevItem = m_trackItemMap[track->prev()]; K3bAudioTrackViewItem* newItem = new K3bAudioTrackViewItem( this, prevItem, track ); // @@ -487,11 +487,11 @@ void K3bAudioTrackView::slotTrackChanged( K3bAudioTrack* track ) item->showSources(true); // the length might have changed - item->repaint(); + item->tqrepaint(); // FIXME: only do this if the position really changed // move the item if the position has changed - if( track->prev() && m_trackItemMap.contains(track->prev()) ) + if( track->prev() && m_trackItemMap.tqcontains(track->prev()) ) item->moveItem( m_trackItemMap[track->prev()] ); else if( !track->prev() ) { takeItem( item ); @@ -522,7 +522,7 @@ void K3bAudioTrackView::showAllSources() { // TODO: add an action to show all sources - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); while( item ) { if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( item ) ) tv->showSources( tv->track()->numberSources() != 1 ); @@ -531,7 +531,7 @@ void K3bAudioTrackView::showAllSources() } -void K3bAudioTrackView::keyPressEvent( QKeyEvent* e ) +void K3bAudioTrackView::keyPressEvent( TQKeyEvent* e ) { // showAllSources(); @@ -539,7 +539,7 @@ void K3bAudioTrackView::keyPressEvent( QKeyEvent* e ) } -void K3bAudioTrackView::keyReleaseEvent( QKeyEvent* e ) +void K3bAudioTrackView::keyReleaseEvent( TQKeyEvent* e ) { // showAllSources(); @@ -547,7 +547,7 @@ void K3bAudioTrackView::keyReleaseEvent( QKeyEvent* e ) } -void K3bAudioTrackView::contentsMouseMoveEvent( QMouseEvent* e ) +void K3bAudioTrackView::contentsMouseMoveEvent( TQMouseEvent* e ) { // showAllSources(); @@ -555,7 +555,7 @@ void K3bAudioTrackView::contentsMouseMoveEvent( QMouseEvent* e ) } -void K3bAudioTrackView::focusOutEvent( QFocusEvent* e ) +void K3bAudioTrackView::focusOutEvent( TQFocusEvent* e ) { // showAllSources(); @@ -563,7 +563,7 @@ void K3bAudioTrackView::focusOutEvent( QFocusEvent* e ) } -void K3bAudioTrackView::resizeEvent( QResizeEvent* e ) +void K3bAudioTrackView::resizeEvent( TQResizeEvent* e ) { K3bListView::resizeEvent(e); @@ -571,7 +571,7 @@ void K3bAudioTrackView::resizeEvent( QResizeEvent* e ) } -void K3bAudioTrackView::contentsDragMoveEvent( QDragMoveEvent* event ) +void K3bAudioTrackView::contentsDragMoveEvent( TQDragMoveEvent* event ) { K3bAudioTrackViewItem* item = findTrackItem( event->pos() ); if( m_currentMouseOverItem != item ) { @@ -585,21 +585,21 @@ void K3bAudioTrackView::contentsDragMoveEvent( QDragMoveEvent* event ) } -void K3bAudioTrackView::contentsDragLeaveEvent( QDragLeaveEvent* e ) +void K3bAudioTrackView::contentsDragLeaveEvent( TQDragLeaveEvent* e ) { m_autoOpenTrackTimer->stop(); K3bListView::contentsDragLeaveEvent( e ); } -K3bAudioTrackViewItem* K3bAudioTrackView::findTrackItem( const QPoint& pos ) const +K3bAudioTrackViewItem* K3bAudioTrackView::findTrackItem( const TQPoint& pos ) const { - QListViewItem* parent = 0; - QListViewItem* after = 0; + TQListViewItem* tqparent = 0; + TQListViewItem* after = 0; K3bAudioTrackView* that = const_cast<K3bAudioTrackView*>(this); - that->findDrop( pos, parent, after ); - if( parent ) - return static_cast<K3bAudioTrackViewItem*>( parent ); + that->findDrop( pos, tqparent, after ); + if( tqparent ) + return static_cast<K3bAudioTrackViewItem*>( tqparent ); else if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>(after) ) return tv; else if( K3bAudioDataSourceViewItem* sv = dynamic_cast<K3bAudioDataSourceViewItem*>(after) ) @@ -628,12 +628,12 @@ void K3bAudioTrackView::resizeColumns() int lengthWidth = header()->fontMetrics().width( header()->label(4) ); int filenameWidth = header()->fontMetrics().width( header()->label(5) ); - for( QListViewItemIterator it( this ); it.current(); ++it ) { - artistWidth = QMAX( artistWidth, it.current()->width( fontMetrics(), this, 1 ) ); - titleWidth = QMAX( titleWidth, it.current()->width( fontMetrics(), this, 2 ) ); - typeWidth = QMAX( typeWidth, it.current()->width( fontMetrics(), this, 3 ) ); - lengthWidth = QMAX( lengthWidth, it.current()->width( fontMetrics(), this, 4 ) ); - filenameWidth = QMAX( filenameWidth, it.current()->width( fontMetrics(), this, 5 ) ); + for( TQListViewItemIterator it( this ); it.current(); ++it ) { + artistWidth = TQMAX( artistWidth, it.current()->width( fontMetrics(), this, 1 ) ); + titleWidth = TQMAX( titleWidth, it.current()->width( fontMetrics(), this, 2 ) ); + typeWidth = TQMAX( typeWidth, it.current()->width( fontMetrics(), this, 3 ) ); + lengthWidth = TQMAX( lengthWidth, it.current()->width( fontMetrics(), this, 4 ) ); + filenameWidth = TQMAX( filenameWidth, it.current()->width( fontMetrics(), this, 5 ) ); } // add a margin @@ -673,7 +673,7 @@ void K3bAudioTrackView::resizeColumns() void K3bAudioTrackView::slotAnimation() { resizeColumns(); - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); bool animate = false; @@ -702,14 +702,14 @@ void K3bAudioTrackView::slotDragTimeout() } -void K3bAudioTrackView::getSelectedItems( QPtrList<K3bAudioTrack>& tracks, - QPtrList<K3bAudioDataSource>& sources ) +void K3bAudioTrackView::getSelectedItems( TQPtrList<K3bAudioTrack>& tracks, + TQPtrList<K3bAudioDataSource>& sources ) { tracks.clear(); sources.clear(); - QPtrList<QListViewItem> items = selectedItems(); - for( QPtrListIterator<QListViewItem> it( items ); it.current(); ++it ) { + TQPtrList<TQListViewItem> items = selectedItems(); + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) { if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( *it ) ) tracks.append( tv->track() ); else { @@ -725,17 +725,17 @@ void K3bAudioTrackView::getSelectedItems( QPtrList<K3bAudioTrack>& tracks, void K3bAudioTrackView::slotRemove() { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); // // remove all sources which belong to one of the selected tracks since they will be // deleted along with their tracks // - QPtrListIterator<K3bAudioDataSource> srcIt( sources ); + TQPtrListIterator<K3bAudioDataSource> srcIt( sources ); while( srcIt.current() ) { - if( tracks.containsRef( srcIt.current()->track() ) ) + if( tracks.tqcontainsRef( srcIt.current()->track() ) ) sources.removeRef( *srcIt ); else ++srcIt; @@ -744,20 +744,20 @@ void K3bAudioTrackView::slotRemove() // // Now delete all the tracks // - for( QPtrListIterator<K3bAudioTrack> it( tracks ); it.current(); ++it ) + for( TQPtrListIterator<K3bAudioTrack> it( tracks ); it.current(); ++it ) delete *it; // // Now delete all the sources // - for( QPtrListIterator<K3bAudioDataSource> it( sources ); it.current(); ++it ) + for( TQPtrListIterator<K3bAudioDataSource> it( sources ); it.current(); ++it ) delete *it; } void K3bAudioTrackView::slotAddSilence() { - QListViewItem* item = selectedItems().first(); + TQListViewItem* item = selectedItems().first(); if( item ) { // // create a simple dialog for asking the length of the silence @@ -767,14 +767,14 @@ void K3bAudioTrackView::slotAddSilence() KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, this ); - QHBoxLayout* dlgLayout = new QHBoxLayout( dlg.plainPage(), 0, KDialog::spacingHint() ); + TQHBoxLayout* dlgLayout = new TQHBoxLayout( dlg.plainPage(), 0, KDialog::spacingHint() ); dlgLayout->setAutoAdd( true ); - (void)new QLabel( i18n("Length of silence:"), dlg.plainPage() ); + (void)new TQLabel( i18n("Length of silence:"), dlg.plainPage() ); K3bMsfEdit* msfEdit = new K3bMsfEdit( dlg.plainPage() ); msfEdit->setValue( 150 ); // 2 seconds default msfEdit->setFocus(); - if( dlg.exec() == QDialog::Accepted ) { + if( dlg.exec() == TQDialog::Accepted ) { K3bAudioZeroData* zero = new K3bAudioZeroData( msfEdit->value() ); if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>(item) ) { tv->track()->addSource( zero ); @@ -789,8 +789,8 @@ void K3bAudioTrackView::slotAddSilence() void K3bAudioTrackView::slotMergeTracks() { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); // we simply merge the selected tracks ignoring any eventually selected sources @@ -805,7 +805,7 @@ void K3bAudioTrackView::slotMergeTracks() void K3bAudioTrackView::slotSplitSource() { - QListViewItem* item = selectedItems().first(); + TQListViewItem* item = selectedItems().first(); if( K3bAudioDataSourceViewItem* sv = dynamic_cast<K3bAudioDataSourceViewItem*>(item) ) { // create a new track K3bAudioTrack* track = new K3bAudioTrack( m_doc ); @@ -830,7 +830,7 @@ void K3bAudioTrackView::slotSplitSource() void K3bAudioTrackView::slotSplitTrack() { - QListViewItem* item = selectedItems().first(); + TQListViewItem* item = selectedItems().first(); if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>(item) ) { K3bAudioTrackSplitDialog::splitTrack( tv->track(), this ); } @@ -839,7 +839,7 @@ void K3bAudioTrackView::slotSplitTrack() void K3bAudioTrackView::slotEditSource() { - QListViewItem* item = selectedItems().first(); + TQListViewItem* item = selectedItems().first(); K3bAudioDataSource* source = 0; if( K3bAudioDataSourceViewItem* sv = dynamic_cast<K3bAudioDataSourceViewItem*>(item) ) @@ -856,22 +856,22 @@ void K3bAudioTrackView::slotEditSource() 0, true, true ); - QVBoxLayout* lay = new QVBoxLayout( dlg.plainPage() ); + TQVBoxLayout* lay = new TQVBoxLayout( dlg.plainPage() ); lay->setMargin( 0 ); lay->setSpacing( KDialog::spacingHint() ); lay->setAutoAdd( true ); K3bAudioDataSourceEditWidget* editW = new K3bAudioDataSourceEditWidget( dlg.plainPage() ); editW->loadSource( source ); - if( dlg.exec() == QDialog::Accepted ) + if( dlg.exec() == TQDialog::Accepted ) editW->saveSource(); } } -void K3bAudioTrackView::showPopupMenu( KListView*, QListViewItem* item, const QPoint& pos ) +void K3bAudioTrackView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ) { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); int numTracks = tracks.count(); @@ -923,8 +923,8 @@ void K3bAudioTrackView::showPopupMenu( KListView*, QListViewItem* item, const QP void K3bAudioTrackView::slotProperties() { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); // TODO: add tracks from sources to tracks @@ -941,8 +941,8 @@ void K3bAudioTrackView::slotProperties() void K3bAudioTrackView::slotPlayTrack() { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); if( tracks.count() > 0 ) m_player->playTrack( tracks.first() ); @@ -973,7 +973,7 @@ void K3bAudioTrackView::togglePauseIndicator( bool b ) void K3bAudioTrackView::removePlayerIndicator() { if( m_currentlyPlayingTrack ) - getTrackViewItem( m_currentlyPlayingTrack )->setPixmap( 1, QPixmap() ); + getTrackViewItem( m_currentlyPlayingTrack )->setPixmap( 1, TQPixmap() ); m_playerItemAnimator->stop(); m_currentlyPlayingTrack = 0; } @@ -982,8 +982,8 @@ void K3bAudioTrackView::removePlayerIndicator() void K3bAudioTrackView::slotQueryMusicBrainz() { #ifdef HAVE_MUSICBRAINZ - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); if( tracks.isEmpty() ) { diff --git a/src/projects/k3baudiotrackview.h b/src/projects/k3baudiotrackview.h index 07415b6..fb52509 100644 --- a/src/projects/k3baudiotrackview.h +++ b/src/projects/k3baudiotrackview.h @@ -18,8 +18,8 @@ #include <k3blistview.h> -#include <qmap.h> -#include <qptrlist.h> +#include <tqmap.h> +#include <tqptrlist.h> #include <kurl.h> class K3bAudioTrack; @@ -28,14 +28,14 @@ class K3bAudioDataSource; class K3bAudioDoc; class KActionCollection; class KAction; -class QDropEvent; -class QKeyEvent; -class QFocusEvent; -class QMouseEvent; -class QDragMoveEvent; -class QTimer; +class TQDropEvent; +class TQKeyEvent; +class TQFocusEvent; +class TQMouseEvent; +class TQDragMoveEvent; +class TQTimer; class KPopupMenu; -class QPainter; +class TQPainter; class K3bListViewItemAnimator; class K3bAudioTrackPlayer; @@ -43,17 +43,18 @@ class K3bAudioTrackPlayer; class K3bAudioTrackView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackView( K3bAudioDoc*, QWidget* parent, const char* name = 0 ); + K3bAudioTrackView( K3bAudioDoc*, TQWidget* tqparent, const char* name = 0 ); ~K3bAudioTrackView(); KActionCollection* actionCollection() const { return m_actionCollection; } K3bAudioTrackPlayer* player() const { return m_player; } - void getSelectedItems( QPtrList<K3bAudioTrack>& tracks, - QPtrList<K3bAudioDataSource>& sources ); + void getSelectedItems( TQPtrList<K3bAudioTrack>& tracks, + TQPtrList<K3bAudioDataSource>& sources ); public slots: void showPlayerIndicator( K3bAudioTrack* ); @@ -64,7 +65,7 @@ class K3bAudioTrackView : public K3bListView void setupColumns(); void setupActions(); void showAllSources(); - K3bAudioTrackViewItem* findTrackItem( const QPoint& pos ) const; + K3bAudioTrackViewItem* findTrackItem( const TQPoint& pos ) const; K3bAudioTrackViewItem* getTrackViewItem( K3bAudioTrack* track, bool* isNew = 0 ); K3bAudioDoc* m_doc; @@ -81,11 +82,11 @@ class K3bAudioTrackView : public K3bListView bool m_updatingColumnWidths; - QMap<K3bAudioTrack*, K3bAudioTrackViewItem*> m_trackItemMap; + TQMap<K3bAudioTrack*, K3bAudioTrackViewItem*> m_trackItemMap; K3bAudioTrackViewItem* m_currentMouseOverItem; - QTimer* m_autoOpenTrackTimer; - QTimer* m_animationTimer; + TQTimer* m_autoOpenTrackTimer; + TQTimer* m_animationTimer; KPopupMenu* m_popupMenu; @@ -105,7 +106,7 @@ class K3bAudioTrackView : public K3bListView private slots: void slotAnimation(); - void slotDropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after ); + void slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ); void slotChanged(); void slotTrackChanged( K3bAudioTrack* ); void slotTrackRemoved( K3bAudioTrack* ); @@ -117,7 +118,7 @@ class K3bAudioTrackView : public K3bListView void slotMergeTracks(); void slotSplitSource(); void slotSplitTrack(); - void showPopupMenu( KListView*, QListViewItem* item, const QPoint& pos ); + void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ); void slotProperties(); void slotPlayTrack(); void slotQueryMusicBrainz(); @@ -127,16 +128,16 @@ class K3bAudioTrackView : public K3bListView void slotAddUrls(); protected: - void keyPressEvent( QKeyEvent* e ); - void keyReleaseEvent( QKeyEvent* e ); - void focusOutEvent( QFocusEvent* e ); - void contentsMouseMoveEvent( QMouseEvent* e ); - void contentsDragMoveEvent( QDragMoveEvent* e ); - void contentsDragLeaveEvent( QDragLeaveEvent* e ); - void resizeEvent( QResizeEvent* e ); + void keyPressEvent( TQKeyEvent* e ); + void keyReleaseEvent( TQKeyEvent* e ); + void focusOutEvent( TQFocusEvent* e ); + void contentsMouseMoveEvent( TQMouseEvent* e ); + void contentsDragMoveEvent( TQDragMoveEvent* e ); + void contentsDragLeaveEvent( TQDragLeaveEvent* e ); + void resizeEvent( TQResizeEvent* e ); void resizeColumns(); - bool acceptDrag(QDropEvent* e) const; - QDragObject* dragObject(); + bool acceptDrag(TQDropEvent* e) const; + TQDragObject* dragObject(); }; #endif diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 6918e2a..6c0418f 100644 --- a/src/projects/k3baudiotrackviewitem.cpp +++ b/src/projects/k3baudiotrackviewitem.cpp @@ -22,13 +22,13 @@ #include <kiconloader.h> -#include <qpainter.h> +#include <tqpainter.h> -K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent, +K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* tqparent, K3bAudioTrackViewItem* after, K3bAudioTrack* track ) - : K3bListViewItem( parent, after ), + : K3bListViewItem( tqparent, after ), m_track( track ), m_alreadyRemoved(false), m_showingSources(false), @@ -52,12 +52,12 @@ K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent, // setMarginVertical( 5 ); // italic type - QFont f(listView()->font()); + TQFont f(listView()->font()); f.setItalic( true ); setFont( 3, f ); // gray out filename - setForegroundColor( 5, listView()->palette().disabled().foreground() ); + setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); // smaller filename f = listView()->font(); @@ -74,7 +74,7 @@ K3bAudioTrackViewItem::~K3bAudioTrackViewItem() } -void K3bAudioTrackViewItem::paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ) +void K3bAudioTrackViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ) { K3bListViewItem::paintCell( p, cg, col, width, align ); @@ -82,25 +82,25 @@ void K3bAudioTrackViewItem::paintCell( QPainter* p, const QColorGroup& cg, int c if( listView()->firstChild() != this ) { p->save(); // FIXME: modify the value from palette().disabled().foreground() to be lighter (or darker, depending on the background color ) - p->setPen( Qt::lightGray ); + p->setPen( TQt::lightGray ); p->drawLine( 0, 0, width, 0 ); p->restore(); } } -void K3bAudioTrackViewItem::paintBranches( QPainter* p, const QColorGroup& cg, int w, int, int h ) +void K3bAudioTrackViewItem::paintBranches( TQPainter* p, const TQColorGroup& cg, int w, int, int h ) { // we just want empty space - p->fillRect( QRect( 0, 0, w, h ), cg.base() ); + p->fillRect( TQRect( 0, 0, w, h ), cg.base() ); } -QString K3bAudioTrackViewItem::text(int i) const +TQString K3bAudioTrackViewItem::text(int i) const { // to avoid crashes when the track has been deleted and this viewitem is still around if( m_alreadyRemoved ) - return QString::null; + return TQString(); // // We add two spaces after all strings (except the once renameable) @@ -110,21 +110,21 @@ QString K3bAudioTrackViewItem::text(int i) const switch( i ) { case 0: - return QString::number( m_track->trackNumber() ).rightJustify( 2, ' ' ); + return TQString::number( m_track->trackNumber() ).rightJustify( 2, ' ' ); case 1: return m_track->performer(); case 2: return m_track->title(); case 3: if( m_showingSources ) - return QString::null; + return TQString(); else return m_track->firstSource()->type(); case 4: return m_track->length().toString(); case 5: if( m_showingSources ) - return QString::null; + return TQString(); else return m_track->firstSource()->sourceComment(); default: @@ -132,10 +132,10 @@ QString K3bAudioTrackViewItem::text(int i) const } } -void K3bAudioTrackViewItem::setText( int col, const QString& text ) +void K3bAudioTrackViewItem::setText( int col, const TQString& text ) { // - // Stupid QListViewItem actually calls setText in paintCell. Thus, once a new item + // Stupid TQListViewItem actually calls setText in paintCell. Thus, once a new item // is created setText is called and in turn the doc is marked as modified since // we call setArtist or setPerformer here! :( // @@ -186,7 +186,7 @@ bool K3bAudioTrackViewItem::animate() // bool animate = false; bool valid = true; - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); while( item ) { K3bAudioDataSourceViewItem* sourceItem = dynamic_cast<K3bAudioDataSourceViewItem*>( item ); animate = animate || sourceItem->animate(); @@ -194,7 +194,7 @@ bool K3bAudioTrackViewItem::animate() item = item->nextSibling(); } if( animate ) { - QString icon = QString( "kde%1" ).arg( m_animationCounter ); + TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter ); setPixmap( 4, SmallIcon( icon ) ); m_animationCounter++; if ( m_animationCounter > 6 ) @@ -213,7 +213,7 @@ void K3bAudioTrackViewItem::setSelected( bool s ) K3bListViewItem::setSelected(s); // we also select or unselect all source items - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); while( item ) { item->setSelected(s); item = item->nextSibling(); @@ -221,7 +221,7 @@ void K3bAudioTrackViewItem::setSelected( bool s ) } -void K3bAudioTrackViewItem::insertItem( QListViewItem* item ) +void K3bAudioTrackViewItem::insertItem( TQListViewItem* item ) { K3bListViewItem::insertItem( item ); if( isSelected() ) diff --git a/src/projects/k3baudiotrackviewitem.h b/src/projects/k3baudiotrackviewitem.h index 9eb6065..c9974ba 100644 --- a/src/projects/k3baudiotrackviewitem.h +++ b/src/projects/k3baudiotrackviewitem.h @@ -25,7 +25,7 @@ class K3bAudioTrack; class K3bAudioTrackViewItem : public K3bListViewItem { public: - K3bAudioTrackViewItem( K3bAudioTrackView* parent, + K3bAudioTrackViewItem( K3bAudioTrackView* tqparent, K3bAudioTrackViewItem* after, K3bAudioTrack* track ); ~K3bAudioTrackViewItem(); @@ -40,8 +40,8 @@ class K3bAudioTrackViewItem : public K3bListViewItem void updateSourceItems(); bool showingSources() const { return m_showingSources; } void showSources( bool show ); - void setText( int col, const QString& text ); - QString text( int i ) const; + void setText( int col, const TQString& text ); + TQString text( int i ) const; /** * @reimpl @@ -50,10 +50,10 @@ class K3bAudioTrackViewItem : public K3bListViewItem /** * @reimpl */ - void insertItem( QListViewItem* item ); + void insertItem( TQListViewItem* item ); - void paintBranches( QPainter*, const QColorGroup &, int, int, int ); - void paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ); + void paintBranches( TQPainter*, const TQColorGroup &, int, int, int ); + void paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ); private: K3bAudioTrack* m_track; diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp index a5a3971..6dc0fe3 100644 --- a/src/projects/k3baudiotrackwidget.cpp +++ b/src/projects/k3baudiotrackwidget.cpp @@ -21,13 +21,13 @@ #include <k3bvalidators.h> #include <k3bcdtextvalidator.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qwidgetstack.h> -#include <qgroupbox.h> -#include <qtabwidget.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqwidgetstack.h> +#include <tqgroupbox.h> +#include <tqtabwidget.h> #include <klineedit.h> #include <klocale.h> @@ -35,27 +35,27 @@ -K3bAudioTrackWidget::K3bAudioTrackWidget( const QPtrList<K3bAudioTrack>& tracks, - QWidget* parent, const char* name ) - : base_K3bAudioTrackWidget( parent, name ), +K3bAudioTrackWidget::K3bAudioTrackWidget( const TQPtrList<K3bAudioTrack>& tracks, + TQWidget* tqparent, const char* name ) + : base_K3bAudioTrackWidget( tqparent, name ), m_tracks(tracks) { m_labelPostGap->setBuddy( m_editPostGap ); - QToolTip::add( m_labelPostGap, QToolTip::textFor( m_editPostGap ) ); - QWhatsThis::add( m_labelPostGap, QWhatsThis::textFor( m_editPostGap ) ); + TQToolTip::add( m_labelPostGap, TQToolTip::textFor( m_editPostGap ) ); + TQWhatsThis::add( m_labelPostGap, TQWhatsThis::textFor( m_editPostGap ) ); // no post-gap for the last track m_editPostGap->setDisabled( tracks.count() == 1 && !tracks.getFirst()->next() ); - K3bCdTextValidator* val = new K3bCdTextValidator( this ); + K3bCdTextValidator* val = new K3bCdTextValidator( TQT_TQOBJECT(this) ); m_editSongwriter->setValidator( val ); m_editArranger->setValidator( val ); m_editComposer->setValidator( val ); m_editMessage->setValidator( val ); m_editTitle->setValidator( val ); m_editPerformer->setValidator( val ); - m_editIsrc->setValidator( K3bValidators::isrcValidator( this ) ); + m_editIsrc->setValidator( K3bValidators::isrcValidator( TQT_TQOBJECT(this) ) ); load(); } @@ -92,25 +92,25 @@ void K3bAudioTrackWidget::load() // m_editPostGap->setMsfValue( track->postGap() ); if( track->title() != m_editTitle->text() ) - m_editTitle->setText( QString::null ); + m_editTitle->setText( TQString() ); if( track->artist() != m_editPerformer->text() ) - m_editPerformer->setText( QString::null ); + m_editPerformer->setText( TQString() ); if( track->arranger() != m_editArranger->text() ) - m_editArranger->setText( QString::null ); + m_editArranger->setText( TQString() ); if( track->songwriter() != m_editSongwriter->text() ) - m_editSongwriter->setText( QString::null ); + m_editSongwriter->setText( TQString() ); if( track->composer() != m_editComposer->text() ) - m_editComposer->setText( QString::null ); + m_editComposer->setText( TQString() ); if( track->isrc() != m_editIsrc->text() ) - m_editIsrc->setText( QString::null ); + m_editIsrc->setText( TQString() ); if( track->cdTextMessage() != m_editMessage->text() ) - m_editMessage->setText( QString::null ); + m_editMessage->setText( TQString() ); } if( m_tracks.count() > 1 ) { @@ -149,10 +149,10 @@ void K3bAudioTrackWidget::save() if( m_editMessage->isModified() ) track->setCdTextMessage( m_editMessage->text() ); - if( m_checkCopyPermitted->state() != QButton::NoChange ) + if( m_checkCopyPermitted->state() != TQButton::NoChange ) track->setCopyProtection( !m_checkCopyPermitted->isChecked() ); - if( m_checkPreemphasis->state() != QButton::NoChange ) + if( m_checkPreemphasis->state() != TQButton::NoChange ) track->setPreEmp( m_checkPreemphasis->isChecked() ); track->setIndex0( track->length() - m_editPostGap->msfValue() ); diff --git a/src/projects/k3baudiotrackwidget.h b/src/projects/k3baudiotrackwidget.h index 8f02fbb..bd7124b 100644 --- a/src/projects/k3baudiotrackwidget.h +++ b/src/projects/k3baudiotrackwidget.h @@ -20,7 +20,7 @@ #include <k3bmsf.h> -#include <qptrlist.h> +#include <tqptrlist.h> class K3bAudioTrack; @@ -32,17 +32,19 @@ class K3bAudioTrack; class K3bAudioTrackWidget : public base_K3bAudioTrackWidget { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackWidget( const QPtrList<K3bAudioTrack>& tracks, - QWidget* parent = 0, const char* name = 0 ); + K3bAudioTrackWidget( const TQPtrList<K3bAudioTrack>& tracks, + TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioTrackWidget(); public slots: void save(); void load(); - QPtrList<K3bAudioTrack> m_tracks; + public: + TQPtrList<K3bAudioTrack> m_tracks; }; #endif diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index 3cfe0c0..929907e 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -38,8 +38,8 @@ #include <k3bprojectplugin.h> // QT-includes -#include <qlayout.h> -#include <qstring.h> +#include <tqlayout.h> +#include <tqstring.h> // KDE-includes #include <klocale.h> @@ -49,8 +49,8 @@ -K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, QWidget* parent, const char *name ) - : K3bView( pDoc, parent, name ) +K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* tqparent, const char *name ) + : K3bView( pDoc, tqparent, name ) { m_doc = pDoc; @@ -59,7 +59,7 @@ K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, QWidget* parent, const char *name fillStatusDisplay()->showTime(); // add button for the audio conversion - KAction* conversionAction = new KAction( i18n("Convert Tracks"), "redo", 0, this, SLOT(slotAudioConversion()), + KAction* conversionAction = new KAction( i18n("Convert Tracks"), "redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), actionCollection(), "project_audio_convert" ); conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) ); @@ -115,9 +115,9 @@ void K3bAudioView::init() } -K3bProjectBurnDialog* K3bAudioView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bAudioView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bAudioBurnDialog( m_doc, parent, name, true ); + return new K3bAudioBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3baudioview.h b/src/projects/k3baudioview.h index 99740a3..006ee14 100644 --- a/src/projects/k3baudioview.h +++ b/src/projects/k3baudioview.h @@ -20,7 +20,7 @@ #include <k3bview.h> #include "k3baudiotrackview.h" -#include <qstringlist.h> +#include <tqstringlist.h> class K3bAudioDoc; @@ -34,9 +34,10 @@ class K3bAudioTrackView; class K3bAudioView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bAudioView( K3bAudioDoc* pDoc, QWidget* parent, const char *name = 0 ); + K3bAudioView( K3bAudioDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); ~K3bAudioView(); K3bAudioTrackPlayer* player() const { return m_songlist->player(); } @@ -45,7 +46,7 @@ class K3bAudioView : public K3bView void addUrls( const KURL::List& ); protected: - K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bbootimagedialog.cpp b/src/projects/k3bbootimagedialog.cpp index c311082..2cd1a63 100644 --- a/src/projects/k3bbootimagedialog.cpp +++ b/src/projects/k3bbootimagedialog.cpp @@ -21,10 +21,10 @@ K3bBootImageDialog::K3bBootImageDialog( K3bDataDoc* doc, - QWidget* parent, + TQWidget* tqparent, const char* name, bool modal ) - : KDialogBase( parent, name, modal, i18n("Boot Images"), Ok ) + : KDialogBase( tqparent, name, modal, i18n("Boot Images"), Ok ) { m_bootImageView = new K3bBootImageView( doc, this ); setMainWidget( m_bootImageView ); diff --git a/src/projects/k3bbootimagedialog.h b/src/projects/k3bbootimagedialog.h index 161c4b5..6f42849 100644 --- a/src/projects/k3bbootimagedialog.h +++ b/src/projects/k3bbootimagedialog.h @@ -26,10 +26,11 @@ class K3bDataDoc; class K3bBootImageDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: K3bBootImageDialog( K3bDataDoc*, - QWidget* parent = 0, + TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); ~K3bBootImageDialog(); diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 22907df..718bc04 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -25,33 +25,33 @@ #include <kdebug.h> #include <kmessagebox.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qgroupbox.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qregexp.h> +#include <tqpushbutton.h> +#include <tqstring.h> +#include <tqgroupbox.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqregexp.h> class K3bBootImageView::PrivateBootImageViewItem : public KListViewItem { public: - PrivateBootImageViewItem( K3bBootItem* image, QListView* parent ) - : KListViewItem( parent ), + PrivateBootImageViewItem( K3bBootItem* image, TQListView* tqparent ) + : KListViewItem( tqparent ), m_image( image ) { } - PrivateBootImageViewItem( K3bBootItem* image, QListView* parent, QListViewItem* after ) - : KListViewItem( parent, after ), + PrivateBootImageViewItem( K3bBootItem* image, TQListView* tqparent, TQListViewItem* after ) + : KListViewItem( tqparent, after ), m_image( image ) { } - QString text( int col ) const { + TQString text( int col ) const { if( col == 0 ) { if( m_image->imageType() == K3bBootItem::FLOPPY ) return i18n("Floppy"); @@ -61,11 +61,11 @@ public: return i18n("None"); } else if( col == 1 ) - return QString( "%1 KB" ).arg( m_image->size()/1024 ); + return TQString( "%1 KB" ).tqarg( m_image->size()/1024 ); else if( col == 2 ) return m_image->localPath(); else - return QString::null; + return TQString(); } K3bBootItem* bootImage() const { return m_image; } @@ -75,20 +75,20 @@ private: }; -K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, QWidget* parent, const char* name ) - : base_K3bBootImageView( parent, name ), +K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, TQWidget* tqparent, const char* name ) + : base_K3bBootImageView( tqparent, name ), m_doc(doc) { - connect( m_buttonNew, SIGNAL(clicked()), - this, SLOT(slotNewBootImage()) ); - connect( m_buttonDelete, SIGNAL(clicked()), - this, SLOT(slotDeleteBootImage()) ); - connect( m_buttonToggleOptions, SIGNAL(clicked()), - this, SLOT(slotToggleOptions()) ); - connect( m_viewImages, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged()) ); - connect( m_radioNoEmulation, SIGNAL(toggled(bool)), - this, SLOT(slotNoEmulationToggled(bool)) ); + connect( m_buttonNew, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotNewBootImage()) ); + connect( m_buttonDelete, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDeleteBootImage()) ); + connect( m_buttonToggleOptions, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotToggleOptions()) ); + connect( m_viewImages, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged()) ); + connect( m_radioNoEmulation, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotNoEmulationToggled(bool)) ); K3bIntValidator* v = new K3bIntValidator( this ); m_editLoadSegment->setValidator( v ); @@ -126,7 +126,7 @@ void K3bBootImageView::showAdvancedOptions( bool show ) void K3bBootImageView::slotNewBootImage() { - QString file = KFileDialog::getOpenFileName( QString::null, QString::null, this, i18n("Please Choose Boot Image") ); + TQString file = KFileDialog::getOpenFileName( TQString(), TQString(), this, i18n("Please Choose Boot Image") ); if( !file.isEmpty() ) { KIO::filesize_t fsize = K3b::filesize( file ); int boottype = K3bBootItem::FLOPPY; @@ -146,7 +146,7 @@ void K3bBootImageView::slotNewBootImage() i18n("No Floppy image selected"), i18n("Use harddisk emulation"), i18n("Use no emulation"), - QString::null, + TQString(), KMessageBox::AllowLink ) ) { case KMessageBox::Yes: boottype = K3bBootItem::HARDDISK; @@ -167,7 +167,7 @@ void K3bBootImageView::slotNewBootImage() void K3bBootImageView::slotDeleteBootImage() { - QListViewItem* item = m_viewImages->selectedItem(); + TQListViewItem* item = m_viewImages->selectedItem(); if( item ) { K3bBootItem* i = ((PrivateBootImageViewItem*)item)->bootImage(); delete item; @@ -178,7 +178,7 @@ void K3bBootImageView::slotDeleteBootImage() void K3bBootImageView::slotSelectionChanged() { - QListViewItem* item = m_viewImages->selectedItem(); + TQListViewItem* item = m_viewImages->selectedItem(); if( item ) loadBootItemSettings( ((PrivateBootImageViewItem*)item)->bootImage() ); else @@ -189,7 +189,7 @@ void K3bBootImageView::slotSelectionChanged() void K3bBootImageView::updateBootImages() { m_viewImages->clear(); - for( QPtrListIterator<K3bBootItem> it( m_doc->bootImages() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bBootItem> it( m_doc->bootImages() ); it.current(); ++it ) { (void)new PrivateBootImageViewItem( *it, m_viewImages, m_viewImages->lastItem() ); } @@ -207,8 +207,8 @@ void K3bBootImageView::loadBootItemSettings( K3bBootItem* item ) m_checkNoBoot->setChecked( item->noBoot() ); m_checkInfoTable->setChecked( item->bootInfoTable() ); - m_editLoadSegment->setText( "0x" + QString::number( item->loadSegment(), 16 ) ); - m_editLoadSize->setText( "0x" + QString::number( item->loadSize(), 16 ) ); + m_editLoadSegment->setText( "0x" + TQString::number( item->loadSegment(), 16 ) ); + m_editLoadSize->setText( "0x" + TQString::number( item->loadSize(), 16 ) ); if( item->imageType() == K3bBootItem::FLOPPY ) m_radioFloppy->setChecked(true); @@ -235,14 +235,14 @@ void K3bBootImageView::loadBootItemSettings( K3bBootItem* item ) void K3bBootImageView::slotOptionsChanged() { if( !m_loadingItem ) { - QListViewItem* item = m_viewImages->selectedItem(); + TQListViewItem* item = m_viewImages->selectedItem(); if( item ) { K3bBootItem* i = ((PrivateBootImageViewItem*)item)->bootImage(); i->setNoBoot( m_checkNoBoot->isChecked() ); i->setBootInfoTable( m_checkInfoTable->isChecked() ); - // TODO: create some class K3bIntEdit : public QLineEdit + // TODO: create some class K3bIntEdit : public TQLineEdit bool ok = true; i->setLoadSegment( K3bIntValidator::toInt( m_editLoadSegment->text(), &ok ) ); if( !ok ) diff --git a/src/projects/k3bbootimageview.h b/src/projects/k3bbootimageview.h index cf41de1..102cedd 100644 --- a/src/projects/k3bbootimageview.h +++ b/src/projects/k3bbootimageview.h @@ -26,9 +26,10 @@ class K3bBootItem; class K3bBootImageView : public base_K3bBootImageView { Q_OBJECT + TQ_OBJECT public: - K3bBootImageView( K3bDataDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bBootImageView( K3bDataDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bBootImageView(); private slots: diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp index ac24813..7ce1789 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.cpp +++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp @@ -17,16 +17,16 @@ #include "k3bisooptions.h" -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qheader.h> -#include <qwhatsthis.h> -#include <qpoint.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qvalidator.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqheader.h> +#include <tqwhatsthis.h> +#include <tqpoint.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqvalidator.h> +#include <tqregexp.h> #include <klistview.h> #include <kcombobox.h> @@ -75,17 +75,17 @@ static const char * mkisofsCharacterSets[] = { "cp10081", -class K3bDataAdvancedImageSettingsWidget::PrivateIsoWhatsThis : public QWhatsThis +class K3bDataAdvancedImageSettingsWidget::PrivateIsoWhatsThis : public TQWhatsThis { public: PrivateIsoWhatsThis( K3bDataAdvancedImageSettingsWidget* w ) - : QWhatsThis( w->m_viewIsoSettings->viewport() ) { + : TQWhatsThis( w->m_viewIsoSettings->viewport() ) { this->w = w; } - QString text( const QPoint& p ) { - QListViewItem* i = w->m_viewIsoSettings->selectedItem(); // dies funktioniert nur bei rechtsklick - QListViewItem* i2 = w->m_viewIsoSettings->itemAt( p ); // dies funktioniert nur bei action whatsthis + TQString text( const TQPoint& p ) { + TQListViewItem* i = w->m_viewIsoSettings->selectedItem(); // dies funktioniert nur bei rechtsklick + TQListViewItem* i2 = w->m_viewIsoSettings->itemAt( p ); // dies funktioniert nur bei action whatsthis if( i2 != 0 ) kdDebug() << "at p " << i2->text(0) << endl; @@ -117,21 +117,21 @@ private: -class K3bDataAdvancedImageSettingsWidget::PrivateCheckViewItem : public QCheckListItem +class K3bDataAdvancedImageSettingsWidget::PrivateCheckViewItem : public TQCheckListItem { public: - PrivateCheckViewItem( QListView* parent, const QString& text, Type tt = Controller ) - : QCheckListItem( parent, text, tt ) { + PrivateCheckViewItem( TQListView* tqparent, const TQString& text, Type tt = Controller ) + : TQCheckListItem( tqparent, text, tt ) { } - PrivateCheckViewItem( QListViewItem* parent, const QString& text, Type tt = Controller ) - : QCheckListItem( parent, text, tt ) { + PrivateCheckViewItem( TQListViewItem* tqparent, const TQString& text, Type tt = Controller ) + : TQCheckListItem( tqparent, text, tt ) { } protected: void stateChange( bool on ) { - // enable or disable all children - QListViewItem* item = firstChild(); + // enable or disable all tqchildren + TQListViewItem* item = firstChild(); while( item ) { if( PrivateCheckViewItem* pi = dynamic_cast<PrivateCheckViewItem*>(item) ) pi->setEnabled( !on ); @@ -141,8 +141,8 @@ protected: }; -K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( QWidget* parent, const char* name ) - : base_K3bAdvancedDataImageSettings( parent, name ) +K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget* tqparent, const char* name ) + : base_K3bAdvancedDataImageSettings( tqparent, name ) { m_viewIsoSettings->header()->hide(); m_viewIsoSettings->setSorting( -1 ); @@ -151,92 +151,92 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( QWidget* (void)new PrivateIsoWhatsThis( this ); // create all the view items - QCheckListItem* iso9660Root = new QCheckListItem( m_viewIsoSettings, + TQCheckListItem* iso9660Root = new TQCheckListItem( m_viewIsoSettings, i18n("IS09660 Settings"), - QCheckListItem::Controller ); - QCheckListItem* rrRoot = new QCheckListItem( m_viewIsoSettings, + TQCheckListItem::Controller ); + TQCheckListItem* rrRoot = new TQCheckListItem( m_viewIsoSettings, iso9660Root, i18n("Rock Ridge Settings"), - QCheckListItem::Controller ); - QCheckListItem* jolietRoot = new QCheckListItem( m_viewIsoSettings, + TQCheckListItem::Controller ); + TQCheckListItem* jolietRoot = new TQCheckListItem( m_viewIsoSettings, rrRoot, i18n("Joliet Settings"), - QCheckListItem::Controller ); - QCheckListItem* miscRoot = new QCheckListItem( m_viewIsoSettings, + TQCheckListItem::Controller ); + TQCheckListItem* miscRoot = new TQCheckListItem( m_viewIsoSettings, jolietRoot, i18n("Misc Settings"), - QCheckListItem::Controller ); + TQCheckListItem::Controller ); // ISO9660 settings m_checkAllowUntranslatedFilenames = new PrivateCheckViewItem( iso9660Root, i18n( "Allow untranslated ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowMaxLengthFilenames = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow max length ISO9660 filenames (37 characters)" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowFullAscii = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow full ASCII charset for ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowOther = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow ~ and # in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowLowercaseCharacters = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow lowercase characters in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowMultiDot = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow multiple dots in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllow31CharFilenames = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow 31 character ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowBeginningPeriod = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow leading period in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkOmitVersionNumbers = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Omit version numbers in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkOmitTrailingPeriod = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Omit trailing period in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowUntranslatedFilenames->setOpen(true); - m_isoLevelController = new QCheckListItem( iso9660Root, + m_isoLevelController = new TQCheckListItem( iso9660Root, m_checkAllowUntranslatedFilenames, i18n("ISO Level") ); - m_radioIsoLevel3 = new QCheckListItem( m_isoLevelController, - i18n("Level %1").arg(3), - QCheckListItem::RadioButton ); - m_radioIsoLevel2 = new QCheckListItem( m_isoLevelController, - i18n("Level %1").arg(2), - QCheckListItem::RadioButton ); - m_radioIsoLevel1 = new QCheckListItem( m_isoLevelController, - i18n("Level %1").arg(1), - QCheckListItem::RadioButton ); + m_radioIsoLevel3 = new TQCheckListItem( m_isoLevelController, + i18n("Level %1").tqarg(3), + TQCheckListItem::RadioButton ); + m_radioIsoLevel2 = new TQCheckListItem( m_isoLevelController, + i18n("Level %1").tqarg(2), + TQCheckListItem::RadioButton ); + m_radioIsoLevel1 = new TQCheckListItem( m_isoLevelController, + i18n("Level %1").tqarg(1), + TQCheckListItem::RadioButton ); m_isoLevelController->setOpen(true); // Joliet Settings - m_checkJolietLong = new QCheckListItem( jolietRoot, + m_checkJolietLong = new TQCheckListItem( jolietRoot, i18n("Allow 103 character Joliet filenames"), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); // Rock Ridge Settings - m_checkCreateTransTbl = new QCheckListItem( rrRoot, + m_checkCreateTransTbl = new TQCheckListItem( rrRoot, i18n( "Create TRANS.TBL files" ), - QCheckListItem::CheckBox ); - m_checkHideTransTbl = new QCheckListItem( rrRoot, m_checkCreateTransTbl, + TQCheckListItem::CheckBox ); + m_checkHideTransTbl = new TQCheckListItem( rrRoot, m_checkCreateTransTbl, i18n( "Hide TRANS.TBL files in Joliet" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); // Misc Settings -// m_checkFollowSymbolicLinks = new QCheckListItem( m_viewIsoSettings, +// m_checkFollowSymbolicLinks = new TQCheckListItem( m_viewIsoSettings, // i18n( "Follow symbolic links" ), -// QCheckListItem::CheckBox ); +// TQCheckListItem::CheckBox ); - m_checkDoNotCacheInodes = new QCheckListItem( miscRoot, + m_checkDoNotCacheInodes = new TQCheckListItem( miscRoot, i18n("Do not cache inodes" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); iso9660Root->setOpen( true ); jolietRoot->setOpen( true ); @@ -244,14 +244,14 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( QWidget* miscRoot->setOpen( true ); - m_comboInputCharset->setValidator( new QRegExpValidator( QRegExp("[\\w_-]*"), this ) ); + m_comboInputCharset->setValidator( new TQRegExpValidator( TQRegExp("[\\w_-]*"), TQT_TQOBJECT(this) ) ); // fill charset combo for( int i = 0; mkisofsCharacterSets[i]; i++ ) { - m_comboInputCharset->insertItem( QString( mkisofsCharacterSets[i] ) ); + m_comboInputCharset->insertItem( TQString( mkisofsCharacterSets[i] ) ); } - connect( m_checkJoliet, SIGNAL(toggled(bool)), this, SLOT(slotJolietToggled(bool)) ); + connect( m_checkJoliet, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotJolietToggled(bool)) ); } diff --git a/src/projects/k3bdataadvancedimagesettingswidget.h b/src/projects/k3bdataadvancedimagesettingswidget.h index eb442e3..9ea8124 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.h +++ b/src/projects/k3bdataadvancedimagesettingswidget.h @@ -20,15 +20,16 @@ #include "base_k3badvanceddataimagesettings.h" class K3bIsoOptions; -class QCheckListItem; +class TQCheckListItem; class K3bDataAdvancedImageSettingsWidget : public base_K3bAdvancedDataImageSettings { Q_OBJECT + TQ_OBJECT public: - K3bDataAdvancedImageSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bDataAdvancedImageSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataAdvancedImageSettingsWidget(); void load( const K3bIsoOptions& ); @@ -38,26 +39,26 @@ class K3bDataAdvancedImageSettingsWidget : public base_K3bAdvancedDataImageSetti void slotJolietToggled( bool on ); private: - QCheckListItem* m_checkAllowUntranslatedFilenames; - QCheckListItem* m_checkAllowMaxLengthFilenames; - QCheckListItem* m_checkAllowFullAscii; - QCheckListItem* m_checkAllowOther; - QCheckListItem* m_checkAllowLowercaseCharacters; - QCheckListItem* m_checkAllowMultiDot; - QCheckListItem* m_checkOmitVersionNumbers; - QCheckListItem* m_checkOmitTrailingPeriod; - QCheckListItem* m_checkCreateTransTbl; - QCheckListItem* m_checkHideTransTbl; - QCheckListItem* m_checkFollowSymbolicLinks; - QCheckListItem* m_checkAllow31CharFilenames; - QCheckListItem* m_checkAllowBeginningPeriod; - QCheckListItem* m_checkJolietLong; - QCheckListItem* m_checkDoNotCacheInodes; + TQCheckListItem* m_checkAllowUntranslatedFilenames; + TQCheckListItem* m_checkAllowMaxLengthFilenames; + TQCheckListItem* m_checkAllowFullAscii; + TQCheckListItem* m_checkAllowOther; + TQCheckListItem* m_checkAllowLowercaseCharacters; + TQCheckListItem* m_checkAllowMultiDot; + TQCheckListItem* m_checkOmitVersionNumbers; + TQCheckListItem* m_checkOmitTrailingPeriod; + TQCheckListItem* m_checkCreateTransTbl; + TQCheckListItem* m_checkHideTransTbl; + TQCheckListItem* m_checkFollowSymbolicLinks; + TQCheckListItem* m_checkAllow31CharFilenames; + TQCheckListItem* m_checkAllowBeginningPeriod; + TQCheckListItem* m_checkJolietLong; + TQCheckListItem* m_checkDoNotCacheInodes; - QCheckListItem* m_isoLevelController; - QCheckListItem* m_radioIsoLevel1; - QCheckListItem* m_radioIsoLevel2; - QCheckListItem* m_radioIsoLevel3; + TQCheckListItem* m_isoLevelController; + TQCheckListItem* m_radioIsoLevel1; + TQCheckListItem* m_radioIsoLevel2; + TQCheckListItem* m_radioIsoLevel3; class PrivateCheckViewItem; class PrivateIsoWhatsThis; diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index d920fd4..85f6a7d 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -32,24 +32,24 @@ #include <k3bglobals.h> #include <k3bwritingmodewidget.h> -#include <qcheckbox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qpoint.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qfileinfo.h> -#include <qtabwidget.h> -#include <qspinbox.h> -#include <qfile.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqpoint.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqfileinfo.h> +#include <tqtabwidget.h> +#include <tqspinbox.h> +#include <tqfile.h> #include <kmessagebox.h> #include <klineedit.h> @@ -64,18 +64,18 @@ #include "k3bfilecompilationsizehandler.h" -K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, parent, name, modal ) +K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, tqparent, name, modal ) { prepareGui(); - setTitle( i18n("Data Project"), i18n("Size: %1").arg( KIO::convertSize(_doc->size()) ) ); + setTitle( i18n("Data Project"), i18n("Size: %1").tqarg( KIO::convertSize(_doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); // create image settings tab @@ -84,13 +84,13 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, QWidget *parent, const ch setupSettingsTab(); - connect( m_comboMultisession, SIGNAL(activated(int)), - this, SLOT(slotMultiSessionModeChanged()) ); + connect( m_comboMultisession, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotMultiSessionModeChanged()) ); m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE ); m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); - QString path = _doc->tempDir(); + TQString path = _doc->tempDir(); if( !path.isEmpty() ) { m_tempDirSelectionWidget->setTempPath( path ); } @@ -98,8 +98,8 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, QWidget *parent, const ch m_tempDirSelectionWidget->setDefaultImageFileName( _doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, SIGNAL(textChanged(const QString&)), - m_tempDirSelectionWidget, SLOT(setDefaultImageFileName(const QString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); } K3bDataBurnDialog::~K3bDataBurnDialog() @@ -152,15 +152,15 @@ void K3bDataBurnDialog::readSettings() void K3bDataBurnDialog::setupSettingsTab() { - QWidget* frame = new QWidget( this ); - QGridLayout* frameLayout = new QGridLayout( frame ); + TQWidget* frame = new TQWidget( this ); + TQGridLayout* frameLayout = new TQGridLayout( frame ); frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); - m_groupDataMode = new QGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); + m_groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); m_dataModeWidget = new K3bDataModeWidget( m_groupDataMode ); - QGroupBox* groupMultiSession = new QGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); + TQGroupBox* groupMultiSession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); m_comboMultisession = new K3bDataMultiSessionCombobox( groupMultiSession ); frameLayout->addWidget( m_groupDataMode, 0, 0 ); @@ -175,17 +175,17 @@ void K3bDataBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked - QFile::remove( m_tempDirSelectionWidget->tempPath() ); + TQFile::remove( m_tempDirSelectionWidget->tempPath() ); } else return; diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h index 1d1e994..4105884 100644 --- a/src/projects/k3bdataburndialog.h +++ b/src/projects/k3bdataburndialog.h @@ -19,13 +19,13 @@ #include "k3bprojectburndialog.h" -class QCheckBox; +class TQCheckBox; class KComboBox; -class QGroupBox; -class QLabel; -class QToolButton; -class QRadioButton; -class QButtonGroup; +class TQGroupBox; +class TQLabel; +class TQToolButton; +class TQRadioButton; +class TQButtonGroup; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bDataDoc; @@ -42,9 +42,10 @@ class K3bDataMultiSessionCombobox; class K3bDataBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bDataBurnDialog(K3bDataDoc*, QWidget *parent=0, const char *name=0, bool modal = true ); + K3bDataBurnDialog(K3bDataDoc*, TQWidget *tqparent=0, const char *name=0, bool modal = true ); ~K3bDataBurnDialog(); protected: @@ -58,11 +59,11 @@ class K3bDataBurnDialog : public K3bProjectBurnDialog K3bDataImageSettingsWidget* m_imageSettingsWidget; // ---------------------------------------------- - QGroupBox* m_groupDataMode; + TQGroupBox* m_groupDataMode; K3bDataModeWidget* m_dataModeWidget; K3bDataMultiSessionCombobox* m_comboMultisession; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; protected slots: void slotStartClicked(); diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 4a7ec18..558e0cf 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -26,9 +26,9 @@ #include <k3bview.h> #include <k3bvalidators.h> -#include <qdragobject.h> -#include <qheader.h> -#include <qtimer.h> +#include <tqdragobject.h> +#include <tqheader.h> +#include <tqtimer.h> #include <klocale.h> #include <kaction.h> @@ -51,21 +51,21 @@ public: K3bDataDirViewItem* animatedDirItem; K3bDataDirViewItem* dropDirItem; int animationCounter; - QPixmap beforeAniPixmap; + TQPixmap beforeAniPixmap; // used for the urladdingdialog hack KURL::List addUrls; K3bDirItem* addParentDir; - QString lastUpdateVolumeId; + TQString lastUpdateVolumeId; - QValidator* iso9660Validator; - QValidator* asciiValidator; + TQValidator* iso9660Validator; + TQValidator* asciiValidator; }; -K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, QWidget* parent ) - : K3bListView( parent ), m_view(view) +K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget* tqparent ) + : K3bListView( tqparent ), m_view(view) { d = new Private(); @@ -78,7 +78,7 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, QWidget* setFullWidth( true ); setDragEnabled( true ); setItemsMovable( false ); - setAlternateBackground( QColor() ); + setAlternateBackground( TQColor() ); // setSorting(-1); addColumn( i18n("Directory") ); @@ -89,15 +89,15 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, QWidget* m_root = new K3bDataRootViewItem( doc, this ); m_itemMap.insert( doc->root(), m_root ); - connect( m_doc, SIGNAL(changed()), this, SLOT(slotDocChanged()) ); - connect( this, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) ); - connect( this, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) ); - connect( m_doc, SIGNAL(itemRemoved(K3bDataItem*)), this, SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, SIGNAL(itemAdded(K3bDataItem*)), this, SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*,QListViewItem*, const QPoint&)), - this, SLOT(showPopupMenu(KListView*,QListViewItem*, const QPoint&)) ); - connect( this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - this, SLOT(slotDropped(QDropEvent*, QListViewItem*, QListViewItem*)) ); + connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(KListView*,TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); setupActions(); } @@ -109,20 +109,20 @@ K3bDataDirTreeView::~K3bDataDirTreeView() } -void K3bDataDirTreeView::slotExecuted( QListViewItem* item ) +void K3bDataDirTreeView::slotExecuted( TQListViewItem* item ) { if( K3bDataDirViewItem* viewItem = dynamic_cast<K3bDataDirViewItem*>(item) ) emit dirSelected( viewItem->dirItem() ); } -bool K3bDataDirTreeView::acceptDrag(QDropEvent* e) const{ +bool K3bDataDirTreeView::acceptDrag(TQDropEvent* e) const{ return ( e->source() == viewport() || KURLDrag::canDecode(e) || ( m_fileView && e->source() == m_fileView->viewport() ) ); } -void K3bDataDirTreeView::contentsDragMoveEvent( QDragMoveEvent* e ) +void K3bDataDirTreeView::contentsDragMoveEvent( TQDragMoveEvent* e ) { K3bListView::contentsDragMoveEvent( e ); @@ -138,7 +138,7 @@ void K3bDataDirTreeView::contentsDragMoveEvent( QDragMoveEvent* e ) } -void K3bDataDirTreeView::contentsDragLeaveEvent( QDragLeaveEvent* e ) +void K3bDataDirTreeView::contentsDragLeaveEvent( TQDragLeaveEvent* e ) { K3bListView::contentsDragLeaveEvent( e ); @@ -150,7 +150,7 @@ void K3bDataDirTreeView::contentsDragLeaveEvent( QDragLeaveEvent* e ) } -void K3bDataDirTreeView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* ) +void K3bDataDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListViewItem* ) { // remove any highlighting if( d->dropDirItem ) { @@ -171,15 +171,15 @@ void K3bDataDirTreeView::slotDropped( QDropEvent* e, QListViewItem*, QListViewIt if( d->addParentDir ) { - // startDropAnimation( parent ); + // startDropAnimation( tqparent ); // check if items have been moved if( m_fileView && e->source() == m_fileView->viewport() ) { // move all selected items - QPtrList<QListViewItem> selectedViewItems = m_fileView->selectedItems(); - QValueList<K3bDataItem*> selectedDataItems; - QPtrListIterator<QListViewItem> it( selectedViewItems ); + TQPtrList<TQListViewItem> selectedViewItems = m_fileView->selectedItems(); + TQValueList<K3bDataItem*> selectedDataItems; + TQPtrListIterator<TQListViewItem> it( selectedViewItems ); for( ; it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); if( dataViewItem ) @@ -188,14 +188,14 @@ void K3bDataDirTreeView::slotDropped( QDropEvent* e, QListViewItem*, QListViewIt kdDebug() << "no dataviewitem" << endl; } - K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, d->addParentDir, this, e->action() == QDropEvent::Copy ); + K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, d->addParentDir, this, e->action() == TQDropEvent::Copy ); } else if( e->source() == viewport() ) { // move the selected dir if( K3bDataDirViewItem* dirItem = dynamic_cast<K3bDataDirViewItem*>( selectedItem() ) ) { - QValueList<K3bDataItem*> selectedDataItems; + TQValueList<K3bDataItem*> selectedDataItems; selectedDataItems.append( dirItem->dirItem() ); - K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, d->addParentDir, this, e->action() == QDropEvent::Copy ); + K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, d->addParentDir, this, e->action() == TQDropEvent::Copy ); } } else { @@ -207,7 +207,7 @@ void K3bDataDirTreeView::slotDropped( QDropEvent* e, QListViewItem*, QListViewIt // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); } } } @@ -231,8 +231,8 @@ void K3bDataDirTreeView::slotItemAdded( K3bDataItem* item ) // should only be emitted once for every item // K3bDirItem* dirItem = static_cast<K3bDirItem*>( item ); - K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->parent()]; - K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); + K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } } @@ -242,14 +242,14 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item ) { if( item->isDir() ) { K3bDirItem* dirItem = static_cast<K3bDirItem*>( item ); - QMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.find( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.tqfind( dirItem ); if( it != m_itemMap.end() ) { K3bDataDirViewItem* viewItem = it.data(); m_itemMap.remove( it ); // we don't get removedInfo for the child items // so we need to remove them here - QPtrListIterator<K3bDataItem> it( dirItem->children() ); + TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); for( ; it.current(); ++it ) { if( it.current()->isDir() ) slotDataItemRemoved( it.current() ); @@ -263,12 +263,12 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item ) void K3bDataDirTreeView::setCurrentDir( K3bDirItem* dirItem ) { - QMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.find( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.tqfind( dirItem ); if( it != m_itemMap.end() ) { setCurrentItem( it.data() ); it.data()->setOpen(true); if( it.data() != root() ) - it.data()->parent()->setOpen(true); + it.data()->tqparent()->setOpen(true); } else { kdDebug() << "Tried to set unknown dirItem to current" << endl; @@ -280,29 +280,29 @@ void K3bDataDirTreeView::setupActions() { m_actionCollection = new KActionCollection( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", 0, this, SLOT(slotProperties()), + m_actionProperties = new KAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, this, SLOT(slotNewDir()), + m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, this, SLOT(slotRemoveItem()), + m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); KShortcut renameShortCut( Key_F2 ); renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, this, SLOT(slotRenameItem()), + m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } -void K3bDataDirTreeView::showPopupMenu( KListView*, QListViewItem* item, const QPoint& point ) +void K3bDataDirTreeView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& point ) { if( item ) { if( K3bDataViewItem* di = dynamic_cast<K3bDataViewItem*>(item) ) { @@ -328,16 +328,16 @@ void K3bDataDirTreeView::showPopupMenu( KListView*, QListViewItem* item, const Q void K3bDataDirTreeView::slotNewDir() { if( K3bDataDirViewItem* vI = dynamic_cast<K3bDataDirViewItem*>(currentItem()) ) { - K3bDirItem* parent = vI->dirItem(); + K3bDirItem* tqparent = vI->dirItem(); - QString name; + TQString name; bool ok; name = KInputDialog::getText( i18n("New Directory"), i18n("Please insert the name for the new directory:"), i18n("New Directory"), &ok, this ); - while( ok && K3bDataDoc::nameAlreadyInDir( name, parent ) ) { + while( ok && K3bDataDoc::nameAlreadyInDir( name, tqparent ) ) { name = KInputDialog::getText( i18n("New Directory"), i18n("A file with that name already exists. " "Please insert the name for the new directory:"), @@ -348,7 +348,7 @@ void K3bDataDirTreeView::slotNewDir() return; - m_doc->addEmptyDir( name, parent ); + m_doc->addEmptyDir( name, tqparent ); } } @@ -374,9 +374,9 @@ void K3bDataDirTreeView::slotProperties() if( viewItem && currentItem() != root() ) { K3bDataPropertiesDialog d( viewItem->dataItem(), this ); if( d.exec() ) { - repaint(); + tqrepaint(); if( m_fileView ) - m_fileView->repaint(); + m_fileView->tqrepaint(); } } else @@ -392,8 +392,8 @@ void K3bDataDirTreeView::startDropAnimation( K3bDirItem* dir ) if( vI ) { d->animationCounter = 0; d->animatedDirItem = vI; - d->beforeAniPixmap = QPixmap( *vI->pixmap(0) ); - QTimer::singleShot( 0, this, SLOT(slotDropAnimate()) ); + d->beforeAniPixmap = TQPixmap( *vI->pixmap(0) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); } } @@ -426,7 +426,7 @@ void K3bDataDirTreeView::slotDropAnimate() } d->animationCounter++; - QTimer::singleShot( 300, this, SLOT(slotDropAnimate()) ); + TQTimer::singleShot( 300, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); } } } @@ -448,26 +448,26 @@ void K3bDataDirTreeView::checkForNewItems() while( item != 0 ) { // check if we have an entry and if not, create one - // we can assume that a listViewItem for the parent exists + // we can assume that a listViewItem for the tqparent exists // since we go top to bottom if( item->isDir() ) { K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( item ); - QMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.find( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.tqfind( dirItem ); if( itDirItem == m_itemMap.end() ) { - K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->parent()]; - K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); + K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } else { - // check if parent still correct (to get moved items) + // check if tqparent still correct (to get moved items) K3bDataDirViewItem* dirViewItem = itDirItem.data(); - K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->parent(); - K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->parent()]; - if( dirParentViewItem != parentViewItem ) { + K3bDataDirViewItem* tqparentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent(); + K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->tqparent()]; + if( dirParentViewItem != tqparentViewItem ) { // reparent it - parentViewItem->takeItem( dirViewItem ); + tqparentViewItem->takeItem( dirViewItem ); dirParentViewItem->insertItem( dirViewItem ); } } @@ -478,7 +478,7 @@ void K3bDataDirTreeView::checkForNewItems() // check the directory depth - QListViewItemIterator it(root()); + TQListViewItemIterator it(root()); while( it.current() != 0 ) { if( K3bDataDirViewItem* dirViewItem = dynamic_cast<K3bDataDirViewItem*>(it.current()) ) if( it.current() != m_root ) { @@ -499,7 +499,7 @@ void K3bDataDirTreeView::slotDocChanged() // avoid flicker if( d->lastUpdateVolumeId != m_doc->isoOptions().volumeID() ) { d->lastUpdateVolumeId = m_doc->isoOptions().volumeID(); - root()->repaint(); + root()->tqrepaint(); } } diff --git a/src/projects/k3bdatadirtreeview.h b/src/projects/k3bdatadirtreeview.h index c79a9c6..2ffaaa7 100644 --- a/src/projects/k3bdatadirtreeview.h +++ b/src/projects/k3bdatadirtreeview.h @@ -21,7 +21,7 @@ #include <k3blistview.h> #include <kurl.h> -#include <qmap.h> +#include <tqmap.h> class K3bDataView; class K3bDataDoc; @@ -33,8 +33,8 @@ class KActionCollection; class KActionMenu; class KAction; class K3bView; -class QDragMoveEvent; -class QDragLeaveEvent; +class TQDragMoveEvent; +class TQDragLeaveEvent; /** @@ -44,9 +44,10 @@ class QDragLeaveEvent; class K3bDataDirTreeView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bDataDirTreeView( K3bView*, K3bDataDoc*, QWidget* parent ); + K3bDataDirTreeView( K3bView*, K3bDataDoc*, TQWidget* tqparent ); virtual ~K3bDataDirTreeView(); K3bDataDirViewItem* root() { return m_root; } @@ -60,13 +61,13 @@ class K3bDataDirTreeView : public K3bListView void setCurrentDir( K3bDirItem* ); signals: - // void urlsDropped( const KURL::List&, QListViewItem* parent ); + // void urlsDropped( const KURL::List&, TQListViewItem* tqparent ); void dirSelected( K3bDirItem* ); protected: - bool acceptDrag(QDropEvent* e) const; - void contentsDragMoveEvent( QDragMoveEvent* e ); - void contentsDragLeaveEvent( QDragLeaveEvent* e ); + bool acceptDrag(TQDropEvent* e) const; + void contentsDragMoveEvent( TQDragMoveEvent* e ); + void contentsDragLeaveEvent( TQDragLeaveEvent* e ); KActionCollection* m_actionCollection; KActionMenu* m_popupMenu; @@ -76,7 +77,7 @@ class K3bDataDirTreeView : public K3bListView KAction* m_actionProperties; protected slots: - virtual void slotDropped( QDropEvent* e, QListViewItem* after, QListViewItem* parent ); + virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); private: void setupActions(); @@ -93,15 +94,15 @@ class K3bDataDirTreeView : public K3bListView * We save the dirItems in a map to have a fast way * for checking for new or removed items */ - QMap<K3bDirItem*, K3bDataDirViewItem*> m_itemMap; + TQMap<K3bDirItem*, K3bDataDirViewItem*> m_itemMap; class Private; Private* d; private slots: - void slotExecuted( QListViewItem* ); + void slotExecuted( TQListViewItem* ); void slotDataItemRemoved( K3bDataItem* ); - void showPopupMenu( KListView*, QListViewItem* _item, const QPoint& ); + void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); void slotNewDir(); diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 4c06bde..9030759 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -30,12 +30,12 @@ #include <k3bview.h> -#include <qdragobject.h> -#include <qpainter.h> -#include <qfontmetrics.h> -#include <qtimer.h> -#include <qheader.h> -#include <qfileinfo.h> +#include <tqdragobject.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> +#include <tqtimer.h> +#include <tqheader.h> +#include <tqfileinfo.h> #include <klocale.h> #include <kaction.h> @@ -47,8 +47,8 @@ #include <kdeversion.h> -K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, QWidget* parent ) - : K3bListView( parent ), +K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, TQWidget* tqparent ) + : K3bListView( tqparent ), m_view(view), m_dropDirItem(0) { @@ -79,16 +79,16 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView m_currentDir = doc->root(); checkForNewItems(); - connect( m_treeView, SIGNAL(dirSelected(K3bDirItem*)), this, SLOT(slotSetCurrentDir(K3bDirItem*)) ); - connect( m_doc, SIGNAL(itemRemoved(K3bDataItem*)), this, SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, SIGNAL(itemAdded(K3bDataItem*)), this, SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(showPopupMenu(KListView*, QListViewItem*, const QPoint&)) ); - connect( this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - this, SLOT(slotDropped(QDropEvent*, QListViewItem*, QListViewItem*)) ); - connect( this, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), - this, SLOT(slotDoubleClicked(QListViewItem*)) ); + connect( m_treeView, TQT_SIGNAL(dirSelected(K3bDirItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotSetCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) ); setupActions(); } @@ -126,7 +126,7 @@ void K3bDataFileView::clearItems() void K3bDataFileView::slotItemAdded( K3bDataItem* item ) { - if( item->parent() == currentDir() ) { + if( item->tqparent() == currentDir() ) { K3bDataViewItem* vi = 0; if( item->isDir() ) vi = new K3bDataDirViewItem( static_cast<K3bDirItem*>(item), this ); @@ -153,7 +153,7 @@ void K3bDataFileView::slotDataItemRemoved( K3bDataItem* item ) } } - if( m_itemMap.contains( item ) ) { + if( m_itemMap.tqcontains( item ) ) { delete m_itemMap[item]; m_itemMap.remove(item); } @@ -165,26 +165,26 @@ void K3bDataFileView::checkForNewItems() hideEditor(); // add items that are not there yet - for( QPtrListIterator<K3bDataItem> it( m_currentDir->children() ); it.current(); ++it ) { - if( !m_itemMap.contains( it.current() ) ) { + for( TQPtrListIterator<K3bDataItem> it( m_currentDir->tqchildren() ); it.current(); ++it ) { + if( !m_itemMap.tqcontains( it.current() ) ) { slotItemAdded( it.current() ); } } // now check if some of the items have been moved out of the currently showing dir. - for( QListViewItemIterator it( this ); it.current(); ++it ) { + for( TQListViewItemIterator it( this ); it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); - if( dataViewItem && dataViewItem->dataItem()->parent() != currentDir() ) + if( dataViewItem && dataViewItem->dataItem()->tqparent() != currentDir() ) delete dataViewItem; } } -QDragObject* K3bDataFileView::dragObject() +TQDragObject* K3bDataFileView::dragObject() { - QPtrList<QListViewItem> selectedViewItems = selectedItems(); + TQPtrList<TQListViewItem> selectedViewItems = selectedItems(); KURL::List urls; - for( QPtrListIterator<QListViewItem> it( selectedViewItems ); it.current(); ++it ) { + for( TQPtrListIterator<TQListViewItem> it( selectedViewItems ); it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); if( dataViewItem ) { urls.append( KURL::fromPathOrURL(dataViewItem->dataItem()->localPath()) ); @@ -200,7 +200,7 @@ QDragObject* K3bDataFileView::dragObject() } -bool K3bDataFileView::acceptDrag(QDropEvent* e) const +bool K3bDataFileView::acceptDrag(TQDropEvent* e) const { return ( e->source() == viewport() || KURLDrag::canDecode(e) || @@ -208,7 +208,7 @@ bool K3bDataFileView::acceptDrag(QDropEvent* e) const } -void K3bDataFileView::contentsDragMoveEvent( QDragMoveEvent* e ) +void K3bDataFileView::contentsDragMoveEvent( TQDragMoveEvent* e ) { K3bListView::contentsDragMoveEvent( e ); @@ -222,7 +222,7 @@ void K3bDataFileView::contentsDragMoveEvent( QDragMoveEvent* e ) } -void K3bDataFileView::contentsDragLeaveEvent( QDragLeaveEvent* e ) +void K3bDataFileView::contentsDragLeaveEvent( TQDragLeaveEvent* e ) { K3bListView::contentsDragLeaveEvent( e ); @@ -234,7 +234,7 @@ void K3bDataFileView::contentsDragLeaveEvent( QDragLeaveEvent* e ) } -void K3bDataFileView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* ) +void K3bDataFileView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListViewItem* ) { // remove any highlighting if( m_dropDirItem ) { @@ -259,9 +259,9 @@ void K3bDataFileView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* // check if items have been moved if( e->source() == viewport() ) { // move all selected items - QPtrList<QListViewItem> selectedViewItems = selectedItems(); - QValueList<K3bDataItem*> selectedDataItems; - QPtrListIterator<QListViewItem> it( selectedViewItems ); + TQPtrList<TQListViewItem> selectedViewItems = selectedItems(); + TQValueList<K3bDataItem*> selectedDataItems; + TQPtrListIterator<TQListViewItem> it( selectedViewItems ); for( ; it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); if( dataViewItem ) @@ -270,14 +270,14 @@ void K3bDataFileView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* kdDebug() << "no dataviewitem" << endl; } - K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, m_addParentDir, this, e->action() == QDropEvent::Copy ); + K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, m_addParentDir, this, e->action() == TQDropEvent::Copy ); } else if( e->source() == m_treeView->viewport() ) { // move the selected dir if( K3bDataDirViewItem* dirItem = dynamic_cast<K3bDataDirViewItem*>( m_treeView->selectedItem() ) ) { - QValueList<K3bDataItem*> selectedDataItems; + TQValueList<K3bDataItem*> selectedDataItems; selectedDataItems.append( dirItem->dirItem() ); - K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, m_addParentDir, this, e->action() == QDropEvent::Copy ); + K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, m_addParentDir, this, e->action() == TQDropEvent::Copy ); } } else { @@ -289,7 +289,7 @@ void K3bDataFileView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); } } } @@ -305,7 +305,7 @@ void K3bDataFileView::slotAddUrls() } -void K3bDataFileView::slotExecuted( QListViewItem* item ) +void K3bDataFileView::slotExecuted( TQListViewItem* item ) { if( K3bDataDirViewItem* k = dynamic_cast<K3bDataDirViewItem*>( item ) ) { hideEditor(); // disable the K3bListView Editor @@ -319,37 +319,37 @@ void K3bDataFileView::setupActions() { m_actionCollection = new KActionCollection( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", 0, this, SLOT(slotProperties()), + m_actionProperties = new KAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, this, SLOT(slotNewDir()), + m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, this, SLOT(slotRemoveItem()), + m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); KShortcut renameShortCut( Key_F2 ); renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, this, SLOT(slotRenameItem()), + m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, this, SLOT(slotParentDir()), - actionCollection(), "parent_dir" ); - m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, this, SLOT(slotOpen()), + m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), + actionCollection(), "tqparent_dir" ); + m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), actionCollection(), "open" ); m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionParentDir ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionOpen ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } -void K3bDataFileView::showPopupMenu( KListView*, QListViewItem* item, const QPoint& point ) +void K3bDataFileView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& point ) { if( item ) { K3bDataItem* di = static_cast<K3bDataViewItem*>(item)->dataItem(); @@ -373,16 +373,16 @@ void K3bDataFileView::showPopupMenu( KListView*, QListViewItem* item, const QPoi void K3bDataFileView::slotNewDir() { - K3bDirItem* parent = currentDir(); + K3bDirItem* tqparent = currentDir(); - QString name; + TQString name; bool ok; name = KInputDialog::getText( i18n("New Directory"), i18n("Please insert the name for the new directory:"), i18n("New Directory"), &ok, this ); - while( ok && K3bDataDoc::nameAlreadyInDir( name, parent ) ) { + while( ok && K3bDataDoc::nameAlreadyInDir( name, tqparent ) ) { name = KInputDialog::getText( i18n("New Directory"), i18n("A file with that name already exists. " "Please insert the name for the new directory:"), @@ -393,7 +393,7 @@ void K3bDataFileView::slotNewDir() return; - m_doc->addEmptyDir( name, parent ); + m_doc->addEmptyDir( name, tqparent ); } @@ -406,8 +406,8 @@ void K3bDataFileView::slotRenameItem() void K3bDataFileView::slotRemoveItem() { - QPtrList<QListViewItem> items = selectedItems(); - QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items = selectedItems(); + TQPtrListIterator<TQListViewItem> it( items ); for(; it.current(); ++it ) { if( K3bDataViewItem* d = dynamic_cast<K3bDataViewItem*>( it.current() ) ) m_doc->removeItem( d->dataItem() ); @@ -418,7 +418,7 @@ void K3bDataFileView::slotRemoveItem() void K3bDataFileView::slotParentDir() { if( currentDir() != m_doc->root() ) { - slotSetCurrentDir( currentDir()->parent() ); + slotSetCurrentDir( currentDir()->tqparent() ); emit dirSelected( currentDir() ); } @@ -458,7 +458,7 @@ void K3bDataFileView::slotOpen() !KRun::isExecutableFile( KURL::fromPathOrURL(item->localPath()), fvi->mimeType()->name() ) #else - !QFileInfo( item->localPath() ).isExecutable() + !TQFileInfo( item->localPath() ).isExecutable() #endif ) KRun::runURL( KURL::fromPathOrURL(item->localPath()), @@ -470,7 +470,7 @@ void K3bDataFileView::slotOpen() } -void K3bDataFileView::slotDoubleClicked( QListViewItem* ) +void K3bDataFileView::slotDoubleClicked( TQListViewItem* ) { if( K3bDataViewItem* viewItem = dynamic_cast<K3bDataViewItem*>( selectedItems().first() ) ) { if( !viewItem->dataItem()->isDir() ) { diff --git a/src/projects/k3bdatafileview.h b/src/projects/k3bdatafileview.h index 580af96..cd7e2c8 100644 --- a/src/projects/k3bdatafileview.h +++ b/src/projects/k3bdatafileview.h @@ -21,7 +21,7 @@ #include <kurl.h> -#include <qmap.h> +#include <tqmap.h> class K3bDataDoc; @@ -29,16 +29,16 @@ class K3bDirItem; class K3bDataView; class K3bDataViewItem; class K3bDataItem; -class QDropEvent; +class TQDropEvent; class KActionCollection; class KActionMenu; class KAction; class K3bDataDirTreeView; class K3bDataDirViewItem; class K3bView; -class QPainter; -class QDragMoveEvent; -class QDragLeaveEvent; +class TQPainter; +class TQDragMoveEvent; +class TQDragLeaveEvent; /** *@author Sebastian Trueg @@ -47,9 +47,10 @@ class QDragLeaveEvent; class K3bDataFileView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bDataFileView( K3bView*, K3bDataDirTreeView*, K3bDataDoc*, QWidget* parent ); + K3bDataFileView( K3bView*, K3bDataDirTreeView*, K3bDataDoc*, TQWidget* tqparent ); ~K3bDataFileView(); K3bDirItem* currentDir() const; @@ -65,24 +66,24 @@ class K3bDataFileView : public K3bListView private slots: void slotDataItemRemoved( K3bDataItem* ); - void slotExecuted( QListViewItem* ); - void slotDropped( QDropEvent* e, QListViewItem* after, QListViewItem* parent ); - void showPopupMenu( KListView*, QListViewItem* _item, const QPoint& ); + void slotExecuted( TQListViewItem* ); + void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); + void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); void slotNewDir(); void slotParentDir(); void slotProperties(); - void slotDoubleClicked( QListViewItem* item ); + void slotDoubleClicked( TQListViewItem* item ); void slotItemAdded( K3bDataItem* ); void slotAddUrls(); void slotOpen(); protected: - bool acceptDrag(QDropEvent* e) const; - void contentsDragMoveEvent( QDragMoveEvent* e ); - void contentsDragLeaveEvent( QDragLeaveEvent* e ); - QDragObject* dragObject(); + bool acceptDrag(TQDropEvent* e) const; + void contentsDragMoveEvent( TQDragMoveEvent* e ); + void contentsDragLeaveEvent( TQDragLeaveEvent* e ); + TQDragObject* dragObject(); private: void clearItems(); @@ -105,7 +106,7 @@ class K3bDataFileView : public K3bListView K3bDataDirViewItem* m_dropDirItem; - QMap<K3bDataItem*, K3bDataViewItem*> m_itemMap; + TQMap<K3bDataItem*, K3bDataViewItem*> m_itemMap; // used for the urladdingdialog hack KURL::List m_addUrls; diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 331e1eb..57f1474 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -19,14 +19,14 @@ #include "k3bisooptions.h" -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qlayout.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> #include <kmessagebox.h> #include <klocale.h> @@ -126,8 +126,8 @@ static void initializePresets() class K3bDataImageSettingsWidget::CustomFilesystemsDialog : public KDialogBase { public: - CustomFilesystemsDialog( QWidget* parent ) - : KDialogBase( parent, + CustomFilesystemsDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "custom_filesystems_dialog", true, i18n("Custom Data Project Filesystems"), @@ -145,8 +145,8 @@ public: class K3bDataImageSettingsWidget::VolumeDescDialog : public KDialogBase { public: - VolumeDescDialog( QWidget* parent ) - : KDialogBase( parent, + VolumeDescDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "voldesc_dialog", true, i18n("Volume Descriptor"), @@ -157,8 +157,8 @@ public: setMainWidget( w ); // give ourselves a reasonable size - QSize s = sizeHint(); - s.setWidth( QMAX(s.width(), 300) ); + TQSize s = tqsizeHint(); + s.setWidth( TQMAX(s.width(), 300) ); resize( s ); } @@ -167,21 +167,21 @@ public: -K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( QWidget* parent, const char* name ) - : base_K3bDataImageSettings( parent, name ), +K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* tqparent, const char* name ) + : base_K3bDataImageSettings( tqparent, name ), m_fileSystemOptionsShown(true) { - layout()->setMargin( KDialog::marginHint() ); + tqlayout()->setMargin( KDialog::marginHint() ); m_customFsDlg = new CustomFilesystemsDialog( this ); m_volDescDlg = new VolumeDescDialog( this ); - connect( m_buttonCustomFilesystems, SIGNAL(clicked()), - this, SLOT(slotCustomFilesystems()) ); - connect( m_buttonMoreVolDescFields, SIGNAL(clicked()), - this, SLOT(slotMoreVolDescFields()) ); - connect( m_comboSpaceHandling, SIGNAL(activated(int)), - this, SLOT(slotSpaceHandlingChanged(int)) ); + connect( m_buttonCustomFilesystems, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCustomFilesystems()) ); + connect( m_buttonMoreVolDescFields, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotMoreVolDescFields()) ); + connect( m_comboSpaceHandling, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotSpaceHandlingChanged(int)) ); for( int i = 0; i < FS_MAX; ++i ) m_comboFilesystems->insertItem( i18n( s_fsPresetNames[i] ) ); @@ -189,7 +189,7 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( QWidget* parent, const c if( !s_fsPresetsInitialized ) initializePresets(); - QWhatsThis::add( m_comboFilesystems, + TQWhatsThis::add( m_comboFilesystems, i18n("<p><b>File System Presets</b>" "<p>K3b provides the following file system Presets which allow for a quick selection " "of the most frequently used settings.") @@ -242,7 +242,7 @@ void K3bDataImageSettingsWidget::slotCustomFilesystems() K3bIsoOptions o; m_customFsDlg->w->save( o ); - if( m_customFsDlg->exec() == QDialog::Accepted ) { + if( m_customFsDlg->exec() == TQDialog::Accepted ) { slotFilesystemsChanged(); } else { @@ -258,7 +258,7 @@ void K3bDataImageSettingsWidget::slotFilesystemsChanged() return; // new custom entry - QStringList s; + TQStringList s; if( m_customFsDlg->w->m_checkRockRidge->isChecked() ) s += i18n("Rock Ridge"); if( m_customFsDlg->w->m_checkJoliet->isChecked() ) @@ -268,7 +268,7 @@ void K3bDataImageSettingsWidget::slotFilesystemsChanged() if( s.isEmpty() ) m_comboFilesystems->changeItem( i18n("Custom (ISO9660 only)"), FS_CUSTOM ); else - m_comboFilesystems->changeItem( i18n("Custom (%1)").arg( s.join(", ") ), FS_CUSTOM ); + m_comboFilesystems->changeItem( i18n("Custom (%1)").tqarg( s.join(", ") ), FS_CUSTOM ); // see if any of the presets is loaded m_comboFilesystems->setCurrentItem( FS_CUSTOM ); @@ -318,7 +318,7 @@ void K3bDataImageSettingsWidget::slotMoreVolDescFields() m_volDescDlg->w->save( o ); // exec dlg - if( m_volDescDlg->exec() == QDialog::Accepted ) { + if( m_volDescDlg->exec() == TQDialog::Accepted ) { // accept new entries m_volDescDlg->w->save( o ); m_editVolumeName->setText( o.volumeID() ); @@ -353,7 +353,7 @@ void K3bDataImageSettingsWidget::load( const K3bIsoOptions& o ) case K3bIsoOptions::extended: m_comboSpaceHandling->setCurrentItem( WS_EXTENDED_STRIP ); break; - case K3bIsoOptions::replace: + case K3bIsoOptions::tqreplace: m_comboSpaceHandling->setCurrentItem( WS_REPLACE ); break; default: @@ -387,7 +387,7 @@ void K3bDataImageSettingsWidget::save( K3bIsoOptions& o ) o.setWhiteSpaceTreatment( K3bIsoOptions::extended ); break; case WS_REPLACE: - o.setWhiteSpaceTreatment( K3bIsoOptions::replace ); + o.setWhiteSpaceTreatment( K3bIsoOptions::tqreplace ); break; default: o.setWhiteSpaceTreatment( K3bIsoOptions::noChange ); diff --git a/src/projects/k3bdataimagesettingswidget.h b/src/projects/k3bdataimagesettingswidget.h index e16226f..13086f3 100644 --- a/src/projects/k3bdataimagesettingswidget.h +++ b/src/projects/k3bdataimagesettingswidget.h @@ -25,9 +25,10 @@ class K3bIsoOptions; class K3bDataImageSettingsWidget : public base_K3bDataImageSettings { Q_OBJECT + TQ_OBJECT public: - K3bDataImageSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bDataImageSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataImageSettingsWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp index 57dd818..87e6551 100644 --- a/src/projects/k3bdatamultisessioncombobox.cpp +++ b/src/projects/k3bdatamultisessioncombobox.cpp @@ -18,8 +18,8 @@ #include <klocale.h> #include <kconfig.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> static const int s_autoIndex = 0; @@ -29,14 +29,14 @@ static const int s_continueIndex = 3; static const int s_finishIndex = 4; -K3bDataMultiSessionCombobox::K3bDataMultiSessionCombobox( QWidget* parent, const char* name ) - : QComboBox( parent, name ), +K3bDataMultiSessionCombobox::K3bDataMultiSessionCombobox( TQWidget* tqparent, const char* name ) + : TQComboBox( tqparent, name ), m_forceNoMultiSession(false) { init( false ); - QToolTip::add( this, i18n("Select the Multisession Mode for the project.") ); - QWhatsThis::add( this, i18n("<p><b>Multisession Mode</b>" + TQToolTip::add( this, i18n("Select the Multisession Mode for the project.") ); + TQWhatsThis::add( this, i18n("<p><b>Multisession Mode</b>" "<p><b>Auto</b><br>" "Let K3b decide which mode to use. The decision will be based " "on the size of the project (does it fill the whole media) and " @@ -101,7 +101,7 @@ K3bDataDoc::MultiSessionMode K3bDataMultiSessionCombobox::multiSessionMode() con void K3bDataMultiSessionCombobox::saveConfig( KConfigBase* c ) { - QString s; + TQString s; switch( currentItem() ) { case s_autoIndex: s = "auto"; @@ -126,7 +126,7 @@ void K3bDataMultiSessionCombobox::saveConfig( KConfigBase* c ) void K3bDataMultiSessionCombobox::loadConfig( KConfigBase* c ) { - QString s = c->readEntry( "multisession mode" ); + TQString s = c->readEntry( "multisession mode" ); if( s == "none" ) setMultiSessionMode( K3bDataDoc::NONE ); else if( s == "start" ) diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h index cb44989..71ccc02 100644 --- a/src/projects/k3bdatamultisessioncombobox.h +++ b/src/projects/k3bdatamultisessioncombobox.h @@ -16,18 +16,19 @@ #ifndef _K3B_DATA_MULTISESSION_COMBOBOX_H_ #define _K3B_DATA_MULTISESSION_COMBOBOX_H_ -#include <qcombobox.h> +#include <tqcombobox.h> #include <k3bdatadoc.h> class KConfigBase; -class K3bDataMultiSessionCombobox : public QComboBox +class K3bDataMultiSessionCombobox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - K3bDataMultiSessionCombobox( QWidget* parent = 0, const char* name = 0 ); + K3bDataMultiSessionCombobox( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataMultiSessionCombobox(); /** diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 39fec61..7cc8549 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -21,15 +21,15 @@ #include <kcutlabel.h> #include <k3bvalidators.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qframe.h> -#include <qcheckbox.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qtabwidget.h> -#include <qvalidator.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqcheckbox.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqtabwidget.h> +#include <tqvalidator.h> #include <klineedit.h> #include <kiconloader.h> @@ -41,46 +41,46 @@ -K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget* parent, const char* name ) - : KDialogBase( Plain, i18n("File Properties"), Ok|Cancel, Ok, parent, name, true, false ) +K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidget* tqparent, const char* name ) + : KDialogBase( Plain, i18n("File Properties"), Ok|Cancel, Ok, tqparent, name, true, false ) { m_dataItem = dataItem; - QLabel* labelMimeType = new QLabel( plainPage() ); - QLabel* extraInfoLabel = new QLabel( plainPage() ); + TQLabel* labelMimeType = new TQLabel( plainPage() ); + TQLabel* extraInfoLabel = new TQLabel( plainPage() ); m_editName = new KLineEdit( plainPage() ); - m_labelType = new QLabel( plainPage() ); + m_labelType = new TQLabel( plainPage() ); m_labelLocation = new KCutLabel( plainPage() ); - m_labelSize = new QLabel( plainPage() ); - m_labelBlocks = new QLabel( plainPage() ); + m_labelSize = new TQLabel( plainPage() ); + m_labelBlocks = new TQLabel( plainPage() ); m_labelLocalName = new KCutLabel( plainPage() ); m_labelLocalLocation = new KCutLabel( plainPage() ); - QGridLayout* grid = new QGridLayout( plainPage() ); + TQGridLayout* grid = new TQGridLayout( plainPage() ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); grid->addWidget( labelMimeType, 0, 0 ); grid->addWidget( m_editName, 0, 2 ); - QFrame* line = new QFrame( plainPage() ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame* line = new TQFrame( plainPage() ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); grid->addMultiCellWidget( line, 1, 1, 0, 2 ); - grid->addWidget( new QLabel( i18n("Type:"), plainPage() ), 2, 0 ); - grid->addWidget( new QLabel( i18n("Location:"), plainPage() ), 4, 0 ); - grid->addWidget( new QLabel( i18n("Size:"), plainPage() ), 5, 0 ); - grid->addWidget( new QLabel( i18n("Used blocks:"), plainPage() ), 6, 0 ); + grid->addWidget( new TQLabel( i18n("Type:"), plainPage() ), 2, 0 ); + grid->addWidget( new TQLabel( i18n("Location:"), plainPage() ), 4, 0 ); + grid->addWidget( new TQLabel( i18n("Size:"), plainPage() ), 5, 0 ); + grid->addWidget( new TQLabel( i18n("Used blocks:"), plainPage() ), 6, 0 ); grid->addWidget( m_labelType, 2, 2 ); grid->addWidget( extraInfoLabel, 3, 2 ); grid->addWidget( m_labelLocation, 4, 2 ); grid->addWidget( m_labelSize, 5, 2 ); grid->addWidget( m_labelBlocks, 6, 2 ); - line = new QFrame( plainPage() ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + line = new TQFrame( plainPage() ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); grid->addMultiCellWidget( line, 7, 7, 0, 2 ); - QLabel* label1 = new QLabel( i18n("Local name:"), plainPage() ); + TQLabel* label1 = new TQLabel( i18n("Local name:"), plainPage() ); grid->addWidget( label1, 8, 0 ); - QLabel* label2 = new QLabel( i18n("Local location:"), plainPage() ); + TQLabel* label2 = new TQLabel( i18n("Local location:"), plainPage() ); grid->addWidget( label2, 9, 0 ); grid->addWidget( m_labelLocalName, 8, 2 ); grid->addWidget( m_labelLocalLocation, 9, 2 ); @@ -94,12 +94,12 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) ); labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) ); if( fileItem->isSymLink() ) - m_labelType->setText( i18n("Link to %1").arg(kFileItem.mimeComment()) ); + m_labelType->setText( i18n("Link to %1").tqarg(kFileItem.mimeComment()) ); else m_labelType->setText( kFileItem.mimeComment() ); m_labelLocalName->setText( kFileItem.name() ); - QString localLocation = kFileItem.url().path(-1); - localLocation.truncate( localLocation.findRev('/') ); + TQString localLocation = kFileItem.url().path(-1); + localLocation.truncate( localLocation.tqfindRev('/') ); m_labelLocalLocation->setText( localLocation ); m_labelSize->setText( KIO::convertSize(dataItem->size()) ); } @@ -127,49 +127,49 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget } m_editName->setText( dataItem->k3bName() ); - m_labelBlocks->setText( QString::number(dataItem->blocks().lba()) ); + m_labelBlocks->setText( TQString::number(dataItem->blocks().lba()) ); - QString location = "/" + dataItem->k3bPath(); + TQString location = "/" + dataItem->k3bPath(); if( location[location.length()-1] == '/' ) location.truncate( location.length()-1 ); - location.truncate( location.findRev('/') ); + location.truncate( location.tqfindRev('/') ); if( location.isEmpty() ) location = "/"; m_labelLocation->setText( location ); - extraInfoLabel->setText( QString( "(%1)" ).arg(dataItem->extraInfo()) ); + extraInfoLabel->setText( TQString( "(%1)" ).tqarg(dataItem->extraInfo()) ); if( dataItem->extraInfo().isEmpty() ) extraInfoLabel->hide(); // OPTIONS // ///////////////////////////////////////////////// - QTabWidget* optionTab = new QTabWidget( plainPage() ); - line = new QFrame( plainPage() ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQTabWidget* optionTab = new TQTabWidget( plainPage() ); + line = new TQFrame( plainPage() ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); grid->addMultiCellWidget( line, 10, 10, 0, 2 ); grid->addMultiCellWidget( optionTab, 12, 12, 0, 2 ); grid->setRowStretch( 11, 1 ); - QWidget* hideBox = new QWidget( optionTab ); - QGridLayout* hideBoxGrid = new QGridLayout( hideBox ); + TQWidget* hideBox = new TQWidget( optionTab ); + TQGridLayout* hideBoxGrid = new TQGridLayout( hideBox ); hideBoxGrid->setSpacing( spacingHint() ); hideBoxGrid->setMargin( marginHint() ); - m_checkHideOnRockRidge = new QCheckBox( i18n("Hide on Rockridge"), hideBox ); - m_checkHideOnJoliet = new QCheckBox( i18n("Hide on Joliet"), hideBox ); + m_checkHideOnRockRidge = new TQCheckBox( i18n("Hide on Rockridge"), hideBox ); + m_checkHideOnJoliet = new TQCheckBox( i18n("Hide on Joliet"), hideBox ); hideBoxGrid->addWidget( m_checkHideOnRockRidge, 0, 0 ); hideBoxGrid->addWidget( m_checkHideOnJoliet, 1, 0 ); hideBoxGrid->setRowStretch( 2, 1 ); // grid->addMultiCellWidget( m_checkHideOnRockRidge, 10, 10, 0, 2 ); // grid->addMultiCellWidget( m_checkHideOnJoliet, 11, 11, 0, 2 ); - QWidget* sortingBox = new QWidget( optionTab ); - QGridLayout* sortingBoxGrid = new QGridLayout( sortingBox ); + TQWidget* sortingBox = new TQWidget( optionTab ); + TQGridLayout* sortingBoxGrid = new TQGridLayout( sortingBox ); sortingBoxGrid->setSpacing( spacingHint() ); sortingBoxGrid->setMargin( marginHint() ); m_editSortWeight = new KLineEdit( sortingBox ); - m_editSortWeight->setValidator( new QIntValidator( -2147483647, 2147483647, m_editSortWeight ) ); - m_editSortWeight->setAlignment( Qt::AlignRight ); - sortingBoxGrid->addWidget( new QLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); + m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) ); + m_editSortWeight->tqsetAlignment( TQt::AlignRight ); + sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 ); sortingBoxGrid->setColStretch( 1, 1 ); sortingBoxGrid->setRowStretch( 1, 1 ); @@ -180,12 +180,12 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget m_checkHideOnJoliet->setChecked( dataItem->hideOnJoliet() ); m_checkHideOnRockRidge->setChecked( dataItem->hideOnRockRidge() ); - m_editSortWeight->setText( QString::number(dataItem->sortWeight()) ); + m_editSortWeight->setText( TQString::number(dataItem->sortWeight()) ); - // if the parent is hidden the value cannot be changed (see K3bDataItem::setHide...) - if( dataItem->parent() ) { - m_checkHideOnRockRidge->setDisabled( dataItem->parent()->hideOnRockRidge() ); - m_checkHideOnJoliet->setDisabled( dataItem->parent()->hideOnJoliet() ); + // if the tqparent is hidden the value cannot be changed (see K3bDataItem::setHide...) + if( dataItem->tqparent() ) { + m_checkHideOnRockRidge->setDisabled( dataItem->tqparent()->hideOnRockRidge() ); + m_checkHideOnJoliet->setDisabled( dataItem->tqparent()->hideOnJoliet() ); } if( !dataItem->isHideable() ) { @@ -194,35 +194,35 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget // line->hide(); } - QToolTip::add( m_checkHideOnRockRidge, i18n("Hide this file in the RockRidge filesystem") ); - QToolTip::add( m_checkHideOnJoliet, i18n("Hide this file in the Joliet filesystem") ); - QToolTip::add( m_editSortWeight, i18n("Modify the physical sorting") ); - QWhatsThis::add( m_checkHideOnRockRidge, i18n("<p>If this option is checked, the file or directory " + TQToolTip::add( m_checkHideOnRockRidge, i18n("Hide this file in the RockRidge filesystem") ); + TQToolTip::add( m_checkHideOnJoliet, i18n("Hide this file in the Joliet filesystem") ); + TQToolTip::add( m_editSortWeight, i18n("Modify the physical sorting") ); + TQWhatsThis::add( m_checkHideOnRockRidge, i18n("<p>If this option is checked, the file or directory " "(and its entire contents) will be hidden on the " "ISO9660 and RockRidge filesystem.</p>" "<p>This is useful, for example, for having different README " "files for RockRidge and Joliet, which can be managed " "by hiding README.joliet on RockRidge and README.rr " "on the Joliet filesystem.</p>") ); - QWhatsThis::add( m_checkHideOnJoliet, i18n("<p>If this option is checked, the file or directory " + TQWhatsThis::add( m_checkHideOnJoliet, i18n("<p>If this option is checked, the file or directory " "(and its entire contents) will be hidden on the " "Joliet filesystem.</p>" "<p>This is useful, for example, for having different README " "files for RockRidge and Joliet, which can be managed " "by hiding README.joliet on RockRidge and README.rr " "on the Joliet filesystem.</p>") ); - QWhatsThis::add( m_editSortWeight, i18n("<p>This value modifies the physical sort order of the files " + TQWhatsThis::add( m_editSortWeight, i18n("<p>This value modifies the physical sort order of the files " "in the ISO9660 filesystem. A higher weighting means that the " "file will be located closer to the beginning of the image " "(and the disk)." - "<p>This option is useful in order to optimize the data layout " + "<p>This option is useful in order to optimize the data tqlayout " "on a CD/DVD." "<p><b>Caution:</b> This does not sort the order of the file " "names that appear in the ISO9660 directory." "It sorts the order in which the file data is " "written to the image.") ); - m_editName->setValidator( K3bValidators::iso9660Validator( false, this ) ); + m_editName->setValidator( K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ) ); m_editName->setReadOnly( !dataItem->isRenameable() ); m_editName->setFocus(); } diff --git a/src/projects/k3bdatapropertiesdialog.h b/src/projects/k3bdatapropertiesdialog.h index eb585ce..8c79c47 100644 --- a/src/projects/k3bdatapropertiesdialog.h +++ b/src/projects/k3bdatapropertiesdialog.h @@ -22,9 +22,9 @@ class K3bDataItem; class KLineEdit; -class QPushButton; -class QLabel; -class QCheckBox; +class TQPushButton; +class TQLabel; +class TQCheckBox; /** @@ -33,9 +33,10 @@ class QCheckBox; class K3bDataPropertiesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bDataPropertiesDialog( K3bDataItem*, QWidget* parent = 0, const char* name = 0 ); + K3bDataPropertiesDialog( K3bDataItem*, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataPropertiesDialog(); protected slots: @@ -43,16 +44,16 @@ Q_OBJECT private: KLineEdit* m_editName; - QLabel* m_labelType; - QLabel* m_labelLocation; - QLabel* m_labelSize; - QLabel* m_labelBlocks; + TQLabel* m_labelType; + TQLabel* m_labelLocation; + TQLabel* m_labelSize; + TQLabel* m_labelBlocks; - QLabel* m_labelLocalName; - QLabel* m_labelLocalLocation; + TQLabel* m_labelLocalName; + TQLabel* m_labelLocalLocation; - QCheckBox* m_checkHideOnRockRidge; - QCheckBox* m_checkHideOnJoliet; + TQCheckBox* m_checkHideOnRockRidge; + TQCheckBox* m_checkHideOnJoliet; KLineEdit* m_editSortWeight; K3bDataItem* m_dataItem; diff --git a/src/projects/k3bdatasessionimportdialog.cpp b/src/projects/k3bdatasessionimportdialog.cpp index f6f1b85..80e45f1 100644 --- a/src/projects/k3bdatasessionimportdialog.cpp +++ b/src/projects/k3bdatasessionimportdialog.cpp @@ -22,16 +22,16 @@ #include <k3bmediacache.h> #include <k3b.h> -#include <qpushbutton.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqpushbutton.h> +#include <tqcursor.h> +#include <tqapplication.h> #include <klocale.h> #include <kmessagebox.h> -K3bDataSessionImportDialog::K3bDataSessionImportDialog( QWidget* parent ) - : KDialogBase( parent, +K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "session_import_dialog", true, i18n("Session Import"), @@ -42,8 +42,8 @@ K3bDataSessionImportDialog::K3bDataSessionImportDialog( QWidget* parent ) m_comboMedia = new K3bMediaSelectionComboBox( this ); setMainWidget( m_comboMedia ); - connect( m_comboMedia, SIGNAL(selectionChanged(K3bDevice::Device*)), - this, SLOT(slotSelectionChanged(K3bDevice::Device*)) ); + connect( m_comboMedia, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); } @@ -74,7 +74,7 @@ void K3bDataSessionImportDialog::slotOk() { // find the selected device, show a busy mouse cursor and call K3bDataDoc::importSession if( K3bDevice::Device* dev = m_comboMedia->selectedDevice() ) { - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); // // Mkisofs does not properly import joliet filenames from an old session @@ -104,7 +104,7 @@ void K3bDataSessionImportDialog::slotOk() m_doc->setBurner( dev ); m_doc->importSession( dev ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); done( 0 ); } @@ -125,9 +125,9 @@ void K3bDataSessionImportDialog::slotSelectionChanged( K3bDevice::Device* dev ) } -K3bDataDoc* K3bDataSessionImportDialog::importSession( K3bDataDoc* doc, QWidget* parent ) +K3bDataDoc* K3bDataSessionImportDialog::importSession( K3bDataDoc* doc, TQWidget* tqparent ) { - K3bDataSessionImportDialog dlg( parent ); + K3bDataSessionImportDialog dlg( tqparent ); dlg.importSession( doc ); dlg.exec(); return dlg.m_doc; diff --git a/src/projects/k3bdatasessionimportdialog.h b/src/projects/k3bdatasessionimportdialog.h index 77c074f..7a092db 100644 --- a/src/projects/k3bdatasessionimportdialog.h +++ b/src/projects/k3bdatasessionimportdialog.h @@ -18,13 +18,13 @@ #include <kdialogbase.h> -#include <qptrlist.h> -#include <qmap.h> +#include <tqptrlist.h> +#include <tqmap.h> #include <k3bdevice.h> -class QLabel; +class TQLabel; class KListBox; class K3bDataDoc; class K3bMediaSelectionComboBox; @@ -33,6 +33,7 @@ class K3bMediaSelectionComboBox; class K3bDataSessionImportDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -44,7 +45,7 @@ class K3bDataSessionImportDialog : public KDialogBase * * \return the project */ - static K3bDataDoc* importSession( K3bDataDoc* doc, QWidget* parent ); + static K3bDataDoc* importSession( K3bDataDoc* doc, TQWidget* tqparent ); private slots: void slotOk(); @@ -54,7 +55,7 @@ class K3bDataSessionImportDialog : public KDialogBase void slotSelectionChanged( K3bDevice::Device* ); private: - K3bDataSessionImportDialog( QWidget* parent = 0 ); + K3bDataSessionImportDialog( TQWidget* tqparent = 0 ); ~K3bDataSessionImportDialog(); K3bDataDoc* m_doc; diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 2edb43b..1a645ff 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -18,11 +18,11 @@ #include "k3bdataurladdingdialog.h" #include "k3bencodingconverter.h" -#include <qtimer.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include <k3bdatadoc.h> #include <k3bdiritem.h> @@ -55,12 +55,12 @@ #include <unistd.h> -K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, QWidget* parent, const char* name ) +K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* tqparent, const char* name ) : KDialogBase( Plain, - i18n("Adding files to project '%1'").arg(doc->URL().fileName()), + i18n("Adding files to project '%1'").tqarg(doc->URL().fileName()), Cancel, Cancel, - parent, + tqparent, name, true, true ), @@ -77,26 +77,26 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, QWidget* parent { m_encodingConverter = new K3bEncodingConverter(); - QWidget* page = plainPage(); - QGridLayout* grid = new QGridLayout( page ); + TQWidget* page = plainPage(); + TQGridLayout* grid = new TQGridLayout( page ); grid->setSpacing( spacingHint() ); grid->setMargin( 0 ); - m_counterLabel = new QLabel( page ); + m_counterLabel = new TQLabel( page ); m_infoLabel = new KSqueezedTextLabel( i18n("Adding files to project '%1'") - .arg(doc->URL().fileName()) + "...", page ); + .tqarg(doc->URL().fileName()) + "...", page ); m_progressWidget = new KProgress( 0, page ); grid->addWidget( m_counterLabel, 0, 1 ); grid->addWidget( m_infoLabel, 0, 0 ); grid->addMultiCellWidget( m_progressWidget, 1, 1, 0, 1 ); - m_dirSizeJob = new K3bDirSizeJob( this ); - connect( m_dirSizeJob, SIGNAL(finished(bool)), - this, SLOT(slotDirSizeDone(bool)) ); + m_dirSizeJob = new K3bDirSizeJob( TQT_TQOBJECT(this) ); + connect( m_dirSizeJob, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotDirSizeDone(bool)) ); // try to start with a reasonable size - resize( (int)( fontMetrics().width( caption() ) * 1.5 ), sizeHint().height() ); + resize( (int)( fontMetrics().width( caption() ) * 1.5 ), tqsizeHint().height() ); } @@ -108,7 +108,7 @@ K3bDataUrlAddingDialog::~K3bDataUrlAddingDialog() int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, K3bDirItem* dir, - QWidget* parent ) + TQWidget* tqparent ) { if( urls.isEmpty() ) return 0; @@ -120,7 +120,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, if( urls.count() == 1 ) { K3bIso9660 isoF( urls.first().path() ); if( isoF.open() ) { - if( KMessageBox::warningYesNo( parent, + if( KMessageBox::warningYesNo( tqparent, i18n("<p>The file you are about to add to the project is an ISO9660 image. As such " "it can be burned to a medium directly since it already contains a file " "system.<br>" @@ -138,13 +138,13 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, } } - K3bDataUrlAddingDialog dlg( dir->doc(), parent ); + K3bDataUrlAddingDialog dlg( dir->doc(), tqparent ); dlg.m_urls = urls; for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) - dlg.m_urlQueue.append( qMakePair( K3b::convertToLocalUrl(*it), dir ) ); + dlg.m_urlQueue.append( tqMakePair( K3b::convertToLocalUrl(*it), dir ) ); dlg.slotAddUrls(); - int ret = QDialog::Accepted; + int ret = TQDialog::Accepted; if( !dlg.m_urlQueue.isEmpty() ) { dlg.m_dirSizeJob->setUrls( urls ); dlg.m_dirSizeJob->setFollowSymlinks( dir->doc()->isoOptions().followSymbolicLinks() ); @@ -156,77 +156,77 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, dlg.m_dirSizeJob->cancel(); K3bSignalWaiter::waitForJob( dlg.m_dirSizeJob ); - QString message = dlg.resultMessage(); + TQString message = dlg.resultMessage(); if( !message.isEmpty() ) - KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); + KMessageBox::detailedSorry( tqparent, i18n("Problems while adding files to the project."), message ); return ret; } -QString K3bDataUrlAddingDialog::resultMessage() const +TQString K3bDataUrlAddingDialog::resultMessage() const { - QString message; + TQString message; if( !m_unreadableFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Insufficient permissions to read the following files") ) - .arg( m_unreadableFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Insufficient permissions to read the following files") ) + .tqarg( m_unreadableFiles.join( "<br>" ) ); if( !m_notFoundFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Unable to find the following files") ) - .arg( m_notFoundFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Unable to find the following files") ) + .tqarg( m_notFoundFiles.join( "<br>" ) ); if( !m_nonLocalFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("No non-local files supported") ) - .arg( m_unreadableFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("No non-local files supported") ) + .tqarg( m_unreadableFiles.join( "<br>" ) ); if( !m_tooBigFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("It is not possible to add files bigger than %1").arg(KIO::convertSize(0xFFFFFFFF)) ) - .arg( m_tooBigFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("It is not possible to add files bigger than %1").tqarg(KIO::convertSize(0xFFFFFFFF)) ) + .tqarg( m_tooBigFiles.join( "<br>" ) ); if( !m_mkisofsLimitationRenamedFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Some filenames had to be modified due to limitations in mkisofs") ) - .arg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Some filenames had to be modified due to limitations in mkisofs") ) + .tqarg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) ); if( !m_invalidFilenameEncodingFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("The following filenames have an invalid encoding. You may fix this " + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("The following filenames have an invalid encoding. You may fix this " "with the convmv tool") ) - .arg( m_invalidFilenameEncodingFiles.join( "<br>" ) ); + .tqarg( m_invalidFilenameEncodingFiles.join( "<br>" ) ); return message; } -int K3bDataUrlAddingDialog::moveItems( const QValueList<K3bDataItem*>& items, +int K3bDataUrlAddingDialog::moveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent ) + TQWidget* tqparent ) { - return copyMoveItems( items, dir, parent, false ); + return copyMoveItems( items, dir, tqparent, false ); } -int K3bDataUrlAddingDialog::copyItems( const QValueList<K3bDataItem*>& items, +int K3bDataUrlAddingDialog::copyItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent ) + TQWidget* tqparent ) { - return copyMoveItems( items, dir, parent, true ); + return copyMoveItems( items, dir, tqparent, true ); } -int K3bDataUrlAddingDialog::copyMoveItems( const QValueList<K3bDataItem*>& items, +int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent, + TQWidget* tqparent, bool copy ) { if( items.isEmpty() ) return 0; - K3bDataUrlAddingDialog dlg( dir->doc(), parent ); - dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").arg(dir->doc()->URL().fileName()) ); + K3bDataUrlAddingDialog dlg( dir->doc(), tqparent ); + dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").tqarg(dir->doc()->URL().fileName()) ); dlg.m_copyItems = copy; - for( QValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { - dlg.m_items.append( qMakePair( *it, dir ) ); + for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { + dlg.m_items.append( tqMakePair( *it, dir ) ); ++dlg.m_totalFiles; if( (*it)->isDir() ) { dlg.m_totalFiles += static_cast<K3bDirItem*>( *it )->numFiles(); @@ -235,7 +235,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const QValueList<K3bDataItem*>& items } dlg.slotCopyMoveItems(); - int ret = QDialog::Accepted; + int ret = TQDialog::Accepted; if( !dlg.m_items.isEmpty() ) { dlg.m_progressWidget->setTotalSteps( dlg.m_totalFiles ); ret = dlg.exec(); @@ -264,13 +264,13 @@ void K3bDataUrlAddingDialog::slotAddUrls() m_urlQueue.remove( m_urlQueue.begin() ); // // HINT: - // we only use QFileInfo::absFilePath() and QFileInfo::isHidden() - // both do not cause QFileInfo to stat, thus no speed improvement - // can come from removing QFileInfo usage here. + // we only use TQFileInfo::absFilePath() and TQFileInfo::isHidden() + // both do not cause TQFileInfo to stat, thus no speed improvement + // can come from removing TQFileInfo usage here. // - QFileInfo info(url.path()); - QString absFilePath( info.absFilePath() ); - QString resolved( absFilePath ); + TQFileInfo info(url.path()); + TQString absFilePath( info.absFilePath() ); + TQString resolved( absFilePath ); bool valid = true; k3b_struct_stat statBuf, resolvedStatBuf; @@ -283,9 +283,9 @@ void K3bDataUrlAddingDialog::slotAddUrls() #if 0 m_infoLabel->setText( url.path() ); if( m_totalFiles == 0 ) - m_counterLabel->setText( QString("(%1)").arg(m_filesHandled) ); + m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) ); else - m_counterLabel->setText( QString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) ); + m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); #endif // @@ -297,12 +297,12 @@ void K3bDataUrlAddingDialog::slotAddUrls() m_nonLocalFiles.append( url.path() ); } - else if( k3b_lstat( QFile::encodeName(absFilePath), &statBuf ) != 0 ) { + else if( k3b_lstat( TQFile::encodeName(absFilePath), &statBuf ) != 0 ) { valid = false; m_notFoundFiles.append( url.path() ); } - else if( !m_encodingConverter->encodedLocally( QFile::encodeName( url.path() ) ) ) { + else if( !m_encodingConverter->encodedLocally( TQFile::encodeName( url.path() ) ) ) { valid = false; m_invalidFilenameEncodingFiles.append( url.path() ); } @@ -316,12 +316,12 @@ void K3bDataUrlAddingDialog::slotAddUrls() // but we need to know if the symlink points to a directory if( isSymLink ) { resolved = K3b::resolveLink( absFilePath ); - k3b_stat( QFile::encodeName(resolved), &resolvedStatBuf ); + k3b_stat( TQFile::encodeName(resolved), &resolvedStatBuf ); isDir = S_ISDIR(resolvedStatBuf.st_mode); } else { - if( ::access( QFile::encodeName( absFilePath ), R_OK ) != 0 ) { + if( ::access( TQFile::encodeName( absFilePath ), R_OK ) != 0 ) { valid = false; m_unreadableFiles.append( url.path() ); } @@ -362,7 +362,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() // 2. Handle the url // - QString newName = url.fileName(); + TQString newName = url.fileName(); // filenames cannot end in backslashes (mkisofs problem. See comments in k3bisoimager.cpp (escapeGraftPoint())) bool bsAtEnd = false; @@ -384,7 +384,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() // and if so handle it properly // if( valid ) { - if( K3bDataItem* oldItem = dir->find( newName ) ) { + if( K3bDataItem* oldItem = dir->tqfind( newName ) ) { // // reuse an existing dir // @@ -425,32 +425,32 @@ void K3bDataUrlAddingDialog::slotAddUrls() switch( K3bMultiChoiceDialog::choose( i18n("File already exists"), i18n("<p>File <em>%1</em> already exists in " "project folder <em>%2</em>.") - .arg(newName) - .arg('/' + dir->k3bPath()), - QMessageBox::Warning, + .tqarg(newName) + .tqarg('/' + dir->k3bPath()), + TQMessageBox::Warning, this, 0, 6, KGuiItem( i18n("Replace"), - QString::null, + TQString(), i18n("Replace the existing file") ), KGuiItem( i18n("Replace All"), - QString::null, + TQString(), i18n("Always replace existing files") ), KGuiItem( i18n("Ignore"), - QString::null, + TQString(), i18n("Keep the existing file") ), KGuiItem( i18n("Ignore All"), - QString::null, + TQString(), i18n("Always keep the existing file") ), KGuiItem( i18n("Rename"), - QString::null, + TQString(), i18n("Rename the new file") ), KStdGuiItem::cancel() ) ) { case 2: // replace all m_bExistingItemsReplaceAll = true; // fallthrough - case 1: // replace + case 1: // tqreplace // if we replace an item from an old session the K3bFileItem constructor takes care // of replacing the item if( !oldItem->isFromOldSession() ) @@ -493,9 +493,9 @@ void K3bDataUrlAddingDialog::slotAddUrls() "K3b project cannot be resolved." "<p><b>If you do not intend to enable the option <em>follow symbolic links</em> you may safely " "ignore this warning and choose to add the link to the project.</b>") - .arg(absFilePath) - .arg(resolved ), - QMessageBox::Warning, + .tqarg(absFilePath) + .tqarg(resolved ), + TQMessageBox::Warning, this, 0, 5, @@ -558,17 +558,17 @@ void K3bDataUrlAddingDialog::slotAddUrls() newDirItem->setLocalPath( url.path() ); // HACK: see k3bdiritem.h } - QDir newDir( absFilePath ); - int dirFilter = QDir::All|QDir::Hidden|QDir::System; + TQDir newDir( absFilePath ); + int dirFilter = TQDir::All|TQDir::Hidden|TQDir::System; - QStringList dlist = newDir.entryList( dirFilter ); - const QString& dot = KGlobal::staticQString( "." ); - const QString& dotdot = KGlobal::staticQString( ".." ); + TQStringList dlist = newDir.entryList( dirFilter ); + const TQString& dot = KGlobal::staticQString( "." ); + const TQString& dotdot = KGlobal::staticQString( ".." ); dlist.remove( dot ); dlist.remove( dotdot ); - for( QStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) { - m_urlQueue.append( qMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) ); + for( TQStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) { + m_urlQueue.append( tqMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) ); } } else { @@ -583,7 +583,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() } else { updateProgress(); - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } } @@ -603,13 +603,13 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() ++m_filesHandled; m_infoLabel->setText( item->k3bPath() ); if( m_totalFiles == 0 ) - m_counterLabel->setText( QString("(%1)").arg(m_filesHandled) ); + m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) ); else - m_counterLabel->setText( QString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) ); + m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); - if( dir == item->parent() ) { - kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into its own parent dir." << endl; + if( dir == item->tqparent() ) { + kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into its own tqparent dir." << endl; } else if( dir == item ) { kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into itselft." << endl; @@ -618,14 +618,14 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() // // Let's see if an item with that name alredy exists // - if( K3bDataItem* oldItem = dir->find( item->k3bName() ) ) { + if( K3bDataItem* oldItem = dir->tqfind( item->k3bName() ) ) { // // reuse an existing dir: move all child items into the old dir // if( oldItem->isDir() && item->isDir() ) { - const QPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children(); - for( QPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) - m_items.append( qMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); + const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->tqchildren(); + for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) + m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); // FIXME: we need to remove the old dir item } @@ -636,7 +636,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() // else if( oldItem->isFromOldSession() && item->isDir() != oldItem->isDir() ) { - QString newName; + TQString newName; if( getNewName( newName, dir, newName ) ) { if( m_copyItems ) item = item->copy(); @@ -661,32 +661,32 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() switch( K3bMultiChoiceDialog::choose( i18n("File already exists"), i18n("<p>File <em>%1</em> already exists in " "project folder <em>%2</em>.") - .arg( item->k3bName() ) - .arg("/" + dir->k3bPath()), - QMessageBox::Warning, + .tqarg( item->k3bName() ) + .tqarg("/" + dir->k3bPath()), + TQMessageBox::Warning, this, 0, 6, KGuiItem( i18n("Replace"), - QString::null, + TQString(), i18n("Replace the existing file") ), KGuiItem( i18n("Replace All"), - QString::null, + TQString(), i18n("Always replace existing files") ), KGuiItem( i18n("Ignore"), - QString::null, + TQString(), i18n("Keep the existing file") ), KGuiItem( i18n("Ignore All"), - QString::null, + TQString(), i18n("Always keep the existing file") ), KGuiItem( i18n("Rename"), - QString::null, + TQString(), i18n("Rename the new file") ), KStdGuiItem::cancel() ) ) { case 2: // replace all m_bExistingItemsReplaceAll = true; // fallthrough - case 1: // replace + case 1: // tqreplace // // if we replace an item from an old session K3bDirItem::addDataItem takes care // of replacing the item @@ -704,7 +704,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() // do nothing break; case 5: {// rename - QString newName; + TQString newName; if( getNewName( newName, dir, newName ) ) { if( m_copyItems ) item = item->copy(); @@ -736,22 +736,22 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() } else { updateProgress(); - QTimer::singleShot( 0, this, SLOT(slotCopyMoveItems()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotCopyMoveItems()) ); } } -bool K3bDataUrlAddingDialog::getNewName( const QString& oldName, K3bDirItem* dir, QString& newName ) +bool K3bDataUrlAddingDialog::getNewName( const TQString& oldName, K3bDirItem* dir, TQString& newName ) { bool ok = true; newName = oldName; - QValidator* validator = K3bValidators::iso9660Validator( false, this ); + TQValidator* validator = K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ); do { newName = KInputDialog::getText( i18n("Enter New Filename"), i18n("A file with that name already exists. Please enter a new name:"), newName, &ok, this, "renamedialog", validator ); - } while( ok && dir->find( newName ) ); + } while( ok && dir->tqfind( newName ) ); delete validator; @@ -763,7 +763,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles() { if( m_iAddHiddenFiles == 0 ) { // FIXME: the isVisible() stuff makes the static addUrls method not return (same below) - if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/, + if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/, i18n("Do you also want to add hidden files?"), i18n("Hidden Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes ) m_iAddHiddenFiles = 1; @@ -778,7 +778,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles() bool K3bDataUrlAddingDialog::addSystemFiles() { if( m_iAddSystemFiles == 0 ) { - if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/, + if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/, i18n("Do you also want to add system files " "(FIFOs, sockets, device files, and broken symlinks)?"), i18n("System Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes ) diff --git a/src/projects/k3bdataurladdingdialog.h b/src/projects/k3bdataurladdingdialog.h index cb7c0ac..ca6b4b2 100644 --- a/src/projects/k3bdataurladdingdialog.h +++ b/src/projects/k3bdataurladdingdialog.h @@ -18,12 +18,12 @@ #include <kdialogbase.h> #include <kurl.h> -#include <qstringlist.h> -#include <qpair.h> -#include <qdir.h> +#include <tqstringlist.h> +#include <tqpair.h> +#include <tqdir.h> class KProgress; -class QLabel; +class TQLabel; class K3bDataItem; class K3bDirItem; class K3bEncodingConverter; @@ -34,24 +34,25 @@ class K3bDataDoc; class K3bDataUrlAddingDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ~K3bDataUrlAddingDialog(); /** - * \return \see QDialog::exec() + * \return \see TQDialog::exec() */ static int addUrls( const KURL::List& urls, K3bDirItem* dir = 0, - QWidget* parent = 0 ); + TQWidget* tqparent = 0 ); - static int moveItems( const QValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent = 0 ); + static int moveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, + TQWidget* tqparent = 0 ); - static int copyItems( const QValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent = 0 ); + static int copyItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, + TQWidget* tqparent = 0 ); - static int copyMoveItems( const QValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent, bool copy ); + static int copyMoveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, + TQWidget* tqparent, bool copy ); private slots: void slotAddUrls(); @@ -61,26 +62,26 @@ class K3bDataUrlAddingDialog : public KDialogBase void updateProgress(); private: - K3bDataUrlAddingDialog( K3bDataDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); - bool getNewName( const QString& oldName, K3bDirItem* dir, QString& newName ); + bool getNewName( const TQString& oldName, K3bDirItem* dir, TQString& newName ); bool addHiddenFiles(); bool addSystemFiles(); - QString resultMessage() const; + TQString resultMessage() const; KProgress* m_progressWidget; - QLabel* m_infoLabel; - QLabel* m_counterLabel; + TQLabel* m_infoLabel; + TQLabel* m_counterLabel; K3bEncodingConverter* m_encodingConverter; KURL::List m_urls; - QValueList< QPair<KURL, K3bDirItem*> > m_urlQueue; + TQValueList< TQPair<KURL, K3bDirItem*> > m_urlQueue; - QValueList< QPair<K3bDataItem*, K3bDirItem*> > m_items; + TQValueList< TQPair<K3bDataItem*, K3bDirItem*> > m_items; - QValueList<KURL> m_dirSizeQueue; + TQValueList<KURL> m_dirSizeQueue; bool m_bExistingItemsReplaceAll; bool m_bExistingItemsIgnoreAll; @@ -89,12 +90,12 @@ class K3bDataUrlAddingDialog : public KDialogBase int m_iAddHiddenFiles; int m_iAddSystemFiles; - QStringList m_unreadableFiles; - QStringList m_notFoundFiles; - QStringList m_nonLocalFiles; - QStringList m_tooBigFiles; - QStringList m_mkisofsLimitationRenamedFiles; - QStringList m_invalidFilenameEncodingFiles; + TQStringList m_unreadableFiles; + TQStringList m_notFoundFiles; + TQStringList m_nonLocalFiles; + TQStringList m_tooBigFiles; + TQStringList m_mkisofsLimitationRenamedFiles; + TQStringList m_invalidFilenameEncodingFiles; bool m_bCanceled; diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index 9539b5c..f4d9749 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -41,47 +41,47 @@ #include <kio/job.h> #include <kdialogbase.h> -#include <qpixmap.h> -#include <qsplitter.h> -#include <qlayout.h> -#include <qdragobject.h> -#include <qheader.h> -#include <qptrlist.h> -#include <qlineedit.h> +#include <tqpixmap.h> +#include <tqsplitter.h> +#include <tqlayout.h> +#include <tqdragobject.h> +#include <tqheader.h> +#include <tqptrlist.h> +#include <tqlineedit.h> #include <assert.h> #include <kdebug.h> -K3bDataView::K3bDataView(K3bDataDoc* doc, QWidget *parent, const char *name ) - : K3bView(doc, parent,name) +K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *tqparent, const char *name ) + : K3bView(doc, tqparent,name) { m_doc = doc; // --- setup GUI --------------------------------------------------- - QSplitter* mainSplitter = new QSplitter( this ); + TQSplitter* mainSplitter = new TQSplitter( this ); m_dataDirTree = new K3bDataDirTreeView( this, doc, mainSplitter ); m_dataFileView = new K3bDataFileView( this, m_dataDirTree, doc, mainSplitter ); m_dataDirTree->setFileView( m_dataFileView ); setMainWidget( mainSplitter ); - connect( m_dataFileView, SIGNAL(dirSelected(K3bDirItem*)), - m_dataDirTree, SLOT(setCurrentDir(K3bDirItem*)) ); - connect( m_doc, SIGNAL(changed()), this, SLOT(slotDocChanged()) ); + connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), + m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); // the data actions - KAction* actionImportSession = new KAction(i18n("&Import Session..."), "gear", 0, this, SLOT(importSession()), + KAction* actionImportSession = new KAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), actionCollection(), "project_data_import_session" ); - KAction* actionClearSession = new KAction(i18n("&Clear Imported Session"), "gear", 0, this, - SLOT(clearImportedSession()), actionCollection(), + KAction* actionClearSession = new KAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), + TQT_SLOT(clearImportedSession()), actionCollection(), "project_data_clear_imported_session" ); - KAction* actionEditBootImages = new KAction(i18n("&Edit Boot Images..."), "cdtrack", 0, this, - SLOT(editBootImages()), actionCollection(), + KAction* actionEditBootImages = new KAction(i18n("&Edit Boot Images..."), "cdtrack", 0, TQT_TQOBJECT(this), + TQT_SLOT(editBootImages()), actionCollection(), "project_data_edit_boot_images" ); actionImportSession->setToolTip( i18n("Import a previously burned session into the current project") ); @@ -92,21 +92,21 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, QWidget *parent, const char *name ) toolBox()->addButton( actionClearSession ); toolBox()->addButton( actionEditBootImages ); toolBox()->addSeparator(); - toolBox()->addButton( m_dataFileView->actionCollection()->action("parent_dir") ); + toolBox()->addButton( m_dataFileView->actionCollection()->action("tqparent_dir") ); toolBox()->addSeparator(); addPluginButtons( K3bProjectPlugin::DATA_CD ); toolBox()->addStretch(); - m_volumeIDEdit = new QLineEdit( doc->isoOptions().volumeID(), toolBox() ); - m_volumeIDEdit->setValidator( new K3bLatin1Validator( m_volumeIDEdit ) ); + m_volumeIDEdit = new TQLineEdit( doc->isoOptions().volumeID(), toolBox() ); + m_volumeIDEdit->setValidator( new K3bLatin1Validator( TQT_TQOBJECT(m_volumeIDEdit) ) ); toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); - connect( m_volumeIDEdit, SIGNAL(textChanged(const QString&)), + connect( m_volumeIDEdit, TQT_SIGNAL(textChanged(const TQString&)), m_doc, - SLOT(setVolumeID(const QString&)) ); + TQT_SLOT(setVolumeID(const TQString&)) ); // this is just for testing (or not?) // most likely every project type will have it's rc file in the future @@ -156,9 +156,9 @@ void K3bDataView::editBootImages() } -K3bProjectBurnDialog* K3bDataView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bDataView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bDataBurnDialog( m_doc, parent, name, true ); + return new K3bDataBurnDialog( m_doc, tqparent, name, true ); } @@ -170,7 +170,7 @@ void K3bDataView::slotBurn() if( m_doc->sessionImported() && m_doc->burningSize() == 0 || m_doc->root()->numFiles() == 0 ) { KMessageBox::information( this, i18n("Please add files to your project first."), - i18n("No Data to Burn"), QString::null, false ); + i18n("No Data to Burn"), TQString(), false ); } else { K3bProjectBurnDialog* dlg = newBurnDialog( this ); diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h index bb9154e..ea2a6a1 100644 --- a/src/projects/k3bdataview.h +++ b/src/projects/k3bdataview.h @@ -25,7 +25,7 @@ class K3bFileItem; class K3bDirItem; class K3bDataDirTreeView; class K3bDataFileView; -class QLineEdit; +class TQLineEdit; namespace KIO { @@ -43,9 +43,10 @@ namespace K3bDevice { class K3bDataView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bDataView(K3bDataDoc* doc, QWidget *parent=0, const char *name=0); + K3bDataView(K3bDataDoc* doc, TQWidget *tqparent=0, const char *name=0); virtual ~K3bDataView(); K3bDirItem* currentDir() const; @@ -63,9 +64,9 @@ class K3bDataView : public K3bView protected: K3bDataDirTreeView* m_dataDirTree; K3bDataFileView* m_dataFileView; - QLineEdit* m_volumeIDEdit; + TQLineEdit* m_volumeIDEdit; - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private: K3bDataDoc* m_doc; diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 78c044d..f200e55 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -30,20 +30,20 @@ #include <kpixmapeffect.h> #include <kpixmap.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qfileinfo.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqfileinfo.h> -K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, QListView* parent ) - : K3bListViewItem( parent ), +K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListView* tqparent ) + : K3bListViewItem( tqparent ), m_dataItem(item) { init(); } -K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, QListViewItem* parent ) - : K3bListViewItem( parent ), +K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListViewItem* tqparent ) + : K3bListViewItem( tqparent ), m_dataItem(item) { init(); @@ -56,36 +56,36 @@ K3bDataViewItem::~K3bDataViewItem() void K3bDataViewItem::init() { setEditor( 0, LINE ); - static QValidator* s_validator = K3bValidators::iso9660Validator(); + static TQValidator* s_validator = K3bValidators::iso9660Validator(); setValidator( 0, s_validator ); } -void K3bDataViewItem::paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align ) +void K3bDataViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ) { - QColorGroup _cg = cg; + TQColorGroup _cg = cg; if( !dataItem()->isRemoveable() && dataItem()->doc()->root() != dataItem() ) { - _cg.setColor( QColorGroup::Text, listView()->palette().disabled().foreground() ); + _cg.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().foreground() ); } if( column == 0 ) { - QFontMetrics fm = p->fontMetrics(); + TQFontMetrics fm = p->fontMetrics(); if( dataItem()->hideOnRockRidge() ) { - int tw = QMAX( fm.width( "rr" ) + 2*listView()->itemMargin(), height() ); - p->fillRect( width-tw, 0, tw, height(), isSelected() ? _cg.highlight() : _cg.brush(QColorGroup::Base) ); + int tw = TQMAX( fm.width( "rr" ) + 2*listView()->itemMargin(), height() ); + p->fillRect( width-tw, 0, tw, height(), isSelected() ? _cg.highlight() : _cg.brush(TQColorGroup::Base) ); p->setPen( isSelected() ? _cg.highlightedText() : red ); p->drawEllipse( width-tw, 0, tw, height() ); - p->drawText( width-tw, 0, tw, height(), Qt::AlignCenter, "rr" ); + p->drawText( width-tw, 0, tw, height(), TQt::AlignCenter, "rr" ); width -= tw; } if( dataItem()->hideOnJoliet() ) { - int tw = QMAX( fm.width( "j" ) + 2*listView()->itemMargin(), height() ); - p->fillRect( width-tw, 0, tw, height(), isSelected() ? _cg.highlight() : _cg.brush(QColorGroup::Base) ); + int tw = TQMAX( fm.width( "j" ) + 2*listView()->itemMargin(), height() ); + p->fillRect( width-tw, 0, tw, height(), isSelected() ? _cg.highlight() : _cg.brush(TQColorGroup::Base) ); p->setPen( isSelected() ? _cg.highlightedText() : blue ); p->drawEllipse( width-tw, 0, tw, height() ); - p->drawText( width-tw, 0, tw, height(), Qt::AlignCenter, "j" ); + p->drawText( width-tw, 0, tw, height(), TQt::AlignCenter, "j" ); width -= tw; } } @@ -95,7 +95,7 @@ void K3bDataViewItem::paintCell( QPainter* p, const QColorGroup& cg, int column, dataItem()->doc()->isoOptions().createRockRidge() && !dataItem()->isValid() ) { // paint the link in red - _cg.setColor( QColorGroup::Text, Qt::red ); + _cg.setColor( TQColorGroup::Text, TQt::red ); } } } @@ -104,7 +104,7 @@ void K3bDataViewItem::paintCell( QPainter* p, const QColorGroup& cg, int column, } -void K3bDataViewItem::setText( int col, const QString& text ) +void K3bDataViewItem::setText( int col, const TQString& text ) { if( col == 0 && dataItem()->isRenameable() ) { dataItem()->setK3bName( text ); @@ -113,37 +113,37 @@ void K3bDataViewItem::setText( int col, const QString& text ) } -QString K3bDataViewItem::key( int col, bool a ) const +TQString K3bDataViewItem::key( int col, bool a ) const { if( col == 2 ) { // to have correct sorting we need to justify the size in bytes // 100 TB should be enough for the next year... ;-) if( a ) - return ( dataItem()->isDir() ? QString("0") : QString("1") ) - + QString::number( dataItem()->size() ).rightJustify( 16, '0' ); + return ( dataItem()->isDir() ? TQString("0") : TQString("1") ) + + TQString::number( dataItem()->size() ).rightJustify( 16, '0' ); else - return ( dataItem()->isDir() ? QString("1") : QString("0") ) - + QString::number( dataItem()->size() ).rightJustify( 16, '0' ); + return ( dataItem()->isDir() ? TQString("1") : TQString("0") ) + + TQString::number( dataItem()->size() ).rightJustify( 16, '0' ); } if( a ) - return ( dataItem()->isDir() ? QString("0") : QString("1") ) + text(col); + return ( dataItem()->isDir() ? TQString("0") : TQString("1") ) + text(col); else - return ( dataItem()->isDir() ? QString("1") : QString("0") ) + text(col); + return ( dataItem()->isDir() ? TQString("1") : TQString("0") ) + text(col); } -K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, QListView* parent ) - : K3bDataViewItem( dir, parent ) +K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListView* tqparent ) + : K3bDataViewItem( dir, tqparent ) { m_dirItem = dir; setPixmap( 0, dir->depth() > 7 ? SmallIcon( "folder_red" ) : SmallIcon( "folder" ) ); } -K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, QListViewItem* parent ) - : K3bDataViewItem( dir, parent ) +K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* tqparent ) + : K3bDataViewItem( dir, tqparent ) { m_dirItem = dir; setPixmap( 0, dir->depth() > 7 ? SmallIcon( "folder_red" ) : SmallIcon( "folder" ) ); @@ -161,7 +161,7 @@ void K3bDataDirViewItem::dragEntered() } -QString K3bDataDirViewItem::text( int index ) const +TQString K3bDataDirViewItem::text( int index ) const { switch( index ) { case 0: @@ -182,22 +182,22 @@ void K3bDataDirViewItem::highlightIcon( bool b ) m_pixmap = *pixmap(0); if( b ) - setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->colorGroup().highlight() ) ); + setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->tqcolorGroup().highlight() ) ); else setPixmap( 0, m_pixmap ); } -K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, QListView* parent ) - : K3bDataViewItem( file, parent ) +K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListView* tqparent ) + : K3bDataViewItem( file, tqparent ) { init( file ); } -K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, QListViewItem* parent ) - : K3bDataViewItem( file, parent ) +K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListViewItem* tqparent ) + : K3bDataViewItem( file, tqparent ) { init( file ); } @@ -216,19 +216,19 @@ void K3bDataFileViewItem::init( K3bFileItem* file ) } -QString K3bDataFileViewItem::text( int index ) const +TQString K3bDataFileViewItem::text( int index ) const { switch( index ) { case 0: return m_fileItem->k3bName(); case 1: { - QString comment = m_pMimeType->comment( KURL::fromPathOrURL(m_fileItem->localPath()), true ); + TQString comment = m_pMimeType->comment( KURL::fromPathOrURL(m_fileItem->localPath()), true ); if( comment.isEmpty() ) comment = m_pMimeType->name(); if( m_fileItem->isSymLink() ) - return i18n("Link to %1").arg(comment); + return i18n("Link to %1").tqarg(comment); else return comment; } @@ -238,15 +238,15 @@ QString K3bDataFileViewItem::text( int index ) const return m_fileItem->localPath(); case 4: { if( !m_fileItem->isSymLink() ) { - return QString::null; + return TQString(); } - QString s; + TQString s; if ( m_fileItem->doc()->isoOptions().followSymbolicLinks() ) { s = K3b::resolveLink( m_fileItem->localPath() ); } else { - s = QFileInfo( m_fileItem->localPath() ).readLink(); + s = TQFileInfo( m_fileItem->localPath() ).readLink(); } if( !m_fileItem->isValid() ) { @@ -262,8 +262,8 @@ QString K3bDataFileViewItem::text( int index ) const -K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, QListView* parent ) - : K3bDataDirViewItem( doc->root(), parent ) +K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, TQListView* tqparent ) + : K3bDataDirViewItem( doc->root(), tqparent ) { m_doc = doc; setPixmap( 0, SmallIcon( "cdrom_unmount" ) ); @@ -277,7 +277,7 @@ K3bDataRootViewItem::~K3bDataRootViewItem() } -QString K3bDataRootViewItem::text( int index ) const +TQString K3bDataRootViewItem::text( int index ) const { switch( index ) { case 0: @@ -288,7 +288,7 @@ QString K3bDataRootViewItem::text( int index ) const } -void K3bDataRootViewItem::setText( int col, const QString& text ) +void K3bDataRootViewItem::setText( int col, const TQString& text ) { if( col == 0 ) m_doc->setVolumeID( text ); @@ -297,13 +297,13 @@ void K3bDataRootViewItem::setText( int col, const QString& text ) } -K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, QListView* parent ) - : K3bDataViewItem( item, parent ) +K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, TQListView* tqparent ) + : K3bDataViewItem( item, tqparent ) { setPixmap( 0, SmallIcon("unknown") ); } -QString K3bSpecialDataViewItem::text( int col ) const +TQString K3bSpecialDataViewItem::text( int col ) const { switch( col ) { case 0: @@ -319,13 +319,13 @@ QString K3bSpecialDataViewItem::text( int col ) const -K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, QListView* parent ) - : K3bDataViewItem( item, parent ) +K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, TQListView* tqparent ) + : K3bDataViewItem( item, tqparent ) { setPixmap( 0, SmallIcon("unknown") ); } -QString K3bSessionImportViewItem::text( int col ) const +TQString K3bSessionImportViewItem::text( int col ) const { switch( col ) { case 0: diff --git a/src/projects/k3bdataviewitem.h b/src/projects/k3bdataviewitem.h index 60d68d2..ac95e98 100644 --- a/src/projects/k3bdataviewitem.h +++ b/src/projects/k3bdataviewitem.h @@ -26,28 +26,28 @@ class K3bDataDoc; class K3bSpecialDataItem; class K3bSessionImportItem; -class QPainter; -class QColorGroup; +class TQPainter; +class TQColorGroup; class K3bDataViewItem : public K3bListViewItem { public: - K3bDataViewItem( K3bDataItem*, QListView* parent ); - K3bDataViewItem( K3bDataItem*, QListViewItem* parent ); + K3bDataViewItem( K3bDataItem*, TQListView* tqparent ); + K3bDataViewItem( K3bDataItem*, TQListViewItem* tqparent ); virtual ~K3bDataViewItem(); virtual K3bDataItem* dataItem() const { return m_dataItem; } - void setText( int col, const QString& text ); + void setText( int col, const TQString& text ); /** * reimplemented to have directories always sorted before files */ - QString key( int, bool ) const; + TQString key( int, bool ) const; - virtual void paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align ); + virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ); private: void init(); @@ -59,11 +59,11 @@ class K3bDataViewItem : public K3bListViewItem class K3bDataDirViewItem : public K3bDataViewItem { public: - K3bDataDirViewItem( K3bDirItem* dir, QListView* parent ); - K3bDataDirViewItem( K3bDirItem* dir, QListViewItem* parent ); + K3bDataDirViewItem( K3bDirItem* dir, TQListView* tqparent ); + K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* tqparent ); ~K3bDataDirViewItem(); - virtual QString text( int ) const; + virtual TQString text( int ) const; K3bDirItem* dirItem() const { return m_dirItem; } @@ -74,18 +74,18 @@ class K3bDataDirViewItem : public K3bDataViewItem private: K3bDirItem* m_dirItem; - QPixmap m_pixmap; + TQPixmap m_pixmap; }; class K3bDataFileViewItem : public K3bDataViewItem { public: - K3bDataFileViewItem( K3bFileItem*, QListView* parent ); - K3bDataFileViewItem( K3bFileItem*, QListViewItem* parent ); + K3bDataFileViewItem( K3bFileItem*, TQListView* tqparent ); + K3bDataFileViewItem( K3bFileItem*, TQListViewItem* tqparent ); ~K3bDataFileViewItem() {} - QString text( int ) const; + TQString text( int ) const; K3bFileItem* fileItem() const { return m_fileItem; } @@ -102,13 +102,13 @@ class K3bDataFileViewItem : public K3bDataViewItem class K3bDataRootViewItem : public K3bDataDirViewItem { public: - K3bDataRootViewItem( K3bDataDoc*, QListView* parent ); + K3bDataRootViewItem( K3bDataDoc*, TQListView* tqparent ); ~K3bDataRootViewItem(); - QString text( int ) const; + TQString text( int ) const; - /** reimplemented from QListViewItem */ - void setText(int col, const QString& text ); + /** reimplemented from TQListViewItem */ + void setText(int col, const TQString& text ); private: K3bDataDoc* m_doc; @@ -118,18 +118,18 @@ class K3bDataRootViewItem : public K3bDataDirViewItem class K3bSpecialDataViewItem : public K3bDataViewItem { public: - K3bSpecialDataViewItem( K3bSpecialDataItem*, QListView* ); + K3bSpecialDataViewItem( K3bSpecialDataItem*, TQListView* ); - QString text( int ) const; + TQString text( int ) const; }; class K3bSessionImportViewItem : public K3bDataViewItem { public: - K3bSessionImportViewItem( K3bSessionImportItem*, QListView* ); + K3bSessionImportViewItem( K3bSessionImportItem*, TQListView* ); - QString text( int ) const; + TQString text( int ) const; }; #endif diff --git a/src/projects/k3bdatavolumedescwidget.cpp b/src/projects/k3bdatavolumedescwidget.cpp index 1edbc7b..be443a5 100644 --- a/src/projects/k3bdatavolumedescwidget.cpp +++ b/src/projects/k3bdatavolumedescwidget.cpp @@ -18,18 +18,18 @@ #include "k3bisooptions.h" #include <k3bvalidators.h> -#include <qlineedit.h> -#include <qspinbox.h> -#include <qlabel.h> -#include <qtoolbutton.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqtoolbutton.h> -K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( QWidget* parent, const char* name ) - : base_K3bDataVolumeDescWidget( parent, name ) +K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* tqparent, const char* name ) + : base_K3bDataVolumeDescWidget( tqparent, name ) { // the maximal number of characters that can be inserted are set in the ui file! - QValidator* isoValidator = new K3bLatin1Validator( this ); + TQValidator* isoValidator = new K3bLatin1Validator( TQT_TQOBJECT(this) ); m_editVolumeName->setValidator( isoValidator ); m_editVolumeSetName->setValidator( isoValidator ); @@ -38,8 +38,8 @@ K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( QWidget* parent, const char* n m_editSystem->setValidator( isoValidator ); m_editApplication->setValidator( isoValidator ); - connect( m_spinVolumeSetSize, SIGNAL(valueChanged(int)), - this, SLOT(slotVolumeSetSizeChanged(int)) ); + connect( m_spinVolumeSetSize, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotVolumeSetSizeChanged(int)) ); // for now we hide the volume set size stuff since it's not working anymore in mkisofs 2.01a34 textLabel1->hide(); diff --git a/src/projects/k3bdatavolumedescwidget.h b/src/projects/k3bdatavolumedescwidget.h index 8b4a388..27102e2 100644 --- a/src/projects/k3bdatavolumedescwidget.h +++ b/src/projects/k3bdatavolumedescwidget.h @@ -25,9 +25,10 @@ class K3bIsoOptions; class K3bDataVolumeDescWidget : public base_K3bDataVolumeDescWidget { Q_OBJECT + TQ_OBJECT public: - K3bDataVolumeDescWidget( QWidget* parent = 0, const char* name = 0 ); + K3bDataVolumeDescWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataVolumeDescWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index 873afbf..4654bb9 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -33,30 +33,30 @@ #include <kio/global.h> #include <kmessagebox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qspinbox.h> - - -K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal, true ), +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqspinbox.h> + + +K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), m_doc( doc ) { prepareGui(); - setTitle( i18n("DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) ); + setTitle( i18n("DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); // create image settings tab @@ -69,7 +69,7 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, QWidget *parent, const char m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE ); - QString path = doc->tempDir(); + TQString path = doc->tempDir(); if( !path.isEmpty() ) { m_tempDirSelectionWidget->setTempPath( path ); } @@ -77,8 +77,8 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, QWidget *parent, const char m_tempDirSelectionWidget->setDefaultImageFileName( doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, SIGNAL(textChanged(const QString&)), - m_tempDirSelectionWidget, SLOT(setDefaultImageFileName(const QString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -89,14 +89,14 @@ K3bDvdBurnDialog::~K3bDvdBurnDialog() void K3bDvdBurnDialog::setupSettingsTab() { - QWidget* frame = new QWidget( this ); - QGridLayout* frameLayout = new QGridLayout( frame ); + TQWidget* frame = new TQWidget( this ); + TQGridLayout* frameLayout = new TQGridLayout( frame ); frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); // Multisession // //////////////////////////////////////////////////////////////////////// - QGroupBox* groupMultiSession = new QGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); + TQGroupBox* groupMultiSession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); m_comboMultisession = new K3bDataMultiSessionCombobox( groupMultiSession ); frameLayout->addWidget( groupMultiSession, 0, 0 ); @@ -104,8 +104,8 @@ void K3bDvdBurnDialog::setupSettingsTab() addPage( frame, i18n("Misc") ); - connect( m_comboMultisession, SIGNAL(activated(int)), - this, SLOT(slotMultiSessionModeChanged()) ); + connect( m_comboMultisession, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotMultiSessionModeChanged()) ); } @@ -277,17 +277,17 @@ void K3bDvdBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked - QFile::remove( m_tempDirSelectionWidget->tempPath() ); + TQFile::remove( m_tempDirSelectionWidget->tempPath() ); } else return; diff --git a/src/projects/k3bdvdburndialog.h b/src/projects/k3bdvdburndialog.h index deb9620..3400c7d 100644 --- a/src/projects/k3bdvdburndialog.h +++ b/src/projects/k3bdvdburndialog.h @@ -22,19 +22,20 @@ class K3bDvdDoc; class K3bDataImageSettingsWidget; -class QGroupBox; -class QRadioButton; -class QButtonGroup; -class QCheckBox; +class TQGroupBox; +class TQRadioButton; +class TQButtonGroup; +class TQCheckBox; class K3bDataMultiSessionCombobox; class K3bDvdBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bDvdBurnDialog( K3bDvdDoc*, QWidget *parent = 0, const char *name = 0, bool modal = true ); + K3bDvdBurnDialog( K3bDvdDoc*, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); ~K3bDvdBurnDialog(); protected slots: @@ -61,7 +62,7 @@ class K3bDvdBurnDialog : public K3bProjectBurnDialog K3bDataMultiSessionCombobox* m_comboMultisession; // --------------------------------------------- - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; K3bDvdDoc* m_doc; }; diff --git a/src/projects/k3bdvdview.cpp b/src/projects/k3bdvdview.cpp index 512ec4b..dc5f67a 100644 --- a/src/projects/k3bdvdview.cpp +++ b/src/projects/k3bdvdview.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -K3bDvdView::K3bDvdView( K3bDvdDoc* doc, QWidget *parent, const char *name ) - : K3bDataView( doc, parent, name ) +K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bDataView( doc, tqparent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView() } -K3bProjectBurnDialog* K3bDvdView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bDvdBurnDialog( m_doc, parent, name, true ); + return new K3bDvdBurnDialog( m_doc, tqparent, name, true ); } #include "k3bdvdview.moc" diff --git a/src/projects/k3bdvdview.h b/src/projects/k3bdvdview.h index d9f30f3..1072cc2 100644 --- a/src/projects/k3bdvdview.h +++ b/src/projects/k3bdvdview.h @@ -25,13 +25,14 @@ class K3bDvdDoc; class K3bDvdView : public K3bDataView { Q_OBJECT + TQ_OBJECT public: - K3bDvdView( K3bDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bDvdView(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private: K3bDvdDoc* m_doc; diff --git a/src/projects/k3bencodingconverter.cpp b/src/projects/k3bencodingconverter.cpp index 460abbe..38e219e 100644 --- a/src/projects/k3bencodingconverter.cpp +++ b/src/projects/k3bencodingconverter.cpp @@ -17,8 +17,8 @@ #include "k3bencodingconverter.h" -#include <qwidget.h> -#include <qlayout.h> +#include <tqwidget.h> +#include <tqlayout.h> #include <kdebug.h> @@ -32,8 +32,8 @@ class K3bEncodingConverter::Private { public: iconv_t ic; - QString localEncoding; - QString lastEncoding; + TQString localEncoding; + TQString lastEncoding; }; @@ -42,7 +42,7 @@ K3bEncodingConverter::K3bEncodingConverter() d = new Private; #ifdef HAVE_ICONV_H char* codec = nl_langinfo( CODESET ); - d->localEncoding = QString::fromLocal8Bit( codec ); + d->localEncoding = TQString::fromLocal8Bit( codec ); kdDebug() << "(K3bDataUrlAddingDialog) using locale codec: " << codec << endl; d->ic = ::iconv_open( "UCS-2BE", codec ); #endif @@ -58,14 +58,14 @@ K3bEncodingConverter::~K3bEncodingConverter() } -bool K3bEncodingConverter::encodedLocally( const QCString& s ) +bool K3bEncodingConverter::encodedLocally( const TQCString& s ) { #ifdef HAVE_ICONV_H - QCString utf8Encoded( s.length()*2 ); + TQCString utf8Encoded( s.length()*2 ); #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) const char* in = s.data(); #else - char* in = s.data(); + char* in = const_cast<char*>(s.data()); #endif char* out = utf8Encoded.data(); size_t inSize = s.length(); @@ -77,7 +77,7 @@ bool K3bEncodingConverter::encodedLocally( const QCString& s ) } -bool K3bEncodingConverter::fixEncoding( const QCString& s, QCString& result, QWidget* parent, bool cache ) +bool K3bEncodingConverter::fixEncoding( const TQCString& s, TQCString& result, TQWidget* tqparent, bool cache ) { #ifdef IMPLEMENT_THIS_METHOD // HAVE_ICONV_H if( !d->lastEncoding.isEmpty() ) { @@ -96,14 +96,14 @@ bool K3bEncodingConverter::fixEncoding( const QCString& s, QCString& result, QWi } else - d->lastEncoding = QString::null; + d->lastEncoding = TQString(); #else return false; #endif } -bool K3bEncodingConverter::convert( const QCString& s, QCString& result, const QString& from, const QString& to ) +bool K3bEncodingConverter::convert( const TQCString& s, TQCString& result, const TQString& from, const TQString& to ) { bool r = false; @@ -114,7 +114,7 @@ bool K3bEncodingConverter::convert( const QCString& s, QCString& result, const Q #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) const char* in = s.data(); #else - char* in = s.data(); + char* in = const_cast<char*>(s.data()); #endif char* out = result.data(); size_t inSize = s.length(); diff --git a/src/projects/k3bencodingconverter.h b/src/projects/k3bencodingconverter.h index e40003c..c88f5be 100644 --- a/src/projects/k3bencodingconverter.h +++ b/src/projects/k3bencodingconverter.h @@ -16,10 +16,10 @@ #ifndef _K3B_ENCODING_CONVERTER_H_ #define _K3B_ENCODING_CONVERTER_H_ -#include <qcstring.h> -#include <qstring.h> +#include <tqcstring.h> +#include <tqstring.h> -class QWidget; +class TQWidget; class K3bEncodingConverter { @@ -32,7 +32,7 @@ class K3bEncodingConverter * * \return True if the string is encoded in the local encoding. */ - bool encodedLocally( const QCString& ); + bool encodedLocally( const TQCString& ); /** * Tries to fix the encoding of a string to fit the local @@ -41,16 +41,16 @@ class K3bEncodingConverter * the proper encoding based on example conversions. * * \param s The string to be fixed. - * \param parent The parent widget to be used when showing the encoding selection dialog. + * \param tqparent The tqparent widget to be used when showing the encoding selection dialog. * \param cacheEncoding If true the codeset used for successful conversion is cached and * reused for the next call to fixEncoding. * * \return True if the conversion was successful. */ - bool fixEncoding( const QCString& s, QCString& result, QWidget* parent = 0, bool cacheEncoding = true ); + bool fixEncoding( const TQCString& s, TQCString& result, TQWidget* tqparent = 0, bool cacheEncoding = true ); private: - bool convert( const QCString& s, QCString& result, const QString& from, const QString& to ); + bool convert( const TQCString& s, TQCString& result, const TQString& from, const TQString& to ); class Private; Private* d; diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 2d39bc7..b52782c 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -26,18 +26,18 @@ #include <k3bradioaction.h> #include <k3bmediacache.h> -#include <qevent.h> -#include <qpainter.h> -#include <qcolor.h> -#include <qrect.h> -#include <qfont.h> -#include <qfontmetrics.h> -#include <qvalidator.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qtimer.h> +#include <tqevent.h> +#include <tqpainter.h> +#include <tqcolor.h> +#include <tqrect.h> +#include <tqfont.h> +#include <tqfontmetrics.h> +#include <tqvalidator.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqtimer.h> #include <kaction.h> #include <kpopupmenu.h> @@ -67,12 +67,12 @@ public: }; -K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, QWidget* parent ) - : QWidget( parent, 0, WRepaintNoErase ) +K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* tqparent ) + : TQWidget( tqparent, 0, WRepaintNoErase ) { d = new Private(); d->doc = doc; - setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); } @@ -102,35 +102,35 @@ void K3bFillStatusDisplayWidget::setCdSize( const K3b::Msf& size ) } -QSize K3bFillStatusDisplayWidget::sizeHint() const +TQSize K3bFillStatusDisplayWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -QSize K3bFillStatusDisplayWidget::minimumSizeHint() const +TQSize K3bFillStatusDisplayWidget::tqminimumSizeHint() const { int margin = 2; - QFontMetrics fm( font() ); - return QSize( -1, fm.height() + 2 * margin ); + TQFontMetrics fm( font() ); + return TQSize( -1, fm.height() + 2 * margin ); } -void K3bFillStatusDisplayWidget::mousePressEvent( QMouseEvent* e ) +void K3bFillStatusDisplayWidget::mousePressEvent( TQMouseEvent* e ) { if( e->button() == Qt::RightButton ) emit contextMenu( e->globalPos() ); } -void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) +void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) { // double buffer - QPixmap buffer( size() ); - buffer.fill( colorGroup().base() ); - QPainter p; - p.begin( &buffer, this ); - p.setPen( Qt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) + TQPixmap buffer( size() ); + buffer.fill( tqcolorGroup().base() ); + TQPainter p; + p.tqbegin( &buffer, TQT_TQOBJECT(this) ); + p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) long long docSize; long long cdSize; @@ -152,19 +152,19 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // so split width() in maxValue pieces double one = (double)rect().width() / (double)maxValue; - QRect crect( rect() ); + TQRect crect( rect() ); crect.setWidth( (int)(one*(double)docSize) ); p.setClipping(true); p.setClipRect(crect); - p.fillRect( crect, Qt::green ); + p.fillRect( crect, TQt::green ); - QRect oversizeRect(crect); + TQRect oversizeRect(crect); // draw yellow if cdSize - tolerance < docSize if( docSize > cdSize - tolerance ) { oversizeRect.setLeft( oversizeRect.left() + (int)(one * (cdSize - tolerance)) ); - p.fillRect( oversizeRect, Qt::yellow ); + p.fillRect( oversizeRect, TQt::yellow ); KPixmap pix; pix.resize( rect().height()*2, rect().height() ); KPixmapEffect::gradient( pix, green, yellow, KPixmapEffect::HorizontalGradient, 0 ); @@ -174,7 +174,7 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // draw red if docSize > cdSize + tolerance if( docSize > cdSize + tolerance ) { oversizeRect.setLeft( oversizeRect.left() + (int)(one * tolerance*2) ); - p.fillRect( oversizeRect, Qt::red ); + p.fillRect( oversizeRect, TQt::red ); KPixmap pix; pix.resize( rect().height()*2, rect().height() ); KPixmapEffect::gradient( pix, yellow, red, KPixmapEffect::HorizontalGradient, 0 ); @@ -190,25 +190,25 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // first we determine the text to display // ==================================================================================== - QString docSizeText; + TQString docSizeText; if( d->showTime ) docSizeText = d->doc->length().toString(false) + " " + i18n("min"); else docSizeText = KIO::convertSize( d->doc->size() ); - QString overSizeText; + TQString overSizeText; if( d->cdSize.mode1Bytes() >= d->doc->size() ) overSizeText = i18n("Available: %1 of %2") - .arg( d->showTime - ? i18n("%1 min").arg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false)) - : KIO::convertSize( QMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) ) - .arg( d->showTime - ? i18n("%1 min").arg(K3b::Msf( cdSize*60*75 ).toString(false)) + .tqarg( d->showTime + ? i18n("%1 min").tqarg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false)) + : KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) ) + .tqarg( d->showTime + ? i18n("%1 min").tqarg(K3b::Msf( cdSize*60*75 ).toString(false)) : KIO::convertSizeFromKB( cdSize * 1024 ) ); else overSizeText = i18n("Capacity exceeded by %1") - .arg( d->showTime - ? i18n("%1 min").arg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false)) + .tqarg( d->showTime + ? i18n("%1 min").tqarg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false)) : KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) ); // ==================================================================================== @@ -234,18 +234,18 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // make sure the text does not cross the medium size marker if( docSizeTextPos <= mediumSizeMarkerPos && mediumSizeMarkerPos <= docSizeTextPos + docSizeTextLength ) - docSizeTextPos = QMAX( crect.left() + 5, mediumSizeMarkerPos - docSizeTextLength - 5 ); + docSizeTextPos = TQMAX( crect.left() + 5, mediumSizeMarkerPos - docSizeTextLength - 5 ); } // ==================================================================================== // draw the over size text // ==================================================================================== - QFont fnt(font()); - fnt.setPointSize( QMAX( 8, fnt.pointSize()-4 ) ); + TQFont fnt(font()); + fnt.setPointSize( TQMAX( 8, fnt.pointSize()-4 ) ); fnt.setBold(false); - QRect overSizeTextRect( rect() ); - int overSizeTextLength = QFontMetrics(fnt).width(overSizeText); + TQRect overSizeTextRect( rect() ); + int overSizeTextLength = TQFontMetrics(fnt).width(overSizeText); if( overSizeTextLength + 5 > overSizeTextRect.width() - (int)(one*cdSize) ) { // we don't have enough space on the right, so we paint to the left of the line overSizeTextRect.setLeft( (int)(one*cdSize) - overSizeTextLength - 5 ); @@ -256,14 +256,14 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // make sure the two text do not overlap (this does not cover all cases though) if( overSizeTextRect.left() < docSizeTextPos + docSizeTextLength ) - docSizeTextPos = QMAX( crect.left() + 5, QMIN( overSizeTextRect.left() - docSizeTextLength - 5, mediumSizeMarkerPos - docSizeTextLength - 5 ) ); + docSizeTextPos = TQMAX( crect.left() + 5, TQMIN( overSizeTextRect.left() - docSizeTextLength - 5, mediumSizeMarkerPos - docSizeTextLength - 5 ) ); - QRect docTextRect( rect() ); + TQRect docTextRect( rect() ); docTextRect.setLeft( docSizeTextPos ); - p.drawText( docTextRect, Qt::AlignLeft | Qt::AlignVCenter, docSizeText ); + p.drawText( docTextRect, TQt::AlignLeft | TQt::AlignVCenter, docSizeText ); p.setFont(fnt); - p.drawText( overSizeTextRect, Qt::AlignLeft | Qt::AlignVCenter, overSizeText ); + p.drawText( overSizeTextRect, TQt::AlignLeft | TQt::AlignVCenter, overSizeText ); // ==================================================================================== p.end(); @@ -276,16 +276,16 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // ---------------------------------------------------------------------------------------------------- -class K3bFillStatusDisplay::ToolTip : public QToolTip +class K3bFillStatusDisplay::ToolTip : public TQToolTip { public: - ToolTip( K3bDoc* doc, QWidget* parent ) - : QToolTip( parent, 0 ), + ToolTip( K3bDoc* doc, TQWidget* tqparent ) + : TQToolTip( tqparent, 0 ), m_doc(doc) { } - void maybeTip( const QPoint& ) { - tip( parentWidget()->rect(), + void maybeTip( const TQPoint& ) { + tip( tqparentWidget()->rect(), KIO::convertSize( m_doc->size() ) + " (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " + m_doc->length().toString(false) + " " + i18n("min") + @@ -316,7 +316,7 @@ public: KPopupMenu* popup; KPopupMenu* dvdPopup; - QToolButton* buttonMenu; + TQToolButton* buttonMenu; K3bFillStatusDisplayWidget* displayWidget; @@ -325,12 +325,12 @@ public: K3bDoc* doc; - QTimer updateTimer; + TQTimer updateTimer; }; -K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, QWidget *parent, const char *name ) - : QFrame(parent,name) +K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *tqparent, const char *name ) + : TQFrame(tqparent,name) { d = new Private; d->doc = doc; @@ -340,27 +340,27 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, QWidget *parent, const setFrameStyle( Panel | Sunken ); d->displayWidget = new K3bFillStatusDisplayWidget( doc, this ); -// d->buttonMenu = new QToolButton( this ); +// d->buttonMenu = new TQToolButton( this ); // d->buttonMenu->setIconSet( SmallIconSet("cdrom_unmount") ); // d->buttonMenu->setAutoRaise(true); -// QToolTip::add( d->buttonMenu, i18n("Fill display properties") ); -// connect( d->buttonMenu, SIGNAL(clicked()), this, SLOT(slotMenuButtonClicked()) ); +// TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); +// connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); - QGridLayout* layout = new QGridLayout( this ); - layout->setSpacing(5); - layout->setMargin(frameWidth()); - layout->addWidget( d->displayWidget, 0, 0 ); - // layout->addWidget( d->buttonMenu, 0, 1 ); - layout->setColStretch( 0, 1 ); + TQGridLayout* tqlayout = new TQGridLayout( this ); + tqlayout->setSpacing(5); + tqlayout->setMargin(frameWidth()); + tqlayout->addWidget( d->displayWidget, 0, 0 ); + // tqlayout->addWidget( d->buttonMenu, 0, 1 ); + tqlayout->setColStretch( 0, 1 ); setupPopupMenu(); showDvdSizes( false ); - connect( d->doc, SIGNAL(changed()), this, SLOT(slotDocChanged()) ); - connect( &d->updateTimer, SIGNAL(timeout()), this, SLOT(slotUpdateDisplay()) ); - connect( k3bappcore->mediaCache(), SIGNAL(mediumChanged(K3bDevice::Device*)), - this, SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( d->doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( &d->updateTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDisplay()) ); + connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } K3bFillStatusDisplay::~K3bFillStatusDisplay() @@ -378,32 +378,32 @@ void K3bFillStatusDisplay::setupPopupMenu() d->popup = new KPopupMenu( this, "popup" ); d->dvdPopup = new KPopupMenu( this, "dvdpopup" ); - d->actionShowMinutes = new KRadioAction( i18n("Minutes"), 0, this, SLOT(showTime()), + d->actionShowMinutes = new KRadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), d->actionCollection, "fillstatus_show_minutes" ); - d->actionShowMegs = new KRadioAction( i18n("Megabytes"), 0, this, SLOT(showSize()), + d->actionShowMegs = new KRadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), d->actionCollection, "fillstatus_show_megabytes" ); d->actionShowMegs->setExclusiveGroup( "show_size_in" ); d->actionShowMinutes->setExclusiveGroup( "show_size_in" ); - d->actionAuto = new KRadioAction( i18n("Auto"), 0, this, SLOT(slotAutoSize()), + d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), d->actionCollection, "fillstatus_auto" ); - d->action74Min = new KRadioAction( i18n("%1 MB").arg(650), 0, this, SLOT(slot74Minutes()), + d->action74Min = new KRadioAction( i18n("%1 MB").tqarg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), d->actionCollection, "fillstatus_74minutes" ); - d->action80Min = new KRadioAction( i18n("%1 MB").arg(700), 0, this, SLOT(slot80Minutes()), + d->action80Min = new KRadioAction( i18n("%1 MB").tqarg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), d->actionCollection, "fillstatus_80minutes" ); - d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, this, SLOT(slot100Minutes()), + d->action100Min = new KRadioAction( i18n("%1 MB").tqarg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); - d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, this, SLOT(slotDvd4_7GB()), + d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); d->actionDvdDoubleLayer = new KRadioAction( KIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), - 0, this, SLOT(slotDvdDoubleLayer()), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()), d->actionCollection, "fillstatus_dvd_double_layer" ); - d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, this, SLOT(slotCustomSize()), + d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), d->actionCollection, "fillstatus_custom_size" ); d->actionCustomSize->setAlwaysEmitActivated(true); d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "cdrom_unmount", 0, - this, SLOT(slotDetermineSize()), + TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()), d->actionCollection, "fillstatus_size_from_disk" ); d->actionDetermineSize->setAlwaysEmitActivated(true); @@ -417,14 +417,14 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionDetermineSize->setExclusiveGroup( "cd_size" ); d->actionLoadUserDefaults = new KAction( i18n("User Defaults"), "", 0, - this, SLOT(slotLoadUserDefaults()), + TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()), d->actionCollection, "load_user_defaults" ); d->actionSaveUserDefaults = new KAction( i18n("Save User Defaults"), "", 0, - this, SLOT(slotSaveUserDefaults()), + TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()), d->actionCollection, "save_user_defaults" ); KAction* dvdSizeInfoAction = new KAction( i18n("Why 4.4 instead of 4.7?"), "", 0, - this, SLOT(slotWhy44()), + TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()), d->actionCollection, "why_44_gb" ); d->popup->insertTitle( i18n("Show Size In") ); @@ -452,7 +452,7 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionLoadUserDefaults->plug( d->dvdPopup ); d->actionSaveUserDefaults->plug( d->dvdPopup ); - connect( d->displayWidget, SIGNAL(contextMenu(const QPoint&)), this, SLOT(slotPopupMenu(const QPoint&)) ); + connect( d->displayWidget, TQT_SIGNAL(contextMenu(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotPopupMenu(const TQPoint&)) ); } @@ -460,9 +460,9 @@ void K3bFillStatusDisplay::showSize() { d->actionShowMegs->setChecked( true ); - d->action74Min->setText( i18n("%1 MB").arg(650) ); - d->action80Min->setText( i18n("%1 MB").arg(700) ); - d->action100Min->setText( i18n("%1 MB").arg(880) ); + d->action74Min->setText( i18n("%1 MB").tqarg(650) ); + d->action80Min->setText( i18n("%1 MB").tqarg(700) ); + d->action100Min->setText( i18n("%1 MB").tqarg(880) ); d->showTime = false; d->displayWidget->setShowTime(false); @@ -526,7 +526,7 @@ void K3bFillStatusDisplay::slotDvdDoubleLayer() void K3bFillStatusDisplay::slotWhy44() { - QWhatsThis::display( i18n("<p><b>Why does K3b offer 4.4 GB and 8.0 GB instead of 4.7 and 8.5 like " + TQWhatsThis::display( i18n("<p><b>Why does K3b offer 4.4 GB and 8.0 GB instead of 4.7 and 8.5 like " "it says on the media?</b>" "<p>A single layer DVD media has a capacity of approximately " "4.4 GB which equals 4.4*1024<sup>3</sup> bytes. Media producers just " @@ -538,29 +538,29 @@ void K3bFillStatusDisplay::slotWhy44() void K3bFillStatusDisplay::slotCustomSize() { // allow the units to be translated - QString gbS = i18n("gb"); - QString mbS = i18n("mb"); - QString minS = i18n("min"); + TQString gbS = i18n("gb"); + TQString mbS = i18n("mb"); + TQString minS = i18n("min"); - QRegExp rx( "(\\d+\\" + KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" ); + TQRegExp rx( "(\\d+\\" + KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" ); bool ok; - QString size = KInputDialog::getText( i18n("Custom Size"), + TQString size = KInputDialog::getText( i18n("Custom Size"), i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, " "and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>" " respectively."), - d->showDvdSizes ? QString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) : - (d->showTime ? QString("74")+minS : QString("650")+mbS), + d->showDvdSizes ? TQString("4%14%2").tqarg(KGlobal::locale()->decimalSymbol()).tqarg(gbS) : + (d->showTime ? TQString("74")+minS : TQString("650")+mbS), &ok, this, (const char*)0, - new QRegExpValidator( rx, this ) ); + new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) ); if( ok ) { // determine size if( rx.exactMatch( size ) ) { - QString valStr = rx.cap(1); + TQString valStr = rx.cap(1); if( valStr.endsWith( KGlobal::locale()->decimalSymbol() ) ) valStr += "0"; double val = KGlobal::locale()->readNumber( valStr, &ok ); if( ok ) { - QString s = rx.cap(2); + TQString s = rx.cap(2); if( s == gbS || (s.isEmpty() && d->showDvdSizes) ) val *= 1024*512; else if( s == mbS || (s.isEmpty() && !d->showTime) ) @@ -577,13 +577,13 @@ void K3bFillStatusDisplay::slotCustomSize() void K3bFillStatusDisplay::slotMenuButtonClicked() { - QSize size = d->showDvdSizes ? d->dvdPopup->sizeHint() : d->popup->sizeHint(); - slotPopupMenu( d->buttonMenu->mapToGlobal(QPoint(d->buttonMenu->width(), 0)) + - QPoint(-1*size.width(), -1*size.height()) ); + TQSize size = d->showDvdSizes ? d->dvdPopup->tqsizeHint() : d->popup->tqsizeHint(); + slotPopupMenu( d->buttonMenu->mapToGlobal(TQPoint(d->buttonMenu->width(), 0)) + + TQPoint(-1*size.width(), -1*size.height()) ); } -void K3bFillStatusDisplay::slotPopupMenu( const QPoint& p ) +void K3bFillStatusDisplay::slotPopupMenu( const TQPoint& p ) { if( d->showDvdSizes ) d->dvdPopup->popup(p); @@ -597,8 +597,8 @@ void K3bFillStatusDisplay::slotDetermineSize() bool canceled = false; K3bDevice::Device* dev = K3bMediaSelectionDialog::selectMedium( d->showDvdSizes ? K3bDevice::MEDIA_WRITABLE_DVD : K3bDevice::MEDIA_WRITABLE_CD, K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE, - parentWidget(), - QString::null, QString::null, &canceled ); + tqparentWidget(), + TQString(), TQString(), &canceled ); if( dev ) { K3b::Msf size = k3bappcore->mediaCache()->diskInfo( dev ).capacity(); @@ -608,10 +608,10 @@ void K3bFillStatusDisplay::slotDetermineSize() update(); } else - KMessageBox::error( parentWidget(), i18n("Medium is not empty.") ); + KMessageBox::error( tqparentWidget(), i18n("Medium is not empty.") ); } else if( !canceled ) - KMessageBox::error( parentWidget(), i18n("No usable medium found.") ); + KMessageBox::error( tqparentWidget(), i18n("No usable medium found.") ); } @@ -673,13 +673,13 @@ void K3bFillStatusDisplay::slotMediumChanged( K3bDevice::Device* ) // TODO: once we have only one data project we need to change this to handle both K3bDevice::Device* dev = 0; - QPtrList<K3bDevice::Device> devs; + TQPtrList<K3bDevice::Device> devs; if( d->showDvdSizes ) devs = k3bcore->deviceManager()->dvdWriter(); else devs = k3bcore->deviceManager()->cdWriter(); - for( QPtrListIterator<K3bDevice::Device> it( devs ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( devs ); *it; ++it ) { const K3bMedium& medium = k3bappcore->mediaCache()->medium( *it ); if( ( medium.diskInfo().empty() || diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index f477faa..d123426 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -18,18 +18,18 @@ #ifndef K3BFILLSTATUSDISPLAY_H #define K3BFILLSTATUSDISPLAY_H -#include <qframe.h> -#include <qtooltip.h> +#include <tqframe.h> +#include <tqtooltip.h> -class QPaintEvent; -class QMouseEvent; +class TQPaintEvent; +class TQMouseEvent; class K3bDoc; class KToggleAction; class KAction; class KActionCollection; class KPopupMenu; -class QToolButton; +class TQToolButton; namespace K3bDevice { class Device; @@ -42,16 +42,17 @@ namespace K3b { /** *@author Sebastian Trueg */ -class K3bFillStatusDisplayWidget : public QWidget +class K3bFillStatusDisplayWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bFillStatusDisplayWidget( K3bDoc* doc, QWidget* parent ); + K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* tqparent ); ~K3bFillStatusDisplayWidget(); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; const K3b::Msf& cdSize() const; @@ -60,11 +61,11 @@ class K3bFillStatusDisplayWidget : public QWidget void setCdSize( const K3b::Msf& ); signals: - void contextMenu( const QPoint& ); + void contextMenu( const TQPoint& ); protected: - void mousePressEvent( QMouseEvent* ); - void paintEvent(QPaintEvent*); + void mousePressEvent( TQMouseEvent* ); + void paintEvent(TQPaintEvent*); private: class Private; @@ -72,12 +73,13 @@ class K3bFillStatusDisplayWidget : public QWidget }; -class K3bFillStatusDisplay : public QFrame { +class K3bFillStatusDisplay : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bFillStatusDisplay(K3bDoc* doc, QWidget *parent=0, const char *name=0); + K3bFillStatusDisplay(K3bDoc* doc, TQWidget *tqparent=0, const char *name=0); ~K3bFillStatusDisplay(); public slots: @@ -98,7 +100,7 @@ class K3bFillStatusDisplay : public QFrame { void slotWhy44(); void slotCustomSize(); void slotMenuButtonClicked(); - void slotPopupMenu(const QPoint&); + void slotPopupMenu(const TQPoint&); void slotDetermineSize(); void slotDocChanged(); void slotMediumChanged( K3bDevice::Device* dev ); diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 5d5ad28..791b3d0 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -36,21 +36,21 @@ #include <k3baudiotrackplayer.h> #include <k3bintmapcombobox.h> -#include <qtabwidget.h> -#include <qcheckbox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qvbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqtabwidget.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> #include <klocale.h> #include <kconfig.h> @@ -59,14 +59,14 @@ #include <kmessagebox.h> -K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal ), m_doc(doc) +K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal ), m_doc(doc) { prepareGui(); setTitle( i18n("Mixed Project"), i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)", - m_doc->numOfTracks()).arg(m_doc->length().toString()) ); + m_doc->numOfTracks()).tqarg(m_doc->length().toString()) ); m_checkOnlyCreateImage->hide(); @@ -80,27 +80,27 @@ K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, QWidget *parent, const setupSettingsPage(); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); - connect( m_checkNormalize, SIGNAL(toggled(bool)), this, SLOT(slotNormalizeToggled(bool)) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotCacheImageToggled(bool)) ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); + connect( m_checkNormalize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNormalizeToggled(bool)) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCacheImageToggled(bool)) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); } void K3bMixedBurnDialog::setupSettingsPage() { - QWidget* w = new QWidget( this ); + TQWidget* w = new TQWidget( this ); - QGroupBox* groupDataMode = new QGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), w ); + TQGroupBox* groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), w ); m_dataModeWidget = new K3bDataModeWidget( groupDataMode ); - QGroupBox* groupNormalize = new QGroupBox( 1, Qt::Vertical, i18n("Misc"), w ); + TQGroupBox* groupNormalize = new TQGroupBox( 1, Qt::Vertical, i18n("Misc"), w ); m_checkNormalize = K3bStdGuiItems::normalizeCheckBox( groupNormalize ); - QGroupBox* groupMixedType = new QGroupBox( 1, Qt::Vertical, i18n("Mixed Mode Type"), w ); + TQGroupBox* groupMixedType = new TQGroupBox( 1, Qt::Vertical, i18n("Mixed Mode Type"), w ); m_comboMixedModeType = new K3bIntMapComboBox( groupMixedType ); m_comboMixedModeType->insertItem( K3bMixedDoc::DATA_SECOND_SESSION, @@ -128,13 +128,13 @@ void K3bMixedBurnDialog::setupSettingsPage() i18n("Data in last track"), i18n("K3b will write the data track after all " "audio tracks.") ); - m_comboMixedModeType->addGlobalWhatsThisText( QString(), + m_comboMixedModeType->addGlobalWhatsThisText( TQString(), i18n("<b>Caution:</b> The last two modes should only be used for CDs that are unlikely to " "be played on a hifi audio CD player." "<br>It could lead to problems with some older " "hifi audio CD players that try to play the data track.") ); - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); grid->addWidget( groupMixedType, 0, 0 ); @@ -318,7 +318,7 @@ void K3bMixedBurnDialog::slotNormalizeToggled( bool on ) if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize audio tracks when burning on-the-fly. " "The external program used for this task only supports normalizing a set " "of audio files."), - QString::null, + TQString(), i18n("Disable normalization"), i18n("Disable on-the-fly burning"), "audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes ) @@ -337,7 +337,7 @@ void K3bMixedBurnDialog::slotCacheImageToggled( bool on ) if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize audio tracks when burning on-the-fly. " "The external program used for this task only supports normalizing a set " "of audio files."), - QString::null, + TQString(), i18n("Disable normalization"), i18n("Disable on-the-fly burning"), "audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes ) diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h index 363d26e..94d224e 100644 --- a/src/projects/k3bmixedburndialog.h +++ b/src/projects/k3bmixedburndialog.h @@ -19,13 +19,13 @@ #include "k3bprojectburndialog.h" -class QCheckBox; +class TQCheckBox; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bMixedDoc; class K3bDataImageSettingsWidget; -class QButtonGroup; -class QRadioButton; +class TQButtonGroup; +class TQRadioButton; class K3bAudioCdTextWidget; class K3bDataModeWidget; class K3bIntMapComboBox; @@ -37,9 +37,10 @@ class K3bIntMapComboBox; class K3bMixedBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bMixedBurnDialog( K3bMixedDoc*, QWidget *parent=0, const char *name=0, bool modal = true ); + K3bMixedBurnDialog( K3bMixedDoc*, TQWidget *tqparent=0, const char *name=0, bool modal = true ); protected: void loadK3bDefaults(); @@ -66,11 +67,11 @@ class K3bMixedBurnDialog : public K3bProjectBurnDialog K3bMixedDoc* m_doc; K3bIntMapComboBox* m_comboMixedModeType; - QRadioButton* m_radioMixedTypeFirstTrack; - QRadioButton* m_radioMixedTypeLastTrack; - QRadioButton* m_radioMixedTypeSessions; + TQRadioButton* m_radioMixedTypeFirstTrack; + TQRadioButton* m_radioMixedTypeLastTrack; + TQRadioButton* m_radioMixedTypeSessions; - QCheckBox* m_checkNormalize; + TQCheckBox* m_checkNormalize; K3bDataModeWidget* m_dataModeWidget; }; diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp index 50d818a..9a014dc 100644 --- a/src/projects/k3bmixeddirtreeview.cpp +++ b/src/projects/k3bmixeddirtreeview.cpp @@ -22,7 +22,7 @@ #include <k3baudiodoc.h> #include <k3bdataviewitem.h> -#include <qevent.h> +#include <tqevent.h> #include <kdebug.h> #include <kiconloader.h> @@ -33,18 +33,18 @@ class K3bMixedDirTreeView::PrivateAudioRootViewItem : public K3bListViewItem { public: - PrivateAudioRootViewItem( K3bMixedDoc* doc, QListView* parent, QListViewItem* after ) - : K3bListViewItem( parent, after ), + PrivateAudioRootViewItem( K3bMixedDoc* doc, TQListView* tqparent, TQListViewItem* after ) + : K3bListViewItem( tqparent, after ), m_doc(doc) { setPixmap( 0, SmallIcon("sound") ); } - QString text( int col ) const { + TQString text( int col ) const { if( col == 0 ) - return i18n("Audio Tracks") + QString(" (%1)").arg(m_doc->audioDoc()->numOfTracks()); + return i18n("Audio Tracks") + TQString(" (%1)").tqarg(m_doc->audioDoc()->numOfTracks()); else - return QString::null; + return TQString(); } private: @@ -52,14 +52,14 @@ public: }; -K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, QWidget* parent, const char* ) - : K3bDataDirTreeView( view, doc->dataDoc(), parent ), m_doc(doc) +K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* tqparent, const char* ) + : K3bDataDirTreeView( view, doc->dataDoc(), tqparent ), m_doc(doc) { m_audioRootItem = new PrivateAudioRootViewItem( doc, this, root() ); - connect( this, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(slotSelectionChanged(QListViewItem*)) ); - connect( m_doc->audioDoc(), SIGNAL(changed()), this, SLOT(slotNewAudioTracks()) ); + connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( m_doc->audioDoc(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotNewAudioTracks()) ); } @@ -68,12 +68,12 @@ K3bMixedDirTreeView::~K3bMixedDirTreeView() } -void K3bMixedDirTreeView::slotDropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after ) +void K3bMixedDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ) { if( !e->isAccepted() ) return; - QListViewItem* droppedItem = itemAt(e->pos()); + TQListViewItem* droppedItem = itemAt(e->pos()); if( droppedItem == m_audioRootItem ) { KURL::List urls; if( KURLDrag::decode( e, urls ) ) { @@ -81,11 +81,11 @@ void K3bMixedDirTreeView::slotDropped( QDropEvent* e, QListViewItem* parent, QLi } } else - K3bDataDirTreeView::slotDropped( e, parent, after ); + K3bDataDirTreeView::slotDropped( e, tqparent, after ); } -void K3bMixedDirTreeView::slotSelectionChanged( QListViewItem* i ) +void K3bMixedDirTreeView::slotSelectionChanged( TQListViewItem* i ) { if( i == m_audioRootItem ) emit audioTreeSelected(); @@ -97,7 +97,7 @@ void K3bMixedDirTreeView::slotSelectionChanged( QListViewItem* i ) void K3bMixedDirTreeView::slotNewAudioTracks() { // update the tracknumber - m_audioRootItem->repaint(); + m_audioRootItem->tqrepaint(); } #include "k3bmixeddirtreeview.moc" diff --git a/src/projects/k3bmixeddirtreeview.h b/src/projects/k3bmixeddirtreeview.h index 8a8bfe9..a7320fc 100644 --- a/src/projects/k3bmixeddirtreeview.h +++ b/src/projects/k3bmixeddirtreeview.h @@ -22,16 +22,17 @@ class K3bView; class K3bMixedDoc; -class QDropEvent; -class QListViewItem; +class TQDropEvent; +class TQListViewItem; class K3bMixedDirTreeView : public K3bDataDirTreeView { Q_OBJECT + TQ_OBJECT public: - K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMixedDirTreeView(); signals: @@ -39,10 +40,10 @@ class K3bMixedDirTreeView : public K3bDataDirTreeView void dataTreeSelected(); protected slots: - void slotDropped( QDropEvent* e, QListViewItem* after, QListViewItem* parent ); + void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); private slots: - void slotSelectionChanged( QListViewItem* i ); + void slotSelectionChanged( TQListViewItem* i ); void slotNewAudioTracks(); private: diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp index 68900c7..1022d0a 100644 --- a/src/projects/k3bmixedview.cpp +++ b/src/projects/k3bmixedview.cpp @@ -31,10 +31,10 @@ #include <k3btoolbox.h> #include <k3bprojectplugin.h> -#include <qwidgetstack.h> -#include <qsplitter.h> -#include <qlayout.h> -#include <qvaluelist.h> +#include <tqwidgetstack.h> +#include <tqsplitter.h> +#include <tqlayout.h> +#include <tqvaluelist.h> #include <kdialog.h> #include <klocale.h> @@ -44,22 +44,22 @@ #include <kactionclasses.h> -K3bMixedView::K3bMixedView( K3bMixedDoc* doc, QWidget* parent, const char* name ) - : K3bView( doc, parent, name ), m_doc(doc) +K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* tqparent, const char* name ) + : K3bView( doc, tqparent, name ), m_doc(doc) { - QSplitter* splitter = new QSplitter( this ); + TQSplitter* splitter = new TQSplitter( this ); m_mixedDirTreeView = new K3bMixedDirTreeView( this, doc, splitter ); - m_widgetStack = new QWidgetStack( splitter ); + m_widgetStack = new TQWidgetStack( splitter ); m_dataFileView = new K3bDataFileView( this, m_mixedDirTreeView, doc->dataDoc(), m_widgetStack ); m_mixedDirTreeView->setFileView( m_dataFileView ); m_audioListView = new K3bAudioTrackView( doc->audioDoc(), m_widgetStack ); setMainWidget( splitter ); - connect( m_mixedDirTreeView, SIGNAL(audioTreeSelected()), - this, SLOT(slotAudioTreeSelected()) ); - connect( m_mixedDirTreeView, SIGNAL(dataTreeSelected()), - this, SLOT(slotDataTreeSelected()) ); + connect( m_mixedDirTreeView, TQT_SIGNAL(audioTreeSelected()), + this, TQT_SLOT(slotAudioTreeSelected()) ); + connect( m_mixedDirTreeView, TQT_SIGNAL(dataTreeSelected()), + this, TQT_SLOT(slotDataTreeSelected()) ); m_widgetStack->raiseWidget( m_dataFileView ); @@ -123,7 +123,7 @@ void K3bMixedView::slotBurn() { if( m_doc->audioDoc()->numOfTracks() == 0 || m_doc->dataDoc()->size() == 0 ) { KMessageBox::information( this, i18n("Please add files and audio titles to your project first."), - i18n("No Data to Burn"), QString::null, false ); + i18n("No Data to Burn"), TQString(), false ); } else { K3bProjectBurnDialog* dlg = newBurnDialog( this ); @@ -138,9 +138,9 @@ void K3bMixedView::slotBurn() } -K3bProjectBurnDialog* K3bMixedView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bMixedView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bMixedBurnDialog( m_doc, parent, name, true ); + return new K3bMixedBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3bmixedview.h b/src/projects/k3bmixedview.h index 8e52df7..1111dd3 100644 --- a/src/projects/k3bmixedview.h +++ b/src/projects/k3bmixedview.h @@ -21,11 +21,11 @@ #include <kurl.h> class K3bMixedDoc; -class QWidgetStack; +class TQWidgetStack; class K3bDataFileView; class K3bMixedDirTreeView; class K3bAudioTrackView; -class QListViewItem; +class TQListViewItem; class K3bDirItem; class K3bAudioTrackPlayer; @@ -33,9 +33,10 @@ class K3bAudioTrackPlayer; class K3bMixedView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bMixedView( K3bMixedDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bMixedView( K3bMixedDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMixedView(); K3bDirItem* currentDir() const; @@ -47,7 +48,7 @@ class K3bMixedView : public K3bView void addUrls( const KURL::List& ); protected: - K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private slots: void slotAudioTreeSelected(); @@ -56,7 +57,7 @@ class K3bMixedView : public K3bView private: K3bMixedDoc* m_doc; - QWidgetStack* m_widgetStack; + TQWidgetStack* m_widgetStack; K3bMixedDirTreeView* m_mixedDirTreeView; K3bDataFileView* m_dataFileView; diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index 94238a7..1a785d8 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -37,14 +37,14 @@ #include <kapplication.h> #include <kconfig.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qfileinfo.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqfileinfo.h> -K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent, const char* name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal ), +K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* tqparent, const char* name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal ), m_doc(doc) { prepareGui(); @@ -52,7 +52,7 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent, const m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); setTitle( i18n("eMovix CD Project"), - i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) ); + i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); addPage( m_movixOptionsWidget, i18n("eMovix") ); @@ -67,11 +67,11 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent, const m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); - QString path = m_doc->tempDir(); + TQString path = m_doc->tempDir(); if( !path.isEmpty() ) { m_tempDirSelectionWidget->setTempPath( path ); } @@ -79,8 +79,8 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent, const m_tempDirSelectionWidget->setDefaultImageFileName( m_doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, SIGNAL(textChanged(const QString&)), - m_tempDirSelectionWidget, SLOT(setDefaultImageFileName(const QString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -91,15 +91,15 @@ K3bMovixBurnDialog::~K3bMovixBurnDialog() void K3bMovixBurnDialog::setupSettingsPage() { - QWidget* frame = new QWidget( this ); - QGridLayout* frameLayout = new QGridLayout( frame ); + TQWidget* frame = new TQWidget( this ); + TQGridLayout* frameLayout = new TQGridLayout( frame ); frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); - QGroupBox* groupDataMode = new QGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); + TQGroupBox* groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); m_dataModeWidget = new K3bDataModeWidget( groupDataMode ); - QGroupBox* groupMultisession = new QGroupBox( 1, Qt::Vertical, i18n("Multisession"), frame ); + TQGroupBox* groupMultisession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession"), frame ); m_checkStartMultiSesssion = K3bStdGuiItems::startMultisessionCheckBox( groupMultisession ); frameLayout->addWidget( groupDataMode, 0, 0 ); @@ -220,13 +220,13 @@ void K3bMovixBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) != KMessageBox::Continue ) return; diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h index ff237c0..326a5b7 100644 --- a/src/projects/k3bmovixburndialog.h +++ b/src/projects/k3bmovixburndialog.h @@ -23,16 +23,17 @@ class K3bMovixDoc; class K3bMovixOptionsWidget; class K3bDataImageSettingsWidget; -class QCheckBox; +class TQCheckBox; class K3bDataModeWidget; class K3bMovixBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent = 0, const char* name = 0, bool modal = true ); + K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); ~K3bMovixBurnDialog(); protected slots: @@ -53,10 +54,10 @@ class K3bMovixBurnDialog : public K3bProjectBurnDialog K3bMovixOptionsWidget* m_movixOptionsWidget; K3bDataImageSettingsWidget* m_imageSettingsWidget; - QCheckBox* m_checkStartMultiSesssion; + TQCheckBox* m_checkStartMultiSesssion; K3bDataModeWidget* m_dataModeWidget; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; }; diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index 3707e3a..fccc3b0 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -39,14 +39,14 @@ #include <kconfig.h> #include <kdebug.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qfileinfo.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqfileinfo.h> -K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* parent, const char* name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal, true ), +K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* tqparent, const char* name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), m_doc(doc) { prepareGui(); @@ -54,7 +54,7 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* pare m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); setTitle( i18n("eMovix DVD Project"), - i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) ); + i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); addPage( m_movixOptionsWidget, i18n("eMovix") ); @@ -67,11 +67,11 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* pare m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); - QString path = m_doc->tempDir(); + TQString path = m_doc->tempDir(); if( !path.isEmpty() ) { m_tempDirSelectionWidget->setTempPath( path ); } @@ -79,8 +79,8 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* pare m_tempDirSelectionWidget->setDefaultImageFileName( m_doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, SIGNAL(textChanged(const QString&)), - m_tempDirSelectionWidget, SLOT(setDefaultImageFileName(const QString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -187,13 +187,13 @@ void K3bMovixDvdBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) != KMessageBox::Continue ) return; diff --git a/src/projects/k3bmovixdvdburndialog.h b/src/projects/k3bmovixdvdburndialog.h index df7b456..ca0b4d0 100644 --- a/src/projects/k3bmovixdvdburndialog.h +++ b/src/projects/k3bmovixdvdburndialog.h @@ -23,15 +23,16 @@ class K3bMovixDvdDoc; class K3bMovixOptionsWidget; class K3bDataImageSettingsWidget; -class QCheckBox; +class TQCheckBox; class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* parent = 0, const char* name = 0, bool modal = true ); + K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); ~K3bMovixDvdBurnDialog(); protected slots: @@ -50,7 +51,7 @@ class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog K3bMovixOptionsWidget* m_movixOptionsWidget; K3bDataImageSettingsWidget* m_imageSettingsWidget; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; }; #endif diff --git a/src/projects/k3bmovixdvdview.cpp b/src/projects/k3bmovixdvdview.cpp index 8173199..42b864d 100644 --- a/src/projects/k3bmovixdvdview.cpp +++ b/src/projects/k3bmovixdvdview.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, QWidget *parent, const char *name ) - : K3bMovixView( doc, parent, name ) +K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bMovixView( doc, tqparent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bMovixDvdView::~K3bMovixDvdView() } -K3bProjectBurnDialog* K3bMovixDvdView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bMovixDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bMovixDvdBurnDialog( m_doc, parent, name, true ); + return new K3bMovixDvdBurnDialog( m_doc, tqparent, name, true ); } #include "k3bmovixdvdview.moc" diff --git a/src/projects/k3bmovixdvdview.h b/src/projects/k3bmovixdvdview.h index 643b259..d6d1977 100644 --- a/src/projects/k3bmovixdvdview.h +++ b/src/projects/k3bmovixdvdview.h @@ -25,13 +25,14 @@ class K3bMovixDvdDoc; class K3bMovixDvdView : public K3bMovixView { Q_OBJECT + TQ_OBJECT public: - K3bMovixDvdView( K3bMovixDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bMovixDvdView(); protected: - K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private: K3bMovixDvdDoc* m_doc; diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 9b943d3..93b217c 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -24,17 +24,17 @@ #include <kio/global.h> #include <kurldrag.h> -#include <qdragobject.h> -#include <qptrlist.h> -#include <qevent.h> -#include <qheader.h> +#include <tqdragobject.h> +#include <tqptrlist.h> +#include <tqevent.h> +#include <tqheader.h> K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - QListView* parent, - QListViewItem* after ) - : K3bListViewItem( parent, after ), + TQListView* tqparent, + TQListViewItem* after ) + : K3bListViewItem( tqparent, after ), m_doc(doc), m_fileItem(item) { @@ -43,8 +43,8 @@ K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - QListViewItem* parent ) - : K3bListViewItem( parent ), + TQListViewItem* tqparent ) + : K3bListViewItem( tqparent ), m_doc(doc), m_fileItem(item) { @@ -58,9 +58,9 @@ K3bMovixListViewItem::~K3bMovixListViewItem() K3bMovixFileViewItem::K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - QListView* parent, - QListViewItem* after ) - : K3bMovixListViewItem( doc, item, parent, after ), + TQListView* tqparent, + TQListViewItem* after ) + : K3bMovixListViewItem( doc, item, tqparent, after ), KFileItem( 0, 0, KURL::fromPathOrURL(item->localPath()) ) { setPixmap( 1, KFileItem::pixmap( 16, KIcon::DefaultState ) ); @@ -68,7 +68,7 @@ K3bMovixFileViewItem::K3bMovixFileViewItem( K3bMovixDoc* doc, } -QString K3bMovixFileViewItem::text( int col ) const +TQString K3bMovixFileViewItem::text( int col ) const { // // We add two spaces after all strings (except the once renamable) @@ -78,13 +78,13 @@ QString K3bMovixFileViewItem::text( int col ) const switch( col ) { case 0: // allowing 999 files to be added. - return QString::number( doc()->indexOf( fileItem() ) ).rightJustify( 3, ' ' ); + return TQString::number( doc()->indexOf( fileItem() ) ).rightJustify( 3, ' ' ); case 1: return fileItem()->k3bName(); case 2: { if( fileItem()->isSymLink() ) - return i18n("Link to %1").arg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " "; + return i18n("Link to %1").tqarg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " "; else return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " "; } @@ -100,7 +100,7 @@ QString K3bMovixFileViewItem::text( int col ) const } -void K3bMovixFileViewItem::setText( int col, const QString& text ) +void K3bMovixFileViewItem::setText( int col, const TQString& text ) { if( col == 1 ) fileItem()->setK3bName( text ); @@ -109,9 +109,9 @@ void K3bMovixFileViewItem::setText( int col, const QString& text ) } -QString K3bMovixFileViewItem::key( int, bool ) const +TQString K3bMovixFileViewItem::key( int, bool ) const { - return QString::number( doc()->indexOf( fileItem() ) ).rightJustify( 10, '0' ); + return TQString::number( doc()->indexOf( fileItem() ) ).rightJustify( 10, '0' ); } @@ -119,8 +119,8 @@ QString K3bMovixFileViewItem::key( int, bool ) const K3bMovixSubTitleViewItem::K3bMovixSubTitleViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - K3bMovixListViewItem* parent ) - : K3bMovixListViewItem( doc, item, parent ), + K3bMovixListViewItem* tqparent ) + : K3bMovixListViewItem( doc, item, tqparent ), KFileItem( 0, 0, KURL::fromPathOrURL(item->subTitleItem()->localPath()) ) { } @@ -131,7 +131,7 @@ K3bMovixSubTitleViewItem::~K3bMovixSubTitleViewItem() } -QString K3bMovixSubTitleViewItem::text( int c ) const +TQString K3bMovixSubTitleViewItem::text( int c ) const { switch( c ) { case 1: @@ -139,7 +139,7 @@ QString K3bMovixSubTitleViewItem::text( int c ) const case 2: { if( fileItem()->subTitleItem()->isSymLink() ) - return i18n("Link to %1").arg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment()); + return i18n("Link to %1").tqarg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment()); else return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment(); } @@ -166,8 +166,8 @@ QString K3bMovixSubTitleViewItem::text( int c ) const -K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, QWidget* parent, const char* name ) - : K3bListView( parent, name ), +K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* tqparent, const char* name ) + : K3bListView( tqparent, name ), m_doc(doc) { addColumn( i18n("No.") ); @@ -189,12 +189,12 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, QWidget* parent, const cha + i18n("To remove or rename files use the context menu.") + "\n" + i18n("After that press the burn button to write the CD.") ); - connect( m_doc, SIGNAL(changed()), this, SLOT(slotChanged()) ); - connect( m_doc, SIGNAL(newMovixFileItems()), this, SLOT(slotNewFileItems()) ); - connect( m_doc, SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); - connect( m_doc, SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); - connect( this, SIGNAL(dropped(KListView*, QDropEvent*, QListViewItem*)), - this, SLOT(slotDropped(KListView*, QDropEvent*, QListViewItem*)) ); + connect( m_doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); + connect( m_doc, TQT_SIGNAL(newMovixFileItems()), this, TQT_SLOT(slotNewFileItems()) ); + connect( m_doc, TQT_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); + connect( m_doc, TQT_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); + connect( this, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(KListView*, TQDropEvent*, TQListViewItem*)) ); // let's see what the doc already has slotNewFileItems(); @@ -207,7 +207,7 @@ K3bMovixListView::~K3bMovixListView() } -bool K3bMovixListView::acceptDrag(QDropEvent* e) const +bool K3bMovixListView::acceptDrag(TQDropEvent* e) const { // the first is for built-in item moving, the second for dropping urls return ( K3bListView::acceptDrag(e) || KURLDrag::canDecode(e) ); @@ -217,9 +217,9 @@ bool K3bMovixListView::acceptDrag(QDropEvent* e) const void K3bMovixListView::slotNewFileItems() { K3bMovixFileItem* lastItem = 0; - for( QPtrListIterator<K3bMovixFileItem> it( m_doc->movixFileItems() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bMovixFileItem> it( m_doc->movixFileItems() ); it.current(); ++it ) { K3bMovixFileItem* item = it.current(); - if( !m_itemMap.contains( item ) ) + if( !m_itemMap.tqcontains( item ) ) m_itemMap.insert( item, new K3bMovixFileViewItem( m_doc, item, this, lastItem ? m_itemMap[lastItem] : 0L ) ); if( item->subTitleItem() ) { @@ -240,7 +240,7 @@ void K3bMovixListView::slotNewFileItems() void K3bMovixListView::slotFileItemRemoved( K3bMovixFileItem* item ) { - if( m_itemMap.contains( item ) ) { + if( m_itemMap.tqcontains( item ) ) { K3bMovixFileViewItem* vi = m_itemMap[item]; m_itemMap.erase(item); delete vi; @@ -250,7 +250,7 @@ void K3bMovixListView::slotFileItemRemoved( K3bMovixFileItem* item ) void K3bMovixListView::slotSubTitleItemRemoved( K3bMovixFileItem* item ) { - if( m_itemMap.contains( item ) ) { + if( m_itemMap.tqcontains( item ) ) { K3bMovixFileViewItem* vi = m_itemMap[item]; if( vi->childCount() >= 1 ) delete vi->firstChild(); @@ -258,7 +258,7 @@ void K3bMovixListView::slotSubTitleItemRemoved( K3bMovixFileItem* item ) } -void K3bMovixListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* after ) +void K3bMovixListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ) { if( !e->isAccepted() ) return; @@ -270,8 +270,8 @@ void K3bMovixListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* af pos = m_doc->indexOf( ((K3bMovixListViewItem*)after)->fileItem() ); if( e->source() == viewport() ) { - QPtrList<QListViewItem> sel = selectedItems(); - QPtrListIterator<QListViewItem> it(sel); + TQPtrList<TQListViewItem> sel = selectedItems(); + TQPtrListIterator<TQListViewItem> it(sel); K3bMovixFileItem* itemAfter = ( after ? ((K3bMovixListViewItem*)after)->fileItem() : 0 ); while( it.current() ) { K3bMovixListViewItem* vi = (K3bMovixListViewItem*)it.current(); @@ -302,14 +302,14 @@ void K3bMovixListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* af } -QDragObject* K3bMovixListView::dragObject() +TQDragObject* K3bMovixListView::dragObject() { - QPtrList<QListViewItem> list = selectedItems(); + TQPtrList<TQListViewItem> list = selectedItems(); if( list.isEmpty() ) return 0; - QPtrListIterator<QListViewItem> it(list); + TQPtrListIterator<TQListViewItem> it(list); KURL::List urls; for( ; it.current(); ++it ) diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index 7426ddb..d3b8119 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -21,7 +21,7 @@ #include <k3blistview.h> #include <kfileitem.h> -#include <qmap.h> +#include <tqmap.h> class K3bMovixDoc; @@ -32,8 +32,8 @@ class K3bFileItem; class K3bMovixListViewItem : public K3bListViewItem { public: - K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, QListView* parent, QListViewItem* after ); - K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, QListViewItem* parent ); + K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* tqparent, TQListViewItem* after ); + K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListViewItem* tqparent ); ~K3bMovixListViewItem(); K3bMovixFileItem* fileItem() const { return m_fileItem; } @@ -50,22 +50,22 @@ class K3bMovixListViewItem : public K3bListViewItem class K3bMovixFileViewItem : public K3bMovixListViewItem, public KFileItem { public: - K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, QListView* parent, QListViewItem* ); + K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* tqparent, TQListViewItem* ); - QString text( int ) const; - void setText(int col, const QString& text ); + TQString text( int ) const; + void setText(int col, const TQString& text ); /** always sort according to the playlist order */ - QString key( int, bool ) const; + TQString key( int, bool ) const; }; class K3bMovixSubTitleViewItem : public K3bMovixListViewItem, public KFileItem { public: - K3bMovixSubTitleViewItem( K3bMovixDoc*, K3bMovixFileItem* item, K3bMovixListViewItem* parent ); + K3bMovixSubTitleViewItem( K3bMovixDoc*, K3bMovixFileItem* item, K3bMovixListViewItem* tqparent ); ~K3bMovixSubTitleViewItem(); - QString text( int ) const; + TQString text( int ) const; bool isMovixFileItem() const { return false; } }; @@ -74,27 +74,28 @@ class K3bMovixSubTitleViewItem : public K3bMovixListViewItem, public KFileItem class K3bMovixListView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bMovixListView( K3bMovixDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bMovixListView( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMovixListView(); - QDragObject* dragObject(); + TQDragObject* dragObject(); protected: - bool acceptDrag(QDropEvent* e) const; + bool acceptDrag(TQDropEvent* e) const; private slots: void slotNewFileItems(); void slotFileItemRemoved( K3bMovixFileItem* ); void slotSubTitleItemRemoved( K3bMovixFileItem* ); - void slotDropped( KListView*, QDropEvent* e, QListViewItem* after ); + void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); void slotChanged(); private: K3bMovixDoc* m_doc; - QMap<K3bFileItem*, K3bMovixFileViewItem*> m_itemMap; + TQMap<K3bFileItem*, K3bMovixFileViewItem*> m_itemMap; }; #endif diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index 131af6b..d1aca71 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -24,29 +24,29 @@ #include <kglobal.h> #include <kdebug.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqlabel.h> class K3bMovixOptionsWidget::LanguageSelectionHelper { public: - LanguageSelectionHelper( QComboBox* box ) + LanguageSelectionHelper( TQComboBox* box ) : m_box(box) { } - void insertLanguages( const QStringList& langs ) { + void insertLanguages( const TQStringList& langs ) { m_box->clear(); m_langMap.clear(); - for( QStringList::const_iterator it = langs.begin(); it != langs.end(); ++it ) { + for( TQStringList::const_iterator it = langs.begin(); it != langs.end(); ++it ) { if( *it == i18n("default") ) m_box->insertItem( *it ); else { - QString lang = KGlobal::locale()->twoAlphaToLanguageName( *it ); + TQString lang = KGlobal::locale()->twoAlphaToLanguageName( *it ); if( lang.isEmpty() ) lang = *it; @@ -57,15 +57,15 @@ public: } } - QString selectedLanguage() const { + TQString selectedLanguage() const { if( m_box->currentItem() == 0 ) return i18n("default"); else return m_langMap[m_box->currentItem()]; } - void setLanguage( const QString& l ) { - QMap<QString,int>::const_iterator it = m_indexMap.find(l); + void setLanguage( const TQString& l ) { + TQMap<TQString,int>::const_iterator it = m_indexMap.tqfind(l); if( it == m_indexMap.end() ) m_box->setCurrentItem( 0 ); else @@ -73,14 +73,14 @@ public: } private: - QComboBox* m_box; - QMap<int,QString> m_langMap; - QMap<QString,int> m_indexMap; + TQComboBox* m_box; + TQMap<int,TQString> m_langMap; + TQMap<TQString,int> m_indexMap; }; -K3bMovixOptionsWidget::K3bMovixOptionsWidget( QWidget* parent, const char* name ) - : base_K3bMovixOptionsWidget( parent, name ) +K3bMovixOptionsWidget::K3bMovixOptionsWidget( TQWidget* tqparent, const char* name ) + : base_K3bMovixOptionsWidget( tqparent, name ) { m_keyboardLangHelper = new LanguageSelectionHelper( m_comboKeyboardLayout ); m_helpLangHelper = new LanguageSelectionHelper( m_comboBootMessageLanguage ); @@ -151,8 +151,8 @@ void K3bMovixOptionsWidget::loadDefaults() m_comboAudioBackground->setCurrentItem( 0 ); // default m_comboKeyboardLayout->setCurrentItem( 0 ); // default m_spinLoop->setValue( 1 ); - m_editAdditionalMplayerOptions->setText( QString::null ); - m_editUnwantedMplayerOptions->setText( QString::null ); + m_editAdditionalMplayerOptions->setText( TQString() ); + m_editUnwantedMplayerOptions->setText( TQString() ); m_comboBootMessageLanguage->setCurrentItem( 0 ); // default m_comboDefaultBootLabel->setCurrentItem( 0 ); // default m_checkShutdown->setChecked( false ); @@ -165,7 +165,7 @@ void K3bMovixOptionsWidget::loadDefaults() void K3bMovixOptionsWidget::loadConfig( KConfigBase* c ) { - QString s = c->readEntry("subtitle_fontset"); + TQString s = c->readEntry("subtitle_fontset"); if( !s.isEmpty() && s != "none" && m_comboSubtitleFontset->contains(s) ) m_comboSubtitleFontset->setCurrentItem( s, false ); else @@ -176,7 +176,7 @@ void K3bMovixOptionsWidget::loadConfig( KConfigBase* c ) m_editUnwantedMplayerOptions->setText( c->readEntry( "unwanted_mplayer_options" ) ); s = c->readEntry("boot_message_language"); - m_helpLangHelper->setLanguage( s == "default" ? QString::null : s ); + m_helpLangHelper->setLanguage( s == "default" ? TQString() : s ); s = c->readEntry( "default_boot_label" ); if( !s.isEmpty() && s != "default" && m_comboDefaultBootLabel->contains(s) ) @@ -191,7 +191,7 @@ void K3bMovixOptionsWidget::loadConfig( KConfigBase* c ) m_comboAudioBackground->setCurrentItem( 0 ); // default s = c->readEntry("keyboard_layout"); - m_keyboardLangHelper->setLanguage( s == "default" ? QString::null : s ); + m_keyboardLangHelper->setLanguage( s == "default" ? TQString() : s ); m_checkShutdown->setChecked( c->readBoolEntry( "shutdown", false) ); m_checkReboot->setChecked( c->readBoolEntry( "reboot", false ) ); diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h index 3b9e367..76437f7 100644 --- a/src/projects/k3bmovixoptionswidget.h +++ b/src/projects/k3bmovixoptionswidget.h @@ -27,9 +27,10 @@ class KConfigBase; class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget { Q_OBJECT + TQ_OBJECT public: - K3bMovixOptionsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bMovixOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMovixOptionsWidget(); public slots: diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 825b10b..45a30ff 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -33,34 +33,34 @@ #include <kmessagebox.h> #include <kurl.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qlineedit.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlineedit.h> -K3bMovixView::K3bMovixView( K3bMovixDoc* doc, QWidget* parent, const char* name ) - : K3bView( doc, parent, name ), +K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* tqparent, const char* name ) + : K3bView( doc, tqparent, name ), m_doc(doc) { m_listView = new K3bMovixListView( m_doc, this ); setMainWidget( m_listView ); - connect( m_listView, SIGNAL(contextMenuRequested( QListViewItem*, const QPoint& , int )), - this, SLOT(slotContextMenuRequested(QListViewItem*, const QPoint& , int )) ); + connect( m_listView, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint& , int )), + this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint& , int )) ); // setup actions m_actionProperties = new KAction( i18n("Properties"), "misc", - 0, this, SLOT(showPropertiesDialog()), + 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), actionCollection(), "movix_show_props" ); m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", - Key_Delete, this, SLOT(slotRemoveItems()), + Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()), actionCollection(), "movix_remove_item" ); m_actionRemoveSubTitle = new KAction( i18n( "Remove Subtitle File" ), "editdelete", - 0, this, SLOT(slotRemoveSubTitleItems()), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()), actionCollection(), "movix_remove_subtitle_item" ); m_actionAddSubTitle = new KAction( i18n("Add Subtitle File..."), "", - 0, this, SLOT(slotAddSubTitleFile()), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTitleFile()), actionCollection(), "movix_add_subtitle" ); m_popupMenu = new KPopupMenu( this ); @@ -77,15 +77,15 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, QWidget* parent, const char* name toolBox()->addStretch(); - m_volumeIDEdit = new QLineEdit( doc->isoOptions().volumeID(), toolBox() ); + m_volumeIDEdit = new TQLineEdit( doc->isoOptions().volumeID(), toolBox() ); toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); - connect( m_volumeIDEdit, SIGNAL(textChanged(const QString&)), + connect( m_volumeIDEdit, TQT_SIGNAL(textChanged(const TQString&)), m_doc, - SLOT(setVolumeID(const QString&)) ); + TQT_SLOT(setVolumeID(const TQString&)) ); - connect( m_doc, SIGNAL(changed()), this, SLOT(slotDocChanged()) ); + connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); } @@ -94,7 +94,7 @@ K3bMovixView::~K3bMovixView() } -void K3bMovixView::slotContextMenuRequested(QListViewItem* item, const QPoint& p, int ) +void K3bMovixView::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p, int ) { if( item ) { m_actionRemove->setEnabled(true); @@ -129,8 +129,8 @@ void K3bMovixView::showPropertiesDialog() void K3bMovixView::slotRemoveItems() { - QPtrList<QListViewItem> list = m_listView->selectedItems(); - QPtrListIterator<QListViewItem> it(list); + TQPtrList<TQListViewItem> list = m_listView->selectedItems(); + TQPtrListIterator<TQListViewItem> it(list); if( list.isEmpty() ) kdDebug() << "nothing to remove" << endl; @@ -147,8 +147,8 @@ void K3bMovixView::slotRemoveItems() void K3bMovixView::slotRemoveSubTitleItems() { - QPtrList<QListViewItem> list = m_listView->selectedItems(); - QPtrListIterator<QListViewItem> it(list); + TQPtrList<TQListViewItem> list = m_listView->selectedItems(); + TQPtrListIterator<TQListViewItem> it(list); if( list.isEmpty() ) kdDebug() << "nothing to remove" << endl; @@ -162,7 +162,7 @@ void K3bMovixView::slotRemoveSubTitleItems() void K3bMovixView::slotAddSubTitleFile() { - QListViewItem* item = m_listView->selectedItems().first(); + TQListViewItem* item = m_listView->selectedItems().first(); if( K3bMovixListViewItem* vi = dynamic_cast<K3bMovixListViewItem*>(item) ) { KURL url = KFileDialog::getOpenURL(); @@ -176,9 +176,9 @@ void K3bMovixView::slotAddSubTitleFile() } -K3bProjectBurnDialog* K3bMovixView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bMovixView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bMovixBurnDialog( m_doc, parent, name, true ); + return new K3bMovixBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h index e174b64..3f07c68 100644 --- a/src/projects/k3bmovixview.h +++ b/src/projects/k3bmovixview.h @@ -24,21 +24,22 @@ class K3bMovixDoc; class K3bMovixListView; class KAction; class KPopupMenu; -class QListViewItem; -class QPoint; -class QLineEdit; +class TQListViewItem; +class TQPoint; +class TQLineEdit; class K3bMovixView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bMovixView( K3bMovixDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bMovixView( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); virtual ~K3bMovixView(); private slots: - void slotContextMenuRequested(QListViewItem*, const QPoint& , int ); + void slotContextMenuRequested(TQListViewItem*, const TQPoint& , int ); void slotRemoveItems(); void slotRemoveSubTitleItems(); void showPropertiesDialog(); @@ -46,7 +47,7 @@ class K3bMovixView : public K3bView void slotDocChanged(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); K3bMovixListView* m_listView; @@ -59,7 +60,7 @@ class K3bMovixView : public K3bView KAction* m_actionAddSubTitle; KPopupMenu* m_popupMenu; - QLineEdit* m_volumeIDEdit; + TQLineEdit* m_volumeIDEdit; }; #endif diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index b52c766..3b1964b 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -43,7 +43,7 @@ public: } void run(); void cancel(); - const QCString& signature() const { + const TQCString& signature() const { return m_trm.signature(); } @@ -63,7 +63,7 @@ public: void run(); - void setSignature( const QCString& sig ) { + void setSignature( const TQCString& sig ) { m_sig = sig; } @@ -71,18 +71,18 @@ public: return m_results; } - const QString& title( unsigned int i = 0 ) const { + const TQString& title( unsigned int i = 0 ) const { return m_mb.title( i ); } - const QString& artist( unsigned int i = 0 ) const { + const TQString& artist( unsigned int i = 0 ) const { return m_mb.artist( i ); } private: K3bMusicBrainz m_mb; int m_results; - QCString m_sig; + TQCString m_sig; }; @@ -152,9 +152,9 @@ void K3bMusicBrainzJob::MusicBrainzThread::run() -// cannot use this as parent for the K3bSimpleJobHandler since this has not been constructed yet -K3bMusicBrainzJob::K3bMusicBrainzJob( QWidget* parent, const char* name ) - : K3bJob( new K3bSimpleJobHandler( 0 ), parent, name ), +// cannot use this as tqparent for the K3bSimpleJobHandler since this has not been constructed yet +K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* tqparent, const char* name ) + : K3bJob( new K3bSimpleJobHandler( 0 ), tqparent, name ), m_canceled( false ) { m_trmThread = new TRMThread(); @@ -162,10 +162,10 @@ K3bMusicBrainzJob::K3bMusicBrainzJob( QWidget* parent, const char* name ) m_trmJob = new K3bThreadJob( m_trmThread, this, this ); m_mbJob = new K3bThreadJob( m_mbThread, this, this ); - connect( m_trmJob, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_trmJob, SIGNAL(percent(int)), this, SLOT(slotTrmPercent(int)) ); - connect( m_trmJob, SIGNAL(finished(bool)), this, SLOT(slotTrmJobFinished(bool)) ); - connect( m_mbJob, SIGNAL(finished(bool)), this, SLOT(slotMbJobFinished(bool)) ); + connect( m_trmJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_trmJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotTrmPercent(int)) ); + connect( m_trmJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotTrmJobFinished(bool)) ); + connect( m_mbJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMbJobFinished(bool)) ); } @@ -188,7 +188,7 @@ void K3bMusicBrainzJob::start() m_trmThread->track = m_tracks.first(); emit infoMessage( i18n("Generating fingerprint for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_trmJob->start(); } @@ -215,7 +215,7 @@ void K3bMusicBrainzJob::slotTrmJobFinished( bool success ) // now query musicbrainz m_mbThread->setSignature( m_trmThread->signature() ); emit infoMessage( i18n("Querying MusicBrainz for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_mbJob->start(); } else { @@ -237,29 +237,29 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) if( success ) { // found entries - QStringList resultStrings, resultStringsUnique; + TQStringList resultStrings, resultStringsUnique; for( unsigned int i = 0; i < m_mbThread->results(); ++i ) resultStrings.append( m_mbThread->artist(i) + " - " + m_mbThread->title(i) ); // since we are only using the title and the artist a lot of entries are alike to us // so to not let the user have to choose between two equal entries we trim the list down - for( QStringList::const_iterator it = resultStrings.begin(); + for( TQStringList::const_iterator it = resultStrings.begin(); it != resultStrings.end(); ++it ) - if( resultStringsUnique.find( *it ) == resultStringsUnique.end() ) + if( resultStringsUnique.tqfind( *it ) == resultStringsUnique.end() ) resultStringsUnique.append( *it ); - QString s; + TQString s; bool ok = true; if( resultStringsUnique.count() > 1 ) s = KInputDialog::getItem( i18n("MusicBrainz Query"), i18n("Found multiple matches for track %1 (%2). Please select one.") - .arg(m_tracks.current()->trackNumber()) - .arg(m_tracks.current()->firstSource()->sourceComment()), + .tqarg(m_tracks.current()->trackNumber()) + .tqarg(m_tracks.current()->firstSource()->sourceComment()), resultStringsUnique, 0, false, &ok, - dynamic_cast<QWidget*>(parent()) ); + dynamic_cast<TQWidget*>(tqparent()) ); else s = resultStringsUnique.first(); @@ -273,7 +273,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) // query next track if( m_tracks.next() ) { emit infoMessage( i18n("Generating fingerprint for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_trmThread->track = m_tracks.current(); m_trmJob->start(); } diff --git a/src/projects/k3bmusicbrainzjob.h b/src/projects/k3bmusicbrainzjob.h index 5007a47..4b5a16b 100644 --- a/src/projects/k3bmusicbrainzjob.h +++ b/src/projects/k3bmusicbrainzjob.h @@ -27,7 +27,7 @@ class K3bAudioTrack; class K3bThreadJob; -class QWidget; +class TQWidget; /** @@ -37,13 +37,14 @@ class QWidget; class K3bMusicBrainzJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: /** - * \param parent since we do not use this job with a normal progressdialog we need a widget - * as parent + * \param tqparent since we do not use this job with a normal progressdialog we need a widget + * as tqparent */ - K3bMusicBrainzJob( QWidget* parent = 0, const char* name = 0 ); + K3bMusicBrainzJob( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMusicBrainzJob(); bool hasBeenCanceled() const { return m_canceled; } @@ -62,7 +63,7 @@ class K3bMusicBrainzJob : public K3bJob void start(); void cancel(); - void setTracks( const QPtrList<K3bAudioTrack>& tracks ) { m_tracks = tracks; } + void setTracks( const TQPtrList<K3bAudioTrack>& tracks ) { m_tracks = tracks; } private slots: void slotTrmPercent( int p ); @@ -78,7 +79,7 @@ class K3bMusicBrainzJob : public K3bJob K3bThreadJob* m_trmJob; K3bThreadJob* m_mbJob; - QPtrList<K3bAudioTrack> m_tracks; + TQPtrList<K3bAudioTrack> m_tracks; bool m_canceled; }; diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index 09444b0..419e3a3 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -27,17 +27,17 @@ #include <k3bglobals.h> #include <k3bcore.h> -#include <qstring.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qcheckbox.h> -#include <qtabwidget.h> -#include <qgroupbox.h> -#include <qspinbox.h> -#include <qlabel.h> +#include <tqstring.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqcheckbox.h> +#include <tqtabwidget.h> +#include <tqgroupbox.h> +#include <tqspinbox.h> +#include <tqlabel.h> #include <klocale.h> #include <kconfig.h> @@ -51,8 +51,8 @@ #include <kiconloader.h> -K3bProjectBurnDialog::K3bProjectBurnDialog( K3bDoc* doc, QWidget *parent, const char *name, bool modal, bool dvd ) - : K3bInteractionDialog( parent, name, i18n("Project"), QString::null, +K3bProjectBurnDialog::K3bProjectBurnDialog( K3bDoc* doc, TQWidget *tqparent, const char *name, bool modal, bool dvd ) + : K3bInteractionDialog( tqparent, name, i18n("Project"), TQString(), START_BUTTON|SAVE_BUTTON|CANCEL_BUTTON, START_BUTTON, "default " + doc->typeString() + " settings", modal ), m_writerSelectionWidget(0), @@ -197,12 +197,12 @@ void K3bProjectBurnDialog::slotStartClicked() // // check if the temp dir exists // - QString tempDir = m_tempDirSelectionWidget->tempDirectory(); - if( !QFile::exists( tempDir ) ) { - if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( tempDir ) ) + TQString tempDir = m_tempDirSelectionWidget->tempDirectory(); + if( !TQFile::exists( tempDir ) ) { + if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( tempDir ) ) == KMessageBox::Yes ) { if( !KStandardDirs::makeDir( tempDir ) ) { - KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( tempDir ) ); + KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( tempDir ) ); return; } } @@ -223,9 +223,9 @@ void K3bProjectBurnDialog::slotStartClicked() K3bJobProgressDialog* dlg = 0; if( m_checkOnlyCreateImage && m_checkOnlyCreateImage->isChecked() ) - dlg = new K3bJobProgressDialog( parentWidget() ); + dlg = new K3bJobProgressDialog( tqparentWidget() ); else - dlg = new K3bBurnProgressDialog( parentWidget() ); + dlg = new K3bBurnProgressDialog( tqparentWidget() ); m_job = m_doc->newBurnJob( dlg ); @@ -250,7 +250,7 @@ void K3bProjectBurnDialog::slotStartClicked() void K3bProjectBurnDialog::prepareGui() { - QVBoxLayout* mainLay = new QVBoxLayout( mainWidget() ); + TQVBoxLayout* mainLay = new TQVBoxLayout( mainWidget() ); mainLay->setAutoAdd( true ); mainLay->setMargin( 0 ); mainLay->setSpacing( KDialog::spacingHint() ); @@ -259,19 +259,19 @@ void K3bProjectBurnDialog::prepareGui() m_writerSelectionWidget->setWantedMediumType( m_dvd ? K3bDevice::MEDIA_WRITABLE_DVD : K3bDevice::MEDIA_WRITABLE_CD ); m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_EMPTY ); - m_tabWidget = new QTabWidget( mainWidget() ); + m_tabWidget = new TQTabWidget( mainWidget() ); - QWidget* w = new QWidget( m_tabWidget ); + TQWidget* w = new TQWidget( m_tabWidget ); m_tabWidget->addTab( w, i18n("Writing") ); - QGroupBox* groupWritingMode = new QGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), w ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), w ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - m_optionGroup = new QGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); - m_optionGroup->layout()->setMargin(0); - m_optionGroup->layout()->setSpacing(0); - m_optionGroupLayout = new QVBoxLayout( m_optionGroup->layout() ); + m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); + m_optionGroup->tqlayout()->setMargin(0); + m_optionGroup->tqlayout()->setSpacing(0); + m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->tqlayout() ); m_optionGroupLayout->setMargin( KDialog::marginHint() ); m_optionGroupLayout->setSpacing( KDialog::spacingHint() ); @@ -286,16 +286,16 @@ void K3bProjectBurnDialog::prepareGui() m_optionGroupLayout->addWidget(m_checkOnlyCreateImage); m_optionGroupLayout->addWidget(m_checkRemoveBufferFiles); - QGroupBox* groupCopies = new QGroupBox( 2, Qt::Horizontal, i18n("Copies"), w ); + TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), w ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); - QLabel* pixLabel = new QLabel( groupCopies ); + TQLabel* pixLabel = new TQLabel( groupCopies ); pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) ); pixLabel->setScaledContents( false ); - m_spinCopies = new QSpinBox( 1, 999, 1, groupCopies ); + m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies ); // arrange it - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( KDialog::marginHint() ); grid->setSpacing( KDialog::spacingHint() ); @@ -306,8 +306,8 @@ void K3bProjectBurnDialog::prepareGui() grid->setRowStretch( 1, 1 ); grid->setColStretch( 1, 1 ); - QWidget* tempW = new QWidget( m_tabWidget ); - grid = new QGridLayout( tempW ); + TQWidget* tempW = new TQWidget( m_tabWidget ); + grid = new TQGridLayout( tempW ); grid->setMargin( KDialog::marginHint() ); grid->setSpacing( KDialog::spacingHint() ); m_tabWidget->addTab( tempW, i18n("Image") ); @@ -321,18 +321,18 @@ void K3bProjectBurnDialog::prepareGui() setTabOrder( groupCopies, m_optionGroup ); // some default connections that should always be useful - connect( m_writerSelectionWidget, SIGNAL(writerChanged()), this, SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, SLOT(slotWritingAppChanged(int)) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_checkSimulate, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQT_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotWritingAppChanged(int)) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); } -void K3bProjectBurnDialog::addPage( QWidget* page, const QString& title ) +void K3bProjectBurnDialog::addPage( TQWidget* page, const TQString& title ) { m_tabWidget->addTab( page, title ); } diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h index f011ae8..2e7f32f 100644 --- a/src/projects/k3bprojectburndialog.h +++ b/src/projects/k3bprojectburndialog.h @@ -24,11 +24,11 @@ class K3bDoc; class K3bBurnJob; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; -class QGroupBox; -class QCheckBox; -class QTabWidget; -class QSpinBox; -class QVBoxLayout; +class TQGroupBox; +class TQCheckBox; +class TQTabWidget; +class TQSpinBox; +class TQVBoxLayout; class K3bWritingModeWidget; class KConfigBase; @@ -39,9 +39,10 @@ class KConfigBase; class K3bProjectBurnDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bProjectBurnDialog( K3bDoc* doc, QWidget *parent=0, const char *name=0, + K3bProjectBurnDialog( K3bDoc* doc, TQWidget *tqparent=0, const char *name=0, bool modal = true, bool dvd = false ); ~K3bProjectBurnDialog(); @@ -162,7 +163,7 @@ class K3bProjectBurnDialog : public K3bInteractionDialog void prepareGui(); - void addPage( QWidget*, const QString& title ); + void addPage( TQWidget*, const TQString& title ); /** * Call this if you must reimplement it. @@ -173,18 +174,18 @@ class K3bProjectBurnDialog : public K3bInteractionDialog K3bWriterSelectionWidget* m_writerSelectionWidget; K3bTempDirSelectionWidget* m_tempDirSelectionWidget; K3bWritingModeWidget* m_writingModeWidget; - QGroupBox* m_optionGroup; - QVBoxLayout* m_optionGroupLayout; - QCheckBox* m_checkCacheImage; - QCheckBox* m_checkSimulate; - QCheckBox* m_checkRemoveBufferFiles; - QCheckBox* m_checkOnlyCreateImage; - QSpinBox* m_spinCopies; + TQGroupBox* m_optionGroup; + TQVBoxLayout* m_optionGroupLayout; + TQCheckBox* m_checkCacheImage; + TQCheckBox* m_checkSimulate; + TQCheckBox* m_checkRemoveBufferFiles; + TQCheckBox* m_checkOnlyCreateImage; + TQSpinBox* m_spinCopies; private: K3bDoc* m_doc; K3bBurnJob* m_job; - QTabWidget* m_tabWidget; + TQTabWidget* m_tabWidget; bool m_dvd; }; diff --git a/src/projects/k3bprojectplugindialog.cpp b/src/projects/k3bprojectplugindialog.cpp index a28f563..4a6d1fb 100644 --- a/src/projects/k3bprojectplugindialog.cpp +++ b/src/projects/k3bprojectplugindialog.cpp @@ -17,13 +17,13 @@ #include <k3bprojectplugin.h> -#include <qwidget.h> +#include <tqwidget.h> -K3bProjectPluginDialog::K3bProjectPluginDialog( K3bProjectPlugin* plugin, K3bDoc* doc, QWidget* parent, const char* name ) - : K3bInteractionDialog( parent, name, - QString::null, - QString::null, +K3bProjectPluginDialog::K3bProjectPluginDialog( K3bProjectPlugin* plugin, K3bDoc* doc, TQWidget* tqparent, const char* name ) + : K3bInteractionDialog( tqparent, name, + TQString(), + TQString(), START_BUTTON|CANCEL_BUTTON, START_BUTTON, plugin->className() ), diff --git a/src/projects/k3bprojectplugindialog.h b/src/projects/k3bprojectplugindialog.h index f2250d7..6a213fa 100644 --- a/src/projects/k3bprojectplugindialog.h +++ b/src/projects/k3bprojectplugindialog.h @@ -27,9 +27,10 @@ class KConfigBase; class K3bProjectPluginDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bProjectPluginDialog( K3bProjectPlugin*, K3bDoc*, QWidget*, const char* name = 0 ); + K3bProjectPluginDialog( K3bProjectPlugin*, K3bDoc*, TQWidget*, const char* name = 0 ); ~K3bProjectPluginDialog(); protected slots: diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 3c45c14..07c7b85 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -13,19 +13,19 @@ * See the file "COPYING" for the exact licensing terms. */ -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qspinbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qgrid.h> -#include <qtoolbutton.h> -#include <qfileinfo.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqspinbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqgrid.h> +#include <tqtoolbutton.h> +#include <tqfileinfo.h> #include <klocale.h> #include <kconfig.h> @@ -47,14 +47,14 @@ #include <k3bexternalbinmanager.h> #include <k3bvalidators.h> -K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, parent, name, modal ) +K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, tqparent, name, modal ) { m_vcdDoc = _doc; prepareGui(); - QString vcdType; + TQString vcdType; switch ( m_vcdDoc->vcdType() ) { case K3bVcdDoc::VCD11: vcdType = i18n( "Video CD (Version 1.1)" ); @@ -62,14 +62,14 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char vcdType = i18n( "Video CD (Version 2.0)" ); case K3bVcdDoc::SVCD10: vcdType = i18n( "Super Video CD" ); - case K3bVcdDoc::HQVCD: + case K3bVcdDoc::HTQVCD: vcdType = i18n( "High-Quality Video CD" ); default: vcdType = i18n( "Video CD" ); } setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)", - m_vcdDoc->tracks() ->count() ).arg( KIO::convertSize( m_vcdDoc->size() ) ) ); + m_vcdDoc->tracks() ->count() ).tqarg( KIO::convertSize( m_vcdDoc->size() ) ) ); const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" ); if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) ) @@ -79,77 +79,77 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char m_checkCacheImage->hide(); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); setupVideoCdTab(); setupLabelTab(); setupAdvancedTab(); - connect( m_spinVolumeCount, SIGNAL( valueChanged( int ) ), this, SLOT( slotSpinVolumeCount() ) ); - connect( m_groupVcdFormat, SIGNAL( clicked( int ) ), this, SLOT( slotVcdTypeClicked( int ) ) ); - connect( m_checkCdiSupport, SIGNAL( toggled( bool ) ), this, SLOT( slotCdiSupportChecked( bool ) ) ); - connect( m_checkAutoDetect, SIGNAL( toggled( bool ) ), this, SLOT( slotAutoDetect( bool ) ) ); - connect( m_checkGaps, SIGNAL( toggled( bool ) ), this, SLOT( slotGapsChecked( bool ) ) ); + connect( m_spinVolumeCount, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotSpinVolumeCount() ) ); + connect( m_groupVcdFormat, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotVcdTypeClicked( int ) ) ); + connect( m_checkCdiSupport, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotCdiSupportChecked( bool ) ) ); + connect( m_checkAutoDetect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotAutoDetect( bool ) ) ); + connect( m_checkGaps, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotGapsChecked( bool ) ) ); // ToolTips // ------------------------------------------------------------------------- - QToolTip::add - ( m_radioVcd11, i18n( "Select Video CD type %1" ).arg( "(VCD 1.1)" ) ); - QToolTip::add - ( m_radioVcd20, i18n( "Select Video CD type %1" ).arg( "(VCD 2.0)" ) ); - QToolTip::add - ( m_radioSvcd10, i18n( "Select Video CD type %1" ).arg( "(SVCD 1.0)" ) ); - QToolTip::add - ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).arg( "(HQ-VCD 1.0)" ) ); - QToolTip::add + TQToolTip::add + ( m_radioVcd11, i18n( "Select Video CD type %1" ).tqarg( "(VCD 1.1)" ) ); + TQToolTip::add + ( m_radioVcd20, i18n( "Select Video CD type %1" ).tqarg( "(VCD 2.0)" ) ); + TQToolTip::add + ( m_radioSvcd10, i18n( "Select Video CD type %1" ).tqarg( "(SVCD 1.0)" ) ); + TQToolTip::add + ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).tqarg( "(HQ-VCD 1.0)" ) ); + TQToolTip::add ( m_checkAutoDetect, i18n( "Automatic video type recognition." ) ); - QToolTip::add + TQToolTip::add ( m_checkNonCompliant, i18n( "Non-compliant compatibility mode for broken devices" ) ); - QToolTip::add + TQToolTip::add ( m_checkVCD30interpretation, i18n( "Chinese VCD3.0 track interpretation" ) ); - QToolTip::add + TQToolTip::add ( m_check2336, i18n( "Use 2336 byte sectors for output" ) ); - QToolTip::add + TQToolTip::add ( m_editVolumeId, i18n( "Specify ISO volume label for Video CD" ) ); - QToolTip::add + TQToolTip::add ( m_editAlbumId, i18n( "Specify album id for VideoCD set" ) ); - QToolTip::add + TQToolTip::add ( m_spinVolumeNumber, i18n( "Specify album set sequence number ( <= volume-count )" ) ); - QToolTip::add + TQToolTip::add ( m_spinVolumeCount, i18n( "Specify number of volumes in album set" ) ); - QToolTip::add + TQToolTip::add ( m_checkCdiSupport, i18n( "Enable CD-i Application Support for VideoCD Type 1.1 & 2.0" ) ); - QToolTip::add + TQToolTip::add ( m_editCdiCfg, i18n( "Configuration parameters (only for VCD 2.0)" ) ); - QToolTip::add + TQToolTip::add ( m_checkPbc, i18n( "Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 disc formats." ) ); - QToolTip::add + TQToolTip::add ( m_checkSegmentFolder, i18n( "Add always an empty `/SEGMENT' directory" ) ); - QToolTip::add + TQToolTip::add ( m_checkRelaxedAps, i18n( "This controls whether APS constraints are strict or relaxed. " ) ); - QToolTip::add + TQToolTip::add ( m_checkUpdateScanOffsets, i18n( "This controls whether to update the scan data information contained in the MPEG-2 video streams." ) ); - QToolTip::add + TQToolTip::add ( m_labelRestriction, i18n( "This element allows to set viewing restrictions which may be interpreted by the playing device." ) ); - QToolTip::add + TQToolTip::add ( m_checkGaps, i18n( "This option allows customization of Gaps and Margins." ) ); - QToolTip::add + TQToolTip::add ( m_labelPreGapLeadout, i18n( "Used to set the number of empty sectors added before the lead-out area begins." ) ); - QToolTip::add + TQToolTip::add ( m_labelPreGapTrack, i18n( "Used to set the track pre-gap for all tracks in sectors globally." ) ); - QToolTip::add + TQToolTip::add ( m_labelFrontMarginTrack, i18n( "Sets the front margin for sequence items." ) ); - QToolTip::add + TQToolTip::add ( m_labelRearMarginTrack, i18n( "Sets the rear margin for sequence items." ) ); // What's This info // ------------------------------------------------------------------------- - QWhatsThis::add + TQWhatsThis::add ( m_radioVcd11, i18n( "<p>This is the most basic <b>Video CD</b> specification dating back to 1993, which has the following characteristics:" "<ul><li>One mode2 mixed form ISO-9660 track containing file pointers to the information areas.</li>" "<li>Up to 98 multiplex-ed MPEG-1 audio/video streams or CD-DA audio tracks.</li>" @@ -161,7 +161,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<p>The CBR MPEG-1, layer II audio stream is fixed at 224 kbps with 1 stereo or 2 mono channels." "<p><b>It is recommended to keep the video bit-rate under 1151929.1 bps.</b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_radioVcd20, i18n( "<p>About two years after the Video CD 1.1 specification came out, an improved <b>Video CD 2.0</b> standard was published in 1995." "<p>This one added the following items to the features already available in the Video CD 1.1 specification:" "<ul><li>Support for MPEG segment play items (<b>\"SPI\"</b>), consisting of still pictures, motion pictures and/or audio (only) streams was added.</li>" @@ -180,7 +180,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<p>Also the possibility to have audio only streams and still pictures was provided." "<p><b>The bit-rate of multiplex-ed streams should be kept under 174300 bytes/sec (except for single still picture items) in order to accommodate single speed drives.</b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_radioSvcd10, i18n( "<p>With the upcoming of the DVD-V media, a new VCD standard had to be published in order to be able to keep up with technology, so the Super Video CD specification was called into life 1999." "<p>In the midst of 2000 a full subset of this <b>Super Video CD</b> specification was published as <b>IEC-62107</b>." "<p>As the most notable change over Video CD 2.0 is a switch from MPEG-1 CBR to MPEG-2 VBR encoding for the video stream was performed." @@ -194,7 +194,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<ul><li>480 x 480 @ 29.97 Hz (NTSC 2/3 D-2).</li>" "<li>480 x 576 @ 25 Hz (PAL 2/3 D-2).</li></ul>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_radioHqVcd10, i18n( "<p>This is actually just a minor variation defined in IEC-62107 on the Super Video CD 1.0 format for compatibility with current products in the market." "<p>It differs from the Super Video CD 1.0 format in the following items:" "<ul><li>The system profile tag field in <b>/SVCD/INFO.SVD</b> is set to <b>1</b> instead of <b>0</b>.</li>" @@ -202,59 +202,59 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<li><b>/EXT/SCANDATA.DAT</b> is mandatory instead of being optional.</li>" "<li><b>/SVCD/SEARCH.DAT</b> is optional instead of being mandatory.</li></ul>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkAutoDetect, i18n( "<p>If Autodetect is:</p>" "<ul><li>ON then K3b will set the correct VideoCD type.</li>" "<li>OFF then the correct VideoCD type needs to be set by the user.</li></ul>" "<p>If you are not sure about the correct VideoCD type, it is best to turn Autodetect ON.</p>" "<p>If you want to force the VideoCD type, you must turn Autodetect OFF. This is useful for some standalone DVD players without SVCD support.</p>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkNonCompliant, i18n( "<ul><li>Rename <b>\"/MPEG2\"</b> folder on SVCDs to (non-compliant) \"/MPEGAV\".</li>" "<li>Enables the use of the (deprecated) signature <b>\"ENTRYSVD\"</b> instead of <b>\"ENTRYVCD\"</b> for the file <b>\"/SVCD/ENTRY.SVD\"</b>.</li></ul>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkVCD30interpretation, i18n( "<ul><li>Enables the use of the (deprecated) Chinese <b>\"/SVCD/TRACKS.SVD\"</b> format which differs from the format defined in the <b>IEC-62107</b> specification.</li></ul>" "<p><b>The differences are most exposed on SVCDs containing more than one video track.</b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check2336, i18n( "<p>though most devices will have problems with such an out-of-specification media." "<p><b>You may want use this option for images longer than 80 minutes</b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkCdiSupport, i18n( "<p>To allow the play of Video-CDs on a CD-i player, the Video-CD standard requires that a CD-i application program must be present." "<p>This program is designed to:" "<ul><li>provide full play back control as defined in the PSD of the standard</l>" "<li>be extremely simple to use and easy-to-learn for the end-user</li></ul>" "<p>The program runs on CD-i players equipped with the CDRTOS 1.1(.1) operating system and a Digital Video extension cartridge." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_editCdiCfg, i18n( "<p>Configuration parameters only available for VideoCD 2.0" "<p>The engine works perfectly well when used as-is." "<p>You have the option to configure the VCD application." - "<p>You can adapt the color and/or the shape of the cursor and lots more." ) ); + "<p>You can adapt the color and/or the tqshape of the cursor and lots more." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkPbc, i18n( "<p>Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 disc formats." "<p>PBC allows control of the playback of play items and the possibility of interaction with the user through the remote control or some other input device available." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkSegmentFolder, i18n( "<p>Here you can specify that the folder <b>SEGMENT</b> should always be present." "<p>Some DVD players need the folder to give a faultless rendition." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkRelaxedAps, i18n( "<p>An Access Point Sector, APS, is an MPEG video sector on the VCD/SVCD which is suitable to be jumped to directly." "<p>APS are required for entry points and scantables. APS have to fulfil the requirement to precede every I-frame by a GOP header which shall be preceded by a sequence header in its turn." "<p>The start codes of these 3 items are required to be contained all in the same MPEG pack/sector, thus forming a so-called access point sector." "<p>This requirement can be relaxed by enabling the relaxed aps option, i.e. every sector containing an I-frame will be regarded as an APS." "<p><b>Warning:</b> The sequence header is needed for a playing device to figure out display parameters, such as display resolution and frame rate, relaxing the aps requirement may lead to non-working entry points." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkUpdateScanOffsets, i18n( "<p>According to the specification, it is mandatory for Super Video CDs to encode scan information data into user data blocks in the picture layer of all intra coded picture." "<p>It can be used by playing devices for implementing fast forward & fast reverse scanning." "<p>The already existing scan information data can be updated by enabling the update scan offsets option." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelRestriction, i18n( "<p>Viewing Restriction may be interpreted by the playing device." "<p>The allowed range goes from 0 to 3." "<ul><li>0 = unrestricted, free to view for all</li>" @@ -262,25 +262,25 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<p>Actually, the exact meaning is not defined and is player dependant." "<p><b>Most players ignore that value.<b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkGaps, i18n( "<p>This option allows customization of Gaps and Margins." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelPreGapLeadout, i18n( "<p>This option allows to set the number of empty sectors added before the lead-out area begins, i.e. the number of post-gap sectors." "<p>The ECMA-130 specification requires the last data track before the lead-out to carry a post-gap of at least 150 sectors, which is used as default for this parameter." "<p>Some operating systems may encounter I/O errors due to read-ahead issues when reading the last MPEG track if this parameter is set too low." "<p>Allowed value content: [0..300]. Default: 150." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelPreGapTrack, i18n( "<p>Used to set the track pre-gap for all tracks in sectors globally." "<p>The specification requires the pre-gaps to be at least 150 sectors long." "<p>Allowed value content: [0..300]. Default: 150." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelFrontMarginTrack, i18n( "Margins are used to compensate for inaccurate sector-addressing issues on CD-ROM media. Interestingly, they have been abandoned for Super Video CDs." "<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors long." "<p>Allowed value content: [0..150]. Default: 30 for Video CD 1.0/1.1/2.0, otherwise (i.e. Super Video CD 1.0 and HQ-VCD 1.0) 0." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelRearMarginTrack, i18n( "<p>Margins are used to compensate for inaccurate sector-addressing issues on CD-ROM media. Interestingly, they have been abandoned for Super Video CDs." "<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors long." "<p>Allowed value content: [0..150]. Default: 45 for Video CD 1.0/1.1/2.0, otherwise 0." ) ); @@ -293,52 +293,52 @@ K3bVcdBurnDialog::~K3bVcdBurnDialog() void K3bVcdBurnDialog::setupAdvancedTab() { - QWidget * w = new QWidget( this ); + TQWidget * w = new TQWidget( this ); // ---------------------------------------------------- generic group ---- - m_groupGeneric = new QGroupBox( 5, Qt::Vertical, i18n( "Generic" ), w ); + m_groupGeneric = new TQGroupBox( 5, Qt::Vertical, i18n( "Generic" ), w ); - m_checkPbc = new QCheckBox( i18n( "Playback Control (PBC)" ), m_groupGeneric ); - m_checkSegmentFolder = new QCheckBox( i18n( "SEGMENT Folder must always be present" ), m_groupGeneric ); - m_checkRelaxedAps = new QCheckBox( i18n( "Relaxed aps" ), m_groupGeneric ); - m_checkUpdateScanOffsets = new QCheckBox( i18n( "Update scan offsets" ), m_groupGeneric ); + m_checkPbc = new TQCheckBox( i18n( "Playback Control (PBC)" ), m_groupGeneric ); + m_checkSegmentFolder = new TQCheckBox( i18n( "SEGMENT Folder must always be present" ), m_groupGeneric ); + m_checkRelaxedAps = new TQCheckBox( i18n( "Relaxed aps" ), m_groupGeneric ); + m_checkUpdateScanOffsets = new TQCheckBox( i18n( "Update scan offsets" ), m_groupGeneric ); m_checkUpdateScanOffsets->setEnabled( false ); // -------------------------------------------- gaps & margins group ---- - m_groupGaps = new QGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); - m_groupGaps->layout() ->setSpacing( spacingHint() ); - m_groupGaps->layout() ->setMargin( marginHint() ); + m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); + m_groupGaps->tqlayout() ->setSpacing( spacingHint() ); + m_groupGaps->tqlayout() ->setMargin( marginHint() ); - QGridLayout* groupGapsLayout = new QGridLayout( m_groupGaps->layout() ); - groupGapsLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() ); + groupGapsLayout->tqsetAlignment( TQt::AlignTop ); - m_checkGaps = new QCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); + m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); - m_labelPreGapLeadout = new QLabel( i18n( "Leadout pre gap (0..300):" ), m_groupGaps, "labelPreGapLeadout" ); - m_spinPreGapLeadout = new QSpinBox( m_groupGaps, "m_spinPreGapLeadout" ); + m_labelPreGapLeadout = new TQLabel( i18n( "Leadout pre gap (0..300):" ), m_groupGaps, "labelPreGapLeadout" ); + m_spinPreGapLeadout = new TQSpinBox( m_groupGaps, "m_spinPreGapLeadout" ); m_spinPreGapLeadout->setMinValue( 0 ); m_spinPreGapLeadout->setMaxValue( 300 ); - m_labelPreGapTrack = new QLabel( i18n( "Track pre gap (0..300):" ), m_groupGaps, "labelPreGapTrack" ); - m_spinPreGapTrack = new QSpinBox( m_groupGaps, "m_spinPreGapTrack" ); + m_labelPreGapTrack = new TQLabel( i18n( "Track pre gap (0..300):" ), m_groupGaps, "labelPreGapTrack" ); + m_spinPreGapTrack = new TQSpinBox( m_groupGaps, "m_spinPreGapTrack" ); m_spinPreGapTrack->setMinValue( 0 ); m_spinPreGapTrack->setMaxValue( 300 ); - m_labelFrontMarginTrack = new QLabel( i18n( "Track front margin (0..150):" ), m_groupGaps, "labelFrontMarginTrack" ); - m_spinFrontMarginTrack = new QSpinBox( m_groupGaps, "m_spinFrontMarginTrack" ); + m_labelFrontMarginTrack = new TQLabel( i18n( "Track front margin (0..150):" ), m_groupGaps, "labelFrontMarginTrack" ); + m_spinFrontMarginTrack = new TQSpinBox( m_groupGaps, "m_spinFrontMarginTrack" ); m_spinFrontMarginTrack->setMinValue( 0 ); m_spinFrontMarginTrack->setMaxValue( 150 ); - m_spinFrontMarginTrackSVCD = new QSpinBox( m_groupGaps, "m_spinFrontMarginTrackSVCD" ); + m_spinFrontMarginTrackSVCD = new TQSpinBox( m_groupGaps, "m_spinFrontMarginTrackSVCD" ); m_spinFrontMarginTrackSVCD->setMinValue( 0 ); m_spinFrontMarginTrackSVCD->setMaxValue( 150 ); m_spinFrontMarginTrackSVCD->setHidden( true ); - m_labelRearMarginTrack = new QLabel( i18n( "Track rear margin (0..150):" ), m_groupGaps, "labelRearMarginTrack" ); - m_spinRearMarginTrack = new QSpinBox( m_groupGaps, "m_spinRearMarginTrack" ); + m_labelRearMarginTrack = new TQLabel( i18n( "Track rear margin (0..150):" ), m_groupGaps, "labelRearMarginTrack" ); + m_spinRearMarginTrack = new TQSpinBox( m_groupGaps, "m_spinRearMarginTrack" ); m_spinRearMarginTrack->setMinValue( 0 ); m_spinRearMarginTrack->setMaxValue( 150 ); - m_spinRearMarginTrackSVCD = new QSpinBox( m_groupGaps, "m_spinRearMarginTrackSVCD" ); + m_spinRearMarginTrackSVCD = new TQSpinBox( m_groupGaps, "m_spinRearMarginTrackSVCD" ); m_spinRearMarginTrackSVCD->setMinValue( 0 ); m_spinRearMarginTrackSVCD->setMaxValue( 150 ); m_spinRearMarginTrackSVCD->setHidden( true ); @@ -402,15 +402,15 @@ void K3bVcdBurnDialog::setupAdvancedTab() groupGapsLayout->setRowStretch( 4, 0 ); // ------------------------------------------------------- misc group ---- - m_groupMisc = new QGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); - m_groupMisc->layout() ->setSpacing( spacingHint() ); - m_groupMisc->layout() ->setMargin( marginHint() ); + m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); + m_groupMisc->tqlayout() ->setSpacing( spacingHint() ); + m_groupMisc->tqlayout() ->setMargin( marginHint() ); - QGridLayout* groupMiscLayout = new QGridLayout( m_groupMisc->layout() ); - groupMiscLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() ); + groupMiscLayout->tqsetAlignment( TQt::AlignTop ); - m_labelRestriction = new QLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); - m_spinRestriction = new QSpinBox( m_groupMisc, "m_spinRestriction" ); + m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); + m_spinRestriction = new TQSpinBox( m_groupMisc, "m_spinRestriction" ); m_spinRestriction->setMinValue( 0 ); m_spinRestriction->setMaxValue( 3 ); @@ -419,7 +419,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() groupMiscLayout->setRowStretch( 2, 0 ); // ---------------------------------------------------------------------- - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); grid->addWidget( m_groupGeneric, 0, 0 ); @@ -431,42 +431,42 @@ void K3bVcdBurnDialog::setupAdvancedTab() void K3bVcdBurnDialog::setupVideoCdTab() { - QWidget * w = new QWidget( this ); + TQWidget * w = new TQWidget( this ); // ---------------------------------------------------- Format group ---- - m_groupVcdFormat = new QButtonGroup( 4, Qt::Vertical, i18n( "Type" ), w ); - m_radioVcd11 = new QRadioButton( i18n( "VideoCD 1.1" ), m_groupVcdFormat ); - m_radioVcd20 = new QRadioButton( i18n( "VideoCD 2.0" ), m_groupVcdFormat ); - m_radioSvcd10 = new QRadioButton( i18n( "Super-VideoCD" ), m_groupVcdFormat ); - m_radioHqVcd10 = new QRadioButton( i18n( "HQ-VideoCD" ), m_groupVcdFormat ); + m_groupVcdFormat = new TQButtonGroup( 4, Qt::Vertical, i18n( "Type" ), w ); + m_radioVcd11 = new TQRadioButton( i18n( "VideoCD 1.1" ), m_groupVcdFormat ); + m_radioVcd20 = new TQRadioButton( i18n( "VideoCD 2.0" ), m_groupVcdFormat ); + m_radioSvcd10 = new TQRadioButton( i18n( "Super-VideoCD" ), m_groupVcdFormat ); + m_radioHqVcd10 = new TQRadioButton( i18n( "HQ-VideoCD" ), m_groupVcdFormat ); m_groupVcdFormat->setExclusive( true ); // ---------------------------------------------------- Options group --- - m_groupOptions = new QGroupBox( 5, Qt::Vertical, i18n( "Settings" ), w ); - m_checkAutoDetect = new QCheckBox( i18n( "Autodetect VideoCD type" ), m_groupOptions ); + m_groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n( "Settings" ), w ); + m_checkAutoDetect = new TQCheckBox( i18n( "Autodetect VideoCD type" ), m_groupOptions ); - m_checkNonCompliant = new QCheckBox( i18n( "Enable broken SVCD mode" ), m_groupOptions ); + m_checkNonCompliant = new TQCheckBox( i18n( "Enable broken SVCD mode" ), m_groupOptions ); // Only available on SVCD Type m_checkNonCompliant->setEnabled( false ); m_checkNonCompliant->setChecked( false ); - m_checkVCD30interpretation = new QCheckBox( i18n( "Enable %1 track interpretation" ).arg( "VCD 3.0" ), m_groupOptions ); + m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).tqarg( "VCD 3.0" ), m_groupOptions ); // Only available on SVCD Type m_checkVCD30interpretation->setEnabled( false ); m_checkVCD30interpretation->setChecked( false ); - m_check2336 = new QCheckBox( i18n( "Use 2336 byte sectors" ), m_groupOptions ); + m_check2336 = new TQCheckBox( i18n( "Use 2336 byte sectors" ), m_groupOptions ); - m_checkCdiSupport = new QCheckBox( i18n( "Enable CD-i support" ), m_groupOptions ); + m_checkCdiSupport = new TQCheckBox( i18n( "Enable CD-i support" ), m_groupOptions ); // ------------------------------------------------- CD-i Application --- - m_groupCdi = new QGroupBox( 4, Qt::Vertical, i18n( "VideoCD on CD-i" ), w ); - m_editCdiCfg = new QMultiLineEdit( m_groupCdi, "m_editCdiCfg" ); - m_editCdiCfg->setFrameShape( QTextEdit::NoFrame ); + m_groupCdi = new TQGroupBox( 4, Qt::Vertical, i18n( "VideoCD on CD-i" ), w ); + m_editCdiCfg = new TQMultiLineEdit( m_groupCdi, "m_editCdiCfg" ); + m_editCdiCfg->setFrameShape( TQTextEdit::NoFrame ); // ---------------------------------------------------------------------- - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); grid->addMultiCellWidget( m_groupVcdFormat, 0, 1, 0, 0 ); @@ -478,60 +478,60 @@ void K3bVcdBurnDialog::setupVideoCdTab() void K3bVcdBurnDialog::setupLabelTab() { - QWidget * w = new QWidget( this ); + TQWidget * w = new TQWidget( this ); // ---------------------------------------------------------------------- // noEdit - QLabel* labelSystemId = new QLabel( i18n( "System:" ), w, "labelSystemId" ); - QLabel* labelApplicationId = new QLabel( i18n( "Application:" ), w, "labelApplicationId" ); - QLabel* labelInfoSystemId = new QLabel( vcdDoc() ->vcdOptions() ->systemId(), w, "labelInfoSystemId" ); - QLabel* labelInfoApplicationId = new QLabel( vcdDoc() ->vcdOptions() ->applicationId(), w, "labelInfoApplicationId" ); + TQLabel* labelSystemId = new TQLabel( i18n( "System:" ), w, "labelSystemId" ); + TQLabel* labelApplicationId = new TQLabel( i18n( "Application:" ), w, "labelApplicationId" ); + TQLabel* labelInfoSystemId = new TQLabel( vcdDoc() ->vcdOptions() ->systemId(), w, "labelInfoSystemId" ); + TQLabel* labelInfoApplicationId = new TQLabel( vcdDoc() ->vcdOptions() ->applicationId(), w, "labelInfoApplicationId" ); - labelInfoSystemId->setFrameShape( QLabel::LineEditPanel ); - labelInfoSystemId->setFrameShadow( QLabel::Sunken ); + labelInfoSystemId->setFrameShape( TQLabel::LineEditPanel ); + labelInfoSystemId->setFrameShadow( TQLabel::Sunken ); - labelInfoApplicationId->setFrameShape( QLabel::LineEditPanel ); - labelInfoApplicationId->setFrameShadow( QLabel::Sunken ); - QToolTip::add + labelInfoApplicationId->setFrameShape( TQLabel::LineEditPanel ); + labelInfoApplicationId->setFrameShadow( TQLabel::Sunken ); + TQToolTip::add ( labelInfoApplicationId, i18n( "ISO application id for VideoCD" ) ); // ---------------------------------------------------------------------- - QLabel* labelVolumeId = new QLabel( i18n( "&Volume name:" ), w, "labelVolumeId" ); - QLabel* labelAlbumId = new QLabel( i18n( "Volume &set name:" ), w, "labelAlbumId" ); - QLabel* labelVolumeCount = new QLabel( i18n( "Volume set s&ize:" ), w, "labelVolumeCount" ); - QLabel* labelVolumeNumber = new QLabel( i18n( "Volume set &number:" ), w, "labelVolumeNumber" ); - QLabel* labelPublisher = new QLabel( i18n( "&Publisher:" ), w, "labelPublisher" ); + TQLabel* labelVolumeId = new TQLabel( i18n( "&Volume name:" ), w, "labelVolumeId" ); + TQLabel* labelAlbumId = new TQLabel( i18n( "Volume &set name:" ), w, "labelAlbumId" ); + TQLabel* labelVolumeCount = new TQLabel( i18n( "Volume set s&ize:" ), w, "labelVolumeCount" ); + TQLabel* labelVolumeNumber = new TQLabel( i18n( "Volume set &number:" ), w, "labelVolumeNumber" ); + TQLabel* labelPublisher = new TQLabel( i18n( "&Publisher:" ), w, "labelPublisher" ); - m_editVolumeId = new QLineEdit( w, "m_editVolumeId" ); - m_editAlbumId = new QLineEdit( w, "m_editAlbumId" ); - m_spinVolumeNumber = new QSpinBox( w, "m_editVolumeNumber" ); - m_spinVolumeCount = new QSpinBox( w, "m_editVolumeCount" ); - m_editPublisher = new QLineEdit( w, "m_editPublisher" ); + m_editVolumeId = new TQLineEdit( w, "m_editVolumeId" ); + m_editAlbumId = new TQLineEdit( w, "m_editAlbumId" ); + m_spinVolumeNumber = new TQSpinBox( w, "m_editVolumeNumber" ); + m_spinVolumeCount = new TQSpinBox( w, "m_editVolumeCount" ); + m_editPublisher = new TQLineEdit( w, "m_editPublisher" ); // only ISO646 d-Characters - m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); - m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); + m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); + m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); m_editVolumeId->setMaxLength( 32 ); m_editAlbumId->setMaxLength( 16 ); // only ISO646 a-Characters - m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, m_editVolumeId ) ); + m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, TQT_TQOBJECT(m_editVolumeId) ) ); m_editPublisher->setMaxLength( 128 ); m_spinVolumeNumber->setMinValue( 1 ); m_spinVolumeNumber->setMaxValue( 1 ); m_spinVolumeCount->setMinValue( 1 ); - QFrame* line = new QFrame( w ); - line->setFrameShape( QFrame::HLine ); - line->setFrameShadow( QFrame::Sunken ); - line->setFrameShape( QFrame::HLine ); + TQFrame* line = new TQFrame( w ); + line->setFrameShape( TQFrame::HLine ); + line->setFrameShadow( TQFrame::Sunken ); + line->setFrameShape( TQFrame::HLine ); // ---------------------------------------------------------------------- - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); @@ -579,8 +579,8 @@ void K3bVcdBurnDialog::setupLabelTab() void K3bVcdBurnDialog::slotStartClicked() { - if ( QFile::exists( vcdDoc() ->vcdImage() ) ) { - if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).arg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") ) + if ( TQFile::exists( vcdDoc() ->vcdImage() ) ) { + if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).tqarg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") ) != KMessageBox::Continue ) return ; } @@ -619,7 +619,7 @@ void K3bVcdBurnDialog::loadK3bDefaults() m_checkCdiSupport->setEnabled( false ); m_checkCdiSupport->setChecked( false ); m_checkUpdateScanOffsets->setEnabled( true ); - m_editVolumeId->setText( "HQ_VIDEOCD" ); + m_editVolumeId->setText( "HTQ_VIDEOCD" ); } else { m_checkCdiSupport->setEnabled( true ); m_checkCdiSupport->setChecked( o.CdiSupport() ); @@ -720,7 +720,7 @@ void K3bVcdBurnDialog::readSettings() m_checkNonCompliant->setEnabled( true ); m_checkVCD30interpretation->setEnabled( true ); break; - case K3bVcdDoc::HQVCD: + case K3bVcdDoc::HTQVCD: m_radioHqVcd10->setChecked( true ); break; default: @@ -882,20 +882,20 @@ void K3bVcdBurnDialog::saveUserDefaults( KConfigBase* c ) void K3bVcdBurnDialog::saveCdiConfig() { - QString filename = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); - if ( QFile::exists( filename ) ) - QFile::remove + TQString filename = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); + if ( TQFile::exists( filename ) ) + TQFile::remove ( filename ); - QFile cdi( filename ); + TQFile cdi( filename ); if ( !cdi.open( IO_WriteOnly ) ) return ; - QTextStream s( &cdi ); + TQTextStream s( &cdi ); int i = m_editCdiCfg->numLines(); for ( int j = 0; j < i; j++ ) - s << QString( "%1" ).arg( m_editCdiCfg->textLine( j ) ) << "\n"; + s << TQString( "%1" ).tqarg( m_editCdiCfg->textLine( j ) ) << "\n"; cdi.close(); @@ -904,15 +904,15 @@ void K3bVcdBurnDialog::saveCdiConfig() void K3bVcdBurnDialog::loadCdiConfig() { - QString filename = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); - if ( QFile::exists( filename ) ) { - QFile cdi( filename ); + TQString filename = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); + if ( TQFile::exists( filename ) ) { + TQFile cdi( filename ); if ( !cdi.open( IO_ReadOnly ) ) { loadDefaultCdiConfig(); return ; } - QTextStream s( &cdi ); + TQTextStream s( &cdi ); m_editCdiCfg->clear(); @@ -930,16 +930,16 @@ void K3bVcdBurnDialog::loadCdiConfig() void K3bVcdBurnDialog::loadDefaultCdiConfig() { - QString filename = locate( "data", "k3b/cdi/cdi_vcd.cfg" ); - if ( QFile::exists( filename ) ) { - QFile cdi( filename ); + TQString filename = locate( "data", "k3b/cdi/cdi_vcd.cfg" ); + if ( TQFile::exists( filename ) ) { + TQFile cdi( filename ); if ( !cdi.open( IO_ReadOnly ) ) { m_checkCdiSupport->setChecked( false ); m_checkCdiSupport->setEnabled( false ); return ; } - QTextStream s( &cdi ); + TQTextStream s( &cdi ); m_editCdiCfg->clear(); @@ -959,7 +959,7 @@ void K3bVcdBurnDialog::setVolumeID() if ( m_radioSvcd10->isChecked() ) m_editVolumeId->setText( "SUPER_VIDEOCD" ); else if ( m_radioHqVcd10->isChecked() ) - m_editVolumeId->setText( "HQ_VIDEOCD" ); + m_editVolumeId->setText( "HTQ_VIDEOCD" ); else m_editVolumeId->setText( "VIDEOCD" ); } diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h index 6f199a9..322fedf 100644 --- a/src/projects/k3bvcdburndialog.h +++ b/src/projects/k3bvcdburndialog.h @@ -17,17 +17,17 @@ #define K3BVCDBURNDIALOG_H #include "k3bprojectburndialog.h" -#include <qmultilineedit.h> - -class QCheckBox; -class QGroupBox; -class QButtonGroup; -class QSpinBox; -class QRadioButton; -class QLabel; -class QLineEdit; -class QMultiLineEdit; -class QToolButton; +#include <tqmultilineedit.h> + +class TQCheckBox; +class TQGroupBox; +class TQButtonGroup; +class TQSpinBox; +class TQRadioButton; +class TQLabel; +class TQLineEdit; +class TQMultiLineEdit; +class TQToolButton; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bVcdDoc; @@ -36,9 +36,10 @@ class K3bVcdOptions; class K3bVcdBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bVcdBurnDialog( K3bVcdDoc* doc, QWidget *parent = 0, const char *name = 0, bool modal = true ); + K3bVcdBurnDialog( K3bVcdDoc* doc, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); ~K3bVcdBurnDialog(); K3bVcdDoc* vcdDoc() const @@ -61,62 +62,62 @@ class K3bVcdBurnDialog : public K3bProjectBurnDialog // the video-cd-tab // ----------------------------------------------------------- - QButtonGroup* m_groupVcdFormat; - QRadioButton* m_radioVcd11; - QRadioButton* m_radioVcd20; - QRadioButton* m_radioSvcd10; - QRadioButton* m_radioHqVcd10; + TQButtonGroup* m_groupVcdFormat; + TQRadioButton* m_radioVcd11; + TQRadioButton* m_radioVcd20; + TQRadioButton* m_radioSvcd10; + TQRadioButton* m_radioHqVcd10; - QGroupBox* m_groupOptions; - QCheckBox* m_checkAutoDetect; - QCheckBox* m_checkNonCompliant; - QCheckBox* m_checkVCD30interpretation; - QCheckBox* m_check2336; + TQGroupBox* m_groupOptions; + TQCheckBox* m_checkAutoDetect; + TQCheckBox* m_checkNonCompliant; + TQCheckBox* m_checkVCD30interpretation; + TQCheckBox* m_check2336; // CD-i - QGroupBox* m_groupCdi; - QCheckBox* m_checkCdiSupport; - QMultiLineEdit* m_editCdiCfg; + TQGroupBox* m_groupCdi; + TQCheckBox* m_checkCdiSupport; + TQMultiLineEdit* m_editCdiCfg; // ----------------------------------------------------------- // the video-label-tab // ----------------------------------------------------------- - QLineEdit* m_editVolumeId; - QLineEdit* m_editPublisher; - QLineEdit* m_editAlbumId; + TQLineEdit* m_editVolumeId; + TQLineEdit* m_editPublisher; + TQLineEdit* m_editAlbumId; - QSpinBox* m_spinVolumeCount; - QSpinBox* m_spinVolumeNumber; + TQSpinBox* m_spinVolumeCount; + TQSpinBox* m_spinVolumeNumber; // ----------------------------------------------------------- // the advanced-tab // ----------------------------------------------------------- - QGroupBox* m_groupGeneric; - QGroupBox* m_groupGaps; - QGroupBox* m_groupMisc; - - QCheckBox* m_checkPbc; - QCheckBox* m_checkSegmentFolder; - QCheckBox* m_checkRelaxedAps; - QCheckBox* m_checkUpdateScanOffsets; - QCheckBox* m_checkGaps; - - QSpinBox* m_spinRestriction; - QSpinBox* m_spinPreGapLeadout; - QSpinBox* m_spinPreGapTrack; - QSpinBox* m_spinFrontMarginTrack; - QSpinBox* m_spinRearMarginTrack; - QSpinBox* m_spinFrontMarginTrackSVCD; - QSpinBox* m_spinRearMarginTrackSVCD; - - QLabel* m_labelRestriction; - QLabel* m_labelPreGapLeadout; - QLabel* m_labelPreGapTrack; - QLabel* m_labelFrontMarginTrack; - QLabel* m_labelRearMarginTrack; + TQGroupBox* m_groupGeneric; + TQGroupBox* m_groupGaps; + TQGroupBox* m_groupMisc; + + TQCheckBox* m_checkPbc; + TQCheckBox* m_checkSegmentFolder; + TQCheckBox* m_checkRelaxedAps; + TQCheckBox* m_checkUpdateScanOffsets; + TQCheckBox* m_checkGaps; + + TQSpinBox* m_spinRestriction; + TQSpinBox* m_spinPreGapLeadout; + TQSpinBox* m_spinPreGapTrack; + TQSpinBox* m_spinFrontMarginTrack; + TQSpinBox* m_spinRearMarginTrack; + TQSpinBox* m_spinFrontMarginTrackSVCD; + TQSpinBox* m_spinRearMarginTrackSVCD; + + TQLabel* m_labelRestriction; + TQLabel* m_labelPreGapLeadout; + TQLabel* m_labelPreGapTrack; + TQLabel* m_labelFrontMarginTrack; + TQLabel* m_labelRearMarginTrack; // ----------------------------------------------------------- diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index f61863b..ad3c07c 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -13,15 +13,15 @@ * See the file "COPYING" for the exact licensing terms. */ -#include <qheader.h> -#include <qtimer.h> -#include <qdragobject.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpainter.h> -#include <qfontmetrics.h> +#include <tqheader.h> +#include <tqtimer.h> +#include <tqdragobject.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> #include <kiconloader.h> #include <kurl.h> @@ -39,8 +39,8 @@ #include "k3bvcddoc.h" #include <k3bview.h> -K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, QWidget *parent, const char *name ) - : K3bListView( parent, name ), m_doc( doc ), m_view( view ) +K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bListView( tqparent, name ), m_doc( doc ), m_view( view ) { setAcceptDrops( true ); setDropVisualizer( true ); @@ -60,15 +60,15 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, QWidget *parent, setupColumns(); header() ->setClickEnabled( false ); - connect( this, SIGNAL( dropped( KListView*, QDropEvent*, QListViewItem* ) ), - this, SLOT( slotDropped( KListView*, QDropEvent*, QListViewItem* ) ) ); - connect( this, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( showPopupMenu( KListView*, QListViewItem*, const QPoint& ) ) ); - connect( this, SIGNAL( doubleClicked( QListViewItem*, const QPoint&, int ) ), - this, SLOT( showPropertiesDialog() ) ); + connect( this, TQT_SIGNAL( dropped( KListView*, TQDropEvent*, TQListViewItem* ) ), + this, TQT_SLOT( slotDropped( KListView*, TQDropEvent*, TQListViewItem* ) ) ); + connect( this, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( showPopupMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQT_SLOT( showPropertiesDialog() ) ); - connect( m_doc, SIGNAL( changed() ), this, SLOT( slotUpdateItems() ) ); - connect( m_doc, SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); + connect( m_doc, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateItems() ) ); + connect( m_doc, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), TQT_TQOBJECT(this), TQT_SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); slotUpdateItems(); } @@ -94,8 +94,8 @@ void K3bVcdListView::setupColumns() void K3bVcdListView::setupActions() { m_actionCollection = new KActionCollection( this ); - m_actionProperties = new KAction( i18n( "Properties" ), "misc", 0, this, SLOT( showPropertiesDialog() ), actionCollection() ); - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", Key_Delete, this, SLOT( slotRemoveTracks() ), actionCollection() ); + m_actionProperties = new KAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); + m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); // disabled by default m_actionRemove->setEnabled( false ); @@ -113,21 +113,21 @@ void K3bVcdListView::setupPopupMenu() } -bool K3bVcdListView::acceptDrag( QDropEvent* e ) const +bool K3bVcdListView::acceptDrag( TQDropEvent* e ) const { // the first is for built-in item moving, the second for dropping urls return ( KListView::acceptDrag( e ) || KURLDrag::canDecode( e ) ); } -QDragObject* K3bVcdListView::dragObject() +TQDragObject* K3bVcdListView::dragObject() { - QPtrList<QListViewItem> list = selectedItems(); + TQPtrList<TQListViewItem> list = selectedItems(); if ( list.isEmpty() ) return 0; - QPtrListIterator<QListViewItem> it( list ); + TQPtrListIterator<TQListViewItem> it( list ); KURL::List urls; for ( ; it.current(); ++it ) @@ -137,7 +137,7 @@ QDragObject* K3bVcdListView::dragObject() } -void K3bVcdListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* after ) +void K3bVcdListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ) { if ( !e->isAccepted() ) return ; @@ -149,8 +149,8 @@ void K3bVcdListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* afte pos = ( ( K3bVcdListViewItem* ) after ) ->vcdTrack() ->index() + 1; if ( e->source() == viewport() ) { - QPtrList<QListViewItem> sel = selectedItems(); - QPtrListIterator<QListViewItem> it( sel ); + TQPtrList<TQListViewItem> sel = selectedItems(); + TQPtrListIterator<TQListViewItem> it( sel ); K3bVcdTrack* trackAfter = ( after ? ( ( K3bVcdListViewItem* ) after ) ->vcdTrack() : 0 ); while ( it.current() ) { K3bVcdTrack * track = ( ( K3bVcdListViewItem* ) it.current() ) ->vcdTrack(); @@ -170,7 +170,7 @@ void K3bVcdListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* afte } -void K3bVcdListView::insertItem( QListViewItem* item ) +void K3bVcdListView::insertItem( TQListViewItem* item ) { KListView::insertItem( item ); @@ -180,7 +180,7 @@ void K3bVcdListView::insertItem( QListViewItem* item ) } } -void K3bVcdListView::showPopupMenu( KListView*, QListViewItem* _item, const QPoint& _point ) +void K3bVcdListView::showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& _point ) { if ( _item ) { m_actionRemove->setEnabled( true ); @@ -193,23 +193,23 @@ void K3bVcdListView::showPopupMenu( KListView*, QListViewItem* _item, const QPoi void K3bVcdListView::showPropertiesDialog() { - QPtrList<K3bVcdTrack> selected = selectedTracks(); + TQPtrList<K3bVcdTrack> selected = selectedTracks(); if ( !selected.isEmpty() && selected.count() == 1 ) { - QPtrList<K3bVcdTrack> tracks = *m_doc->tracks(); + TQPtrList<K3bVcdTrack> tracks = *m_doc->tracks(); K3bVcdTrackDialog d( m_doc, tracks, selected, this ); if ( d.exec() ) { - repaint(); + tqrepaint(); } } else { m_view->slotProperties(); } } -QPtrList<K3bVcdTrack> K3bVcdListView::selectedTracks() +TQPtrList<K3bVcdTrack> K3bVcdListView::selectedTracks() { - QPtrList<K3bVcdTrack> selectedTracks; - QPtrList<QListViewItem> selectedVI( selectedItems() ); - for ( QListViewItem * item = selectedVI.first(); item != 0; item = selectedVI.next() ) { + TQPtrList<K3bVcdTrack> selectedTracks; + TQPtrList<TQListViewItem> selectedVI( selectedItems() ); + for ( TQListViewItem * item = selectedVI.first(); item != 0; item = selectedVI.next() ) { K3bVcdListViewItem * vcdItem = dynamic_cast<K3bVcdListViewItem*>( item ); if ( vcdItem ) { selectedTracks.append( vcdItem->vcdTrack() ); @@ -222,7 +222,7 @@ QPtrList<K3bVcdTrack> K3bVcdListView::selectedTracks() void K3bVcdListView::slotRemoveTracks() { - QPtrList<K3bVcdTrack> selected = selectedTracks(); + TQPtrList<K3bVcdTrack> selected = selectedTracks(); if ( !selected.isEmpty() ) { for ( K3bVcdTrack * track = selected.first(); track != 0; track = selected.next() ) { @@ -238,7 +238,7 @@ void K3bVcdListView::slotRemoveTracks() void K3bVcdListView::slotTrackRemoved( K3bVcdTrack* track ) { - QListViewItem * viewItem = m_itemMap[ track ]; + TQListViewItem * viewItem = m_itemMap[ track ]; m_itemMap.remove( track ); delete viewItem; } @@ -250,7 +250,7 @@ void K3bVcdListView::slotUpdateItems() K3bVcdTrack * track = m_doc->first(); K3bVcdTrack* lastTrack = 0; while ( track != 0 ) { - if ( !m_itemMap.contains( track ) ) + if ( !m_itemMap.tqcontains( track ) ) m_itemMap.insert( track, new K3bVcdListViewItem( track, this, m_itemMap[ lastTrack ] ) ); lastTrack = track; diff --git a/src/projects/k3bvcdlistview.h b/src/projects/k3bvcdlistview.h index 71d22d7..01fa218 100644 --- a/src/projects/k3bvcdlistview.h +++ b/src/projects/k3bvcdlistview.h @@ -19,12 +19,12 @@ #include <k3blistview.h> -#include <qmap.h> +#include <tqmap.h> -class QDragEnterEvent; -class QDragObject; -class QDropEvent; -class QTimer; +class TQDragEnterEvent; +class TQDragObject; +class TQDropEvent; +class TQTimer; class KPopupMenu; class KAction; class K3bVcdDoc; @@ -32,28 +32,29 @@ class K3bView; class K3bVcdTrack; class KActionCollection; class K3bVcdListViewItem; -class QPainter; +class TQPainter; class K3bVcdListView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bVcdListView( K3bView*, K3bVcdDoc*, QWidget *parent = 0, const char *name = 0 ); + K3bVcdListView( K3bView*, K3bVcdDoc*, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bVcdListView(); /** * reimplemented from KListView */ - void insertItem( QListViewItem* ); + void insertItem( TQListViewItem* ); KActionCollection* actionCollection() const { return m_actionCollection; } - QPtrList<K3bVcdTrack> selectedTracks(); + TQPtrList<K3bVcdTrack> selectedTracks(); signals: void lengthReady(); @@ -72,19 +73,19 @@ class K3bVcdListView : public K3bListView KPopupMenu* m_popupMenu; - QMap<K3bVcdTrack*, K3bVcdListViewItem*> m_itemMap; + TQMap<K3bVcdTrack*, K3bVcdListViewItem*> m_itemMap; private slots: - void slotDropped( KListView*, QDropEvent* e, QListViewItem* after ); + void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); void slotUpdateItems(); - void showPopupMenu( KListView*, QListViewItem* item, const QPoint& ); + void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& ); void showPropertiesDialog(); void slotRemoveTracks(); void slotTrackRemoved( K3bVcdTrack* ); protected: - bool acceptDrag( QDropEvent* e ) const; - QDragObject* dragObject(); + bool acceptDrag( TQDropEvent* e ) const; + TQDragObject* dragObject(); }; #endif diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index 02df525..5232632 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -22,15 +22,15 @@ #include "k3bvcdtrack.h" #include <k3bglobals.h> -K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent ) - : K3bListViewItem( parent ), m_track( track ) +K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent ) + : K3bListViewItem( tqparent ), m_track( track ) { setEditor( 1, LINE ); animate(); } -K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, QListViewItem* after ) - : K3bListViewItem( parent, after ), m_track( track ) +K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent, TQListViewItem* after ) + : K3bListViewItem( tqparent, after ), m_track( track ) { setEditor( 1, LINE ); animate(); @@ -40,7 +40,7 @@ K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, K3bVcdListViewItem::~K3bVcdListViewItem() {} -QString K3bVcdListViewItem::text( int i ) const +TQString K3bVcdListViewItem::text( int i ) const { // // We add two spaces after all strings (except the once renamable) @@ -49,7 +49,7 @@ QString K3bVcdListViewItem::text( int i ) const switch ( i ) { case 0: - return QString::number( m_track->index() + 1 ).rightJustify( 2, ' ' ) + " "; + return TQString::number( m_track->index() + 1 ).rightJustify( 2, ' ' ) + " "; case 1: return m_track->title(); case 2: @@ -66,7 +66,7 @@ QString K3bVcdListViewItem::text( int i ) const return m_track->video_frate() + " "; case 6: // track mpegmbps - return QString::number( m_track->muxrate() ) + " "; + return TQString::number( m_track->muxrate() ) + " "; case 7: // track mpegduration return m_track->duration() + " "; @@ -82,7 +82,7 @@ QString K3bVcdListViewItem::text( int i ) const } } -void K3bVcdListViewItem::setText( int col, const QString& text ) +void K3bVcdListViewItem::setText( int col, const TQString& text ) { if ( col == 1 ) { // this is the title field @@ -93,9 +93,9 @@ void K3bVcdListViewItem::setText( int col, const QString& text ) } -QString K3bVcdListViewItem::key( int, bool ) const +TQString K3bVcdListViewItem::key( int, bool ) const { - QString num = QString::number( m_track->index() ); + TQString num = TQString::number( m_track->index() ); if ( num.length() == 1 ) return "00" + num; else if ( num.length() == 2 ) diff --git a/src/projects/k3bvcdlistviewitem.h b/src/projects/k3bvcdlistviewitem.h index 0101850..9a1a290 100644 --- a/src/projects/k3bvcdlistviewitem.h +++ b/src/projects/k3bvcdlistviewitem.h @@ -24,18 +24,18 @@ class K3bVcdListViewItem : public K3bListViewItem { public: - K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent ); - K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, QListViewItem* after ); + K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent ); + K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent, TQListViewItem* after ); ~K3bVcdListViewItem(); - /** reimplemented from QListViewItem */ - QString text( int i ) const; + /** reimplemented from TQListViewItem */ + TQString text( int i ) const; - /** reimplemented from QListViewItem */ - void setText( int col, const QString& text ); + /** reimplemented from TQListViewItem */ + void setText( int col, const TQString& text ); - /** reimplemented from QListViewItem */ - QString key( int column, bool a ) const; + /** reimplemented from TQListViewItem */ + TQString key( int column, bool a ) const; bool animate(); K3bVcdTrack* vcdTrack() diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 06588b8..1b148f2 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -13,22 +13,22 @@ * See the file "COPYING" for the exact licensing terms. */ -// Qt Includes -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qmultilineedit.h> -#include <qpixmap.h> -#include <qradiobutton.h> -#include <qtable.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +// TQt Includes +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqmultilineedit.h> +#include <tqpixmap.h> +#include <tqradiobutton.h> +#include <tqtable.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // Kde Includes #include <kiconloader.h> @@ -47,9 +47,9 @@ #include <k3bcutcombobox.h> -K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, QPtrList<K3bVcdTrack>& tracks, QPtrList<K3bVcdTrack>& selectedTracks, QWidget* parent, const char* name ) +K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& tracks, TQPtrList<K3bVcdTrack>& selectedTracks, TQWidget* tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Video Track Properties" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, - KDialogBase::Ok, parent, name ) + KDialogBase::Ok, tqparent, name ) { prepareGui(); @@ -70,7 +70,7 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, QPtrList<K3bVcdTrack>& tr m_displayFileName->setText( selectedTrack->fileName() ); m_displayLength->setText( selectedTrack->duration() ); m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) ); - m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) ); + m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( selectedTrack->muxrate() ) ); if ( selectedTrack->isSegment() ) m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) ); @@ -93,7 +93,7 @@ void K3bVcdTrackDialog::slotOk() void K3bVcdTrackDialog::setPbcTrack( K3bVcdTrack* selected, K3bCutComboBox* box, int which ) { // TODO: Unset Userdefined on default settings - kdDebug() << QString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).arg( box->currentItem() ).arg( m_tracks.count() ) << endl; + kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).tqarg( box->currentItem() ).tqarg( m_tracks.count() ) << endl; int count = m_tracks.count(); @@ -142,7 +142,7 @@ void K3bVcdTrackDialog::slotApply() selectedTrack->delDefinedNumKey(); if ( m_check_overwritekeys->isChecked() ) { - QListViewItemIterator it( m_list_keys ); + TQListViewItemIterator it( m_list_keys ); int skiped = 0; int startkey = 0; while ( it.current() ) { @@ -158,8 +158,8 @@ void K3bVcdTrackDialog::slotApply() startkey = it.current() ->text( 0 ).toInt(); } - QMap<QString, K3bVcdTrack*>::Iterator mit; - mit = m_numkeysmap.find( it.current() ->text( 1 ) ); + TQMap<TQString, K3bVcdTrack*>::Iterator mit; + mit = m_numkeysmap.tqfind( it.current() ->text( 1 ) ); if ( mit != m_numkeysmap.end() ) if ( mit.data() ) { selectedTrack->setDefinedNumKey( it.current() ->text( 0 ).toInt(), mit.data() ); @@ -198,50 +198,50 @@ void K3bVcdTrackDialog::fillGui() fillPbcGui(); - QToolTip::add + TQToolTip::add ( m_pbc_previous, i18n( "May also look like | << on the remote control. " ) ); - QToolTip::add + TQToolTip::add ( m_pbc_next, i18n( "May also look like >> | on the remote control." ) ); - QToolTip::add + TQToolTip::add ( m_pbc_return, i18n( "This key may be mapped to the STOP key." ) ); - QToolTip::add + TQToolTip::add ( m_pbc_default, i18n( "This key is usually mapped to the > or PLAY key." ) ); - QToolTip::add + TQToolTip::add ( m_comboAfterTimeout, i18n( "Target to be jumped to on time-out of <wait>." ) ); - QToolTip::add + TQToolTip::add ( m_check_reactivity, i18n( "Delay reactivity of keys." ) ); - QToolTip::add + TQToolTip::add ( m_check_pbc, i18n( "Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 disc formats." ) ); - QToolTip::add + TQToolTip::add ( m_check_usekeys, i18n( "Activate the use of numeric keys." ) ); - QToolTip::add + TQToolTip::add ( m_check_overwritekeys, i18n( "Overwrite default numeric keys." ) ); - QToolTip::add + TQToolTip::add ( m_list_keys, i18n( "Numeric keys." ) ); - QToolTip::add + TQToolTip::add ( m_spin_times, i18n( "Times to repeat the playback of 'play track'." ) ); - QToolTip::add + TQToolTip::add ( m_spin_waittime, i18n( "Time in seconds to wait after playback of 'play track'." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_comboAfterTimeout, i18n( "<p>Target to be jumped to on time-out of <wait>." "<p>If omitted (and <wait> is not set to an infinite time) one of the targets is selected at random." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check_reactivity, i18n( "<p>When reactivity is set to delayed, it is recommended that the length of the referenced 'play track' is not more than 5 seconds." "<p>The recommended setting for a play item consisting of one still picture and no audio is to loop once and have a delayed reactivity." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check_pbc, i18n( "<p>Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 disc formats." "<p>PBC allows control of the playback of play items and the possibility of interaction with the user through the remote control or some other input device available." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check_usekeys, i18n( "These are actually pseudo keys, representing the numeric keys 0, 1, ..., 9." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check_overwritekeys, i18n( "<p>If numeric keys enabled, you can overwrite the default settings." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_spin_times, i18n( "<p>Times to repeat the playback of 'play track'." "<p>The reactivity attribute controls whether the playback of 'play track' is finished, thus delayed, before executing user triggered action or an immediate jump is performed." "<p>After the specified number of repetitions have completed, the <wait> time begins to count down, unless set to an infinite wait time." "<p>If this element is omitted, a default of `1' is used, i.e. the 'play track' will be displayed once." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_spin_waittime, i18n( "Time in seconds to wait after playback of 'play track' before triggering the <timeout> action (unless the user triggers some action before time ran up)." ) ); } @@ -263,13 +263,13 @@ void K3bVcdTrackDialog::fillPbcGui() m_numkeysmap.insert( displayName( selectedTrack ) , selectedTrack ); for ( track = m_tracks.first(); track; track = m_tracks.next() ) { - QPixmap pm; + TQPixmap pm; if ( track->isSegment() ) pm = SmallIcon( "image" ); else pm = SmallIcon( "video" ); - QString s = displayName( track ); + TQString s = displayName( track ); if ( track != selectedTrack ) // donot insert selectedTrack, it was as "ItSelf" inserted to the begin of map m_numkeysmap.insert( s, track ); @@ -296,8 +296,8 @@ void K3bVcdTrackDialog::fillPbcGui() } // add Event Disabled - QPixmap pmDisabled = SmallIcon( "stop" ); - QString txtDisabled = i18n( "Event Disabled" ); + TQPixmap pmDisabled = SmallIcon( "stop" ); + TQString txtDisabled = i18n( "Event Disabled" ); m_pbc_previous->insertItem( pmDisabled, txtDisabled ); m_pbc_next->insertItem( pmDisabled, txtDisabled ); m_pbc_return->insertItem( pmDisabled, txtDisabled ); @@ -305,8 +305,8 @@ void K3bVcdTrackDialog::fillPbcGui() m_comboAfterTimeout->insertItem( pmDisabled, txtDisabled ); // add VideoCD End - QPixmap pmEnd = SmallIcon( "cdrom_unmount" ); - QString txtEnd = i18n( "VideoCD END" ); + TQPixmap pmEnd = SmallIcon( "cdrom_unmount" ); + TQString txtEnd = i18n( "VideoCD END" ); m_pbc_previous->insertItem( pmEnd, txtEnd ); m_pbc_next->insertItem( pmEnd, txtEnd ); m_pbc_return->insertItem( pmEnd, txtEnd ); @@ -315,7 +315,7 @@ void K3bVcdTrackDialog::fillPbcGui() m_numkeysmap.insert( txtEnd, 0L ); for ( int i = 99; i > 0; i-- ) { - item = new K3bListViewItem( m_list_keys, QString::number( i ) + " ", "" ); + item = new K3bListViewItem( m_list_keys, TQString::number( i ) + " ", "" ); item->setEditor( 1, K3bListViewItem::COMBO , m_numkeysmap.keys() ); } @@ -363,50 +363,50 @@ void K3bVcdTrackDialog::fillPbcGui() void K3bVcdTrackDialog::prepareGui() { - QFrame * frame = plainPage(); + TQFrame * frame = plainPage(); - QGridLayout* mainLayout = new QGridLayout( frame ); + TQGridLayout* mainLayout = new TQGridLayout( frame ); mainLayout->setSpacing( spacingHint() ); mainLayout->setMargin( 0 ); - m_mainTabbed = new QTabWidget( frame ); + m_mainTabbed = new TQTabWidget( frame ); /////////////////////////////////////////////////// // FILE-INFO BOX /////////////////////////////////////////////////// - QGroupBox* groupFileInfo = new QGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); - groupFileInfo->layout() ->setSpacing( 0 ); - groupFileInfo->layout() ->setMargin( 0 ); + TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); + groupFileInfo->tqlayout() ->setSpacing( 0 ); + groupFileInfo->tqlayout() ->setMargin( 0 ); - QGridLayout* groupFileInfoLayout = new QGridLayout( groupFileInfo->layout() ); - groupFileInfoLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() ); + groupFileInfoLayout->tqsetAlignment( TQt::AlignTop ); groupFileInfoLayout->setSpacing( spacingHint() ); groupFileInfoLayout->setMargin( marginHint() ); - m_labelMimeType = new QLabel( groupFileInfo, "m_labelMimeType" ); + m_labelMimeType = new TQLabel( groupFileInfo, "m_labelMimeType" ); m_displayFileName = new KCutLabel( groupFileInfo ); m_displayFileName->setText( i18n( "Filename" ) ); - m_displayFileName->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); + m_displayFileName->tqsetAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) ); - QLabel* labelSize = new QLabel( i18n( "Size:" ), groupFileInfo, "labelSize" ); - QLabel* labelLength = new QLabel( i18n( "Length:" ), groupFileInfo, "labelLength" ); - QLabel* labelMuxrate = new QLabel( i18n( "Muxrate:" ), groupFileInfo, "labelMuxrate" ); + TQLabel* labelSize = new TQLabel( i18n( "Size:" ), groupFileInfo, "labelSize" ); + TQLabel* labelLength = new TQLabel( i18n( "Length:" ), groupFileInfo, "labelLength" ); + TQLabel* labelMuxrate = new TQLabel( i18n( "Muxrate:" ), groupFileInfo, "labelMuxrate" ); - m_displaySize = new QLabel( groupFileInfo, "m_displaySize" ); + m_displaySize = new TQLabel( groupFileInfo, "m_displaySize" ); m_displaySize->setText( "0.0 MB" ); - m_displaySize->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_displaySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - m_displayLength = new QLabel( groupFileInfo, "m_displayLength" ); + m_displayLength = new TQLabel( groupFileInfo, "m_displayLength" ); m_displayLength->setText( "0:0:0" ); - m_displayLength->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_displayLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - m_muxrate = new QLabel( groupFileInfo, "m_muxrate" ); - m_muxrate->setText( i18n( "%1 bit/s" ).arg( 0 ) ); - m_muxrate->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" ); + m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) ); + m_muxrate->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - QFrame* fileInfoLine = new QFrame( groupFileInfo ); - fileInfoLine->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame* fileInfoLine = new TQFrame( groupFileInfo ); + fileInfoLine->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); groupFileInfoLayout->addWidget( m_labelMimeType, 0, 0 ); groupFileInfoLayout->addMultiCellWidget( m_displayFileName, 0, 1, 1, 1 ); @@ -421,7 +421,7 @@ void K3bVcdTrackDialog::prepareGui() groupFileInfoLayout->setRowStretch( 6, 1 ); groupFileInfoLayout->setColStretch( 1, 1 ); - QFont f( m_displayLength->font() ); + TQFont f( m_displayLength->font() ); f.setBold( true ); m_displayLength->setFont( f ); m_displaySize->setFont( f ); @@ -440,54 +440,54 @@ void K3bVcdTrackDialog::setupPbcTab() // ///////////////////////////////////////////////// // Playback Control TAB // ///////////////////////////////////////////////// - QWidget * w = new QWidget( m_mainTabbed ); + TQWidget * w = new TQWidget( m_mainTabbed ); - QGridLayout* grid = new QGridLayout( w ); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout* grid = new TQGridLayout( w ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); ////////////////////////////////////////////////////////////////////////////////////////// - QGroupBox* groupOptions = new QGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); - groupOptions->layout() ->setSpacing( spacingHint() ); - groupOptions->layout() ->setMargin( marginHint() ); + TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); + groupOptions->tqlayout() ->setSpacing( spacingHint() ); + groupOptions->tqlayout() ->setMargin( marginHint() ); - m_check_pbc = new QCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" ); + m_check_pbc = new TQCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" ); - m_check_usekeys = new QCheckBox( i18n( "Use numeric keys" ), groupOptions, "m_check_usekeys" ); + m_check_usekeys = new TQCheckBox( i18n( "Use numeric keys" ), groupOptions, "m_check_usekeys" ); m_check_usekeys->setEnabled( false ); - m_check_reactivity = new QCheckBox( i18n( "Reactivity delayed to the end of playing track" ), groupOptions, "m_check_reactivity" ); + m_check_reactivity = new TQCheckBox( i18n( "Reactivity delayed to the end of playing track" ), groupOptions, "m_check_reactivity" ); m_check_reactivity->setEnabled( false ); ////////////////////////////////////////////////////////////////////////////////////////// - m_groupPlay = new QGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); - m_groupPlay->layout() ->setSpacing( spacingHint() ); - m_groupPlay->layout() ->setMargin( marginHint() ); + m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); + m_groupPlay->tqlayout() ->setSpacing( spacingHint() ); + m_groupPlay->tqlayout() ->setMargin( marginHint() ); - QGridLayout* groupPlayLayout = new QGridLayout( m_groupPlay->layout() ); - groupPlayLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() ); + groupPlayLayout->tqsetAlignment( TQt::AlignTop ); - QLabel* labelPlaying = new QLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); + TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); - m_spin_times = new QSpinBox( m_groupPlay, "m_spin_times" ); + m_spin_times = new TQSpinBox( m_groupPlay, "m_spin_times" ); m_spin_times->setValue( 1 ); m_spin_times->setSuffix( i18n( " time(s)" ) ); m_spin_times->setSpecialValueText( i18n( "forever" ) ); ////////////////////////////////////////////////////////////////////////////////////////// - m_labelWait = new QLabel( i18n( "then wait" ), m_groupPlay, "m_labelWait" ); - m_spin_waittime = new QSpinBox( m_groupPlay, "m_spinSeconds" ); + m_labelWait = new TQLabel( i18n( "then wait" ), m_groupPlay, "m_labelWait" ); + m_spin_waittime = new TQSpinBox( m_groupPlay, "m_spinSeconds" ); m_spin_waittime->setMinValue( -1 ); m_spin_waittime->setValue( 0 ); // m_spin_waittime->setEnabled( false ); m_spin_waittime->setSuffix( i18n( " seconds" ) ); m_spin_waittime->setSpecialValueText( i18n( "infinite" ) ); - m_labelAfterTimeout = new QLabel( i18n( "after timeout playing" ), m_groupPlay, "m_labelTimeout" ); + m_labelAfterTimeout = new TQLabel( i18n( "after timeout playing" ), m_groupPlay, "m_labelTimeout" ); // m_labelAfterTimeout->setEnabled( false ); - m_comboAfterTimeout = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPlay, "m_comboAfterTimeout" ); + m_comboAfterTimeout = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPlay, "m_comboAfterTimeout" ); // m_comboAfterTimeout->setEnabled( false ); groupPlayLayout->addWidget( labelPlaying, 1, 0 ); @@ -498,22 +498,22 @@ void K3bVcdTrackDialog::setupPbcTab() groupPlayLayout->addMultiCellWidget( m_comboAfterTimeout, 3, 3, 1, 3 ); ////////////////////////////////////////////////////////////////////////////////////////// - m_groupPbc = new QGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); - m_groupPbc->layout() ->setSpacing( spacingHint() ); - m_groupPbc->layout() ->setMargin( marginHint() ); + m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); + m_groupPbc->tqlayout() ->setSpacing( spacingHint() ); + m_groupPbc->tqlayout() ->setMargin( marginHint() ); - QGridLayout* groupPbcLayout = new QGridLayout( m_groupPbc->layout() ); - groupPbcLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() ); + groupPbcLayout->tqsetAlignment( TQt::AlignTop ); - QLabel* labelPbc_previous = new QLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" ); - QLabel* labelPbc_next = new QLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" ); - QLabel* labelPbc_return = new QLabel( i18n( "Return:" ), m_groupPbc, "labelPbc_return" ); - QLabel* labelPbc_default = new QLabel( i18n( "Default:" ), m_groupPbc, "labelPbc_default" ); + TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" ); + TQLabel* labelPbc_next = new TQLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" ); + TQLabel* labelPbc_return = new TQLabel( i18n( "Return:" ), m_groupPbc, "labelPbc_return" ); + TQLabel* labelPbc_default = new TQLabel( i18n( "Default:" ), m_groupPbc, "labelPbc_default" ); - m_pbc_previous = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPbc, "m_pbc_previous" ); - m_pbc_next = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPbc, "m_pbc_next" ); - m_pbc_return = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPbc, "m_pbc_return" ); - m_pbc_default = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPbc, "m_pbc_default" ); + m_pbc_previous = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPbc, "m_pbc_previous" ); + m_pbc_next = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPbc, "m_pbc_next" ); + m_pbc_return = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPbc, "m_pbc_return" ); + m_pbc_default = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPbc, "m_pbc_default" ); groupPbcLayout->addWidget( labelPbc_previous, 1, 0 ); groupPbcLayout->addMultiCellWidget( m_pbc_previous, 1, 1, 1, 3 ); @@ -539,10 +539,10 @@ void K3bVcdTrackDialog::setupPbcTab() m_groupPlay->setEnabled( false ); m_groupPbc->setEnabled( false ); - connect( m_check_pbc, SIGNAL( toggled( bool ) ), this, SLOT( slotPbcToggled( bool ) ) ); - connect( m_spin_times, SIGNAL( valueChanged( int ) ), this, SLOT( slotPlayTimeChanged( int ) ) ); - connect( m_spin_waittime, SIGNAL( valueChanged( int ) ), this, SLOT( slotWaitTimeChanged( int ) ) ); - connect( m_check_usekeys, SIGNAL( toggled( bool ) ), this, SLOT( slotUseKeysToggled( bool ) ) ); + connect( m_check_pbc, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPbcToggled( bool ) ) ); + connect( m_spin_times, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotPlayTimeChanged( int ) ) ); + connect( m_spin_waittime, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotWaitTimeChanged( int ) ) ); + connect( m_check_usekeys, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseKeysToggled( bool ) ) ); } void K3bVcdTrackDialog::setupPbcKeyTab() @@ -550,35 +550,35 @@ void K3bVcdTrackDialog::setupPbcKeyTab() // ///////////////////////////////////////////////// // Playback Control Numeric Key's TAB // ///////////////////////////////////////////////// - m_widgetnumkeys = new QWidget( m_mainTabbed ); + m_widgetnumkeys = new TQWidget( m_mainTabbed ); - QGridLayout* grid = new QGridLayout( m_widgetnumkeys ); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout* grid = new TQGridLayout( m_widgetnumkeys ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - m_groupKey = new QGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); + m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); m_groupKey->setEnabled( false ); - m_groupKey->layout() ->setSpacing( spacingHint() ); - m_groupKey->layout() ->setMargin( marginHint() ); + m_groupKey->tqlayout() ->setSpacing( spacingHint() ); + m_groupKey->tqlayout() ->setMargin( marginHint() ); m_list_keys = new K3bListView( m_groupKey, "m_list_keys" ); m_list_keys->setAllColumnsShowFocus( true ); m_list_keys->setDoubleClickForEdit( false ); - m_list_keys->setColumnAlignment( 0, Qt::AlignRight ); - m_list_keys->setSelectionMode( QListView::NoSelection ); + m_list_keys->setColumnAlignment( 0, TQt::AlignRight ); + m_list_keys->setSelectionMode( TQListView::NoSelection ); m_list_keys->setSorting( -1 ); m_list_keys->addColumn( i18n( "Key" ) ); m_list_keys->addColumn( i18n( "Playing" ) ); - m_list_keys->setResizeMode( QListView::LastColumn ); - m_check_overwritekeys = new QCheckBox( i18n( "Overwrite default assignment" ), m_widgetnumkeys, "m_check_overwritekeys" ); + m_list_keys->setResizeMode( TQListView::LastColumn ); + m_check_overwritekeys = new TQCheckBox( i18n( "Overwrite default assignment" ), m_widgetnumkeys, "m_check_overwritekeys" ); grid->addWidget( m_groupKey, 1, 0 ); grid->addWidget( m_check_overwritekeys, 2, 0 ); m_mainTabbed->addTab( m_widgetnumkeys, i18n( "Numeric Keys" ) ); - connect( m_check_overwritekeys, SIGNAL( toggled( bool ) ), this, SLOT( slotGroupkeyToggled( bool ) ) ); + connect( m_check_overwritekeys, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotGroupkeyToggled( bool ) ) ); } @@ -587,36 +587,36 @@ void K3bVcdTrackDialog::setupAudioTab() // ///////////////////////////////////////////////// // AUDIO TAB // ///////////////////////////////////////////////// - QWidget * w = new QWidget( m_mainTabbed ); + TQWidget * w = new TQWidget( m_mainTabbed ); - QGridLayout* grid = new QGridLayout( w ); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout* grid = new TQGridLayout( w ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - QLabel* labelMpegVer_Audio = new QLabel( i18n( "Type:" ), w, "labelMpegVer_Audio" ); - QLabel* labelRate_Audio = new QLabel( i18n( "Rate:" ), w, "labelRate_Audio" ); - QLabel* labelSampling_Frequency_Audio = new QLabel( i18n( "Sampling frequency:" ), w, "labelSampling_Frequency_Audio" ); - QLabel* labelMode_Audio = new QLabel( i18n( "Mode:" ), w, "labelMode_Audio" ); - QLabel* labelCopyright_Audio = new QLabel( i18n( "Copyright:" ), w, "labelCopyright_Audio" ); - - m_mpegver_audio = new QLabel( w, "m_mpegver_audio" ); - m_rate_audio = new QLabel( w, "m_rate_audio" ); - m_sampling_frequency_audio = new QLabel( w, "m_sampling_frequency_audio" ); - m_mode_audio = new QLabel( w, "m_mode_audio" ); - m_copyright_audio = new QLabel( w, "m_copyright_audio" ); - - m_mpegver_audio->setFrameShape( QLabel::LineEditPanel ); - m_rate_audio->setFrameShape( QLabel::LineEditPanel ); - m_sampling_frequency_audio->setFrameShape( QLabel::LineEditPanel ); - m_mode_audio->setFrameShape( QLabel::LineEditPanel ); - m_copyright_audio->setFrameShape( QLabel::LineEditPanel ); - - m_mpegver_audio->setFrameShadow( QLabel::Sunken ); - m_rate_audio->setFrameShadow( QLabel::Sunken ); - m_sampling_frequency_audio->setFrameShadow( QLabel::Sunken ); - m_mode_audio->setFrameShadow( QLabel::Sunken ); - m_copyright_audio->setFrameShadow( QLabel::Sunken ); + TQLabel* labelMpegVer_Audio = new TQLabel( i18n( "Type:" ), w, "labelMpegVer_Audio" ); + TQLabel* labelRate_Audio = new TQLabel( i18n( "Rate:" ), w, "labelRate_Audio" ); + TQLabel* labelSampling_Frequency_Audio = new TQLabel( i18n( "Sampling frequency:" ), w, "labelSampling_Frequency_Audio" ); + TQLabel* labelMode_Audio = new TQLabel( i18n( "Mode:" ), w, "labelMode_Audio" ); + TQLabel* labelCopyright_Audio = new TQLabel( i18n( "Copyright:" ), w, "labelCopyright_Audio" ); + + m_mpegver_audio = new TQLabel( w, "m_mpegver_audio" ); + m_rate_audio = new TQLabel( w, "m_rate_audio" ); + m_sampling_frequency_audio = new TQLabel( w, "m_sampling_frequency_audio" ); + m_mode_audio = new TQLabel( w, "m_mode_audio" ); + m_copyright_audio = new TQLabel( w, "m_copyright_audio" ); + + m_mpegver_audio->setFrameShape( TQLabel::LineEditPanel ); + m_rate_audio->setFrameShape( TQLabel::LineEditPanel ); + m_sampling_frequency_audio->setFrameShape( TQLabel::LineEditPanel ); + m_mode_audio->setFrameShape( TQLabel::LineEditPanel ); + m_copyright_audio->setFrameShape( TQLabel::LineEditPanel ); + + m_mpegver_audio->setFrameShadow( TQLabel::Sunken ); + m_rate_audio->setFrameShadow( TQLabel::Sunken ); + m_sampling_frequency_audio->setFrameShadow( TQLabel::Sunken ); + m_mode_audio->setFrameShadow( TQLabel::Sunken ); + m_copyright_audio->setFrameShadow( TQLabel::Sunken ); grid->addWidget( labelMpegVer_Audio, 1, 0 ); grid->addMultiCellWidget( m_mpegver_audio, 1, 1, 1, 4 ); @@ -644,40 +644,40 @@ void K3bVcdTrackDialog::setupVideoTab() // ///////////////////////////////////////////////// // VIDEO TAB // ///////////////////////////////////////////////// - QWidget * w = new QWidget( m_mainTabbed ); + TQWidget * w = new TQWidget( m_mainTabbed ); - QGridLayout* grid = new QGridLayout( w ); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout* grid = new TQGridLayout( w ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - QLabel* labelMpegVer_Video = new QLabel( i18n( "Type:" ), w, "labelMpegVer_Video" ); - QLabel* labelRate_Video = new QLabel( i18n( "Rate:" ), w, "labelRate_Video" ); - QLabel* labelChromaFormat_Video = new QLabel( i18n( "Chroma format:" ), w, "labelChromaFormat_Video" ); - QLabel* labelFormat_Video = new QLabel( i18n( "Video format:" ), w, "labelFormat_Video" ); - QLabel* labelResolution_Video = new QLabel( i18n( "Resolution:" ), w, "labelSize_Video" ); - QLabel* labelHighResolution_Video = new QLabel( i18n( "High resolution:" ), w, "labelHighResolution_Video" ); - - m_mpegver_video = new QLabel( w, "m_mpegver_video" ); - m_rate_video = new QLabel( w, "m_rate_video" ); - m_chromaformat_video = new QLabel( w, "m_chromaformat_video" ); - m_format_video = new QLabel( w, "m_format_video" ); - m_resolution_video = new QLabel( w, "m_resolution_video" ); - m_highresolution_video = new QLabel( w, "m_highresolution_video" ); - - m_mpegver_video->setFrameShape( QLabel::LineEditPanel ); - m_rate_video->setFrameShape( QLabel::LineEditPanel ); - m_chromaformat_video->setFrameShape( QLabel::LineEditPanel ); - m_format_video->setFrameShape( QLabel::LineEditPanel ); - m_resolution_video->setFrameShape( QLabel::LineEditPanel ); - m_highresolution_video->setFrameShape( QLabel::LineEditPanel ); - - m_mpegver_video->setFrameShadow( QLabel::Sunken ); - m_rate_video->setFrameShadow( QLabel::Sunken ); - m_chromaformat_video->setFrameShadow( QLabel::Sunken ); - m_format_video->setFrameShadow( QLabel::Sunken ); - m_resolution_video->setFrameShadow( QLabel::Sunken ); - m_highresolution_video->setFrameShadow( QLabel::Sunken ); + TQLabel* labelMpegVer_Video = new TQLabel( i18n( "Type:" ), w, "labelMpegVer_Video" ); + TQLabel* labelRate_Video = new TQLabel( i18n( "Rate:" ), w, "labelRate_Video" ); + TQLabel* labelChromaFormat_Video = new TQLabel( i18n( "Chroma format:" ), w, "labelChromaFormat_Video" ); + TQLabel* labelFormat_Video = new TQLabel( i18n( "Video format:" ), w, "labelFormat_Video" ); + TQLabel* labelResolution_Video = new TQLabel( i18n( "Resolution:" ), w, "labelSize_Video" ); + TQLabel* labelHighResolution_Video = new TQLabel( i18n( "High resolution:" ), w, "labelHighResolution_Video" ); + + m_mpegver_video = new TQLabel( w, "m_mpegver_video" ); + m_rate_video = new TQLabel( w, "m_rate_video" ); + m_chromaformat_video = new TQLabel( w, "m_chromaformat_video" ); + m_format_video = new TQLabel( w, "m_format_video" ); + m_resolution_video = new TQLabel( w, "m_resolution_video" ); + m_highresolution_video = new TQLabel( w, "m_highresolution_video" ); + + m_mpegver_video->setFrameShape( TQLabel::LineEditPanel ); + m_rate_video->setFrameShape( TQLabel::LineEditPanel ); + m_chromaformat_video->setFrameShape( TQLabel::LineEditPanel ); + m_format_video->setFrameShape( TQLabel::LineEditPanel ); + m_resolution_video->setFrameShape( TQLabel::LineEditPanel ); + m_highresolution_video->setFrameShape( TQLabel::LineEditPanel ); + + m_mpegver_video->setFrameShadow( TQLabel::Sunken ); + m_rate_video->setFrameShadow( TQLabel::Sunken ); + m_chromaformat_video->setFrameShadow( TQLabel::Sunken ); + m_format_video->setFrameShadow( TQLabel::Sunken ); + m_resolution_video->setFrameShadow( TQLabel::Sunken ); + m_highresolution_video->setFrameShadow( TQLabel::Sunken ); grid->addWidget( labelMpegVer_Video, 1, 0 ); grid->addMultiCellWidget( m_mpegver_video, 1, 1, 1, 4 ); @@ -712,17 +712,17 @@ void K3bVcdTrackDialog::setDefinedNumKeys( ) } - QListViewItemIterator it( m_list_keys ); - QMap<int, K3bVcdTrack*> definedkeysmap = selectedTrack->DefinedNumKey(); + TQListViewItemIterator it( m_list_keys ); + TQMap<int, K3bVcdTrack*> definedkeysmap = selectedTrack->DefinedNumKey(); while ( it.current() ) { int itemId = it.current() ->text( 0 ).toInt(); - QMap<int, K3bVcdTrack*>::const_iterator keyit = definedkeysmap.find( itemId ); + TQMap<int, K3bVcdTrack*>::const_iterator keyit = definedkeysmap.tqfind( itemId ); if ( keyit != definedkeysmap.end() ) { if ( keyit.data() ) { - if ( m_tracks.findRef( keyit.data() ) >= 0 ) { + if ( m_tracks.tqfindRef( keyit.data() ) >= 0 ) { it.current() ->setText( 1 , displayName( keyit.data() ) ) ; } else { it.current() ->setText( 1 , "" ) ; @@ -738,15 +738,15 @@ void K3bVcdTrackDialog::setDefinedNumKeys( ) } } -QString K3bVcdTrackDialog::displayName( K3bVcdTrack * track ) +TQString K3bVcdTrackDialog::displayName( K3bVcdTrack * track ) { if ( track == m_selectedTracks.first() ) return i18n( "ItSelf" ); if ( track->isSegment() ) - return i18n( "Segment-%1 - %2" ).arg( QString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() ); + return i18n( "Segment-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() ); - return i18n( "Sequence-%1 - %2" ).arg( QString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() ); + return i18n( "Sequence-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() ); } void K3bVcdTrackDialog::slotPlayTimeChanged( int value ) diff --git a/src/projects/k3bvcdtrackdialog.h b/src/projects/k3bvcdtrackdialog.h index 3b62c35..565275b 100644 --- a/src/projects/k3bvcdtrackdialog.h +++ b/src/projects/k3bvcdtrackdialog.h @@ -17,19 +17,19 @@ #define K3BVCDTRACKDIALOG_H #include <kdialogbase.h> -#include <qptrlist.h> -#include <qtabwidget.h> +#include <tqptrlist.h> +#include <tqtabwidget.h> #include <k3bvcddoc.h> #include <k3blistview.h> class K3bVcdTrack; -class QLabel; -class QCheckBox; -class QComboBox; -class QGroupBox; -class QRadioButton; -class QButtonGroup; +class TQLabel; +class TQCheckBox; +class TQComboBox; +class TQGroupBox; +class TQRadioButton; +class TQButtonGroup; class KCutLabel; class K3bCutComboBox; @@ -37,9 +37,10 @@ class K3bCutComboBox; class K3bVcdTrackDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bVcdTrackDialog( K3bVcdDoc*, QPtrList<K3bVcdTrack>& tracks, QPtrList<K3bVcdTrack>& selectedTracks, QWidget* parent = 0, const char* name = 0 ); + K3bVcdTrackDialog( K3bVcdDoc*, TQPtrList<K3bVcdTrack>& tracks, TQPtrList<K3bVcdTrack>& selectedTracks, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bVcdTrackDialog(); protected slots: @@ -56,37 +57,37 @@ class K3bVcdTrackDialog : public KDialogBase private: K3bVcdDoc* m_vcdDoc; - QPtrList<K3bVcdTrack> m_tracks; - QPtrList<K3bVcdTrack> m_selectedTracks; - QMap<QString, K3bVcdTrack*> m_numkeysmap; - QTabWidget* m_mainTabbed; + TQPtrList<K3bVcdTrack> m_tracks; + TQPtrList<K3bVcdTrack> m_selectedTracks; + TQMap<TQString, K3bVcdTrack*> m_numkeysmap; + TQTabWidget* m_mainTabbed; KCutLabel* m_displayFileName; - QLabel* m_labelMimeType; - QLabel* m_displaySize; - QLabel* m_displayLength; - QLabel* m_muxrate; - - QLabel* m_mpegver_audio; - QLabel* m_rate_audio; - QLabel* m_sampling_frequency_audio; - QLabel* m_mode_audio; - QLabel* m_copyright_audio; - - QLabel* m_mpegver_video; - QLabel* m_rate_video; - QLabel* m_chromaformat_video; - QLabel* m_format_video; - QLabel* m_resolution_video; - QLabel* m_highresolution_video; - - QLabel* m_labelAfterTimeout; - QLabel* m_labelWait; - - QGroupBox* m_groupPlay; - QGroupBox* m_groupPbc; - QGroupBox* m_groupKey; - QWidget* m_widgetnumkeys; + TQLabel* m_labelMimeType; + TQLabel* m_displaySize; + TQLabel* m_displayLength; + TQLabel* m_muxrate; + + TQLabel* m_mpegver_audio; + TQLabel* m_rate_audio; + TQLabel* m_sampling_frequency_audio; + TQLabel* m_mode_audio; + TQLabel* m_copyright_audio; + + TQLabel* m_mpegver_video; + TQLabel* m_rate_video; + TQLabel* m_chromaformat_video; + TQLabel* m_format_video; + TQLabel* m_resolution_video; + TQLabel* m_highresolution_video; + + TQLabel* m_labelAfterTimeout; + TQLabel* m_labelWait; + + TQGroupBox* m_groupPlay; + TQGroupBox* m_groupPbc; + TQGroupBox* m_groupKey; + TQWidget* m_widgetnumkeys; K3bCutComboBox* m_pbc_previous; K3bCutComboBox* m_pbc_next; @@ -94,14 +95,14 @@ class K3bVcdTrackDialog : public KDialogBase K3bCutComboBox* m_pbc_default; K3bCutComboBox* m_comboAfterTimeout; - QCheckBox* m_check_reactivity; - QCheckBox* m_check_pbc; - QCheckBox* m_check_usekeys; - QCheckBox* m_check_overwritekeys; + TQCheckBox* m_check_reactivity; + TQCheckBox* m_check_pbc; + TQCheckBox* m_check_usekeys; + TQCheckBox* m_check_overwritekeys; K3bListView* m_list_keys; - QSpinBox* m_spin_times; - QSpinBox* m_spin_waittime; + TQSpinBox* m_spin_times; + TQSpinBox* m_spin_waittime; void prepareGui(); void setupPbcTab(); @@ -113,7 +114,7 @@ class K3bVcdTrackDialog : public KDialogBase void setPbcTrack( K3bVcdTrack*, K3bCutComboBox*, int ); void setDefinedNumKeys( ); - QString displayName( K3bVcdTrack* ); + TQString displayName( K3bVcdTrack* ); K3bVcdOptions* VcdOptions() { return m_vcdDoc->vcdOptions(); diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index d8984d4..852928f 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -14,8 +14,8 @@ */ // QT-includes -#include <qlayout.h> -#include <qstring.h> +#include <tqlayout.h> +#include <tqstring.h> // KDE-includes @@ -34,8 +34,8 @@ #include <k3bcore.h> -K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, QWidget* parent, const char *name ) - : K3bView( pDoc, parent, name ) +K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, TQWidget* tqparent, const char *name ) + : K3bView( pDoc, tqparent, name ) { m_doc = pDoc; @@ -45,17 +45,17 @@ K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, QWidget* parent, const char *name ) setMainWidget( m_vcdlist ); fillStatusDisplay() ->showSize(); - connect( m_vcdlist, SIGNAL( lengthReady() ), fillStatusDisplay(), SLOT( update() ) ); - connect( m_doc, SIGNAL( newTracks() ), fillStatusDisplay(), SLOT( update() ) ); + connect( m_vcdlist, TQT_SIGNAL( lengthReady() ), fillStatusDisplay(), TQT_SLOT( update() ) ); + connect( m_doc, TQT_SIGNAL( newTracks() ), fillStatusDisplay(), TQT_SLOT( update() ) ); } K3bVcdView::~K3bVcdView() {} -K3bProjectBurnDialog* K3bVcdView::newBurnDialog( QWidget * parent, const char * name ) +K3bProjectBurnDialog* K3bVcdView::newBurnDialog( TQWidget * tqparent, const char * name ) { - return new K3bVcdBurnDialog( m_doc, parent, name, true ); + return new K3bVcdBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3bvcdview.h b/src/projects/k3bvcdview.h index 77ad292..a58a465 100644 --- a/src/projects/k3bvcdview.h +++ b/src/projects/k3bvcdview.h @@ -16,18 +16,18 @@ #ifndef K3BVCDVIEW_H #define K3BVCDVIEW_H -#include <qstringlist.h> -#include <qptrlist.h> +#include <tqstringlist.h> +#include <tqptrlist.h> // K3b Includes #include <k3bview.h> class K3bVcdListView; class K3bVcdListViewItem; -class QWidget; +class TQWidget; class K3bVcdDoc; class K3bVcdTrack; -class QListViewItem; +class TQListViewItem; class KListView; class K3bVcdBurnDialog; class K3bProjectBurnDialog; @@ -36,13 +36,14 @@ class K3bProjectBurnDialog; class K3bVcdView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bVcdView( K3bVcdDoc* pDoc, QWidget* parent, const char *name = 0 ); + K3bVcdView( K3bVcdDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); ~K3bVcdView(); protected: - K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp index 22626df..d7602b0 100644 --- a/src/projects/k3bvideodvdburndialog.cpp +++ b/src/projects/k3bvideodvdburndialog.cpp @@ -32,27 +32,27 @@ #include <kio/global.h> #include <kmessagebox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> -K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal, true ), +K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), m_doc( doc ) { prepareGui(); - setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) ); + setTitle( i18n("Video DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); // create image settings tab @@ -63,7 +63,7 @@ K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, QWidget *pare m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); - QString path = m_doc->tempDir(); + TQString path = m_doc->tempDir(); if( path.isEmpty() ) { path = K3b::defaultTempPath(); if( m_doc->isoOptions().volumeID().isEmpty() ) @@ -175,17 +175,17 @@ void K3bVideoDvdBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked - QFile::remove( m_tempDirSelectionWidget->tempPath() ); + TQFile::remove( m_tempDirSelectionWidget->tempPath() ); } else return; diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h index 0dbbe58..af393d1 100644 --- a/src/projects/k3bvideodvdburndialog.h +++ b/src/projects/k3bvideodvdburndialog.h @@ -22,15 +22,16 @@ class K3bVideoDvdDoc; class K3bDataImageSettingsWidget; -class QCheckBox; +class TQCheckBox; class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bVideoDvdBurnDialog( K3bVideoDvdDoc*, QWidget *parent = 0, const char *name = 0, bool modal = true ); + K3bVideoDvdBurnDialog( K3bVideoDvdDoc*, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); ~K3bVideoDvdBurnDialog(); protected slots: @@ -47,7 +48,7 @@ class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog private: K3bDataImageSettingsWidget* m_imageSettingsWidget; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; K3bVideoDvdDoc* m_doc; }; diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp index 277beac..792ffc5 100644 --- a/src/projects/k3bvideodvdview.cpp +++ b/src/projects/k3bvideodvdview.cpp @@ -28,23 +28,23 @@ #include <kmessagebox.h> #include <kactioncollection.h> -#include <qsplitter.h> +#include <tqsplitter.h> -K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, QWidget *parent, const char *name ) - : K3bView( doc, parent, name ), +K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bView( doc, tqparent, name ), m_doc(doc) { fillStatusDisplay()->showDvdSizes(true); // --- setup GUI --------------------------------------------------- - QSplitter* mainSplitter = new QSplitter( this ); + TQSplitter* mainSplitter = new TQSplitter( this ); m_dataDirTree = new K3bDataDirTreeView( this, doc, mainSplitter ); m_dataFileView = new K3bDataFileView( this, m_dataDirTree, doc, mainSplitter ); m_dataDirTree->setFileView( m_dataFileView ); setMainWidget( mainSplitter ); - connect( m_dataFileView, SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, SLOT(setCurrentDir(K3bDirItem*)) ); + connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); @@ -58,9 +58,9 @@ K3bVideoDvdView::~K3bVideoDvdView() } -K3bProjectBurnDialog* K3bVideoDvdView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bVideoDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bVideoDvdBurnDialog( m_doc, parent, name, true ); + return new K3bVideoDvdBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3bvideodvdview.h b/src/projects/k3bvideodvdview.h index 1125ac4..59dd88d 100644 --- a/src/projects/k3bvideodvdview.h +++ b/src/projects/k3bvideodvdview.h @@ -27,15 +27,16 @@ class K3bDataFileView; class K3bVideoDvdView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bVideoDvdView( K3bVideoDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bVideoDvdView(); void addUrls( const KURL::List& ); protected: - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index 0809f59..ccb2656 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -14,13 +14,13 @@ */ -// include files for Qt -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qptrlist.h> -#include <qtoolbutton.h> +// include files for TQt +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqptrlist.h> +#include <tqtoolbutton.h> #include <kaction.h> #include <kiconloader.h> @@ -40,11 +40,11 @@ #include <k3bcore.h> -K3bView::K3bView( K3bDoc* pDoc, QWidget *parent, const char* name ) - : QWidget( parent, name ), +K3bView::K3bView( K3bDoc* pDoc, TQWidget *tqparent, const char* name ) + : TQWidget( tqparent, name ), m_doc( pDoc ) { - QGridLayout* grid = new QGridLayout( this ); + TQGridLayout* grid = new TQGridLayout( this ); m_toolBox = new K3bToolBox( this, "toolbox" ); m_fillStatusDisplay = new K3bFillStatusDisplay( m_doc, this ); @@ -57,10 +57,10 @@ K3bView::K3bView( K3bDoc* pDoc, QWidget *parent, const char* name ) grid->setSpacing( 5 ); grid->setMargin( 2 ); - KAction* burnAction = new KAction( i18n("&Burn"), "cdburn", CTRL + Key_B, this, SLOT(slotBurn()), + KAction* burnAction = new KAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), actionCollection(), "project_burn"); burnAction->setToolTip( i18n("Open the burn dialog for the current project") ); - KAction* propAction = new KAction( i18n("&Properties"), "edit", CTRL + Key_P, this, SLOT(slotProperties()), + KAction* propAction = new KAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "project_properties"); propAction->setToolTip( i18n("Open the properties dialog") ); @@ -85,9 +85,9 @@ K3bView::~K3bView() } -void K3bView::setMainWidget( QWidget* w ) +void K3bView::setMainWidget( TQWidget* w ) { - static_cast<QGridLayout*>(layout())->addMultiCellWidget( w, 1, 1, 0, 1 ); + static_cast<TQGridLayout*>(tqlayout())->addMultiCellWidget( w, 1, 1, 0, 1 ); } @@ -95,7 +95,7 @@ void K3bView::slotBurn() { if( m_doc->numOfTracks() == 0 || m_doc->size() == 0 ) { KMessageBox::information( this, i18n("Please add files to your project first."), - i18n("No Data to Burn"), QString::null, false ); + i18n("No Data to Burn"), TQString(), false ); } else { K3bProjectBurnDialog* dlg = newBurnDialog( this ); @@ -131,16 +131,16 @@ void K3bView::slotProperties() void K3bView::addPluginButtons( int projectType ) { - QPtrList<K3bPlugin> pl = k3bcore->pluginManager()->plugins( "ProjectPlugin" ); - for( QPtrListIterator<K3bPlugin> it( pl ); *it; ++it ) { + TQPtrList<K3bPlugin> pl = k3bcore->pluginManager()->plugins( "ProjectPlugin" ); + for( TQPtrListIterator<K3bPlugin> it( pl ); *it; ++it ) { K3bProjectPlugin* pp = dynamic_cast<K3bProjectPlugin*>( *it ); if( pp && (pp->type() & projectType) ) { - QToolButton* button = toolBox()->addButton( pp->text(), + TQToolButton* button = toolBox()->addButton( pp->text(), pp->icon(), pp->toolTip(), pp->whatsThis(), - this, - SLOT(slotPluginButtonClicked()) ); + TQT_TQOBJECT(this), + TQT_SLOT(slotPluginButtonClicked()) ); m_plugins.insert( static_cast<void*>(button), pp ); } } @@ -149,7 +149,7 @@ void K3bView::addPluginButtons( int projectType ) void K3bView::slotPluginButtonClicked() { - QObject* o = const_cast<QObject*>(sender()); + TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); if( K3bProjectPlugin* p = m_plugins[static_cast<void*>(o)] ) { if( p->hasGUI() ) { K3bProjectPluginDialog dlg( p, doc(), this ); diff --git a/src/projects/k3bview.h b/src/projects/k3bview.h index 2bd8266..9ca4438 100644 --- a/src/projects/k3bview.h +++ b/src/projects/k3bview.h @@ -21,9 +21,9 @@ #include <config.h> #endif -// include files for Qt -#include <qwidget.h> -#include <qptrdict.h> +// include files for TQt +#include <tqwidget.h> +#include <tqptrdict.h> #include <kxmlguiclient.h> #include <kurl.h> @@ -39,15 +39,16 @@ class K3bProjectPlugin; /** * */ -class K3bView : public QWidget, public KXMLGUIClient +class K3bView : public TQWidget, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: /** * */ - K3bView( K3bDoc* pDoc, QWidget* parent, const char *name = 0 ); + K3bView( K3bDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); virtual ~K3bView(); /** @@ -57,7 +58,7 @@ class K3bView : public QWidget, public KXMLGUIClient K3bDoc* getDocument() const { return m_doc; } K3bDoc* doc() const { return m_doc; } - void setMainWidget( QWidget* ); + void setMainWidget( TQWidget* ); public slots: /** @@ -85,7 +86,7 @@ class K3bView : public QWidget, public KXMLGUIClient /** * Protected since the BurnDialog is not part of the API. */ - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* = 0, const char* = 0 ) = 0; + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* = 0, const char* = 0 ) = 0; /** * Call this to add the projectplugin buttons to the toolbox. It is not called @@ -106,7 +107,7 @@ class K3bView : public QWidget, public KXMLGUIClient K3bFillStatusDisplay* m_fillStatusDisplay; K3bToolBox* m_toolBox; - QPtrDict<K3bProjectPlugin> m_plugins; + TQPtrDict<K3bProjectPlugin> m_plugins; }; #endif // K3BVIEW_H diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc index 5e7fd06..1b17d95 100644 --- a/src/projects/kostore/koStore.cc +++ b/src/projects/kostore/koStore.cc @@ -28,9 +28,9 @@ #include "koZipStore.h" //#include "koDirectoryStore.h" -#include <qfileinfo.h> -#include <qfile.h> -#include <qdir.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqdir.h> #include <kurl.h> #include <kdebug.h> @@ -44,7 +44,7 @@ const int KoStore::s_area = 30002; -KoStore::Backend KoStore::determineBackend( QIODevice* dev ) +KoStore::Backend KoStore::determineBackend( TQIODevice* dev ) { unsigned char buf[5]; if ( dev->readBlock( (char *)buf, 4 ) < 4 ) @@ -56,21 +56,21 @@ KoStore::Backend KoStore::determineBackend( QIODevice* dev ) return DefaultFormat; // fallback } -KoStore* KoStore::createStore( const QString& fileName, Mode mode, const QCString & appIdentification, Backend backend ) +KoStore* KoStore::createStore( const TQString& fileName, Mode mode, const TQCString & appIdentification, Backend backend ) { if ( backend == Auto ) { if ( mode == KoStore::Write ) backend = DefaultFormat; else { - QFileInfo inf( fileName ); + TQFileInfo inf( fileName ); if ( inf.isDir() ) backend = Directory; else { - QFile file( fileName ); + TQFile file( fileName ); if ( file.open( IO_ReadOnly ) ) - backend = determineBackend( &file ); + backend = determineBackend( TQT_TQIODEVICE(&file) ); else backend = DefaultFormat; // will create a "bad" store (bad()==true) } @@ -90,7 +90,7 @@ KoStore* KoStore::createStore( const QString& fileName, Mode mode, const QCStrin } } -KoStore* KoStore::createStore( QIODevice *device, Mode mode, const QCString & appIdentification, Backend backend ) +KoStore* KoStore::createStore( TQIODevice *device, Mode mode, const TQCString & appIdentification, Backend backend ) { if ( backend == Auto ) { @@ -118,12 +118,12 @@ KoStore* KoStore::createStore( QIODevice *device, Mode mode, const QCString & ap } } -KoStore* KoStore::createStore( QWidget* window, const KURL& url, Mode mode, const QCString & appIdentification, Backend backend ) +KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, const TQCString & appIdentification, Backend backend ) { if ( url.isLocalFile() ) return createStore(url.path(), mode, appIdentification, backend ); - QString tmpFile; + TQString tmpFile; if ( mode == KoStore::Write ) { if ( backend == Auto ) @@ -141,10 +141,10 @@ KoStore* KoStore::createStore( QWidget* window, const KURL& url, Mode mode, cons } else if ( backend == Auto ) { - QFile file( tmpFile ); + TQFile file( tmpFile ); if ( file.open( IO_ReadOnly ) ) { - backend = determineBackend( &file ); + backend = determineBackend( TQT_TQIODEVICE(&file) ); file.close(); } } @@ -186,7 +186,7 @@ KoStore::~KoStore() delete m_stream; } -bool KoStore::open( const QString & _name ) +bool KoStore::open( const TQString & _name ) { // This also converts from relative to absolute, i.e. merges the currentPath() m_sName = toExternalNaming( _name ); @@ -208,7 +208,7 @@ bool KoStore::open( const QString & _name ) if ( m_mode == Write ) { kdDebug(s_area) << "KoStore: opening for writing '" << m_sName << "'" << endl; - if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there + if ( m_strFiles.tqfindIndex( m_sName ) != -1 ) // just check if it's there { kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl; //return KIO::ERR_FILE_ALREADY_EXIST; @@ -259,7 +259,7 @@ bool KoStore::close() return ret; } -QIODevice* KoStore::device() const +TQIODevice* KoStore::device() const { if ( !m_bIsOpen ) kdWarning(s_area) << "KoStore: You must open before asking for a device" << endl; @@ -268,9 +268,9 @@ QIODevice* KoStore::device() const return m_stream; } -QByteArray KoStore::read( unsigned long int max ) +TQByteArray KoStore::read( unsigned long int max ) { - QByteArray data; // Data is a QArray<char> + TQByteArray data; // Data is a TQArray<char> if ( !m_bIsOpen ) { @@ -306,12 +306,12 @@ QByteArray KoStore::read( unsigned long int max ) return data; } -Q_LONG KoStore::write( const QByteArray& data ) +TQ_LONG KoStore::write( const TQByteArray& data ) { return write( data.data(), data.size() ); // see below } -Q_LONG KoStore::read( char *_buffer, Q_ULONG _len ) +TQ_LONG KoStore::read( char *_buffer, TQ_ULONG _len ) { if ( !m_bIsOpen ) { @@ -335,7 +335,7 @@ Q_LONG KoStore::read( char *_buffer, Q_ULONG _len ) return m_stream->readBlock( _buffer, _len ); } -Q_LONG KoStore::write( const char* _data, Q_ULONG _len ) +TQ_LONG KoStore::write( const char* _data, TQ_ULONG _len ) { if ( _len == 0L ) return 0; @@ -357,29 +357,29 @@ Q_LONG KoStore::write( const char* _data, Q_ULONG _len ) return nwritten; } -QIODevice::Offset KoStore::size() const +TQIODevice::Offset KoStore::size() const { if ( !m_bIsOpen ) { kdWarning(s_area) << "KoStore: You must open before asking for a size" << endl; - return static_cast<QIODevice::Offset>(-1); + return static_cast<TQIODevice::Offset>(-1); } if ( m_mode != Read ) { kdWarning(s_area) << "KoStore: Can not get size from store that is opened for writing" << endl; - return static_cast<QIODevice::Offset>(-1); + return static_cast<TQIODevice::Offset>(-1); } return m_iSize; } -bool KoStore::enterDirectory( const QString& directory ) +bool KoStore::enterDirectory( const TQString& directory ) { //kdDebug(s_area) << "KoStore::enterDirectory " << directory << endl; int pos; bool success = true; - QString tmp( directory ); + TQString tmp( directory ); - while ( ( pos = tmp.find( '/' ) ) != -1 && + while ( ( pos = tmp.tqfind( '/' ) ) != -1 && ( success = enterDirectoryInternal( tmp.left( pos ) ) ) ) tmp = tmp.mid( pos + 1 ); @@ -398,16 +398,16 @@ bool KoStore::leaveDirectory() return enterAbsoluteDirectory( expandEncodedDirectory( currentPath() ) ); } -QString KoStore::currentDirectory() const +TQString KoStore::currentDirectory() const { return expandEncodedDirectory( currentPath() ); } -QString KoStore::currentPath() const +TQString KoStore::currentPath() const { - QString path; - QStringList::ConstIterator it = m_currentPath.begin(); - QStringList::ConstIterator end = m_currentPath.end(); + TQString path; + TQStringList::ConstIterator it = m_currentPath.begin(); + TQStringList::ConstIterator end = m_currentPath.end(); for ( ; it != end; ++it ) { path += *it; path += '/'; @@ -423,15 +423,15 @@ void KoStore::pushDirectory() void KoStore::popDirectory() { m_currentPath.clear(); - enterAbsoluteDirectory( QString::null ); + enterAbsoluteDirectory( TQString() ); enterDirectory( m_directoryStack.pop() ); } -bool KoStore::addLocalFile( const QString &fileName, const QString &destName ) +bool KoStore::addLocalFile( const TQString &fileName, const TQString &destName ) { - QFileInfo fi( fileName ); + TQFileInfo fi( fileName ); uint size = fi.size(); - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly )) { return false; @@ -442,7 +442,7 @@ bool KoStore::addLocalFile( const QString &fileName, const QString &destName ) return false; } - QByteArray data ( 8 * 1024 ); + TQByteArray data ( 8 * 1024 ); uint total = 0; for ( int block = 0; ( block = file.readBlock ( data.data(), data.size() ) ) > 0; total += block ) @@ -460,12 +460,12 @@ bool KoStore::addLocalFile( const QString &fileName, const QString &destName ) return true; } -bool KoStore::extractFile ( const QString &srcName, const QString &fileName ) +bool KoStore::extractFile ( const TQString &srcName, const TQString &fileName ) { if ( !open ( srcName ) ) return false; - QFile file( fileName ); + TQFile file( fileName ); if( !file.open ( IO_WriteOnly ) ) { @@ -473,14 +473,14 @@ bool KoStore::extractFile ( const QString &srcName, const QString &fileName ) return false; } - QByteArray data ( 8 * 1024 ); + TQByteArray data ( 8 * 1024 ); uint total = 0; for( int block = 0; ( block = read ( data.data(), data.size() ) ) > 0; total += block ) { file.writeBlock ( data.data(), block ); } - if( size() != static_cast<QIODevice::Offset>(-1) ) + if( size() != static_cast<TQIODevice::Offset>(-1) ) Q_ASSERT( total == size() ); file.close(); @@ -489,25 +489,25 @@ bool KoStore::extractFile ( const QString &srcName, const QString &fileName ) return true; } -QStringList KoStore::addLocalDirectory( const QString &dirPath, const QString &destName ) +TQStringList KoStore::addLocalDirectory( const TQString &dirPath, const TQString &destName ) { - QString dot = "."; - QString dotdot = ".."; - QStringList content; + TQString dot = "."; + TQString dotdot = ".."; + TQStringList content; - QDir dir(dirPath); + TQDir dir(dirPath); if ( !dir.exists() ) return 0; - QStringList files = dir.entryList(); - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) + TQStringList files = dir.entryList(); + for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) { if ( *it != dot && *it != dotdot ) { - QString currentFile = dirPath + "/" + *it; - QString dest = destName.isEmpty() ? *it : (destName + "/" + *it); + TQString currentFile = dirPath + "/" + *it; + TQString dest = destName.isEmpty() ? *it : (destName + "/" + *it); - QFileInfo fi ( currentFile ); + TQFileInfo fi ( currentFile ); if ( fi.isFile() ) { addLocalFile ( currentFile, dest ); @@ -524,12 +524,12 @@ QStringList KoStore::addLocalDirectory( const QString &dirPath, const QString &d } -bool KoStore::at( QIODevice::Offset pos ) +bool KoStore::at( TQIODevice::Offset pos ) { return m_stream->at( pos ); } -QIODevice::Offset KoStore::at() const +TQIODevice::Offset KoStore::at() const { return m_stream->at(); } @@ -540,12 +540,12 @@ bool KoStore::atEnd() const } // See the specification for details of what this function does. -QString KoStore::toExternalNaming( const QString & _internalNaming ) const +TQString KoStore::toExternalNaming( const TQString & _internalNaming ) const { if ( _internalNaming == ROOTPART ) return expandEncodedDirectory( currentPath() ) + MAINNAME; - QString intern; + TQString intern; if ( _internalNaming.startsWith( "tar:/" ) ) // absolute reference intern = _internalNaming.mid( 5 ); // remove protocol else @@ -554,22 +554,22 @@ QString KoStore::toExternalNaming( const QString & _internalNaming ) const return expandEncodedPath( intern ); } -QString KoStore::expandEncodedPath( QString intern ) const +TQString KoStore::expandEncodedPath( TQString intern ) const { if ( m_namingVersion == NAMING_VERSION_RAW ) return intern; - QString result; + TQString result; int pos; - if ( ( pos = intern.findRev( '/', -1 ) ) != -1 ) { + if ( ( pos = intern.tqfindRev( '/', -1 ) ) != -1 ) { result = expandEncodedDirectory( intern.left( pos ) ) + '/'; intern = intern.mid( pos + 1 ); } // Now process the filename. If the first character is numeric, we have // a main document. - if ( QChar(intern.at(0)).isDigit() ) + if ( TQChar(intern.at(0)).isDigit() ) { // If this is the first part name, check if we have a store with // old-style names. @@ -588,27 +588,27 @@ QString KoStore::expandEncodedPath( QString intern ) const return result; } -QString KoStore::expandEncodedDirectory( QString intern ) const +TQString KoStore::expandEncodedDirectory( TQString intern ) const { if ( m_namingVersion == NAMING_VERSION_RAW ) return intern; - QString result; + TQString result; int pos; - while ( ( pos = intern.find( '/' ) ) != -1 ) { - if ( QChar(intern.at(0)).isDigit() ) + while ( ( pos = intern.tqfind( '/' ) ) != -1 ) { + if ( TQChar(intern.at(0)).isDigit() ) result += "part"; result += intern.left( pos + 1 ); // copy numbers (or "pictures") + "/" intern = intern.mid( pos + 1 ); // remove the dir we just processed } - if ( QChar(intern.at(0)).isDigit() ) + if ( TQChar(intern.at(0)).isDigit() ) result += "part"; result += intern; return result; } -bool KoStore::enterDirectoryInternal( const QString& directory ) +bool KoStore::enterDirectoryInternal( const TQString& directory ) { if ( enterRelativeDirectory( expandEncodedDirectory( directory ) ) ) { @@ -623,7 +623,7 @@ void KoStore::disallowNameExpansion( void ) m_namingVersion = NAMING_VERSION_RAW; } -bool KoStore::hasFile( const QString& fileName ) const +bool KoStore::hasFile( const TQString& fileName ) const { return fileExists( toExternalNaming( currentPath() + fileName ) ); } diff --git a/src/projects/kostore/koStore.h b/src/projects/kostore/koStore.h index a22c5f3..331bc8b 100644 --- a/src/projects/kostore/koStore.h +++ b/src/projects/kostore/koStore.h @@ -21,16 +21,16 @@ #ifndef __koStore_h_ #define __koStore_h_ -#include <qstring.h> -#include <qstringlist.h> -#include <qiodevice.h> -#include <qvaluestack.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqiodevice.h> +#include <tqvaluestack.h> //#include <koffice_export.h> #include <kdemacros.h> #define KOSTORE_EXPORT KDE_EXPORT -class QWidget; +class TQWidget; class KURL; @@ -61,14 +61,14 @@ public: * to be written in the file for "mime-magic" identification. * Only meaningful if mode is Write, and if backend!=Directory. */ - static KoStore* createStore( const QString& fileName, Mode mode, const QCString & appIdentification = "", Backend backend = Auto ); + static KoStore* createStore( const TQString& fileName, Mode mode, const TQCString & appIdentification = "", Backend backend = Auto ); /** - * Create a store for any kind of QIODevice: file, memory buffer... - * KoStore will take care of opening the QIODevice. + * Create a store for any kind of TQIODevice: file, memory buffer... + * KoStore will take care of opening the TQIODevice. * This method doesn't support the Directory store! */ - static KoStore* createStore( QIODevice *device, Mode mode, const QCString & appIdentification = "", Backend backend = Auto ); + static KoStore* createStore( TQIODevice *device, Mode mode, const TQCString & appIdentification = "", Backend backend = Auto ); /** * Open a store (i.e. the representation on disk of a KOffice document). @@ -90,7 +90,7 @@ public: * @since 1.4 * @bug saving not completely implemented (fixed temporary file) */ - static KoStore* createStore( QWidget* window, const KURL& url, Mode mode, const QCString & appIdentification = "", Backend backend = Auto ); + static KoStore* createStore( TQWidget* window, const KURL& url, Mode mode, const TQCString & appIdentification = "", Backend backend = Auto ); /** * Destroys the store (i.e. closes the file on the hard disk) @@ -103,7 +103,7 @@ public: * If the tar:/ prefix is missing it's assumed to be a relative URI. * @return true on success. */ - bool open( const QString & name ); + bool open( const TQString & name ); /** * Check whether a file inside the store is currently opened with open(), @@ -123,38 +123,38 @@ public: * (slightly faster than read() calls) * You need to call @ref open first, and @ref close afterwards. */ - QIODevice* device() const; + TQIODevice* device() const; /** * Read data from the currently opened file. You can also use the streams * for this. */ - QByteArray read( unsigned long int max ); + TQByteArray read( unsigned long int max ); /** * Write data into the currently opened file. You can also use the streams * for this. */ - Q_LONG write( const QByteArray& _data ); + TQ_LONG write( const TQByteArray& _data ); /** * Read data from the currently opened file. You can also use the streams * for this. * @return size of data read, -1 on error */ - Q_LONG read( char *_buffer, Q_ULONG _len ); + TQ_LONG read( char *_buffer, TQ_ULONG _len ); /** * Write data into the currently opened file. You can also use the streams * for this. */ - virtual Q_LONG write( const char* _data, Q_ULONG _len ); + virtual TQ_LONG write( const char* _data, TQ_ULONG _len ); /** * @return the size of the currently opened file, -1 on error. * Can be used as an argument for the read methods, for instance */ - QIODevice::Offset size() const; + TQIODevice::Offset size() const; /** * @return true if an error occurred @@ -175,7 +175,7 @@ public: * opening a stream. * Note: Operates on internal names */ - bool enterDirectory( const QString& directory ); + bool enterDirectory( const TQString& directory ); /** * Leaves a directory. Equivalent to "cd .." @@ -188,13 +188,13 @@ public: * Returns the current path including a trailing slash. * Note: Returns a path in "internal name" style */ - QString currentPath() const; + TQString currentPath() const; /** * Returns the current directory. * Note: Returns a path in "internal name" style */ - QString currentDirectory() const; + TQString currentDirectory() const; /** @@ -213,14 +213,14 @@ public: * @return true if the given file exists in the current directory, * i.e. if open(fileName) will work. */ - bool hasFile( const QString& fileName ) const; + bool hasFile( const TQString& fileName ) const; /** * Imports a local file into a store * @param fileName file on hard disk * @param destName file in the store */ - bool addLocalFile( const QString &fileName, const QString &destName ); + bool addLocalFile( const TQString &fileName, const TQString &destName ); /** * Imports a local directory @@ -228,7 +228,7 @@ public: * @param dest path in the store where the directory should get saved * @return the directory index */ - QStringList addLocalDirectory( const QString &dirPath, const QString &dest ); + TQStringList addLocalDirectory( const TQString &dirPath, const TQString &dest ); /** @@ -236,12 +236,12 @@ public: * @param srcName file in the store * @param fileName file on a disk */ - bool extractFile( const QString &srcName, const QString &fileName ); + bool extractFile( const TQString &srcName, const TQString &fileName ); //@{ - /// See QIODevice - bool at( QIODevice::Offset pos ); - QIODevice::Offset at() const; + /// See TQIODevice + bool at( TQIODevice::Offset pos ); + TQIODevice::Offset at() const; bool atEnd() const; //@} @@ -267,7 +267,7 @@ protected: * @param name "absolute path" (in the archive) to the file to open * @return true on success */ - virtual bool openWrite( const QString& name ) = 0; + virtual bool openWrite( const TQString& name ) = 0; /** * Open the file @p name in the store, for reading. * On success, this method must set m_stream to a stream from which we can read, @@ -275,7 +275,7 @@ protected: * @param name "absolute path" (in the archive) to the file to open * @return true on success */ - virtual bool openRead( const QString& name ) = 0; + virtual bool openRead( const TQString& name ) = 0; /** * @return true on success @@ -290,21 +290,21 @@ protected: * Enter a subdirectory of the current directory. * The directory might not exist yet in Write mode. */ - virtual bool enterRelativeDirectory( const QString& dirName ) = 0; + virtual bool enterRelativeDirectory( const TQString& dirName ) = 0; /** * Enter a directory where we've been before. * It is guaranteed to always exist. */ - virtual bool enterAbsoluteDirectory( const QString& path ) = 0; + virtual bool enterAbsoluteDirectory( const TQString& path ) = 0; /** * Check if a file exists inside the store. * @param absPath the absolute path inside the store, i.e. not relative to the current directory */ - virtual bool fileExists( const QString& absPath ) const = 0; + virtual bool fileExists( const TQString& absPath ) const = 0; private: - static Backend determineBackend( QIODevice* dev ); + static Backend determineBackend( TQIODevice* dev ); /** * Conversion routine @@ -319,18 +319,18 @@ private: * * see specification (koffice/lib/store/SPEC) for details. */ - QString toExternalNaming( const QString & _internalNaming ) const; + TQString toExternalNaming( const TQString & _internalNaming ) const; /** * Expands a full path name for a stream (directories+filename) */ - QString expandEncodedPath( QString intern ) const; + TQString expandEncodedPath( TQString intern ) const; /** * Expands only directory names(!) * Needed for the path handling code, as we only operate on internal names */ - QString expandEncodedDirectory( QString intern ) const; + TQString expandEncodedDirectory( TQString intern ) const; mutable enum { @@ -343,28 +343,28 @@ private: * Enter *one* single directory. Nothing like foo/bar/bleh allowed. * Performs some checking when in Read mode */ - bool enterDirectoryInternal( const QString& directory ); + bool enterDirectoryInternal( const TQString& directory ); protected: Mode m_mode; /// Store the filenames (with full path inside the archive) when writing, to avoid duplicates - QStringList m_strFiles; + TQStringList m_strFiles; /// The "current directory" (path) - QStringList m_currentPath; + TQStringList m_currentPath; /// Used to push/pop directories to make it easy to save/restore the state - QValueStack<QString> m_directoryStack; + TQValueStack<TQString> m_directoryStack; /// Current filename (between an open() and a close()) - QString m_sName; + TQString m_sName; /// Current size of the file named m_sName - QIODevice::Offset m_iSize; + TQIODevice::Offset m_iSize; /// The stream for the current read or write operation - QIODevice * m_stream; + TQIODevice * m_stream; bool m_bIsOpen; /// Must be set by the constructor. diff --git a/src/projects/kostore/koStoreBase.h b/src/projects/kostore/koStoreBase.h index 0987577..c3792e5 100644 --- a/src/projects/kostore/koStoreBase.h +++ b/src/projects/kostore/koStoreBase.h @@ -44,8 +44,8 @@ protected: */ KURL m_url; FileMode m_fileMode; - QString m_localFileName; - QWidget* m_window; + TQString m_localFileName; + TQWidget* m_window; }; #endif //KOSTORE_BASE_H diff --git a/src/projects/kostore/koStoreDevice.h b/src/projects/kostore/koStoreDevice.h index b245d60..df8cebf 100644 --- a/src/projects/kostore/koStoreDevice.h +++ b/src/projects/kostore/koStoreDevice.h @@ -23,11 +23,11 @@ #include "koStore.h" /** - * This class implements a QIODevice around KoStore, so that - * it can be used to create a QDomDocument from it, to be written or read - * using QDataStream or to be written using QTextStream + * This class implements a TQIODevice around KoStore, so that + * it can be used to create a TQDomDocument from it, to be written or read + * using TQDataStream or to be written using TQTextStream */ -class KoStoreDevice : public QIODevice +class KoStoreDevice : public TQIODevice { public: /// Note: KoStore::open() should be called before calling this. @@ -46,17 +46,26 @@ public: void close() { } void flush() { } +#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 + +#ifdef USE_QT4 + qint64 size() const { +#else // USE_QT4 Offset size() const { +#endif // USE_QT4 if ( m_store->mode() == KoStore::Read ) return m_store->size(); else return 0xffffffff; } - virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ) { return m_store->read(data, maxlen); } - virtual Q_LONG writeBlock( const char *data, Q_ULONG len ) { return m_store->write( data, len ); } + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ) { return m_store->read(data, maxlen); } + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ) { return m_store->write( data, len ); } // Not virtual, only to uncover shadow - Q_LONG writeBlock( const QByteArray& data ) { return QIODevice::writeBlock( data ); } + TQ_LONG writeBlock( const TQByteArray& data ) { return TQIODevice::writeBlock( data ); } int getch() { char c[2]; @@ -76,7 +85,7 @@ public: } int ungetch( int ) { return -1; } // unsupported - // See QIODevice + // See TQIODevice virtual bool at( Offset pos ) { return m_store->at(pos); } virtual Offset at() const { return m_store->at(); } virtual bool atEnd() const { return m_store->atEnd(); } diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc index ed3fec4..4b63a4c 100644 --- a/src/projects/kostore/koZipStore.cc +++ b/src/projects/kostore/koZipStore.cc @@ -19,7 +19,7 @@ #include "koZipStore.h" -#include <qbuffer.h> +#include <tqbuffer.h> #include <kzip.h> #include <kdebug.h> @@ -27,11 +27,11 @@ #include <kurl.h> #include <kio/netaccess.h> #if ! KDE_IS_VERSION( 3, 4, 1 ) -#include <qdir.h> -#include <qfileinfo.h> +#include <tqdir.h> +#include <tqfileinfo.h> #endif -KoZipStore::KoZipStore( const QString & _filename, Mode _mode, const QCString & appIdentification ) +KoZipStore::KoZipStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification ) { kdDebug(s_area) << "KoZipStore Constructor filename = " << _filename << " mode = " << int(_mode) @@ -42,8 +42,8 @@ KoZipStore::KoZipStore( const QString & _filename, Mode _mode, const QCString & #if ! KDE_IS_VERSION( 3, 4, 1 ) // Workaround for KZip KSaveFile double deletion in kdelibs-3.4, // when trying to write to a non-writable directory. - QDir dir( QFileInfo( _filename ).dir() ); - if (_mode == Write && !QFileInfo( dir.path() ).isWritable() ) + TQDir dir( TQFileInfo( _filename ).dir() ); + if (_mode == Write && !TQFileInfo( dir.path() ).isWritable() ) { kdWarning(s_area) << dir.path() << " isn't writable" << endl; m_bGood = false; @@ -57,13 +57,13 @@ KoZipStore::KoZipStore( const QString & _filename, Mode _mode, const QCString & } } -KoZipStore::KoZipStore( QIODevice *dev, Mode mode, const QCString & appIdentification ) +KoZipStore::KoZipStore( TQIODevice *dev, Mode mode, const TQCString & appIdentification ) { m_pZip = new KZip( dev ); m_bGood = init( mode, appIdentification ); } -KoZipStore::KoZipStore( QWidget* window, const KURL & _url, const QString & _filename, Mode _mode, const QCString & appIdentification ) +KoZipStore::KoZipStore( TQWidget* window, const KURL & _url, const TQString & _filename, Mode _mode, const TQCString & appIdentification ) { kdDebug(s_area) << "KoZipStore Constructor url" << _url.prettyURL() << " filename = " << _filename @@ -107,7 +107,7 @@ KoZipStore::~KoZipStore() } } -bool KoZipStore::init( Mode _mode, const QCString& appIdentification ) +bool KoZipStore::init( Mode _mode, const TQCString& appIdentification ) { KoStore::init( _mode ); m_currentDir = 0; @@ -129,12 +129,12 @@ bool KoZipStore::init( Mode _mode, const QCString& appIdentification ) return good; } -bool KoZipStore::openWrite( const QString& name ) +bool KoZipStore::openWrite( const TQString& name ) { #if 0 // Prepare memory buffer for writing m_byteArray.resize( 0 ); - m_stream = new QBuffer( m_byteArray ); + m_stream = new TQBuffer( m_byteArray ); m_stream->open( IO_WriteOnly ); return true; #endif @@ -142,7 +142,7 @@ bool KoZipStore::openWrite( const QString& name ) return m_pZip->prepareWriting( name, "", "" /*m_pZip->rootDir()->user(), m_pZip->rootDir()->group()*/, 0 ); } -bool KoZipStore::openRead( const QString& name ) +bool KoZipStore::openRead( const TQString& name ) { const KArchiveEntry * entry = m_pZip->directory()->entry( name ); if ( entry == 0L ) @@ -165,7 +165,7 @@ bool KoZipStore::openRead( const QString& name ) return true; } -Q_LONG KoZipStore::write( const char* _data, Q_ULONG _len ) +TQ_LONG KoZipStore::write( const char* _data, TQ_ULONG _len ) { if ( _len == 0L ) return 0; //kdDebug(s_area) << "KoZipStore::write " << _len << endl; @@ -200,7 +200,7 @@ bool KoZipStore::closeWrite() #endif } -bool KoZipStore::enterRelativeDirectory( const QString& dirName ) +bool KoZipStore::enterRelativeDirectory( const TQString& dirName ) { if ( m_mode == Read ) { if ( !m_currentDir ) { @@ -218,7 +218,7 @@ bool KoZipStore::enterRelativeDirectory( const QString& dirName ) return true; } -bool KoZipStore::enterAbsoluteDirectory( const QString& path ) +bool KoZipStore::enterAbsoluteDirectory( const TQString& path ) { if ( path.isEmpty() ) { @@ -230,7 +230,7 @@ bool KoZipStore::enterAbsoluteDirectory( const QString& path ) return m_currentDir != 0; } -bool KoZipStore::fileExists( const QString& absPath ) const +bool KoZipStore::fileExists( const TQString& absPath ) const { const KArchiveEntry *entry = m_pZip->directory()->entry( absPath ); return entry && entry->isFile(); diff --git a/src/projects/kostore/koZipStore.h b/src/projects/kostore/koZipStore.h index e87f5e4..557cca3 100644 --- a/src/projects/kostore/koZipStore.h +++ b/src/projects/kostore/koZipStore.h @@ -29,26 +29,26 @@ class KURL; class KoZipStore : public KoStoreBase { public: - KoZipStore( const QString & _filename, Mode _mode, const QCString & appIdentification ); - KoZipStore( QIODevice *dev, Mode mode, const QCString & appIdentification ); + KoZipStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification ); + KoZipStore( TQIODevice *dev, Mode mode, const TQCString & appIdentification ); /** * KURL-constructor * @todo saving not completely implemented (fixed temporary file) * @since 1.4 */ - KoZipStore( QWidget* window, const KURL& _url, const QString & _filename, Mode _mode, const QCString & appIdentification ); + KoZipStore( TQWidget* window, const KURL& _url, const TQString & _filename, Mode _mode, const TQCString & appIdentification ); ~KoZipStore(); - virtual Q_LONG write( const char* _data, Q_ULONG _len ); + virtual TQ_LONG write( const char* _data, TQ_ULONG _len ); protected: - virtual bool init( Mode _mode, const QCString& appIdentification ); - virtual bool openWrite( const QString& name ); - virtual bool openRead( const QString& name ); + virtual bool init( Mode _mode, const TQCString& appIdentification ); + virtual bool openWrite( const TQString& name ); + virtual bool openRead( const TQString& name ); virtual bool closeWrite(); virtual bool closeRead() { return true; } - virtual bool enterRelativeDirectory( const QString& dirName ); - virtual bool enterAbsoluteDirectory( const QString& path ); - virtual bool fileExists( const QString& absPath ) const; + virtual bool enterRelativeDirectory( const TQString& dirName ); + virtual bool enterAbsoluteDirectory( const TQString& path ); + virtual bool fileExists( const TQString& absPath ) const; /// The archive KZip * m_pZip; diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui index 04355b4..db1848a 100644 --- a/src/rip/base_k3baudiorippingoptionwidget.ui +++ b/src/rip/base_k3baudiorippingoptionwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bAudioRippingOptionWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -41,7 +41,7 @@ </sizepolicy> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonConfigurePlugin</cstring> </property> @@ -54,7 +54,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -65,7 +65,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkCreatePlaylist</cstring> </property> @@ -81,9 +81,9 @@ which can be used with programs like xmms or noatun. <p>You may use the special strings to give the playlist a unique filename.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -99,14 +99,14 @@ which can be used with programs like xmms or noatun. <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkPlaylistRelative</cstring> </property> @@ -128,7 +128,7 @@ playlist will look something like: <em>cool/track1.ogg</em>.</string </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkSingleFile</cstring> </property> @@ -146,9 +146,9 @@ file will contain all tracks one after the other. <p><b>Caution:</b> The file will have the name of the first track.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6_2</cstring> + <cstring>tqlayout6_2</cstring> </property> <hbox> <property name="name"> @@ -164,14 +164,14 @@ file will contain all tracks one after the other. <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkWriteCueFile</cstring> </property> @@ -192,7 +192,7 @@ file will contain all tracks one after the other. </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -211,7 +211,7 @@ file will contain all tracks one after the other. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -224,18 +224,18 @@ file will contain all tracks one after the other. <cstring>m_editBaseDir</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_labelFreeSpace</cstring> </property> <property name="text"> <string>-</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -243,14 +243,14 @@ file will contain all tracks one after the other. <string>Space needed:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_labelNeededSpace</cstring> </property> <property name="text"> <string>-</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -274,7 +274,7 @@ file will contain all tracks one after the other. <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui index cafaa5d..2a1f617 100644 --- a/src/rip/base_k3bcddbpatternwidget.ui +++ b/src/rip/base_k3bcddbpatternwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bCddbPatternWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bPatternOptionTab</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,15 +25,15 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkBlankReplace</cstring> </property> @@ -54,7 +54,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -78,7 +78,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -105,9 +105,9 @@ <string>Insert your custom pattern here</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>2</height> @@ -137,7 +137,7 @@ <property name="text"> <string>See special strings</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -148,7 +148,7 @@ <property name="text"> <string>About conditional inclusion</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -172,7 +172,7 @@ <tabstop>m_checkBlankReplace</tabstop> <tabstop>m_editBlankReplace</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurllabel.h</includehint> <includehint>kurllabel.h</includehint> diff --git a/src/rip/k3baudiocdlistview.cpp b/src/rip/k3baudiocdlistview.cpp index b5f8566..fe7fcde 100644 --- a/src/rip/k3baudiocdlistview.cpp +++ b/src/rip/k3baudiocdlistview.cpp @@ -18,12 +18,12 @@ #include <klocale.h> -#include <qheader.h> -#include <qtooltip.h> +#include <tqheader.h> +#include <tqtooltip.h> -K3bAudioCdListView::K3bAudioCdListView( K3bAudioCdView* view, QWidget* parent, const char* name ) - : K3bListView( parent, name ), +K3bAudioCdListView::K3bAudioCdListView( K3bAudioCdView* view, TQWidget* tqparent, const char* name ) + : K3bListView( tqparent, name ), m_view(view) { setFullWidth(true); @@ -41,13 +41,13 @@ K3bAudioCdListView::K3bAudioCdListView( K3bAudioCdView* view, QWidget* parent, c setDoubleClickForEdit( true ); header()->setClickEnabled(false); - setColumnWidthMode( 0, QListView::Manual ); + setColumnWidthMode( 0, TQListView::Manual ); setColumnWidth( 0, 20 ); header()->setResizeEnabled( false,0 ); - setColumnAlignment( 4, Qt::AlignHCenter ); + setColumnAlignment( 4, TQt::AlignHCenter ); - QToolTip::add( viewport(), i18n("Check the tracks that should be ripped") ); + TQToolTip::add( viewport(), i18n("Check the tracks that should be ripped") ); } @@ -56,7 +56,7 @@ K3bAudioCdListView::~K3bAudioCdListView() } -QDragObject* K3bAudioCdListView::dragObject() +TQDragObject* K3bAudioCdListView::dragObject() { return m_view->dragObject(); } diff --git a/src/rip/k3baudiocdlistview.h b/src/rip/k3baudiocdlistview.h index 1ce4a90..dccdc20 100644 --- a/src/rip/k3baudiocdlistview.h +++ b/src/rip/k3baudiocdlistview.h @@ -18,7 +18,7 @@ #include <k3blistview.h> -class QDragObject; +class TQDragObject; class K3bAudioCdView; /** @@ -27,16 +27,17 @@ class K3bAudioCdView; class K3bAudioCdListView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bAudioCdListView( K3bAudioCdView*, QWidget* parent = 0, const char* name = 0 ); + K3bAudioCdListView( K3bAudioCdView*, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioCdListView(); protected: /** * @reimpl from KListView */ - QDragObject* dragObject(); + TQDragObject* dragObject(); private: K3bAudioCdView* m_view; diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index d225922..f8e5c0a 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -46,13 +46,13 @@ #include <kstandarddirs.h> #include <kdialogbase.h> -#include <qlayout.h> -#include <qheader.h> -#include <qlabel.h> -#include <qframe.h> -#include <qspinbox.h> -#include <qfont.h> -#include <qdragobject.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqspinbox.h> +#include <tqfont.h> +#include <tqdragobject.h> @@ -60,14 +60,14 @@ class K3bAudioCdView::AudioTrackViewItem : public K3bCheckListViewItem { public: - AudioTrackViewItem( QListView* parent, - QListViewItem* after, + AudioTrackViewItem( TQListView* tqparent, + TQListViewItem* after, int _trackNumber, const K3b::Msf& length) - : K3bCheckListViewItem( parent, after ) { + : K3bCheckListViewItem( tqparent, after ) { - setText( 1, QString::number(_trackNumber).rightJustify( 2, ' ' ) ); - setText( 3, i18n("Track %1").arg(_trackNumber) ); + setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) ); + setText( 3, i18n("Track %1").tqarg(_trackNumber) ); setText( 4, " " + length.toString() + " " ); setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " ); @@ -94,24 +94,24 @@ public: }; -K3bAudioCdView::K3bAudioCdView( QWidget* parent, const char *name ) +K3bAudioCdView::K3bAudioCdView( TQWidget* tqparent, const char *name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_AUDIO, K3bDevice::MEDIA_CD_ALL, K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE, - parent, name ) + tqparent, name ) { - QGridLayout* mainGrid = new QGridLayout( mainWidget() ); + TQGridLayout* mainGrid = new TQGridLayout( mainWidget() ); // toolbox // ---------------------------------------------------------------------------------- - QHBoxLayout* toolBoxLayout = new QHBoxLayout( 0, 0, 0, "toolBoxLayout" ); + TQHBoxLayout* toolBoxLayout = new TQHBoxLayout( 0, 0, 0, "toolBoxLayout" ); m_toolBox = new K3bToolBox( mainWidget() ); toolBoxLayout->addWidget( m_toolBox ); - QSpacerItem* spacer = new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); toolBoxLayout->addItem( spacer ); - m_labelLength = new QLabel( mainWidget() ); - m_labelLength->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_labelLength = new TQLabel( mainWidget() ); + m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); toolBoxLayout->addWidget( m_labelLength ); @@ -119,21 +119,21 @@ K3bAudioCdView::K3bAudioCdView( QWidget* parent, const char *name ) // ---------------------------------------------------------------------------------- m_trackView = new K3bAudioCdListView( this, mainWidget() ); - connect( m_trackView, SIGNAL(itemRenamed(QListViewItem*, const QString&, int)), - this, SLOT(slotItemRenamed(QListViewItem*, const QString&, int)) ); - connect( m_trackView, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); -// connect( m_trackView, SIGNAL(selectionChanged(QListViewItem*)), -// this, SLOT(slotTrackSelectionChanged(QListViewItem*)) ); + connect( m_trackView, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), + this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)) ); + connect( m_trackView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); +// connect( m_trackView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), +// this, TQT_SLOT(slotTrackSelectionChanged(TQListViewItem*)) ); mainGrid->addLayout( toolBoxLayout, 0, 0 ); mainGrid->addWidget( m_trackView, 1, 0 ); - m_cddb = new K3bCddb( this ); + m_cddb = new K3bCddb( TQT_TQOBJECT(this) ); - connect( m_cddb, SIGNAL(queryFinished(int)), - this, SLOT(slotCddbQueryFinished(int)) ); + connect( m_cddb, TQT_SIGNAL(queryFinished(int)), + this, TQT_SLOT(slotCddbQueryFinished(int)) ); initActions(); // slotTrackSelectionChanged(0); @@ -142,7 +142,7 @@ K3bAudioCdView::K3bAudioCdView( QWidget* parent, const char *name ) setRightPixmap( K3bTheme::MEDIA_AUDIO ); m_busyInfoLabel = new K3bThemedLabel( i18n("Searching for Artist information..."), this ); - m_busyInfoLabel->setFrameStyle( QFrame::Box|QFrame::Plain ); + m_busyInfoLabel->setFrameStyle( TQFrame::Box|TQFrame::Plain ); m_busyInfoLabel->setMargin( 6 ); m_busyInfoLabel->hide(); } @@ -160,7 +160,7 @@ void K3bAudioCdView::reloadMedium() // initialize cddb info for editing m_cddbInfo = K3bCddbResultEntry(); - m_cddbInfo.discid = QString::number( medium().toc().discId(), 16 ); + m_cddbInfo.discid = TQString::number( medium().toc().discId(), 16 ); for( int i = 0; i < (int)m_toc.count(); ++i ) { m_cddbInfo.titles.append(""); @@ -226,33 +226,33 @@ void K3bAudioCdView::initActions() { m_actionCollection = new KActionCollection( this ); - KAction* actionSelectAll = new KAction( i18n("Check All"), 0, 0, this, - SLOT(slotCheckAll()), actionCollection(), + KAction* actionSelectAll = new KAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), + TQT_SLOT(slotCheckAll()), actionCollection(), "check_all" ); - KAction* actionDeselectAll = new KAction( i18n("Uncheck All"), 0, 0, this, - SLOT(slotUncheckAll()), actionCollection(), + KAction* actionDeselectAll = new KAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), + TQT_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); - KAction* actionSelect = new KAction( i18n("Check Track"), 0, 0, this, - SLOT(slotSelect()), actionCollection(), + KAction* actionSelect = new KAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), + TQT_SLOT(slotSelect()), actionCollection(), "select_track" ); - KAction* actionDeselect = new KAction( i18n("Uncheck Track"), 0, 0, this, - SLOT(slotDeselect()), actionCollection(), + KAction* actionDeselect = new KAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), + TQT_SLOT(slotDeselect()), actionCollection(), "deselect_track" ); - KAction* actionEditTrackCddbInfo = new KAction( i18n("Edit Track cddb Info"), "edit", 0, this, - SLOT(slotEditTrackCddb()), actionCollection(), + KAction* actionEditTrackCddbInfo = new KAction( i18n("Edit Track cddb Info"), "edit", 0, TQT_TQOBJECT(this), + TQT_SLOT(slotEditTrackCddb()), actionCollection(), "edit_track_cddb" ); - KAction* actionEditAlbumCddbInfo = new KAction( i18n("Edit Album cddb Info"), "edit", 0, this, - SLOT(slotEditAlbumCddb()), actionCollection(), + KAction* actionEditAlbumCddbInfo = new KAction( i18n("Edit Album cddb Info"), "edit", 0, TQT_TQOBJECT(this), + TQT_SLOT(slotEditAlbumCddb()), actionCollection(), "edit_album_cddb" ); - KAction* actionStartRip = new KAction( i18n("Start Ripping"), "cddarip", 0, this, - SLOT(startRip()), actionCollection(), "start_rip" ); + KAction* actionStartRip = new KAction( i18n("Start Ripping"), "cddarip", 0, TQT_TQOBJECT(this), + TQT_SLOT(startRip()), actionCollection(), "start_rip" ); - KAction* actionQueryCddb = new KAction( i18n("Query cddb"), "reload", 0, this, - SLOT(queryCddb()), actionCollection(), "query_cddb" ); + KAction* actionQueryCddb = new KAction( i18n("Query cddb"), "reload", 0, TQT_TQOBJECT(this), + TQT_SLOT(queryCddb()), actionCollection(), "query_cddb" ); - KAction* actionSaveCddbLocally = new KAction( i18n("Save Cddb Entry Locally"), "filesave", 0, this, - SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); + KAction* actionSaveCddbLocally = new KAction( i18n("Save Cddb Entry Locally"), "filesave", 0, TQT_TQOBJECT(this), + TQT_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); // TODO: set the actions tooltips and whatsthis infos @@ -279,13 +279,13 @@ void K3bAudioCdView::initActions() } -void K3bAudioCdView::slotContextMenu( KListView*, QListViewItem*, const QPoint& p ) +void K3bAudioCdView::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& p ) { m_popupMenu->popup(p); } -void K3bAudioCdView::slotItemRenamed( QListViewItem* item, const QString& str, int col ) +void K3bAudioCdView::slotItemRenamed( TQListViewItem* item, const TQString& str, int col ) { AudioTrackViewItem* a = (AudioTrackViewItem*)item; if( col == 2 ) @@ -297,7 +297,7 @@ void K3bAudioCdView::slotItemRenamed( QListViewItem* item, const QString& str, i } -void K3bAudioCdView::slotTrackSelectionChanged( QListViewItem* item ) +void K3bAudioCdView::slotTrackSelectionChanged( TQListViewItem* item ) { actionCollection()->action("edit_track_cddb")->setEnabled( item != 0 ); actionCollection()->action("select_track")->setEnabled( item != 0 ); @@ -307,8 +307,8 @@ void K3bAudioCdView::slotTrackSelectionChanged( QListViewItem* item ) void K3bAudioCdView::startRip() { - QValueList<int> trackNumbers; - for( QListViewItemIterator it( m_trackView ); it.current(); ++it ) { + TQValueList<int> trackNumbers; + for( TQListViewItemIterator it( m_trackView ); it.current(); ++it ) { AudioTrackViewItem* a = (AudioTrackViewItem*)it.current(); if( a->isChecked() ) trackNumbers.append( a->trackNumber ); @@ -331,37 +331,37 @@ void K3bAudioCdView::startRip() void K3bAudioCdView::slotEditTrackCddb() { - QPtrList<QListViewItem> items( m_trackView->selectedItems() ); + TQPtrList<TQListViewItem> items( m_trackView->selectedItems() ); if( !items.isEmpty() ) { AudioTrackViewItem* a = static_cast<AudioTrackViewItem*>(items.first()); - KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").arg(a->trackNumber), + KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").tqarg(a->trackNumber), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true); - QWidget* w = new QWidget( &d ); + TQWidget* w = new TQWidget( &d ); KLineEdit* editTitle = new KLineEdit( m_cddbInfo.titles[a->trackNumber-1], w ); KLineEdit* editArtist = new KLineEdit( m_cddbInfo.artists[a->trackNumber-1], w ); KLineEdit* editExtInfo = new KLineEdit( m_cddbInfo.extInfos[a->trackNumber-1], w ); - QFrame* line = new QFrame( w ); - line->setFrameShape( QFrame::HLine ); - line->setFrameShadow( QFrame::Sunken ); + TQFrame* line = new TQFrame( w ); + line->setFrameShape( TQFrame::HLine ); + line->setFrameShadow( TQFrame::Sunken ); - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setSpacing( KDialog::spacingHint() ); - grid->addWidget( new QLabel( i18n("Title:"), w ), 0, 0 ); + grid->addWidget( new TQLabel( i18n("Title:"), w ), 0, 0 ); grid->addWidget( editTitle, 0, 1 ); grid->addMultiCellWidget( line, 1, 1, 0, 1 ); - grid->addWidget( new QLabel( i18n("Artist:"), w ), 2, 0 ); + grid->addWidget( new TQLabel( i18n("Artist:"), w ), 2, 0 ); grid->addWidget( editArtist, 2, 1 ); - grid->addWidget( new QLabel( i18n("Extra info:"), w ), 3, 0 ); + grid->addWidget( new TQLabel( i18n("Extra info:"), w ), 3, 0 ); grid->addWidget( editExtInfo, 3, 1 ); grid->setRowStretch( 4, 1 ); d.setMainWidget(w); - d.resize( QMAX( QMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() ); + d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() ); - if( d.exec() == QDialog::Accepted ) { + if( d.exec() == TQDialog::Accepted ) { m_cddbInfo.titles[a->trackNumber-1] = editTitle->text(); m_cddbInfo.artists[a->trackNumber-1] = editArtist->text(); m_cddbInfo.extInfos[a->trackNumber-1] = editExtInfo->text(); @@ -375,17 +375,17 @@ void K3bAudioCdView::slotEditAlbumCddb() { KDialogBase d( this, "trackCddbDialog", true, i18n("Album Cddb"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true); - QWidget* w = new QWidget( &d ); + TQWidget* w = new TQWidget( &d ); KLineEdit* editTitle = new KLineEdit( m_cddbInfo.cdTitle, w ); KLineEdit* editArtist = new KLineEdit( m_cddbInfo.cdArtist, w ); KLineEdit* editExtInfo = new KLineEdit( m_cddbInfo.cdExtInfo, w ); KLineEdit* editGenre = new KLineEdit( m_cddbInfo.genre, w ); - QSpinBox* spinYear = new QSpinBox( 0, 9999, 1, w ); + TQSpinBox* spinYear = new TQSpinBox( 0, 9999, 1, w ); spinYear->setValue( m_cddbInfo.year ); - QFrame* line = new QFrame( w ); - line->setFrameShape( QFrame::HLine ); - line->setFrameShadow( QFrame::Sunken ); + TQFrame* line = new TQFrame( w ); + line->setFrameShape( TQFrame::HLine ); + line->setFrameShadow( TQFrame::Sunken ); KComboBox* comboCat = new KComboBox( w ); comboCat->insertStringList( K3bCddbQuery::categories() ); @@ -396,28 +396,28 @@ void K3bAudioCdView::slotEditAlbumCddb() break; } - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setSpacing( KDialog::spacingHint() ); - grid->addWidget( new QLabel( i18n("Title:"), w ), 0, 0 ); + grid->addWidget( new TQLabel( i18n("Title:"), w ), 0, 0 ); grid->addWidget( editTitle, 0, 1 ); grid->addMultiCellWidget( line, 1, 1, 0, 1 ); - grid->addWidget( new QLabel( i18n("Artist:"), w ), 2, 0 ); + grid->addWidget( new TQLabel( i18n("Artist:"), w ), 2, 0 ); grid->addWidget( editArtist, 2, 1 ); - grid->addWidget( new QLabel( i18n("Extra info:"), w ), 3, 0 ); + grid->addWidget( new TQLabel( i18n("Extra info:"), w ), 3, 0 ); grid->addWidget( editExtInfo, 3, 1 ); - grid->addWidget( new QLabel( i18n("Genre:"), w ), 4, 0 ); + grid->addWidget( new TQLabel( i18n("Genre:"), w ), 4, 0 ); grid->addWidget( editGenre, 4, 1 ); - grid->addWidget( new QLabel( i18n("Year:"), w ), 5, 0 ); + grid->addWidget( new TQLabel( i18n("Year:"), w ), 5, 0 ); grid->addWidget( spinYear, 5, 1 ); - grid->addWidget( new QLabel( i18n("Category:"), w ), 6, 0 ); + grid->addWidget( new TQLabel( i18n("Category:"), w ), 6, 0 ); grid->addWidget( comboCat, 6, 1 ); grid->setRowStretch( 7, 1 ); d.setMainWidget(w); - d.resize( QMAX( QMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() ); + d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() ); - if( d.exec() == QDialog::Accepted ) { + if( d.exec() == TQDialog::Accepted ) { m_cddbInfo.cdTitle = editTitle->text(); m_cddbInfo.cdArtist = editArtist->text(); m_cddbInfo.cdExtInfo = editExtInfo->text(); @@ -516,36 +516,36 @@ void K3bAudioCdView::slotSaveCddbLocally() m_cddb->saveEntry( m_cddbInfo ); K3bPassivePopup::showPopup( i18n("Saved entry (%1) in category %2.") - .arg(m_cddbInfo.discid) - .arg(m_cddbInfo.category), + .tqarg(m_cddbInfo.discid) + .tqarg(m_cddbInfo.category), i18n("CDDB") ); } void K3bAudioCdView::slotCheckAll() { - for( QListViewItemIterator it( m_trackView ); it.current(); ++it ) + for( TQListViewItemIterator it( m_trackView ); it.current(); ++it ) ((AudioTrackViewItem*)it.current())->setChecked(true); } void K3bAudioCdView::slotUncheckAll() { - for( QListViewItemIterator it( m_trackView ); it.current(); ++it ) + for( TQListViewItemIterator it( m_trackView ); it.current(); ++it ) ((AudioTrackViewItem*)it.current())->setChecked(false); } void K3bAudioCdView::slotSelect() { - QPtrList<QListViewItem> items( m_trackView->selectedItems() ); - for( QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items( m_trackView->selectedItems() ); + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) static_cast<AudioTrackViewItem*>(it.current())->setChecked(true); } void K3bAudioCdView::slotDeselect() { - QPtrList<QListViewItem> items( m_trackView->selectedItems() ); - for( QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items( m_trackView->selectedItems() ); + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) static_cast<AudioTrackViewItem*>(it.current())->setChecked(false); } @@ -553,13 +553,13 @@ void K3bAudioCdView::slotDeselect() void K3bAudioCdView::updateDisplay() { // update the listview - for( QListViewItemIterator it( m_trackView ); it.current(); ++it ) { + for( TQListViewItemIterator it( m_trackView ); it.current(); ++it ) { AudioTrackViewItem* item = (AudioTrackViewItem*)it.current(); item->updateCddbData( m_cddbInfo ); } if( !m_cddbInfo.cdTitle.isEmpty() ) { - QString s = m_cddbInfo.cdTitle; + TQString s = m_cddbInfo.cdTitle; if( !m_cddbInfo.cdArtist.isEmpty() ) s += " (" + m_cddbInfo.cdArtist + ")"; setTitle( s ); @@ -569,7 +569,7 @@ void K3bAudioCdView::updateDisplay() m_labelLength->setText( i18n("1 track (%1)", "%n tracks (%1)", - m_toc.count()).arg(K3b::Msf(m_toc.length()).toString()) ); + m_toc.count()).tqarg(K3b::Msf(m_toc.length()).toString()) ); } @@ -584,10 +584,10 @@ void K3bAudioCdView::showBusyLabel( bool b ) // the themed label is a cut label, thus its size hint is // based on the cut text, we force it to be full m_busyInfoLabel->resize( width(), height() ); - m_busyInfoLabel->resize( m_busyInfoLabel->sizeHint() ); + m_busyInfoLabel->resize( m_busyInfoLabel->tqsizeHint() ); int x = (width() - m_busyInfoLabel->width())/2; int y = (height() - m_busyInfoLabel->height())/2; - QRect r( QPoint( x, y ), m_busyInfoLabel->size() ); + TQRect r( TQPoint( x, y ), m_busyInfoLabel->size() ); m_busyInfoLabel->setGeometry( r ); m_busyInfoLabel->show(); @@ -607,16 +607,16 @@ void K3bAudioCdView::enableInteraction( bool b ) } -QDragObject* K3bAudioCdView::dragObject() +TQDragObject* K3bAudioCdView::dragObject() { - QPtrList<QListViewItem> items = m_trackView->selectedItems(); - QValueList<int> tracks; - for( QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items = m_trackView->selectedItems(); + TQValueList<int> tracks; + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) tracks.append( static_cast<AudioTrackViewItem*>(it.current())->trackNumber ); if( !items.isEmpty() ) { - QDragObject* drag = new K3bAudioCdTrackDrag( m_toc, + TQDragObject* drag = new K3bAudioCdTrackDrag( m_toc, tracks, m_cddbInfo, m_device, diff --git a/src/rip/k3baudiocdview.h b/src/rip/k3baudiocdview.h index 257a0f5..f28e3a9 100644 --- a/src/rip/k3baudiocdview.h +++ b/src/rip/k3baudiocdview.h @@ -26,14 +26,14 @@ class K3bListView; class KListView; -class QListViewItem; -class QPoint; +class TQListViewItem; +class TQPoint; class KActionCollection; class KActionMenu; class K3bCddb; -class QLabel; +class TQLabel; class K3bToolBox; -class QDragObject; +class TQDragObject; namespace K3bDevice { @@ -44,9 +44,10 @@ namespace K3bDevice { class K3bAudioCdView : public K3bMediaContentsView { Q_OBJECT + TQ_OBJECT public: - K3bAudioCdView( QWidget* parent = 0, const char * name = 0 ); + K3bAudioCdView( TQWidget* tqparent = 0, const char * name = 0 ); ~K3bAudioCdView(); KActionCollection* actionCollection() const { return m_actionCollection; } @@ -54,16 +55,16 @@ class K3bAudioCdView : public K3bMediaContentsView /** * internal */ - QDragObject* dragObject(); + TQDragObject* dragObject(); public slots: void queryCddb(); private slots: - void slotContextMenu( KListView*, QListViewItem*, const QPoint& ); - void slotItemRenamed( QListViewItem*, const QString&, int ); + void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); + void slotItemRenamed( TQListViewItem*, const TQString&, int ); void slotCddbQueryFinished( int ); - void slotTrackSelectionChanged( QListViewItem* ); + void slotTrackSelectionChanged( TQListViewItem* ); void slotSaveCddbLocally(); void slotEditTrackCddb(); @@ -92,7 +93,7 @@ class K3bAudioCdView : public K3bMediaContentsView K3bListView* m_trackView; K3bToolBox* m_toolBox; - QLabel* m_labelLength; + TQLabel* m_labelLength; class AudioTrackViewItem; @@ -100,7 +101,7 @@ class K3bAudioCdView : public K3bMediaContentsView K3bDevice::CdText m_cdText; - QLabel* m_busyInfoLabel; + TQLabel* m_busyInfoLabel; }; diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp index a044dc5..5c8070c 100644 --- a/src/rip/k3baudioconvertingoptionwidget.cpp +++ b/src/rip/k3baudioconvertingoptionwidget.cpp @@ -27,22 +27,22 @@ #include <klocale.h> #include <kiconloader.h> -#include <qintdict.h> -#include <qmap.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qtoolbutton.h> -#include <qcheckbox.h> +#include <tqintdict.h> +#include <tqmap.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqtoolbutton.h> +#include <tqcheckbox.h> class K3bAudioConvertingOptionWidget::Private { public: - QIntDict<K3bAudioEncoder> encoderMap; - QMap<int, QString> extensionMap; + TQIntDict<K3bAudioEncoder> encoderMap; + TQMap<int, TQString> extensionMap; - QTimer freeSpaceUpdateTimer; + TQTimer freeSpaceUpdateTimer; KIO::filesize_t neededSize; @@ -55,7 +55,7 @@ public: int ogg = -1; int mp3 = -1; int flac = -1; - for( QMap<int, QString>::const_iterator it = extensionMap.constBegin(); + for( TQMap<int, TQString>::const_iterator it = extensionMap.constBegin(); it != extensionMap.constEnd(); ++it ) { if( it.data() == "ogg" ) ogg = it.key(); @@ -77,23 +77,23 @@ public: }; -K3bAudioConvertingOptionWidget::K3bAudioConvertingOptionWidget( QWidget* parent, const char* name ) - : base_K3bAudioRippingOptionWidget( parent, name ) +K3bAudioConvertingOptionWidget::K3bAudioConvertingOptionWidget( TQWidget* tqparent, const char* name ) + : base_K3bAudioRippingOptionWidget( tqparent, name ) { d = new Private(); - connect( m_editBaseDir, SIGNAL(textChanged(const QString&)), - this, SLOT(slotUpdateFreeTempSpace()) ); - connect( m_comboFileType, SIGNAL(activated(int)), - this, SLOT(slotEncoderChanged()) ); - connect( &d->freeSpaceUpdateTimer, SIGNAL(timeout()), - this, SLOT(slotUpdateFreeTempSpace()) ); - connect( m_checkCreatePlaylist, SIGNAL(toggled(bool)), this, SIGNAL(changed()) ); - connect( m_checkSingleFile, SIGNAL(toggled(bool)), this, SIGNAL(changed()) ); - connect( m_checkWriteCueFile, SIGNAL(toggled(bool)), this, SIGNAL(changed()) ); - connect( m_comboFileType, SIGNAL(activated(int)), this, SIGNAL(changed()) ); - connect( m_editBaseDir, SIGNAL(textChanged(const QString&)), this, SIGNAL(changed()) ); - connect( m_buttonConfigurePlugin, SIGNAL(clicked()), this, SLOT(slotConfigurePlugin()) ); + connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_comboFileType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEncoderChanged()) ); + connect( &d->freeSpaceUpdateTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_checkCreatePlaylist, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); + connect( m_checkSingleFile, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); + connect( m_checkWriteCueFile, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); + connect( m_comboFileType, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()) ); + connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(changed()) ); + connect( m_buttonConfigurePlugin, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigurePlugin()) ); m_editBaseDir->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); m_buttonConfigurePlugin->setIconSet( SmallIconSet( "gear" ) ); @@ -108,12 +108,12 @@ K3bAudioConvertingOptionWidget::K3bAudioConvertingOptionWidget( QWidget* parent, d->extensionMap[0] = "wav"; // check the available encoding plugins - QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioEncoder" ); - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioEncoder" ); + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { K3bAudioEncoder* f = (K3bAudioEncoder*)it.current(); - QStringList exL = f->extensions(); + TQStringList exL = f->extensions(); - for( QStringList::const_iterator exIt = exL.begin(); + for( TQStringList::const_iterator exIt = exL.begin(); exIt != exL.end(); ++exIt ) { d->extensionMap.insert( m_comboFileType->count(), *exIt ); d->encoderMap.insert( m_comboFileType->count(), f ); @@ -133,13 +133,13 @@ K3bAudioConvertingOptionWidget::~K3bAudioConvertingOptionWidget() } -QString K3bAudioConvertingOptionWidget::baseDir() const +TQString K3bAudioConvertingOptionWidget::baseDir() const { return m_editBaseDir->url(); } -void K3bAudioConvertingOptionWidget::setBaseDir( const QString& path ) +void K3bAudioConvertingOptionWidget::setBaseDir( const TQString& path ) { m_editBaseDir->setURL( path ); } @@ -168,16 +168,16 @@ void K3bAudioConvertingOptionWidget::slotConfigurePlugin() void K3bAudioConvertingOptionWidget::slotUpdateFreeTempSpace() { - QString path = m_editBaseDir->url(); + TQString path = m_editBaseDir->url(); - if( !QFile::exists( path ) ) - path.truncate( path.findRev('/') ); + if( !TQFile::exists( path ) ) + path.truncate( path.tqfindRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) { m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) ); if( avail < d->neededSize/1024 ) - m_labelNeededSpace->setPaletteForegroundColor( Qt::red ); + m_labelNeededSpace->setPaletteForegroundColor( TQt::red ); else m_labelNeededSpace->setPaletteForegroundColor( paletteForegroundColor() ); } @@ -201,7 +201,7 @@ K3bAudioEncoder* K3bAudioConvertingOptionWidget::encoder() const } -QString K3bAudioConvertingOptionWidget::extension() const +TQString K3bAudioConvertingOptionWidget::extension() const { return d->extensionMap[m_comboFileType->currentItem()]; } @@ -209,7 +209,7 @@ QString K3bAudioConvertingOptionWidget::extension() const void K3bAudioConvertingOptionWidget::loadDefaults() { - m_editBaseDir->setURL( QDir::homeDirPath() ); + m_editBaseDir->setURL( TQDir::homeDirPath() ); m_checkSingleFile->setChecked( false ); m_checkWriteCueFile->setChecked( false ); m_comboFileType->setCurrentItem( d->getDefaultFormat() ); @@ -222,7 +222,7 @@ void K3bAudioConvertingOptionWidget::loadDefaults() void K3bAudioConvertingOptionWidget::loadConfig( KConfigBase* c ) { - m_editBaseDir->setURL( c->readPathEntry( "last ripping directory", QDir::homeDirPath() ) ); + m_editBaseDir->setURL( c->readPathEntry( "last ripping directory", TQDir::homeDirPath() ) ); m_checkSingleFile->setChecked( c->readBoolEntry( "single_file", false ) ); m_checkWriteCueFile->setChecked( c->readBoolEntry( "write_cue_file", false ) ); @@ -230,11 +230,11 @@ void K3bAudioConvertingOptionWidget::loadConfig( KConfigBase* c ) m_checkCreatePlaylist->setChecked( c->readBoolEntry( "create_playlist", false ) ); m_checkPlaylistRelative->setChecked( c->readBoolEntry( "relative_path_in_playlist", false ) ); - QString filetype = c->readEntry( "filetype", d->extensionMap[d->getDefaultFormat()] ); + TQString filetype = c->readEntry( "filetype", d->extensionMap[d->getDefaultFormat()] ); if( filetype == "wav" ) m_comboFileType->setCurrentItem(0); else { - for( QMap<int, QString>::iterator it = d->extensionMap.begin(); + for( TQMap<int, TQString>::iterator it = d->extensionMap.begin(); it != d->extensionMap.end(); ++it ) { if( it.data() == filetype ) { m_comboFileType->setCurrentItem( it.key() ); @@ -257,7 +257,7 @@ void K3bAudioConvertingOptionWidget::saveConfig( KConfigBase* c ) c->writeEntry( "create_playlist", m_checkCreatePlaylist->isChecked() ); c->writeEntry( "relative_path_in_playlist", m_checkPlaylistRelative->isChecked() ); - if( d->extensionMap.contains(m_comboFileType->currentItem()) ) + if( d->extensionMap.tqcontains(m_comboFileType->currentItem()) ) c->writeEntry( "filetype", d->extensionMap[m_comboFileType->currentItem()] ); else c->writeEntry( "filetype", "wav" ); diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h index ff4cd45..5ef51a7 100644 --- a/src/rip/k3baudioconvertingoptionwidget.h +++ b/src/rip/k3baudioconvertingoptionwidget.h @@ -18,7 +18,7 @@ #include "base_k3baudiorippingoptionwidget.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kio/global.h> class K3bAudioEncoder; @@ -31,12 +31,13 @@ class KConfigBase; class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget { Q_OBJECT + TQ_OBJECT public: - K3bAudioConvertingOptionWidget( QWidget* parent, const char* name = 0 ); + K3bAudioConvertingOptionWidget( TQWidget* tqparent, const char* name = 0 ); ~K3bAudioConvertingOptionWidget(); - void setBaseDir( const QString& path ); + void setBaseDir( const TQString& path ); void setNeededSize( KIO::filesize_t ); @@ -44,9 +45,9 @@ class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget * @returns 0 if wave is selected */ K3bAudioEncoder* encoder() const; - QString extension() const; + TQString extension() const; - QString baseDir() const; + TQString baseDir() const; bool createPlaylist() const { return m_checkCreatePlaylist->isChecked(); } bool playlistRelativePath() const { return m_checkPlaylistRelative->isChecked(); } diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index 8a3eadc..d0fe302 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -41,14 +41,14 @@ #include <kdebug.h> #include <kmessagebox.h> -#include <qgroupbox.h> -#include <qheader.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qtabwidget.h> +#include <tqgroupbox.h> +#include <tqheader.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqtabwidget.h> @@ -58,16 +58,16 @@ public: Private() { } - QValueVector<QString> filenames; - QString playlistFilename; - QString cueFilename; + TQValueVector<TQString> filenames; + TQString playlistFilename; + TQString cueFilename; }; -K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* doc, QWidget *parent, const char *name ) - : K3bInteractionDialog( parent, name, - QString::null, - QString::null, +K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* doc, TQWidget *tqparent, const char *name ) + : K3bInteractionDialog( tqparent, name, + TQString(), + TQString(), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "Audio Project Converting" ), // config group @@ -79,7 +79,7 @@ K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* d setTitle( i18n("Audio Project Conversion"), i18n("1 track (%1)", "%n tracks (%1)", - m_doc->numOfTracks()).arg(m_doc->length().toString()) ); + m_doc->numOfTracks()).tqarg(m_doc->length().toString()) ); refresh(); } @@ -93,8 +93,8 @@ K3bAudioProjectConvertingDialog::~K3bAudioProjectConvertingDialog() void K3bAudioProjectConvertingDialog::setupGui() { - QWidget *frame = mainWidget(); - QGridLayout* Form1Layout = new QGridLayout( frame ); + TQWidget *frame = mainWidget(); + TQGridLayout* Form1Layout = new TQGridLayout( frame ); Form1Layout->setSpacing( KDialog::spacingHint() ); Form1Layout->setMargin( 0 ); @@ -106,7 +106,7 @@ void K3bAudioProjectConvertingDialog::setupGui() m_viewTracks->setAllColumnsShowFocus(true); m_viewTracks->setFullWidth(true); - QTabWidget* mainTab = new QTabWidget( frame ); + TQTabWidget* mainTab = new TQTabWidget( frame ); m_optionWidget = new K3bAudioConvertingOptionWidget( mainTab ); mainTab->addTab( m_optionWidget, i18n("Settings") ); @@ -116,13 +116,13 @@ void K3bAudioProjectConvertingDialog::setupGui() // ------------------------------------------------------------------------------------------- m_patternWidget = new K3bCddbPatternWidget( mainTab ); mainTab->addTab( m_patternWidget, i18n("File Naming") ); - connect( m_patternWidget, SIGNAL(changed()), this, SLOT(refresh()) ); + connect( m_patternWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); Form1Layout->addWidget( m_viewTracks, 0, 0 ); Form1Layout->addWidget( mainTab, 1, 0 ); Form1Layout->setRowStretch( 0, 1 ); - connect( m_optionWidget, SIGNAL(changed()), this, SLOT(refresh()) ); + connect( m_optionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); } @@ -151,14 +151,14 @@ void K3bAudioProjectConvertingDialog::slotStartClicked() } // check if we need to overwrite some files... - QListViewItemIterator it( m_viewTracks ); - QStringList filesToOverwrite; + TQListViewItemIterator it( m_viewTracks ); + TQStringList filesToOverwrite; for( unsigned int i = 0; i < d->filenames.count(); ++i ) { - if( QFile::exists( d->filenames[i] ) ) + if( TQFile::exists( d->filenames[i] ) ) filesToOverwrite.append( d->filenames[i] ); } - if( m_optionWidget->createPlaylist() && QFile::exists( d->playlistFilename ) ) + if( m_optionWidget->createPlaylist() && TQFile::exists( d->playlistFilename ) ) filesToOverwrite.append( d->playlistFilename ); if( !filesToOverwrite.isEmpty() ) @@ -171,11 +171,11 @@ void K3bAudioProjectConvertingDialog::slotStartClicked() // just generate a fake m_tracks list for now so we can keep most of the methods // like they are in K3bAudioRipThread. This way future combination is easier - QValueVector<QPair<int, QString> > tracksToRip; + TQValueVector<TQPair<int, TQString> > tracksToRip; int i = 0; K3bAudioTrack* track = m_doc->firstTrack(); while( track ) { - tracksToRip.append( qMakePair( i+1, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); + tracksToRip.append( tqMakePair( i+1, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); ++i; track = track->next(); } @@ -194,9 +194,9 @@ void K3bAudioProjectConvertingDialog::slotStartClicked() if( encoder ) thread->setFileType( m_optionWidget->extension() ); - K3bJobProgressDialog progressDialog( parentWidget() ); + K3bJobProgressDialog progressDialog( tqparentWidget() ); - K3bThreadJob job( thread, &progressDialog, this ); + K3bThreadJob job( thread, &progressDialog, TQT_TQOBJECT(this) ); hide(); progressDialog.startJob(&job); @@ -216,14 +216,14 @@ void K3bAudioProjectConvertingDialog::refresh() // create a cddb entry from the doc to use in the patternparser K3bCddbResultEntry cddbEntry = createCddbEntryFromDoc( m_doc ); - QString baseDir = K3b::prepareDir( m_optionWidget->baseDir() ); + TQString baseDir = K3b::prepareDir( m_optionWidget->baseDir() ); - QString extension = m_optionWidget->extension(); + TQString extension = m_optionWidget->extension(); KIO::filesize_t overallSize = 0; if( m_optionWidget->createSingleFile() ) { - QString filename; + TQString filename; long long filesize = 0; if( m_optionWidget->encoder() == 0 ) { filesize = m_doc->length().audioBytes() + 44; @@ -274,7 +274,7 @@ void K3bAudioProjectConvertingDialog::refresh() if( filesize > 0 ) overallSize += filesize; - QString filename = K3bPatternParser::parsePattern( cddbEntry, i, + TQString filename = K3bPatternParser::parsePattern( cddbEntry, i, m_patternWidget->filenamePattern(), m_patternWidget->replaceBlanks(), m_patternWidget->blankReplaceString() ) + "." + extension; @@ -294,7 +294,7 @@ void K3bAudioProjectConvertingDialog::refresh() // create playlist item if( m_optionWidget->createPlaylist() ) { - QString filename = K3bPatternParser::parsePattern( cddbEntry, 1, + TQString filename = K3bPatternParser::parsePattern( cddbEntry, 1, m_patternWidget->playlistPattern(), m_patternWidget->replaceBlanks(), m_patternWidget->blankReplaceString() ) + ".m3u"; @@ -316,7 +316,7 @@ void K3bAudioProjectConvertingDialog::refresh() } -void K3bAudioProjectConvertingDialog::setBaseDir( const QString& path ) +void K3bAudioProjectConvertingDialog::setBaseDir( const TQString& path ) { m_optionWidget->setBaseDir( path ); } diff --git a/src/rip/k3baudioprojectconvertingdialog.h b/src/rip/k3baudioprojectconvertingdialog.h index 1816ea2..f9956ff 100644 --- a/src/rip/k3baudioprojectconvertingdialog.h +++ b/src/rip/k3baudioprojectconvertingdialog.h @@ -20,15 +20,15 @@ #include <k3binteractiondialog.h> #include <k3bmsf.h> -#include <qstringlist.h> +#include <tqstringlist.h> class K3bListView; -class QCheckBox; -class QSpinBox; -class QComboBox; +class TQCheckBox; +class TQSpinBox; +class TQComboBox; class K3bCddbPatternWidget; -class QToolButton; +class TQToolButton; class K3bAudioConvertingOptionWidget; class K3bCddbResultEntry; class K3bAudioConvertingJob; @@ -42,12 +42,13 @@ class K3bAudioDoc; class K3bAudioProjectConvertingDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bAudioProjectConvertingDialog( K3bAudioDoc*, QWidget *parent = 0, const char *name = 0 ); + K3bAudioProjectConvertingDialog( K3bAudioDoc*, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bAudioProjectConvertingDialog(); - void setBaseDir( const QString& path ); + void setBaseDir( const TQString& path ); public slots: void refresh(); diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp index 8c175fb..6d5cdf5 100644 --- a/src/rip/k3baudioprojectconvertingthread.cpp +++ b/src/rip/k3baudioprojectconvertingthread.cpp @@ -26,8 +26,8 @@ #include <k3bglobals.h> -#include <qfile.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqtimer.h> #include <kdebug.h> #include <klocale.h> @@ -55,7 +55,7 @@ public: bool canceled; - QString fileType; + TQString fileType; }; @@ -74,7 +74,7 @@ K3bAudioProjectConvertingThread::~K3bAudioProjectConvertingThread() } -void K3bAudioProjectConvertingThread::setFileType( const QString& t ) +void K3bAudioProjectConvertingThread::setFileType( const TQString& t ) { d->fileType = t; } @@ -106,11 +106,11 @@ void K3bAudioProjectConvertingThread::run() d->overallBytesToRead = m_doc->length().audioBytes(); if( m_singleFile ) { - QString& filename = m_tracks[0].second; + TQString& filename = m_tracks[0].second; - QString dir = filename.left( filename.findRev("/") ); + TQString dir = filename.left( filename.tqfindRev("/") ); if( !KStandardDirs::makeDir( dir ) ) { - emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); emitFinished(false); return; } @@ -126,7 +126,7 @@ void K3bAudioProjectConvertingThread::run() d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_ARTIST, m_cddbEntry.cdArtist ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_TITLE, m_cddbEntry.cdTitle ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_COMMENT, m_cddbEntry.cdExtInfo ); - d->encoder->setMetaData( K3bAudioEncoder::META_YEAR, QString::number(m_cddbEntry.year) ); + d->encoder->setMetaData( K3bAudioEncoder::META_YEAR, TQString::number(m_cddbEntry.year) ); d->encoder->setMetaData( K3bAudioEncoder::META_GENRE, m_cddbEntry.genre ); } else @@ -137,12 +137,12 @@ void K3bAudioProjectConvertingThread::run() } if( !isOpen ) { - emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR ); emitFinished(false); return; } - emitInfoMessage( i18n("Converting to single file '%1'.").arg(filename), K3bJob::INFO ); + emitInfoMessage( i18n("Converting to single file '%1'.").tqarg(filename), K3bJob::INFO ); } bool success = true; @@ -155,7 +155,7 @@ void K3bAudioProjectConvertingThread::run() break; } - emitInfoMessage( i18n("Successfully converted track %1.").arg(i+1), K3bJob::INFO ); + emitInfoMessage( i18n("Successfully converted track %1.").tqarg(i+1), K3bJob::INFO ); track = track->next(); ++i; @@ -178,9 +178,9 @@ void K3bAudioProjectConvertingThread::run() if( d->canceled ) { if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) { - if( QFile::exists( m_tracks[d->currentTrackIndex].second ) ) { - QFile::remove( m_tracks[d->currentTrackIndex].second ); - emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO ); + if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) { + TQFile::remove( m_tracks[d->currentTrackIndex].second ); + emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO ); } } @@ -192,11 +192,11 @@ void K3bAudioProjectConvertingThread::run() } -bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const QString& filename ) +bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const TQString& filename ) { - QString dir = filename.left( filename.findRev("/") ); + TQString dir = filename.left( filename.tqfindRev("/") ); if( !KStandardDirs::makeDir( dir ) ) { - emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); return false; } @@ -211,11 +211,11 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_ARTIST, m_cddbEntry.artists[d->currentTrackIndex] ); d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_TITLE, m_cddbEntry.titles[d->currentTrackIndex] ); d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_COMMENT, m_cddbEntry.extInfos[d->currentTrackIndex] ); - d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_NUMBER, QString::number(d->currentTrackIndex+1).rightJustify( 2, '0' ) ); + d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_NUMBER, TQString::number(d->currentTrackIndex+1).rightJustify( 2, '0' ) ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_ARTIST, m_cddbEntry.cdArtist ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_TITLE, m_cddbEntry.cdTitle ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_COMMENT, m_cddbEntry.cdExtInfo ); - d->encoder->setMetaData( K3bAudioEncoder::META_YEAR, QString::number(m_cddbEntry.year) ); + d->encoder->setMetaData( K3bAudioEncoder::META_YEAR, TQString::number(m_cddbEntry.year) ); d->encoder->setMetaData( K3bAudioEncoder::META_GENRE, m_cddbEntry.genre ); } else @@ -226,7 +226,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const } if( !isOpen ) { - emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR ); return false; } } @@ -235,11 +235,11 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const if( !m_cddbEntry.artists[d->currentTrackIndex].isEmpty() && !m_cddbEntry.titles[d->currentTrackIndex].isEmpty() ) emitNewSubTask( i18n("Converting track %1 (%2 - %3)") - .arg(d->currentTrackIndex+1) - .arg(m_cddbEntry.artists[d->currentTrackIndex]) - .arg(m_cddbEntry.titles[d->currentTrackIndex]) ); + .tqarg(d->currentTrackIndex+1) + .tqarg(m_cddbEntry.artists[d->currentTrackIndex]) + .tqarg(m_cddbEntry.titles[d->currentTrackIndex]) ); else - emitNewSubTask( i18n("Converting track %1").arg(d->currentTrackIndex+1) ); + emitNewSubTask( i18n("Converting track %1").tqarg(d->currentTrackIndex+1) ); // do the conversion @@ -265,7 +265,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const if( d->encoder->encode( buffer, readLength ) < 0 ) { kdDebug() << "(K3bAudioProjectConvertingThread) error while encoding." << endl; emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR ); - emitInfoMessage( i18n("Error while encoding track %1.").arg(d->currentTrackIndex+1), K3bJob::ERROR ); + emitInfoMessage( i18n("Error while encoding track %1.").tqarg(d->currentTrackIndex+1), K3bJob::ERROR ); return false; } } @@ -301,18 +301,18 @@ void K3bAudioProjectConvertingThread::cancel() bool K3bAudioProjectConvertingThread::writePlaylist() { // this is an absolut path so there is always a "/" - QString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) ); + TQString playlistDir = m_playlistFilename.left( m_playlistFilename.tqfindRev( "/" ) ); if( !KStandardDirs::makeDir( playlistDir ) ) { - emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR ); return false; } - emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO ); + emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO ); - QFile f( m_playlistFilename ); + TQFile f( m_playlistFilename ); if( f.open( IO_WriteOnly ) ) { - QTextStream t( &f ); + TQTextStream t( &f ); // format descriptor t << "#EXTM3U" << endl; @@ -324,8 +324,8 @@ bool K3bAudioProjectConvertingThread::writePlaylist() if( !m_cddbEntry.cdArtist.isEmpty() && !m_cddbEntry.cdTitle.isEmpty() ) t << m_cddbEntry.cdArtist << " - " << m_cddbEntry.cdTitle << endl; else - t << m_tracks[0].second.mid(m_tracks[0].second.findRev("/") + 1, - m_tracks[0].second.length() - m_tracks[0].second.findRev("/") - 5) + t << m_tracks[0].second.mid(m_tracks[0].second.tqfindRev("/") + 1, + m_tracks[0].second.length() - m_tracks[0].second.tqfindRev("/") - 5) << endl; // filename without extension // filename @@ -345,9 +345,9 @@ bool K3bAudioProjectConvertingThread::writePlaylist() if( !m_cddbEntry.artists[trackIndex].isEmpty() && !m_cddbEntry.titles[trackIndex].isEmpty() ) t << m_cddbEntry.artists[trackIndex] << " - " << m_cddbEntry.titles[trackIndex] << endl; else - t << m_tracks[i].second.mid(m_tracks[i].second.findRev("/") + 1, + t << m_tracks[i].second.mid(m_tracks[i].second.tqfindRev("/") + 1, m_tracks[i].second.length() - - m_tracks[i].second.findRev("/") - 5) + - m_tracks[i].second.tqfindRev("/") - 5) << endl; // filename without extension // filename @@ -359,10 +359,10 @@ bool K3bAudioProjectConvertingThread::writePlaylist() } } - return ( t.device()->status() == IO_Ok ); + return ( t.tqdevice()->status() == IO_Ok ); } else { - emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR ); kdDebug() << "(K3bAudioProjectConvertingThread) could not open file " << m_playlistFilename << " for writing." << endl; return false; } @@ -401,37 +401,37 @@ bool K3bAudioProjectConvertingThread::writeCueFile() // we always use a relative filename here - QString imageFile = m_tracks[0].second.section( '/', -1 ); - cueWriter.setImage( imageFile, ( d->fileType.isEmpty() ? QString("WAVE") : d->fileType ) ); + TQString imageFile = m_tracks[0].second.section( '/', -1 ); + cueWriter.setImage( imageFile, ( d->fileType.isEmpty() ? TQString("WAVE") : d->fileType ) ); // use the same base name as the image file - QString cueFile = m_tracks[0].second; - cueFile.truncate( cueFile.findRev(".") ); + TQString cueFile = m_tracks[0].second; + cueFile.truncate( cueFile.tqfindRev(".") ); cueFile += ".cue"; - emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO ); + emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO ); return cueWriter.save( cueFile ); } -QString K3bAudioProjectConvertingThread::findRelativePath( const QString& absPath, const QString& baseDir ) +TQString K3bAudioProjectConvertingThread::findRelativePath( const TQString& absPath, const TQString& baseDir ) { - QString baseDir_ = K3b::prepareDir( K3b::fixupPath(baseDir) ); - QString path = K3b::fixupPath( absPath ); + TQString baseDir_ = K3b::prepareDir( K3b::fixupPath(baseDir) ); + TQString path = K3b::fixupPath( absPath ); // both paths have an equal beginning. That's just how it's configured by K3b - int pos = baseDir_.find( "/" ); + int pos = baseDir_.tqfind( "/" ); int oldPos = pos; while( pos != -1 && path.left( pos+1 ) == baseDir_.left( pos+1 ) ) { oldPos = pos; - pos = baseDir_.find( "/", pos+1 ); + pos = baseDir_.tqfind( "/", pos+1 ); } // now the paths are equal up to oldPos, so that's how "deep" we go path = path.mid( oldPos+1 ); baseDir_ = baseDir_.mid( oldPos+1 ); - int numberOfDirs = baseDir_.contains( '/' ); + int numberOfDirs = baseDir_.tqcontains( '/' ); for( int i = 0; i < numberOfDirs; ++i ) path.prepend( "../" ); @@ -439,20 +439,20 @@ QString K3bAudioProjectConvertingThread::findRelativePath( const QString& absPat } -QString K3bAudioProjectConvertingThread::jobDescription() const +TQString K3bAudioProjectConvertingThread::jobDescription() const { if( m_cddbEntry.cdTitle.isEmpty() ) return i18n("Converting Audio Tracks"); else - return i18n("Converting Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle); + return i18n("Converting Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle); } -QString K3bAudioProjectConvertingThread::jobDetails() const +TQString K3bAudioProjectConvertingThread::jobDetails() const { if( d->encoder ) return i18n("1 track (encoding to %1)", "%n tracks (encoding to %1)", - m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType)); + m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType)); else return i18n("1 track", "%n tracks", m_doc->numOfTracks() ); } diff --git a/src/rip/k3baudioprojectconvertingthread.h b/src/rip/k3baudioprojectconvertingthread.h index aeda217..63b8895 100644 --- a/src/rip/k3baudioprojectconvertingthread.h +++ b/src/rip/k3baudioprojectconvertingthread.h @@ -18,9 +18,9 @@ #define K3B_AUDIO_PROJECT_CONVERTING_THREAD_H #include <k3bthread.h> -#include <qobject.h> -#include <qvaluevector.h> -#include <qpair.h> +#include <tqobject.h> +#include <tqvaluevector.h> +#include <tqpair.h> #include <k3bcddbresult.h> @@ -36,8 +36,8 @@ class K3bAudioProjectConvertingThread : public K3bThread K3bAudioProjectConvertingThread( K3bAudioDoc* ); ~K3bAudioProjectConvertingThread(); - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; void setSingleFile( bool b ) { m_singleFile = b; } @@ -49,15 +49,15 @@ class K3bAudioProjectConvertingThread : public K3bThread /** * Used for encoders that support multiple formats */ - void setFileType( const QString& ); + void setFileType( const TQString& ); /** * 1 is the first track */ - void setTracksToRip( const QValueVector<QPair<int, QString> >& t ) { m_tracks = t; } + void setTracksToRip( const TQValueVector<TQPair<int, TQString> >& t ) { m_tracks = t; } void setWritePlaylist( bool b ) { m_writePlaylist = b; } - void setPlaylistFilename( const QString& s ) { m_playlistFilename = s; } + void setPlaylistFilename( const TQString& s ) { m_playlistFilename = s; } void setUseRelativePathInPlaylist( bool b ) { m_relativePathInPlaylist = b; } void setWriteCueFile( bool b ) { m_writeCueFile = b; } @@ -69,28 +69,28 @@ class K3bAudioProjectConvertingThread : public K3bThread void cancel(); private: - /** reimplemented from QThread. Does the work */ + /** reimplemented from TQThread. Does the work */ void run(); - bool convertTrack( K3bAudioTrack*, const QString& filename ); + bool convertTrack( K3bAudioTrack*, const TQString& filename ); bool writePlaylist(); bool writeCueFile(); /** * Finds a relative path from baseDir to absPath */ - QString findRelativePath( const QString& absPath, const QString& baseDir ); + TQString findRelativePath( const TQString& absPath, const TQString& baseDir ); K3bCddbResultEntry m_cddbEntry; bool m_singleFile; bool m_writePlaylist; bool m_relativePathInPlaylist; - QString m_playlistFilename; + TQString m_playlistFilename; bool m_writeCueFile; - QValueVector<QPair<int, QString> > m_tracks; + TQValueVector<TQPair<int, TQString> > m_tracks; K3bAudioDoc* m_doc; diff --git a/src/rip/k3baudioripjob.cpp b/src/rip/k3baudioripjob.cpp index ef520e1..ac53c38 100644 --- a/src/rip/k3baudioripjob.cpp +++ b/src/rip/k3baudioripjob.cpp @@ -23,17 +23,17 @@ #include <klocale.h> -K3bAudioRipJob::K3bAudioRipJob( K3bJobHandler* hdl, QObject* parent ) - : K3bJob( hdl, parent ) +K3bAudioRipJob::K3bAudioRipJob( K3bJobHandler* hdl, TQObject* tqparent ) + : K3bJob( hdl, tqparent ) { m_thread = new K3bAudioRipThread(); m_threadJob = new K3bThreadJob( m_thread, this, this ); connectSubJob( m_threadJob, - SLOT(slotRippingFinished(bool)), - SIGNAL(newTask(const QString&)), - SIGNAL(newSubTask(const QString&)), - SIGNAL(percent(int)), - SIGNAL(subPercent(int)) ); + TQT_SLOT(slotRippingFinished(bool)), + TQT_SIGNAL(newTask(const TQString&)), + TQT_SIGNAL(newSubTask(const TQString&)), + TQT_SIGNAL(percent(int)), + TQT_SIGNAL(subPercent(int)) ); } @@ -42,13 +42,13 @@ K3bAudioRipJob::~K3bAudioRipJob() } -QString K3bAudioRipJob::jobDescription() const +TQString K3bAudioRipJob::jobDescription() const { return m_thread->jobDescription(); } -QString K3bAudioRipJob::jobDetails() const +TQString K3bAudioRipJob::jobDetails() const { return m_thread->jobDetails(); } diff --git a/src/rip/k3baudioripjob.h b/src/rip/k3baudioripjob.h index adf47f3..691af34 100644 --- a/src/rip/k3baudioripjob.h +++ b/src/rip/k3baudioripjob.h @@ -23,7 +23,7 @@ #include <k3bcddbresult.h> #include <k3baudioencoder.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> class K3bInterferingSystemsHandler; class K3bThreadJob; @@ -32,13 +32,14 @@ class K3bThreadJob; class K3bAudioRipJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioRipJob( K3bJobHandler* hdl, QObject* parent ); + K3bAudioRipJob( K3bJobHandler* hdl, TQObject* tqparent ); ~K3bAudioRipJob(); - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); @@ -46,7 +47,7 @@ class K3bAudioRipJob : public K3bJob void setDevice( K3bDevice::Device* dev ) { m_thread->setDevice( dev ); } void setCddbEntry( const K3bCddbResultEntry& entry ) { m_thread->setCddbEntry( entry ); } - void setTracksToRip( const QValueVector<QPair<int, QString> >& tracksToRip ) { m_thread->setTracksToRip( tracksToRip ); } + void setTracksToRip( const TQValueVector<TQPair<int, TQString> >& tracksToRip ) { m_thread->setTracksToRip( tracksToRip ); } void setParanoiaMode( int mode ) { m_thread->setParanoiaMode( mode ); } void setMaxRetries( int retries ) { m_thread->setMaxRetries( retries ); } void setNeverSkip( bool neverSkip ) { m_thread->setNeverSkip( neverSkip ); } @@ -54,10 +55,10 @@ class K3bAudioRipJob : public K3bJob void setWriteCueFile( bool cue ) { m_thread->setWriteCueFile( cue ); } void setEncoder( K3bAudioEncoder* encoder ) { m_thread->setEncoder( encoder ); } void setWritePlaylist( bool playlist ) { m_thread->setWritePlaylist( playlist ); } - void setPlaylistFilename( const QString& filename ) { m_thread->setPlaylistFilename( filename ); } + void setPlaylistFilename( const TQString& filename ) { m_thread->setPlaylistFilename( filename ); } void setUseRelativePathInPlaylist( bool relative ) { m_thread->setUseRelativePathInPlaylist( relative ); } void setUseIndex0( bool index0 ) { m_thread->setUseIndex0( index0 ); } - void setFileType( const QString& filetype ) { m_thread->setFileType( filetype ); } + void setFileType( const TQString& filetype ) { m_thread->setFileType( filetype ); } private slots: void slotRippingFinished( bool ); diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index 693230f..1592198 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -43,27 +43,27 @@ #include <kmessagebox.h> #include <kurllabel.h> -#include <qgroupbox.h> -#include <qheader.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qmessagebox.h> -#include <qfont.h> -#include <qhbox.h> -#include <qtoolbutton.h> -#include <qtabwidget.h> -#include <qspinbox.h> -#include <qptrlist.h> -#include <qintdict.h> -#include <qpair.h> -#include <qvalidator.h> +#include <tqgroupbox.h> +#include <tqheader.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqmessagebox.h> +#include <tqfont.h> +#include <tqhbox.h> +#include <tqtoolbutton.h> +#include <tqtabwidget.h> +#include <tqspinbox.h> +#include <tqptrlist.h> +#include <tqintdict.h> +#include <tqpair.h> +#include <tqvalidator.h> class K3bAudioRippingDialog::Private @@ -72,8 +72,8 @@ public: Private() { } - QValueVector<QString> filenames; - QString playlistFilename; + TQValueVector<TQString> filenames; + TQString playlistFilename; K3bFileSystemInfo fsInfo; }; @@ -81,11 +81,11 @@ public: K3bAudioRippingDialog::K3bAudioRippingDialog(const K3bDevice::Toc& toc, K3bDevice::Device* device, const K3bCddbResultEntry& entry, - const QValueList<int>& tracks, - QWidget *parent, const char *name ) - : K3bInteractionDialog( parent, name, - QString::null, - QString::null, + const TQValueList<int>& tracks, + TQWidget *tqparent, const char *name ) + : K3bInteractionDialog( tqparent, name, + TQString(), + TQString(), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "Audio Ripping" ), // config group @@ -100,13 +100,13 @@ K3bAudioRippingDialog::K3bAudioRippingDialog(const K3bDevice::Toc& toc, setupContextHelp(); K3b::Msf length; - for( QValueList<int>::const_iterator it = m_trackNumbers.begin(); + for( TQValueList<int>::const_iterator it = m_trackNumbers.begin(); it != m_trackNumbers.end(); ++it ) { length += m_toc[*it-1].length(); } setTitle( i18n("CD Ripping"), i18n("1 track (%1)", "%n tracks (%1)", - m_trackNumbers.count()).arg(length.toString()) ); + m_trackNumbers.count()).tqarg(length.toString()) ); } @@ -118,8 +118,8 @@ K3bAudioRippingDialog::~K3bAudioRippingDialog() void K3bAudioRippingDialog::setupGui() { - QWidget *frame = mainWidget(); - QGridLayout* Form1Layout = new QGridLayout( frame ); + TQWidget *frame = mainWidget(); + TQGridLayout* Form1Layout = new TQGridLayout( frame ); Form1Layout->setSpacing( KDialog::spacingHint() ); Form1Layout->setMargin( 0 ); @@ -132,7 +132,7 @@ void K3bAudioRippingDialog::setupGui() m_viewTracks->setAllColumnsShowFocus(true); m_viewTracks->setFullWidth(true); - QTabWidget* mainTab = new QTabWidget( frame ); + TQTabWidget* mainTab = new TQTabWidget( frame ); m_optionWidget = new K3bAudioConvertingOptionWidget( mainTab ); mainTab->addTab( m_optionWidget, i18n("Settings") ); @@ -142,25 +142,25 @@ void K3bAudioRippingDialog::setupGui() // ------------------------------------------------------------------------------------------- m_patternWidget = new K3bCddbPatternWidget( mainTab ); mainTab->addTab( m_patternWidget, i18n("File Naming") ); - connect( m_patternWidget, SIGNAL(changed()), this, SLOT(refresh()) ); + connect( m_patternWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); // setup advanced page // ------------------------------------------------------------------------------------------- - QWidget* advancedPage = new QWidget( mainTab ); - QGridLayout* advancedPageLayout = new QGridLayout( advancedPage ); + TQWidget* advancedPage = new TQWidget( mainTab ); + TQGridLayout* advancedPageLayout = new TQGridLayout( advancedPage ); advancedPageLayout->setMargin( marginHint() ); advancedPageLayout->setSpacing( spacingHint() ); mainTab->addTab( advancedPage, i18n("Advanced") ); m_comboParanoiaMode = K3bStdGuiItems::paranoiaModeComboBox( advancedPage ); - m_spinRetries = new QSpinBox( advancedPage ); - m_checkIgnoreReadErrors = new QCheckBox( i18n("Ignore read errors"), advancedPage ); - m_checkUseIndex0 = new QCheckBox( i18n("Don't read pregaps"), advancedPage ); + m_spinRetries = new TQSpinBox( advancedPage ); + m_checkIgnoreReadErrors = new TQCheckBox( i18n("Ignore read errors"), advancedPage ); + m_checkUseIndex0 = new TQCheckBox( i18n("Don't read pregaps"), advancedPage ); - advancedPageLayout->addWidget( new QLabel( i18n("Paranoia mode:"), advancedPage ), 0, 0 ); + advancedPageLayout->addWidget( new TQLabel( i18n("Paranoia mode:"), advancedPage ), 0, 0 ); advancedPageLayout->addWidget( m_comboParanoiaMode, 0, 1 ); - advancedPageLayout->addWidget( new QLabel( i18n("Read retries:"), advancedPage ), 1, 0 ); + advancedPageLayout->addWidget( new TQLabel( i18n("Read retries:"), advancedPage ), 1, 0 ); advancedPageLayout->addWidget( m_spinRetries, 1, 1 ); advancedPageLayout->addMultiCellWidget( m_checkIgnoreReadErrors, 2, 2, 0, 1 ); advancedPageLayout->addMultiCellWidget( m_checkUseIndex0, 3, 3, 0, 1 ); @@ -176,20 +176,20 @@ void K3bAudioRippingDialog::setupGui() setStartButtonText( i18n( "Start Ripping" ), i18n( "Starts copying the selected tracks") ); - connect( m_checkUseIndex0, SIGNAL(toggled(bool)), this, SLOT(refresh()) ); - connect( m_optionWidget, SIGNAL(changed()), this, SLOT(refresh()) ); + connect( m_checkUseIndex0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(refresh()) ); + connect( m_optionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); } void K3bAudioRippingDialog::setupContextHelp() { - QToolTip::add( m_spinRetries, i18n("Maximal number of read retries") ); - QWhatsThis::add( m_spinRetries, i18n("<p>This specifies the maximum number of retries to " + TQToolTip::add( m_spinRetries, i18n("Maximal number of read retries") ); + TQWhatsThis::add( m_spinRetries, i18n("<p>This specifies the maximum number of retries to " "read a sector of audio data from the cd. After that " "K3b will either skip the sector if the <em>Ignore Read Errors</em> " "option is enabled or stop the process.") ); - QToolTip::add( m_checkUseIndex0, i18n("Do not read the pregaps at the end of every track") ); - QWhatsThis::add( m_checkUseIndex0, i18n("<p>If this option is checked K3b will not rip the audio " + TQToolTip::add( m_checkUseIndex0, i18n("Do not read the pregaps at the end of every track") ); + TQWhatsThis::add( m_checkUseIndex0, i18n("<p>If this option is checked K3b will not rip the audio " "data in the pregaps. Most audio tracks contain an empty " "pregap which does not belong to the track itself.</p>" "<p>Although the default behaviour of nearly all ripping " @@ -227,14 +227,14 @@ void K3bAudioRippingDialog::slotStartClicked() } // check if we need to overwrite some files... - QListViewItemIterator it( m_viewTracks ); - QStringList filesToOverwrite; + TQListViewItemIterator it( m_viewTracks ); + TQStringList filesToOverwrite; for( unsigned int i = 0; i < d->filenames.count(); ++i ) { - if( QFile::exists( d->filenames[i] ) ) + if( TQFile::exists( d->filenames[i] ) ) filesToOverwrite.append( d->filenames[i] ); } - if( m_optionWidget->createPlaylist() && QFile::exists( d->playlistFilename ) ) + if( m_optionWidget->createPlaylist() && TQFile::exists( d->playlistFilename ) ) filesToOverwrite.append( d->playlistFilename ); if( !filesToOverwrite.isEmpty() ) @@ -246,18 +246,18 @@ void K3bAudioRippingDialog::slotStartClicked() // prepare list of tracks to rip - QValueVector<QPair<int, QString> > tracksToRip; + TQValueVector<TQPair<int, TQString> > tracksToRip; unsigned int i = 0; - for( QValueList<int>::const_iterator trackIt = m_trackNumbers.begin(); + for( TQValueList<int>::const_iterator trackIt = m_trackNumbers.begin(); trackIt != m_trackNumbers.end(); ++trackIt ) { - tracksToRip.append( qMakePair( *trackIt, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); + tracksToRip.append( tqMakePair( *trackIt, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); ++i; } - K3bJobProgressDialog ripDialog( parentWidget(), "Ripping" ); + K3bJobProgressDialog ripDialog( tqparentWidget(), "Ripping" ); K3bAudioEncoder* encoder = m_optionWidget->encoder(); - K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, this ); + K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, TQT_TQOBJECT(this) ); job->setDevice( m_device ); job->setCddbEntry( m_cddbEntry ); job->setTracksToRip( tracksToRip ); @@ -289,22 +289,22 @@ void K3bAudioRippingDialog::refresh() m_viewTracks->clear(); d->filenames.clear(); - QString baseDir = K3b::prepareDir( m_optionWidget->baseDir() ); + TQString baseDir = K3b::prepareDir( m_optionWidget->baseDir() ); d->fsInfo.setPath( baseDir ); KIO::filesize_t overallSize = 0; if( m_optionWidget->createSingleFile() ) { long length = 0; - for( QValueList<int>::const_iterator it = m_trackNumbers.begin(); + for( TQValueList<int>::const_iterator it = m_trackNumbers.begin(); it != m_trackNumbers.end(); ++it ) { length += ( m_checkUseIndex0->isChecked() ? m_toc[*it-1].realAudioLength().lba() : m_toc[*it-1].length().lba() ); } - QString filename; - QString extension; + TQString filename; + TQString extension; long long fileSize = 0; if( m_optionWidget->encoder() == 0 ) { extension = "wav"; @@ -347,11 +347,11 @@ void K3bAudioRippingDialog::refresh() i18n("Cue-file") ); } else { - for( QValueList<int>::const_iterator it = m_trackNumbers.begin(); + for( TQValueList<int>::const_iterator it = m_trackNumbers.begin(); it != m_trackNumbers.end(); ++it ) { int index = *it - 1; - QString extension; + TQString extension; long long fileSize = 0; K3b::Msf trackLength = ( m_checkUseIndex0->isChecked() ? m_toc[index].realAudioLength() @@ -374,7 +374,7 @@ void K3bAudioRippingDialog::refresh() } - QString filename; + TQString filename; if( (int)m_cddbEntry.titles.count() >= *it ) { filename = K3bPatternParser::parsePattern( m_cddbEntry, *it, @@ -383,7 +383,7 @@ void K3bAudioRippingDialog::refresh() m_patternWidget->blankReplaceString() ) + "." + extension; } else { - filename = i18n("Track%1").arg( QString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension; + filename = i18n("Track%1").tqarg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension; } filename = d->fsInfo.fixupPath( filename ); @@ -401,7 +401,7 @@ void K3bAudioRippingDialog::refresh() // create playlist item if( m_optionWidget->createPlaylist() ) { - QString filename = K3bPatternParser::parsePattern( m_cddbEntry, 1, + TQString filename = K3bPatternParser::parsePattern( m_cddbEntry, 1, m_patternWidget->playlistPattern(), m_patternWidget->replaceBlanks(), m_patternWidget->blankReplaceString() ) + ".m3u"; @@ -423,7 +423,7 @@ void K3bAudioRippingDialog::refresh() } -void K3bAudioRippingDialog::setStaticDir( const QString& path ) +void K3bAudioRippingDialog::setStaticDir( const TQString& path ) { m_optionWidget->setBaseDir( path ); } diff --git a/src/rip/k3baudiorippingdialog.h b/src/rip/k3baudiorippingdialog.h index 83fe0dc..2a0304b 100644 --- a/src/rip/k3baudiorippingdialog.h +++ b/src/rip/k3baudiorippingdialog.h @@ -19,7 +19,7 @@ #include <k3binteractiondialog.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <k3bcddbquery.h> @@ -30,11 +30,11 @@ namespace K3bDevice { class KListView; -class QCheckBox; -class QSpinBox; -class QComboBox; +class TQCheckBox; +class TQSpinBox; +class TQComboBox; class K3bCddbPatternWidget; -class QToolButton; +class TQToolButton; class K3bAudioConvertingOptionWidget; @@ -44,16 +44,17 @@ class K3bAudioConvertingOptionWidget; class K3bAudioRippingDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: K3bAudioRippingDialog( const K3bDevice::Toc&, K3bDevice::Device*, const K3bCddbResultEntry&, - const QValueList<int>&, - QWidget *parent = 0, const char *name = 0 ); + const TQValueList<int>&, + TQWidget *tqparent = 0, const char *name = 0 ); ~K3bAudioRippingDialog(); - void setStaticDir( const QString& path ); + void setStaticDir( const TQString& path ); public slots: void refresh(); @@ -63,14 +64,14 @@ class K3bAudioRippingDialog : public K3bInteractionDialog K3bDevice::Toc m_toc; K3bDevice::Device* m_device; K3bCddbResultEntry m_cddbEntry; - QValueList<int> m_trackNumbers; + TQValueList<int> m_trackNumbers; KListView* m_viewTracks; - QComboBox* m_comboParanoiaMode; - QSpinBox* m_spinRetries; - QCheckBox* m_checkIgnoreReadErrors; - QCheckBox* m_checkUseIndex0; + TQComboBox* m_comboParanoiaMode; + TQSpinBox* m_spinRetries; + TQCheckBox* m_checkIgnoreReadErrors; + TQCheckBox* m_checkUseIndex0; K3bCddbPatternWidget* m_patternWidget; K3bAudioConvertingOptionWidget* m_optionWidget; diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp index 8a5a6e9..48e8780 100644 --- a/src/rip/k3baudioripthread.cpp +++ b/src/rip/k3baudioripthread.cpp @@ -30,9 +30,9 @@ #include <k3btrack.h> #include <k3bglobals.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqtimer.h> #include <kdebug.h> #include <klocale.h> @@ -71,12 +71,12 @@ public: K3bDevice::Toc toc; - QString fileType; + TQString fileType; }; K3bAudioRipThread::K3bAudioRipThread() - : QObject(), + : TQObject(), K3bThread(), m_device(0), m_useIndex0(false) @@ -93,7 +93,7 @@ K3bAudioRipThread::~K3bAudioRipThread() } -void K3bAudioRipThread::setFileType( const QString& t ) +void K3bAudioRipThread::setFileType( const TQString& t ) { d->fileType = t; } @@ -150,15 +150,15 @@ void K3bAudioRipThread::run() d->toc = m_device->readToc(); if( !d->paranoiaLib->initParanoia( m_device, d->toc ) ) { - emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), + emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR ); m_device->block(false); // check if we have write access to the generic device if( m_device->interfaceType() == K3bDevice::SCSI && !m_device->genericDevice().isEmpty() && - !QFileInfo( m_device->genericDevice() ).isWritable() ) - emitInfoMessage( i18n("You need write access to %1").arg( m_device->genericDevice() ), K3bJob::ERROR ); + !TQFileInfo( m_device->genericDevice() ).isWritable() ) + emitInfoMessage( i18n("You need write access to %1").tqarg( m_device->genericDevice() ), K3bJob::ERROR ); emitFinished(false); return; @@ -192,12 +192,12 @@ void K3bAudioRipThread::run() if( m_singleFile ) { - QString& filename = m_tracks[0].second; + TQString& filename = m_tracks[0].second; - QString dir = filename.left( filename.findRev("/") ); + TQString dir = filename.left( filename.tqfindRev("/") ); if( !KStandardDirs::makeDir( dir, 0777 ) ) { d->paranoiaLib->close(); - emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); m_device->block(false); emitFinished(false); return; @@ -214,7 +214,7 @@ void K3bAudioRipThread::run() d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_ARTIST, m_cddbEntry.cdArtist ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_TITLE, m_cddbEntry.cdTitle ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_COMMENT, m_cddbEntry.cdExtInfo ); - d->encoder->setMetaData( K3bAudioEncoder::META_YEAR, QString::number(m_cddbEntry.year) ); + d->encoder->setMetaData( K3bAudioEncoder::META_YEAR, TQString::number(m_cddbEntry.year) ); d->encoder->setMetaData( K3bAudioEncoder::META_GENRE, m_cddbEntry.genre ); } else @@ -226,13 +226,13 @@ void K3bAudioRipThread::run() if( !isOpen ) { d->paranoiaLib->close(); - emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR ); m_device->block(false); emitFinished(false); return; } - emitInfoMessage( i18n("Ripping to single file '%1'.").arg(filename), K3bJob::INFO ); + emitInfoMessage( i18n("Ripping to single file '%1'.").tqarg(filename), K3bJob::INFO ); } emitInfoMessage( i18n("Starting digital audio extraction (ripping)."), K3bJob::INFO ); @@ -253,8 +253,8 @@ void K3bAudioRipThread::run() d->waveFileWriter->close(); if( success && !d->canceled ) { - QString& filename = m_tracks[0].second; - emitInfoMessage( i18n("Successfully ripped to %2.").arg(filename), K3bJob::INFO ); + TQString& filename = m_tracks[0].second; + emitInfoMessage( i18n("Successfully ripped to %2.").tqarg(filename), K3bJob::INFO ); } } @@ -286,7 +286,7 @@ void K3bAudioRipThread::run() } -bool K3bAudioRipThread::ripTrack( int track, const QString& filename ) +bool K3bAudioRipThread::ripTrack( int track, const TQString& filename ) { const K3bTrack& tt = d->toc[track-1]; @@ -298,9 +298,9 @@ bool K3bAudioRipThread::ripTrack( int track, const QString& filename ) long trackSectorsRead = 0; - QString dir = filename.left( filename.findRev("/") ); + TQString dir = filename.left( filename.tqfindRev("/") ); if( !KStandardDirs::makeDir( dir, 0777 ) ) { - emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); return false; } @@ -315,11 +315,11 @@ bool K3bAudioRipThread::ripTrack( int track, const QString& filename ) d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_ARTIST, m_cddbEntry.artists[track-1] ); d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_TITLE, m_cddbEntry.titles[track-1] ); d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_COMMENT, m_cddbEntry.extInfos[track-1] ); - d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_NUMBER, QString::number(track).rightJustify( 2, '0' ) ); + d->encoder->setMetaData( K3bAudioEncoder::META_TRACK_NUMBER, TQString::number(track).rightJustify( 2, '0' ) ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_ARTIST, m_cddbEntry.cdArtist ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_TITLE, m_cddbEntry.cdTitle ); d->encoder->setMetaData( K3bAudioEncoder::META_ALBUM_COMMENT, m_cddbEntry.cdExtInfo ); - d->encoder->setMetaData( K3bAudioEncoder::META_YEAR, QString::number(m_cddbEntry.year) ); + d->encoder->setMetaData( K3bAudioEncoder::META_YEAR, TQString::number(m_cddbEntry.year) ); d->encoder->setMetaData( K3bAudioEncoder::META_GENRE, m_cddbEntry.genre ); } else @@ -330,16 +330,16 @@ bool K3bAudioRipThread::ripTrack( int track, const QString& filename ) } if( !isOpen ) { - emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR ); return false; } } if( !m_cddbEntry.artists[track-1].isEmpty() && !m_cddbEntry.titles[track-1].isEmpty() ) - emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").arg(track).arg(m_cddbEntry.artists[track-1]).arg(m_cddbEntry.titles[track-1]) ); + emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").tqarg(track).tqarg(m_cddbEntry.artists[track-1]).tqarg(m_cddbEntry.titles[track-1]) ); else - emitNewSubTask( i18n("Ripping track %1").arg(track) ); + emitNewSubTask( i18n("Ripping track %1").tqarg(track) ); int status; while( 1 ) { @@ -352,9 +352,9 @@ bool K3bAudioRipThread::ripTrack( int track, const QString& filename ) if( status == K3bCdparanoiaLib::S_OK ) { if( buf == 0 ) { if( m_singleFile ) - emitInfoMessage( i18n("Successfully ripped track %1.").arg(track), K3bJob::INFO ); + emitInfoMessage( i18n("Successfully ripped track %1.").tqarg(track), K3bJob::INFO ); else - emitInfoMessage( i18n("Successfully ripped track %1 to %2.").arg(track).arg(filename), K3bJob::INFO ); + emitInfoMessage( i18n("Successfully ripped track %1 to %2.").tqarg(track).tqarg(filename), K3bJob::INFO ); if( !m_singleFile ) { if( d->encoder ) @@ -371,7 +371,7 @@ bool K3bAudioRipThread::ripTrack( int track, const QString& filename ) CD_FRAMESIZE_RAW ) < 0 ) { kdDebug() << "(K3bAudioRipThread) error while encoding." << endl; emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR ); - emitInfoMessage( i18n("Error while encoding track %1.").arg(track), K3bJob::ERROR ); + emitInfoMessage( i18n("Error while encoding track %1.").tqarg(track), K3bJob::ERROR ); return false; } } @@ -387,7 +387,7 @@ bool K3bAudioRipThread::ripTrack( int track, const QString& filename ) } } else { - emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(track), K3bJob::ERROR ); + emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(track), K3bJob::ERROR ); return false; } } @@ -409,7 +409,7 @@ void K3bAudioRipThread::cancel() // wait for 1 second. I the thread still is working terminate it // and trigger the finished slot manually emitInfoMessage( i18n("Cancellation could take a while..."), K3bJob::INFO ); - QTimer::singleShot( 1000, this, SLOT(slotCheckIfThreadStillRunning()) ); + TQTimer::singleShot( 1000, this, TQT_SLOT(slotCheckIfThreadStillRunning()) ); } @@ -433,9 +433,9 @@ void K3bAudioRipThread::slotCheckIfThreadStillRunning() void K3bAudioRipThread::cleanupAfterCancellation() { if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) { - if( QFile::exists( m_tracks[d->currentTrackIndex].second ) ) { - QFile::remove( m_tracks[d->currentTrackIndex].second ); - emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO ); + if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) { + TQFile::remove( m_tracks[d->currentTrackIndex].second ); + emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO ); } } } @@ -444,18 +444,18 @@ void K3bAudioRipThread::cleanupAfterCancellation() bool K3bAudioRipThread::writePlaylist() { // this is an absolut path so there is always a "/" - QString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) ); + TQString playlistDir = m_playlistFilename.left( m_playlistFilename.tqfindRev( "/" ) ); if( !KStandardDirs::makeDir( playlistDir ) ) { - emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR ); return false; } - emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO ); + emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO ); - QFile f( m_playlistFilename ); + TQFile f( m_playlistFilename ); if( f.open( IO_WriteOnly ) ) { - QTextStream t( &f ); + TQTextStream t( &f ); // format descriptor t << "#EXTM3U" << endl; @@ -467,8 +467,8 @@ bool K3bAudioRipThread::writePlaylist() if( !m_cddbEntry.cdArtist.isEmpty() && !m_cddbEntry.cdTitle.isEmpty() ) t << m_cddbEntry.cdArtist << " - " << m_cddbEntry.cdTitle << endl; else - t << m_tracks[0].second.mid(m_tracks[0].second.findRev("/") + 1, - m_tracks[0].second.length() - m_tracks[0].second.findRev("/") - 5) + t << m_tracks[0].second.mid(m_tracks[0].second.tqfindRev("/") + 1, + m_tracks[0].second.length() - m_tracks[0].second.tqfindRev("/") - 5) << endl; // filename without extension // filename @@ -488,9 +488,9 @@ bool K3bAudioRipThread::writePlaylist() if( !m_cddbEntry.artists[trackIndex].isEmpty() && !m_cddbEntry.titles[trackIndex].isEmpty() ) t << m_cddbEntry.artists[trackIndex] << " - " << m_cddbEntry.titles[trackIndex] << endl; else - t << m_tracks[i].second.mid(m_tracks[i].second.findRev("/") + 1, + t << m_tracks[i].second.mid(m_tracks[i].second.tqfindRev("/") + 1, m_tracks[i].second.length() - - m_tracks[i].second.findRev("/") - 5) + - m_tracks[i].second.tqfindRev("/") - 5) << endl; // filename without extension // filename @@ -502,10 +502,10 @@ bool K3bAudioRipThread::writePlaylist() } } - return ( t.device()->status() == IO_Ok ); + return ( t.tqdevice()->status() == IO_Ok ); } else { - emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR ); kdDebug() << "(K3bAudioRipThread) could not open file " << m_playlistFilename << " for writing." << endl; return false; } @@ -543,37 +543,37 @@ bool K3bAudioRipThread::writeCueFile() // we always use a relative filename here - QString imageFile = m_tracks[0].second.section( '/', -1 ); - cueWriter.setImage( imageFile, ( d->fileType.isEmpty() ? QString("WAVE") : d->fileType ) ); + TQString imageFile = m_tracks[0].second.section( '/', -1 ); + cueWriter.setImage( imageFile, ( d->fileType.isEmpty() ? TQString("WAVE") : d->fileType ) ); // use the same base name as the image file - QString cueFile = m_tracks[0].second; - cueFile.truncate( cueFile.findRev(".") ); + TQString cueFile = m_tracks[0].second; + cueFile.truncate( cueFile.tqfindRev(".") ); cueFile += ".cue"; - emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO ); + emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO ); return cueWriter.save( cueFile ); } -QString K3bAudioRipThread::findRelativePath( const QString& absPath, const QString& baseDir ) +TQString K3bAudioRipThread::findRelativePath( const TQString& absPath, const TQString& baseDir ) { - QString baseDir_ = K3b::prepareDir( K3b::fixupPath(baseDir) ); - QString path = K3b::fixupPath( absPath ); + TQString baseDir_ = K3b::prepareDir( K3b::fixupPath(baseDir) ); + TQString path = K3b::fixupPath( absPath ); // both paths have an equal beginning. That's just how it's configured by K3b - int pos = baseDir_.find( "/" ); + int pos = baseDir_.tqfind( "/" ); int oldPos = pos; while( pos != -1 && path.left( pos+1 ) == baseDir_.left( pos+1 ) ) { oldPos = pos; - pos = baseDir_.find( "/", pos+1 ); + pos = baseDir_.tqfind( "/", pos+1 ); } // now the paths are equal up to oldPos, so that's how "deep" we go path = path.mid( oldPos+1 ); baseDir_ = baseDir_.mid( oldPos+1 ); - int numberOfDirs = baseDir_.contains( '/' ); + int numberOfDirs = baseDir_.tqcontains( '/' ); for( int i = 0; i < numberOfDirs; ++i ) path.prepend( "../" ); @@ -581,20 +581,20 @@ QString K3bAudioRipThread::findRelativePath( const QString& absPath, const QStri } -QString K3bAudioRipThread::jobDescription() const +TQString K3bAudioRipThread::jobDescription() const { if( m_cddbEntry.cdTitle.isEmpty() ) return i18n("Ripping Audio Tracks"); else - return i18n("Ripping Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle); + return i18n("Ripping Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle); } -QString K3bAudioRipThread::jobDetails() const +TQString K3bAudioRipThread::jobDetails() const { if( d->encoder ) return i18n("1 track (encoding to %1)", "%n tracks (encoding to %1)", - m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType)); + m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType)); else return i18n("1 track", "%n tracks", m_tracks.count() ); } diff --git a/src/rip/k3baudioripthread.h b/src/rip/k3baudioripthread.h index 93d600f..cb3ce53 100644 --- a/src/rip/k3baudioripthread.h +++ b/src/rip/k3baudioripthread.h @@ -18,9 +18,9 @@ #define K3B_AUDIO_RIP_THREAD_H #include <k3bthread.h> -#include <qobject.h> -#include <qvaluevector.h> -#include <qpair.h> +#include <tqobject.h> +#include <tqvaluevector.h> +#include <tqpair.h> #include <k3bcddbquery.h> @@ -32,16 +32,17 @@ namespace K3bDevice { } -class K3bAudioRipThread : public QObject, public K3bThread +class K3bAudioRipThread : public TQObject, public K3bThread { Q_OBJECT + TQ_OBJECT public: K3bAudioRipThread(); ~K3bAudioRipThread(); - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; // paranoia settings void setParanoiaMode( int mode ); @@ -62,15 +63,15 @@ class K3bAudioRipThread : public QObject, public K3bThread /** * Used for encoders that support multiple formats */ - void setFileType( const QString& ); + void setFileType( const TQString& ); /** * 1 is the first track */ - void setTracksToRip( const QValueVector<QPair<int, QString> >& t ) { m_tracks = t; } + void setTracksToRip( const TQValueVector<TQPair<int, TQString> >& t ) { m_tracks = t; } void setWritePlaylist( bool b ) { m_writePlaylist = b; } - void setPlaylistFilename( const QString& s ) { m_playlistFilename = s; } + void setPlaylistFilename( const TQString& s ) { m_playlistFilename = s; } void setUseRelativePathInPlaylist( bool b ) { m_relativePathInPlaylist = b; } void setWriteCueFile( bool b ) { m_writeCueFile = b; } @@ -80,10 +81,10 @@ class K3bAudioRipThread : public QObject, public K3bThread void slotCheckIfThreadStillRunning(); private: - /** reimplemented from QThread. Does the work */ + /** reimplemented from TQThread. Does the work */ void run(); - bool ripTrack( int track, const QString& filename ); + bool ripTrack( int track, const TQString& filename ); void cleanupAfterCancellation(); bool writePlaylist(); bool writeCueFile(); @@ -91,7 +92,7 @@ class K3bAudioRipThread : public QObject, public K3bThread /** * Finds a relative path from baseDir to absPath */ - QString findRelativePath( const QString& absPath, const QString& baseDir ); + TQString findRelativePath( const TQString& absPath, const TQString& baseDir ); K3bCddbResultEntry m_cddbEntry; K3bDevice::Device* m_device; @@ -102,11 +103,11 @@ class K3bAudioRipThread : public QObject, public K3bThread bool m_writePlaylist; bool m_relativePathInPlaylist; - QString m_playlistFilename; + TQString m_playlistFilename; bool m_writeCueFile; - QValueVector<QPair<int, QString> > m_tracks; + TQValueVector<TQPair<int, TQString> > m_tracks; friend class K3bAudioRipJob; diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index 9cea4d5..ba5427a 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -22,18 +22,18 @@ #include <kurllabel.h> #include <kdebug.h> -#include <qregexp.h> -#include <qvalidator.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqregexp.h> +#include <tqvalidator.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlayout.h> -K3bCddbPatternWidget::K3bCddbPatternWidget( QWidget* parent, const char* name ) - : base_K3bCddbPatternWidget( parent, name ) +K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* tqparent, const char* name ) + : base_K3bCddbPatternWidget( tqparent, name ) { - // fix the layout - ((QGridLayout*)layout())->setRowStretch( 4, 1 ); + // fix the tqlayout + ((TQGridLayout*)tqlayout())->setRowStretch( 4, 1 ); // setup validators // there can never be one of the following characters in both dir and filename: @@ -41,7 +41,7 @@ K3bCddbPatternWidget::K3bCddbPatternWidget( QWidget* parent, const char* name ) // additional the filename can never contain a slash / // and the dir should never start with a slash since it should always be a relative path - QRegExpValidator* dirValidator = new QRegExpValidator( QRegExp( "[^/][^?\\*\\\"]*" ), this ); + TQRegExpValidator* dirValidator = new TQRegExpValidator( TQRegExp( "[^/][^?\\*\\\"]*" ), TQT_TQOBJECT(this) ); m_comboFilenamePattern->setValidator( dirValidator ); m_comboPlaylistPattern->setValidator( dirValidator ); m_editBlankReplace->setValidator( dirValidator ); @@ -56,18 +56,18 @@ K3bCddbPatternWidget::K3bCddbPatternWidget( QWidget* parent, const char* name ) m_comboPlaylistPattern->insertItem( i18n( "Playlist" ) ); m_comboPlaylistPattern->insertItem( i18n( "playlists/%{albumartist}/%{albumtitle }" ) ); - connect( m_comboFilenamePattern, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_comboPlaylistPattern, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_editBlankReplace, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_checkBlankReplace, SIGNAL(toggled(bool)), - this, SIGNAL(changed()) ); - connect( m_specialStringsLabel, SIGNAL(leftClickedURL()), - this, SLOT(slotSeeSpecialStrings()) ); - connect( m_conditionalInclusionLabel, SIGNAL(leftClickedURL()), - this, SLOT(slotSeeConditionalInclusion()) ); + connect( m_comboFilenamePattern, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_comboPlaylistPattern, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_editBlankReplace, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_checkBlankReplace, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(changed()) ); + connect( m_specialStringsLabel, TQT_SIGNAL(leftClickedURL()), + this, TQT_SLOT(slotSeeSpecialStrings()) ); + connect( m_conditionalInclusionLabel, TQT_SIGNAL(leftClickedURL()), + this, TQT_SLOT(slotSeeConditionalInclusion()) ); } @@ -76,19 +76,19 @@ K3bCddbPatternWidget::~K3bCddbPatternWidget() } -QString K3bCddbPatternWidget::filenamePattern() const +TQString K3bCddbPatternWidget::filenamePattern() const { return m_comboFilenamePattern->currentText(); } -QString K3bCddbPatternWidget::playlistPattern() const +TQString K3bCddbPatternWidget::playlistPattern() const { return m_comboPlaylistPattern->currentText(); } -QString K3bCddbPatternWidget::blankReplaceString() const +TQString K3bCddbPatternWidget::blankReplaceString() const { return m_editBlankReplace->text(); } @@ -129,7 +129,7 @@ void K3bCddbPatternWidget::loadDefaults() void K3bCddbPatternWidget::slotSeeSpecialStrings() { - QWhatsThis::display( i18n( "<p><b>Pattern special strings:</b>" + TQWhatsThis::display( i18n( "<p><b>Pattern special strings:</b>" "<p>The following strings will be replaced with their respective meaning in every " "track name.<br>" "<em>Hint:</em> %A differs from %a only on soundtracks or compilations." @@ -150,7 +150,7 @@ void K3bCddbPatternWidget::slotSeeSpecialStrings() void K3bCddbPatternWidget::slotSeeConditionalInclusion() { - QWhatsThis::display( i18n( "<p><b>Conditional inclusion:</b>" + TQWhatsThis::display( i18n( "<p><b>Conditional inclusion:</b>" "<p>These patterns make it possible to selectively include texts, " "depending on the value of CDDB entries. You can choose only to " "include or exclude texts if one of the entries is empty, " diff --git a/src/rip/k3bcddbpatternwidget.h b/src/rip/k3bcddbpatternwidget.h index 928b95b..ef15ae7 100644 --- a/src/rip/k3bcddbpatternwidget.h +++ b/src/rip/k3bcddbpatternwidget.h @@ -25,14 +25,15 @@ class KConfigBase; class K3bCddbPatternWidget : public base_K3bCddbPatternWidget { Q_OBJECT + TQ_OBJECT public: - K3bCddbPatternWidget( QWidget* parent = 0, const char* name = 0 ); + K3bCddbPatternWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bCddbPatternWidget(); - QString filenamePattern() const; - QString playlistPattern() const; - QString blankReplaceString() const; + TQString filenamePattern() const; + TQString playlistPattern() const; + TQString blankReplaceString() const; bool replaceBlanks() const; signals: diff --git a/src/rip/k3bcuefilewriter.cpp b/src/rip/k3bcuefilewriter.cpp index 087002d..2303926 100644 --- a/src/rip/k3bcuefilewriter.cpp +++ b/src/rip/k3bcuefilewriter.cpp @@ -20,9 +20,9 @@ #include <k3bcore.h> #include <k3bversion.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqdatetime.h> K3bCueFileWriter::K3bCueFileWriter() @@ -30,22 +30,22 @@ K3bCueFileWriter::K3bCueFileWriter() } -bool K3bCueFileWriter::save( const QString& filename ) +bool K3bCueFileWriter::save( const TQString& filename ) { - QFile f( filename ); + TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { kdDebug() << "(K3bCueFileWriter) could not open file " << f.name() << endl; return false; } - QTextStream s( &f ); + TQTextStream s( &f ); return save( s ); } -bool K3bCueFileWriter::save( QTextStream& t ) +bool K3bCueFileWriter::save( TQTextStream& t ) { t << "REM Cue file written by K3b " << k3bcore->version() << endl << endl; @@ -64,7 +64,7 @@ bool K3bCueFileWriter::save( QTextStream& t ) const K3bDevice::Track& track = *it; - t << " TRACK " << QString::number(i+1).rightJustify( 2, '0' ) << " AUDIO" << endl; + t << " TRACK " << TQString::number(i+1).rightJustify( 2, '0' ) << " AUDIO" << endl; if( m_cdText.count() > i && !m_cdText[i].isEmpty() ) { t << " PERFORMER \"" << m_cdText[i].performer() << "\"" << endl; @@ -87,5 +87,5 @@ bool K3bCueFileWriter::save( QTextStream& t ) i++; } - return ( t.device()->status() == IO_Ok ); + return ( t.tqdevice()->status() == IO_Ok ); } diff --git a/src/rip/k3bcuefilewriter.h b/src/rip/k3bcuefilewriter.h index 88f7ffe..cee821d 100644 --- a/src/rip/k3bcuefilewriter.h +++ b/src/rip/k3bcuefilewriter.h @@ -16,8 +16,8 @@ #ifndef _K3B_CUE_FILE_WRITER_H_ #define _K3B_CUE_FILE_WRITER_H_ -#include <qtextstream.h> -#include <qstringlist.h> +#include <tqtextstream.h> +#include <tqstringlist.h> #include <k3btoc.h> #include <k3bcdtext.h> @@ -37,18 +37,18 @@ class K3bCueFileWriter public: K3bCueFileWriter(); - bool save( QTextStream& ); - bool save( const QString& filename ); + bool save( TQTextStream& ); + bool save( const TQString& filename ); void setData( const K3bDevice::Toc& toc ) { m_toc = toc; } void setCdText( const K3bDevice::CdText& text ) { m_cdText = text; } - void setImage( const QString& name, const QString& type ) { m_image = name; m_dataType = type; } + void setImage( const TQString& name, const TQString& type ) { m_image = name; m_dataType = type; } private: K3bDevice::Toc m_toc; K3bDevice::CdText m_cdText; - QString m_image; - QString m_dataType; + TQString m_image; + TQString m_dataType; }; #endif diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp index 8ba04e6..4d25ad2 100644 --- a/src/rip/k3bpatternparser.cpp +++ b/src/rip/k3bpatternparser.cpp @@ -17,24 +17,24 @@ #include "k3bpatternparser.h" -#include <qregexp.h> -#include <qdatetime.h> -#include <qvaluestack.h> +#include <tqregexp.h> +#include <tqdatetime.h> +#include <tqvaluestack.h> #include <kglobal.h> #include <klocale.h> -QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, +TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, unsigned int trackNumber, - const QString& pattern, - bool replace, - const QString& replaceString ) + const TQString& pattern, + bool tqreplace, + const TQString& replaceString ) { if( entry.titles.count() < trackNumber ) return ""; - QString dir, s; + TQString dir, s; char c = ' '; // contains the character representation of a special string unsigned int len; // length of the current special string @@ -115,40 +115,40 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, switch( c ) { case ARTIST: s = entry.artists[trackNumber-1]; - s.replace( '/', '_' ); - s.replace( '*', '_' ); - s.replace( '}', '*' ); // for conditional inclusion + s.tqreplace( '/', '_' ); + s.tqreplace( '*', '_' ); + s.tqreplace( '}', '*' ); // for conditional inclusion dir.append( s.isEmpty() - ? i18n("unknown") + QString(" %1").arg(trackNumber) + ? i18n("unknown") + TQString(" %1").tqarg(trackNumber) : s ); break; case TITLE: s = entry.titles[trackNumber-1]; - s.replace( '/', '_' ); - s.replace( '*', '_' ); - s.replace( '}', '*' ); + s.tqreplace( '/', '_' ); + s.tqreplace( '*', '_' ); + s.tqreplace( '}', '*' ); dir.append( s.isEmpty() - ? i18n("Track %1").arg(trackNumber) + ? i18n("Track %1").tqarg(trackNumber) : s ); break; case NUMBER: - dir.append( QString::number(trackNumber).rightJustify( 2, '0' ) ); + dir.append( TQString::number(trackNumber).rightJustify( 2, '0' ) ); break; case YEAR: - dir.append( QString::number( entry.year ) ); + dir.append( TQString::number( entry.year ) ); break; case COMMENT: s = entry.extInfos[trackNumber-1]; - s.replace( '/', '_' ); - s.replace( '*', '_' ); - s.replace( '}', '*' ); + s.tqreplace( '/', '_' ); + s.tqreplace( '*', '_' ); + s.tqreplace( '}', '*' ); dir.append( s ); break; case GENRE: s = ( entry.genre.isEmpty() ? entry.category : entry.genre ); - s.replace( '/', '_' ); - s.replace( '*', '_' ); - s.replace( '}', '*' ); + s.tqreplace( '/', '_' ); + s.tqreplace( '*', '_' ); + s.tqreplace( '}', '*' ); dir.append( s ); break; case ALBUMARTIST: @@ -157,21 +157,21 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, break; case ALBUMTITLE: s = entry.cdTitle; - s.replace( '/', '_' ); - s.replace( '*', '_' ); - s.replace( '}', '*' ); + s.tqreplace( '/', '_' ); + s.tqreplace( '*', '_' ); + s.tqreplace( '}', '*' ); dir.append( s.isEmpty() ? i18n("unknown") : s ); break; case ALBUMCOMMENT: s = entry.cdExtInfo; - s.replace( '/', '_' ); - s.replace( '*', '_' ); - s.replace( '}', '*' ); + s.tqreplace( '/', '_' ); + s.tqreplace( '*', '_' ); + s.tqreplace( '}', '*' ); dir.append( s ); // I think it makes more sense to allow empty comments break; case DATE: - dir.append( KGlobal::locale()->formatDate( QDate::currentDate() ) ); + dir.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ); break; default: dir.append( pattern.mid(i, len) ); @@ -193,17 +193,17 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, // /* delete line comment to comment out // the following part: Conditional Inclusion - QValueStack<int> offsetStack; - QString inclusion; + TQValueStack<int> offsetStack; + TQString inclusion; bool isIncluded; - static QRegExp conditionrx( "^[@|!][atyegrmx](?:='.*')?\\{" ); + static TQRegExp conditionrx( "^[@|!][atyegrmx](?:='.*')?\\{" ); conditionrx.setMinimal( TRUE ); for( unsigned int i = 0; i < dir.length(); ++i ) { offsetStack.push( - conditionrx.search(dir, i, QRegExp::CaretAtOffset) ); + conditionrx.search(dir, i, TQRegExp::CaretAtOffset) ); if( offsetStack.top() == -1 ) { offsetStack.pop(); @@ -218,7 +218,7 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, int offset = offsetStack.pop(); int length = i - offset + 1; - switch( (QChar) dir[offset+1] ) { + switch( (TQChar) dir[offset+1] ) { case ARTIST: s = entry.artists[trackNumber-1]; break; @@ -226,10 +226,10 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, s = entry.titles[trackNumber-1]; break; case NUMBER: - s = QString::number( trackNumber ); + s = TQString::number( trackNumber ); break; case YEAR: - s = QString::number( entry.year ); + s = TQString::number( entry.year ); break; case COMMENT: s = entry.extInfos[trackNumber-1]; @@ -247,14 +247,14 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, s = entry.cdExtInfo; break; case DATE: - s = KGlobal::locale()->formatDate( QDate::currentDate() ); + s = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ); break; default: // we must never get here, break; // all choices should be covered } if( dir[offset+2] == '{' ) { // no string matching, e.g. ?y{text} - switch( (QChar) dir[offset+1] ) { + switch( (TQChar) dir[offset+1] ) { case YEAR: isIncluded = (s != "0"); break; @@ -267,8 +267,8 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, else { // with string matching, e.g. ?y='2004'{text} // Be aware that there might be ' in the condition text - int endOfCondition = dir.find( '{', offset+4 )-1; - QString condition = dir.mid( offset+4, + int endOfCondition = dir.tqfind( '{', offset+4 )-1; + TQString condition = dir.mid( offset+4, endOfCondition - (offset+4) ); isIncluded = (s == condition); @@ -280,7 +280,7 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, isIncluded = !isIncluded; // Leave it when it's '@'. - dir.replace( offset, length, ( isIncluded ? inclusion : QString("") ) ); + dir.tqreplace( offset, length, ( isIncluded ? inclusion : TQString("") ) ); if( isIncluded == TRUE ) i -= length - inclusion.length(); @@ -289,17 +289,17 @@ QString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, continue; - } // end of replace (at closing bracket '}') + } // end of tqreplace (at closing bracket '}') } // end of conditional inclusion for(...) // end of Conditional Inclusion */ - dir.replace( '*', '}' ); // bring the brackets back, if there were any + dir.tqreplace( '*', '}' ); // bring the brackets back, if there were any - if( replace ) - dir.replace( QRegExp( "\\s" ), replaceString ); + if( tqreplace ) + dir.tqreplace( TQRegExp( "\\s" ), replaceString ); return dir; } diff --git a/src/rip/k3bpatternparser.h b/src/rip/k3bpatternparser.h index 88a725d..1f2cf86 100644 --- a/src/rip/k3bpatternparser.h +++ b/src/rip/k3bpatternparser.h @@ -17,7 +17,7 @@ #ifndef K3BPATTERNPARSER_H #define K3BPATTERNPARSER_H -#include <qstring.h> +#include <tqstring.h> #include <k3bcddbquery.h> @@ -28,11 +28,11 @@ class K3bPatternParser { public: - static QString parsePattern( const K3bCddbResultEntry& entry, + static TQString parsePattern( const K3bCddbResultEntry& entry, unsigned int trackNumber, - const QString& pattern, - bool replace = false, - const QString& replaceString = "_" ); + const TQString& pattern, + bool tqreplace = false, + const TQString& replaceString = "_" ); private: enum { diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index ac30d40..9d6e8bc 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -15,11 +15,11 @@ -#include <qstring.h> -#include <qvaluelist.h> -#include <qstringlist.h> -#include <qtimer.h> -#include <qdom.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> +#include <tqtimer.h> +#include <tqdom.h> #include <klocale.h> #include <kconfig.h> @@ -31,8 +31,8 @@ #include <k3bexternalbinmanager.h> -K3bVideoCdInfo::K3bVideoCdInfo( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bVideoCdInfo::K3bVideoCdInfo( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { m_process = 0L; m_isXml = false; @@ -52,7 +52,7 @@ void K3bVideoCdInfo::cancelAll() } } -void K3bVideoCdInfo::info( const QString& device ) +void K3bVideoCdInfo::info( const TQString& device ) { if ( !k3bcore ->externalBinManager() ->foundBin( "vcdxrip" ) ) { kdDebug() << "(K3bVideoCdInfo::info) could not find vcdxrip executable" << endl; @@ -67,12 +67,12 @@ void K3bVideoCdInfo::info( const QString& device ) *m_process << "-q" << "--norip" << "-i" << device << "-o" << "-"; - connect( m_process, SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, SLOT( slotParseOutput( KProcess*, char*, int ) ) ); - connect( m_process, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, SLOT( slotParseOutput( KProcess*, char*, int ) ) ); - connect( m_process, SIGNAL( processExited( KProcess* ) ), - this, SLOT( slotInfoFinished() ) ); + connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), + this, TQT_SLOT( slotParseOutput( KProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), + this, TQT_SLOT( slotParseOutput( KProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + this, TQT_SLOT( slotInfoFinished() ) ); if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { kdDebug() << "(K3bVideoCdInfo::info) could not start vcdxrip" << endl; @@ -83,14 +83,14 @@ void K3bVideoCdInfo::info( const QString& device ) void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len ) { - QString buffer = QString::fromLocal8Bit( output, len ); + TQString buffer = TQString::fromLocal8Bit( output, len ); // split to lines - QStringList lines = QStringList::split( "\n", buffer ); - QStringList::Iterator end( lines.end()); - for ( QStringList::Iterator str = lines.begin(); str != end; ++str ) { + TQStringList lines = TQStringList::split( "\n", buffer ); + TQStringList::Iterator end( lines.end()); + for ( TQStringList::Iterator str = lines.begin(); str != end; ++str ) { - if ( ( *str ).contains( "<?xml" ) ) + if ( ( *str ).tqcontains( "<?xml" ) ) m_isXml = true; if ( m_isXml ) @@ -98,7 +98,7 @@ void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len ) else kdDebug() << "(K3bVideoCdInfo::slotParseOutput) " << *str << endl; - if ( ( *str ).contains( "</videocd>" ) ) + if ( ( *str ).tqcontains( "</videocd>" ) ) m_isXml = false; } } @@ -132,8 +132,8 @@ void K3bVideoCdInfo::slotInfoFinished() void K3bVideoCdInfo::parseXmlData() { - QDomDocument xml_doc; - QDomElement xml_root; + TQDomDocument xml_doc; + TQDomElement xml_root; m_Result.xmlData = m_xmlData; @@ -143,23 +143,23 @@ void K3bVideoCdInfo::parseXmlData() m_Result.type = xml_root.attribute( "class" ); m_Result.version = xml_root.attribute( "version" ); - for ( QDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement el = node.toElement(); - QString tagName = el.tagName().lower(); + for ( TQDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) { + TQDomElement el = node.toElement(); + TQString tagName = el.tagName().lower(); if ( tagName == "pvd" ) { - for ( QDomNode snode = node.firstChild(); !snode.isNull(); snode = snode.nextSibling() ) { - QDomElement sel = snode.toElement(); - QString pvdElement = sel.tagName().lower(); - QString pvdElementText = sel.text(); + for ( TQDomNode snode = node.firstChild(); !snode.isNull(); snode = snode.nextSibling() ) { + TQDomElement sel = snode.toElement(); + TQString pvdElement = sel.tagName().lower(); + TQString pvdElementText = sel.text(); if ( pvdElement == "volume-id" ) m_Result.volumeId = pvdElementText; } } else if ( tagName == "sequence-items" ) { - for ( QDomNode snode = node.firstChild(); !snode.isNull(); snode = snode.nextSibling() ) { - QDomElement sel = snode.toElement(); - QString seqElement = sel.tagName().lower(); + for ( TQDomNode snode = node.firstChild(); !snode.isNull(); snode = snode.nextSibling() ) { + TQDomElement sel = snode.toElement(); + TQString seqElement = sel.tagName().lower(); m_Result.addEntry( K3bVideoCdInfoResultEntry( sel.attribute( "src" ), sel.attribute( "id" ) ), @@ -167,9 +167,9 @@ void K3bVideoCdInfo::parseXmlData() ); } } else if ( tagName == "segment-items" ) { - for ( QDomNode snode = node.firstChild(); !snode.isNull(); snode = snode.nextSibling() ) { - QDomElement sel = snode.toElement(); - QString seqElement = sel.tagName().lower(); + for ( TQDomNode snode = node.firstChild(); !snode.isNull(); snode = snode.nextSibling() ) { + TQDomElement sel = snode.toElement(); + TQString seqElement = sel.tagName().lower(); m_Result.addEntry( K3bVideoCdInfoResultEntry( sel.attribute( "src" ), sel.attribute( "id" ) ), @@ -177,7 +177,7 @@ void K3bVideoCdInfo::parseXmlData() ); } } else { - kdDebug() << QString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).arg( tagName ) << endl; + kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).tqarg( tagName ) << endl; } } } diff --git a/src/rip/k3bvideocdinfo.h b/src/rip/k3bvideocdinfo.h index 0b295e6..c5acebe 100644 --- a/src/rip/k3bvideocdinfo.h +++ b/src/rip/k3bvideocdinfo.h @@ -17,9 +17,9 @@ #ifndef K3BVIDEOCDINFO_H #define K3BVIDEOCDINFO_H -#include <qstring.h> -#include <qstringlist.h> -#include <qobject.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqobject.h> #include <k3btoc.h> #include <k3bcore.h> @@ -32,12 +32,12 @@ class K3bVideoCdInfoResultEntry K3bVideoCdInfoResultEntry() : name( 0 ), id( 0 ) {} - K3bVideoCdInfoResultEntry( const QString& name, const QString& id ) + K3bVideoCdInfoResultEntry( const TQString& name, const TQString& id ) : name( name ), id( id ) {} - QString name; - QString id; + TQString name; + TQString id; long size; }; @@ -54,26 +54,27 @@ class K3bVideoCdInfoResult const K3bVideoCdInfoResultEntry& entry( unsigned int number = 0 , int type = K3bVideoCdInfoResult::SEQUENCE ) const; int foundEntries( int type = K3bVideoCdInfoResult::SEQUENCE ) const; - QString volumeId; - QString type; - QString version; + TQString volumeId; + TQString type; + TQString version; - QString xmlData; + TQString xmlData; private: - QValueList<K3bVideoCdInfoResultEntry> m_fileEntry; - QValueList<K3bVideoCdInfoResultEntry> m_segmentEntry; - QValueList<K3bVideoCdInfoResultEntry> m_sequenceEntry; + TQValueList<K3bVideoCdInfoResultEntry> m_fileEntry; + TQValueList<K3bVideoCdInfoResultEntry> m_segmentEntry; + TQValueList<K3bVideoCdInfoResultEntry> m_sequenceEntry; K3bVideoCdInfoResultEntry m_emptyEntry; }; -class K3bVideoCdInfo : public QObject +class K3bVideoCdInfo : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bVideoCdInfo( QObject* parent = 0, const char* name = 0 ); + K3bVideoCdInfo( TQObject* tqparent = 0, const char* name = 0 ); ~K3bVideoCdInfo(); /** @@ -82,7 +83,7 @@ class K3bVideoCdInfo : public QObject */ const K3bVideoCdInfoResult& result() const; - void info( const QString& ); + void info( const TQString& ); signals: void infoFinished( bool success ); @@ -99,7 +100,7 @@ class K3bVideoCdInfo : public QObject KProcess* m_process; - QString m_xmlData; + TQString m_xmlData; bool m_isXml; }; diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index a7467c9..a649e6e 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -21,13 +21,13 @@ #include <ktempfile.h> #include <kurl.h> -#include <qdatetime.h> -#include <qdom.h> -#include <qfile.h> -#include <qstring.h> -#include <qregexp.h> -#include <qtimer.h> -#include <qurl.h> +#include <tqdatetime.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqtimer.h> +#include <tqurl.h> // K3b Includes #include "k3bvideocdrip.h" @@ -36,8 +36,8 @@ #include <k3bglobals.h> #include <k3bprocess.h> -K3bVideoCdRip::K3bVideoCdRip( K3bJobHandler* hdl, K3bVideoCdRippingOptions* options, QObject* parent, const char* name ) - : K3bJob( hdl, parent, name ), +K3bVideoCdRip::K3bVideoCdRip( K3bJobHandler* hdl, K3bVideoCdRippingOptions* options, TQObject* tqparent, const char* name ) + : K3bJob( hdl, tqparent, name ), m_ripsourceType( 0 ), m_subPosition ( 0 ), m_videooptions( options ), @@ -97,8 +97,8 @@ void K3bVideoCdRip::vcdxRip() if ( !bin ) { kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl; - emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxrip" ), K3bJob::ERROR ); - emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).arg( ">= 0.7.12" ), K3bJob::INFO ); + emit infoMessage( i18n( "Could not tqfind %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR ); + emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -107,7 +107,7 @@ void K3bVideoCdRip::vcdxRip() if( bin->version < K3bVersion("0.7.12") ) { kdDebug() << "(K3bVideoCdRip) vcdxrip executable too old!" << endl; - emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).arg( "Vcdxrip" ).arg( "0.7.12" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).tqarg( "Vcdxrip" ).tqarg( "0.7.12" ), K3bJob::ERROR ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -115,14 +115,14 @@ void K3bVideoCdRip::vcdxRip() } if ( !bin->copyright.isEmpty() ) - emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO ); + emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO ); *m_process << k3bcore ->externalBinManager() ->binPath( "vcdxrip" ); // additional user parameters from config - const QStringList& params = k3bcore->externalBinManager() ->program( "vcdxrip" ) ->userParameters(); - for ( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = k3bcore->externalBinManager() ->program( "vcdxrip" ) ->userParameters(); + for ( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; *m_process << "--gui" << "--progress"; @@ -142,29 +142,29 @@ void K3bVideoCdRip::vcdxRip() if ( m_videooptions ->getVideoCdSector2336() ) *m_process << "--sector-2336"; - *m_process << "-i" << QString( "%1" ).arg( QFile::encodeName( m_videooptions ->getVideoCdSource() ) ); + *m_process << "-i" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() ); if ( m_videooptions ->getVideoCdExtractXml() ) - *m_process << "-o" << QString( "%1" ).arg( QFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ) ); + *m_process << "-o" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() ); else *m_process << "-o" << "/dev/null"; - connect( m_process, SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) ); - connect( m_process, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) ); - connect( m_process, SIGNAL( processExited( KProcess* ) ), - this, SLOT( slotVcdXRipFinished() ) ); + connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + this, TQT_SLOT( slotVcdXRipFinished() ) ); - m_process->setWorkingDirectory( QUrl( m_videooptions ->getVideoCdDestination() ).dirPath() ); + m_process->setWorkingDirectory( TQUrl( m_videooptions ->getVideoCdDestination() ).dirPath() ); // vcdxrip commandline parameters kdDebug() << "***** vcdxrip parameters:" << endl; ; - const QValueList<QCString>& args = m_process->args(); - QString s; - for ( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = m_process->args(); + TQString s; + for ( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -172,11 +172,11 @@ void K3bVideoCdRip::vcdxRip() emit newTask( i18n( "Extracting" ) ); emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO ); - emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO ); + emit infoMessage( i18n( "Extract files from %1 to %2." ).tqarg( m_videooptions ->getVideoCdSource() ).tqarg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO ); if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl; - emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR ); + emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxrip" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); } @@ -184,34 +184,34 @@ void K3bVideoCdRip::vcdxRip() void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len ) { - QString buffer = QString::fromLocal8Bit( output, len ); + TQString buffer = TQString::fromLocal8Bit( output, len ); // split to lines - QStringList lines = QStringList::split( "\n", buffer ); + TQStringList lines = TQStringList::split( "\n", buffer ); - QDomDocument xml_doc; - QDomElement xml_root; + TQDomDocument xml_doc; + TQDomElement xml_root; // do every line - 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 ) { *str = ( *str ).stripWhiteSpace(); emit debuggingOutput( "vcdxrip", *str ); - xml_doc.setContent( QString( "<?xml version='1.0'?><vcdxrip>" ) + *str + "</vcdxrip>" ); + xml_doc.setContent( TQString( "<?xml version='1.0'?><vcdxrip>" ) + *str + "</vcdxrip>" ); xml_root = xml_doc.documentElement(); - for ( QDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement el = node.toElement(); + for ( TQDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) { + TQDomElement el = node.toElement(); if ( el.isNull() ) continue; - const QString tagName = el.tagName().lower(); + const TQString tagName = el.tagName().lower(); if ( tagName == "progress" ) { - const QString oper = el.attribute( "operation" ).lower(); + const TQString oper = el.attribute( "operation" ).lower(); const unsigned long long overallPos = el.attribute( "position" ).toLong(); const unsigned long long pos = overallPos - m_subPosition; const unsigned long long size = el.attribute( "size" ).toLong() - m_subPosition; @@ -236,20 +236,20 @@ void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len ) } } else if ( tagName == "log" ) { - QDomText tel = el.firstChild().toText(); - const QString level = el.attribute( "level" ).lower(); + TQDomText tel = el.firstChild().toText(); + const TQString level = el.attribute( "level" ).lower(); if ( tel.isText() ) { - const QString text = tel.data(); + const TQString text = tel.data(); if ( level == "information" ) { - kdDebug() << QString( "(K3bVideoCdRip) vcdxrip information, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).tqarg( text ) << endl; parseInformation( text ); } else { if ( level != "error" ) { - kdDebug() << QString( "(K3bVideoCdRip) vcdxrip warning, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).tqarg( text ) << endl; emit debuggingOutput( "vcdxrip", text ); parseInformation( text ); } else { - kdDebug() << QString( "(K3bVideoCdRip) vcdxrip error, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).tqarg( text ) << endl; emit infoMessage( text, K3bJob::ERROR ); } } @@ -269,14 +269,14 @@ void K3bVideoCdRip::slotVcdXRipFinished() emit infoMessage( i18n( "Files successfully extracted." ), K3bJob::SUCCESS ); break; default: - emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxrip" ).arg( m_process->exitStatus() ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxrip" ).tqarg( m_process->exitStatus() ), K3bJob::ERROR ); emit infoMessage( i18n( "Please send me an email with the last output..." ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); return ; } } else { - emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxrip" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxrip" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); return ; @@ -285,12 +285,12 @@ void K3bVideoCdRip::slotVcdXRipFinished() jobFinished( true ); } -void K3bVideoCdRip::parseInformation( QString text ) +void K3bVideoCdRip::parseInformation( TQString text ) { // parse warning - if ( text.contains( "encountered non-form2 sector" ) ) { + if ( text.tqcontains( "encountered non-form2 sector" ) ) { // I think this is an error not a warning. Finish ripping with invalid mpegs. - emit infoMessage( i18n( "%1 encountered non-form2 sector" ).arg("Vcdxrip"), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 encountered non-form2 sector" ).tqarg("Vcdxrip"), K3bJob::ERROR ); emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); @@ -298,22 +298,22 @@ void K3bVideoCdRip::parseInformation( QString text ) } // parse extra info - else if ( text.contains( "detected extended VCD2.0 PBC files" ) ) + else if ( text.tqcontains( "detected extended VCD2.0 PBC files" ) ) emit infoMessage( i18n( "detected extended VCD2.0 PBC files" ), K3bJob::INFO ); // parse startposition and extracting sequence info // extracting avseq05.mpg... (start lsn 32603 (+28514)) else if ( text.startsWith( "extracting" ) ) { - if ( text.contains( "(start lsn" ) ) { - int index = text.find( "(start lsn" ); - int end = text.find( " (+" ); + if ( text.tqcontains( "(start lsn" ) ) { + int index = text.tqfind( "(start lsn" ); + int end = text.tqfind( " (+" ); if ( end > 0) { m_subPosition = text.mid( index + 11, end - index - 11 ).stripWhiteSpace().toLong(); } else { // found segment here we can get only the start lsn :) // extracting item0001.mpg... (start lsn 225, 1 segments) - int end = text.find( ",", index ); + int end = text.tqfind( ",", index ); int overallPos = text.mid( index + 11, end - index - 11 ).stripWhiteSpace().toLong(); double relOverallWritten = ( ( double ) overallPos * 2352 ) / ( double ) m_videooptions ->getVideoCdSize() ; int newpercent = ( int ) ( 100 * relOverallWritten ); @@ -325,31 +325,31 @@ void K3bVideoCdRip::parseInformation( QString text ) index = 11; - end = text.find( "(start lsn" ); - emit newSubTask( i18n( "Extracting %1" ).arg( text.mid( index, end - index ).stripWhiteSpace() ) ); + end = text.tqfind( "(start lsn" ); + emit newSubTask( i18n( "Extracting %1" ).tqarg( text.mid( index, end - index ).stripWhiteSpace() ) ); } // parse extracting files info // extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1) - else if ( text.contains( "(lsn" ) && text.contains( "size" ) ) { + else if ( text.tqcontains( "(lsn" ) && text.tqcontains( "size" ) ) { int index = 11; - int end = text.find( "to" ); - QString extractFileName = text.mid( index, end - index ).stripWhiteSpace(); - index = text.find( " to " ); - end = text.find( " (lsn" ); - QString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace(); - emit newSubTask( i18n( "Extracting %1 to %2" ).arg( extractFileName ).arg( toFileName ) ); + int end = text.tqfind( "to" ); + TQString extractFileName = text.mid( index, end - index ).stripWhiteSpace(); + index = text.tqfind( " to " ); + end = text.tqfind( " (lsn" ); + TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace(); + emit newSubTask( i18n( "Extracting %1 to %2" ).tqarg( extractFileName ).tqarg( toFileName ) ); } } } -QString K3bVideoCdRip::jobDescription() const +TQString K3bVideoCdRip::jobDescription() const { - return i18n( "Extracting %1" ).arg( m_videooptions ->getVideoCdDescription() ); + return i18n( "Extracting %1" ).tqarg( m_videooptions ->getVideoCdDescription() ); } -QString K3bVideoCdRip::jobDetails() const +TQString K3bVideoCdRip::jobDetails() const { - return QString( "(%1)" ).arg ( KIO::convertSize( m_videooptions ->getVideoCdSize() ) ); + return TQString( "(%1)" ).arg ( KIO::convertSize( m_videooptions ->getVideoCdSize() ) ); } #include "k3bvideocdrip.moc" diff --git a/src/rip/k3bvideocdrip.h b/src/rip/k3bvideocdrip.h index fe0d6f9..a47f1d0 100644 --- a/src/rip/k3bvideocdrip.h +++ b/src/rip/k3bvideocdrip.h @@ -20,22 +20,23 @@ #include <k3bdiskinfo.h> #include "k3bvideocdrippingoptions.h" -class QString; +class TQString; class KProcess; -class QDataStream; +class TQDataStream; class K3bVideoCdRip : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bVideoCdRip( K3bJobHandler*, K3bVideoCdRippingOptions* options, QObject* parent = 0, const char* name = 0 ); + K3bVideoCdRip( K3bJobHandler*, K3bVideoCdRippingOptions* options, TQObject* tqparent = 0, const char* name = 0 ); ~K3bVideoCdRip(); enum { CDROM, BIN_IMAGE, NRG_IMAGE }; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); @@ -50,7 +51,7 @@ class K3bVideoCdRip : public K3bJob private: void vcdxRip(); - void parseInformation( QString ); + void parseInformation( TQString ); enum { stageUnknown, stageScan, stageFinished, _stage_max }; @@ -61,7 +62,7 @@ class K3bVideoCdRip : public K3bJob long m_subPosition; - QString m_collectedOutput; + TQString m_collectedOutput; K3bVideoCdRippingOptions * m_videooptions; diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index 490f531..24e3d2e 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -24,17 +24,17 @@ #include <kstandarddirs.h> // qt includes -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qstringlist.h> -#include <qhbox.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqstringlist.h> +#include <tqhbox.h> // k3b includes #include "k3bvideocdrippingdialog.h" @@ -45,10 +45,10 @@ #include <k3bglobals.h> #include <k3bstdguiitems.h> -K3bVideoCdRippingDialog::K3bVideoCdRippingDialog( K3bVideoCdRippingOptions* options, QWidget* parent, const char* name ) - : K3bInteractionDialog( parent, name, +K3bVideoCdRippingDialog::K3bVideoCdRippingDialog( K3bVideoCdRippingOptions* options, TQWidget* tqparent, const char* name ) + : K3bInteractionDialog( tqparent, name, i18n( "Video CD Ripping" ), - QString::null, + TQString(), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "Video CD Ripping" ), // config group @@ -66,37 +66,37 @@ K3bVideoCdRippingDialog::~K3bVideoCdRippingDialog() void K3bVideoCdRippingDialog::setupGui() { - QWidget * frame = mainWidget(); - QGridLayout* MainLayout = new QGridLayout( frame ); + TQWidget * frame = mainWidget(); + TQGridLayout* MainLayout = new TQGridLayout( frame ); MainLayout->setSpacing( KDialog::spacingHint() ); MainLayout->setMargin( 0 ); // ---------------------------------------------------- Directory group --- - QGroupBox* groupDirectory = new QGroupBox( 0, Qt::Vertical, i18n( "Destination Directory" ), frame ); - groupDirectory->layout() ->setSpacing( KDialog::spacingHint() ); - groupDirectory->layout() ->setMargin( KDialog::marginHint() ); + TQGroupBox* groupDirectory = new TQGroupBox( 0, Qt::Vertical, i18n( "Destination Directory" ), frame ); + groupDirectory->tqlayout() ->setSpacing( KDialog::spacingHint() ); + groupDirectory->tqlayout() ->setMargin( KDialog::marginHint() ); - QGridLayout* groupDirectoryLayout = new QGridLayout( groupDirectory->layout() ); - groupDirectoryLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->tqlayout() ); + groupDirectoryLayout->tqsetAlignment( TQt::AlignTop ); - QLabel* rippathLabel = new QLabel( i18n( "Rip files to:" ), groupDirectory ); + TQLabel* rippathLabel = new TQLabel( i18n( "Rip files to:" ), groupDirectory ); m_editDirectory = new KURLRequester( groupDirectory, "m_editDirectory" ); - m_editDirectory->setURL( QDir::homeDirPath() ); + m_editDirectory->setURL( TQDir::homeDirPath() ); m_editDirectory->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); rippathLabel->setBuddy( m_editDirectory ); - QHBox* freeSpaceBox = new QHBox( groupDirectory ); + TQHBox* freeSpaceBox = new TQHBox( groupDirectory ); freeSpaceBox->setSpacing( KDialog::spacingHint() ); - ( void ) new QLabel( i18n( "Free space in directory:" ), freeSpaceBox, "FreeSpaceLabel" ); - m_labelFreeSpace = new QLabel( " ", freeSpaceBox, "m_labelFreeSpace" ); - m_labelFreeSpace->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + ( void ) new TQLabel( i18n( "Free space in directory:" ), freeSpaceBox, "FreeSpaceLabel" ); + m_labelFreeSpace = new TQLabel( " ", freeSpaceBox, "m_labelFreeSpace" ); + m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - QHBox* necessarySizeBox = new QHBox( groupDirectory ); + TQHBox* necessarySizeBox = new TQHBox( groupDirectory ); necessarySizeBox->setSpacing( KDialog::spacingHint() ); - ( void ) new QLabel( i18n( "Necessary storage size:" ), necessarySizeBox, "StorSize" ); - m_labelNecessarySize = new QLabel( " ", necessarySizeBox, "m_labelNecessarySize" ); - m_labelNecessarySize->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + ( void ) new TQLabel( i18n( "Necessary storage size:" ), necessarySizeBox, "StorSize" ); + m_labelNecessarySize = new TQLabel( " ", necessarySizeBox, "m_labelNecessarySize" ); + m_labelNecessarySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); groupDirectoryLayout->addWidget( rippathLabel, 0, 0 ); @@ -105,16 +105,16 @@ void K3bVideoCdRippingDialog::setupGui() groupDirectoryLayout->addWidget( necessarySizeBox, 2, 1 ); // ---------------------------------------------------- Options group --- - QGroupBox* groupOptions = new QGroupBox( 4, Qt::Vertical, i18n( "Settings" ), frame ); + TQGroupBox* groupOptions = new TQGroupBox( 4, Qt::Vertical, i18n( "Settings" ), frame ); - m_ignoreExt = new QCheckBox( i18n( "Ignore /EXT/PSD_X.VCD" ), groupOptions ); + m_ignoreExt = new TQCheckBox( i18n( "Ignore /EXT/PSD_X.VCD" ), groupOptions ); - m_sector2336 = new QCheckBox( i18n( "Use 2336 byte sector mode for image file" ), groupOptions ); + m_sector2336 = new TQCheckBox( i18n( "Use 2336 byte sector mode for image file" ), groupOptions ); // Only available for image file ripping m_sector2336->setEnabled( false ); m_sector2336->setChecked( false ); - m_extractXML = new QCheckBox( i18n( "Extract XML structure" ), groupOptions ); + m_extractXML = new TQCheckBox( i18n( "Extract XML structure" ), groupOptions ); MainLayout->addWidget( groupDirectory, 0, 0 ); @@ -124,7 +124,7 @@ void K3bVideoCdRippingDialog::setupGui() setStartButtonText( i18n( "Start Ripping" ), i18n( "Starts extracting the selected VideoCd tracks" ) ); // ---------------------------------------------------------------------------------- - connect( m_editDirectory, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateFreeSpace()) ); + connect( m_editDirectory, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateFreeSpace()) ); m_labelNecessarySize ->setText( KIO::convertSize( m_videooptions ->getVideoCdSize() ) ); } @@ -132,19 +132,19 @@ void K3bVideoCdRippingDialog::setupGui() void K3bVideoCdRippingDialog::setupContextHelp() { - QToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").arg( m_editDirectory ->url() ) ); + TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").tqarg( m_editDirectory ->url() ) ); - QToolTip::add( m_labelNecessarySize, i18n("Necessary space for extracted files") ); + TQToolTip::add( m_labelNecessarySize, i18n("Necessary space for extracted files") ); - QToolTip::add( m_ignoreExt, i18n("Ignore extended PSD") ); - QWhatsThis::add( m_ignoreExt, i18n("<p>Ignore extended PSD (located in the ISO-9660 filesystem under `/EXT/PSD_X.VCD') and use the <em>standard</em> PSD.</p>") ); + TQToolTip::add( m_ignoreExt, i18n("Ignore extended PSD") ); + TQWhatsThis::add( m_ignoreExt, i18n("<p>Ignore extended PSD (located in the ISO-9660 filesystem under `/EXT/PSD_X.VCD') and use the <em>standard</em> PSD.</p>") ); - QToolTip::add( m_sector2336, i18n("Assume a 2336-byte sector mode") ); - QWhatsThis::add( m_sector2336, i18n("<p>This option only makes sense if you are reading from a BIN CD disk image. This indicates to `vcdxrip' to assume a 2336-byte sector mode for image file.</p>" + TQToolTip::add( m_sector2336, i18n("Assume a 2336-byte sector mode") ); + TQWhatsThis::add( m_sector2336, i18n("<p>This option only makes sense if you are reading from a BIN CD disk image. This indicates to `vcdxrip' to assume a 2336-byte sector mode for image file.</p>" "<b>Note: This option is slated to disappear.</b>") ); - QToolTip::add( m_extractXML, i18n("Create XML description file.") ); - QWhatsThis::add( m_extractXML, i18n("<p>This option creates an XML description file with all video CD information.</p>" + TQToolTip::add( m_extractXML, i18n("Create XML description file.") ); + TQWhatsThis::add( m_extractXML, i18n("<p>This option creates an XML description file with all video CD information.</p>" "<p>This file will always contain all of the information.</p>" "<p>Example: If you only extract sequences, the description file will also hold the information for files and segments.</p>" "<p>The filename is the same as the video CD name, with a .xml extension. The default is VIDEOCD.xml.</p>") ); @@ -153,24 +153,24 @@ void K3bVideoCdRippingDialog::setupContextHelp() void K3bVideoCdRippingDialog::slotStartClicked() { - QStringList filesExists; - QDir d; + TQStringList filesExists; + TQDir d; d.setPath( m_editDirectory ->url() ); if( !d.exists() ) { - if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( m_editDirectory->url() ) ) + if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( m_editDirectory->url() ) ) == KMessageBox::Yes ) { if( !KStandardDirs::makeDir( m_editDirectory->url() ) ) { - KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( m_editDirectory->url() ) ); + KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( m_editDirectory->url() ) ); return; } } } - const QFileInfoList* list = d.entryInfoList(); - QFileInfoListIterator it( *list ); - QFileInfo* fi; + const TQFileInfoList* list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); + TQFileInfo* fi; while ( ( fi = it.current() ) != 0 ) { if ( fi ->fileName() != "." && fi ->fileName() != ".." ) - filesExists.append( QString( "%1 (%2)" ).arg( QFile::encodeName( fi ->fileName() ) ).arg( KIO::convertSize( fi ->size() ) ) ); + filesExists.append( TQString( "%1 (%2)" ).tqarg( TQFile::encodeName( fi ->fileName() ).data() ).tqarg( KIO::convertSize( fi ->size() ) ) ); ++it; } @@ -197,7 +197,7 @@ void K3bVideoCdRippingDialog::slotStartClicked() close(); } -void K3bVideoCdRippingDialog::slotFreeSpace(const QString&, +void K3bVideoCdRippingDialog::slotFreeSpace(const TQString&, unsigned long, unsigned long, unsigned long kbAvail) @@ -211,16 +211,16 @@ void K3bVideoCdRippingDialog::slotFreeSpace(const QString&, else m_labelNecessarySize->setPaletteForegroundColor( m_labelFreeSpace->paletteForegroundColor() ); - QTimer::singleShot( 1000, this, SLOT(slotUpdateFreeSpace()) ); + TQTimer::singleShot( 1000, this, TQT_SLOT(slotUpdateFreeSpace()) ); } void K3bVideoCdRippingDialog::slotUpdateFreeSpace() { - QString path = m_editDirectory->url(); + TQString path = m_editDirectory->url(); - if( !QFile::exists( path ) ) - path.truncate( path.findRev('/') ); + if( !TQFile::exists( path ) ) + path.truncate( path.tqfindRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) @@ -231,7 +231,7 @@ void K3bVideoCdRippingDialog::slotUpdateFreeSpace() void K3bVideoCdRippingDialog::loadK3bDefaults() { - m_editDirectory->setURL( QDir::homeDirPath() ); + m_editDirectory->setURL( TQDir::homeDirPath() ); m_ignoreExt ->setChecked( false ); m_sector2336 ->setChecked( false ); m_extractXML ->setChecked( false ); @@ -241,7 +241,7 @@ void K3bVideoCdRippingDialog::loadK3bDefaults() void K3bVideoCdRippingDialog::loadUserDefaults( KConfigBase* c ) { - m_editDirectory ->setURL( c->readPathEntry( "last ripping directory", QDir::homeDirPath() ) ); + m_editDirectory ->setURL( c->readPathEntry( "last ripping directory", TQDir::homeDirPath() ) ); m_ignoreExt ->setChecked( c->readBoolEntry( "ignore ext", false ) ); m_sector2336 ->setChecked( c->readBoolEntry( "sector 2336", false ) ); m_extractXML ->setChecked( c->readBoolEntry( "extract xml", false ) ); diff --git a/src/rip/k3bvideocdrippingdialog.h b/src/rip/k3bvideocdrippingdialog.h index 98d16f6..6b7e565 100644 --- a/src/rip/k3bvideocdrippingdialog.h +++ b/src/rip/k3bvideocdrippingdialog.h @@ -17,27 +17,28 @@ #ifndef _K3B_VIDEOCD_RIPPING_DIALOG_H_ #define _K3B_VIDEOCD_RIPPING_DIALOG_H_ -#include <qstringlist.h> +#include <tqstringlist.h> #include <k3binteractiondialog.h> #include <k3bdiskinfo.h> #include "k3bvideocdrippingoptions.h" class KListView; -class QCheckBox; -class QLabel; -class QSpinBox; -class QComboBox; -class QToolButton; +class TQCheckBox; +class TQLabel; +class TQSpinBox; +class TQComboBox; +class TQToolButton; class KURLRequester; class K3bTempDirSelectionWidget; class K3bVideoCdRippingDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bVideoCdRippingDialog( K3bVideoCdRippingOptions* options, QWidget* parent = 0, const char* name = 0 ); + K3bVideoCdRippingDialog( K3bVideoCdRippingOptions* options, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bVideoCdRippingDialog(); private: @@ -52,11 +53,11 @@ class K3bVideoCdRippingDialog : public K3bInteractionDialog KURLRequester* m_editDirectory; - QLabel* m_labelFreeSpace; - QLabel* m_labelNecessarySize; - QCheckBox* m_ignoreExt; - QCheckBox* m_sector2336; - QCheckBox* m_extractXML; + TQLabel* m_labelFreeSpace; + TQLabel* m_labelNecessarySize; + TQCheckBox* m_ignoreExt; + TQCheckBox* m_sector2336; + TQCheckBox* m_extractXML; K3bVideoCdRippingOptions* m_videooptions; @@ -66,7 +67,7 @@ class K3bVideoCdRippingDialog : public K3bInteractionDialog void slotStartClicked(); void slotUpdateFreeSpace(); - void slotFreeSpace(const QString&, unsigned long, unsigned long, unsigned long); + void slotFreeSpace(const TQString&, unsigned long, unsigned long, unsigned long); }; diff --git a/src/rip/k3bvideocdrippingoptions.h b/src/rip/k3bvideocdrippingoptions.h index bd8aea9..7ccdde2 100644 --- a/src/rip/k3bvideocdrippingoptions.h +++ b/src/rip/k3bvideocdrippingoptions.h @@ -16,7 +16,7 @@ #ifndef _K3B_VIDEOCD_OPTIONS_H_ #define _K3B_VIDEOCD_OPTIONS_H_ -#include <qstring.h> +#include <tqstring.h> class K3bVideoCdRippingOptions { @@ -35,9 +35,9 @@ class K3bVideoCdRippingOptions {} void setVideoCdSize( unsigned long size ) { m_videocdsize = size;} - void setVideoCdSource( const QString& source ) { m_videocdsource = source;} - void setVideoCdDestination( const QString& destination ) { m_videocddestination = destination;} - void setVideoCdDescription( const QString& description ) { m_videocddescription = description;} + void setVideoCdSource( const TQString& source ) { m_videocdsource = source;} + void setVideoCdDestination( const TQString& destination ) { m_videocddestination = destination;} + void setVideoCdDescription( const TQString& description ) { m_videocddescription = description;} void setVideoCdRipFiles( bool ripfiles ) { m_videocdripfiles = ripfiles;} void setVideoCdRipSegments( bool ripsegments ) { m_videocdripsegments = ripsegments;} void setVideoCdRipSequences( bool ripsequences ) { m_videocdripsequences = ripsequences;} @@ -46,9 +46,9 @@ class K3bVideoCdRippingOptions void setVideoCdExtractXml( bool extractxml ) { m_extractXML = extractxml;} unsigned long getVideoCdSize( ) { return m_videocdsize;} - QString getVideoCdSource( ) { return m_videocdsource;} - QString getVideoCdDestination( ) { return m_videocddestination;} - QString getVideoCdDescription( ) { return m_videocddescription;} + TQString getVideoCdSource( ) { return m_videocdsource;} + TQString getVideoCdDestination( ) { return m_videocddestination;} + TQString getVideoCdDescription( ) { return m_videocddescription;} bool getVideoCdRipFiles( ) { return m_videocdripfiles;} bool getVideoCdRipSegments( ) { return m_videocdripsegments;} bool getVideoCdRipSequences( ) { return m_videocdripsequences;} @@ -59,9 +59,9 @@ class K3bVideoCdRippingOptions private: unsigned long m_videocdsize; - QString m_videocdsource; - QString m_videocddestination; - QString m_videocddescription; + TQString m_videocdsource; + TQString m_videocddestination; + TQString m_videocddescription; bool m_videocdripfiles; bool m_videocdripsegments; diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp index c0f5ae2..bc47c62 100644 --- a/src/rip/k3bvideocdview.cpp +++ b/src/rip/k3bvideocdview.cpp @@ -25,13 +25,13 @@ #include <kstdaction.h> // qt includes -#include <qfont.h> -#include <qframe.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqfont.h> +#include <tqframe.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcursor.h> +#include <tqapplication.h> // k3b includes #include "k3bvideocdview.h" @@ -46,29 +46,29 @@ #include <k3btoolbox.h> -class K3bVideoCdView::VideoTrackViewItem : public QListViewItem +class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem { public: - VideoTrackViewItem( QListViewItem* parent, QListViewItem* after ) - : QListViewItem( parent, after ) + VideoTrackViewItem( TQListViewItem* tqparent, TQListViewItem* after ) + : TQListViewItem( tqparent, after ) { setSelectable( false ); } - VideoTrackViewItem( QListView* parent, QListViewItem* after ) - : QListViewItem( parent, after ) + VideoTrackViewItem( TQListView* tqparent, TQListViewItem* after ) + : TQListViewItem( tqparent, after ) { setSelectable( false ); } - VideoTrackViewItem( QListViewItem* parent, - const QString& name, - const QString& id, + VideoTrackViewItem( TQListViewItem* tqparent, + const TQString& name, + const TQString& id, int _trackNumber, const K3b::Msf& length ) - : QListViewItem( parent ) + : TQListViewItem( tqparent ) { - setText( 0, QString( "%1. %2" ).arg( _trackNumber ).arg( id ) ); + setText( 0, TQString( "%1. %2" ).tqarg( _trackNumber ).tqarg( id ) ); setText( 1, name ); if ( length > 0 ) { setText( 2, length.toString() ); @@ -83,42 +83,42 @@ class K3bVideoCdView::VideoTrackViewItem : public QListViewItem void updateData( const K3bVideoCdInfoResultEntry& resultEntry ) { - setText( 0, QString( "%1. %2" ).arg( trackNumber ).arg( resultEntry.id ) ); + setText( 0, TQString( "%1. %2" ).tqarg( trackNumber ).tqarg( resultEntry.id ) ); setText( 1, resultEntry.name ); } }; -class K3bVideoCdView::VideoTrackViewCheckItem : public QCheckListItem +class K3bVideoCdView::VideoTrackViewCheckItem : public TQCheckListItem { public: - VideoTrackViewCheckItem( QListViewItem* parent, - const QString& desc ) - : QCheckListItem( parent, - QString::null, - QCheckListItem::CheckBox ) + VideoTrackViewCheckItem( TQListViewItem* tqparent, + const TQString& desc ) + : TQCheckListItem( tqparent, + TQString(), + TQCheckListItem::CheckBox ) { setText( 0, desc ); setOn( true ); } - VideoTrackViewCheckItem( QListView* parent, - const QString& desc ) - : QCheckListItem( parent, - QString::null, - QCheckListItem::CheckBox ) + VideoTrackViewCheckItem( TQListView* tqparent, + const TQString& desc ) + : TQCheckListItem( tqparent, + TQString(), + TQCheckListItem::CheckBox ) { setText( 0, desc ); setOn( true ); } - VideoTrackViewCheckItem( VideoTrackViewCheckItem* parent, - const QString& desc ) - : QCheckListItem( parent, - QString::null, - QCheckListItem::CheckBox ) + VideoTrackViewCheckItem( VideoTrackViewCheckItem* tqparent, + const TQString& desc ) + : TQCheckListItem( tqparent, + TQString(), + TQCheckListItem::CheckBox ) { setText( 0, desc ); @@ -136,24 +136,24 @@ class K3bVideoCdView::VideoTrackViewCheckItem : public QCheckListItem }; -K3bVideoCdView::K3bVideoCdView( QWidget* parent, const char *name ) +K3bVideoCdView::K3bVideoCdView( TQWidget* tqparent, const char *name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_VIDEO_CD, K3bDevice::MEDIA_CD_ALL, K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE, - parent, name ) + tqparent, name ) { - QGridLayout * mainGrid = new QGridLayout( mainWidget() ); + TQGridLayout * mainGrid = new TQGridLayout( mainWidget() ); // toolbox // ---------------------------------------------------------------------------------- - QHBoxLayout* toolBoxLayout = new QHBoxLayout( 0, 0, 0, "toolBoxLayout" ); + TQHBoxLayout* toolBoxLayout = new TQHBoxLayout( 0, 0, 0, "toolBoxLayout" ); m_toolBox = new K3bToolBox( mainWidget() ); toolBoxLayout->addWidget( m_toolBox ); - QSpacerItem* spacer = new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); toolBoxLayout->addItem( spacer ); - m_labelLength = new QLabel( mainWidget() ); - m_labelLength->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_labelLength = new TQLabel( mainWidget() ); + m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); toolBoxLayout->addWidget( m_labelLength ); // the track view @@ -161,7 +161,7 @@ K3bVideoCdView::K3bVideoCdView( QWidget* parent, const char *name ) m_trackView = new K3bListView( mainWidget() ); m_trackView->setFullWidth( true ); m_trackView->setAllColumnsShowFocus( true ); - m_trackView->setSelectionMode( QListView::Single ); + m_trackView->setSelectionMode( TQListView::Single ); m_trackView->setDragEnabled( true ); m_trackView->addColumn( i18n( "Item Name" ) ); m_trackView->addColumn( i18n( "Extracted Name" ) ); @@ -173,14 +173,14 @@ K3bVideoCdView::K3bVideoCdView( QWidget* parent, const char *name ) m_trackView->setItemsRenameable( false ); m_trackView->setRootIsDecorated( true ); - connect( m_trackView, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); - connect( m_trackView, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotTrackSelectionChanged( QListViewItem* ) ) ); - connect( m_trackView, SIGNAL( clicked( QListViewItem* ) ), - this, SLOT( slotStateChanged( QListViewItem* ) ) ); - connect( m_trackView, SIGNAL( spacePressed( QListViewItem* ) ), - this, SLOT( slotStateChanged( QListViewItem* ) ) ); + connect( m_trackView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_trackView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotTrackSelectionChanged( TQListViewItem* ) ) ); + connect( m_trackView, TQT_SIGNAL( clicked( TQListViewItem* ) ), + this, TQT_SLOT( slotStateChanged( TQListViewItem* ) ) ); + connect( m_trackView, TQT_SIGNAL( spacePressed( TQListViewItem* ) ), + this, TQT_SLOT( slotStateChanged( TQListViewItem* ) ) ); mainGrid->addLayout( toolBoxLayout, 0, 0 ); @@ -211,7 +211,7 @@ void K3bVideoCdView::reloadMedium() m_trackView->setEnabled( false ); m_toolBox->setEnabled( false ); - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); m_contentList.append( new VideoTrackViewCheckItem( m_trackView, i18n("Video CD MPEG tracks") ) ); m_contentList.append( new VideoTrackViewCheckItem( m_trackView, i18n("Video CD DATA track" ) ) ); @@ -232,7 +232,7 @@ void K3bVideoCdView::reloadMedium() K3b::Msf length( ( *it ).length() ); sequenceSize += length; m_videocdmpegsize += length.mode2Form2Bytes(); - ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).arg( index ), "", index, length ); + ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).tqarg( index ), "", index, length ); } else { K3b::Msf length( ( *it ).length() ); m_videocddatasize += length.mode2Form1Bytes(); @@ -248,11 +248,11 @@ void K3bVideoCdView::reloadMedium() m_videooptions ->setVideoCdSource( device()->devicename() ); - m_videocdinfo = new K3bVideoCdInfo( this ); + m_videocdinfo = new K3bVideoCdInfo( TQT_TQOBJECT(this) ); m_videocdinfo->info( device()->devicename() ); - connect( m_videocdinfo, SIGNAL( infoFinished( bool ) ), - this, SLOT( slotVideoCdInfoFinished( bool ) ) ); + connect( m_videocdinfo, TQT_SIGNAL( infoFinished( bool ) ), + this, TQT_SLOT( slotVideoCdInfoFinished( bool ) ) ); } @@ -265,7 +265,7 @@ void K3bVideoCdView::slotVideoCdInfoFinished( bool success ) m_trackView->setEnabled( true ); m_toolBox->setEnabled( true ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } @@ -286,12 +286,12 @@ void K3bVideoCdView::updateDisplay() if ( check_item->key( 0, false ).compare( i18n( "Files" ) ) == 0 ) { if ( domTree.setContent( m_videocdinfoResult.xmlData ) ) { - QDomElement root = domTree.documentElement(); - QDomNode node; + TQDomElement root = domTree.documentElement(); + TQDomNode node; node = root.firstChild(); while ( !node.isNull() ) { if ( node.isElement() && node.nodeName() == "filesystem" ) { - QDomElement body = node.toElement(); + TQDomElement body = node.toElement(); buildTree( check_item, body ); break; } @@ -307,14 +307,14 @@ void K3bVideoCdView::updateDisplay() } if ( !m_videocdinfoResult.volumeId.isEmpty() ) { - QString description = m_videocdinfoResult.volumeId + " (" + m_videocdinfoResult.type + " " + m_videocdinfoResult.version + ")" ; + TQString description = m_videocdinfoResult.volumeId + " (" + m_videocdinfoResult.type + " " + m_videocdinfoResult.version + ")" ; setTitle( description ); m_videooptions ->setVideoCdDescription( description ); } else setTitle( i18n( "Video CD" ) ); - m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).arg( K3b::Msf( m_toc.length() ).toString() ) ); + m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).tqarg( K3b::Msf( m_toc.length() ).toString() ) ); } @@ -322,20 +322,20 @@ void K3bVideoCdView::initActions() { m_actionCollection = new KActionCollection( this ); - KAction* actionSelectAll = KStdAction::selectAll( this, SLOT( slotSelectAll() ), + KAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), m_actionCollection, "select_all" ); - KAction* actionDeselectAll = KStdAction::deselect( this, SLOT( slotDeselectAll() ), + KAction* actionDeselectAll = KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( slotDeselectAll() ), m_actionCollection, "deselect_all" ); actionDeselectAll->setText( i18n( "Dese&lect All" ) ); - KAction* actionSelect = new KAction( i18n( "Select Track" ), 0, 0, this, - SLOT( slotSelect() ), actionCollection(), + KAction* actionSelect = new KAction( i18n( "Select Track" ), 0, 0, TQT_TQOBJECT(this), + TQT_SLOT( slotSelect() ), actionCollection(), "select_track" ); - KAction* actionDeselect = new KAction( i18n( "Deselect Track" ), 0, 0, this, - SLOT( slotDeselect() ), actionCollection(), + KAction* actionDeselect = new KAction( i18n( "Deselect Track" ), 0, 0, TQT_TQOBJECT(this), + TQT_SLOT( slotDeselect() ), actionCollection(), "deselect_track" ); - KAction* actionStartRip = new KAction( i18n( "Start Ripping" ), "run", 0, this, - SLOT( startRip() ), actionCollection(), "start_rip" ); + KAction* actionStartRip = new KAction( i18n( "Start Ripping" ), "run", 0, TQT_TQOBJECT(this), + TQT_SLOT( startRip() ), actionCollection(), "start_rip" ); // TODO: set the actions tooltips and whatsthis infos @@ -354,25 +354,25 @@ void K3bVideoCdView::initActions() } -void K3bVideoCdView::slotContextMenu( KListView*, QListViewItem*, const QPoint& p ) +void K3bVideoCdView::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& p ) { m_popupMenu->popup( p ); } -void K3bVideoCdView::slotTrackSelectionChanged( QListViewItem* item ) +void K3bVideoCdView::slotTrackSelectionChanged( TQListViewItem* item ) { actionCollection() ->action( "select_track" ) ->setEnabled( item != 0 ); actionCollection() ->action( "deselect_track" ) ->setEnabled( item != 0 ); } -void K3bVideoCdView::slotStateChanged( QListViewItem* item ) +void K3bVideoCdView::slotStateChanged( TQListViewItem* item ) { /* > QT 3.1 if ( !item == 0 && item ->isSelectable() ) { - if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == QCheckListItem::On) + if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == TQCheckListItem::On) slotSelect(); - else if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == QCheckListItem::Off) + else if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == TQCheckListItem::Off) slotDeselect(); } */ @@ -388,7 +388,7 @@ void K3bVideoCdView::startRip() { int selectedItems = 0; - for ( QListViewItemIterator it( m_trackView ); it.current(); ++it ) { + for ( TQListViewItemIterator it( m_trackView ); it.current(); ++it ) { if ( it.current() ->isSelectable() ) { if ( ( ( ( VideoTrackViewCheckItem* ) it.current()) ->key( 0, false ).compare( i18n("Video CD MPEG tracks" ) ) == 0 ) && ( ( VideoTrackViewCheckItem* ) it.current() ) ->isOn() ) { m_videooptions ->setVideoCdRipSequences( true ); @@ -416,7 +416,7 @@ void K3bVideoCdView::startRip() if ( m_videooptions ->getVideoCdRipSequences() ) videocdsize += m_videocdmpegsize; - kdDebug() << QString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").arg( videocdsize ) << endl; + kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").tqarg( videocdsize ) << endl; m_videooptions ->setVideoCdSize( videocdsize ); K3bVideoCdRippingDialog rip( m_videooptions, this ); rip.exec(); @@ -425,23 +425,23 @@ void K3bVideoCdView::startRip() void K3bVideoCdView::slotSelectAll() { - for ( QListViewItemIterator it( m_trackView ); it.current(); ++it ) + for ( TQListViewItemIterator it( m_trackView ); it.current(); ++it ) if ( it.current() ->isSelectable() ) ( ( VideoTrackViewCheckItem* ) it.current() ) ->setOn( true ); } void K3bVideoCdView::slotDeselectAll() { - for ( QListViewItemIterator it( m_trackView ); it.current(); ++it ) + for ( TQListViewItemIterator it( m_trackView ); it.current(); ++it ) if ( it.current() ->isSelectable() ) ( ( VideoTrackViewCheckItem* ) it.current() ) ->setOn( false ); } void K3bVideoCdView::slotSelect() { - if ( QListViewItem * sel = m_trackView->selectedItem() ) { + if ( TQListViewItem * sel = m_trackView->selectedItem() ) { ( ( VideoTrackViewCheckItem* ) sel) ->setOn( true ); - QListViewItem * item = sel ->firstChild(); + TQListViewItem * item = sel ->firstChild(); while ( item ) { if ( item ->isSelectable() ) ( ( VideoTrackViewCheckItem* ) item) ->setOn( true ); @@ -453,9 +453,9 @@ void K3bVideoCdView::slotSelect() void K3bVideoCdView::slotDeselect() { - if ( QListViewItem * sel = m_trackView->selectedItem() ) { + if ( TQListViewItem * sel = m_trackView->selectedItem() ) { ( ( VideoTrackViewCheckItem* ) sel) ->setOn( false ); - QListViewItem * item = sel ->firstChild(); + TQListViewItem * item = sel ->firstChild(); while ( item ) { if ( item ->isSelectable() ) ( ( VideoTrackViewCheckItem* ) item) ->setOn( false ); @@ -470,19 +470,19 @@ void K3bVideoCdView::enableInteraction( bool b ) actionCollection()->action( "start_rip" )->setEnabled( b ); } -void K3bVideoCdView::buildTree( QListViewItem *parentItem, const QDomElement &parentElement, const QString& pname ) +void K3bVideoCdView::buildTree( TQListViewItem *tqparentItem, const TQDomElement &tqparentElement, const TQString& pname ) { VideoTrackViewItem * thisItem = 0; - QDomNode node = parentElement.firstChild(); + TQDomNode node = tqparentElement.firstChild(); while ( !node.isNull() ) { if ( node.isElement() && node.nodeName() == "folder" || node.nodeName() == "file" ) { - if ( parentItem == 0 ) + if ( tqparentItem == 0 ) thisItem = new VideoTrackViewItem( m_trackView, thisItem ); else - thisItem = new VideoTrackViewItem( parentItem, thisItem ); + thisItem = new VideoTrackViewItem( tqparentItem, thisItem ); - QString txt = node.firstChild().toElement().text(); + TQString txt = node.firstChild().toElement().text(); thisItem->setText( 0, txt); if ( node.nodeName() == "folder" ) { buildTree( thisItem, node.toElement(), pname + "_" + txt.lower() ); @@ -492,10 +492,10 @@ void K3bVideoCdView::buildTree( QListViewItem *parentItem, const QDomElement &pa buildTree( thisItem, node.toElement(), pname ); } } else if ( node.isElement() && node.nodeName() == "segment-item" || node.nodeName() == "sequence-item" ) { - if ( parentItem == 0 ) + if ( tqparentItem == 0 ) thisItem = new VideoTrackViewItem( m_trackView, thisItem ); else - thisItem = new VideoTrackViewItem( parentItem, thisItem ); + thisItem = new VideoTrackViewItem( tqparentItem, thisItem ); thisItem->setText( 0, node.toElement().attribute( "src" ) ); diff --git a/src/rip/k3bvideocdview.h b/src/rip/k3bvideocdview.h index cb3e7a6..65b2f8a 100644 --- a/src/rip/k3bvideocdview.h +++ b/src/rip/k3bvideocdview.h @@ -17,7 +17,7 @@ #ifndef _K3B_VIDEOCDVIEW_H_ #define _K3B_VIDEOCDVIEW_H_ -#include <qdom.h> +#include <tqdom.h> #include <k3bmediacontentsview.h> #include <k3bmedium.h> @@ -28,8 +28,8 @@ class KActionCollection; class KActionMenu; class KListView; -class QLabel; -class QListViewItem; +class TQLabel; +class TQListViewItem; class K3bListView; class K3bToolBox; @@ -46,9 +46,10 @@ namespace K3bDevice class K3bVideoCdView : public K3bMediaContentsView { Q_OBJECT + TQ_OBJECT public: - K3bVideoCdView( QWidget* parent = 0, const char * name = 0 ); + K3bVideoCdView( TQWidget* tqparent = 0, const char * name = 0 ); ~K3bVideoCdView(); KActionCollection* actionCollection() const @@ -57,9 +58,9 @@ class K3bVideoCdView : public K3bMediaContentsView } private slots: - void slotContextMenu( KListView*, QListViewItem*, const QPoint& ); - void slotTrackSelectionChanged( QListViewItem* ); - void slotStateChanged( QListViewItem* ); + void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); + void slotTrackSelectionChanged( TQListViewItem* ); + void slotStateChanged( TQListViewItem* ); void slotVideoCdInfoFinished( bool ); void startRip(); @@ -78,7 +79,7 @@ class K3bVideoCdView : public K3bMediaContentsView void initActions(); void updateDisplay(); void enableInteraction( bool ); - void buildTree( QListViewItem *parentItem, const QDomElement &parentElement, const QString& pname = QString::null ); + void buildTree( TQListViewItem *tqparentItem, const TQDomElement &tqparentElement, const TQString& pname = TQString() ); K3bDevice::Toc m_toc; @@ -91,11 +92,11 @@ class K3bVideoCdView : public K3bMediaContentsView K3bListView* m_trackView; K3bToolBox* m_toolBox; - QLabel* m_labelLength; + TQLabel* m_labelLength; - QDomDocument domTree; + TQDomDocument domTree; - QValueList<VideoTrackViewCheckItem *> m_contentList; + TQValueList<VideoTrackViewCheckItem *> m_contentList; unsigned long m_videocddatasize; unsigned long m_videocdmpegsize; diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui index 72b03b4..5d2ffdd 100644 --- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui +++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bVideoDVDRippingWidget</class> <author>Seastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -39,11 +39,11 @@ <bool>true</bool> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -54,7 +54,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -65,15 +65,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -81,7 +81,7 @@ <string>Video Size:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_comboVideoSize</cstring> </property> @@ -94,7 +94,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonCustomPictureSize</cstring> </property> @@ -104,15 +104,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -120,7 +120,7 @@ <string>Video Bitrate:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinVideoBitrate</cstring> </property> @@ -149,7 +149,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1_2</cstring> </property> @@ -168,7 +168,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -181,18 +181,18 @@ <cstring>m_editBaseDir</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_labelFreeSpace</cstring> </property> <property name="text"> <string>-</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -200,20 +200,20 @@ <string>Space needed:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_labelNeededSpace</cstring> </property> <property name="text"> <string>-</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -224,11 +224,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>m_stackAudioQuality</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_stackPageAudioQualityMp3</cstring> </property> @@ -242,7 +242,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkAudioVBR</cstring> </property> @@ -250,15 +250,15 @@ <string>Variable &Bitrate</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelAudioBitrate</cstring> </property> @@ -266,7 +266,7 @@ <string>Audio Bitrate:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_comboAudioBitrate</cstring> </property> @@ -278,7 +278,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_stackPageAudioQualityAC3Pt</cstring> </property> @@ -310,7 +310,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_stackPageAudioQualityAC3</cstring> </property> @@ -324,15 +324,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -340,7 +340,7 @@ <string>Audio Bitrate:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinAudioBitrate</cstring> </property> @@ -372,7 +372,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -384,7 +384,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -395,15 +395,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -421,15 +421,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -451,7 +451,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -462,15 +462,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -478,7 +478,7 @@ <string>Ripped files pattern:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_comboFilenamePattern</cstring> </property> @@ -509,19 +509,19 @@ <property name="text"> <string>See special strings</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkBlankReplace</cstring> </property> @@ -560,7 +560,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>5</width> <height>1</height> @@ -569,7 +569,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -580,7 +580,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkTwoPassEncoding</cstring> </property> @@ -602,7 +602,7 @@ <p>2-pass encoding results in a doubled encoding time.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkAutoClipping</cstring> </property> @@ -621,7 +621,7 @@ <p>Although this method is very reliable there may be problems if the source material is exceptionally short or dark.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkAudioResampling</cstring> </property> @@ -642,7 +642,7 @@ <p>If this option is checked K3b will change the sampling rate of the audio stream to 44100 Hz.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkLowPriority</cstring> </property> @@ -663,7 +663,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>1</height> @@ -706,7 +706,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index ddb5ff2..57f6426 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -34,14 +34,14 @@ #include <kconfig.h> #include <kmessagebox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qstyle.h> -#include <qfontmetrics.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> +#include <tqstyle.h> +#include <tqfontmetrics.h> -static QString videoCodecId( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) +static TQString videoCodecId( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) { switch( codec ) { case K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_FFMPEG_MPEG4: @@ -54,7 +54,7 @@ static QString videoCodecId( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) } -static QString audioCodecId( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) +static TQString audioCodecId( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) { switch( codec ) { case K3bVideoDVDTitleTranscodingJob::AUDIO_CODEC_MP3: @@ -69,7 +69,7 @@ static QString audioCodecId( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) } -static K3bVideoDVDTitleTranscodingJob::VideoCodec videoCodecFromId( const QString& codec ) +static K3bVideoDVDTitleTranscodingJob::VideoCodec videoCodecFromId( const TQString& codec ) { if( codec == "xvid" ) return K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_XVID; @@ -78,7 +78,7 @@ static K3bVideoDVDTitleTranscodingJob::VideoCodec videoCodecFromId( const QStrin } -static K3bVideoDVDTitleTranscodingJob::AudioCodec audioCodecFromId( const QString& codec ) +static K3bVideoDVDTitleTranscodingJob::AudioCodec audioCodecFromId( const TQString& codec ) { if( codec == "ac3_stereo" ) return K3bVideoDVDTitleTranscodingJob::AUDIO_CODEC_AC3_STEREO; @@ -90,7 +90,7 @@ static K3bVideoDVDTitleTranscodingJob::AudioCodec audioCodecFromId( const QStrin // resize according to aspect ratio -static QSize resizeTitle( const K3bVideoDVD::VideoStream& title, const QSize& size ) +static TQSize resizeTitle( const K3bVideoDVD::VideoStream& title, const TQSize& size ) { int w = size.width(); int h = size.height(); @@ -108,18 +108,18 @@ static QSize resizeTitle( const K3bVideoDVD::VideoStream& title, const QSize& si h = w * rh / rw; } - return QSize(w,h); + return TQSize(w,h); } -class K3bVideoDVDRippingDialog::AudioStreamViewItem : public QCheckListItem +class K3bVideoDVDRippingDialog::AudioStreamViewItem : public TQCheckListItem { public: AudioStreamViewItem( K3bVideoDVDRippingDialog* dlg, - QCheckListItem* parent, QListViewItem* after, const QString& text, + TQCheckListItem* tqparent, TQListViewItem* after, const TQString& text, int audioStream ) - : QCheckListItem( parent, after, text, RadioButton ), + : TQCheckListItem( tqparent, after, text, RadioButton ), m_audioStream( audioStream ), m_dlg( dlg ) { } @@ -127,7 +127,7 @@ public: private: void stateChange( bool ) { if( state() == On ) { - m_dlg->m_titleRipInfos[static_cast<QCheckListItem*>(parent())].audioStream = m_audioStream; + m_dlg->m_titleRipInfos[static_cast<TQCheckListItem*>(tqparent())].audioStream = m_audioStream; m_dlg->slotUpdateFilenames(); } } @@ -145,11 +145,11 @@ public: K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& dvd, - const QValueList<int>& titles, - QWidget* parent, const char* name ) - : K3bInteractionDialog( parent, name, + const TQValueList<int>& titles, + TQWidget* tqparent, const char* name ) + : K3bInteractionDialog( tqparent, name, i18n("Video DVD Ripping"), - QString::null, + TQString(), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "VideoDVD Ripping" ), // config group @@ -157,22 +157,22 @@ K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& { d = new Private; - QWidget* frame = mainWidget(); - QHBoxLayout* frameLayout = new QHBoxLayout( frame ); + TQWidget* frame = mainWidget(); + TQHBoxLayout* frameLayout = new TQHBoxLayout( frame ); frameLayout->setMargin( 0 ); frameLayout->setAutoAdd( true ); m_w = new K3bVideoDVDRippingWidget( frame ); - connect( m_w, SIGNAL(changed()), - this, SLOT(slotUpdateFilesizes()) ); - connect( m_w, SIGNAL(changed()), - this, SLOT(slotUpdateFilenames()) ); - connect( m_w, SIGNAL(changed()), - this, SLOT(slotUpdateVideoSizes()) ); + connect( m_w, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotUpdateFilesizes()) ); + connect( m_w, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotUpdateFilenames()) ); + connect( m_w, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotUpdateVideoSizes()) ); setTitle( i18n("Video DVD Ripping"), i18n("1 title from %1", "%n titles from %1", titles.count()) - .arg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) ); + .tqarg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) ); // populate list map populateTitleView( titles ); @@ -185,23 +185,23 @@ K3bVideoDVDRippingDialog::~K3bVideoDVDRippingDialog() } -void K3bVideoDVDRippingDialog::populateTitleView( const QValueList<int>& titles ) +void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles ) { m_w->m_titleView->clear(); m_titleRipInfos.clear(); - QCheckListItem* titleItem = 0; - for( QValueList<int>::const_iterator it = titles.begin(); it != titles.end(); ++it ) { - titleItem = new QCheckListItem( m_w->m_titleView, + TQCheckListItem* titleItem = 0; + for( TQValueList<int>::const_iterator it = titles.begin(); it != titles.end(); ++it ) { + titleItem = new TQCheckListItem( m_w->m_titleView, titleItem, i18n("Title %1 (%2)") - .arg(*it) - .arg(m_dvd[*it-1].playbackTime().toString()), - QCheckListItem::RadioButtonController ); - titleItem->setText( 1, QString("%1x%2") - .arg(m_dvd[*it-1].videoStream().realPictureWidth()) - .arg(m_dvd[*it-1].videoStream().realPictureHeight()) ); - titleItem->setText( 3, QString("%1 Title %2.avi").arg(m_dvd.volumeIdentifier()).arg(*it) ); + .tqarg(*it) + .tqarg(m_dvd[*it-1].playbackTime().toString()), + TQCheckListItem::RadioButtonController ); + titleItem->setText( 1, TQString("%1x%2") + .tqarg(m_dvd[*it-1].videoStream().realPictureWidth()) + .tqarg(m_dvd[*it-1].videoStream().realPictureHeight()) ); + titleItem->setText( 3, TQString("%1 Title %2.avi").tqarg(m_dvd.volumeIdentifier()).tqarg(*it) ); // now for the rip info K3bVideoDVDRippingJob::TitleRipInfo ri( *it ); @@ -219,30 +219,30 @@ void K3bVideoDVDRippingDialog::populateTitleView( const QValueList<int>& titles } } - QListViewItem* asI = 0; + TQListViewItem* asI = 0; for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) { - QString text = i18n("%1 %2Ch (%3%4)") - .arg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) ) - .arg( m_dvd[*it-1].audioStream(i).channels() ) - .arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty() + TQString text = i18n("%1 %2Ch (%3%4)") + .tqarg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) ) + .tqarg( m_dvd[*it-1].audioStream(i).channels() ) + .tqarg( m_dvd[*it-1].audioStream(i).langCode().isEmpty() ? i18n("unknown language") : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) ) - .arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED - ? QString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() ) - : QString::null ); + .tqarg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED + ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() ) + : TQString() ); if( m_dvd[*it-1].audioStream(i).format() == K3bVideoDVD::AUDIO_FORMAT_DTS ) { - // width of the radio button from QCheckListItem::paintCell - int buttonSize = style().pixelMetric( QStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4; + // width of the radio button from TQCheckListItem::paintCell + int buttonSize = style().tqpixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4; int spaceWidth = fontMetrics().width( ' ' ); int numSpaces = buttonSize/spaceWidth; - asI = new QListViewItem( titleItem, asI, QString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" ); + asI = new TQListViewItem( titleItem, asI, TQString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" ); } else { asI = new AudioStreamViewItem( this, titleItem, asI, text, i ); if( ri.audioStream == (int)i ) - ((AudioStreamViewItem*)asI)->setState( QCheckListItem::On ); + ((AudioStreamViewItem*)asI)->setState( TQCheckListItem::On ); } } @@ -255,14 +255,14 @@ void K3bVideoDVDRippingDialog::populateTitleView( const QValueList<int>& titles void K3bVideoDVDRippingDialog::slotUpdateFilenames() { - QString baseDir = K3b::prepareDir( m_w->m_editBaseDir->url() ); + TQString baseDir = K3b::prepareDir( m_w->m_editBaseDir->url() ); d->fsInfo.setPath( baseDir ); - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { - QString f = d->fsInfo.fixupPath( createFilename( it.data(), m_w->m_comboFilenamePattern->currentText() ) ); + TQString f = d->fsInfo.fixupPath( createFilename( it.data(), m_w->m_comboFilenamePattern->currentText() ) ); if( m_w->m_checkBlankReplace->isChecked() ) - f.replace( QRegExp( "\\s" ), m_w->m_editBlankReplace->text() ); + f.tqreplace( TQRegExp( "\\s" ), m_w->m_editBlankReplace->text() ); it.data().filename = baseDir + f; it.key()->setText( 3, f ); } @@ -275,7 +275,7 @@ void K3bVideoDVDRippingDialog::slotUpdateFilesizes() KIO::filesize_t overallSize = 0ULL; // update file sizes - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { double sec = m_dvd[it.data().title-1].playbackTime().totalSeconds(); @@ -298,24 +298,24 @@ void K3bVideoDVDRippingDialog::slotUpdateFilesizes() void K3bVideoDVDRippingDialog::slotUpdateVideoSizes() { - QSize size = m_w->selectedPictureSize(); - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + TQSize size = m_w->selectedPictureSize(); + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { - QSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) ); - it.key()->setText( 1, QString("%1x%2").arg(s.width()).arg(s.height()) ); + TQSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) ); + it.key()->setText( 1, TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) ); } } -void K3bVideoDVDRippingDialog::setBaseDir( const QString& path ) +void K3bVideoDVDRippingDialog::setBaseDir( const TQString& path ) { m_w->m_editBaseDir->setURL( path ); } -QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const QString& pattern ) const +TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const TQString& pattern ) const { - QString f; + TQString f; const K3bVideoDVD::Title& title = m_dvd[info.title-1]; @@ -325,17 +325,17 @@ QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::T // if( pattern[i] == '%' ) { ++i; // skip the % - QChar c = pattern[i]; + TQChar c = pattern[i]; // // first check if we have a long keyword instead of a one-char // if( pattern[i] == '{' ) { - int j = pattern.find( '}', i ); + int j = pattern.tqfind( '}', i ); if( j < 0 ) // no closing bracket -> no valid pattern c = '*'; else { - QString keyword = pattern.mid( i+1, j-i-1 ); + TQString keyword = pattern.mid( i+1, j-i-1 ); if( keyword == "titlenumber" || keyword == "title_number" || keyword == "title" ) { @@ -422,7 +422,7 @@ QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::T switch( c ) { case PATTERN_TITLE_NUMBER: - f.append( QString::number(info.title).rightJustify( 2, '0' ) ); + f.append( TQString::number(info.title).rightJustify( 2, '0' ) ); break; case PATTERN_VOLUME_ID: f.append( m_dvd.volumeIdentifier() ); @@ -455,13 +455,13 @@ QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::T : 2 ) ); break; case PATTERN_ORIG_VIDEO_SIZE: - f.append( QString("%1x%2") - .arg(title.videoStream().pictureWidth()) - .arg(title.videoStream().pictureHeight()) ); + f.append( TQString("%1x%2") + .tqarg(title.videoStream().pictureWidth()) + .tqarg(title.videoStream().pictureHeight()) ); break; case PATTERN_VIDEO_SIZE: { - QSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) ); - f.append( QString("%1x%2").arg(s.width()).arg(s.height()) ); + TQSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) ); + f.append( TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) ); break; } case PATTERN_ASPECT_RATIO: @@ -471,7 +471,7 @@ QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::T f.append( "16:9" ); break; case PATTERN_CURRENT_DATE: - f.append( KGlobal::locale()->formatDate( QDate::currentDate() ) ); + f.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ); break; default: f.append( pattern[i-1] ); @@ -557,7 +557,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked() // We can only use the AC3 pass-through mode for AC3 streams // if( m_w->selectedAudioCodec() == K3bVideoDVDTitleTranscodingJob::AUDIO_CODEC_AC3_PASSTHROUGH ) { - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { if( m_dvd[it.data().title-1].numAudioStreams() > 0 && m_dvd[it.data().title-1].audioStream(it.data().audioStream).format() != K3bVideoDVD::AUDIO_FORMAT_AC3 ) { @@ -571,10 +571,10 @@ void K3bVideoDVDRippingDialog::slotStartClicked() } // check if we need to overwrite some files... - QStringList filesToOverwrite; - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + TQStringList filesToOverwrite; + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { - if( QFile::exists( it.data().filename ) ) + if( TQFile::exists( it.data().filename ) ) filesToOverwrite.append( it.data().filename ); } @@ -586,10 +586,10 @@ void K3bVideoDVDRippingDialog::slotStartClicked() return; - QSize videoSize = m_w->selectedPictureSize(); + TQSize videoSize = m_w->selectedPictureSize(); int i = 0; - QValueVector<K3bVideoDVDRippingJob::TitleRipInfo> titles( m_titleRipInfos.count() ); - for( QMapConstIterator<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo> it = m_titleRipInfos.begin(); + TQValueVector<K3bVideoDVDRippingJob::TitleRipInfo> titles( m_titleRipInfos.count() ); + for( TQMapConstIterator<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo> it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { titles[i] = it.data(); titles[i].videoBitrate = 0; // use the global bitrate set below @@ -611,7 +611,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked() } // start the job - K3bJobProgressDialog dlg( parentWidget() ); + K3bJobProgressDialog dlg( tqparentWidget() ); K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg ); job->setVideoDVD( m_dvd ); job->setTitles( titles ); diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.h b/src/rip/videodvd/k3bvideodvdrippingdialog.h index 1acad53..bd8b7a0 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.h +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.h @@ -20,24 +20,25 @@ #include <k3bvideodvd.h> #include "k3bvideodvdrippingjob.h" -#include <qvaluelist.h> -#include <qmap.h> +#include <tqvaluelist.h> +#include <tqmap.h> class K3bVideoDVDRippingWidget; -class QCheckListItem; +class TQCheckListItem; class K3bVideoDVDRippingDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& dvd, - const QValueList<int>& titles, - QWidget *parent = 0, const char *name = 0 ); + const TQValueList<int>& titles, + TQWidget *tqparent = 0, const char *name = 0 ); ~K3bVideoDVDRippingDialog(); - void setBaseDir( const QString& path ); + void setBaseDir( const TQString& path ); enum FileNamingPattern { PATTERN_TITLE_NUMBER = 't', @@ -60,9 +61,9 @@ class K3bVideoDVDRippingDialog : public K3bInteractionDialog void slotUpdateVideoSizes(); private: - void populateTitleView( const QValueList<int>& titles ); + void populateTitleView( const TQValueList<int>& titles ); - QString createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const QString& pattern ) const; + TQString createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const TQString& pattern ) const; void loadK3bDefaults(); void loadUserDefaults( KConfigBase* ); @@ -71,7 +72,7 @@ class K3bVideoDVDRippingDialog : public K3bInteractionDialog K3bVideoDVDRippingWidget* m_w; K3bVideoDVD::VideoDVD m_dvd; - QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo> m_titleRipInfos; + TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo> m_titleRipInfos; class AudioStreamViewItem; diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp index c10c127..1cc9e9e 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp @@ -38,7 +38,7 @@ K3bVideoDVDRippingJob::TitleRipInfo::TitleRipInfo() K3bVideoDVDRippingJob::TitleRipInfo::TitleRipInfo( int _title, int _audioStream, - const QString& fn, + const TQString& fn, int _width, int _height, int _videoBitrate, @@ -76,24 +76,24 @@ public: int failedTitles; - QValueVector<double> titleProgressParts; - QValueVector<double> titleClippingProgressParts; + TQValueVector<double> titleProgressParts; + TQValueVector<double> titleClippingProgressParts; }; -K3bVideoDVDRippingJob::K3bVideoDVDRippingJob( K3bJobHandler* hdl, QObject* parent ) - : K3bJob( hdl, parent ) +K3bVideoDVDRippingJob::K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* tqparent ) + : K3bJob( hdl, tqparent ) { d = new Private(); m_transcodingJob = new K3bVideoDVDTitleTranscodingJob( this, this ); connectSubJob( m_transcodingJob, - SLOT(slotTranscodingJobFinished(bool)), - SIGNAL(newTask(const QString&)), - SIGNAL(newSubTask(const QString&)), - SLOT(slotTranscodingProgress(int)), - SIGNAL(subPercent(int)), + TQT_SLOT(slotTranscodingJobFinished(bool)), + TQT_SIGNAL(newTask(const TQString&)), + TQT_SIGNAL(newSubTask(const TQString&)), + TQT_SLOT(slotTranscodingProgress(int)), + TQT_SIGNAL(subPercent(int)), 0, 0 ); m_detectClippingJob = 0; @@ -106,17 +106,17 @@ K3bVideoDVDRippingJob::~K3bVideoDVDRippingJob() } -QString K3bVideoDVDRippingJob::jobDescription() const +TQString K3bVideoDVDRippingJob::jobDescription() const { return i18n("Ripping Video DVD Titles"); } -QString K3bVideoDVDRippingJob::jobDetails() const +TQString K3bVideoDVDRippingJob::jobDetails() const { return i18n("Transcoding %n title to %1/%2", "Transcoding %n titles to %1/%2", m_titleRipInfos.count() ) - .arg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) ) - .arg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) ); + .tqarg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) ) + .tqarg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) ); } @@ -143,10 +143,10 @@ void K3bVideoDVDRippingJob::slotTranscodingJobFinished( bool success ) } else { if( success ) - emit infoMessage( i18n("Successfully ripped title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); + emit infoMessage( i18n("Successfully ripped title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); else { d->failedTitles++; - emit infoMessage( i18n("Failed to rip title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); + emit infoMessage( i18n("Failed to rip title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); } ++d->currentTitleInfoIndex ; @@ -176,11 +176,11 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success ) m_titleRipInfos[d->currentTitleInfoIndex].clipRight = 0; if( success ) { - emit infoMessage( i18n("Determined clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); + emit infoMessage( i18n("Determined clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); emit infoMessage( i18n("Top: %1, Bottom: %2") - .arg(m_detectClippingJob->clippingTop()).arg(m_detectClippingJob->clippingBottom()), INFO ); + .tqarg(m_detectClippingJob->clippingTop()).tqarg(m_detectClippingJob->clippingBottom()), INFO ); emit infoMessage( i18n("Left: %1, Right: %2") - .arg(m_detectClippingJob->clippingLeft()).arg(m_detectClippingJob->clippingRight()), INFO ); + .tqarg(m_detectClippingJob->clippingLeft()).tqarg(m_detectClippingJob->clippingRight()), INFO ); // let's see if the clipping values make sense if( m_detectClippingJob->clippingTop() + m_detectClippingJob->clippingBottom() @@ -197,7 +197,7 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success ) } } else - emit infoMessage( i18n("Failed to determine clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); + emit infoMessage( i18n("Failed to determine clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); startTranscoding( d->currentTitleInfoIndex ); } @@ -234,11 +234,11 @@ void K3bVideoDVDRippingJob::startDetectClipping( int ripInfoIndex ) if( !m_detectClippingJob ) { m_detectClippingJob = new K3bVideoDVDTitleDetectClippingJob( this, this ); connectSubJob( m_detectClippingJob, - SLOT(slotDetectClippingJobFinished(bool)), - SIGNAL(newTask(const QString&)), - SIGNAL(newSubTask(const QString&)), - SLOT(slotDetectClippingProgress(int)), - SIGNAL(subPercent(int)), + TQT_SLOT(slotDetectClippingJobFinished(bool)), + TQT_SIGNAL(newTask(const TQString&)), + TQT_SIGNAL(newSubTask(const TQString&)), + TQT_SLOT(slotDetectClippingProgress(int)), + TQT_SIGNAL(subPercent(int)), 0, 0 ); } diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.h b/src/rip/videodvd/k3bvideodvdrippingjob.h index 7c9f4d2..93ec1b0 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.h +++ b/src/rip/videodvd/k3bvideodvdrippingjob.h @@ -20,7 +20,7 @@ #include <k3bvideodvd.h> #include <k3bvideodvdtitletranscodingjob.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> class K3bVideoDVDTitleDetectClippingJob; @@ -32,9 +32,10 @@ class K3bVideoDVDTitleDetectClippingJob; class K3bVideoDVDRippingJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingJob( K3bJobHandler* hdl, QObject* parent ); + K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* tqparent ); ~K3bVideoDVDRippingJob(); class TitleRipInfo { @@ -42,7 +43,7 @@ class K3bVideoDVDRippingJob : public K3bJob TitleRipInfo(); TitleRipInfo( int title, int audioStream = 0, - const QString& fn = QString::null, + const TQString& fn = TQString(), int width = 0, // 0 -> no resize int height = 0, // 0 -> no resize int videoBitrate = 0, // 0 -> use default from job settings @@ -52,7 +53,7 @@ class K3bVideoDVDRippingJob : public K3bJob int clipRight = 0 ); int title; int audioStream; - QString filename; + TQString filename; int width; int height; int videoBitrate; @@ -62,15 +63,15 @@ class K3bVideoDVDRippingJob : public K3bJob int clipRight; }; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); void cancel(); void setVideoDVD( const K3bVideoDVD::VideoDVD& dvd ) { m_dvd = dvd; } - void setTitles( const QValueVector<TitleRipInfo>& titles ) { m_titleRipInfos = titles; } + void setTitles( const TQValueVector<TitleRipInfo>& titles ) { m_titleRipInfos = titles; } void setVideoCodec( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ); void setVideoBitrate( int bitrate ); @@ -94,7 +95,7 @@ class K3bVideoDVDRippingJob : public K3bJob void initProgressInfo(); K3bVideoDVD::VideoDVD m_dvd; - QValueVector<TitleRipInfo> m_titleRipInfos; + TQValueVector<TitleRipInfo> m_titleRipInfos; K3bVideoDVDTitleTranscodingJob* m_transcodingJob; K3bVideoDVDTitleDetectClippingJob* m_detectClippingJob; diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp index 3ba7582..a08ba51 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp @@ -23,12 +23,12 @@ #include <ktempdir.h> #include <kdebug.h> -#include <qdir.h> +#include <tqdir.h> -K3bVideoDVDRippingPreview::K3bVideoDVDRippingPreview( QObject* parent ) - : QObject( parent ), +K3bVideoDVDRippingPreview::K3bVideoDVDRippingPreview( TQObject* tqparent ) + : TQObject( tqparent ), m_tempDir( 0 ), m_process( 0 ) { @@ -60,7 +60,7 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv // auto-select a chapter // choose the center chapter, but not the first or last if possible if( chapter == 0 ) - chapter = QMIN( QMAX( dvd[title-1].numChapters()/2, 2 ), QMAX( dvd[title-1].numChapters() - 1, 1 ) ); + chapter = TQMIN( TQMAX( dvd[title-1].numChapters()/2, 2 ), TQMAX( dvd[title-1].numChapters() - 1, 1 ) ); // select a frame number unsigned int frame = 30; @@ -77,16 +77,16 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv m_process = new KProcess(); *m_process << bin->path; *m_process << "-i" << dvd.device()->blockDeviceName(); - *m_process << "-T" << QString("%1,%2").arg(title).arg(chapter); + *m_process << "-T" << TQString("%1,%2").tqarg(title).tqarg(chapter); *m_process << "-x" << "dvd,null"; *m_process << "--dvd_access_delay" << "0"; *m_process << "-y" << "ppm,null"; - *m_process << "-c" << QString("%1-%2").arg( frame ).arg( frame+1 ); + *m_process << "-c" << TQString("%1-%2").tqarg( frame ).tqarg( frame+1 ); *m_process << "-Z" << "x200"; *m_process << "-o" << m_tempDir->name(); - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotTranscodeFinished(KProcess*)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotTranscodeFinished(KProcess*)) ); if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout // something went wrong when starting the program // it "should" be the executable @@ -112,9 +112,9 @@ void K3bVideoDVDRippingPreview::cancel() void K3bVideoDVDRippingPreview::slotTranscodeFinished( KProcess* ) { // read the image - QString filename = m_tempDir->name() + "000000.ppm";// + tempQDir->entryList( QDir::Files ).first(); + TQString filename = m_tempDir->name() + "000000.ppm";// + tempTQDir->entryList( TQDir::Files ).first(); kdDebug() << "(K3bVideoDVDRippingPreview) reading from file " << filename << endl; - m_preview = QImage( filename ); + m_preview = TQImage( filename ); bool success = !m_preview.isNull() && !m_canceled; // remove temp files diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h index f5beb69..ab7b994 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.h +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h @@ -16,8 +16,8 @@ #ifndef _K3B_VIDEODVD_RIPPING_PREVIEW_H_ #define _K3B_VIDEODVD_RIPPING_PREVIEW_H_ -#include <qobject.h> -#include <qimage.h> +#include <tqobject.h> +#include <tqimage.h> #include <k3bvideodvd.h> @@ -25,15 +25,16 @@ class KTempDir; class KProcess; -class K3bVideoDVDRippingPreview : public QObject +class K3bVideoDVDRippingPreview : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingPreview( QObject* parent = 0 ); + K3bVideoDVDRippingPreview( TQObject* tqparent = 0 ); ~K3bVideoDVDRippingPreview(); - const QImage& preview() const { return m_preview; } + const TQImage& preview() const { return m_preview; } public slots: /** @@ -53,7 +54,7 @@ class K3bVideoDVDRippingPreview : public QObject void slotTranscodeFinished( KProcess* ); private: - QImage m_preview; + TQImage m_preview; KTempDir* m_tempDir; KProcess* m_process; int m_title; diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index 85379dc..244de2c 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -25,11 +25,11 @@ #include <k3bvideodvdvideostream.h> #include <k3bvideodvdsubpicturestream.h> -#include <qsimplerichtext.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qheader.h> -#include <qtooltip.h> +#include <tqsimplerichtext.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqheader.h> +#include <tqtooltip.h> #include <klocale.h> #include <kglobal.h> @@ -37,22 +37,22 @@ #include <kapplication.h> -static QString audioStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) +static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) { - QString s = "<p>"; - for( unsigned int i = 0; i < QMIN( title.numAudioStreams(), maxLines ); ++i ) { + TQString s = "<p>"; + for( unsigned int i = 0; i < TQMIN( title.numAudioStreams(), maxLines ); ++i ) { if( i > 0 ) s += "<br>"; - s += QString::number(i+1) + ": " + s += TQString::number(i+1) + ": " + i18n("%1 %2Ch (%3<em>%4</em>)") - .arg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) ) - .arg( title.audioStream(i).channels() ) - .arg( title.audioStream(i).langCode().isEmpty() + .tqarg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) ) + .tqarg( title.audioStream(i).channels() ) + .tqarg( title.audioStream(i).langCode().isEmpty() ? i18n("unknown language") : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) ) - .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED - ? QString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() ) - : QString::null ); + .tqarg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED + ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() ) + : TQString() ); } if( title.numAudioStreams() > maxLines ) s += "..."; @@ -61,23 +61,23 @@ static QString audioStreamString( const K3bVideoDVD::Title& title, unsigned int } -static QString subpictureStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) +static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) { - QString s = "<p>"; - for( unsigned int i = 0; i < QMIN( title.numSubPictureStreams(), maxLines ); ++i ) { + TQString s = "<p>"; + for( unsigned int i = 0; i < TQMIN( title.numSubPictureStreams(), maxLines ); ++i ) { if( i > 0 ) s += "<br>"; - s += QString::number(i+1) + ": " - + QString("%1 (%2<em>%3</em>)") - .arg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE + s += TQString::number(i+1) + ": " + + TQString("%1 (%2<em>%3</em>)") + .tqarg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE ? i18n("RLE") : i18n("Extended") ) - .arg( title.subPictureStream(i).langCode().isEmpty() + .tqarg( title.subPictureStream(i).langCode().isEmpty() ? i18n("unknown language") : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) ) - .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED - ? QString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() ) - : QString::null ); + .tqarg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED + ? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() ) + : TQString() ); } if( title.numSubPictureStreams() > maxLines ) s += "..."; @@ -90,8 +90,8 @@ static QString subpictureStreamString( const K3bVideoDVD::Title& title, unsigned class K3bVideoDVDRippingTitleListView::TitleViewItem : public K3bCheckListViewItem { public: - TitleViewItem( K3bVideoDVDRippingTitleListView* parent, QListViewItem* after, const K3bVideoDVD::Title& title ) - : K3bCheckListViewItem( parent, after ), + TitleViewItem( K3bVideoDVDRippingTitleListView* tqparent, TQListViewItem* after, const K3bVideoDVD::Title& title ) + : K3bCheckListViewItem( tqparent, after ), m_title( title ) { setMarginVertical( 4 ); @@ -113,39 +113,39 @@ public: // set a valid height int maxH = 0; for( int c = 1; c <= 4; ++c ) { - QSimpleRichText rt( text(c), listView()->font() ); + TQSimpleRichText rt( text(c), listView()->font() ); rt.setWidth( 600 ); // way to big to avoid line breaks - maxH = QMAX( maxH, rt.height() ); + maxH = TQMAX( maxH, rt.height() ); } setHeight( maxH + 2*marginVertical() ); } - int width( const QFontMetrics& fm, const QListView* lv, int c ) const { + int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const { if( c == 0 ) return K3bCheckListViewItem::width( fm, lv, c ); else { - QSimpleRichText rt( text(c), lv->font() ); + TQSimpleRichText rt( text(c), lv->font() ); rt.setWidth( 600 ); // way to big to avoid line breaks return rt.widthUsed() + 2*marginHorizontal( c ); } } - void setPreview( const QImage& preview ) { + void setPreview( const TQImage& preview ) { m_preview = preview; - m_scaledPreview = QPixmap(); + m_scaledPreview = TQPixmap(); m_previewSet = true; - repaint(); + tqrepaint(); } - const QImage& preview() const { + const TQImage& preview() const { return m_preview; } protected: - void paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int w, int align ) { + void paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int w, int align ) { p->save(); if( col == 0 ) { @@ -155,7 +155,7 @@ protected: else if( col == 2 ) { if( isSelected() ) { p->fillRect( 0, 0, w, height(), - cg.brush( QColorGroup::Highlight ) ); + cg.brush( TQColorGroup::Highlight ) ); p->setPen( cg.highlightedText() ); } else { @@ -193,35 +193,35 @@ protected: preW = h*16/9; p->drawRect( ( w - preW ) / 2, ( height() - h ) / 2, preW, h ); - QPixmap noIcon = KApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true ); + TQPixmap noIcon = KApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true ); p->drawPixmap( ( w - noIcon.width() ) / 2, ( height() - noIcon.height() ) / 2, noIcon ); } else { - p->drawText( 0, 0, w, height(), Qt::AlignCenter, "..." ); + p->drawText( 0, 0, w, height(), TQt::AlignCenter, "..." ); } } else { - QString s = text( col ); + TQString s = text( col ); if( s.isEmpty() ) K3bCheckListViewItem::paintK3bCell( p, cg, col, w, align ); else { - QColorGroup cg1( cg ); + TQColorGroup cg1( cg ); if( isSelected() ) { p->fillRect( 0, 0, w, height(), - cg.brush( QColorGroup::Highlight ) ); - cg1.setColor( QColorGroup::Text, cg.highlightedText() ); + cg.brush( TQColorGroup::Highlight ) ); + cg1.setColor( TQColorGroup::Text, cg.highlightedText() ); } else { p->fillRect( 0, 0, w, height(), cg.base() ); } - // paint using QSimpleRichText - QSimpleRichText rt( text(col), listView()->font() ); + // paint using TQSimpleRichText + TQSimpleRichText rt( text(col), listView()->font() ); rt.setWidth( 600 ); // way to big to avoid line breaks // normally we would have to clip the height to height()-2*marginVertical(). But if we do that - // some characters are cut (such as p or q). It seems as if QSimpleRichText does not properly + // some characters are cut (such as p or q). It seems as if TQSimpleRichText does not properly // calculate it's height... - rt.draw( p, 0, marginVertical(), QRect( 0, 0, w, height() ), cg1 ); + rt.draw( p, 0, marginVertical(), TQRect( 0, 0, w, height() ), cg1 ); } } @@ -229,7 +229,7 @@ protected: if( listView()->firstChild() != this ) { p->translate( -1*marginHorizontal(col), 0 ); // FIXME: modify the value from palette().disabled().foreground() to be lighter (or darker, depending on the background color ) - p->setPen( Qt::lightGray ); + p->setPen( TQt::lightGray ); p->drawLine( 0, 0, w+2*marginHorizontal(col), 0 ); } @@ -237,26 +237,26 @@ protected: } private: - QString text( int col ) const { + TQString text( int col ) const { switch( col ) { case 1: // Title X + length return i18n("<p><b>Title %1 (%2)</b><br>" "%3") - .arg( m_title.titleNumber(), 2 ) - .arg( m_title.playbackTime().toString( false ) ) - .arg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) ); + .tqarg( m_title.titleNumber(), 2 ) + .tqarg( m_title.playbackTime().toString( false ) ) + .tqarg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) ); case 3: // video stream info - return QString("<p>%1 %2x%3<br>%4%5") - .arg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") ) - .arg( m_title.videoStream().pictureWidth() ) - .arg( m_title.videoStream().pictureHeight() ) - .arg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" ) - .arg( m_title.videoStream().letterboxed() ? QString(" - <em>") + i18n("letterboxed") + QString("</em>"): + return TQString("<p>%1 %2x%3<br>%4%5") + .tqarg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") ) + .tqarg( m_title.videoStream().pictureWidth() ) + .tqarg( m_title.videoStream().pictureHeight() ) + .tqarg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" ) + .tqarg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"): m_title.videoStream().permittedDf() == K3bVideoDVD::VIDEO_PERMITTED_DF_LETTERBOXED - ? QString(" - <em>") + i18n("anamorph") + QString("</em>") : QString::null ); + ? TQString(" - <em>") + i18n("anamorph") + TQString("</em>") : TQString() ); case 4: // audio streams info @@ -280,8 +280,8 @@ private: K3bVideoDVD::Title m_title; bool m_previewSet; - QImage m_preview; - QPixmap m_scaledPreview; + TQImage m_preview; + TQPixmap m_scaledPreview; }; @@ -293,14 +293,14 @@ public: m_view( view ) { } - void maybeTip( const QPoint& pos ) { + void maybeTip( const TQPoint& pos ) { TitleViewItem* item = static_cast<TitleViewItem*>( m_view->itemAt( pos ) ); - QPoint contentsPos = m_view->viewportToContents( pos ); + TQPoint contentsPos = m_view->viewportToContents( pos ); if( !item ) return; int col = m_view->header()->sectionAt( contentsPos.x() ); - QRect r = m_view->itemRect( item ); + TQRect r = m_view->tqitemRect( item ); int headerPos = m_view->header()->sectionPos( col ); r.setLeft( headerPos ); r.setRight( headerPos + m_view->header()->sectionSize( col ) ); @@ -308,7 +308,7 @@ public: switch( col ) { case 2: if( !item->preview().isNull() ) { - QPixmap previewPix; + TQPixmap previewPix; if( previewPix.convertFromImage( item->preview() ) ) tip( r, previewPix, 0 ); } @@ -330,8 +330,8 @@ private: -K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( QWidget* parent ) - : K3bListView( parent ) +K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( TQWidget* tqparent ) + : K3bListView( tqparent ) { setFullWidth(true); setSorting(-1); @@ -346,15 +346,15 @@ K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( QWidget* paren addColumn( i18n("Subpicture") ); header()->setClickEnabled( false ); - setColumnWidthMode( 0, QListView::Manual ); + setColumnWidthMode( 0, TQListView::Manual ); setColumnWidth( 0, 20 ); header()->setResizeEnabled( false, 0 ); m_toolTip = new TitleToolTip( this ); m_previewGen = new K3bVideoDVDRippingPreview( this ); - connect( m_previewGen, SIGNAL(previewDone(bool)), - this, SLOT(slotPreviewDone(bool)) ); + connect( m_previewGen, TQT_SIGNAL(previewDone(bool)), + this, TQT_SLOT(slotPreviewDone(bool)) ); } @@ -385,7 +385,7 @@ void K3bVideoDVDRippingTitleListView::slotPreviewDone( bool success ) if( success ) m_itemMap[m_currentPreviewTitle-1]->setPreview( m_previewGen->preview() ); else - m_itemMap[m_currentPreviewTitle-1]->setPreview( QImage() ); + m_itemMap[m_currentPreviewTitle-1]->setPreview( TQImage() ); // cancel if we got hidden or if the medium changed. if( isVisible() && m_medium == k3bappcore->mediaCache()->medium( m_dvd.device() ) ) { @@ -396,7 +396,7 @@ void K3bVideoDVDRippingTitleListView::slotPreviewDone( bool success ) } -void K3bVideoDVDRippingTitleListView::hideEvent( QHideEvent* e ) +void K3bVideoDVDRippingTitleListView::hideEvent( TQHideEvent* e ) { // // For now we do it the easy way: just stop the preview generation diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h index 7c21815..2aa0dbc 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h @@ -20,18 +20,19 @@ #include <k3bvideodvd.h> #include <k3bmedium.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> class K3bVideoDVDRippingPreview; -class QHideEvent; +class TQHideEvent; class K3bVideoDVDRippingTitleListView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingTitleListView( QWidget* parent ); + K3bVideoDVDRippingTitleListView( TQWidget* tqparent ); ~K3bVideoDVDRippingTitleListView(); void setVideoDVD( const K3bVideoDVD::VideoDVD& dvd ); @@ -40,14 +41,14 @@ class K3bVideoDVDRippingTitleListView : public K3bListView void slotPreviewDone( bool ); private: - void hideEvent( QHideEvent* ); + void hideEvent( TQHideEvent* ); class TitleViewItem; class TitleToolTip; TitleToolTip* m_toolTip; - QValueVector<TitleViewItem*> m_itemMap; + TQValueVector<TitleViewItem*> m_itemMap; K3bVideoDVDRippingPreview* m_previewGen; unsigned int m_currentPreviewTitle; diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index f6c8c8d..6753305 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -26,9 +26,9 @@ #include <k3bcore.h> #include <k3bexternalbinmanager.h> -#include <qcursor.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqcursor.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <kapplication.h> #include <kmessagebox.h> @@ -37,24 +37,24 @@ #include <kconfig.h> -K3bVideoDVDRippingView::K3bVideoDVDRippingView( QWidget* parent, const char * name ) +K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* tqparent, const char * name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_VIDEO_DVD, K3bDevice::MEDIA_DVD_ALL, K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE, - parent, name ) + tqparent, name ) { - QGridLayout* mainGrid = new QGridLayout( mainWidget() ); + TQGridLayout* mainGrid = new TQGridLayout( mainWidget() ); // toolbox // ---------------------------------------------------------------------------------- - QHBoxLayout* toolBoxLayout = new QHBoxLayout( 0, 0, 0, "toolBoxLayout" ); + TQHBoxLayout* toolBoxLayout = new TQHBoxLayout( 0, 0, 0, "toolBoxLayout" ); m_toolBox = new K3bToolBox( mainWidget() ); toolBoxLayout->addWidget( m_toolBox ); - QSpacerItem* spacer = new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); toolBoxLayout->addItem( spacer ); - m_labelLength = new QLabel( mainWidget() ); - m_labelLength->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_labelLength = new TQLabel( mainWidget() ); + m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); toolBoxLayout->addWidget( m_labelLength ); @@ -62,10 +62,10 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( QWidget* parent, const char * na // ---------------------------------------------------------------------------------- m_titleView = new K3bVideoDVDRippingTitleListView( mainWidget() ); - connect( m_titleView, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + connect( m_titleView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); - // general layout + // general tqlayout // ---------------------------------------------------------------------------------- mainGrid->addLayout( toolBoxLayout, 0, 0 ); mainGrid->addWidget( m_titleView, 1, 0 ); @@ -113,13 +113,13 @@ void K3bVideoDVDRippingView::reloadMedium() delete css; } - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); if( m_dvd.open( device() ) ) { setTitle( medium().beautifiedVolumeId() + " (" + i18n("Video DVD") + ")" ); m_labelLength->setText( i18n("%n title", "%n titles", m_dvd.numTitles() ) ); m_titleView->setVideoDVD( m_dvd ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); bool transcodeUsable = true; @@ -150,7 +150,7 @@ void K3bVideoDVDRippingView::reloadMedium() actionCollection()->action("start_rip")->setEnabled( transcodeUsable ); } else { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); KMessageBox::error( this, i18n("Unable to read Video DVD contents.") ); } @@ -159,9 +159,9 @@ void K3bVideoDVDRippingView::reloadMedium() void K3bVideoDVDRippingView::slotStartRipping() { - QValueList<int> titles; + TQValueList<int> titles; int i = 1; - for( QListViewItemIterator it( m_titleView ); *it; ++it, ++i ) + for( TQListViewItemIterator it( m_titleView ); *it; ++it, ++i ) if( static_cast<K3bCheckListViewItem*>( *it )->isChecked() ) titles.append( i ); @@ -176,7 +176,7 @@ void K3bVideoDVDRippingView::slotStartRipping() } -void K3bVideoDVDRippingView::slotContextMenu( KListView*, QListViewItem*, const QPoint& p ) +void K3bVideoDVDRippingView::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& p ) { m_popupMenu->popup(p); } @@ -184,22 +184,22 @@ void K3bVideoDVDRippingView::slotContextMenu( KListView*, QListViewItem*, const void K3bVideoDVDRippingView::slotCheckAll() { - for( QListViewItemIterator it( m_titleView ); it.current(); ++it ) + for( TQListViewItemIterator it( m_titleView ); it.current(); ++it ) dynamic_cast<K3bCheckListViewItem*>(it.current())->setChecked(true); } void K3bVideoDVDRippingView::slotUncheckAll() { - for( QListViewItemIterator it( m_titleView ); it.current(); ++it ) + for( TQListViewItemIterator it( m_titleView ); it.current(); ++it ) dynamic_cast<K3bCheckListViewItem*>(it.current())->setChecked(false); } void K3bVideoDVDRippingView::slotCheck() { - QPtrList<QListViewItem> items( m_titleView->selectedItems() ); - for( QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items( m_titleView->selectedItems() ); + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) dynamic_cast<K3bCheckListViewItem*>(it.current())->setChecked(true); } @@ -207,8 +207,8 @@ void K3bVideoDVDRippingView::slotCheck() void K3bVideoDVDRippingView::slotUncheck() { - QPtrList<QListViewItem> items( m_titleView->selectedItems() ); - for( QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items( m_titleView->selectedItems() ); + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) dynamic_cast<K3bCheckListViewItem*>(it.current())->setChecked(false); } @@ -219,19 +219,19 @@ void K3bVideoDVDRippingView::initActions() m_actionCollection = new KActionCollection( this ); KAction* actionSelectAll = new KAction( i18n("Check All"), 0, 0, this, - SLOT(slotCheckAll()), actionCollection(), + TQT_SLOT(slotCheckAll()), actionCollection(), "check_all" ); KAction* actionDeselectAll = new KAction( i18n("Uncheck All"), 0, 0, this, - SLOT(slotUncheckAll()), actionCollection(), + TQT_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); KAction* actionSelect = new KAction( i18n("Check Track"), 0, 0, this, - SLOT(slotCheck()), actionCollection(), + TQT_SLOT(slotCheck()), actionCollection(), "select_track" ); KAction* actionDeselect = new KAction( i18n("Uncheck Track"), 0, 0, this, - SLOT(slotUncheck()), actionCollection(), + TQT_SLOT(slotUncheck()), actionCollection(), "deselect_track" ); KAction* actionStartRip = new KAction( i18n("Start Ripping"), "gear", 0, this, - SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); + TQT_SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") ); diff --git a/src/rip/videodvd/k3bvideodvdrippingview.h b/src/rip/videodvd/k3bvideodvdrippingview.h index 679ea09..1bf58f3 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.h +++ b/src/rip/videodvd/k3bvideodvdrippingview.h @@ -22,18 +22,19 @@ class K3bVideoDVDRippingTitleListView; class K3bToolBox; -class QLabel; +class TQLabel; class KActionCollection; class KActionMenu; class KListView; -class QListViewItem; +class TQListViewItem; class K3bVideoDVDRippingView : public K3bMediaContentsView { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingView( QWidget* parent = 0, const char * name = 0 ); + K3bVideoDVDRippingView( TQWidget* tqparent = 0, const char * name = 0 ); ~K3bVideoDVDRippingView(); KActionCollection* actionCollection() const { return m_actionCollection; } @@ -41,7 +42,7 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView private slots: void slotStartRipping(); - void slotContextMenu( KListView*, QListViewItem*, const QPoint& ); + void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); void slotCheckAll(); void slotUncheckAll(); @@ -57,7 +58,7 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView KActionMenu* m_popupMenu; K3bToolBox* m_toolBox; - QLabel* m_labelLength; + TQLabel* m_labelLength; K3bVideoDVDRippingTitleListView* m_titleView; K3bVideoDVD::VideoDVD m_dvd; diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 721d191..06214a0 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -28,15 +28,15 @@ #include <kdialogbase.h> #include <klineedit.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qwhatsthis.h> -#include <qwidgetstack.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> +#include <tqwidgetstack.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> static const int s_mp3Bitrates[] = { @@ -72,8 +72,8 @@ static const char* s_pictureSizeNames[] = { }; -K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( QWidget* parent ) - : base_K3bVideoDVDRippingWidget( parent ) +K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* tqparent ) + : base_K3bVideoDVDRippingWidget( tqparent ) { m_editBaseDir->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); @@ -86,15 +86,15 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( QWidget* parent ) // // Example filename pattern // - m_comboFilenamePattern->insertItem( QString( "%b - %1 %t (%n %a %c)" ).arg(i18n("Title") ) ); - m_comboFilenamePattern->insertItem( QString( "%{volumeid} (%{title})" ) ); + m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).tqarg(i18n("Title") ) ); + m_comboFilenamePattern->insertItem( TQString( "%{volumeid} (%{title})" ) ); // // Add the Audio bitrates // for( int i = 0; s_mp3Bitrates[i]; ++i ) - m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).arg(s_mp3Bitrates[i]) ); + m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_mp3Bitrates[i]) ); for( int i = 0; i < K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_NUM_ENTRIES; ++i ) { @@ -118,32 +118,32 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( QWidget* parent ) slotAudioCodecChanged( m_comboAudioCodec->selectedValue() ); - connect( m_comboAudioBitrate, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_spinVideoBitrate, SIGNAL(valueChanged(int)), - this, SIGNAL(changed()) ); - connect( m_checkBlankReplace, SIGNAL(toggled(bool)), - this, SIGNAL(changed()) ); - connect( m_editBlankReplace, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_comboFilenamePattern, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_editBaseDir, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - - connect( m_comboAudioCodec, SIGNAL(valueChanged(int)), - this, SLOT(slotAudioCodecChanged(int)) ); - connect( m_specialStringsLabel, SIGNAL(leftClickedURL()), - this, SLOT(slotSeeSpecialStrings()) ); - connect( m_buttonCustomPictureSize, SIGNAL(clicked()), - this, SLOT(slotCustomPictureSize()) ); - connect( m_comboVideoSize, SIGNAL(activated(int)), - this, SLOT(slotVideoSizeChanged(int)) ); + connect( m_comboAudioBitrate, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_spinVideoBitrate, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(changed()) ); + connect( m_checkBlankReplace, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(changed()) ); + connect( m_editBlankReplace, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_comboFilenamePattern, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + + connect( m_comboAudioCodec, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAudioCodecChanged(int)) ); + connect( m_specialStringsLabel, TQT_SIGNAL(leftClickedURL()), + this, TQT_SLOT(slotSeeSpecialStrings()) ); + connect( m_buttonCustomPictureSize, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCustomPictureSize()) ); + connect( m_comboVideoSize, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotVideoSizeChanged(int)) ); // refresh every 2 seconds - m_freeSpaceUpdateTimer = new QTimer( this ); - connect( m_freeSpaceUpdateTimer, SIGNAL(timeout()), - this, SLOT(slotUpdateFreeTempSpace()) ); + m_freeSpaceUpdateTimer = new TQTimer( this ); + connect( m_freeSpaceUpdateTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotUpdateFreeTempSpace()) ); m_freeSpaceUpdateTimer->start(2000); slotUpdateFreeTempSpace(); } @@ -160,35 +160,35 @@ K3bVideoDVDTitleTranscodingJob::VideoCodec K3bVideoDVDRippingWidget::selectedVid } -QSize K3bVideoDVDRippingWidget::selectedPictureSize() const +TQSize K3bVideoDVDRippingWidget::selectedPictureSize() const { switch( m_comboVideoSize->currentItem() ) { case PICTURE_SIZE_ORIGINAL: - return QSize(0,0); + return TQSize(0,0); case PICTURE_SIZE_640: - return QSize(640,0); + return TQSize(640,0); case PICTURE_SIZE_320: - return QSize(320,0); + return TQSize(320,0); default: return m_customVideoSize; } } -void K3bVideoDVDRippingWidget::setSelectedPictureSize( const QSize& size ) +void K3bVideoDVDRippingWidget::setSelectedPictureSize( const TQSize& size ) { m_customVideoSize = size; - if( size == QSize(0,0) ) + if( size == TQSize(0,0) ) m_comboVideoSize->setCurrentItem( PICTURE_SIZE_ORIGINAL ); - else if( size == QSize(640,0) ) + else if( size == TQSize(640,0) ) m_comboVideoSize->setCurrentItem( PICTURE_SIZE_640 ); - else if( size == QSize(320,0) ) + else if( size == TQSize(320,0) ) m_comboVideoSize->setCurrentItem( PICTURE_SIZE_320 ); else { m_comboVideoSize->changeItem( i18n(s_pictureSizeNames[PICTURE_SIZE_CUSTOM]) - + QString(" (%1x%2)") - .arg(size.width() == 0 ? i18n("auto") : QString::number(size.width())) - .arg(size.height() == 0 ? i18n("auto") : QString::number(size.height())), + + TQString(" (%1x%2)") + .tqarg(size.width() == 0 ? i18n("auto") : TQString::number(size.width())) + .tqarg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())), PICTURE_SIZE_CUSTOM ); m_comboVideoSize->setCurrentItem( PICTURE_SIZE_CUSTOM ); } @@ -246,16 +246,16 @@ void K3bVideoDVDRippingWidget::setSelectedAudioBitrate( int bitrate ) void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace() { - QString path = m_editBaseDir->url(); + TQString path = m_editBaseDir->url(); - if( !QFile::exists( path ) ) - path.truncate( path.findRev('/') ); + if( !TQFile::exists( path ) ) + path.truncate( path.tqfindRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) { m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) ); if( avail < m_neededSize/1024 ) - m_labelNeededSpace->setPaletteForegroundColor( Qt::red ); + m_labelNeededSpace->setPaletteForegroundColor( TQt::red ); else m_labelNeededSpace->setPaletteForegroundColor( paletteForegroundColor() ); } @@ -280,7 +280,7 @@ void K3bVideoDVDRippingWidget::setNeededSize( KIO::filesize_t size ) void K3bVideoDVDRippingWidget::slotSeeSpecialStrings() { - QWhatsThis::display( i18n( "<p><b>Pattern special strings:</b>" + TQWhatsThis::display( i18n( "<p><b>Pattern special strings:</b>" "<p>The following strings will be replaced with their respective meaning in every " "track name.<br>" "<p><table border=\"0\">" @@ -345,16 +345,16 @@ void K3bVideoDVDRippingWidget::slotCustomPictureSize() "Be aware that setting both the width and the height to fixed values " "will result in no aspect ratio correction to be performed."), dlg.plainPage() ); - QSpinBox* spinWidth = new QSpinBox( 0, 20000, 16, dlg.plainPage() ); - QSpinBox* spinHeight = new QSpinBox( 0, 20000, 16, dlg.plainPage() ); + TQSpinBox* spinWidth = new TQSpinBox( 0, 20000, 16, dlg.plainPage() ); + TQSpinBox* spinHeight = new TQSpinBox( 0, 20000, 16, dlg.plainPage() ); spinWidth->setSpecialValueText( i18n("Auto") ); spinHeight->setSpecialValueText( i18n("Auto") ); - QLabel* labelW = new QLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() ); - QLabel* labelH = new QLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() ); - labelW->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); - labelH->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); + TQLabel* labelW = new TQLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() ); + TQLabel* labelH = new TQLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() ); + labelW->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter ); + labelH->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter ); - QGridLayout* grid = new QGridLayout( dlg.plainPage() ); + TQGridLayout* grid = new TQGridLayout( dlg.plainPage() ); grid->setMargin( 0 ); grid->setSpacing( KDialog::spacingHint() ); grid->addMultiCellWidget( label, 0, 0, 0, 3 ); @@ -367,7 +367,7 @@ void K3bVideoDVDRippingWidget::slotCustomPictureSize() spinHeight->setValue( m_customVideoSize.height() ); if( dlg.exec() ) { - setSelectedPictureSize( QSize( spinWidth->value(), spinHeight->value() ) ); + setSelectedPictureSize( TQSize( spinWidth->value(), spinHeight->value() ) ); emit changed(); } } diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h index 2d10da7..5335b7c 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.h +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h @@ -20,30 +20,31 @@ #include <k3bvideodvdtitletranscodingjob.h> -#include <qvaluevector.h> -#include <qmap.h> +#include <tqvaluevector.h> +#include <tqmap.h> #include <kio/global.h> -class QTimer; +class TQTimer; class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingWidget( QWidget* parent ); + K3bVideoDVDRippingWidget( TQWidget* tqparent ); ~K3bVideoDVDRippingWidget(); K3bVideoDVDTitleTranscodingJob::VideoCodec selectedVideoCodec() const; K3bVideoDVDTitleTranscodingJob::AudioCodec selectedAudioCodec() const; int selectedAudioBitrate() const; - QSize selectedPictureSize() const; + TQSize selectedPictureSize() const; void setSelectedVideoCodec( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ); void setSelectedAudioCodec( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ); void setSelectedAudioBitrate( int bitrate ); - void setSelectedPictureSize( const QSize& ); + void setSelectedPictureSize( const TQSize& ); void setNeededSize( KIO::filesize_t ); @@ -58,10 +59,10 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget void slotCustomPictureSize(); private: - QTimer* m_freeSpaceUpdateTimer; + TQTimer* m_freeSpaceUpdateTimer; KIO::filesize_t m_neededSize; - QSize m_customVideoSize; + TQSize m_customVideoSize; }; #endif |