diff options
Diffstat (limited to 'kaffeine/src/input')
92 files changed, 3207 insertions, 3152 deletions
diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp index fe88d14..a276e71 100644 --- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp +++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp @@ -35,17 +35,17 @@ #include "googlefetcher.h" #include "googlefetcherdialog.h" -GoogleImage::GoogleImage(QString thumbURL, QString size) +GoogleImage::GoogleImage(TQString thumbURL, TQString size) { // thumbURL is in the following format - and we can regex the imageURL // images?q=tbn:hKSEWNB8aNcJ:www.styxnet.com/deyoung/styx/stygians/cp_portrait.jpg - m_thumbURL = thumbURL.replace("\"",""); - m_imageURL = thumbURL.remove(QRegExp("^.*q=tbn:[^:]*:")).replace("\"",""); - m_size = size.replace("pixels - ", "\n(") + ")"; + m_thumbURL = thumbURL.tqreplace("\"",""); + m_imageURL = thumbURL.remove(TQRegExp("^.*q=tbn:[^:]*:")).tqreplace("\"",""); + m_size = size.tqreplace("pixels - ", "\n(") + ")"; } -GoogleFetcher::GoogleFetcher( QString artist, QString album, bool gallery ) +GoogleFetcher::GoogleFetcher( TQString artist, TQString album, bool gallery ) { m_artist = artist; m_album = album; @@ -108,9 +108,9 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size) kdDebug() << "Performing Google Search: " << url << endl; - search.load(url.url()+QString("&start=%1&sa=N").arg(galleryPage*20) ); + search.load(url.url()+TQString("&start=%1&sa=N").tqarg(galleryPage*20) ); - QString text = search.toString().string(); + TQString text = search.toString().string(); if ( !hasImageResults(text) ) { kdDebug() << "Search returned no results.\n"; @@ -120,28 +120,28 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size) // Go through each of the top (table) nodes - int pos = text.find("/imgres?imgurl"); + int pos = text.tqfind("/imgres?imgurl"); int tpos; - QString s, c; + TQString s, c; while ( pos>-1 ) { text = text.right( text.length()-pos-14 ); - tpos = text.find("&h="); + tpos = text.tqfind("&h="); text = text.right( text.length()-tpos-3 ); - tpos = text.find("&w="); + tpos = text.tqfind("&w="); c = "pixels - " + text.left( tpos ); text = text.right( text.length()-tpos-3 ); - tpos = text.find("&sz="); + tpos = text.tqfind("&sz="); c = c + "x" + text.left( tpos ); - tpos = text.find("src="); + tpos = text.tqfind("src="); text = text.right( text.length()-tpos-4 ); - if ( (tpos=text.find("width="))==-1 ) + if ( (tpos=text.tqfind("width="))==-1 ) break; s = text.left( tpos-1 ); text = text.right( text.length()-tpos ); - if ( (tpos=text.find("></a>"))==-1 ) + if ( (tpos=text.tqfind("></a>"))==-1 ) break; m_imageList.append(GoogleImage(s, c)); - pos = text.find("/imgres?imgurl"); + pos = text.tqfind("/imgres?imgurl"); } } // try catch (DOM::DOMException &e) @@ -156,10 +156,10 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size) emit signalNewSearch(m_imageList); } -QImage GoogleFetcher::galleryNext( bool &end ) +TQImage GoogleFetcher::galleryNext( bool &end ) { - QString file; - QImage image; + TQString file; + TQImage image; m_loadedSize = All; int tries = 0; end = false; @@ -181,14 +181,14 @@ QImage GoogleFetcher::galleryNext( bool &end ) } else { end = true; - return QImage(); + return TQImage(); } } else { if(KIO::NetAccess::download( m_imageList[galleryImage].imageURL(), file, 0)) - image = QImage(file); + image = TQImage(file); else - image = QImage(); + image = TQImage(); ++galleryImage; if ( galleryImage==(int)m_imageList.count() ) { m_imageList.clear(); @@ -199,10 +199,10 @@ QImage GoogleFetcher::galleryNext( bool &end ) return image; } } - return QImage(); + return TQImage(); } -QPixmap GoogleFetcher::pixmap( bool forceFetch ) +TQPixmap GoogleFetcher::pixmap( bool forceFetch ) { bool chosen = false; m_loadedSize = All; @@ -211,7 +211,7 @@ QPixmap GoogleFetcher::pixmap( bool forceFetch ) encoding = 0; displayWaitMessage(); - QPixmap pixmap; + TQPixmap pixmap; while(!chosen) { @@ -232,10 +232,10 @@ QPixmap GoogleFetcher::pixmap( bool forceFetch ) } else { GoogleFetcherDialog dialog("google", m_imageList, m_artist, m_album, 0); - connect(&dialog, SIGNAL(sizeChanged(GoogleFetcher::ImageSize)), - this, SLOT(slotLoadImageURLs(GoogleFetcher::ImageSize))); - connect(this, SIGNAL(signalNewSearch(GoogleImageList &)), - &dialog, SLOT(refreshScreen(GoogleImageList &))); + connect(&dialog, TQT_SIGNAL(sizeChanged(GoogleFetcher::ImageSize)), + this, TQT_SLOT(slotLoadImageURLs(GoogleFetcher::ImageSize))); + connect(this, TQT_SIGNAL(signalNewSearch(GoogleImageList &)), + &dialog, TQT_SLOT(refreshScreen(GoogleImageList &))); dialog.exec(); pixmap = dialog.result(); chosen = dialog.takeIt(); @@ -271,9 +271,9 @@ bool GoogleFetcher::requestNewSearchTerms(bool noResults) return ok; } -bool GoogleFetcher::hasImageResults( QString &doc ) +bool GoogleFetcher::hasImageResults( TQString &doc ) { - if ( !doc.contains( "/imgres?imgurl" ) ) + if ( !doc.tqcontains( "/imgres?imgurl" ) ) return false; return true; diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.h b/kaffeine/src/input/audiobrowser/googlefetcher.h index 7c90091..22697cf 100644 --- a/kaffeine/src/input/audiobrowser/googlefetcher.h +++ b/kaffeine/src/input/audiobrowser/googlefetcher.h @@ -24,9 +24,9 @@ #include <kdialogbase.h> -#include <qpixmap.h> -#include <qstringlist.h> -#include <qregexp.h> +#include <tqpixmap.h> +#include <tqstringlist.h> +#include <tqregexp.h> namespace DOM { class HTMLDocument; @@ -37,30 +37,31 @@ class KURL; class GoogleImage { public: - GoogleImage(QString thumbURL = QString::null, QString size = QString::null); + GoogleImage(TQString thumbURL = TQString(), TQString size = TQString()); - QString imageURL() const { return m_imageURL; } - QString thumbURL() const { return m_thumbURL; } - QString size() const { return m_size; } + TQString imageURL() const { return m_imageURL; } + TQString thumbURL() const { return m_thumbURL; } + TQString size() const { return m_size; } private: - QString m_imageURL; - QString m_thumbURL; - QString m_size; + TQString m_imageURL; + TQString m_thumbURL; + TQString m_size; }; -typedef QValueList<GoogleImage> GoogleImageList; +typedef TQValueList<GoogleImage> GoogleImageList; -class GoogleFetcher : public QObject +class GoogleFetcher : public TQObject { Q_OBJECT + TQ_OBJECT public: enum ImageSize { All, Icon, Small, Medium, Large, XLarge }; - GoogleFetcher( QString artist, QString album, bool gallery=false ); - QPixmap pixmap( bool forceFetch = false ); - QImage galleryNext( bool &end ); + GoogleFetcher( TQString artist, TQString album, bool gallery=false ); + TQPixmap pixmap( bool forceFetch = false ); + TQImage galleryNext( bool &end ); signals: void signalNewSearch(GoogleImageList &images); @@ -70,15 +71,15 @@ private: bool requestNewSearchTerms(bool noResults = false); // Returns true if there are results in the search, otherwise returns false. - bool hasImageResults( QString &doc ); + bool hasImageResults( TQString &doc ); private slots: void slotLoadImageURLs(GoogleFetcher::ImageSize size = All); private: - QString m_artist, m_album; - QString m_searchString; - QString m_loadedQuery; + TQString m_artist, m_album; + TQString m_searchString; + TQString m_loadedQuery; ImageSize m_loadedSize; GoogleImageList m_imageList; uint m_selectedIndex; diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp index bda3853..cf49424 100644 --- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp +++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp @@ -25,22 +25,22 @@ #include <kmessagebox.h> #include <kcombobox.h> -#include <qhbox.h> -#include <qimage.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qeventloop.h> +#include <tqhbox.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqeventloop.h> #include "googlefetcherdialog.h" -GoogleFetcherDialog::GoogleFetcherDialog(const QString &name, +GoogleFetcherDialog::GoogleFetcherDialog(const TQString &name, const GoogleImageList &imageList, - const QString &artist, - const QString &album, - QWidget *parent) : - KDialogBase(parent, name.latin1(), true, QString::null, + const TQString &artist, + const TQString &album, + TQWidget *tqparent) : + KDialogBase(tqparent, name.latin1(), true, TQString(), Ok | Cancel | User1 , NoDefault, true), - m_pixmap(QPixmap()), + m_pixmap(TQPixmap()), m_imageList(imageList), m_takeIt(false), m_newSearch(false) @@ -49,18 +49,18 @@ GoogleFetcherDialog::GoogleFetcherDialog(const QString &name, m_album = album; disableResize(); - QHBox *mainBox = new QHBox(this); + TQHBox *mainBox = new TQHBox(this); m_iconWidget = new KIconView(mainBox); - m_iconWidget->setResizeMode(QIconView::Adjust); - m_iconWidget->setSelectionMode(QIconView::Extended); + m_iconWidget->setResizeMode(TQIconView::Adjust); + m_iconWidget->setSelectionMode(TQIconView::Extended); m_iconWidget->setSpacing(10); m_iconWidget->setMode(KIconView::Execute); m_iconWidget->setFixedSize(500,550); m_iconWidget->arrangeItemsInGrid(); m_iconWidget->setItemsMovable(FALSE); - QHBox *imgSize = new QHBox(actionButton(User1)->parentWidget()); - //QLabel *label = new QLabel(imgSize); + TQHBox *imgSize = new TQHBox(actionButton(User1)->tqparentWidget()); + //TQLabel *label = new TQLabel(imgSize); //label->setText(i18n("Image size:")); KComboBox *combo = new KComboBox(imgSize); @@ -71,8 +71,8 @@ GoogleFetcherDialog::GoogleFetcherDialog(const QString &name, combo->insertItem(i18n("Large")); combo->insertItem(i18n("Very Large")); combo->setCurrentItem(0); - connect(combo, SIGNAL(activated(int)), this, SLOT(imgSizeChanged(int))); - connect(m_iconWidget, SIGNAL( executed(QIconViewItem*) ), this, SLOT(slotOk())); + connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(imgSizeChanged(int))); + connect(m_iconWidget, TQT_SIGNAL( executed(TQIconViewItem*) ), this, TQT_SLOT(slotOk())); imgSize->adjustSize(); setMainWidget(mainBox); @@ -86,10 +86,10 @@ GoogleFetcherDialog::~GoogleFetcherDialog() void GoogleFetcherDialog::setLayout() { - setCaption(QString("%1 - %2 (%3)") - .arg(m_artist) - .arg(m_album) - .arg(m_imageList.size())); + setCaption(TQString("%1 - %2 (%3)") + .tqarg(m_artist) + .tqarg(m_album) + .tqarg(m_imageList.size())); m_iconWidget->clear(); for(uint i = 0; i < m_imageList.size(); i++) @@ -128,7 +128,7 @@ void GoogleFetcherDialog::slotOk() KMessageBox::sorry(this, i18n("The cover you have selected is unavailable. Please select another."), i18n("Cover Unavailable")); - QPixmap blankPix; + TQPixmap blankPix; blankPix.resize(80, 80); blankPix.fill(); m_iconWidget->currentItem()->setPixmap(blankPix, true, true); @@ -144,7 +144,7 @@ void GoogleFetcherDialog::slotCancel() { m_takeIt = true; m_newSearch = false; - m_pixmap = QPixmap(); + m_pixmap = TQPixmap(); hide(); } @@ -152,7 +152,7 @@ void GoogleFetcherDialog::slotUser1() { m_takeIt = false; m_newSearch = true; - m_pixmap = QPixmap(); + m_pixmap = TQPixmap(); hide(); } @@ -181,34 +181,34 @@ void GoogleFetcherDialog::imgSizeChanged(int index) emit sizeChanged(imageSize); } -QPixmap GoogleFetcherDialog::fetchedImage(uint index) const +TQPixmap GoogleFetcherDialog::fetchedImage(uint index) const { - return (index > m_imageList.count()) ? QPixmap() : pixmapFromURL(m_imageList[index].imageURL()); + return (index > m_imageList.count()) ? TQPixmap() : pixmapFromURL(m_imageList[index].imageURL()); } -QPixmap GoogleFetcherDialog::pixmapFromURL(const KURL &url) const +TQPixmap GoogleFetcherDialog::pixmapFromURL(const KURL &url) const { - QString file; + TQString file; if(KIO::NetAccess::download(url, file, 0)) { - QPixmap pixmap = QPixmap(file); + TQPixmap pixmap = TQPixmap(file); KIO::NetAccess::removeTempFile(file); return pixmap; } KIO::NetAccess::removeTempFile(file); - return QPixmap(); + return TQPixmap(); } //////////////////////////////////////////////////////////////////////////////// // CoverIconViewItem //////////////////////////////////////////////////////////////////////////////// -CoverIconViewItem::CoverIconViewItem(QIconView *parent, const GoogleImage &image) : - QObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0) +CoverIconViewItem::CoverIconViewItem(TQIconView *tqparent, const GoogleImage &image) : + TQObject(tqparent), KIconViewItem(tqparent, tqparent->lastItem(), image.size()), m_job(0) { // Set up the iconViewItem - QPixmap mainMap; + TQPixmap mainMap; mainMap.resize(80, 80); mainMap.fill(); setPixmap(mainMap, true, true); @@ -216,9 +216,9 @@ CoverIconViewItem::CoverIconViewItem(QIconView *parent, const GoogleImage &image // Start downloading the image. m_job = KIO::get(image.thumbURL(), false, false); - connect(m_job, SIGNAL(result(KIO::Job *)), this, SLOT(imageResult(KIO::Job *))); - connect(m_job, SIGNAL(data(KIO::Job *, const QByteArray &)), - this, SLOT(imageData(KIO::Job *, const QByteArray &))); + connect(m_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(imageResult(KIO::Job *))); + connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), + this, TQT_SLOT(imageData(KIO::Job *, const TQByteArray &))); } CoverIconViewItem::~CoverIconViewItem() @@ -228,16 +228,16 @@ CoverIconViewItem::~CoverIconViewItem() // Drain results issued by KIO before being deleted, // and before deleting the job. - kapp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput); + kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); delete m_job; } } -void CoverIconViewItem::imageData(KIO::Job *, const QByteArray &data) +void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data) { int currentSize = m_buffer.size(); - m_buffer.resize(currentSize + data.size(), QGArray::SpeedOptim); + m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim); memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size()); } @@ -246,8 +246,8 @@ void CoverIconViewItem::imageResult(KIO::Job *job) if(job->error()) return; - QPixmap iconImage(m_buffer); - iconImage = QImage(iconImage.convertToImage()).smoothScale(80, 80); + TQPixmap iconImage(m_buffer); + iconImage = TQImage(iconImage.convertToImage()).smoothScale(80, 80); setPixmap(iconImage, true, true); } diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h index 48ec70c..f0de193 100644 --- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h +++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h @@ -31,17 +31,18 @@ class KURL; class GoogleFetcherDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GoogleFetcherDialog(const QString &name, + GoogleFetcherDialog(const TQString &name, const GoogleImageList &urlList, - const QString &artist, - const QString &album, - QWidget *parent = 0); + const TQString &artist, + const TQString &album, + TQWidget *tqparent = 0); virtual ~GoogleFetcherDialog(); - QPixmap result() const { return m_pixmap; } + TQPixmap result() const { return m_pixmap; } bool takeIt() const { return m_takeIt; } bool newSearch() const { return m_newSearch; } @@ -62,15 +63,15 @@ protected slots: void imgSizeChanged(int index); private: - QPixmap fetchedImage(uint index) const; - QPixmap pixmapFromURL(const KURL &url) const; + TQPixmap fetchedImage(uint index) const; + TQPixmap pixmapFromURL(const KURL &url) const; - QPixmap m_pixmap; + TQPixmap m_pixmap; GoogleImageList m_imageList; KIconView *m_iconWidget; bool m_takeIt; bool m_newSearch; - QString m_artist, m_album; + TQString m_artist, m_album; }; namespace KIO @@ -78,21 +79,22 @@ namespace KIO class TransferJob; } -class CoverIconViewItem : public QObject, public KIconViewItem +class CoverIconViewItem : public TQObject, public KIconViewItem { Q_OBJECT + TQ_OBJECT public: - CoverIconViewItem(QIconView *parent, const GoogleImage &image); + CoverIconViewItem(TQIconView *tqparent, const GoogleImage &image); ~CoverIconViewItem(); private slots: - void imageData(KIO::Job *job, const QByteArray &data); + void imageData(KIO::Job *job, const TQByteArray &data); void imageResult(KIO::Job* job); private: - QByteArray m_buffer; - QGuardedPtr<KIO::TransferJob> m_job; + TQByteArray m_buffer; + TQGuardedPtr<KIO::TransferJob> m_job; }; #endif /* GOOGLEFETCHERDIALOG_H */ diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp index 480d70b..752eb66 100644 --- a/kaffeine/src/input/audiobrowser/playlist.cpp +++ b/kaffeine/src/input/audiobrowser/playlist.cpp @@ -45,24 +45,24 @@ #include <kurlcombobox.h> #include <kurlcompletion.h> -#include <qlabel.h> -#include <qclipboard.h> -#include <qdragobject.h> -#include <qstringlist.h> -#include <qdom.h> -#include <qxml.h> -#include <qregexp.h> -#include <qheader.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qvbox.h> -#include <qlistbox.h> -#include <qtextcodec.h> -#include <qtooltip.h> -#include <qinputdialog.h> -#include <qtimer.h> -#include <qwhatsthis.h> -#include <qpopupmenu.h> +#include <tqlabel.h> +#include <tqclipboard.h> +#include <tqdragobject.h> +#include <tqstringlist.h> +#include <tqdom.h> +#include <tqxml.h> +#include <tqregexp.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqvbox.h> +#include <tqlistbox.h> +#include <tqtextcodec.h> +#include <tqtooltip.h> +#include <tqinputdialog.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> +#include <tqpopupmenu.h> #include "googlefetcher.h" #include "mrl.h" @@ -73,32 +73,32 @@ -RollTitle::RollTitle( QWidget *parent ) : QLabel( "I", parent ) +RollTitle::RollTitle( TQWidget *tqparent ) : TQLabel( "I", tqparent ) { - QColorGroup cg = parentWidget()->colorGroup(); - QColor base = cg.base(); - QColor selection = cg.highlight(); + TQColorGroup cg = tqparentWidget()->tqcolorGroup(); + TQColor base = cg.base(); + TQColor selection = cg.highlight(); int r = (base.red() + selection.red()) / 2; int b = (base.blue() + selection.blue()) / 2; int g = (base.green() + selection.green()) / 2; - back = QColor(r, g, b); - fore = parentWidget()->colorGroup().text(); + back = TQColor(r, g, b); + fore = tqparentWidget()->tqcolorGroup().text(); setPaletteBackgroundColor( back ); setPaletteForegroundColor( fore ); - setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); title = " ##### "; titleOffset = 0; setTitle( title ); - connect( &titleTimer, SIGNAL( timeout() ), this, SLOT( rollTitle() ) ); + connect( &titleTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( rollTitle() ) ); titleTimer.start( 50 ); } void RollTitle::setTitle( MRL mrl ) { title = " ##### "; - QString s1 = mrl.artist().stripWhiteSpace(); - QString s2 = mrl.album().stripWhiteSpace(); - QString s3 = mrl.title().stripWhiteSpace(); + TQString s1 = mrl.artist().stripWhiteSpace(); + TQString s2 = mrl.album().stripWhiteSpace(); + TQString s3 = mrl.title().stripWhiteSpace(); if ( !s1.isEmpty() ) title+= s1+" - "; if ( !s2.isEmpty() ) @@ -111,27 +111,27 @@ void RollTitle::setTitle( MRL mrl ) setTitle( title ); } -void RollTitle::setTitle( QString t ) +void RollTitle::setTitle( TQString t ) { - QLabel *lab = new QLabel( t, this ); - lab->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); - lab->resize( lab->sizeHint() ); + TQLabel *lab = new TQLabel( t, this ); + lab->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); + lab->resize( lab->tqsizeHint() ); int x = 2*lab->frameWidth(); - titlePix = QPixmap( lab->width()-x, height()-x, -1, QPixmap::BestOptim ); + titlePix = TQPixmap( lab->width()-x, height()-x, -1, TQPixmap::BestOptim ); delete lab; - QPainter p( &titlePix ); + TQPainter p( &titlePix ); p.fillRect( 0, 0, titlePix.width(), titlePix.height(), back ); p.setPen( fore ); p.setFont( font() ); - p.drawText( QRect(0,(titlePix.height()-QFontInfo(font()).pointSize())/2,titlePix.width(),QFontInfo(font()).pointSize()*2), Qt::AlignAuto|Qt::SingleLine, t ); + p.drawText( TQRect(0,(titlePix.height()-TQFontInfo(font()).pointSize())/2,titlePix.width(),TQFontInfo(font()).pointSize()*2), TQt::AlignAuto|TQt::SingleLine, t ); p.end(); } void RollTitle::rollTitle() { int w = 2*frameWidth(); - QPixmap pix( width()-w, height()-w, -1, QPixmap::BestOptim ); - QPainter p1( &pix ); + TQPixmap pix( width()-w, height()-w, -1, TQPixmap::BestOptim ); + TQPainter p1( &pix ); p1.fillRect( 0, 0, pix.width(), pix.height(), back ); p1.end(); int x = titlePix.width()-titleOffset; @@ -146,51 +146,51 @@ void RollTitle::rollTitle() bitBlt( this, w/2, w/2, &pix, 0, 0, width()-w, height()-w, CopyROP ); } -void RollTitle::paintEvent( QPaintEvent *pe ) +void RollTitle::paintEvent( TQPaintEvent *pe ) { - QLabel::paintEvent( pe ); - QColorGroup cg = parentWidget()->colorGroup(); - QColor base = cg.base(); - QColor selection = cg.highlight(); + TQLabel::paintEvent( pe ); + TQColorGroup cg = tqparentWidget()->tqcolorGroup(); + TQColor base = cg.base(); + TQColor selection = cg.highlight(); int r = (base.red() + selection.red()) / 2; int b = (base.blue() + selection.blue()) / 2; int g = (base.green() + selection.green()) / 2; - back=QColor(r,g,b); + back=TQColor(r,g,b); setPaletteBackgroundColor( back ); - fore = parentWidget()->colorGroup().text(); + fore = tqparentWidget()->tqcolorGroup().text(); setPaletteForegroundColor( fore ); setTitle( title ); } -struct CoverPopup : public QWidget +struct CoverPopup : public TQWidget { - CoverPopup(const QPixmap &image, const QPoint &p) : - QWidget(0, 0, WDestructiveClose | WX11BypassWM) + CoverPopup(const TQPixmap &image, const TQPoint &p) : + TQWidget(0, 0, WDestructiveClose | WX11BypassWM) { - QHBoxLayout *layout = new QHBoxLayout(this); - QLabel *label = new QLabel(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQLabel *label = new TQLabel(this); - layout->addWidget(label); - label->setFrameStyle(QFrame::Box | QFrame::Raised); + tqlayout->addWidget(label); + label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setLineWidth(1); label->setPixmap(image); setGeometry(p.x(), p.y(), label->width(), label->height()); show(); } - virtual void leaveEvent(QEvent *) { close(); } - virtual void mouseReleaseEvent(QMouseEvent *) { close(); } + virtual void leaveEvent(TQEvent *) { close(); } + virtual void mouseReleaseEvent(TQMouseEvent *) { close(); } }; -CoverFrame::CoverFrame( QWidget *parent ) : QFrame( parent ) +CoverFrame::CoverFrame( TQWidget *tqparent ) : TQFrame( tqparent ) { imagePath = ""; - QString path = locate("appdata", "nocover.png"); + TQString path = locate("appdata", "nocover.png"); if ( !path ) path = locate("data", "kaffeine/nocover.png"); - noCoverPix.convertFromImage( QImage(path) ); + noCoverPix.convertFromImage( TQImage(path) ); setPaletteBackgroundPixmap( noCoverPix ); } @@ -198,12 +198,12 @@ CoverFrame::~CoverFrame() { } -void CoverFrame::setCoverPixmap( const QString &path ) +void CoverFrame::setCoverPixmap( const TQString &path ) { - QPixmap pix; - QImage img; + TQPixmap pix; + TQImage img; - img = QImage( path ); + img = TQImage( path ); if ( !img.isNull() ) { img = img.smoothScale( 80, 80 ); pix.convertFromImage( img ); @@ -216,10 +216,10 @@ void CoverFrame::setCoverPixmap( const QString &path ) } } -void CoverFrame::popup( const QPixmap &pix ) const +void CoverFrame::popup( const TQPixmap &pix ) const { - QPoint mouse = QCursor::pos(); - QRect desktop = KApplication::desktop()->screenGeometry(mouse); + TQPoint mouse = TQCursor::pos(); + TQRect desktop = KApplication::desktop()->screenGeometry(mouse); int x = mouse.x(); int y = mouse.y(); int height = pix.height() + 4; @@ -241,28 +241,28 @@ void CoverFrame::popup( const QPixmap &pix ) const else y = (y - desktop.y() > desktop.height() - 10) ? desktop.height() - height + desktop.y() : (y - height + 10); - new CoverPopup( pix, QPoint(x, y) ); + new CoverPopup( pix, TQPoint(x, y) ); } -void CoverFrame::mousePressEvent( QMouseEvent *e ) +void CoverFrame::mousePressEvent( TQMouseEvent *e ) { int i; - QPixmap pix; + TQPixmap pix; switch ( e->button() ) { - case LeftButton: { + case Qt::LeftButton: { if ( imagePath.isEmpty() ) break; - pix.convertFromImage( QImage( imagePath ) ); + pix.convertFromImage( TQImage( imagePath ) ); if ( !pix.isNull() ) popup( pix ); break; } - case RightButton: { - QPopupMenu pop( this ); + case Qt::RightButton: { + TQPopupMenu pop( this ); pop.insertItem( i18n("Choose a Cover..."), 1 ); pop.insertItem( i18n("Gallery..."), 2 ); - i = pop.exec( QCursor::pos() ); + i = pop.exec( TQCursor::pos() ); if ( i==1 ) emit changeCurrentCover(); else if ( i==2 ) @@ -275,27 +275,27 @@ void CoverFrame::mousePressEvent( QMouseEvent *e ) } -PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : KaffeineInput(objParent , name), +PlayList::PlayList( TQWidget* tqparent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name), m_playTime(0), m_playTimeVisible(0), m_countVisible(0), m_searchSelection(false), m_metaOnLoading(true), m_sortAscending(true), m_currentEntry(NULL), m_currentRandomListEntry(-1), m_endless(false), m_random(false), m_useAlternateEncoding(false), m_alternateEncoding("ISO 8859-1") { google = NULL; - mainWidget = new QVBox( parent ); - //mainWidget->setSizePolicy( QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred) ); - hSplit = new QSplitter( mainWidget ); + mainWidget = new TQVBox( tqparent ); + //mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); + hSplit = new TQSplitter( mainWidget ); hSplit->setOpaqueResize( true ); - panel = new QVBox( hSplit ); - playlist = new QWidget( hSplit ); + panel = new TQVBox( hSplit ); + playlist = new TQWidget( hSplit ); hSplit->moveToFirst( panel ); - hSplit->setResizeMode( panel, QSplitter::KeepSize ); + hSplit->setResizeMode( panel, TQSplitter::KeepSize ); - vSplit = new QSplitter( QSplitter::Vertical, panel ); + vSplit = new TQSplitter( Qt::Vertical, panel ); vSplit->setOpaqueResize( true ); - QWidget *vb = new QWidget( vSplit ); + TQWidget *vb = new TQWidget( vSplit ); KToolBar *tb = new KToolBar( vb ); - QVBoxLayout *v = new QVBoxLayout( vb, 0, 0 ); + TQVBoxLayout *v = new TQVBoxLayout( vb, 0, 0 ); v->addWidget( tb ); tb->setIconSize( 16 ); @@ -303,7 +303,7 @@ PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : Ka browserComb->setCompletionObject( new KURLCompletion( KURLCompletion::DirCompletion ) ); browserComb->setAutoDeleteCompletionObject( true ); browserComb->setMaxItems( 10 ); - browserComb->setFocusPolicy(QWidget::ClickFocus); + browserComb->setFocusPolicy(TQ_ClickFocus); /* if (!m_medium) @@ -311,7 +311,7 @@ PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : Ka else m_combo->lineEdit()->setText( "/" );*/ - QVBoxLayout *v1 = new QVBoxLayout( 0, 3, 3 ); + TQVBoxLayout *v1 = new TQVBoxLayout( 0, 3, 3 ); v1->addWidget( browserComb ); fileBrowser = new KDirOperator( KURL("/"), vb ); fileBrowser->setupMenu( KDirOperator::SortActions|KDirOperator::NavActions|KDirOperator::ViewActions ); @@ -332,7 +332,7 @@ PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : Ka col->action( "home" )->plug( tb ); vSplit->moveToFirst( vb ); - playerBox = new QVBox( vSplit ); + playerBox = new TQVBox( vSplit ); playerBox->setMinimumHeight( 50 ); playerBox->setMinimumWidth( 200 ); vSplit->moveToLast( playerBox ); @@ -342,14 +342,14 @@ PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : Ka KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget); kdDebug() << "PLAYLIST" << endl; - QGridLayout* layout = new QGridLayout( playlist, 4, 2, 3 ); + TQGridLayout* tqlayout = new TQGridLayout( playlist, 4, 2, 3 ); m_list = new UrlListView(playlist); mainWidget->setAcceptDrops(true); m_list->setHScrollBarMode(KListView::AlwaysOff); m_list->setItemMargin(2); m_list->setMargin(0); - m_list->setSelectionMode(QListView::Extended); + m_list->setSelectionMode(TQListView::Extended); m_list->addColumn(""); m_list->addColumn(i18n("Title")); m_list->addColumn(i18n("Artist")); @@ -357,13 +357,13 @@ PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : Ka m_list->addColumn(i18n("Track")); m_list->addColumn(i18n("Length")); m_list->setShowToolTips(true); - m_list->setColumnWidthMode(MIME_COLUMN, QListView::Manual); - m_list->setColumnWidthMode(TITLE_COLUMN, QListView::Manual); - m_list->setColumnWidthMode(ARTIST_COLUMN, QListView::Manual); - m_list->setColumnWidthMode(ALBUM_COLUMN, QListView::Manual); - m_list->setColumnWidthMode(TRACK_COLUMN, QListView::Manual); - m_list->setColumnWidthMode(LENGTH_COLUMN, QListView::Manual); - m_list->setResizeMode(QListView::NoColumn); + m_list->setColumnWidthMode(MIME_COLUMN, TQListView::Manual); + m_list->setColumnWidthMode(TITLE_COLUMN, TQListView::Manual); + m_list->setColumnWidthMode(ARTIST_COLUMN, TQListView::Manual); + m_list->setColumnWidthMode(ALBUM_COLUMN, TQListView::Manual); + m_list->setColumnWidthMode(TRACK_COLUMN, TQListView::Manual); + m_list->setColumnWidthMode(LENGTH_COLUMN, TQListView::Manual); + m_list->setResizeMode(TQListView::NoColumn); KConfig* config = kapp->config(); m_list->restoreLayout(config, "Playlist Layout"); m_list->setFullWidth(true); @@ -379,44 +379,44 @@ PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : Ka m_list->setRenameable(TRACK_COLUMN); m_list->setAllColumnsShowFocus(true); m_list->setShowSortIndicator(true); - layout->addMultiCellWidget(m_list, 3, 3, 0, 1); + tqlayout->addMultiCellWidget(m_list, 3, 3, 0, 1); coverFrame = new CoverFrame( playlist ); coverFrame->setFixedWidth( 80 ); coverFrame->setFixedHeight( 80 ); - layout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); + tqlayout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); - QHBoxLayout *h1 = new QHBoxLayout(); - searchBtn = new QToolButton( playlist ); + TQHBoxLayout *h1 = new TQHBoxLayout(); + searchBtn = new TQToolButton( playlist ); searchBtn->setAutoRaise( true ); - QToolTip::add( searchBtn, i18n("Search")); + TQToolTip::add( searchBtn, i18n("Search")); searchBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("locationbar_erase", KIcon::Small) ); h1->addWidget( searchBtn ); - QLabel* filterLabel = new QLabel(i18n("Filter") + ":", playlist); + TQLabel* filterLabel = new TQLabel(i18n("Filter") + ":", playlist); h1->addWidget(filterLabel); m_playlistFilter = new KLineEdit(playlist); - m_playlistFilter->setFocusPolicy(QWidget::ClickFocus); + m_playlistFilter->setFocusPolicy(TQ_ClickFocus); h1->addWidget(m_playlistFilter); - layout->addLayout( h1, 2, 1 ); + tqlayout->addLayout( h1, 2, 1 ); - QHBoxLayout *h2 = new QHBoxLayout(); - QLabel* playlistLabel = new QLabel(i18n("Playlist:"), playlist); + TQHBoxLayout *h2 = new TQHBoxLayout(); + TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist); h2->addWidget(playlistLabel); m_playlistSelector = new KComboBox( playlist ); m_playlistSelector->setMinimumWidth(10); - m_playlistSelector->setSizePolicy( QSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::Preferred) ); + m_playlistSelector->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) ); m_playlistSelector->setEditable(true); m_playlistSelector->setDuplicatesEnabled(false); - m_playlistSelector->setFocusPolicy(QWidget::ClickFocus); - QToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'.")); + m_playlistSelector->setFocusPolicy(TQ_ClickFocus); + TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'.")); h2->addWidget(m_playlistSelector); - layout->addLayout( h2, 1, 1 ); + tqlayout->addLayout( h2, 1, 1 ); roller = new RollTitle( playlist ); - layout->addWidget( roller, 0, 1 ); + tqlayout->addWidget( roller, 0, 1 ); KAccel* accel = new KAccel(mainWidget); - accel->insert("Delete selected", Qt::Key_Delete, this, SLOT(slotRemoveSelected())); + accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected())); m_isCurrentEntry = UserIcon("playing"); m_cdPixmap = KGlobal::iconLoader()->loadIcon("cdtrack", KIcon::Small); @@ -424,10 +424,10 @@ PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : Ka setXMLFile("kaffeineplaylist.rc"); setupActions(); - QStrList formats = QImageIO::outputFormats(); + TQStrList formats = TQImageIO::outputFormats(); coverImageFormat = "PNG"; for (int i=0; i<(int)formats.count(); i++ ) { - if ( QString(formats.at(i))=="JPEG" ) { + if ( TQString(formats.at(i))=="JPEG" ) { coverImageFormat = "JPEG"; break; } @@ -435,28 +435,28 @@ PlayList::PlayList( QWidget* parent, QObject *objParent, const char *name ) : Ka loadConfig( KGlobal::config() ); - connect(coverFrame, SIGNAL(changeCurrentCover()), this, SLOT(chooseCurrentCover())); - connect(coverFrame, SIGNAL(gallery()), this, SLOT(showGallery())); - connect(browserComb, SIGNAL(urlActivated( const KURL& )), this, SLOT(setBrowserURL( const KURL& ))); - connect(browserComb, SIGNAL(returnPressed( const QString& )), this, SLOT(setBrowserURL( const QString& ))); - connect(fileBrowser, SIGNAL(urlEntered( const KURL& )), this, SLOT(browserURLChanged( const KURL& ))); - connect(fileBrowser, SIGNAL(fileSelected(const KFileItem*)), this, SLOT(fileSelected(const KFileItem*))); - connect(m_playlistFilter, SIGNAL(textChanged(const QString&)), this, SLOT(slotFindText(const QString&))); - connect( searchBtn, SIGNAL(clicked()), this, SLOT(resetSearch()) ); - connect(m_playlistSelector, SIGNAL(returnPressed(const QString&)), this, SLOT(slotNewPlaylistName(const QString&))); - connect(m_playlistSelector, SIGNAL(activated(int)),this, SLOT(slotPlaylistActivated(int))); - connect(m_list, SIGNAL(dropped(QDropEvent*, QListViewItem*)), this, SLOT(slotDropEvent(QDropEvent*, QListViewItem*))); - connect(m_list, SIGNAL(aboutToMove()), this, SLOT(slotPreDropEvent())); - connect(m_list, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(slotPlayDirect(QListViewItem*))); - connect(m_list, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(slotPlayDirect(QListViewItem*))); - connect(m_list, SIGNAL(signalCut()), this, SLOT(slotCut())); - connect(m_list, SIGNAL(signalCopy()), this, SLOT(slotCopy())); - connect(m_list, SIGNAL(signalPaste()), this, SLOT(slotPaste())); - connect(m_list, SIGNAL(signalSelectAll()), this, SLOT(slotSelectAll())); - connect(m_list, SIGNAL(signalPlayItem(QListViewItem*)), this, SLOT(slotPlayDirect(QListViewItem*))); - connect(m_list, SIGNAL(signalPlaylistFromSelected()), this, SLOT(slotPlaylistFromSelected())); - connect(m_list, SIGNAL(signalAddToQueue(MRL)), this, SLOT(slotAddToQueue(MRL))); - connect(m_list->header(), SIGNAL(clicked(int)), this, SLOT(slotSort(int))); + connect(coverFrame, TQT_SIGNAL(changeCurrentCover()), this, TQT_SLOT(chooseCurrentCover())); + connect(coverFrame, TQT_SIGNAL(gallery()), this, TQT_SLOT(showGallery())); + connect(browserComb, TQT_SIGNAL(urlActivated( const KURL& )), this, TQT_SLOT(setBrowserURL( const KURL& ))); + connect(browserComb, TQT_SIGNAL(returnPressed( const TQString& )), this, TQT_SLOT(setBrowserURL( const TQString& ))); + connect(fileBrowser, TQT_SIGNAL(urlEntered( const KURL& )), this, TQT_SLOT(browserURLChanged( const KURL& ))); + connect(fileBrowser, TQT_SIGNAL(fileSelected(const KFileItem*)), this, TQT_SLOT(fileSelected(const KFileItem*))); + connect(m_playlistFilter, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotFindText(const TQString&))); + connect( searchBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetSearch()) ); + connect(m_playlistSelector, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotNewPlaylistName(const TQString&))); + connect(m_playlistSelector, TQT_SIGNAL(activated(int)),this, TQT_SLOT(slotPlaylistActivated(int))); + connect(m_list, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQT_SLOT(slotDropEvent(TQDropEvent*, TQListViewItem*))); + connect(m_list, TQT_SIGNAL(aboutToMove()), this, TQT_SLOT(slotPreDropEvent())); + connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(slotPlayDirect(TQListViewItem*))); + connect(m_list, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotPlayDirect(TQListViewItem*))); + connect(m_list, TQT_SIGNAL(signalCut()), this, TQT_SLOT(slotCut())); + connect(m_list, TQT_SIGNAL(signalCopy()), this, TQT_SLOT(slotCopy())); + connect(m_list, TQT_SIGNAL(signalPaste()), this, TQT_SLOT(slotPaste())); + connect(m_list, TQT_SIGNAL(signalSelectAll()), this, TQT_SLOT(slotSelectAll())); + connect(m_list, TQT_SIGNAL(signalPlayItem(TQListViewItem*)), this, TQT_SLOT(slotPlayDirect(TQListViewItem*))); + connect(m_list, TQT_SIGNAL(signalPlaylistFromSelected()), this, TQT_SLOT(slotPlaylistFromSelected())); + connect(m_list, TQT_SIGNAL(signalAddToQueue(MRL)), this, TQT_SLOT(slotAddToQueue(MRL))); + connect(m_list->header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSort(int))); } void PlayList::togglePanel() @@ -467,24 +467,24 @@ void PlayList::togglePanel() panel->hide(); } -void PlayList::getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames ) +void PlayList::getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames ) { uiNames.append( i18n("Play Playlist") ); iconNames.append( "view_text" ); targetNames.append( "PLAYLIST" ); } -bool PlayList::execTarget( const QString &target ) +bool PlayList::execTarget( const TQString &target ) { if ( target=="PLAYLIST" ) { emit showMe( this ); - QTimer::singleShot( 100, this, SLOT(startPlaylist()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(startPlaylist()) ); return true; } return false; } -void PlayList::setFileFilter( const QString& filter ) +void PlayList::setFileFilter( const TQString& filter ) { m_fileFilter = filter; fileBrowser->setNameFilter( m_fileFilter ); @@ -497,19 +497,19 @@ PlayList::~PlayList() void PlayList::setupActions() { - m_repeat = new KToggleAction(i18n("&Repeat"), 0 , CTRL|Key_E, this, SLOT(slotRepeat()), actionCollection(),"playlist_repeat"); + m_repeat = new KToggleAction(i18n("&Repeat"), 0 , CTRL|Key_E, this, TQT_SLOT(slotRepeat()), actionCollection(),"playlist_repeat"); m_repeat->setStatusText(i18n("Loop playlist")); - m_shuffle = new KToggleAction(i18n("Sh&uffle"), 0 , CTRL|Key_R, this, SLOT(slotShuffle()), actionCollection(),"playlist_shuffle"); + m_shuffle = new KToggleAction(i18n("Sh&uffle"), 0 , CTRL|Key_R, this, TQT_SLOT(slotShuffle()), actionCollection(),"playlist_shuffle"); m_shuffle->setStatusText(i18n("Play items in random order")); - m_autoCover = new KToggleAction(i18n("Autodownload covers"), 0 , 0, this, SLOT(slotAutoCover()), actionCollection(),"playlist_autocover"); + m_autoCover = new KToggleAction(i18n("Autodownload covers"), 0 , 0, this, TQT_SLOT(slotAutoCover()), actionCollection(),"playlist_autocover"); m_autoCover->setStatusText(i18n("Automatic dowloading of covers")); - m_showPlayer = new KToggleAction(i18n("Don't switch to player window"), 0 , 0, this, SLOT(slotShowPlayer()), actionCollection(),"playlist_showplayer"); + m_showPlayer = new KToggleAction(i18n("Don't switch to player window"), 0 , 0, this, TQT_SLOT(slotShowPlayer()), actionCollection(),"playlist_showplayer"); m_showPlayer->setStatusText(i18n("Don't switch automatically to player window")); - new KAction(i18n("&Clear Current Playlist"), "eraser", 0, this, SLOT(slotClearList()), actionCollection(), "playlist_clear"); - new KAction(i18n("Ne&w Playlist"), "filenew", 0, this, SLOT(slotNewList()), actionCollection(), "playlist_new"); - new KAction(i18n("&Import Playlist..."), "project_open", 0, this, SLOT(slotPlaylistLoad()), actionCollection(), "playlist_load"); - new KAction(i18n("&Save Current Playlist As..."), "filesaveas", 0, this, SLOT(slotPlaylistSaveAs()), actionCollection(), "playlist_save_as"); - new KAction(i18n("Re&move Current Playlist"), "fileclose", 0, this, SLOT(slotPlaylistRemove()), actionCollection(), "playlist_remove"); + new KAction(i18n("&Clear Current Playlist"), "eraser", 0, this, TQT_SLOT(slotClearList()), actionCollection(), "playlist_clear"); + new KAction(i18n("Ne&w Playlist"), "filenew", 0, this, TQT_SLOT(slotNewList()), actionCollection(), "playlist_new"); + new KAction(i18n("&Import Playlist..."), "project_open", 0, this, TQT_SLOT(slotPlaylistLoad()), actionCollection(), "playlist_load"); + new KAction(i18n("&Save Current Playlist As..."), "filesaveas", 0, this, TQT_SLOT(slotPlaylistSaveAs()), actionCollection(), "playlist_save_as"); + new KAction(i18n("Re&move Current Playlist"), "fileclose", 0, this, TQT_SLOT(slotPlaylistRemove()), actionCollection(), "playlist_remove"); } void PlayList::slotClearList() @@ -544,8 +544,8 @@ void PlayList::slotToggleShuffle() void PlayList::slotPlaylistLoad() { - QString path = KFileDialog::getOpenFileName(":kaffeine_openPlaylist", QString("*.kaffeine|") + i18n("Kaffeine Playlists") + "\n*.*|" + i18n("All Files"), 0, i18n("Open Playlist")); - if (path.isEmpty() || (!path.contains(".kaffeine", false))) + TQString path = KFileDialog::getOpenFileName(":kaffeine_openPlaylist", TQString("*.kaffeine|") + i18n("Kaffeine Playlists") + "\n*.*|" + i18n("All Files"), 0, i18n("Open Playlist")); + if (path.isEmpty() || (!path.tqcontains(".kaffeine", false))) return; loadPlaylist(path); @@ -553,12 +553,12 @@ void PlayList::slotPlaylistLoad() void PlayList::slotPlaylistSaveAs() { - QString startPath = ":kaffeine_savePlaylist"; + TQString startPath = ":kaffeine_savePlaylist"; //if (!lastPlaylist.isEmpty()) startPath = lastPlaylist; - QString path = KFileDialog::getSaveFileName(startPath, - QString("*.kaffeine|") + i18n("Kaffeine Playlists") + "\n" + - QString("*.m3u|") + i18n("M3U Playlists") + "\n" + - QString("*.pls|") + i18n("PLS Playlists") + "\n" + + TQString path = KFileDialog::getSaveFileName(startPath, + TQString("*.kaffeine|") + i18n("Kaffeine Playlists") + "\n" + + TQString("*.m3u|") + i18n("M3U Playlists") + "\n" + + TQString("*.pls|") + i18n("PLS Playlists") + "\n" + "*.*|" + i18n("All Files"), 0, i18n("Save Playlist")); if ( path.isEmpty() ) @@ -580,19 +580,19 @@ void PlayList::slotPlaylistRemove() removeCurrentPlaylist(); } -QWidget* PlayList::wantPlayerWindow() +TQWidget* PlayList::wantPlayerWindow() { return playerBox; } -QWidget* PlayList::inputMainWidget() +TQWidget* PlayList::inputMainWidget() { return mainWidget; } void PlayList::loadConfig(KConfig* config) { - QValueList<int> sl; + TQValueList<int> sl; bool b; config->setGroup("Playlist"); @@ -617,7 +617,7 @@ void PlayList::loadConfig(KConfig* config) hSplit->setSizes( sl ); } vSplit->setSizes( config->readIntListEntry("VSplitSizes") ); - QStringList list; + TQStringList list; list = config->readListEntry("Playlists"); if (!list.count()) { @@ -632,10 +632,10 @@ void PlayList::loadConfig(KConfig* config) m_playlistSelector->setCurrentItem(m_currentPlaylist); add(m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine", NULL); m_nextPlaylistNumber = config->readNumEntry("Next Playlist", 2); - QString currentEntry = config->readEntry("Current Entry", QString()); + TQString currentEntry = config->readEntry("Current Entry", TQString()); if ((!currentEntry.isEmpty()) && (m_list->childCount())) { - QListViewItem* tmp = findByURL(currentEntry); + TQListViewItem* tmp = findByURL(currentEntry); if (tmp) setCurrentEntry(tmp, false); } @@ -659,8 +659,8 @@ void PlayList::saveConfig(KConfig* config) config->writeEntry("DontShowPlayer", m_showPlayer->isChecked()); config->writeEntry( "HSplitSizes", hSplit->sizes() ); config->writeEntry( "VSplitSizes", vSplit->sizes() ); - QStringList list; - QString text; + TQStringList list; + TQString text; for (uint i=0; i < m_playlistSelector->listBox()->count(); i++) { text = m_playlistSelector->text(i); @@ -676,7 +676,7 @@ void PlayList::saveConfig(KConfig* config) config->writeEntry( "FileBrowserURL", fileBrowser->url().url() ); } -void PlayList::closeEvent(QCloseEvent* ce) +void PlayList::closeEvent(TQCloseEvent* ce) { kdDebug() << "Playlist: close Event" << endl; ce->ignore(); @@ -706,7 +706,7 @@ MRL PlayList::getCurrent() if (isQueueMode()) { m_queue.clear(); - updateStatus(); + updatetqStatus(); } if (m_random) @@ -747,7 +747,7 @@ bool PlayList::nextTrack( MRL &mrl ) { mrl = m_queue.first(); m_queue.remove(m_queue.begin()); - updateStatus(); + updatetqStatus(); return true; } @@ -775,7 +775,7 @@ bool PlayList::nextTrack( MRL &mrl ) return true; } - QListViewItem* tmpItem; + TQListViewItem* tmpItem; tmpItem = m_currentEntry->itemBelow(); if (tmpItem) @@ -802,7 +802,7 @@ bool PlayList::previousTrack( MRL &mrl ) if (isQueueMode()) { m_queue.clear(); - updateStatus(); + updatetqStatus(); } if (!m_currentEntry) { @@ -827,7 +827,7 @@ bool PlayList::previousTrack( MRL &mrl ) return true; } - QListViewItem* tmpItem; + TQListViewItem* tmpItem; tmpItem = m_currentEntry->itemAbove(); if (tmpItem) { @@ -851,7 +851,7 @@ bool PlayList::trackNumber( int number, MRL &mrl ) if (number > m_list->childCount()) return false; - QListViewItem * item = m_list->firstChild(); + TQListViewItem * item = m_list->firstChild(); for (int i = 1; i < number; i++) item = item->nextSibling(); @@ -860,19 +860,19 @@ bool PlayList::trackNumber( int number, MRL &mrl ) return true; } -QListViewItem* PlayList::getLast() +TQListViewItem* PlayList::getLast() { return m_list->lastItem(); } -QListViewItem* PlayList::getFirst() +TQListViewItem* PlayList::getFirst() { return m_list->firstChild(); } -QListViewItem* PlayList::findByURL(const QString& url) +TQListViewItem* PlayList::findByURL(const TQString& url) { - QListViewItemIterator it(m_list); + TQListViewItemIterator it(m_list); while (it.current()) { if (dynamic_cast<PlaylistItem*>(*it)->url() == url) @@ -888,14 +888,14 @@ QListViewItem* PlayList::findByURL(const QString& url) /********* set current entry (with play icon) ****************/ -void PlayList::setCurrentEntry(QListViewItem* item, bool playIcon) +void PlayList::setCurrentEntry(TQListViewItem* item, bool playIcon) { PlaylistItem* newItem = dynamic_cast<PlaylistItem*>(item); PlaylistItem* oldItem = dynamic_cast<PlaylistItem*>(m_currentEntry); if (m_currentEntry) { oldItem->setPlaying(false); - m_currentEntry->setPixmap(TITLE_COLUMN, QPixmap()); + m_currentEntry->setPixmap(TITLE_COLUMN, TQPixmap()); } if (playIcon) { @@ -904,7 +904,7 @@ void PlayList::setCurrentEntry(QListViewItem* item, bool playIcon) } m_currentEntry = item; if (m_random) - m_currentRandomListEntry = m_randomList.find(item); + m_currentRandomListEntry = m_randomList.tqfind(item); m_currentEntryMRL = newItem->toMRL(); roller->setTitle( m_currentEntryMRL ); m_list->setCurrentItem(m_currentEntry); @@ -912,13 +912,13 @@ void PlayList::setCurrentEntry(QListViewItem* item, bool playIcon) m_list->ensureVisible(10, m_list->itemPos(m_currentEntry), 10, 30); } -QListViewItem* PlayList::insertItem(QListViewItem* after, const MRL& m) +TQListViewItem* PlayList::insertItem(TQListViewItem* after, const MRL& m) { PlaylistItem* tmp = NULL; MRL mrl(m); m_list->setSorting(-1); - QListViewItemIterator it(m_list); + TQListViewItemIterator it(m_list); while (it.current()) { if (dynamic_cast<PlaylistItem*>(*it)->url() == mrl.url()) @@ -943,14 +943,14 @@ QListViewItem* PlayList::insertItem(QListViewItem* after, const MRL& m) else tmp->setPixmap(MIME_COLUMN, KMimeType::mimeType(mrl.mime())->pixmap(KIcon::Small)); - if (tmp->length().contains(':')) + if (tmp->length().tqcontains(':')) m_playTime += timeStringToMs(tmp->length()); if (m_searchSelection) { - QString text = m_playlistFilter->text(); - if ((!tmp->title().contains(text, false)) && (!tmp->url().contains(text, false)) - && (!tmp->artist().contains(text, false)) && (!tmp->album().contains(text, false))) + TQString text = m_playlistFilter->text(); + if ((!tmp->title().tqcontains(text, false)) && (!tmp->url().tqcontains(text, false)) + && (!tmp->artist().tqcontains(text, false)) && (!tmp->album().tqcontains(text, false))) { tmp->setVisible(false); } @@ -958,7 +958,7 @@ QListViewItem* PlayList::insertItem(QListViewItem* after, const MRL& m) if (tmp->isVisible()) { - if (tmp->length().contains(':')); + if (tmp->length().tqcontains(':')); m_playTimeVisible += timeStringToMs(tmp->length()); m_countVisible++; } @@ -970,15 +970,15 @@ void PlayList::fileSelected( const KFileItem *item ) { if ( !item ) return; - add( QStringList( item->url().path() ), NULL ); - QListViewItem* tmp = findByURL(item->url().path()); + add( TQStringList( item->url().path() ), NULL ); + TQListViewItem* tmp = findByURL(item->url().path()); if (tmp) { setCurrentEntry(tmp); emit play(m_currentEntryMRL, this); } } -void PlayList::setBrowserURL( const QString &path ) +void PlayList::setBrowserURL( const TQString &path ) { fileBrowser->setURL( KURL(path), true ); } @@ -990,41 +990,41 @@ void PlayList::setBrowserURL( const KURL &path ) void PlayList::browserURLChanged( const KURL &u ) { - QString url; + TQString url; if ( u.isLocalFile() ) url = u.path(); else url = u.prettyURL(); - QStringList urls = browserComb->urls(); + TQStringList urls = browserComb->urls(); urls.remove( url ); // do not duplicate urls.prepend( url ); browserComb->setURLs( urls, KURLComboBox::RemoveBottom ); } -void PlayList::add(const QString& url, QListViewItem* after) +void PlayList::add(const TQString& url, TQListViewItem* after) { - add(QStringList(url), after); + add(TQStringList(url), after); } -void PlayList::add(const QStringList& urlList, QListViewItem* after) +void PlayList::add(const TQStringList& urlList, TQListViewItem* after) { - QListViewItem* tmp = NULL; - QStringList urls(urlList); + TQListViewItem* tmp = NULL; + TQStringList urls(urlList); - QString ext; - QString subtitleURL; - QStringList subs; + TQString ext; + TQString subtitleURL; + TQStringList subs; KURL tmpKURL; bool playlist; MRL mrl; - QValueList<MRL> mrlList; - QString mediadevice=""; + TQValueList<MRL> mrlList; + TQString mediadevice=""; KProgressDialog* progress = NULL; - progress = new KProgressDialog(mainWidget, "importprogress", QString::null, i18n("Importing media resources...")); + progress = new KProgressDialog(mainWidget, "importprogress", TQString(), i18n("Importing media resources...")); progress->progressBar()->setTotalSteps(urls.count()); progress->show(); @@ -1033,26 +1033,26 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) for (uint i = 0; i < urls.count(); i++) { mrl = MRL(urls[i]); - QString url(mrl.kurl().prettyURL()); + TQString url(mrl.kurl().prettyURL()); if (mrl.kurl().protocol() == "media" || url.startsWith("system:/media/")) { - QString mediaName; + TQString mediaName; if (url.startsWith("system:/media/")) mediaName = url.mid(14); else mediaName = url.mid(7); - int slash = mediaName.find("/"); - QString filePath(mediaName.mid(slash)); + int slash = mediaName.tqfind("/"); + TQString filePath(mediaName.mid(slash)); if (filePath == "/") filePath = ""; mediaName = mediaName.left(slash); DCOPRef mediamanager("kded","mediamanager"); - DCOPReply reply = mediamanager.call("properties(QString)",mediaName); + DCOPReply reply = mediamanager.call("properties(TQString)",mediaName); if (reply.isValid()) { - QStringList properties = reply; + TQStringList properties = reply; if (properties.isEmpty()) break; url = properties[6] + filePath; if (filePath.isEmpty()) @@ -1085,7 +1085,7 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) if (mrl.kurl().isLocalFile()) { - if (!QFile::exists(mrl.kurl().path())) + if (!TQFile::exists(mrl.kurl().path())) continue; mrl.setTitle(mrl.kurl().fileName()); mrl.setURL(mrl.kurl().path()); @@ -1099,7 +1099,7 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) /*********** determine extension and mime type ************/ ext = mrl.kurl().fileName(); - ext = ext.remove(0 , ext.findRev('.') +1).lower(); + ext = ext.remove(0 , ext.tqfindRev('.') +1).lower(); // kdDebug() << "Extension: " << ext << endl; //kdDebug() << "PlayList: Try to determine mime of: " << mrl.url() << endl; @@ -1122,32 +1122,32 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) mrlList.clear(); playlist = false; - QFile file(mrl.url()); + TQFile file(mrl.url()); file.open(IO_ReadOnly); - QTextStream stream(&file); - QString firstLine = stream.readLine(); - QString secondLine = stream.readLine(); + TQTextStream stream(&file); + TQString firstLine = stream.readLine(); + TQString secondLine = stream.readLine(); file.close(); - if (secondLine.contains("kaffeine", false)) + if (secondLine.tqcontains("kaffeine", false)) { kdDebug() << "PlayList: Try loading kaffeine playlist\n"; playlist = PlaylistImport::kaffeine(mrl.url(), mrlList); if (!playlist) continue; } - if (secondLine.contains("noatun", false)) + if (secondLine.tqcontains("noatun", false)) { kdDebug() << "PlayList: Try loading noatun playlist\n"; playlist = PlaylistImport::noatun(mrl.url(), mrlList); } - if (firstLine.contains("asx", false)) + if (firstLine.tqcontains("asx", false)) { kdDebug() << "PlayList: Try loading asx playlist\n"; playlist = PlaylistImport::asx(mrl.url(), mrlList); } - if ( (firstLine.contains("[playlist]", false)) || (ext == "pls") ) + if ( (firstLine.tqcontains("[playlist]", false)) || (ext == "pls") ) { kdDebug() << "PlayList: Try loading pls playlist\n"; playlist = PlaylistImport::pls(mrl.url(), mrlList); @@ -1159,8 +1159,8 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) } if (playlist) { - QValueList<MRL>::ConstIterator end(mrlList.end()); - for (QValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it) + TQValueList<MRL>::ConstIterator end(mrlList.end()); + for (TQValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it) after = insertItem(after, *it); continue; } @@ -1172,10 +1172,10 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) { mrlList.clear(); kdDebug() << "PlayList: Try loading ram playlist\n"; - if (PlaylistImport::ram(mrl, mrlList, mainWidget->parentWidget())) + if (PlaylistImport::ram(mrl, mrlList, mainWidget->tqparentWidget())) { - QValueList<MRL>::ConstIterator end(mrlList.end()); - for (QValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it) + TQValueList<MRL>::ConstIterator end(mrlList.end()); + for (TQValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it) after = insertItem(after, *it); continue; } @@ -1186,11 +1186,11 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) { kdDebug() << "PlayList: Add Directory: " << mrl.url() << endl; - QDir d(mrl.url()); + TQDir d(mrl.url()); uint x; /* subdirs */ - QStringList entryList = d.entryList(QDir::Dirs, QDir::Name); + TQStringList entryList = d.entryList(TQDir::Dirs, TQDir::Name); for (x = 0; x < entryList.count(); x++) { if (entryList[x][0] != '.') @@ -1202,14 +1202,14 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) /* Media files */ /* Exclude subtitles because they are examined twice : */ /* Once for movie and once per subtitle - very annoying*/ - QString fileFilter = m_fileFilter; + TQString fileFilter = m_fileFilter; fileFilter.remove("*.srt",false); fileFilter.remove("*.ssa",false); fileFilter.remove("*.txt",false); fileFilter.remove("*.asc",false); fileFilter.remove("*.smi",false); fileFilter.remove("*.sub",false); - entryList = d.entryList(fileFilter, QDir::Files, QDir::Name ); + entryList = d.entryList(fileFilter, TQDir::Files, TQDir::Name ); for (x = 0; x < entryList.count(); x++) { urls.append(mrl.url() + "/" + entryList[x]); @@ -1223,12 +1223,12 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) if ((ext == "srt") || (ext == "ssa") || (ext == "txt") || (ext == "asc") || (ext == "smi") || (ext == "sub")) { - QStringList movies; - QString movieURL; - QListViewItemIterator it(m_list); + TQStringList movies; + TQString movieURL; + TQListViewItemIterator it(m_list); while (it.current()) { - if (dynamic_cast<PlaylistItem*>(*it)->mime().contains("video")) + if (dynamic_cast<PlaylistItem*>(*it)->mime().tqcontains("video")) movies << dynamic_cast<PlaylistItem*>(*it)->url(); ++it; } @@ -1237,7 +1237,7 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) else if (movies.count() >= 2) { MovieChooser *mc = new MovieChooser(movies, mrl.url(), mainWidget); - if(mc->exec() == QDialog::Accepted) + if(mc->exec() == TQDialog::Accepted) movieURL = mc->getSelection(); delete mc; } @@ -1263,18 +1263,18 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) * those starting with a different name than the movie, * prompt the user to select a sub */ - if (mime->name().contains("video")) + if (mime->name().tqcontains("video")) { kdDebug() << "PlayList: Check for subtitle files" << endl; - subtitleURL = QString::null; - QDir *d = new QDir(mrl.url().section('/',0,-2)); - QString filename = mrl.url().section('/',-1,-1); - subs = QStringList(); + subtitleURL = TQString(); + TQDir *d = new TQDir(mrl.url().section('/',0,-2)); + TQString filename = mrl.url().section('/',-1,-1); + subs = TQStringList(); //Do a case insensitive search for subs - QStringList dirListing = d->entryList(QDir::Files|QDir::NoSymLinks); //cache directory listing + TQStringList dirListing = d->entryList(TQDir::Files|TQDir::NoSymLinks); //cache directory listing bool matches = false; - QStringList::Iterator end(dirListing.end()); - for(QStringList::Iterator it = dirListing.begin(); it != end; ++it ) + TQStringList::Iterator end(dirListing.end()); + for(TQStringList::Iterator it = dirListing.begin(); it != end; ++it ) { if(startsWith(*it, filename.section('.',0,-2), false)) //If filenames (without extensions) match { @@ -1293,10 +1293,10 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) if((subs.count() > 1)) { subs.prepend(i18n("(no subtitles)")); subs.append(i18n("Other subtitle...")); - subtitleURL = QString::null; + subtitleURL = TQString(); SubtitleChooser *sc = new SubtitleChooser(subs, filename, mainWidget); - THERE: if(sc->exec() == QDialog::Accepted) + THERE: if(sc->exec() == TQDialog::Accepted) { if((sc->getSelection() != i18n("(no subtitles)")) && (sc->getSelection() != i18n("Other subtitle..."))) subtitleURL = d->path()+"/"+sc->getSelection(); @@ -1305,7 +1305,7 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) subtitleURL = KFileDialog::getOpenURL(d->path(), i18n("*.smi *.srt *.sub *.txt *.ssa *.asc|Subtitle Files\n*.*|All Files"), 0, i18n("Select Subtitle File")).path(); if(subtitleURL.isEmpty()) { - subtitleURL = QString::null; + subtitleURL = TQString(); goto THERE; } else //The user has selected another sub, so add this to the list @@ -1331,7 +1331,7 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) if (!subtitleURL.isNull()) { kdDebug() << "PlayList: Use subtitle file: " << subtitleURL << " for: " << mrl.url() << endl; - mrl.setCurrentSubtitle(subs.findIndex(subtitleURL)); + mrl.setCurrentSubtitle(subs.tqfindIndex(subtitleURL)); } } } /* if localFile() */ @@ -1343,25 +1343,25 @@ void PlayList::add(const QStringList& urlList, QListViewItem* after) if ( progress->wasCancelled() ) break; progress->progressBar()->setProgress(i+1); - progress->setLabel(QString::number(i+1) + " / " + QString::number(progress->progressBar()->totalSteps()) + " " + i18n("Files")); + progress->setLabel(TQString::number(i+1) + " / " + TQString::number(progress->progressBar()->totalSteps()) + " " + i18n("Files")); KApplication::kApplication()->processEvents(); } delete progress; if (m_random) createRandomList(); - updateStatus(); + updatetqStatus(); } -void PlayList::add(const QValueList<MRL>& mrlList, QListViewItem* after) +void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after) { - QValueList<MRL>::ConstIterator end(mrlList.end()); - for (QValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it) + TQValueList<MRL>::ConstIterator end(mrlList.end()); + for (TQValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it) after = insertItem(after, *it); - updateStatus(); + updatetqStatus(); if (m_random) createRandomList(); } -void PlayList::slotPlayDirect(QListViewItem* item) +void PlayList::slotPlayDirect(TQListViewItem* item) { if (!item) return; @@ -1386,7 +1386,7 @@ void PlayList::createRandomList() m_randomList.clear(); m_currentRandomListEntry = 0; - QListViewItem* tmpItem = NULL; + TQListViewItem* tmpItem = NULL; tmpItem = m_list->firstChild(); if ( (tmpItem) && (!tmpItem->isVisible()) ) tmpItem = tmpItem->itemBelow(); @@ -1419,23 +1419,23 @@ void PlayList::clearList() m_playlistFilter->clear(); m_searchSelection = false; } - updateStatus(); + updatetqStatus(); m_currentEntry = NULL; m_currentRandomListEntry = -1; } -void PlayList::slotDropEvent(QDropEvent* dev, QListViewItem* after) +void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after) { - QStringList urls ,newurls; + TQStringList urls ,newurls; m_list->setSorting(-1); - if (QUriDrag::decodeLocalFiles(dev, urls)) + if (TQUriDrag::decodeLocalFiles(dev, urls)) { if (urls.count()) { for (uint i=0; i < urls.count() ;i++) { - //KURL url(QUriDrag::unicodeUriToUri(urls[i])); + //KURL url(TQUriDrag::tqunicodeUriToUri(urls[i])); //newurls << url.path(-1); //kdDebug() << "PlayList: Dropped " << url.path() << endl; newurls << urls[i]; @@ -1445,7 +1445,7 @@ void PlayList::slotDropEvent(QDropEvent* dev, QListViewItem* after) } else { - QUriDrag::decodeToUnicodeUris(dev, urls); + TQUriDrag::decodeToUnicodeUris(dev, urls); if (urls.count()) add(urls, after); } @@ -1453,8 +1453,8 @@ void PlayList::slotDropEvent(QDropEvent* dev, QListViewItem* after) else if (strcmp(dev->format(), "text/x-moz-url") == 0) /* for mozilla drops */ { - QByteArray data = dev->encodedData("text/plain"); - QString md(data); + TQByteArray data = dev->tqencodedData("text/plain"); + TQString md(data); add(md, after); } } @@ -1464,7 +1464,7 @@ void PlayList::slotPreDropEvent() m_list->setSorting(-1); } -void PlayList::slotSetAlternateColor( const QColor& col ) +void PlayList::slotSetAlternateColor( const TQColor& col ) { m_list->setAlternateBackground( col ); m_altCol = col; @@ -1476,30 +1476,30 @@ void PlayList::useAlternateEncoding(bool useEncoding) m_useAlternateEncoding = useEncoding; } -void PlayList::setAlternateEncoding(const QString& encoding) +void PlayList::setAlternateEncoding(const TQString& encoding) { m_alternateEncoding = encoding; } -void PlayList::getMetaInfo(MRL& mrl, const QString& mimeName) +void PlayList::getMetaInfo(MRL& mrl, const TQString& mimeName) { KFileMetaInfo* metaInfo = NULL; KFileMetaInfoGroup metaGroup; uint m, n; metaInfo = new KFileMetaInfo(mrl.url(), mimeName); - QStringList groups = metaInfo->groups(); - QStringList keys; - QString title; - QString artist; - QString album; + TQStringList groups = metaInfo->groups(); + TQStringList keys; + TQString title; + TQString artist; + TQString album; - QTextCodec *altCodec; - QTextCodec *CodecUtf8; + TQTextCodec *altCodec; + TQTextCodec *CodecUtf8; - altCodec = QTextCodec::codecForName(m_alternateEncoding.ascii()); - CodecUtf8 = QTextCodec::codecForName("UTF-8"); + altCodec = TQTextCodec::codecForName(m_alternateEncoding.ascii()); + CodecUtf8 = TQTextCodec::codecForName("UTF-8"); //kdDebug() << "playlist: locale " << Codec->name << " index: " << m_alternateEncoding << endl; for (m = 0; m < groups.count(); m++) @@ -1512,13 +1512,13 @@ void PlayList::getMetaInfo(MRL& mrl, const QString& mimeName) //kdDebug() << "Metainfo-Key: " << keys[n] << endl; if (keys[n] == "Length") { - mrl.setLength(QTime().addSecs(metaGroup.item(keys[n]).value().toUInt())); + mrl.setLength(TQTime().addSecs(metaGroup.item(keys[n]).value().toUInt())); } if (keys[n] == "Title") { title = metaGroup.item(keys[n]).value().toString().simplifyWhiteSpace(); - if ((!title.isEmpty()) && (title.contains(QRegExp("\\w")) > 2) && (title.left(5).lower() != "track")) + if ((!title.isEmpty()) && (title.tqcontains(TQRegExp("\\w")) > 2) && (title.left(5).lower() != "track")) { if ((m_useAlternateEncoding) && (CodecUtf8->heuristicContentMatch(title.ascii(), title.length()) < 0)) { @@ -1581,7 +1581,7 @@ void PlayList::mergeMeta(const MRL& mrl) { if (!m_currentEntry) return; PlaylistItem* tmp = dynamic_cast<PlaylistItem*>(m_currentEntry); - bool addTime = (tmp->length() == QString("00:00:00")); + bool addTime = (tmp->length() == TQString("00:00:00")); if ((tmp) && (tmp->url() == mrl.url())) { tmp->setTitle(mrl.title()); @@ -1596,13 +1596,13 @@ void PlayList::mergeMeta(const MRL& mrl) } if (addTime) { - if (tmp->length().contains(':')); + if (tmp->length().tqcontains(':')); { m_playTime += timeStringToMs(tmp->length()); if (tmp->isVisible()) m_playTimeVisible += timeStringToMs(tmp->length()); - updateStatus(); + updatetqStatus(); } } @@ -1610,26 +1610,26 @@ void PlayList::mergeMeta(const MRL& mrl) setCover( mrl.artist().stripWhiteSpace(), mrl.album().stripWhiteSpace() ); } -GalleryDialog::GalleryDialog( QWidget *parent, GoogleFetcher *goog ) - : KDialogBase( parent, QString(i18n("Gallery")).latin1(), true, QString::null, Ok, NoDefault, true ) +GalleryDialog::GalleryDialog( TQWidget *tqparent, GoogleFetcher *goog ) + : KDialogBase( tqparent, TQString(i18n("Gallery")).latin1(), true, TQString(), Ok, NoDefault, true ) { google = goog; - hbox = new QHBox(this); - imageFrame = new QFrame( hbox ); + hbox = new TQHBox(this); + imageFrame = new TQFrame( hbox ); imageFrame->setFixedSize(500,500); setMainWidget(hbox); - connect( &next, SIGNAL(timeout()), this, SLOT(slotNext()) ); + connect( &next, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNext()) ); next.start(1000,true); } void GalleryDialog::slotNext() { - QPixmap pix; + TQPixmap pix; bool end; actionButton(Ok)->setEnabled(false); loop: - QImage img = google->galleryNext( end ); + TQImage img = google->galleryNext( end ); if ( end ) { slotOk(); return; @@ -1661,7 +1661,7 @@ void PlayList::showGallery() { if ( google ) return; - QString s = getCurrent().artist().stripWhiteSpace(); + TQString s = getCurrent().artist().stripWhiteSpace(); if ( s.isEmpty() ) return; google = new GoogleFetcher( s, "", true ); @@ -1671,20 +1671,20 @@ void PlayList::showGallery() google = NULL; } -void PlayList::setCover( QString s1, QString s2, bool forceFetch ) +void PlayList::setCover( TQString s1, TQString s2, bool forceFetch ) { if ( s1.isEmpty() || s2.isEmpty() ) { coverFrame->setCoverPixmap( "" ); return; } - QString s = locateLocal("appdata", ""); - QImage img; - QPixmap pix; - QString fname = s1+"_"+s2; - fname = fname.replace( QChar( '/' ), "_" ); + TQString s = locateLocal("appdata", ""); + TQImage img; + TQPixmap pix; + TQString fname = s1+"_"+s2; + fname = fname.tqreplace( TQChar( '/' ), "_" ); fname = fname.upper(); fname = s+"covers/"+fname; - if ( !forceFetch && QFile( fname ).exists() ) + if ( !forceFetch && TQFile( fname ).exists() ) coverFrame->setCoverPixmap( fname ); else { if ( !forceFetch ) @@ -1697,8 +1697,8 @@ void PlayList::setCover( QString s1, QString s2, bool forceFetch ) delete google; google = NULL; } - if ( !QDir( s+"covers" ).exists() ) - QDir().mkdir( s+"covers" ); + if ( !TQDir( s+"covers" ).exists() ) + TQDir().mkdir( s+"covers" ); if ( !pix.isNull() ) { img = pix.convertToImage(); img.save( fname, coverImageFormat.latin1() ); @@ -1707,7 +1707,7 @@ void PlayList::setCover( QString s1, QString s2, bool forceFetch ) coverFrame->setCoverPixmap( fname ); } else if ( !forceFetch && m_cover ) { - QString path = locate("appdata", "nocover.png"); + TQString path = locate("appdata", "nocover.png"); if ( !path ) path = locate("data", "kaffeine/nocover.png"); KIO::file_copy( KURL::fromPathOrURL( path ), KURL::fromPathOrURL( fname ), -1, true ); @@ -1735,7 +1735,7 @@ void PlayList::slotSort(int section) void PlayList::slotRemoveSelected() { - QPtrList<QListViewItem> selected; + TQPtrList<TQListViewItem> selected; if (m_currentEntry) if (m_currentEntry->isSelected()) @@ -1751,7 +1751,7 @@ void PlayList::slotRemoveSelected() { // kdDebug() << "Remove " << selected.at(i)->text(TITLE_COLUMN) << "\n"; item = dynamic_cast<PlaylistItem *>(selected.at(i)); - if (item->length().contains(':')) + if (item->length().tqcontains(':')) { m_playTime -= timeStringToMs(item->length()); m_playTimeVisible -= timeStringToMs(item->length()); @@ -1762,26 +1762,26 @@ void PlayList::slotRemoveSelected() } if (m_random) createRandomList(); - updateStatus(); + updatetqStatus(); } -void PlayList::updateStatus() +void PlayList::updatetqStatus() { - QString status; + TQString status; if (isQueueMode()) { - QTime total; - QValueList<MRL>::ConstIterator end(m_queue.end()); - for (QValueList<MRL>::ConstIterator it = m_queue.begin(); it != end; ++it) - total = total.addSecs(QTime().secsTo((*it).length())); - status = i18n("Queue: %1 Entries, Playtime: %2").arg(m_queue.count()).arg(total.toString("h:mm:ss")); + TQTime total; + TQValueList<MRL>::ConstIterator end(m_queue.end()); + for (TQValueList<MRL>::ConstIterator it = m_queue.begin(); it != end; ++it) + total = total.addSecs(TQTime().secsTo((*it).length())); + status = i18n("Queue: %1 Entries, Playtime: %2").tqarg(m_queue.count()).tqarg(total.toString("h:mm:ss")); } else { - //status = i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").arg(QString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible)).arg(QString::number(m_list->childCount())).arg(msToTimeString(m_playTime)); + //status = i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible)).tqarg(TQString::number(m_list->childCount())).tqarg(msToTimeString(m_playTime)); - status = i18n("Entries: %1, Playtime: %2").arg(QString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible)); + status = i18n("Entries: %1, Playtime: %2").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible)); } emit statusBarMessage(status); } @@ -1790,21 +1790,21 @@ void PlayList::slotNewList() { m_list->setSorting(-1); saveCurrentPlaylist(); - m_playlistSelector->insertItem(i18n("Playlist") + QString::number(m_nextPlaylistNumber), 0); + m_playlistSelector->insertItem(i18n("Playlist") + TQString::number(m_nextPlaylistNumber), 0); m_nextPlaylistNumber++; m_playlistSelector->setCurrentItem(0); m_currentPlaylist = 0; clearList(); } -void PlayList::setPlaylist(const QString& name, bool clear) +void PlayList::setPlaylist(const TQString& name, bool clear) { saveCurrentPlaylist(); if (clear) clearList(); int index = 0; - if (m_playlistSelector->listBox()->findItem(name)) - index = m_playlistSelector->listBox()->index(m_playlistSelector->listBox()->findItem(name)); + if (m_playlistSelector->listBox()->tqfindItem(name)) + index = m_playlistSelector->listBox()->index(m_playlistSelector->listBox()->tqfindItem(name)); else m_playlistSelector->insertItem(name, 0); m_playlistSelector->setCurrentItem(index); @@ -1814,7 +1814,7 @@ void PlayList::setPlaylist(const QString& name, bool clear) void PlayList::nextPlaylist() { int nextPlaylist = m_playlistSelector->currentItem(); - QString pl = NULL; + TQString pl = NULL; do { nextPlaylist++; @@ -1829,21 +1829,21 @@ void PlayList::nextPlaylist() m_playlistSelector->setCurrentItem(nextPlaylist); m_currentPlaylist = nextPlaylist; add(m_playlistDirectory + pl + ".kaffeine", NULL); - if (mainWidget->parentWidget()) - mainWidget->parentWidget()->setFocus(); + if (mainWidget->tqparentWidget()) + mainWidget->tqparentWidget()->setFocus(); } void PlayList::slotPlaylistActivated(int index) { kdDebug() << "PlayList: Switch to playlist: " << m_playlistSelector->text(index) << endl; - QString pl = m_playlistSelector->text(index); + TQString pl = m_playlistSelector->text(index); saveCurrentPlaylist(); clearList(); m_currentPlaylist = index; add(m_playlistDirectory + pl + ".kaffeine", NULL); - if (mainWidget->parentWidget()) - mainWidget->parentWidget()->setFocus(); + if (mainWidget->tqparentWidget()) + mainWidget->tqparentWidget()->setFocus(); /* if (!isQueueMode()) { getCurrent(); @@ -1851,16 +1851,16 @@ void PlayList::slotPlaylistActivated(int index) } */ } -void PlayList::slotNewPlaylistName(const QString& text) +void PlayList::slotNewPlaylistName(const TQString& text) { if ((text.isEmpty()) || (text == m_playlistSelector->text(m_currentPlaylist))) return; - if (m_playlistSelector->listBox()->findItem(text)) + if (m_playlistSelector->listBox()->tqfindItem(text)) { kdDebug() << "PlayList: Name still exists!" << endl; return; } - QString oldPl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine"; + TQString oldPl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine"; kdDebug() << "Playlist: removing file: " << oldPl << endl; if (!KIO::NetAccess::del(oldPl, mainWidget)) kdError() << "Playlist: " << KIO::NetAccess::lastErrorString() << endl; @@ -1868,28 +1868,28 @@ void PlayList::slotNewPlaylistName(const QString& text) kdDebug() << "PlayList: Set playlist name to: " << text << endl; m_playlistSelector->changeItem(text, m_currentPlaylist); saveCurrentPlaylist(); - if (mainWidget->parentWidget()) - mainWidget->parentWidget()->setFocus(); + if (mainWidget->tqparentWidget()) + mainWidget->tqparentWidget()->setFocus(); } -QString PlayList::queryCurrentPlaylist() +TQString PlayList::queryCurrentPlaylist() { - QString pl = m_playlistSelector->text(m_currentPlaylist); + TQString pl = m_playlistSelector->text(m_currentPlaylist); return (m_playlistDirectory + pl + ".kaffeine"); } void PlayList::saveCurrentPlaylist() { - QString pl = m_playlistSelector->text(m_currentPlaylist); + TQString pl = m_playlistSelector->text(m_currentPlaylist); savePlaylist(m_playlistDirectory + pl + ".kaffeine"); } void PlayList::removeCurrentPlaylist() { - int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").arg(m_playlistSelector->text(m_currentPlaylist)),QString::null,KStdGuiItem::del()); + int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").tqarg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del()); if (code == KMessageBox::Continue) { - QString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine"; + TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine"; if (!KIO::NetAccess::del(pl, mainWidget)) kdError() << "Playlist: " << KIO::NetAccess::lastErrorString() << endl; @@ -1900,22 +1900,22 @@ void PlayList::removeCurrentPlaylist() } } -void PlayList::loadPlaylist(const QString& pl) +void PlayList::loadPlaylist(const TQString& pl) { saveCurrentPlaylist(); - QString plName = KURL(pl).fileName(); + TQString plName = KURL(pl).fileName(); plName = plName.remove(".kaffeine", false); - if (m_playlistSelector->listBox()->findItem(plName)) + if (m_playlistSelector->listBox()->tqfindItem(plName)) { - QString plNewName = NULL; + TQString plNewName = NULL; while (true) { bool ok; - plNewName = QInputDialog::getText(i18n("Playlist Name Already Exists"), - i18n("Enter different playlist name:"), QLineEdit::Normal, plName, &ok); + plNewName = TQInputDialog::getText(i18n("Playlist Name Already Exists"), + i18n("Enter different playlist name:"), TQLineEdit::Normal, plName, &ok); if ((ok) && (!plNewName.isEmpty())) { - if (m_playlistSelector->listBox()->findItem(plNewName)) + if (m_playlistSelector->listBox()->tqfindItem(plNewName)) continue; else break; @@ -1939,18 +1939,18 @@ void PlayList::loadPlaylist(const QString& pl) * save xml playlist ******************************************/ -void PlayList::savePlaylist(const QString& pl) +void PlayList::savePlaylist(const TQString& pl) { - QDomDocument doc("playlist"); - doc.setContent(QString("<!DOCTYPE XMLPlaylist>")); - QDomElement root = doc.createElement("playlist"); + TQDomDocument doc("playlist"); + doc.setContent(TQString("<!DOCTYPE XMLPlaylist>")); + TQDomElement root = doc.createElement("playlist"); root.setAttribute("client", "kaffeine"); doc.appendChild(root); - QDomElement entry; + TQDomElement entry; PlaylistItem * tmp = NULL; - QListViewItemIterator it(m_list); + TQListViewItemIterator it(m_list); while (it.current()) { tmp = dynamic_cast<PlaylistItem *>(it.current()); @@ -1969,22 +1969,22 @@ void PlayList::savePlaylist(const QString& pl) if(!(tmp->subtitles().isEmpty())) { - QString subList; + TQString subList; for(unsigned int i=0; i<tmp->subtitles().count(); i++) subList += tmp->subtitles()[i] + "&"; entry.setAttribute("subs", subList); } - entry.setAttribute("currentSub", QString::number(tmp->currentSubtitle())); + entry.setAttribute("currentSub", TQString::number(tmp->currentSubtitle())); root.appendChild(entry); ++it; } - QFile file(pl); + TQFile file(pl); if (!file.open(IO_WriteOnly)) return; - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream stream(&file); + stream.setEncoding(TQTextStream::UnicodeUTF8); stream << doc.toString(); @@ -1994,14 +1994,14 @@ void PlayList::savePlaylist(const QString& pl) /**********************/ -void PlayList::exportM3UPlaylist(const QString& pl) +void PlayList::exportM3UPlaylist(const TQString& pl) { PlaylistItem * tmp = NULL; - QListViewItemIterator it(m_list); + TQListViewItemIterator it(m_list); int length = -1; - QString m3uList = "#EXTM3U\n"; + TQString m3uList = "#EXTM3U\n"; while (it.current()) { @@ -2011,7 +2011,7 @@ void PlayList::exportM3UPlaylist(const QString& pl) if ( length == 0 ) length = -1; - m3uList.append("#EXTINF:" + QString::number(length) + "," + tmp->title()); + m3uList.append("#EXTINF:" + TQString::number(length) + "," + tmp->title()); if (tmp->artist().isEmpty() ) m3uList.append("\n"); else @@ -2020,26 +2020,26 @@ void PlayList::exportM3UPlaylist(const QString& pl) ++it; } - QFile file(pl); + TQFile file(pl); if (!file.open(IO_WriteOnly)) return; - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream stream(&file); + stream.setEncoding(TQTextStream::UnicodeUTF8); stream << m3uList; file.close(); } -void PlayList::exportPLSPlaylist(const QString& pl) +void PlayList::exportPLSPlaylist(const TQString& pl) { PlaylistItem * tmp = NULL; - QListViewItemIterator it(m_list); + TQListViewItemIterator it(m_list); int counter = 0; int length = -1; - QString plsList = "[playlist]\n"; + TQString plsList = "[playlist]\n"; while (it.current()) { @@ -2052,24 +2052,24 @@ void PlayList::exportPLSPlaylist(const QString& pl) length = -1; } - plsList.append("File" + QString::number(counter) + "=" + tmp->url() + "\n"); - plsList.append("Title" + QString::number(counter) + "=" + tmp->title()); + plsList.append("File" + TQString::number(counter) + "=" + tmp->url() + "\n"); + plsList.append("Title" + TQString::number(counter) + "=" + tmp->title()); if (tmp->artist().isEmpty() ) plsList.append("\n"); else plsList.append(" - " + tmp->artist() + "\n"); - plsList.append("Length" + QString::number(counter) + "=" + QString::number(length) + "\n"); + plsList.append("Length" + TQString::number(counter) + "=" + TQString::number(length) + "\n"); ++it; } - plsList.append("NumberOfEntries=" + QString::number(counter) + "\n"); + plsList.append("NumberOfEntries=" + TQString::number(counter) + "\n"); plsList.append("Version=2"); - QFile file(pl); + TQFile file(pl); if (!file.open(IO_WriteOnly)) return; - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream stream(&file); + stream.setEncoding(TQTextStream::UnicodeUTF8); stream << plsList; @@ -2082,22 +2082,22 @@ void PlayList::resetSearch() slotFindText( "" ); } -void PlayList::slotFindText(const QString& text) +void PlayList::slotFindText(const TQString& text) { if (text == i18n("Filter")) return; - QListViewItemIterator it(m_list); + TQListViewItemIterator it(m_list); m_playTimeVisible = 0; m_countVisible = 0; PlaylistItem* tmp = NULL; while ( it.current() ) { tmp = dynamic_cast<PlaylistItem *>(it.current()); - if (text.isEmpty() || tmp->title().contains(text, false) || tmp->url().contains(text, false) - || tmp->artist().contains(text, false) || tmp->album().contains(text, false) ) + if (text.isEmpty() || tmp->title().tqcontains(text, false) || tmp->url().tqcontains(text, false) + || tmp->artist().tqcontains(text, false) || tmp->album().tqcontains(text, false) ) { tmp->setVisible(true); - if (tmp->length().contains(':')) + if (tmp->length().tqcontains(':')) m_playTimeVisible += timeStringToMs(tmp->length()); m_countVisible++; @@ -2107,7 +2107,7 @@ void PlayList::slotFindText(const QString& text) tmp->setVisible(false); if (tmp == m_currentEntry) { - tmp->setPixmap(TITLE_COLUMN, QPixmap()); + tmp->setPixmap(TITLE_COLUMN, TQPixmap()); m_currentEntry = NULL; m_currentRandomListEntry = -1; } @@ -2121,7 +2121,7 @@ void PlayList::slotFindText(const QString& text) m_searchSelection = true; if (m_random) createRandomList(); - updateStatus(); + updatetqStatus(); } @@ -2135,27 +2135,27 @@ void PlayList::slotCut() void PlayList::slotPaste() { - QPtrList<QListViewItem> selected; + TQPtrList<TQListViewItem> selected; selected = m_list->selectedItems(); - QListViewItem* lastSelected = NULL; + TQListViewItem* lastSelected = NULL; if (selected.count()) lastSelected = selected.at(selected.count() - 1); else lastSelected = m_list->lastItem(); - QStrList list; + TQStrList list; - if (QUriDrag::decode(QApplication::clipboard()->data(), list)) + if (TQUriDrag::decode(TQApplication::tqclipboard()->data(), list)) { - QStringList urls; - for (QStrListIterator it(list); *it; ++it) - urls.append(QUriDrag::uriToUnicodeUri(*it)); + TQStringList urls; + for (TQStrListIterator it(list); *it; ++it) + urls.append(TQUriDrag::uriToUnicodeUri(*it)); add(urls, lastSelected); return; } /** try to decode as text **/ - QString text; - if (QTextDrag::decode(QApplication::clipboard()->data(), text)) + TQString text; + if (TQTextDrag::decode(TQApplication::tqclipboard()->data(), text)) { add(text, lastSelected); } @@ -2163,22 +2163,22 @@ void PlayList::slotPaste() void PlayList::slotCopy() { - QPtrList<QListViewItem> selected; + TQPtrList<TQListViewItem> selected; selected = m_list->selectedItems(); - QStrList urlList; + TQStrList urlList; for (uint i=0; i<selected.count(); i++) { - urlList.append(QUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url())); + urlList.append(TQUriDrag::tqunicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url())); } - QApplication::clipboard()->setData(new QUriDrag(urlList)); + TQApplication::tqclipboard()->setData(new TQUriDrag(urlList)); } void PlayList::slotSelectAll() { - QListViewItemIterator it(m_list); + TQListViewItemIterator it(m_list); while (it.current()) { if ((*it)->isVisible()) @@ -2189,10 +2189,10 @@ void PlayList::slotSelectAll() void PlayList::slotPlaylistFromSelected() { - QPtrList<QListViewItem> selected; + TQPtrList<TQListViewItem> selected; selected = m_list->selectedItems(); - QValueList<MRL> mrlList; + TQValueList<MRL> mrlList; for (uint i=0; i<selected.count(); i++) { @@ -2209,15 +2209,15 @@ void PlayList::slotPlaylistFromSelected() void PlayList::slotAddToQueue(MRL mrl) { m_queue.append(mrl); - updateStatus(); + updatetqStatus(); } /**** helper ****/ -QString PlayList::msToTimeString(int msec) +TQString PlayList::msToTimeString(int msec) { /* - QTime t; + TQTime t; t = t.addMSecs(msec); return t.toString("h:mm:ss"); */ @@ -2226,8 +2226,8 @@ QString PlayList::msToTimeString(int msec) int min; int sec; int my_msec=msec; - QString tmp; - QString t; + TQString tmp; + TQString t; msec = msec/1000; //sec hours = msec/3600; @@ -2254,10 +2254,10 @@ QString PlayList::msToTimeString(int msec) return t; } -int PlayList::timeStringToMs(const QString& timeString) +int PlayList::timeStringToMs(const TQString& timeString) { int sec = 0; - QStringList tokens = QStringList::split(':',timeString); + TQStringList tokens = TQStringList::split(':',timeString); bool ok = false; sec += tokens[0].toInt(&ok)*3600; //hours @@ -2274,7 +2274,7 @@ int PlayList::timeStringToMs(const QString& timeString) return 0; } -bool PlayList::endsWith(QString s1, QString s2, bool caseSensitive ) +bool PlayList::endsWith(TQString s1, TQString s2, bool caseSensitive ) { if ( s1.isNull() || s2.isNull() ) return false; @@ -2297,7 +2297,7 @@ bool PlayList::endsWith(QString s1, QString s2, bool caseSensitive ) return true; } -bool PlayList::startsWith(QString s1, QString s2, bool caseSensitive ) +bool PlayList::startsWith(TQString s1, TQString s2, bool caseSensitive ) { if ( s1.isNull() || s2.isNull() ) return false; @@ -2322,13 +2322,13 @@ bool PlayList::startsWith(QString s1, QString s2, bool caseSensitive ) return true; } -SubtitleChooser::SubtitleChooser(QStringList values, QString filename,QWidget *parent, const char * name) : - KDialogBase(parent,name,true,i18n("Select Subtitle"), Ok|Cancel, Ok, true) +SubtitleChooser::SubtitleChooser(TQStringList values, TQString filename,TQWidget *tqparent, const char * name) : + KDialogBase(tqparent,name,true,i18n("Select Subtitle"), Ok|Cancel, Ok, true) { - QVBox *page = makeVBoxMainWidget(); - QLabel *label = new QLabel(page); + TQVBox *page = makeVBoxMainWidget(); + TQLabel *label = new TQLabel(page); label->setText("<qt>" + i18n("Media file:") + " <b>" + filename + "</b></qt>"); - table = new QListBox(page); + table = new TQListBox(page); this->setMinimumSize(300,200); table->setFocus(); @@ -2338,18 +2338,18 @@ SubtitleChooser::SubtitleChooser(QStringList values, QString filename,QWidget *p SubtitleChooser::~SubtitleChooser(){} -QString SubtitleChooser::getSelection() +TQString SubtitleChooser::getSelection() { return table->selectedItem()->text(); } -MovieChooser::MovieChooser(QStringList values, QString filename,QWidget *parent, const char * name) : - KDialogBase(parent,name,true,i18n("Select Movie"), Ok|Cancel, Ok, true) +MovieChooser::MovieChooser(TQStringList values, TQString filename,TQWidget *tqparent, const char * name) : + KDialogBase(tqparent,name,true,i18n("Select Movie"), Ok|Cancel, Ok, true) { - QVBox *page = makeVBoxMainWidget(); - QLabel *label = new QLabel(page); + TQVBox *page = makeVBoxMainWidget(); + TQLabel *label = new TQLabel(page); label->setText("<qt> " + i18n("Subtitle file:") + " <b>" + filename + "</b></qt>"); - table = new QListBox(page); + table = new TQListBox(page); this->setMinimumSize(450,200); table->setFocus(); @@ -2359,7 +2359,7 @@ MovieChooser::MovieChooser(QStringList values, QString filename,QWidget *parent, MovieChooser::~MovieChooser(){} -QString MovieChooser::getSelection() +TQString MovieChooser::getSelection() { return table->selectedItem()->text(); } diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h index 41df120..08c5a9c 100644 --- a/kaffeine/src/input/audiobrowser/playlist.h +++ b/kaffeine/src/input/audiobrowser/playlist.h @@ -28,12 +28,12 @@ #include <kaction.h> #include <kstdaction.h> -#include <qwidget.h> -#include <qptrlist.h> -#include <qvbox.h> -#include <qsplitter.h> -#include <qpainter.h> -#include <qtoolbutton.h> +#include <tqwidget.h> +#include <tqptrlist.h> +#include <tqvbox.h> +#include <tqsplitter.h> +#include <tqpainter.h> +#include <tqtoolbutton.h> #include "urllistview.h" #include "kaffeineinput.h" @@ -41,12 +41,12 @@ class UrlListView; class MRL; class KURL; -class QListViewItem; -class QString; -class QLabel; -class QColor; -class QDropEvent; -class QPixmap; +class TQListViewItem; +class TQString; +class TQLabel; +class TQColor; +class TQDropEvent; +class TQPixmap; class KLineEdit; class KComboBox; class KURLComboBox; @@ -59,38 +59,40 @@ class GoogleFetcher; class GalleryDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GalleryDialog( QWidget *parent, GoogleFetcher *goog ); + GalleryDialog( TQWidget *tqparent, GoogleFetcher *goog ); protected slots: void slotOk(); void slotNext(); private: - QFrame *imageFrame; + TQFrame *imageFrame; GoogleFetcher *google; - QTimer next; - QHBox *hbox; + TQTimer next; + TQHBox *hbox; }; -class RollTitle : public QLabel +class RollTitle : public TQLabel { Q_OBJECT + TQ_OBJECT public: - RollTitle( QWidget *parent ); + RollTitle( TQWidget *tqparent ); void setTitle( MRL mrl ); private: - void setTitle( QString t ); - QTimer titleTimer; - QPixmap titlePix; - QColor back, fore; + void setTitle( TQString t ); + TQTimer titleTimer; + TQPixmap titlePix; + TQColor back, fore; int titleOffset; - QString title; + TQString title; protected: - void paintEvent ( QPaintEvent * ); + void paintEvent ( TQPaintEvent * ); private slots: void rollTitle(); @@ -98,22 +100,23 @@ private slots: -class CoverFrame : public QFrame +class CoverFrame : public TQFrame { Q_OBJECT + TQ_OBJECT public: - CoverFrame( QWidget *parent ); + CoverFrame( TQWidget *tqparent ); ~CoverFrame(); - void setCoverPixmap( const QString &path ); + void setCoverPixmap( const TQString &path ); protected: - void mousePressEvent( QMouseEvent *e ); + void mousePressEvent( TQMouseEvent *e ); private: - void popup( const QPixmap &pix ) const; - QString imagePath; - QPixmap noCoverPix; + void popup( const TQPixmap &pix ) const; + TQString imagePath; + TQPixmap noCoverPix; signals: void changeCurrentCover(); @@ -125,24 +128,25 @@ signals: class PlayList : public KaffeineInput { Q_OBJECT + TQ_OBJECT public: - PlayList(QWidget *parent, QObject *objParent, const char *name=0); + PlayList(TQWidget *tqparent, TQObject *objParent, const char *name=0); ~PlayList(); // Reimplemented from KaffeineInput public: - QWidget *wantPlayerWindow(); - QWidget *inputMainWidget(); + TQWidget *wantPlayerWindow(); + TQWidget *inputMainWidget(); void mergeMeta(const MRL&); bool nextTrack( MRL& ); bool previousTrack( MRL& ); bool currentTrack( MRL& ); bool trackNumber( int, MRL& ); bool playbackFinished( MRL& ); - void getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames ); + void getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames ); void togglePanel(); - bool execTarget( const QString& ); + bool execTarget( const TQString& ); void saveConfig(); bool showPlayer() {return !m_showPlayer->isChecked();} //*************************************** @@ -151,24 +155,24 @@ public: MRL getCurrent(); /* get current playlist entry */ MRL getNext(); MRL getEntryWithNumber(int number); - void setCurrentEntry(QListViewItem*, bool playIcon = true); + void setCurrentEntry(TQListViewItem*, bool playIcon = true); - QListViewItem* getLast(); - QListViewItem* getFirst(); - QListViewItem* findByURL(const QString&); + TQListViewItem* getLast(); + TQListViewItem* getFirst(); + TQListViewItem* findByURL(const TQString&); /* insert a KURL(list) after a specific item */ - void add(const QString& url, QListViewItem* after); - void add(const QStringList& urls, QListViewItem* after); - void add(const QValueList<MRL>&, QListViewItem* after); + void add(const TQString& url, TQListViewItem* after); + void add(const TQStringList& urls, TQListViewItem* after); + void add(const TQValueList<MRL>&, TQListViewItem* after); bool isQueueMode() { return m_queue.count(); } - void setPlaylist(const QString& name, bool clear = false); + void setPlaylist(const TQString& name, bool clear = false); void nextPlaylist(); void removeCurrentPlaylist(); void saveCurrentPlaylist(); - QString queryCurrentPlaylist(); + TQString queryCurrentPlaylist(); void loadConfig(KConfig*); void saveConfig(KConfig*); void clearList(); @@ -177,32 +181,32 @@ public: void setRandom(bool); void useAlternateEncoding(bool); - void setAlternateEncoding(const QString&); + void setAlternateEncoding(const TQString&); - void setFileFilter(const QString& filter); - void savePlaylist(const QString&); - void loadPlaylist(const QString&); + void setFileFilter(const TQString& filter); + void savePlaylist(const TQString&); + void loadPlaylist(const TQString&); - void exportM3UPlaylist(const QString&); - void exportPLSPlaylist(const QString&); + void exportM3UPlaylist(const TQString&); + void exportPLSPlaylist(const TQString&); const bool getReadMetaOnLoading() const { return m_metaOnLoading; } - QVBox *mainWidget; - QVBox *playerBox; + TQVBox *mainWidget; + TQVBox *playerBox; public slots: void slotToggleShuffle(); protected: - void closeEvent(QCloseEvent*); + void closeEvent(TQCloseEvent*); private slots: void slotNewList(); void slotSetReadMetaOnLoading(bool read) { m_metaOnLoading = read; } - void slotSetAlternateColor(const QColor&); - void slotPlayDirect(QListViewItem* item); /* doubleclick */ - void slotDropEvent(QDropEvent*, QListViewItem*); + void slotSetAlternateColor(const TQColor&); + void slotPlayDirect(TQListViewItem* item); /* doubleclick */ + void slotDropEvent(TQDropEvent*, TQListViewItem*); void slotPreDropEvent(); void slotCut(); void slotPaste(); @@ -211,10 +215,10 @@ private slots: void slotPlaylistFromSelected(); void slotAddToQueue(MRL); void slotRemoveSelected(); - void slotFindText(const QString&); + void slotFindText(const TQString&); void slotSort(int); void slotPlaylistActivated(int); - void slotNewPlaylistName(const QString&); + void slotNewPlaylistName(const TQString&); void slotRepeat(); void slotShuffle(); void slotAutoCover(); @@ -222,52 +226,52 @@ private slots: void slotPlaylistLoad(); void slotPlaylistSaveAs(); void slotPlaylistRemove(); - void setCover( QString s1, QString s2, bool forceFetch=false ); + void setCover( TQString s1, TQString s2, bool forceFetch=false ); void chooseCurrentCover(); void showGallery(); void startPlaylist(); void fileSelected( const KFileItem* ); - void setBrowserURL( const QString& ); + void setBrowserURL( const TQString& ); void setBrowserURL( const KURL& ); void browserURLChanged( const KURL& ); void slotClearList(); void resetSearch(); private: - QListViewItem* insertItem(QListViewItem* after, const MRL&); - void updateStatus(); + TQListViewItem* insertItem(TQListViewItem* after, const MRL&); + void updatetqStatus(); void createRandomList(); - void getMetaInfo(MRL& mrl, const QString& mimeName); + void getMetaInfo(MRL& mrl, const TQString& mimeName); void setupActions(); /* helpers */ - static QString msToTimeString(int); - static int timeStringToMs(const QString&); - static bool endsWith(QString, QString, bool); - static bool startsWith(QString, QString, bool); + static TQString msToTimeString(int); + static int timeStringToMs(const TQString&); + static bool endsWith(TQString, TQString, bool); + static bool startsWith(TQString, TQString, bool); private: - QColor m_altCol; + TQColor m_altCol; KComboBox* m_playlistSelector; - QToolButton *searchBtn; + TQToolButton *searchBtn; KLineEdit* m_playlistFilter; int m_nextPlaylistNumber; - QString m_playlistDirectory; + TQString m_playlistDirectory; int m_currentPlaylist; KURLComboBox *browserComb; - QSplitter *hSplit, *vSplit; - QVBox *panel; - QWidget *playlist; + TQSplitter *hSplit, *vSplit; + TQVBox *panel; + TQWidget *playlist; KDirOperator *fileBrowser; KFileIconView *view; CoverFrame *coverFrame; GoogleFetcher *google; - QString coverImageFormat; + TQString coverImageFormat; RollTitle *roller; KToggleAction *m_repeat, *m_shuffle, *m_autoCover, *m_showPlayer; - QValueList<MRL> m_queue; + TQValueList<MRL> m_queue; uint m_playTime; uint m_playTimeVisible; @@ -278,59 +282,61 @@ private: bool m_sortAscending; UrlListView* m_list; - QListViewItem* m_currentEntry; + TQListViewItem* m_currentEntry; MRL m_currentEntryMRL; - QString m_fileFilter; - QString m_metaInfoString; - QString m_lastPlaylist; + TQString m_fileFilter; + TQString m_metaInfoString; + TQString m_lastPlaylist; - QPtrList<QListViewItem> m_randomList; + TQPtrList<TQListViewItem> m_randomList; int m_currentRandomListEntry; - QPixmap m_isCurrentEntry; - QPixmap m_cdPixmap; + TQPixmap m_isCurrentEntry; + TQPixmap m_cdPixmap; bool m_endless; bool m_random; bool m_cover; bool m_useAlternateEncoding; - QString m_alternateEncoding; + TQString m_alternateEncoding; signals: - void signalRequestForAudioCD(const QString&); - void signalRequestForDVD(const QString&); - void signalRequestForVCD(const QString&); + void signalRequestForAudioCD(const TQString&); + void signalRequestForDVD(const TQString&); + void signalRequestForVCD(const TQString&); }; -class QListBox; -class QStringList; +class TQListBox; +class TQStringList; class SubtitleChooser : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SubtitleChooser(QStringList, QString, QWidget *parent=0, const char *name = 0); + SubtitleChooser(TQStringList, TQString, TQWidget *tqparent=0, const char *name = 0); virtual ~SubtitleChooser(); - QString getSelection(); + TQString getSelection(); private: - QListBox *table; + TQListBox *table; }; class MovieChooser : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MovieChooser(QStringList, QString, QWidget *parent=0, const char *name = 0); + MovieChooser(TQStringList, TQString, TQWidget *tqparent=0, const char *name = 0); virtual ~MovieChooser(); - QString getSelection(); + TQString getSelection(); private: - QListBox *table; + TQListBox *table; }; #endif /* PLAYLIST_H */ diff --git a/kaffeine/src/input/audiobrowser/playlistitem.cpp b/kaffeine/src/input/audiobrowser/playlistitem.cpp index 3b5fc05..813f5c2 100644 --- a/kaffeine/src/input/audiobrowser/playlistitem.cpp +++ b/kaffeine/src/input/audiobrowser/playlistitem.cpp @@ -19,16 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdebug.h> #include "mrl.h" #include "playlistitem.h" -PlaylistItem::PlaylistItem(KListView *list, KListViewItem *after, const QString& url, const QString& mime, const QString& title, - const QString& length, const QString& artist, const QString& album, const QString& year, const QString& genre, - const QString& track, const QStringList& subtitles, int currentSubtitle) : +PlaylistItem::PlaylistItem(KListView *list, KListViewItem *after, const TQString& url, const TQString& mime, const TQString& title, + const TQString& length, const TQString& artist, const TQString& album, const TQString& year, const TQString& genre, + const TQString& track, const TQStringList& subtitles, int currentSubtitle) : KListViewItem(list, after, mime, title, artist, album, track, length), m_url(url), m_year(year), m_genre(genre), m_subtitles(subtitles), m_currentSubtitle(currentSubtitle), isCurrent(false) {} @@ -44,55 +44,55 @@ PlaylistItem::~PlaylistItem() {} MRL PlaylistItem::toMRL() const { - return MRL(url(), title(), stringToTime(length()), mime(), artist(), album(), track(), year(), genre(), QString::null, subtitles(), currentSubtitle()); + return MRL(url(), title(), stringToTime(length()), mime(), artist(), album(), track(), year(), genre(), TQString(), subtitles(), currentSubtitle()); } -const QString& PlaylistItem::url() const +const TQString& PlaylistItem::url() const { return m_url; } -QString PlaylistItem::mime() const +TQString PlaylistItem::mime() const { return this->text(MIME_COLUMN); } -QString PlaylistItem::title() const +TQString PlaylistItem::title() const { return this->text(TITLE_COLUMN); } -QString PlaylistItem::artist() const +TQString PlaylistItem::artist() const { return this->text(ARTIST_COLUMN); } -QString PlaylistItem::album() const +TQString PlaylistItem::album() const { return this->text(ALBUM_COLUMN); } -QString PlaylistItem::track() const +TQString PlaylistItem::track() const { return this->text(TRACK_COLUMN); } -QString PlaylistItem::year() const +TQString PlaylistItem::year() const { return m_year; } -QString PlaylistItem::genre() const +TQString PlaylistItem::genre() const { return m_genre; } -QString PlaylistItem::length() const +TQString PlaylistItem::length() const { return this->text(LENGTH_COLUMN); } -const QStringList& PlaylistItem::subtitles() const +const TQStringList& PlaylistItem::subtitles() const { return m_subtitles; } @@ -102,57 +102,57 @@ int PlaylistItem::currentSubtitle() const return m_currentSubtitle; } -void PlaylistItem::setUrl(const QString& url) +void PlaylistItem::setUrl(const TQString& url) { m_url = url; } -void PlaylistItem::setMime(const QString& mime) +void PlaylistItem::setMime(const TQString& mime) { this->setText(MIME_COLUMN, mime); } -void PlaylistItem::setTitle(const QString& title) +void PlaylistItem::setTitle(const TQString& title) { this->setText(TITLE_COLUMN, title); } -void PlaylistItem::setArtist(const QString& artist) +void PlaylistItem::setArtist(const TQString& artist) { this->setText(ARTIST_COLUMN, artist); } -void PlaylistItem::setAlbum(const QString& album) +void PlaylistItem::setAlbum(const TQString& album) { this->setText(ALBUM_COLUMN, album); } -void PlaylistItem::setTrack(const QString& track) +void PlaylistItem::setTrack(const TQString& track) { this->setText(TRACK_COLUMN, track); } -void PlaylistItem::setYear(const QString& year) +void PlaylistItem::setYear(const TQString& year) { m_year = year; } -void PlaylistItem::setGenre(const QString& genre) +void PlaylistItem::setGenre(const TQString& genre) { m_genre = genre; } -void PlaylistItem::setLength(const QString& length) +void PlaylistItem::setLength(const TQString& length) { this->setText(LENGTH_COLUMN, length); } -void PlaylistItem::setSubtitles(const QStringList& subs) +void PlaylistItem::setSubtitles(const TQStringList& subs) { m_subtitles = subs; } -void PlaylistItem::addSubtitle(const QString& sub) +void PlaylistItem::addSubtitle(const TQString& sub) { /* This will add subtitle & set it to the current one */ for (uint i=0; i < m_subtitles.count(); i++) { @@ -170,27 +170,27 @@ void PlaylistItem::setCurrentSubtitle(int sub) m_currentSubtitle = sub; } -QTime PlaylistItem::stringToTime(const QString& timeString) +TQTime PlaylistItem::stringToTime(const TQString& timeString) { int sec = 0; bool ok = false; - QStringList tokens = QStringList::split(':',timeString); + TQStringList tokens = TQStringList::split(':',timeString); sec += tokens[0].toInt(&ok)*3600; //hours sec += tokens[1].toInt(&ok)*60; //minutes sec += tokens[2].toInt(&ok); //secs if (ok) - return QTime().addSecs(sec); + return TQTime().addSecs(sec); else - return QTime(); + return TQTime(); } -int PlaylistItem::compare(QListViewItem *i, int col, bool ascending ) const +int PlaylistItem::compare(TQListViewItem *i, int col, bool ascending ) const { PlaylistItem* p = dynamic_cast<PlaylistItem*>(i); if (!p) - return QListViewItem::compare(i, col, ascending); + return TQListViewItem::compare(i, col, ascending); //if both strings are empty, sort by filename if (text(col).isEmpty() && i->text(col).isEmpty()) @@ -207,16 +207,16 @@ int PlaylistItem::compare(QListViewItem *i, int col, bool ascending ) const if (ok) return (track2 - track1); else - return QListViewItem::compare(i, col, ascending); + return TQListViewItem::compare(i, col, ascending); } else { - int result = QListViewItem::compare(i, col, ascending); + int result = TQListViewItem::compare(i, col, ascending); //if artists are equal, compare albums if ((col == ARTIST_COLUMN) && (result == 0)) { - result = QListViewItem::compare(i, ALBUM_COLUMN, ascending); + result = TQListViewItem::compare(i, ALBUM_COLUMN, ascending); if (!ascending) result = -result; } @@ -245,23 +245,23 @@ void PlaylistItem::setPlaying(bool playing) isCurrent = playing; } -void PlaylistItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align) +void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if (isCurrent) { - QColorGroup colorGroup = cg; + TQColorGroup tqcolorGroup = cg; - QColor base = colorGroup.base(); - QColor selection = colorGroup.highlight(); + TQColor base = tqcolorGroup.base(); + TQColor selection = tqcolorGroup.highlight(); int r = (base.red() + selection.red()) / 2; int b = (base.blue() + selection.blue()) / 2; int g = (base.green() + selection.green()) / 2; - QColor c(r, g, b); + TQColor c(r, g, b); - colorGroup.setColor(QColorGroup::Base, c); - QListViewItem::paintCell(p, colorGroup, column, width, align); + tqcolorGroup.setColor(TQColorGroup::Base, c); + TQListViewItem::paintCell(p, tqcolorGroup, column, width, align); } else return KListViewItem::paintCell(p, cg, column, width, align); diff --git a/kaffeine/src/input/audiobrowser/playlistitem.h b/kaffeine/src/input/audiobrowser/playlistitem.h index 9b1b9f5..d536117 100644 --- a/kaffeine/src/input/audiobrowser/playlistitem.h +++ b/kaffeine/src/input/audiobrowser/playlistitem.h @@ -31,61 +31,61 @@ #define TRACK_COLUMN 4 #define LENGTH_COLUMN 5 -class QTime; -class QString; -class QStringList; +class TQTime; +class TQString; +class TQStringList; class MRL; class PlaylistItem : public KListViewItem { public: - PlaylistItem(KListView *list, KListViewItem *after, const QString& url, const QString& mime, const QString& title, - const QString& length = QString::null, const QString& artist = QString::null, const QString& album = QString::null, - const QString& track = QString::null, const QString& year = QString::null, const QString& genre = QString::null, - const QStringList& subtitles = QStringList(), int currentSubtitle = -1); + PlaylistItem(KListView *list, KListViewItem *after, const TQString& url, const TQString& mime, const TQString& title, + const TQString& length = TQString(), const TQString& artist = TQString(), const TQString& album = TQString(), + const TQString& track = TQString(), const TQString& year = TQString(), const TQString& genre = TQString(), + const TQStringList& subtitles = TQStringList(), int currentSubtitle = -1); PlaylistItem(KListView* list, KListViewItem* after, const MRL&); virtual ~PlaylistItem(); MRL toMRL() const; - const QString& url() const; - QString mime() const; - QString title() const; - QString artist() const; - QString album() const; - QString track() const; - QString year() const; - QString genre() const; - QString length() const; - const QStringList& subtitles() const; + const TQString& url() const; + TQString mime() const; + TQString title() const; + TQString artist() const; + TQString album() const; + TQString track() const; + TQString year() const; + TQString genre() const; + TQString length() const; + const TQStringList& subtitles() const; int currentSubtitle() const; - void setUrl(const QString&); - void setMime(const QString&); - void setTitle(const QString&); - void setArtist(const QString&); - void setAlbum(const QString&); - void setTrack(const QString&); - void setYear(const QString&); - void setGenre(const QString&); - void setLength(const QString&); - void setSubtitles(const QStringList&); - void addSubtitle(const QString&); + void setUrl(const TQString&); + void setMime(const TQString&); + void setTitle(const TQString&); + void setArtist(const TQString&); + void setAlbum(const TQString&); + void setTrack(const TQString&); + void setYear(const TQString&); + void setGenre(const TQString&); + void setLength(const TQString&); + void setSubtitles(const TQStringList&); + void addSubtitle(const TQString&); void setCurrentSubtitle(int); //reimplement to fix track order - int compare( QListViewItem *i, int col, bool ascending ) const; + int compare( TQListViewItem *i, int col, bool ascending ) const; void setPlaying(bool playing); - 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: - static QTime stringToTime(const QString&); - QString m_url; - QString m_year; - QString m_genre; - QStringList m_subtitles; + static TQTime stringToTime(const TQString&); + TQString m_url; + TQString m_year; + TQString m_genre; + TQStringList m_subtitles; int m_currentSubtitle; bool isCurrent; }; diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp index 49cfc3c..644f6ab 100644 --- a/kaffeine/src/input/audiobrowser/urllistview.cpp +++ b/kaffeine/src/input/audiobrowser/urllistview.cpp @@ -28,8 +28,8 @@ #include <kfiledialog.h> #include <kpopupmenu.h> -#include <qfontmetrics.h> -#include <qdragobject.h> +#include <tqfontmetrics.h> +#include <tqdragobject.h> #include "mrl.h" #include "playlistitem.h" @@ -37,27 +37,27 @@ #include "urllistview.moc" -UrlListView::UrlListView(QWidget *parent, const char *name ) : KListView(parent,name), +UrlListView::UrlListView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name), m_listCleared(true), m_itemOfContextMenu(NULL) { m_contextMenu = new KPopupMenu(this); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play"), this, SLOT(slotPlayItem())); - m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, SLOT(slotPlayNext())); + m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem())); + m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, TQT_SLOT(slotPlayNext())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editcut", KIcon::Small), i18n("C&ut"), this, SIGNAL(signalCut()), CTRL+Key_X); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editcopy", KIcon::Small), i18n("&Copy"), this, SIGNAL(signalCopy()), CTRL+Key_C); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editpaste", KIcon::Small), i18n("&Paste"), this, SIGNAL(signalPaste()), CTRL+Key_V); - m_contextMenu->insertItem(i18n("Select &All"), this, SIGNAL(signalSelectAll()), CTRL+Key_A); - m_contextMenu->insertItem(i18n("Create Playlist From Selected"), this, SIGNAL(signalPlaylistFromSelected())); + m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editcut", KIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X); + m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editcopy", KIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C); + m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editpaste", KIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V); + m_contextMenu->insertItem(i18n("Select &All"), this, TQT_SIGNAL(signalSelectAll()), CTRL+Key_A); + m_contextMenu->insertItem(i18n("Create Playlist From Selected"), this, TQT_SIGNAL(signalPlaylistFromSelected())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("indent", KIcon::Small), i18n("Add Sub&title..."), this, SLOT(slotAddSubtitle()),QKeySequence(),100 ); + m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("indent", KIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 ); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("edit", KIcon::Small), i18n("&Edit Title"), this, SLOT(slotEditTitle())); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("info", KIcon::Small), i18n("&Info"), this, SLOT(slotShowInfo())); + m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("edit", KIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle())); + m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("info", KIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo())); /* width of the "length"-column */ - QFontMetrics met(KGlobalSettings::generalFont()); + TQFontMetrics met(KGlobalSettings::generalFont()); int w1 = met.width(i18n("Length")); int w2 = met.width("5:55:55") + 2; @@ -71,28 +71,28 @@ UrlListView::UrlListView(QWidget *parent, const char *name ) : KListView(parent, m_column4Track = w1 > w2 ? w1 : w2; m_column4Track += 36; - connect(this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - this, SLOT(slotShowContextMenu(QListViewItem*, const QPoint&, int))); - connect(this, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(slotCurrentChanged(QListViewItem*))); - connect(this, SIGNAL(clicked( QListViewItem*, const QPoint&, int )), - this, SLOT(slotClicked( QListViewItem*, const QPoint&, int ))); + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotShowContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), + this, TQT_SLOT(slotCurrentChanged(TQListViewItem*))); + connect(this, TQT_SIGNAL(clicked( TQListViewItem*, const TQPoint&, int )), + this, TQT_SLOT(slotClicked( TQListViewItem*, const TQPoint&, int ))); } UrlListView::~UrlListView() { } -bool UrlListView::acceptDrag(QDropEvent* event) const +bool UrlListView::acceptDrag(TQDropEvent* event) const { - return QUriDrag::canDecode(event) || QTextDrag::canDecode(event) || KListView::acceptDrag(event); + return TQUriDrag::canDecode(event) || TQTextDrag::canDecode(event) || KListView::acceptDrag(event); } -QDragObject* UrlListView::dragObject() +TQDragObject* UrlListView::dragObject() { // get selected items - QPtrList<QListViewItem> selected; - QStrList urlList; + TQPtrList<TQListViewItem> selected; + TQStrList urlList; selected = selectedItems(); for (uint i = 0; i<selected.count(); i++) @@ -100,10 +100,10 @@ QDragObject* UrlListView::dragObject() urlList.append(dynamic_cast<PlaylistItem*>(selected.at(i))->url().ascii()); } - return new QUriDrag(urlList, viewport()); + return new TQUriDrag(urlList, viewport()); } -void UrlListView::resizeEvent(QResizeEvent* rev) +void UrlListView::resizeEvent(TQResizeEvent* rev) { int width = contentsRect().width() - m_column5Width - m_column4Track - 69; setColumnWidth(0, 20); /* mime */ @@ -136,7 +136,7 @@ bool UrlListView::getCleared() const /* was playlist cleared ? */ /********** context menu **********/ -void UrlListView::slotShowContextMenu(QListViewItem* item, const QPoint& pos, int) +void UrlListView::slotShowContextMenu(TQListViewItem* item, const TQPoint& pos, int) { if (!item) { @@ -146,7 +146,7 @@ void UrlListView::slotShowContextMenu(QListViewItem* item, const QPoint& pos, in else { m_itemOfContextMenu = dynamic_cast<PlaylistItem *>(item); - if (m_itemOfContextMenu->mime().contains("video")) + if (m_itemOfContextMenu->mime().tqcontains("video")) enableSubEntry(); else disableSubEntry(); @@ -183,9 +183,9 @@ void UrlListView::slotShowInfo() if (!m_itemOfContextMenu) return; - QString num; + TQString num; num = num.setNum(childCount()); - QString info = "<qt><table width=\"90%\">"; + TQString info = "<qt><table width=\"90%\">"; info = info + "<tr><td colspan=\"2\"><center><b>" + m_itemOfContextMenu->title() + "</b></center></td></tr>"; info = info + "<tr><td><b>" + i18n("URL")+ ":</b></td><td>" + m_itemOfContextMenu->url() + "</td></tr>"; info = info + "<tr><td><b>" + i18n("Artist") + ":</b></td><td>" + m_itemOfContextMenu->artist() + "</td></td>"; @@ -211,7 +211,7 @@ void UrlListView::slotShowInfo() KMessageBox::information(this, info); } -void UrlListView::slotClicked(QListViewItem*, const QPoint&, int) +void UrlListView::slotClicked(TQListViewItem*, const TQPoint&, int) { /*if ( (item) && (col == 3) ) { @@ -221,44 +221,44 @@ void UrlListView::slotClicked(QListViewItem*, const QPoint&, int) } */ } -#include <qdom.h> +#include <tqdom.h> #include <kio/job.h> void UrlListView::slotAddSubtitle() { - /*QDomDocument reqdoc; + /*TQDomDocument reqdoc; - QDomElement methodCall = reqdoc.createElement( "methodCall" ); - QDomElement methodName = reqdoc.createElement( "methodName" ); - QDomText methodNameValue = reqdoc.createTextNode( "LogIn" ); + TQDomElement methodCall = reqdoc.createElement( "methodCall" ); + TQDomElement methodName = reqdoc.createElement( "methodName" ); + TQDomText methodNameValue = reqdoc.createTextNode( "LogIn" ); methodName.appendChild( methodNameValue ); methodCall.appendChild( methodName ); reqdoc.appendChild( methodCall ); - QDomElement params = reqdoc.createElement( "params" ); + TQDomElement params = reqdoc.createElement( "params" ); - QDomElement param1 = reqdoc.createElement( "param" ); - QDomElement value1 = reqdoc.createElement( "value" ); - QDomElement type1 = reqdoc.createElement( "string" ); - QDomText param1Value = reqdoc.createTextNode( "" ); + TQDomElement param1 = reqdoc.createElement( "param" ); + TQDomElement value1 = reqdoc.createElement( "value" ); + TQDomElement type1 = reqdoc.createElement( "string" ); + TQDomText param1Value = reqdoc.createTextNode( "" ); type1.appendChild( param1Value ); value1.appendChild( type1 ); param1.appendChild( value1 ); params.appendChild( param1 ); - QDomElement param2 = reqdoc.createElement( "param" ); - QDomElement value2 = reqdoc.createElement( "value" ); - QDomElement type2 = reqdoc.createElement( "string" ); - QDomText param2Value = reqdoc.createTextNode( "" ); + TQDomElement param2 = reqdoc.createElement( "param" ); + TQDomElement value2 = reqdoc.createElement( "value" ); + TQDomElement type2 = reqdoc.createElement( "string" ); + TQDomText param2Value = reqdoc.createTextNode( "" ); type2.appendChild( param2Value ); value2.appendChild( type2 ); param2.appendChild( value2 ); params.appendChild( param2 ); - QDomElement param3 = reqdoc.createElement( "param" ); - QDomElement value3 = reqdoc.createElement( "value" ); - QDomElement type3 = reqdoc.createElement( "string" ); - QDomText param3Value = reqdoc.createTextNode( "en" ); + TQDomElement param3 = reqdoc.createElement( "param" ); + TQDomElement value3 = reqdoc.createElement( "value" ); + TQDomElement type3 = reqdoc.createElement( "string" ); + TQDomText param3Value = reqdoc.createTextNode( "en" ); type3.appendChild( param3Value ); value3.appendChild( type3 ); param3.appendChild( value3 ); @@ -266,20 +266,20 @@ void UrlListView::slotAddSubtitle() methodCall.appendChild( params ); - const QString xmlRequest = "<?xml version=\"1.0\"?>\n" + reqdoc.toString(); + const TQString xmlRequest = "<?xml version=\"1.0\"?>\n" + reqdoc.toString(); - QByteArray postData; - QDataStream stream( postData, IO_WriteOnly ); + TQByteArray postData; + TQDataStream stream( postData, IO_WriteOnly ); stream.writeRawBytes( xmlRequest.utf8(), xmlRequest.utf8().length() ); - openSubJobBuf = QByteArray(); + openSubJobBuf = TQByteArray(); openSubJob = KIO::http_post( "http://test.opensubtitles.org/xml-rpc", postData, false ); openSubJob->addMetaData( "content-type", "Content-Type: text/xml" ); - connect( openSubJob, SIGNAL(result(KIO::Job*)), this, SLOT(openSubResult(KIO::Job*)) ); - connect( openSubJob, SIGNAL(data(KIO::Job*,const QByteArray&) ), this, SLOT(openSubData(KIO::Job*, - const QByteArray&)) ); + connect( openSubJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(openSubResult(KIO::Job*)) ); + connect( openSubJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&) ), this, TQT_SLOT(openSubData(KIO::Job*, + const TQByteArray&)) ); kdDebug() << "\n\n" << xmlRequest << "\n\n" << endl;*/ @@ -287,11 +287,11 @@ void UrlListView::slotAddSubtitle() if (!m_itemOfContextMenu) return; - QString openURL = m_itemOfContextMenu->url(); - QString subtitleURL = KFileDialog::getOpenURL(openURL, + TQString openURL = m_itemOfContextMenu->url(); + TQString subtitleURL = KFileDialog::getOpenURL(openURL, i18n("*.smi *.srt *.sub *.txt *.ssa *.asc|Subtitle Files\n*.*|All Files"), 0, i18n("Select Subtitle File")).path(); - if(!(subtitleURL.isEmpty()) && !(m_itemOfContextMenu->subtitles().contains(subtitleURL)) && QFile::exists(subtitleURL)) + if(!(subtitleURL.isEmpty()) && !(m_itemOfContextMenu->subtitles().tqcontains(subtitleURL)) && TQFile::exists(subtitleURL)) { m_itemOfContextMenu->addSubtitle(subtitleURL); emit signalPlayItem(m_itemOfContextMenu); @@ -308,7 +308,7 @@ void UrlListView::openSubResult( KIO::Job* job ) return; } - QDomDocument document; + TQDomDocument document; if ( !document.setContent( openSubJobBuf ) ) { kdDebug() << "Couldn't read similar artists response" << endl; return; @@ -317,7 +317,7 @@ void UrlListView::openSubResult( KIO::Job* job ) openSubJob = 0; } -void UrlListView::openSubData( KIO::Job* job, const QByteArray& data ) +void UrlListView::openSubData( KIO::Job* job, const TQByteArray& data ) { if ( openSubJob != job ) return; @@ -328,7 +328,7 @@ void UrlListView::openSubData( KIO::Job* job, const QByteArray& data ) } -void UrlListView::slotCurrentChanged(QListViewItem * item) +void UrlListView::slotCurrentChanged(TQListViewItem * item) { if(item == 0) //All items deleted m_itemOfContextMenu = NULL; diff --git a/kaffeine/src/input/audiobrowser/urllistview.h b/kaffeine/src/input/audiobrowser/urllistview.h index 964b743..95ac717 100644 --- a/kaffeine/src/input/audiobrowser/urllistview.h +++ b/kaffeine/src/input/audiobrowser/urllistview.h @@ -28,8 +28,8 @@ #include <klistview.h> class KPopupMenu; -class QWidget; -class QDragObject; +class TQWidget; +class TQDragObject; class PlaylistItem; class MRL; class KIO::Job; @@ -37,8 +37,9 @@ class KIO::Job; class UrlListView : public KListView { Q_OBJECT + TQ_OBJECT public: - UrlListView(QWidget *parent=0, const char *name=0); + UrlListView(TQWidget *tqparent=0, const char *name=0); ~UrlListView(); void setCleared(bool); @@ -48,7 +49,7 @@ public slots: virtual void clear(); /* reimplement slot */ signals: - void signalPlayItem(QListViewItem* ); /* play selected in context menu */ + void signalPlayItem(TQListViewItem* ); /* play selected in context menu */ void signalCut(); void signalCopy(); void signalPaste(); @@ -57,21 +58,21 @@ signals: void signalPlaylistFromSelected(); private slots: - void slotShowContextMenu(QListViewItem*, const QPoint&, int); - void slotCurrentChanged(QListViewItem *); + void slotShowContextMenu(TQListViewItem*, const TQPoint&, int); + void slotCurrentChanged(TQListViewItem *); void slotAddSubtitle(); void slotShowInfo(); void slotEditTitle(); void slotPlayItem(); - void slotClicked(QListViewItem*, const QPoint&, int); + void slotClicked(TQListViewItem*, const TQPoint&, int); void slotPlayNext(); void openSubResult( KIO::Job* ); - void openSubData( KIO::Job*, const QByteArray& ); + void openSubData( KIO::Job*, const TQByteArray& ); protected: - virtual bool acceptDrag(QDropEvent* event) const; - virtual void resizeEvent(QResizeEvent*); - virtual QDragObject* dragObject(); + virtual bool acceptDrag(TQDropEvent* event) const; + virtual void resizeEvent(TQResizeEvent*); + virtual TQDragObject* dragObject(); private: void enableSubEntry(); @@ -85,7 +86,7 @@ private: PlaylistItem* m_itemOfContextMenu; KPopupMenu* m_contextMenu; KIO::Job *openSubJob; - QByteArray openSubJobBuf; + TQByteArray openSubJobBuf; }; diff --git a/kaffeine/src/input/disc/cddb.cpp b/kaffeine/src/input/disc/cddb.cpp index 407fbbc..037c515 100644 --- a/kaffeine/src/input/disc/cddb.cpp +++ b/kaffeine/src/input/disc/cddb.cpp @@ -24,12 +24,12 @@ #include <errno.h> #include <unistd.h> -#include <qdir.h> -#include <qtextstream.h> -#include <qregexp.h> -#include <qapplication.h> -#include <qstring.h> -#include <qcursor.h> +#include <tqdir.h> +#include <tqtextstream.h> +#include <tqregexp.h> +#include <tqapplication.h> +#include <tqstring.h> +#include <tqcursor.h> #include <kdebug.h> #include <ksock.h> #include <kextsock.h> @@ -41,7 +41,7 @@ CDDB::CDDB() : ks(0), port(80), remote(false), save_local(false) { - QString s = QDir::homeDirPath()+"/.cddb"; + TQString s = TQDir::homeDirPath()+"/.cddb"; cddb_dirs +=s; } @@ -73,7 +73,7 @@ bool CDDB::set_server(const char *hostname, unsigned short int _port) h_name = hostname; port = _port; - QCString r; + TQCString r; readLine(r); // the server greeting writeLine("cddb hello kde-user blubb kio_audiocd 0.4"); readLine(r); @@ -86,7 +86,7 @@ bool CDDB::deinit() if (ks) { writeLine("quit"); - QCString r; + TQCString r; readLine(r); ks->close(); } @@ -97,7 +97,7 @@ bool CDDB::deinit() return true; } -bool CDDB::readLine(QCString& ret) +bool CDDB::readLine(TQCString& ret) { int read_length = 0; char small_b[128]; @@ -107,7 +107,7 @@ bool CDDB::readLine(QCString& ret) while (read_length < 40000) { // Look for a \n in buf - int ni = buf.find('\n'); + int ni = buf.tqfind('\n'); if (ni >= 0) { // Nice, so return this substring (without the \n), @@ -135,7 +135,7 @@ bool CDDB::readLine(QCString& ret) return false; } -bool CDDB::writeLine(const QCString& line) +bool CDDB::writeLine(const TQCString& line) { const char *b = line.data(); int l = line.length(); @@ -164,7 +164,7 @@ bool CDDB::writeLine(const QCString& line) return true; } -unsigned int CDDB::get_discid(QValueList<int>& track_ofs) +unsigned int CDDB::get_discid(TQValueList<int>& track_ofs) { unsigned int id = 0; int num_tracks = track_ofs.count() - 2; @@ -188,7 +188,7 @@ unsigned int CDDB::get_discid(QValueList<int>& track_ofs) return id; } -static int get_code (const QCString &s) +static int get_code (const TQCString &s) { bool ok; int code = s.left(3).toInt(&ok); @@ -197,17 +197,17 @@ static int get_code (const QCString &s) return code; } -static void parse_query_resp (const QCString& _r, QCString& catg, QCString& d_id, QCString& title) +static void parse_query_resp (const TQCString& _r, TQCString& catg, TQCString& d_id, TQCString& title) { - QCString r = _r.stripWhiteSpace(); - int i = r.find(' '); + TQCString r = _r.stripWhiteSpace(); + int i = r.tqfind(' '); if (i) { catg = r.left(i).stripWhiteSpace(); r.remove(0, i+1); r = r.stripWhiteSpace(); } - i = r.find(' '); + i = r.tqfind(' '); if (i) { d_id = r.left(i).stripWhiteSpace(); @@ -217,17 +217,17 @@ static void parse_query_resp (const QCString& _r, QCString& catg, QCString& d_id title = r; } -QString CDDB::track(int i) const +TQString CDDB::track(int i) const { if (i < 0 || i >= int(m_names.count())) - return QString(); + return TQString(); return m_names[i].utf8(); } -bool CDDB::parse_read_resp(QTextStream *stream, QTextStream *write_stream) +bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream) { /* Note, that m_names and m_title should be empty */ - QCString end = "."; + TQCString end = "."; /* Fill table, so we can index it below. */ for (int i = 0; i < m_tracks; i++) @@ -236,7 +236,7 @@ bool CDDB::parse_read_resp(QTextStream *stream, QTextStream *write_stream) } while (1) { - QCString r; + TQCString r; if (stream) { if (stream->atEnd()) @@ -260,12 +260,12 @@ bool CDDB::parse_read_resp(QTextStream *stream, QTextStream *write_stream) if (r.left(7) == "DTITLE=") { r.remove(0, 7); - m_title += QString::fromLocal8Bit(r.stripWhiteSpace()); + m_title += TQString::fromLocal8Bit(r.stripWhiteSpace()); } else if (r.left(6) == "TTITLE") { r.remove(0, 6); - int e = r.find('='); + int e = r.tqfind('='); if (e) { bool ok; @@ -273,7 +273,7 @@ bool CDDB::parse_read_resp(QTextStream *stream, QTextStream *write_stream) if (ok && i >= 0 && i < m_tracks) { r.remove(0, e+1); - m_names[i] += QString::fromLocal8Bit(r); + m_names[i] += TQString::fromLocal8Bit(r); } } } @@ -281,7 +281,7 @@ bool CDDB::parse_read_resp(QTextStream *stream, QTextStream *write_stream) /* XXX We should canonicalize the strings ("\n" --> '\n' e.g.) */ - int si = m_title.find(" / "); + int si = m_title.tqfind(" / "); if (si > 0) { m_artist = m_title.left(si).stripWhiteSpace(); @@ -292,27 +292,27 @@ bool CDDB::parse_read_resp(QTextStream *stream, QTextStream *write_stream) if (m_title.isEmpty()) m_title = i18n("No Title"); /*else - m_title.replace(QRegExp("/"), "%2f");*/ + m_title.tqreplace(TQRegExp("/"), "%2f");*/ if (m_artist.isEmpty()) m_artist = i18n("Unknown"); /*else - m_artist.replace(QRegExp("/"), "%2f");*/ + m_artist.tqreplace(TQRegExp("/"), "%2f");*/ kdDebug(7101) << "CDDB: found Title: `" << m_title << "'" << endl; for (int i = 0; i < m_tracks; i++) { if (m_names[i].isEmpty()) - m_names[i] += i18n("Track %1").arg(i); - m_names[i].replace(QRegExp("/"), "%2f"); + m_names[i] += i18n("Track %1").tqarg(i); + m_names[i].tqreplace(TQRegExp("/"), "%2f"); kdDebug(7101) << "CDDB: found Track " << i+1 << ": `" << m_names[i] << "'" << endl; } return true; } -void CDDB::add_cddb_dirs(const QStringList& list) +void CDDB::add_cddb_dirs(const TQStringList& list) { - QString s = QDir::homeDirPath()+"/.cddb"; + TQString s = TQDir::homeDirPath()+"/.cddb"; cddb_dirs = list; if (cddb_dirs.isEmpty()) @@ -322,14 +322,14 @@ void CDDB::add_cddb_dirs(const QStringList& list) /* Locates and opens the local file corresponding to that discid. Returns TRUE, if file is found and ready for reading. Returns FALSE, if file isn't found. In this case ret_file is initialized - with a QFile which resides in the first cddb_dir, and has a temp name + with a TQFile which resides in the first cddb_dir, and has a temp name (the ID + getpid()). You can open it for writing. */ -bool CDDB::searchLocal(unsigned int id, QFile *ret_file) +bool CDDB::searchLocal(unsigned int id, TQFile *ret_file) { - QDir dir; - QString filename; - filename = QString("%1").arg(id, 0, 16).rightJustify(8, '0'); - QStringList::ConstIterator it; + TQDir dir; + TQString filename; + filename = TQString("%1").tqarg(id, 0, 16).rightJustify(8, '0'); + TQStringList::ConstIterator it; for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it) { dir.setPath(*it); @@ -341,9 +341,9 @@ bool CDDB::searchLocal(unsigned int id, QFile *ret_file) return true; /* And then in the subdirs of dir (representing the categories normally). */ - const QFileInfoList *subdirs = dir.entryInfoList (QDir::Dirs); - QFileInfoListIterator fiit(*subdirs); - QFileInfo *fi; + const TQFileInfoList *subdirs = dir.entryInfoList (TQDir::Dirs); + TQFileInfoListIterator fiit(*subdirs); + TQFileInfo *fi; while ((fi = fiit.current()) != 0) { ret_file->setName (*it + "/" + fi->fileName() + "/" + filename); @@ -352,26 +352,26 @@ bool CDDB::searchLocal(unsigned int id, QFile *ret_file) ++fiit; } } - QString pid; + TQString pid; pid.setNum(::getpid()); ret_file->setName (cddb_dirs[0] + "/" + filename + "." + pid); /* Try to create the save location. */ dir.setPath(cddb_dirs[0]); if (save_local && !dir.exists()) { - //dir = QDir::current(); + //dir = TQDir::current(); dir.mkdir(cddb_dirs[0]); } return false; } -bool CDDB::queryCD(QValueList<int>& track_ofs) +bool CDDB::queryCD(TQValueList<int>& track_ofs) { int num_tracks = track_ofs.count() - 2; if (num_tracks < 1) return false; unsigned int id = get_discid(track_ofs); - QFile file; + TQFile file; bool local; /* Already read this ID. */ @@ -379,7 +379,7 @@ bool CDDB::queryCD(QValueList<int>& track_ofs) return true; emit cddbMessage(i18n("Searching local cddb entry ...")); - qApp->processEvents(); + tqApp->processEvents(); /* First look for a local file. */ local = searchLocal (id, &file); @@ -394,41 +394,41 @@ bool CDDB::queryCD(QValueList<int>& track_ofs) m_discid = id; if (local) { - QTextStream stream(&file); + TQTextStream stream(&file); /* XXX Hmm, what encoding is used by CDDB files? local? Unicode? Nothing? */ - //stream.setEncoding(QTextStream::Locale); + //stream.setEncoding(TQTextStream::Locale); parse_read_resp(&stream, 0); file.close(); return true; } emit cddbMessage(i18n("Searching remote cddb entry ...")); - qApp->processEvents(); + tqApp->processEvents(); /* Remote CDDB query. */ unsigned int length = track_ofs[num_tracks+1] - track_ofs[num_tracks]; - QCString q; + TQCString q; q.sprintf("cddb query %08x %d", id, num_tracks); - QCString num; + TQCString num; for (int i = 0; i < num_tracks; i++) q += " " + num.setNum(track_ofs[i]); q += " " + num.setNum(length / 75); if (!writeLine(q)) return false; - QCString r; + TQCString r; if (!readLine(r)) return false; r = r.stripWhiteSpace(); int code = get_code(r); if (code == 200) { - QCString catg, d_id, title; - QDir dir; - QCString s, pid; + TQCString catg, d_id, title; + TQDir dir; + TQCString s, pid; emit cddbMessage(i18n("Found exact match cddb entry ...")); - qApp->processEvents(); + tqApp->processEvents(); /* an exact match */ r.remove(0, 3); @@ -456,16 +456,16 @@ bool CDDB::queryCD(QValueList<int>& track_ofs) if (save_local && file.open(IO_WriteOnly)) { kdDebug(7101) << "CDDB: file name to save =" << file.name() << endl; - QTextStream stream(&file); + TQTextStream stream(&file); if (!parse_read_resp(0, &stream)) { file.remove(); return false; } file.close(); - /*QString newname (file.name()); - newname.truncate(newname.findRev('.')); - if (QDir::current().rename(file.name(), newname)) { + /*TQString newname (file.name()); + newname.truncate(newname.tqfindRev('.')); + if (TQDir::current().rename(file.name(), newname)) { kdDebug(7101) << "CDDB: rename failed" << endl; file.remove(); } */ @@ -477,16 +477,16 @@ bool CDDB::queryCD(QValueList<int>& track_ofs) { // Found some close matches. We'll read the query response and ask the user // which one should be fetched from the server. - QCString end = "."; - QCString catg, d_id, title; - QDir dir; - QCString s, pid, first_match; - QStringList disc_ids; + TQCString end = "."; + TQCString catg, d_id, title; + TQDir dir; + TQCString s, pid, first_match; + TQStringList disc_ids; /* some close matches */ //XXX may be try to find marker based on r emit cddbMessage(i18n("Found close cddb entry ...")); - qApp->processEvents(); + tqApp->processEvents(); int i=0; while (1) @@ -505,12 +505,12 @@ bool CDDB::queryCD(QValueList<int>& track_ofs) bool ok = false; // We don't want to be thinking too much, do we? - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); // Oh, mylord, which match should I serve you? - QString _answer = KInputDialog::getItem(i18n("CDDB Matches"), i18n("Several close CDDB entries found. Choose one:"), + TQString _answer = KInputDialog::getItem(i18n("CDDB Matches"), i18n("Several close CDDB entries found. Choose one:"), disc_ids, 0, false, &ok ); - QCString answer = _answer.utf8(); + TQCString answer = _answer.utf8(); if (ok){ // Get user selected match parse_query_resp(answer, catg, d_id, title); @@ -520,7 +520,7 @@ bool CDDB::queryCD(QValueList<int>& track_ofs) } // Now we can continue thinking... - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); kdDebug(7101) << "CDDB: found close CD: category=" << catg << " DiscId=" << d_id << " Title=`" << title << "'" << endl; @@ -547,7 +547,7 @@ bool CDDB::queryCD(QValueList<int>& track_ofs) if (save_local && file.open(IO_WriteOnly)) { kdDebug(7101) << "CDDB: file name to save =" << file.name() << endl; - QTextStream stream(&file); + TQTextStream stream(&file); if (!parse_read_resp(0, &stream)) { file.remove(); diff --git a/kaffeine/src/input/disc/cddb.h b/kaffeine/src/input/disc/cddb.h index e75eb2d..a9d0657 100644 --- a/kaffeine/src/input/disc/cddb.h +++ b/kaffeine/src/input/disc/cddb.h @@ -21,57 +21,58 @@ #ifndef CDDB_H #define CDDB_H -#include <qcstring.h> -#include <qvaluelist.h> -#include <qstringlist.h> -#include <qobject.h> +#include <tqcstring.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> +#include <tqobject.h> -class QFile; -class QTextStream; +class TQFile; +class TQTextStream; class KExtendedSocket; -class CDDB : public QObject +class CDDB : public TQObject { Q_OBJECT + TQ_OBJECT public: CDDB(); ~CDDB(); bool set_server(const char *hostname = 0, unsigned short int port = 0); - void add_cddb_dirs(const QStringList& list); + void add_cddb_dirs(const TQStringList& list); void save_cddb (bool save) { save_local = save; } - unsigned int get_discid(QValueList<int>& track_ofs); - bool queryCD(QValueList<int>& track_ofs); - QString title() const { return m_title.utf8(); } - QString artist() const { return m_artist.utf8(); } + unsigned int get_discid(TQValueList<int>& track_ofs); + bool queryCD(TQValueList<int>& track_ofs); + TQString title() const { return m_title.utf8(); } + TQString artist() const { return m_artist.utf8(); } int trackCount() const { return m_tracks; } - QString track(int i) const; + TQString track(int i) const; private: - bool readLine(QCString& s); - bool writeLine(const QCString& s); + bool readLine(TQCString& s); + bool writeLine(const TQCString& s); bool deinit(); - bool parse_read_resp(QTextStream*, QTextStream*); - bool searchLocal(unsigned int id, QFile *ret_file); + bool parse_read_resp(TQTextStream*, TQTextStream*); + bool searchLocal(unsigned int id, TQFile *ret_file); KExtendedSocket *ks; - QCString h_name; + TQCString h_name; unsigned short int port; bool remote; bool save_local; - QStringList cddb_dirs; - QCString buf; + TQStringList cddb_dirs; + TQCString buf; unsigned int m_discid; int m_tracks; - QString m_title; - QString m_artist; - QStringList m_names; + TQString m_title; + TQString m_artist; + TQStringList m_names; signals: - void cddbMessage( QString ); + void cddbMessage( TQString ); }; #endif /* CDDB_H */ diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp index 224a270..ea56305 100644 --- a/kaffeine/src/input/disc/disc.cpp +++ b/kaffeine/src/input/disc/disc.cpp @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qstringlist.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qvaluelist.h> -#include <qcursor.h> -#include <qtimer.h> -#include <qfile.h> -#include <qpopupmenu.h> -#include <qapplication.h> +#include <tqstringlist.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqvaluelist.h> +#include <tqcursor.h> +#include <tqtimer.h> +#include <tqfile.h> +#include <tqpopupmenu.h> +#include <tqapplication.h> #include <klocale.h> #include <kiconloader.h> @@ -42,28 +42,28 @@ #include "disc.h" #include "disc.moc" -MLabel::MLabel( QWidget *parent ) : QLabel( parent ) +MLabel::MLabel( TQWidget *tqparent ) : TQLabel( tqparent ) { setText("<center><font size=\"6\"><b>"+i18n("Audio CD")+"</b></font></center>"); } -void MLabel::paintEvent( QPaintEvent *pe ) +void MLabel::paintEvent( TQPaintEvent *pe ) { - QLabel::paintEvent( pe ); - QColorGroup cg = parentWidget()->colorGroup(); - QColor base = cg.base(); - QColor selection = cg.highlight(); + TQLabel::paintEvent( pe ); + TQColorGroup cg = tqparentWidget()->tqcolorGroup(); + TQColor base = cg.base(); + TQColor selection = cg.highlight(); int r = (base.red() + selection.red()) / 2; int b = (base.blue() + selection.blue()) / 2; int g = (base.green() + selection.green()) / 2; - setPaletteBackgroundColor( QColor(r, g, b) ); + setPaletteBackgroundColor( TQColor(r, g, b) ); } -MListView::MListView( QWidget *parent ) : KListView( parent ) +MListView::MListView( TQWidget *tqparent ) : KListView( tqparent ) { } -void MListView::resizeEvent( QResizeEvent *rev ) +void MListView::resizeEvent( TQResizeEvent *rev ) { int width = contentsRect().width(); setColumnWidth(0, 40); /* Track */ @@ -73,42 +73,42 @@ void MListView::resizeEvent( QResizeEvent *rev ) KListView::resizeEvent(rev); } -Disc::Disc( QWidget* parent, QObject *objParent, const char *name ) : KaffeineInput(objParent , name) +Disc::Disc( TQWidget* tqparent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name) { - mainWidget = new QVBox( parent ); - mainWidget->setSizePolicy( QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred) ); - split = new QSplitter( mainWidget ); + mainWidget = new TQVBox( tqparent ); + mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); + split = new TQSplitter( mainWidget ); split->setOpaqueResize( true ); - widg = new QWidget( split ); + widg = new TQWidget( split ); widg->setMinimumWidth( 200 ); - widg->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding ) ); - QVBoxLayout *wb = new QVBoxLayout( widg, 0, 0 ); + widg->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); + TQVBoxLayout *wb = new TQVBoxLayout( widg, 0, 0 ); discLab = new MLabel( widg ); wb->addWidget( discLab ); - playerBox = new QVBox( widg ); + playerBox = new TQVBox( widg ); wb->addWidget( playerBox ); playerBox->setMinimumWidth( 200 ); - playerBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding ) ); - panel = new QFrame( split ); + playerBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); + panel = new TQFrame( split ); split->moveToFirst( panel ); - panel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding ) ); - split->setResizeMode( panel, QSplitter::KeepSize ); + panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); + split->setResizeMode( panel, TQSplitter::KeepSize ); - QVBoxLayout *vb = new QVBoxLayout( panel, 3, 3 ); - cdBtn = new QToolButton( panel ); + TQVBoxLayout *vb = new TQVBoxLayout( panel, 3, 3 ); + cdBtn = new TQToolButton( panel ); cdBtn->setTextLabel( i18n("Play CD") ); - cdBtn->setTextPosition( QToolButton::Under ); + cdBtn->setTextPosition( TQToolButton::Under ); cdBtn->setUsesTextLabel( true ); - cdBtn->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ) ); - QToolTip::add( cdBtn, i18n("Play CD")); - ripBtn = new QToolButton( panel ); + cdBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + TQToolTip::add( cdBtn, i18n("Play CD")); + ripBtn = new TQToolButton( panel ); ripBtn->setTextLabel( i18n("Rip CD") ); - ripBtn->setTextPosition( QToolButton::Under ); + ripBtn->setTextPosition( TQToolButton::Under ); ripBtn->setUsesTextLabel( true ); - ripBtn->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ) ); - QToolTip::add( ripBtn, i18n("Rip CD")); + ripBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + TQToolTip::add( ripBtn, i18n("Rip CD")); - QHBoxLayout *h1 = new QHBoxLayout(); + TQHBoxLayout *h1 = new TQHBoxLayout(); h1->addWidget( cdBtn ); h1->addWidget( ripBtn ); vb->addLayout( h1 ); @@ -116,66 +116,66 @@ Disc::Disc( QWidget* parent, QObject *objParent, const char *name ) : KaffeineIn cdBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("cdaudio_unmount", KIcon::Toolbar) ); ripBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Toolbar) ); - connect( cdBtn, SIGNAL(clicked()), this, SLOT(startCD()) ); - connect( ripBtn, SIGNAL(clicked()), this, SLOT(startRIP()) ); + connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) ); + connect( ripBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startRIP()) ); - h1 = new QHBoxLayout(); - h1->addWidget( new QLabel( i18n("Artist:"), panel ) ); - artistLab = new QLabel( "", panel ); + h1 = new TQHBoxLayout(); + h1->addWidget( new TQLabel( i18n("Artist:"), panel ) ); + artistLab = new TQLabel( "", panel ); artistLab->setLineWidth(1); - artistLab->setFrameStyle(QFrame::Panel|QFrame::Sunken); - artistLab->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); + artistLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + artistLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); h1->addWidget( artistLab ); vb->addLayout( h1 ); - h1 = new QHBoxLayout(); - h1->addWidget( new QLabel( i18n("Album:"), panel ) ); - albumLab = new QLabel( "", panel ); + h1 = new TQHBoxLayout(); + h1->addWidget( new TQLabel( i18n("Album:"), panel ) ); + albumLab = new TQLabel( "", panel ); albumLab->setLineWidth(1); - albumLab->setFrameStyle(QFrame::Panel|QFrame::Sunken); - albumLab->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); + albumLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + albumLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); h1->addWidget( albumLab ); vb->addLayout( h1 ); list = new MListView( panel ); - list->setHScrollBarMode( QListView::AlwaysOff ); - connect( list, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(trackSelected(QListViewItem*)) ); + list->setHScrollBarMode( TQListView::AlwaysOff ); + connect( list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(trackSelected(TQListViewItem*)) ); list->addColumn( i18n("Track") ); list->addColumn( i18n("Title") ); list->addColumn( i18n("Duration") ); //list->setSortColumn( -1 ); list->setAllColumnsShowFocus( true ); - list->setSelectionMode(QListView::Extended); - list->setColumnWidthMode( 0, QListView::Manual ); - list->setColumnWidthMode( 1, QListView::Manual ); - list->setColumnWidthMode( 2, QListView::Manual ); - list->setResizeMode( QListView::NoColumn ); + list->setSelectionMode(TQListView::Extended); + list->setColumnWidthMode( 0, TQListView::Manual ); + list->setColumnWidthMode( 1, TQListView::Manual ); + list->setColumnWidthMode( 2, TQListView::Manual ); + list->setResizeMode( TQListView::NoColumn ); vb->addWidget( list ); - encodeWidget = new QWidget( panel ); - QGridLayout *grid = new QGridLayout( encodeWidget, 2, 2, 0, 3 ); - QLabel *lab = new QLabel( i18n("Select the tracks you want to rip and click the <b>Encode</b> button."), encodeWidget ); + encodeWidget = new TQWidget( panel ); + TQGridLayout *grid = new TQGridLayout( encodeWidget, 2, 2, 0, 3 ); + TQLabel *lab = new TQLabel( i18n("Select the tracks you want to rip and click the <b>Encode</b> button."), encodeWidget ); grid->addMultiCellWidget( lab, 0, 1, 0, 0); - enc = new QToolButton( encodeWidget ); + enc = new TQToolButton( encodeWidget ); grid->addMultiCellWidget( enc, 0, 0, 1, 1); enc->setTextLabel( i18n("Encode...") ); - enc->setTextPosition( QToolButton::Under ); + enc->setTextPosition( TQToolButton::Under ); enc->setUsesTextLabel( true ); enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) ); - enc->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); - connect( enc, SIGNAL(clicked()), this, SLOT(encode()) ); + enc->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) ); vb->addWidget( encodeWidget ); encodeWidget->hide(); - progressBar = new QProgressBar( 100, panel ); + progressBar = new TQProgressBar( 100, panel ); vb->addWidget( progressBar ); progressBar->hide(); - vb->addItem( new QSpacerItem( 1, 1, QSizePolicy::Preferred, QSizePolicy::Preferred ) ); + vb->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); artistLab->setPaletteBackgroundColor( list->paletteBackgroundColor() ); albumLab->setPaletteBackgroundColor( list->paletteBackgroundColor() ); - connect( &encodeTimer, SIGNAL(timeout()), this, SLOT(encodeProgress()) ); + connect( &encodeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(encodeProgress()) ); setXMLFile("kaffeinedisc.rc"); setupActions(); @@ -199,7 +199,7 @@ void Disc::togglePanel() panel->hide(); } -void Disc::getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames ) +void Disc::getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames ) { uiNames.append( i18n("Audio CD encoding") ); iconNames.append( "kilogram" ); @@ -215,23 +215,23 @@ void Disc::getTargets( QStringList &uiNames, QStringList &iconNames, QStringList targetNames.append( "DISC_VCD" ); } -bool Disc::execTarget( const QString &target ) +bool Disc::execTarget( const TQString &target ) { if ( target=="DISC_CDDA" ) { //emit showMe( this ); - QTimer::singleShot( 100, this, SLOT(startCD()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(startCD()) ); return true; } else if ( target=="DISC_RIP" ) { - QTimer::singleShot( 100, this, SLOT(startRIP()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(startRIP()) ); return true; } else if ( target=="DISC_DVD" ) { - QTimer::singleShot( 100, this, SLOT(startDVD()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(startDVD()) ); return true; } else if ( target=="DISC_VCD" ) { - QTimer::singleShot( 100, this, SLOT(startVCD()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(startVCD()) ); return true; } return false; @@ -239,7 +239,7 @@ bool Disc::execTarget( const QString &target ) void Disc::loadConfig( KConfig* config ) { - QValueList<int> sl; + TQValueList<int> sl; config->setGroup("Disc"); sl = config->readIntListEntry("SplitSizes"); @@ -254,21 +254,21 @@ void Disc::saveConfig() config->writeEntry( "SplitSizes", split->sizes() ); } -QWidget* Disc::wantPlayerWindow() +TQWidget* Disc::wantPlayerWindow() { return playerBox; } -QWidget* Disc::inputMainWidget() +TQWidget* Disc::inputMainWidget() { return mainWidget; } void Disc::setupActions() { - new KAction(i18n("Open &DVD"), "dvd_unmount", 0, this, SLOT(startDVD()), actionCollection(), "file_open_dvd"); - new KAction(i18n("Open &VCD"), "cdrom_unmount", 0, this, SLOT(startVCD()), actionCollection(), "file_open_vcd"); - new KAction(i18n("Open &Audio-CD"), "cdaudio_unmount", 0, this, SLOT(startCD()), actionCollection(), "file_open_audiocd"); + new KAction(i18n("Open &DVD"), "dvd_unmount", 0, this, TQT_SLOT(startDVD()), actionCollection(), "file_open_dvd"); + new KAction(i18n("Open &VCD"), "cdrom_unmount", 0, this, TQT_SLOT(startVCD()), actionCollection(), "file_open_vcd"); + new KAction(i18n("Open &Audio-CD"), "cdaudio_unmount", 0, this, TQT_SLOT(startCD()), actionCollection(), "file_open_audiocd"); } void Disc::playerStopped() @@ -300,8 +300,8 @@ void Disc::setEncoding( bool b ) void Disc::encode() { - QListViewItem *it; - QStringList tracklist; + TQListViewItem *it; + TQStringList tracklist; it = list->firstChild(); if ( !it ) @@ -353,29 +353,29 @@ void Disc::encodeProgress() void Disc::setCurrent( int n ) { - QListViewItem *it; + TQListViewItem *it; it = list->firstChild(); while ( it!=0 ) { if ( it->text(0).toInt()==n ) it->setPixmap( 1, currentPixmap ); else - it->setPixmap( 1, QPixmap() ); + it->setPixmap( 1, TQPixmap() ); it = it->nextSibling(); } } -void Disc::trackSelected( QListViewItem *it ) +void Disc::trackSelected( TQListViewItem *it ) { if ( !it ) return; - MRL mrl( QString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + MRL mrl( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setTitle( it->text(1) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); mrl.setTrack( it->text(0) ); - mrl.setMime( QString("audio/cdda") ); + mrl.setMime( TQString("audio/cdda") ); trackCurrent = it->text(0).toInt(); setCurrent( trackCurrent ); emit play( mrl, this ); @@ -386,15 +386,15 @@ void Disc::startRIP() startCD( "", true ); } -void Disc::startCD( const QString &device, bool rip ) +void Disc::startCD( const TQString &device, bool rip ) { - QStringList s; + TQStringList s; bool init=false; - QValueList<int> qvl; + TQValueList<int> qvl; int i; KListViewItem *it; MRL mrl; - QStringList dcopList, devList; + TQStringList dcopList, devList; bool ok=false; if ( !cdBtn->isEnabled() ) { @@ -419,7 +419,7 @@ void Disc::startCD( const QString &device, bool rip ) i+=13; } if ( devList.count()>1 ) { - QString choice = KInputDialog::getItem( i18n("Audio CD"), i18n("Several Audio CD found. Choose one:"), + TQString choice = KInputDialog::getItem( i18n("Audio CD"), i18n("Several Audio CD found. Choose one:"), devList, 0, false, &ok ); if ( ok ) s.append( choice ); @@ -439,8 +439,8 @@ void Disc::startCD( const QString &device, bool rip ) } } - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); - qApp->processEvents(); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); + tqApp->processEvents(); para = new Paranoia(); for ( i=0; i<(int)s.count(); i++ ) { @@ -463,13 +463,13 @@ void Disc::startCD( const QString &device, bool rip ) artistLab->setText( cddb->artist() ); albumLab->setText( cddb->title() ); for ( i=0; i<para->getTracks(); i++ ) { - it = new KListViewItem( list, QString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) ); + it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) ); if ( i==0 ) { - mrl.setURL( QString("cdda://%1/1").arg( currentDevice ) ); + mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); mrl.setTitle( cddb->track(i) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); - mrl.setTrack( QString().sprintf("%02d", i+1) ); + mrl.setTrack( TQString().sprintf("%02d", i+1) ); } } } @@ -479,13 +479,13 @@ void Disc::startCD( const QString &device, bool rip ) artistLab->setText( cddb->artist() ); albumLab->setText( cddb->title() ); for ( i=0; i<para->getTracks(); i++ ) { - it = new KListViewItem( list, QString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) ); + it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) ); if ( i==0 ) { - mrl.setURL( QString("cdda://%1/1").arg( currentDevice ) ); + mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); mrl.setTitle( cddb->track(i) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); - mrl.setTrack( QString().sprintf("%02d", i+1) ); + mrl.setTrack( TQString().sprintf("%02d", i+1) ); } } } @@ -493,45 +493,45 @@ void Disc::startCD( const QString &device, bool rip ) artistLab->setText( i18n("Unknown") ); albumLab->setText( i18n("Unknown") ); for ( i=0; i<para->getTracks(); i++ ) { - it = new KListViewItem( list, QString().sprintf("%02d", i+1), i18n("Track")+QString().sprintf("%02d", i+1), para->trackTime(i) ); + it = new KListViewItem( list, TQString().sprintf("%02d", i+1), i18n("Track")+TQString().sprintf("%02d", i+1), para->trackTime(i) ); if ( i==0 ) { - mrl.setURL( QString("cdda://%1/1").arg( currentDevice ) ); - mrl.setTitle( i18n("Track")+QString().sprintf("%02d", i+1) ); + mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); + mrl.setTitle( i18n("Track")+TQString().sprintf("%02d", i+1) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); - mrl.setTrack( QString().sprintf("%02d", i+1) ); + mrl.setTrack( TQString().sprintf("%02d", i+1) ); } } } } delete cddb; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); encodeWidget->show(); emit showMe( this ); if ( !rip && !mrl.isEmpty() ) { - mrl.setMime( QString("audio/cdda") ); + mrl.setMime( TQString("audio/cdda") ); trackCurrent = mrl.track().toInt(); setCurrent( trackCurrent ); emit play( mrl, this ); } } else { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); KMessageBox::information( 0, i18n("No audio CD found."), i18n("Warning") ); } delete para; para = NULL; } -void Disc::startDVD( const QString &device ) +void Disc::startDVD( const TQString &device ) { MRL mrl; - QStringList dcopList, devList; + TQStringList dcopList, devList; int i; bool ok=false; if ( !device.isEmpty() ) - mrl.setURL( QString("dvd://%1").arg(device) ); + mrl.setURL( TQString("dvd://%1").tqarg(device) ); else { DCOPRef mediamanager("kded","mediamanager"); DCOPReply reply = mediamanager.call("fullList()"); @@ -546,32 +546,32 @@ void Disc::startDVD( const QString &device ) else if ( dcopList[i+10]=="media/cdrom_mounted" || dcopList[i+10]=="media/cdwriter_mounted" || dcopList[i+10]=="media/dvd_mounted" ) { - if ( QFile::exists(dcopList[i+6]+"/video_ts") || QFile::exists(dcopList[i+6]+"/VIDEO_TS") ) + if ( TQFile::exists(dcopList[i+6]+"/video_ts") || TQFile::exists(dcopList[i+6]+"/VIDEO_TS") ) devList.append( dcopList[i+5] ); } i+=13; } if ( devList.count()>1 ) { - QString choice = KInputDialog::getItem( i18n("DVD Video"), i18n("Several DVD Video found. Choose one:"), + TQString choice = KInputDialog::getItem( i18n("DVD Video"), i18n("Several DVD Video found. Choose one:"), devList, 0, false, &ok ); if ( ok ) - mrl.setURL( QString("dvd://%1").arg(choice) ); + mrl.setURL( TQString("dvd://%1").tqarg(choice) ); else return; } else if ( devList.count()==1 ) - mrl.setURL( QString("dvd://%1").arg(devList[0]) ); + mrl.setURL( TQString("dvd://%1").tqarg(devList[0]) ); else { //KMessageBox::information( 0, i18n("No DVD Video found."), i18n("Warning") ); //return; - mrl.setURL( QString("dvd://") ); + mrl.setURL( TQString("dvd://") ); } } else - mrl.setURL( QString("dvd://") ); + mrl.setURL( TQString("dvd://") ); } - mrl.setMime( QString("video/dvd") ); + mrl.setMime( TQString("video/dvd") ); if ( !progressBar->isVisible() ) { list->clear(); @@ -583,15 +583,15 @@ void Disc::startDVD( const QString &device ) emit play( mrl, this ); } -void Disc::startVCD( const QString &device ) +void Disc::startVCD( const TQString &device ) { MRL mrl; - QStringList dcopList, devList; + TQStringList dcopList, devList; int i; bool ok=false; if ( !device.isEmpty() ) - mrl.setURL( QString("vcd://%1").arg(device) ); + mrl.setURL( TQString("vcd://%1").tqarg(device) ); else { DCOPRef mediamanager("kded","mediamanager"); DCOPReply reply = mediamanager.call("fullList()"); @@ -606,26 +606,26 @@ void Disc::startVCD( const QString &device ) i+=13; } if ( devList.count()>1 ) { - QString choice = KInputDialog::getItem( i18n("VCD-SVCD"), i18n("Several (S)VCD found. Choose one:"), + TQString choice = KInputDialog::getItem( i18n("VCD-SVCD"), i18n("Several (S)VCD found. Choose one:"), devList, 0, false, &ok ); if ( ok ) - mrl.setURL( QString("vcd://%1").arg(choice) ); + mrl.setURL( TQString("vcd://%1").tqarg(choice) ); else return; } else if ( devList.count()==1 ) - mrl.setURL( QString("vcd://%1").arg(devList[0]) ); + mrl.setURL( TQString("vcd://%1").tqarg(devList[0]) ); else { //KMessageBox::information( 0, i18n("No (S)VCD found."), i18n("Warning") ); //return; - mrl.setURL( QString("vcd://") ); + mrl.setURL( TQString("vcd://") ); } } else - mrl.setURL( QString("vcd://") ); + mrl.setURL( TQString("vcd://") ); } - mrl.setMime( QString("video/vcd") ); + mrl.setMime( TQString("video/vcd") ); if ( !progressBar->isVisible() ) { list->clear(); @@ -639,7 +639,7 @@ void Disc::startVCD( const QString &device ) bool Disc::currentTrack( MRL &mrl ) { - QListViewItem *it; + TQListViewItem *it; if ( !trackCurrent ) return false; @@ -649,12 +649,12 @@ bool Disc::currentTrack( MRL &mrl ) return false; while ( it!=0 ) { if ( it->text(0).toInt()==trackCurrent ) { - mrl.setURL( QString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setTitle( it->text(1) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); mrl.setTrack( it->text(0) ); - mrl.setMime( QString("audio/cdda") ); + mrl.setMime( TQString("audio/cdda") ); setCurrent( trackCurrent ); return true; } @@ -671,7 +671,7 @@ bool Disc::playbackFinished( MRL &mrl ) bool Disc::nextTrack( MRL &mrl ) { - QListViewItem *it; + TQListViewItem *it; if ( !trackCurrent ) return false; @@ -681,12 +681,12 @@ bool Disc::nextTrack( MRL &mrl ) return false; while ( it!=0 ) { if ( it->text(0).toInt()==trackCurrent+1 ) { - mrl.setURL( QString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setTitle( it->text(1) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); mrl.setTrack( it->text(0) ); - mrl.setMime( QString("audio/cdda") ); + mrl.setMime( TQString("audio/cdda") ); ++trackCurrent; setCurrent( trackCurrent ); return true; @@ -695,12 +695,12 @@ bool Disc::nextTrack( MRL &mrl ) } it = list->firstChild(); - mrl.setURL( QString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setTitle( it->text(1) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); mrl.setTrack( it->text(0) ); - mrl.setMime( QString("audio/cdda") ); + mrl.setMime( TQString("audio/cdda") ); trackCurrent = 1; setCurrent( trackCurrent ); return true; @@ -708,7 +708,7 @@ bool Disc::nextTrack( MRL &mrl ) bool Disc::previousTrack( MRL &mrl ) { - QListViewItem *it; + TQListViewItem *it; if ( !trackCurrent ) return false; @@ -718,12 +718,12 @@ bool Disc::previousTrack( MRL &mrl ) return false; while ( it!=0 ) { if ( it->text(0).toInt()==trackCurrent-1 ) { - mrl.setURL( QString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setTitle( it->text(1) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); mrl.setTrack( it->text(0) ); - mrl.setMime( QString("audio/cdda") ); + mrl.setMime( TQString("audio/cdda") ); --trackCurrent; setCurrent( trackCurrent ); return true; @@ -736,7 +736,7 @@ bool Disc::previousTrack( MRL &mrl ) bool Disc::trackNumber( int number, MRL &mrl ) { - QListViewItem *it; + TQListViewItem *it; if ( !trackCurrent ) return false; @@ -746,12 +746,12 @@ bool Disc::trackNumber( int number, MRL &mrl ) return false; while ( it!=0 ) { if ( it->text(0).toInt()==number ) { - mrl.setURL( QString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setTitle( it->text(1) ); mrl.setArtist( artistLab->text() ); mrl.setAlbum( albumLab->text() ); mrl.setTrack( it->text(0) ); - mrl.setMime( QString("audio/cdda") ); + mrl.setMime( TQString("audio/cdda") ); trackCurrent=number; setCurrent( trackCurrent ); return true; diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h index c62c905..fe1a1ad 100644 --- a/kaffeine/src/input/disc/disc.h +++ b/kaffeine/src/input/disc/disc.h @@ -26,30 +26,31 @@ #include <kconfig.h> #include <klistview.h> -#include <qframe.h> -#include <qvbox.h> -#include <qsplitter.h> -#include <qtoolbutton.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qprogressbar.h> -#include <qguardedptr.h> +#include <tqframe.h> +#include <tqvbox.h> +#include <tqsplitter.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqprogressbar.h> +#include <tqguardedptr.h> #include "kaffeineinput.h" #include "paranoia.h" class MRL; -class MLabel : public QLabel +class MLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - MLabel( QWidget *parent ); + MLabel( TQWidget *tqparent ); ~MLabel() {} protected: - void paintEvent( QPaintEvent * ); + void paintEvent( TQPaintEvent * ); }; @@ -57,13 +58,14 @@ protected: class MListView : public KListView { Q_OBJECT + TQ_OBJECT public: - MListView( QWidget *parent ); + MListView( TQWidget *tqparent ); ~MListView() {} protected: - virtual void resizeEvent(QResizeEvent*); + virtual void resizeEvent(TQResizeEvent*); }; @@ -71,15 +73,16 @@ protected: class Disc : public KaffeineInput { Q_OBJECT + TQ_OBJECT public: - Disc(QWidget *parent, QObject *objParent, const char *name=0); + Disc(TQWidget *tqparent, TQObject *objParent, const char *name=0); ~Disc(); // Reimplemented from KaffeineInput public: - QWidget *wantPlayerWindow(); - QWidget *inputMainWidget(); + TQWidget *wantPlayerWindow(); + TQWidget *inputMainWidget(); void mergeMeta(const MRL&); bool nextTrack( MRL& ); bool previousTrack( MRL& ); @@ -88,21 +91,21 @@ public: bool playbackFinished( MRL& ); void toggleLayout( bool ); void playerStopped(); - void getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames ); + void getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames ); void togglePanel(); - bool execTarget( const QString& ); + bool execTarget( const TQString& ); void saveConfig(); //*************************************** public slots: - void startCD( const QString &device="", bool rip=false ); - void startDVD( const QString &device="" ); - void startVCD( const QString &device="" ); + void startCD( const TQString &device="", bool rip=false ); + void startDVD( const TQString &device="" ); + void startVCD( const TQString &device="" ); void startRIP(); public: - QVBox *mainWidget; - QVBox *playerBox; + TQVBox *mainWidget; + TQVBox *playerBox; private: void loadConfig( KConfig* config ); @@ -110,24 +113,24 @@ private: void setCurrent( int n ); void setupActions(); - QLabel *artistLab, *albumLab; - QGuardedPtr<QWidget> widg; - QToolButton *ripBtn, *cdBtn; - QToolButton *enc; - QSplitter *split; - QGuardedPtr<QFrame> panel; + TQLabel *artistLab, *albumLab; + TQGuardedPtr<TQWidget> widg; + TQToolButton *ripBtn, *cdBtn; + TQToolButton *enc; + TQSplitter *split; + TQGuardedPtr<TQFrame> panel; MLabel *discLab; Paranoia *para; MListView *list; int trackCurrent; - QString currentDevice; - QPixmap currentPixmap; - QWidget *encodeWidget; - QTimer encodeTimer; - QProgressBar *progressBar; + TQString currentDevice; + TQPixmap currentPixmap; + TQWidget *encodeWidget; + TQTimer encodeTimer; + TQProgressBar *progressBar; private slots: - void trackSelected( QListViewItem* ); + void trackSelected( TQListViewItem* ); void encode(); void encodeProgress(); void setEncoding( bool ); diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp index fad1729..9a32743 100644 --- a/kaffeine/src/input/disc/paranoia.cpp +++ b/kaffeine/src/input/disc/paranoia.cpp @@ -25,16 +25,16 @@ #include <unistd.h> #include <math.h> -#include <qfile.h> -#include <qslider.h> -#include <qlcdnumber.h> -#include <qdir.h> -#include <qlineedit.h> -#include <qbuttongroup.h> -#include <qtoolbutton.h> -#include <qcheckbox.h> +#include <tqfile.h> +#include <tqslider.h> +#include <tqlcdnumber.h> +#include <tqdir.h> +#include <tqlineedit.h> +#include <tqbuttongroup.h> +#include <tqtoolbutton.h> +#include <tqcheckbox.h> -#include <qcombobox.h> +#include <tqcombobox.h> #include <kmessagebox.h> #include <klocale.h> @@ -50,7 +50,7 @@ #define DEFAULT_DRIVE "/dev/cdrom" -KiloConfig::KiloConfig( QWidget *parent, KConfig *confile, const QStringList &encoders ) : ParanoiaSettings( parent ) +KiloConfig::KiloConfig( TQWidget *tqparent, KConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( tqparent ) { int i; @@ -59,14 +59,14 @@ KiloConfig::KiloConfig( QWidget *parent, KConfig *confile, const QStringList &en cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", KIcon::Small) ) ); baseDirBtn->setIconSet( icon->loadIconSet("fileopen", KIcon::Small) ); delete icon; - connect( baseDirBtn, SIGNAL( clicked() ), this, SLOT( setBaseDir() ) ); + connect( baseDirBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setBaseDir() ) ); Conf = confile; Conf->setGroup( "Paranoia" ); - baseDirLineEdit->setText( Conf->readEntry( "Basedir", QDir::homeDirPath() ) ); + baseDirLineEdit->setText( Conf->readEntry( "Basedir", TQDir::homeDirPath() ) ); paranoiaGroup->setButton( Conf->readNumEntry( "Mode", 0 ) ); normCb->setChecked( Conf->readBoolEntry( "Normalize", false ) ); encoderComb->insertStringList( encoders ); - QString s = Conf->readEntry( "CurrentEncoder", "" ); + TQString s = Conf->readEntry( "CurrentEncoder", "" ); if ( !s.isEmpty() ) { for ( i=0; i<(int)encoders.count(); i++ ) { if ( encoders[i]==s ) { @@ -79,15 +79,15 @@ KiloConfig::KiloConfig( QWidget *parent, KConfig *confile, const QStringList &en void KiloConfig::setBaseDir() { Conf->setGroup( "Paranoia" ); - QString d = Conf->readEntry( "Basedir", QDir::homeDirPath() ); - QString u = KFileDialog::getExistingDirectory( d ); + TQString d = Conf->readEntry( "Basedir", TQDir::homeDirPath() ); + TQString u = KFileDialog::getExistingDirectory( d ); if ( u!="" ) { baseDirLineEdit->setText( u ); Conf->writeEntry( "Basedir", u ); } } -QString KiloConfig::getEncoder() +TQString KiloConfig::getEncoder() { return encoderComb->currentText(); } @@ -97,7 +97,7 @@ bool KiloConfig::getNormalize() return normCb->isChecked(); } -QString KiloConfig::getBaseDir() +TQString KiloConfig::getBaseDir() { return baseDirLineEdit->text().stripWhiteSpace(); } @@ -131,10 +131,10 @@ Paranoia::Paranoia() isRunning = false; } -bool Paranoia::init( QString dev ) +bool Paranoia::init( TQString dev ) { - QString s; - QFile f; + TQString s; + TQFile f; if ( p!=0 ) paranoia_free( p ); if (d!=0 ) cdda_close( d ); @@ -162,27 +162,27 @@ bool Paranoia::init( QString dev ) bool Paranoia::findCdrom() { - QFile *f; - QString c; - QString s=""; + TQFile *f; + TQString c; + TQString s=""; int pos, i; bool stop=false; char dev[4][4]={"","","",""}; - f = new QFile( "/proc/sys/dev/cdrom/info" ); + f = new TQFile( "/proc/sys/dev/cdrom/info" ); if ( !f->open(IO_ReadOnly) ) return false; - QTextStream t( f ); + TQTextStream t( f ); while ( !t.eof() && !stop ) { s = t.readLine(); - if ( s.contains("drive name:") ) + if ( s.tqcontains("drive name:") ) stop = true; } if ( !stop ) return false; - pos = s.find(":"); + pos = s.tqfind(":"); c = s.right( s.length()-pos-1 ); sscanf( c.latin1(), "%s %s %s %s", dev[0], dev[1], dev[2], dev[3] ); @@ -194,19 +194,19 @@ bool Paranoia::findCdrom() return false; } -bool Paranoia::procCdrom( QString name ) +bool Paranoia::procCdrom( TQString name ) { int pos; - if ( name.contains("sr") ) { - pos = name.find("r"); + if ( name.tqcontains("sr") ) { + pos = name.tqfind("r"); name = name.right( name.length()-pos-1 ); name = "/dev/scd"+name; d = cdda_identify( name.ascii(), CDDA_MESSAGE_PRINTIT, 0 ); if ( cdda_open( d )==0 ) return true; } - else if ( name.contains("hd") ) { + else if ( name.tqcontains("hd") ) { name = "/dev/"+name; d = cdda_identify( name.ascii(), CDDA_MESSAGE_PRINTIT, 0 ); if ( cdda_open( d )==0 ) @@ -227,14 +227,14 @@ void Paranoia::setMode( int mode ) paranoia_modeset( p, mode ); } -bool Paranoia::encode( const QStringList &list, QWidget *parent ) +bool Paranoia::encode( const TQStringList &list, TQWidget *tqparent ) { - QStringList desktop; - QStringList encoderName; + TQStringList desktop; + TQStringList encoderName; encodingList.clear(); encodingList = list; - myParent = parent; + myParent = tqparent; // check for encoders KTrader::OfferList offers = KTrader::self()->query("KaffeineAudioEncoder"); @@ -252,13 +252,13 @@ bool Paranoia::encode( const QStringList &list, QWidget *parent ) KiloConfig dlg( myParent, KGlobal::config(), encoderName ); int ret = dlg.exec(); - if ( ret!=QDialog::Accepted ) + if ( ret!=TQDialog::Accepted ) return false; normalize = dlg.getNormalize(); baseDir = dlg.getBaseDir(); paraMode = dlg.getParanoiaMode(); - QString s = dlg.getEncoder(); + TQString s = dlg.getEncoder(); for ( ret=0; ret<(int)encoderName.count(); ++ret ) { if ( encoderName[ret]==s ) { encoderDesktop = desktop[ret]; @@ -274,7 +274,7 @@ bool Paranoia::encode( const QStringList &list, QWidget *parent ) return false; } - if ( !setPath( baseDir, QString(encodingList[0]).replace("/","_"), QString(encodingList[1]).replace("/","_") ) ) { + if ( !setPath( baseDir, TQString(encodingList[0]).tqreplace("/","_"), TQString(encodingList[1]).tqreplace("/","_") ) ) { return false; } isRunning = true; @@ -282,20 +282,20 @@ bool Paranoia::encode( const QStringList &list, QWidget *parent ) return true; } -bool Paranoia::loadEncoder( QWidget *parent ) +bool Paranoia::loadEncoder( TQWidget *tqparent ) { int error = 0; KService::Ptr service = KService::serviceByDesktopName( encoderDesktop ); if (!service) { - KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) ); + KMessageBox::error( tqparent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) ); return false; } - if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) { + if ( service->serviceTypes().tqcontains("KaffeineAudioEncoder") ) { currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error); if (error > 0) { - KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) ); + KMessageBox::error( tqparent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) ); return false; } else @@ -313,9 +313,9 @@ void Paranoia::unloadEncoder() //kdDebug()<<"... encoder unloaded."<<endl; } -bool Paranoia::validPath( QString path ) +bool Paranoia::validPath( TQString path ) { - QDir dir; + TQDir dir; dir.setPath( path ); if ( !dir.exists() ) { @@ -327,9 +327,9 @@ bool Paranoia::validPath( QString path ) return true; } -bool Paranoia::setPath( QString &path, const QString &artist, const QString &album ) +bool Paranoia::setPath( TQString &path, const TQString &artist, const TQString &album ) { - QString s; + TQString s; if ( !path.endsWith("/") ) path = path+"/"; @@ -368,10 +368,10 @@ void Paranoia::run() signed short *buf; int i, n, len, retlen; long curpos, endpos; - QFile f, fn; + TQFile f, fn; float max; float factor; - QString s; + TQString s; char *encoded; int overallSectors=0; int sectorCount=0; @@ -389,7 +389,7 @@ void Paranoia::run() for ( i=2; i<(int)encodingList.count(); ++i ) { n = encodingList[i].left(2).toInt(); - s = QString(encodingList[i]).replace("/","_")+currentEncoder->getExtension(); + s = TQString(encodingList[i]).tqreplace("/","_")+currentEncoder->getExtension(); f.setName( baseDir+s ); initTrack( n ); max = 0; @@ -509,9 +509,9 @@ bool Paranoia::isAudio( int t ) else return false; } -QString Paranoia::trackSize( int t ) +TQString Paranoia::trackSize( int t ) { - QString s, c; + TQString s, c; long total; total = CDIO_CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) ); @@ -526,9 +526,9 @@ long Paranoia::trackSectorSize( int t ) return cdda_track_lastsector( d, t )-cdda_track_firstsector( d, t ); } -QString Paranoia::trackTime( int t ) +TQString Paranoia::trackTime( int t ) { - QString c; + TQString c; long total, time; int m, s; diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h index ae269d4..0957ffe 100644 --- a/kaffeine/src/input/disc/paranoia.h +++ b/kaffeine/src/input/disc/paranoia.h @@ -21,9 +21,9 @@ #ifndef PARANOIA_H #define PARANOIA_H -#include <qstringlist.h> -#include <qthread.h> -#include <qwidget.h> +#include <tqstringlist.h> +#include <tqthread.h> +#include <tqwidget.h> #include <kconfig.h> @@ -39,15 +39,16 @@ extern "C" class KiloConfig : public ParanoiaSettings { Q_OBJECT + TQ_OBJECT public: - KiloConfig( QWidget *parent, KConfig *confile, const QStringList &encoders ); + KiloConfig( TQWidget *tqparent, KConfig *confile, const TQStringList &encoders ); ~KiloConfig(); - QString getEncoder(); + TQString getEncoder(); bool getNormalize(); - QString getBaseDir(); + TQString getBaseDir(); int getParanoiaMode(); public slots: @@ -60,15 +61,15 @@ private: KConfig *Conf; }; -class Paranoia : public QThread +class Paranoia : public TQThread { public: Paranoia(); - bool init( QString dev ); + bool init( TQString dev ); ~Paranoia(); - bool encode( const QStringList&, QWidget* ); + bool encode( const TQStringList&, TQWidget* ); long getTracks(); - QString trackTime( int t ); + TQString trackTime( int t ); int trackFirstSector( int t ); int discFirstSector(); int discLastSector(); @@ -79,28 +80,28 @@ public: private: bool findCdrom(); - bool procCdrom( QString name ); + bool procCdrom( TQString name ); bool initTrack( int t ); void setMode( int mode ); bool isAudio( int t ); - QString trackSize( int t ); + TQString trackSize( int t ); long trackSectorSize( int t ); - bool loadEncoder( QWidget* ); + bool loadEncoder( TQWidget* ); void unloadEncoder(); - bool validPath( QString path ); - bool setPath( QString &path, const QString &artist, const QString &album ); + bool validPath( TQString path ); + bool setPath( TQString &path, const TQString &artist, const TQString &album ); long nTracks; cdrom_drive_t *d; cdrom_paranoia_t *p; long currentSector, endOfTrack; bool isRunning; - QStringList encodingList; - QWidget *myParent; + TQStringList encodingList; + TQWidget *myParent; KaffeineAudioEncoder *currentEncoder; - QString encoderDesktop; + TQString encoderDesktop; bool normalize; - QString baseDir; + TQString baseDir; int paraMode; int progress; }; diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui index 487899c..d73e492 100644 --- a/kaffeine/src/input/disc/paranoiasettings.ui +++ b/kaffeine/src/input/disc/paranoiasettings.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ParanoiaSettings</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ParanoiaSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>encoderGroup</cstring> </property> @@ -41,14 +41,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="0"> + <widget class="TQComboBox" row="0" column="0"> <property name="name"> <cstring>encoderComb</cstring> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>basedirGroup</cstring> </property> @@ -65,7 +65,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QToolButton" row="0" column="1"> + <widget class="TQToolButton" row="0" column="1"> <property name="name"> <cstring>baseDirBtn</cstring> </property> @@ -73,7 +73,7 @@ <string>...</string> </property> </widget> - <widget class="QLineEdit" row="0" column="0"> + <widget class="TQLineEdit" row="0" column="0"> <property name="name"> <cstring>baseDirLineEdit</cstring> </property> @@ -91,7 +91,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>paranoiaGroup</cstring> </property> @@ -108,7 +108,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>paranoiaRb0</cstring> </property> @@ -116,7 +116,7 @@ <string>Disable all checking</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>paranoiaRb1</cstring> </property> @@ -124,7 +124,7 @@ <string>Normal mode</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>paranoiaRb2</cstring> </property> @@ -134,7 +134,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -145,7 +145,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>normCb</cstring> </property> @@ -165,16 +165,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>152</width> <height>20</height> @@ -248,5 +248,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp index 5198e43..85b9f7a 100644 --- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp +++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp @@ -21,7 +21,7 @@ #include "kaffeineaudioencoder.h" #include "kaffeineaudioencoder.moc" -KaffeineAudioEncoder::KaffeineAudioEncoder(QObject* parent, const char* name) : KParts::Part( parent, name ) +KaffeineAudioEncoder::KaffeineAudioEncoder(TQObject* tqparent, const char* name) : KParts::Part( tqparent, name ) { } diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h index 1dc3616..3cfc570 100644 --- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h +++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h @@ -24,8 +24,8 @@ #include <kparts/part.h> #include <kconfig.h> -#include <qstring.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqwidget.h> /* * Base-Class for Kaffeine audio encoder plugins. @@ -34,17 +34,18 @@ class KDE_EXPORT KaffeineAudioEncoder : public KParts::Part { Q_OBJECT + TQ_OBJECT public: - KaffeineAudioEncoder(QObject* parent, const char* name); + KaffeineAudioEncoder(TQObject* tqparent, const char* name); virtual ~KaffeineAudioEncoder(); // return false if the user's canceled. - virtual bool options( QWidget*, KConfig* ) {return false;} + virtual bool options( TQWidget*, KConfig* ) {return false;} // your file extension, e.g. ".ogg" - virtual QString getExtension() {return QString();} + virtual TQString getExtension() {return TQString();} - virtual void start( QString/*title*/=0, QString/*artist*/=0, QString/*album*/=0, QString/*tracknumber*/=0, QString/*genre*/=0 ) {} + virtual void start( TQString/*title*/=0, TQString/*artist*/=0, TQString/*album*/=0, TQString/*tracknumber*/=0, TQString/*genre*/=0 ) {} virtual char* getHeader( int&/*len*/ ) {return NULL;} virtual char* encode( char*/*data*/, int /*datalen*/, int&/*len*/ ) {return NULL;} virtual char* stop( int& /*len*/) {return NULL;} diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp index ddfc5c2..19f3737 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp +++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qcombobox.h> -#include <qcheckbox.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> #include <kparts/genericfactory.h> #include <klocale.h> @@ -29,7 +29,7 @@ #include "klameenc.h" #include "klameenc.moc" -LameSettings::LameSettings( QWidget *parent, KConfig *confile ) : LameConfig( parent ) +LameSettings::LameSettings( TQWidget *tqparent, KConfig *confile ) : LameConfig( tqparent ) { KIconLoader *icon = new KIconLoader(); okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) ); @@ -79,8 +79,8 @@ bool LameSettings::isVBR() K_EXPORT_COMPONENT_FACTORY (libkaffeinemp3lame, KParts::GenericFactory<KLameEnc>) -KLameEnc::KLameEnc( QWidget*, const char*, QObject* parent, const char* name, const QStringList& ) - : KaffeineAudioEncoder(parent,name) +KLameEnc::KLameEnc( TQWidget*, const char*, TQObject* tqparent, const char* name, const TQStringList& ) + : KaffeineAudioEncoder(tqparent,name) { setInstance(KParts::GenericFactory<KLameEnc>::instance()); } @@ -96,23 +96,23 @@ KAboutData *KLameEnc::createAboutData() return aboutData; } -QString KLameEnc::getExtension() +TQString KLameEnc::getExtension() { - return QString(".mp3"); + return TQString(".mp3"); } -bool KLameEnc::options( QWidget *parent, KConfig *conf ) +bool KLameEnc::options( TQWidget *tqparent, KConfig *conf ) { - LameSettings dlg( parent, conf ); + LameSettings dlg( tqparent, conf ); int ret = dlg.exec(); - if ( ret!=QDialog::Accepted ) + if ( ret!=TQDialog::Accepted ) return false; bitrate = dlg.getBitrate(); vbr = dlg.isVBR(); return true; } -void KLameEnc::start( QString title, QString artist, QString album, QString tracknumber, QString genre ) +void KLameEnc::start( TQString title, TQString artist, TQString album, TQString tracknumber, TQString genre ) { flags = lame_init(); lame_set_mode( flags, STEREO ); diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h index 0550149..faa944e 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h +++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h @@ -31,8 +31,9 @@ class LameSettings : public LameConfig { Q_OBJECT + TQ_OBJECT public: - LameSettings( QWidget *parent, KConfig *confile ); + LameSettings( TQWidget *tqparent, KConfig *confile ); ~LameSettings(); int getBitrate(); @@ -48,16 +49,17 @@ private: class KLameEnc : public KaffeineAudioEncoder { Q_OBJECT + TQ_OBJECT public: - KLameEnc( QWidget*, const char*, QObject*, const char*, const QStringList& ); + KLameEnc( TQWidget*, const char*, TQObject*, const char*, const TQStringList& ); ~KLameEnc(); // Reimplemented from KaffeineAudioEncoder - bool options( QWidget*, KConfig* ); - QString getExtension(); - void start( QString title=0, QString artist=0, QString album=0, QString tracknumber=0, QString genre=0 ); + bool options( TQWidget*, KConfig* ); + TQString getExtension(); + void start( TQString title=0, TQString artist=0, TQString album=0, TQString tracknumber=0, TQString genre=0 ); char* getHeader( int &len ); char* encode( char *data, int datalen, int &len ); char* stop( int &len ); diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui index 202040a..bb184cd 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui +++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>LameConfig</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>LameConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>vbrCb</cstring> </property> @@ -49,15 +49,15 @@ <string>VBR</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -73,12 +73,12 @@ <string>Bitrate:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>brateComb</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -108,16 +108,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>107</width> <height>20</height> @@ -191,5 +191,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp index f5352b8..a96898c 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp +++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qslider.h> +#include <tqslider.h> #include <kparts/genericfactory.h> #include <kiconloader.h> @@ -27,7 +27,7 @@ #include "koggenc.h" #include "koggenc.moc" -OggSettings::OggSettings( QWidget *parent, KConfig *confile ) : OggConfig( parent ) +OggSettings::OggSettings( TQWidget *tqparent, KConfig *confile ) : OggConfig( tqparent ) { KIconLoader *icon = new KIconLoader(); okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) ); @@ -56,8 +56,8 @@ int OggSettings::getQuality() K_EXPORT_COMPONENT_FACTORY (libkaffeineoggvorbis, KParts::GenericFactory<KOggEnc>) -KOggEnc::KOggEnc( QWidget*, const char*, QObject* parent, const char* name, const QStringList& ) - : KaffeineAudioEncoder(parent,name) +KOggEnc::KOggEnc( TQWidget*, const char*, TQObject* tqparent, const char* name, const TQStringList& ) + : KaffeineAudioEncoder(tqparent,name) { setInstance(KParts::GenericFactory<KOggEnc>::instance()); encodingQuality = 0.4; @@ -76,22 +76,22 @@ KAboutData *KOggEnc::createAboutData() return aboutData; } -QString KOggEnc::getExtension() +TQString KOggEnc::getExtension() { - return QString(".ogg"); + return TQString(".ogg"); } -bool KOggEnc::options( QWidget *parent, KConfig *conf ) +bool KOggEnc::options( TQWidget *tqparent, KConfig *conf ) { - OggSettings dlg( parent, conf ); + OggSettings dlg( tqparent, conf ); int ret = dlg.exec(); - if ( ret!=QDialog::Accepted ) + if ( ret!=TQDialog::Accepted ) return false; encodingQuality = dlg.getQuality()/10.0; return true; } -void KOggEnc::start( QString title, QString artist, QString album, QString tracknumber, QString genre ) +void KOggEnc::start( TQString title, TQString artist, TQString album, TQString tracknumber, TQString genre ) { char* tag; diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h index 9560a53..be2c9b6 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h +++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h @@ -39,8 +39,9 @@ extern "C" class OggSettings : public OggConfig { Q_OBJECT + TQ_OBJECT public: - OggSettings( QWidget *parent, KConfig *confile ); + OggSettings( TQWidget *tqparent, KConfig *confile ); ~OggSettings(); int getQuality(); @@ -55,16 +56,17 @@ private: class KOggEnc : public KaffeineAudioEncoder { Q_OBJECT + TQ_OBJECT public: - KOggEnc( QWidget*, const char*, QObject*, const char*, const QStringList& ); + KOggEnc( TQWidget*, const char*, TQObject*, const char*, const TQStringList& ); ~KOggEnc(); // Reimplemented from KaffeineAudioEncoder - bool options( QWidget*, KConfig* ); - QString getExtension(); - void start( QString title=0, QString artist=0, QString album=0, QString tracknumber=0, QString genre=0 ); + bool options( TQWidget*, KConfig* ); + TQString getExtension(); + void start( TQString title=0, TQString artist=0, TQString album=0, TQString tracknumber=0, TQString genre=0 ); char* getHeader( int &len ); char* encode( char *data, int datalen, int &len ); char* stop( int &len ); diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui index 178e938..91576ef 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui +++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>OggConfig</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>OggConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -47,7 +47,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLCDNumber" row="1" column="1"> + <widget class="TQLCDNumber" row="1" column="1"> <property name="name"> <cstring>oggLCD</cstring> </property> @@ -64,7 +64,7 @@ <number>0</number> </property> </widget> - <widget class="QSlider" row="1" column="0"> + <widget class="TQSlider" row="1" column="0"> <property name="name"> <cstring>oggSlid</cstring> </property> @@ -78,7 +78,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -98,16 +98,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>81</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</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>157</width> <height>20</height> @@ -187,5 +187,5 @@ <slot>display(int)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/dvb/audioeditor.cpp b/kaffeine/src/input/dvb/audioeditor.cpp index a8d8a5f..0f3e8c9 100644 --- a/kaffeine/src/input/dvb/audioeditor.cpp +++ b/kaffeine/src/input/dvb/audioeditor.cpp @@ -18,20 +18,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qlistbox.h> -#include <qspinbox.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqlistbox.h> +#include <tqspinbox.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <kmessagebox.h> #include <klocale.h> #include "audioeditor.h" -AudioEditor::AudioEditor( ChannelDesc *chan, QWidget *parent ) : AudioEditorUI( parent ) +AudioEditor::AudioEditor( ChannelDesc *chan, TQWidget *tqparent ) : AudioEditorUI( tqparent ) { - QString s, t; + TQString s, t; int i; channel = chan; @@ -41,17 +41,17 @@ AudioEditor::AudioEditor( ChannelDesc *chan, QWidget *parent ) : AudioEditorUI( if ( channel->napid==channel->maxapid ) newBtn->setEnabled( false ); - connect( pidList, SIGNAL(highlighted(int)), this, SLOT(showProp(int)) ); - connect( upBtn, SIGNAL(clicked()), this, SLOT(itemUp()) ); - connect( downBtn, SIGNAL(clicked()), this, SLOT(itemDown()) ); - connect( delBtn, SIGNAL(clicked()), this, SLOT(itemDelete()) ); - connect( updateBtn, SIGNAL(clicked()), this, SLOT(itemUpdate()) ); - connect( newBtn, SIGNAL(clicked()), this, SLOT(itemNew()) ); + connect( pidList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(showProp(int)) ); + connect( upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemUp()) ); + connect( downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemDown()) ); + connect( delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemDelete()) ); + connect( updateBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemUpdate()) ); + connect( newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemNew()) ); } void AudioEditor::insertItem( int index, bool updt ) { - QString s, t; + TQString s, t; s = t.setNum( channel->apid[index].pid ); if ( !channel->apid[index].lang.isEmpty() ) s = s+"("+channel->apid[index].lang+")"; diff --git a/kaffeine/src/input/dvb/audioeditor.h b/kaffeine/src/input/dvb/audioeditor.h index 8751505..2422264 100644 --- a/kaffeine/src/input/dvb/audioeditor.h +++ b/kaffeine/src/input/dvb/audioeditor.h @@ -27,10 +27,11 @@ class AudioEditor : public AudioEditorUI { Q_OBJECT + TQ_OBJECT public: - AudioEditor( ChannelDesc *chan, QWidget *parent ); + AudioEditor( ChannelDesc *chan, TQWidget *tqparent ); ~AudioEditor(); private slots: diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui index 20b07ef..945520c 100644 --- a/kaffeine/src/input/dvb/audioeditorui.ui +++ b/kaffeine/src/input/dvb/audioeditorui.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AudioEditorUI</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AudioEditorUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,23 +19,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox" row="0" column="0"> + <widget class="TQListBox" row="0" column="0"> <item> <property name="text"> <string>New Item</string> @@ -58,31 +58,31 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <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="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>upBtn</cstring> </property> @@ -90,7 +90,7 @@ <string>Move Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>downBtn</cstring> </property> @@ -98,7 +98,7 @@ <string>Move Down</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>delBtn</cstring> </property> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -137,30 +137,30 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <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="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>updateBtn</cstring> </property> @@ -168,7 +168,7 @@ <string><< Update Selected</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>newBtn</cstring> </property> @@ -178,7 +178,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox9</cstring> </property> @@ -189,7 +189,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>pidSpin</cstring> </property> @@ -197,7 +197,7 @@ <number>8192</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -205,7 +205,7 @@ <string>Pid:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -213,7 +213,7 @@ <string>Lang:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>ac3Cb</cstring> </property> @@ -221,7 +221,7 @@ <string>AC3</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>langLe</cstring> </property> @@ -256,9 +256,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -274,14 +274,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>okBtn</cstring> </property> @@ -315,5 +315,5 @@ <tabstop>langLe</tabstop> <tabstop>ac3Cb</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/dvb/broadcasteditor.cpp b/kaffeine/src/input/dvb/broadcasteditor.cpp index 0e6c8a6..9e3c86c 100644 --- a/kaffeine/src/input/dvb/broadcasteditor.cpp +++ b/kaffeine/src/input/dvb/broadcasteditor.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qdir.h> -#include <qvaluelist.h> +#include <tqdir.h> +#include <tqvaluelist.h> #include <kpushbutton.h> #include <kiconloader.h> @@ -27,7 +27,7 @@ #include "broadcasteditor.h" -BroadcastEditor::BroadcastEditor( QWidget *parent, QPtrList<ChannelDesc> *ch, QPtrList<ChannelDesc> *ret ) : BroadcastEditorUI( parent ) +BroadcastEditor::BroadcastEditor( TQWidget *tqparent, TQPtrList<ChannelDesc> *ch, TQPtrList<ChannelDesc> *ret ) : BroadcastEditorUI( tqparent ) { KIconLoader *icon = new KIconLoader(); @@ -40,7 +40,7 @@ BroadcastEditor::BroadcastEditor( QWidget *parent, QPtrList<ChannelDesc> *ch, QP cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", KIcon::Small) ) ); okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) ); - connect( channelLb, SIGNAL(doubleClicked(QListBoxItem*)), this, SLOT(slotAddChannel(QListBoxItem*)) ); + connect( channelLb, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), this, TQT_SLOT(slotAddChannel(TQListBoxItem*)) ); chan = ch; list = ret; @@ -53,7 +53,7 @@ BroadcastEditor::~BroadcastEditor() { } -ChannelDesc* BroadcastEditor::getChannel( const QString &name ) +ChannelDesc* BroadcastEditor::getChannel( const TQString &name ) { int i; @@ -63,7 +63,7 @@ ChannelDesc* BroadcastEditor::getChannel( const QString &name ) return 0; } -void BroadcastEditor::slotAddChannel(QListBoxItem*) +void BroadcastEditor::slotAddChannel(TQListBoxItem*) { addToList(); } @@ -71,8 +71,8 @@ void BroadcastEditor::slotAddChannel(QListBoxItem*) void BroadcastEditor::addToList() { int i; - QString curName; - QValueList<QListBoxItem*> qvl; + TQString curName; + TQValueList<TQListBoxItem*> qvl; ChannelDesc *c=0, *d=0; for ( i=0; i<(int)channelLb->count(); i++ ) { @@ -96,7 +96,7 @@ void BroadcastEditor::addToList() } for ( i=0; i<(int)qvl.count(); i++ ) channelLb->takeItem( qvl[i] ); - channelLb->setSelectionMode( QListBox::Extended ); + channelLb->setSelectionMode( TQListBox::Extended ); } bool BroadcastEditor::getChannelList() @@ -126,7 +126,7 @@ void BroadcastEditor::resetList() list->clear(); getChannelList(); channelLb->sort(); - channelLb->setSelectionMode( QListBox::Single ); + channelLb->setSelectionMode( TQListBox::Single ); } #include "broadcasteditor.moc" diff --git a/kaffeine/src/input/dvb/broadcasteditor.h b/kaffeine/src/input/dvb/broadcasteditor.h index 13c619f..86d5fad 100644 --- a/kaffeine/src/input/dvb/broadcasteditor.h +++ b/kaffeine/src/input/dvb/broadcasteditor.h @@ -21,9 +21,9 @@ #ifndef BROADCASTEDITOR_H #define BROADCASTEDITOR_H -#include <qpixmap.h> -#include <qfile.h> -#include <qlistbox.h> +#include <tqpixmap.h> +#include <tqfile.h> +#include <tqlistbox.h> #include "broadcasteditorui.h" #include "channeldesc.h" @@ -31,27 +31,28 @@ class BroadcastEditor : public BroadcastEditorUI { Q_OBJECT + TQ_OBJECT public: - BroadcastEditor( QWidget *parent, QPtrList<ChannelDesc> *ch, QPtrList<ChannelDesc> *ret ); + BroadcastEditor( TQWidget *tqparent, TQPtrList<ChannelDesc> *ch, TQPtrList<ChannelDesc> *ret ); ~BroadcastEditor(); - QPtrList<ChannelDesc> *chan; - QPtrList<ChannelDesc> *list; + TQPtrList<ChannelDesc> *chan; + TQPtrList<ChannelDesc> *list; public slots: virtual void addToList(); virtual void resetList(); - void slotAddChannel(QListBoxItem*); + void slotAddChannel(TQListBoxItem*); private: bool getChannelList(); - ChannelDesc* getChannel( const QString &name ); + ChannelDesc* getChannel( const TQString &name ); - QPixmap tvPix, raPix, tvcPix, racPix; + TQPixmap tvPix, raPix, tvcPix, racPix; }; diff --git a/kaffeine/src/input/dvb/broadcasteditorui.ui b/kaffeine/src/input/dvb/broadcasteditorui.ui index 034bd39..b14d625 100644 --- a/kaffeine/src/input/dvb/broadcasteditorui.ui +++ b/kaffeine/src/input/dvb/broadcasteditorui.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>BroadcastEditorUI</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>BroadcastEditorUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -53,7 +53,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -67,7 +67,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -78,7 +78,7 @@ <bool>false</bool> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>New Item</string> @@ -93,7 +93,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -159,7 +159,7 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -173,7 +173,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -181,7 +181,7 @@ <string>Broadcasting list:</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>New Item</string> @@ -212,7 +212,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -244,7 +244,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -301,11 +301,11 @@ <tabstop>cancelBtn</tabstop> <tabstop>okBtn</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>addToList()</slot> <slot>resetList()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kaffeine/src/input/dvb/camdialog.ui b/kaffeine/src/input/dvb/camdialog.ui index b1c3032..4a04607 100644 --- a/kaffeine/src/input/dvb/camdialog.ui +++ b/kaffeine/src/input/dvb/camdialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CamDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CamDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,23 +19,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -43,7 +43,7 @@ <string>Maximum Concurrent Services:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>maxServiceSpin</cstring> </property> @@ -53,7 +53,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -64,7 +64,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>textLabel1</cstring> </property> @@ -72,7 +72,7 @@ <string>Application Type:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -80,7 +80,7 @@ <string>Manufacturer Code:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -88,7 +88,7 @@ <string>Menu String:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>manuCodeLab</cstring> </property> @@ -96,7 +96,7 @@ <string>_</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>appManuLab</cstring> </property> @@ -104,7 +104,7 @@ <string>_</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -112,7 +112,7 @@ <string>Application Manufacturer:</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>menuStringLab</cstring> </property> @@ -120,7 +120,7 @@ <string>_</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>appTypeLab</cstring> </property> @@ -130,7 +130,7 @@ </widget> </grid> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>camMenuBtn</cstring> </property> @@ -145,5 +145,5 @@ <tabstops> <tabstop>maxServiceSpin</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/dvb/cammenudialog.ui b/kaffeine/src/input/dvb/cammenudialog.ui index 6eebfa4..e7123f9 100644 --- a/kaffeine/src/input/dvb/cammenudialog.ui +++ b/kaffeine/src/input/dvb/cammenudialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CamMenuDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CamMenuDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,28 +19,28 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextBrowser"> + <widget class="TQTextBrowser"> <property name="name"> <cstring>menuText</cstring> </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>textLabel1</cstring> </property> @@ -48,7 +48,7 @@ <string>Your choice (enter to validate):</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>inputLine</cstring> </property> @@ -63,5 +63,5 @@ <tabstop>inputLine</tabstop> <tabstop>menuText</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/dvb/channeldesc.h b/kaffeine/src/input/dvb/channeldesc.h index ef07011..cb50c00 100644 --- a/kaffeine/src/input/dvb/channeldesc.h +++ b/kaffeine/src/input/dvb/channeldesc.h @@ -21,11 +21,11 @@ #ifndef CHANNELDESC_H #define CHANNELDESC_H -#include <qstring.h> -#include <qptrlist.h> -#include <qdatetime.h> -#include <qvaluelist.h> -#include <qpixmap.h> +#include <tqstring.h> +#include <tqptrlist.h> +#include <tqdatetime.h> +#include <tqvaluelist.h> +#include <tqpixmap.h> #include <linux/dvb/frontend.h> @@ -39,11 +39,11 @@ class RecTimer public: - QString name; - QString fullPath; - QString channel; - QDateTime begin; - QTime duration; + TQString name; + TQString fullPath; + TQString channel; + TQDateTime begin; + TQTime duration; char running; int mode; }; @@ -58,7 +58,7 @@ public: ~AudioPid(); unsigned short pid; - QString lang; + TQString lang; char ac3; }; @@ -69,7 +69,7 @@ public: unsigned short pid, page, id; unsigned char type; - QString lang; + TQString lang; }; class Transponder @@ -84,10 +84,10 @@ public: bool operator==( const Transponder &t ); bool operator!=( const Transponder &t ); - QString source; + TQString source; fe_type_t type; // S, C or T unsigned long freq; - QValueList<unsigned long> freqlist; + TQValueList<unsigned long> freqlist; char pol; unsigned long sr; unsigned short nid; @@ -114,9 +114,9 @@ public: ChannelDesc( const ChannelDesc &chan ); //copy ~ChannelDesc(); - QString provider; - QString name; - QString category; + TQString provider; + TQString name; + TQString category; unsigned int num; unsigned short sid; unsigned short vpid; @@ -133,7 +133,7 @@ public: unsigned char type; // 1 for TV , 2 for RA int completed; Transponder tp; - QPixmap pix; + TQPixmap pix; }; #endif /* CHANNELDESC_H */ diff --git a/kaffeine/src/input/dvb/channeleditor.cpp b/kaffeine/src/input/dvb/channeleditor.cpp index 18ea8ce..61ab9f0 100644 --- a/kaffeine/src/input/dvb/channeleditor.cpp +++ b/kaffeine/src/input/dvb/channeleditor.cpp @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qspinbox.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlineedit.h> -#include <qpushbutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> #include <klocale.h> #include <kmessagebox.h> @@ -34,7 +34,7 @@ #include "audioeditor.h" #include "subeditor.h" -ChannelEditor::ChannelEditor( QStringList src, bool m, ChannelDesc *chan, QPtrList<ChannelDesc> *cdesc, QWidget *parent ) : ChannelEditorUI( parent ) +ChannelEditor::ChannelEditor( TQStringList src, bool m, ChannelDesc *chan, TQPtrList<ChannelDesc> *cdesc, TQWidget *tqparent ) : ChannelEditorUI( tqparent ) { int i; channel = chan; @@ -75,8 +75,8 @@ ChannelEditor::ChannelEditor( QStringList src, bool m, ChannelDesc *chan, QPtrLi } nameLe->setText( channel->name ); - connect( apidBtn, SIGNAL(clicked()), this, SLOT(editAudio()) ); - connect( subpidBtn, SIGNAL(clicked()), this, SLOT(editSubtitle()) ); + connect( apidBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editAudio()) ); + connect( subpidBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editSubtitle()) ); } void ChannelEditor::editAudio() @@ -96,7 +96,7 @@ void ChannelEditor::editSubtitle() void ChannelEditor::accept() { int ret, i; - QString name; + TQString name; name = nameLe->text().stripWhiteSpace(); if ( name.isEmpty() ) { @@ -261,73 +261,73 @@ void ChannelEditor::initA() rolloffComb->setEnabled( false ); } -QStringList ChannelEditor::inversionList() +TQStringList ChannelEditor::inversionList() { - QStringList list; + TQStringList list; list<<"OFF"<<"ON"<<"AUTO"; return list; } -QStringList ChannelEditor::coderateList() +TQStringList ChannelEditor::coderateList() { - QStringList list; + TQStringList list; list<<"NONE"<<"1/2"<<"2/3"<<"3/4"<<"4/5"<<"5/6"<<"6/7"<<"7/8"<<"8/9"<<"AUTO"<<"3/5"<<"9/10"; return list; } -QStringList ChannelEditor::modulationList() +TQStringList ChannelEditor::modulationList() { - QStringList list; + TQStringList list; list<<"QPSK"<<"QAM 16"<<"QAM 32"<<"QAM 64"<<"QAM 128"<<"QAM 256"<<"AUTO"<<"VSB-8"<<"VSB-16"<<"8PSK"<<"16APSK"<<"DQPSK"; return list; } -QStringList ChannelEditor::transmissionList() +TQStringList ChannelEditor::transmissionList() { - QStringList list; + TQStringList list; list<<"2K"<<"8K"<<"AUTO"; return list; } -QStringList ChannelEditor::bandwidthList() +TQStringList ChannelEditor::bandwidthList() { - QStringList list; + TQStringList list; list<<"8 MHz"<<"7 MHz"<<"6 MHz"<<"AUTO"; return list; } -QStringList ChannelEditor::hierarchyList() +TQStringList ChannelEditor::hierarchyList() { - QStringList list; + TQStringList list; list<<"NONE"<<"1"<<"2"<<"4"<<"AUTO"; return list; } -QStringList ChannelEditor::guardList() +TQStringList ChannelEditor::guardList() { - QStringList list; + TQStringList list; list<<"1/32"<<"1/16"<<"1/8"<<"1/4"<<"AUTO"; return list; } -QStringList ChannelEditor::stypeList() +TQStringList ChannelEditor::stypeList() { - QStringList list; + TQStringList list; list<<"DVB-S"<<"DVB-S2"; return list; } -QStringList ChannelEditor::rolloffList() +TQStringList ChannelEditor::rolloffList() { - QStringList list; + TQStringList list; list<<"35"<<"20"<<"25"<<"AUTO"; return list; diff --git a/kaffeine/src/input/dvb/channeleditor.h b/kaffeine/src/input/dvb/channeleditor.h index 586b9a3..69221b1 100644 --- a/kaffeine/src/input/dvb/channeleditor.h +++ b/kaffeine/src/input/dvb/channeleditor.h @@ -21,7 +21,7 @@ #ifndef CHANNELEDITOR_H #define CHANNELEDITOR_H -#include <qstringlist.h> +#include <tqstringlist.h> #include "channeleditorui.h" #include "channeldesc.h" @@ -29,10 +29,11 @@ class ChannelEditor : public ChannelEditorUI { Q_OBJECT + TQ_OBJECT public: - ChannelEditor( QStringList src, bool m, ChannelDesc *chan, QPtrList<ChannelDesc> *cdesc, QWidget *parent ); + ChannelEditor( TQStringList src, bool m, ChannelDesc *chan, TQPtrList<ChannelDesc> *cdesc, TQWidget *tqparent ); ~ChannelEditor(); protected: @@ -50,20 +51,20 @@ private: void initC(); void initT(); void initA(); - QStringList inversionList(); - QStringList coderateList(); - QStringList modulationList(); - QStringList transmissionList(); - QStringList bandwidthList(); - QStringList hierarchyList(); - QStringList guardList(); - QStringList stypeList(); - QStringList rolloffList(); + TQStringList inversionList(); + TQStringList coderateList(); + TQStringList modulationList(); + TQStringList transmissionList(); + TQStringList bandwidthList(); + TQStringList hierarchyList(); + TQStringList guardList(); + TQStringList stypeList(); + TQStringList rolloffList(); ChannelDesc *channel; - QPtrList<ChannelDesc> *chandesc; + TQPtrList<ChannelDesc> *chandesc; bool mode; - QString orgName; + TQString orgName; int chanNum; }; diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui index 09bdad1..3ccacf8 100644 --- a/kaffeine/src/input/dvb/channeleditorui.ui +++ b/kaffeine/src/input/dvb/channeleditorui.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ChannelEditorUI</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ChannelEditorUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,23 +33,23 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </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_4</cstring> </property> @@ -57,7 +57,7 @@ <string>Source:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>sourceComb</cstring> </property> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -81,15 +81,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -105,7 +105,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>nameLe</cstring> </property> @@ -118,7 +118,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -126,7 +126,7 @@ <string>Nr:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>numSpin</cstring> </property> @@ -136,15 +136,15 @@ </widget> </hbox> </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="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>freqGroup</cstring> </property> @@ -155,7 +155,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>polGroup</cstring> </property> @@ -166,7 +166,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>verticalRadio</cstring> </property> @@ -174,7 +174,7 @@ <string>Vertical</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>horizontalRadio</cstring> </property> @@ -184,7 +184,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -200,7 +200,7 @@ <string>Frequency:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -216,7 +216,7 @@ <string>Symbol rate:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>srSpin</cstring> </property> @@ -224,7 +224,7 @@ <number>99999</number> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>freqSpin</cstring> </property> @@ -238,7 +238,7 @@ <number>0</number> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ftaCb</cstring> </property> @@ -248,7 +248,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>pidsGroup</cstring> </property> @@ -259,15 +259,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>tsidSpin</cstring> </property> @@ -275,7 +275,7 @@ <number>65535</number> </property> </widget> - <widget class="QSpinBox" row="4" column="1"> + <widget class="TQSpinBox" row="4" column="1"> <property name="name"> <cstring>ttpidSpin</cstring> </property> @@ -289,7 +289,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -305,7 +305,7 @@ <string>Service ID:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -313,7 +313,7 @@ <string>Network ID:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel15</cstring> </property> @@ -329,7 +329,7 @@ <string>Teletext PID:</string> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>vpidSpin</cstring> </property> @@ -343,7 +343,7 @@ <number>0</number> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>sidSpin</cstring> </property> @@ -351,7 +351,7 @@ <number>65535</number> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>nidSpin</cstring> </property> @@ -359,7 +359,7 @@ <number>65535</number> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -375,7 +375,7 @@ <string>Video PID:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -393,7 +393,7 @@ </widget> </grid> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>subpidBtn</cstring> </property> @@ -401,7 +401,7 @@ <string>Subtitle PIDs...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>apidBtn</cstring> </property> @@ -416,7 +416,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>extendedGroup</cstring> </property> @@ -427,12 +427,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>transmissionComb</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -448,7 +448,7 @@ <string>FEC high:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -464,17 +464,17 @@ <string>Transmission:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>coderateHComb</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>coderateLComb</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -490,7 +490,7 @@ <string>FEC low:</string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -506,12 +506,12 @@ <string>Guard interval:</string> </property> </widget> - <widget class="QComboBox" row="2" column="3"> + <widget class="TQComboBox" row="2" column="3"> <property name="name"> <cstring>hierarchyComb</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -527,7 +527,7 @@ <string>Hierarchy:</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -543,17 +543,17 @@ <string>Modulation:</string> </property> </widget> - <widget class="QComboBox" row="1" column="3"> + <widget class="TQComboBox" row="1" column="3"> <property name="name"> <cstring>modulationComb</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="3"> + <widget class="TQComboBox" row="0" column="3"> <property name="name"> <cstring>inversionComb</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -569,7 +569,7 @@ <string>Inversion:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -585,12 +585,12 @@ <string>Bandwidth:</string> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <property name="name"> <cstring>bandwidthComb</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -598,17 +598,17 @@ <string>Type:</string> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <property name="name"> <cstring>stypeComb</cstring> </property> </widget> - <widget class="QComboBox" row="4" column="3"> + <widget class="TQComboBox" row="4" column="3"> <property name="name"> <cstring>rolloffComb</cstring> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>textLabel2_4</cstring> </property> @@ -616,7 +616,7 @@ <string>Roll off:</string> </property> </widget> - <widget class="QComboBox" row="3" column="3"> + <widget class="TQComboBox" row="3" column="3"> <property name="name"> <cstring>guardComb</cstring> </property> @@ -633,22 +633,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>166</height> </size> </property> </spacer> - <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="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okBtn</cstring> </property> @@ -666,14 +666,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelBtn</cstring> </property> @@ -726,5 +726,5 @@ <tabstop>okBtn</tabstop> <tabstop>sourceComb</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/dvb/cleaner.cpp b/kaffeine/src/input/dvb/cleaner.cpp index 8214bc9..d9400b1 100644 --- a/kaffeine/src/input/dvb/cleaner.cpp +++ b/kaffeine/src/input/dvb/cleaner.cpp @@ -20,18 +20,18 @@ #include <sys/statvfs.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qptrlist.h> -#include <qfileinfo.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqptrlist.h> +#include <tqfileinfo.h> #include "cleaner.h" -Cleaner::Cleaner( const QString &lpath, const QString &rpath ) +Cleaner::Cleaner( const TQString &lpath, const TQString &rpath ) { setPaths( lpath, rpath ); - connect( &timer, SIGNAL(timeout()), this, SLOT(doClean()) ); + connect( &timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doClean()) ); timer.start( 60*1000 ); } @@ -45,7 +45,7 @@ void Cleaner::doClean() start(IdlePriority); } -void Cleaner::setPaths( const QString &lpath, const QString &rpath ) +void Cleaner::setPaths( const TQString &lpath, const TQString &rpath ) { livePath = lpath; recordPath = rpath; @@ -53,13 +53,13 @@ void Cleaner::setPaths( const QString &lpath, const QString &rpath ) void Cleaner::run() { - QStringList list; - QDir d; + TQStringList list; + TQDir d; double freemb; struct statvfs buf; d.setPath( livePath ); - list = d.entryList( "DVBLive-*", QDir::Files, QDir::Name ); + list = d.entryList( "DVBLive-*", TQDir::Files, TQDir::Name ); if ( list.count()>1 ) d.remove( list[0] ); @@ -71,9 +71,9 @@ void Cleaner::run() freemb = (double)(((double)(buf.f_bavail)*(double)(buf.f_bsize))/(1024.0*1024.0)); if ( freemb<1000 ) { d.setPath( recordPath ); - const QFileInfoList *infos = d.entryInfoList( "*.m2t", QDir::Files|QDir::NoSymLinks|QDir::Writable, QDir::Time|QDir::Reversed ); - QFileInfoListIterator it( *infos ); - QFileInfo *i; + const TQFileInfoList *infos = d.entryInfoList( "*.m2t", TQDir::Files|TQDir::NoSymLinks|TQDir::Writable, TQDir::Time|TQDir::Reversed ); + TQFileInfoListIterator it( *infos ); + TQFileInfo *i; /*if ( ( i=it.current() )!=0 ) d.remove( i->absFilePath() );*/ } diff --git a/kaffeine/src/input/dvb/cleaner.h b/kaffeine/src/input/dvb/cleaner.h index 215af32..5132c1f 100644 --- a/kaffeine/src/input/dvb/cleaner.h +++ b/kaffeine/src/input/dvb/cleaner.h @@ -21,21 +21,22 @@ #ifndef CLEANER_H #define CLEANER_H -#include <qobject.h> -#include <qthread.h> -#include <qstring.h> -#include <qtimer.h> +#include <tqobject.h> +#include <tqthread.h> +#include <tqstring.h> +#include <tqtimer.h> -class Cleaner : public QObject, public QThread +class Cleaner : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: - Cleaner( const QString &lpath, const QString &rpath ); + Cleaner( const TQString &lpath, const TQString &rpath ); ~Cleaner(); - void setPaths( const QString &lpath, const QString &rpath ); + void setPaths( const TQString &lpath, const TQString &rpath ); protected: @@ -47,8 +48,8 @@ private slots: private: - QTimer timer; - QString livePath, recordPath; + TQTimer timer; + TQString livePath, recordPath; }; #endif /* CLEANER_H */ diff --git a/kaffeine/src/input/dvb/crontimer.cpp b/kaffeine/src/input/dvb/crontimer.cpp index 00078ea..677c306 100644 --- a/kaffeine/src/input/dvb/crontimer.cpp +++ b/kaffeine/src/input/dvb/crontimer.cpp @@ -25,9 +25,9 @@ #include "crontimer.h" -CronTimer::CronTimer( int m, QWidget *parent ) : CronTimerUI( parent ) +CronTimer::CronTimer( int m, TQWidget *tqparent ) : CronTimerUI( tqparent ) { - connect( cronBtnGrp, SIGNAL(clicked(int)), this, SLOT(modeSelected(int)) ); + connect( cronBtnGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(modeSelected(int)) ); mode = m; switch ( mode ) { case Noone : cronBtnGrp->setButton( 0 ); break; diff --git a/kaffeine/src/input/dvb/crontimer.h b/kaffeine/src/input/dvb/crontimer.h index bb079bd..d46262f 100644 --- a/kaffeine/src/input/dvb/crontimer.h +++ b/kaffeine/src/input/dvb/crontimer.h @@ -21,10 +21,10 @@ #ifndef CRONTIMER_H #define CRONTIMER_H -#include <qwidget.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qradiobutton.h> +#include <tqwidget.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> #include "crontimerui.h" @@ -32,10 +32,11 @@ class CronTimer : public CronTimerUI { Q_OBJECT + TQ_OBJECT public: - CronTimer( int m, QWidget *parent ); + CronTimer( int m, TQWidget *tqparent ); ~CronTimer(); int getMode() const; diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui index 1a70361..41130bd 100644 --- a/kaffeine/src/input/dvb/crontimerui.ui +++ b/kaffeine/src/input/dvb/crontimerui.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CronTimerUI</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CronTimerUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,17 +19,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -45,22 +45,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>32</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>cronBtnGrp</cstring> </property> @@ -71,7 +71,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>noneRad</cstring> </property> @@ -82,7 +82,7 @@ <number>0</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>dailyRad</cstring> </property> @@ -93,7 +93,7 @@ <number>1</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>weeklyRad</cstring> </property> @@ -104,7 +104,7 @@ <number>2</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>mnthlyRad</cstring> </property> @@ -115,7 +115,7 @@ <number>3</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>customRad</cstring> </property> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>67</height> @@ -157,14 +157,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>39</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>daysGb</cstring> </property> @@ -175,7 +175,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>monCb</cstring> </property> @@ -183,7 +183,7 @@ <string>Monday</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>tueCb</cstring> </property> @@ -191,7 +191,7 @@ <string>Tuesday</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>wedCb</cstring> </property> @@ -199,7 +199,7 @@ <string>Wednesday</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>thuCb</cstring> </property> @@ -207,7 +207,7 @@ <string>Thursday</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>friCb</cstring> </property> @@ -215,7 +215,7 @@ <string>Friday</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>satCb</cstring> </property> @@ -223,7 +223,7 @@ <string>Saturday</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>sunCb</cstring> </property> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>32</width> <height>20</height> @@ -262,16 +262,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>95</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>177</width> <height>20</height> @@ -346,7 +346,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kaffeine/src/input/dvb/dvbcam.cpp b/kaffeine/src/input/dvb/dvbcam.cpp index e525f6d..e4cd749 100644 --- a/kaffeine/src/input/dvb/dvbcam.cpp +++ b/kaffeine/src/input/dvb/dvbcam.cpp @@ -30,14 +30,14 @@ #include <sys/poll.h> #include <linux/dvb/ca.h> -#include <qapplication.h> -#include <qthread.h> -#include <qstring.h> -#include <qspinbox.h> -#include <qlabel.h> -#include <qtextbrowser.h> -#include <qlineedit.h> -#include <qpushbutton.h> +#include <tqapplication.h> +#include <tqthread.h> +#include <tqstring.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqtextbrowser.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> #include "dvbcam.h" @@ -79,7 +79,7 @@ int DvbCam::probe( int adapter, int ca_device ) int fdCa; ca_caps_t cap; ca_slot_info_t info; - QString s = QString("/dev/dvb/adapter%1/ca%2").arg( adapter ).arg( ca_device ); + TQString s = TQString("/dev/dvb/adapter%1/ca%2").tqarg( adapter ).tqarg( ca_device ); if ( (fdCa = open( s.ascii(), O_RDWR )) < 0) { fprintf(stderr, "DvbCam::probe(): %s:", s.ascii()); @@ -131,7 +131,7 @@ bool DvbCam::canPlay( ChannelDesc *chan ) { int i, n=0; - QMutexLocker locker( &sidMutex ); + TQMutexLocker locker( &sidMutex ); for ( i=0; i<sidList.count(); ++i ) { if ( sidList.at(i)->getState()<CamService::Remove ) n++; @@ -144,7 +144,7 @@ bool DvbCam::canPlay( ChannelDesc *chan ) void DvbCam::startService( ChannelDesc *chan ) { int i; - QMutexLocker locker( &sidMutex ); + TQMutexLocker locker( &sidMutex ); for ( i=0; i<sidList.count(); ++i ) { if ( sidList.at(i)->getChannel().name==chan->name ) { sidList.at(i)->restart(); @@ -157,7 +157,7 @@ void DvbCam::startService( ChannelDesc *chan ) void DvbCam::stopService( ChannelDesc *chan ) { int i; - QMutexLocker locker( &sidMutex ); + TQMutexLocker locker( &sidMutex ); for ( i=0; i<sidList.count(); ++i ) { if ( sidList.at(i)->getChannel().name==chan->name ) { sidList.at(i)->setState( CamService::Remove ); @@ -169,7 +169,7 @@ void DvbCam::stopService( ChannelDesc *chan ) void DvbCam::resendPmts() { int i; - QMutexLocker locker( &sidMutex ); + TQMutexLocker locker( &sidMutex ); for ( i=0; i<sidList.count(); ++i ) { if ( sidList.at(i)->getState()==CamService::Added ) { sidList.at(i)->setState( CamService::Ready ); @@ -401,7 +401,7 @@ int DvbCam::infoCallback(void *arg, uint8_t slot_id, uint16_t session_number, ui fprintf( stderr, " 0x%04x\n", ca_ids[i]); } - QApplication::postEvent( std->dvbcam, new QTimerEvent(TIMER_EVENT_CAM_READY ) ); + TQApplication::postEvent( std->dvbcam, new TQTimerEvent(TIMER_EVENT_CAM_READY ) ); return 0; } @@ -413,13 +413,13 @@ int DvbCam::aiCallback(void *arg, uint8_t slot_id, uint16_t session_number, uint (void)session_number; fprintf(stderr, "CAM Application type: %02x\n", application_type); - std->dvbcam->setAppType( QString("0x%1").arg(application_type, 0, 16 ) ); + std->dvbcam->setAppType( TQString("0x%1").tqarg(application_type, 0, 16 ) ); fprintf(stderr, "CAM Application manufacturer: %04x\n", application_manufacturer); - std->dvbcam->setAppManu( QString("0x%1").arg(application_manufacturer, 0, 16 ) ); + std->dvbcam->setAppManu( TQString("0x%1").tqarg(application_manufacturer, 0, 16 ) ); fprintf(stderr, "CAM Manufacturer code: %04x\n", manufacturer_code); - std->dvbcam->setManuCode( QString("0x%1").arg(manufacturer_code, 0, 16 ) ); + std->dvbcam->setManuCode( TQString("0x%1").tqarg(manufacturer_code, 0, 16 ) ); fprintf(stderr, "CAM Menu string: %.*s\n", menu_string_length, menu_string); - QString s = (const char*)menu_string; + TQString s = (const char*)menu_string; s.truncate( menu_string_length ); std->dvbcam->setMenuString( s ); return 0; @@ -436,7 +436,7 @@ int DvbCam::mmi_close_callback(void *arg, uint8_t slot_id, uint16_t session_numb // note: not entirely correct as its supposed to delay if asked std->mmi_state = MMI_STATE_CLOSED; - QApplication::postEvent( std->dvbcam, new QTimerEvent(TIMER_EVENT_MMI_CLOSE ) ); + TQApplication::postEvent( std->dvbcam, new TQTimerEvent(TIMER_EVENT_MMI_CLOSE ) ); return 0; } @@ -474,9 +474,9 @@ int DvbCam::mmi_enq_callback(void *arg, uint8_t slot_id, uint16_t session_number (void) slot_id; (void) session_number; - QString s; + TQString s; - QMutexLocker locker( &std->mutex ); + TQMutexLocker locker( &std->mutex ); std->menuList.clear(); fprintf(stderr, "%.*s: ", text_size, text); @@ -504,9 +504,9 @@ int DvbCam::mmi_menu_callback(void *arg, uint8_t slot_id, uint16_t session_numbe (void) item_raw_length; (void) items_raw; - QString s; + TQString s; - QMutexLocker locker( &std->mutex ); + TQMutexLocker locker( &std->mutex ); std->menuList.clear(); fprintf(stderr, "------------------------------\n"); @@ -531,7 +531,7 @@ int DvbCam::mmi_menu_callback(void *arg, uint8_t slot_id, uint16_t session_numbe fprintf(stderr, "%i. %.*s\n", i+1, items[i].text_length, items[i].text); s = (const char*)items[i].text; s.truncate( items[i].text_length ); - std->menuList.append( QString("%1. %2").arg(i+1).arg(s) ); + std->menuList.append( TQString("%1. %2").tqarg(i+1).tqarg(s) ); } @@ -546,12 +546,12 @@ int DvbCam::mmi_menu_callback(void *arg, uint8_t slot_id, uint16_t session_numbe std->mmi_state = MMI_STATE_MENU; std->menuType = MMI_MENU; - QApplication::postEvent( std->dvbcam, new QTimerEvent(TIMER_EVENT_MMI_OPEN ) ); + TQApplication::postEvent( std->dvbcam, new TQTimerEvent(TIMER_EVENT_MMI_OPEN ) ); return 0; } -void DvbCam::timerEvent( QTimerEvent *e ) +void DvbCam::timerEvent( TQTimerEvent *e ) { switch ( e->timerId() ) { case TIMER_EVENT_MMI_OPEN: @@ -570,7 +570,7 @@ void DvbCam::showMMI() { if ( !menuDialog && stdcam ) { menuDialog = new MCamMenuDialog( stdcam ); - connect( menuDialog, SIGNAL(enteredResponse(QString)), this, SLOT(mmiResponse(QString)) ); + connect( menuDialog, TQT_SIGNAL(enteredResponse(TQString)), this, TQT_SLOT(mmiResponse(TQString)) ); menuDialog->exec(); closeMMI(); } @@ -597,7 +597,7 @@ int DvbCam::showCamDialog() dlg.appManuLab->setText( getAppManu() ); dlg.manuCodeLab->setText( getManuCode() ); dlg.menuStringLab->setText( getMenuString() ); - connect( dlg.camMenuBtn, SIGNAL(clicked()), this, SLOT(enterMenu()) ); + connect( dlg.camMenuBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(enterMenu()) ); dlg.exec(); CamMaxService = dlg.maxServiceSpin->value(); return CamMaxService; @@ -609,9 +609,9 @@ void DvbCam::enterMenu() en50221_app_ai_entermenu( stdcam->stdcam->ai_resource, stdcam->stdcam->ai_session_number ); } -void DvbCam::mmiResponse( QString s ) +void DvbCam::mmiResponse( TQString s ) { - QString res = s.stripWhiteSpace(); + TQString res = s.stripWhiteSpace(); switch( stdcam->mmi_state ) { case MMI_STATE_CLOSED: @@ -644,8 +644,8 @@ void DvbCam::mmiResponse( QString s ) MCamMenuDialog::MCamMenuDialog( StandardCam *sc ) { stdcam = sc; - connect( inputLine, SIGNAL(returnPressed()), this, SLOT(validateClicked()) ); - connect( &readTimer, SIGNAL(timeout()), this, SLOT(setMenu()) ); + connect( inputLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(validateClicked()) ); + connect( &readTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setMenu()) ); readTimer.start( 500 ); } @@ -653,7 +653,7 @@ void MCamMenuDialog::setMenu() { if ( !stdcam ) return; - QMutexLocker locker( &stdcam->mutex ); + TQMutexLocker locker( &stdcam->mutex ); if ( stdcam->menuType==MMI_MENU ) menuText->setText( stdcam->menuList.join("\n") ); } @@ -707,8 +707,8 @@ int CamService::createSectionFilter(uint16_t pid, uint8_t table_id) // create a section filter uint8_t filter[18] = {table_id}; - uint8_t mask[18] = {0xff}; - if(dvbdemux_set_section_filter(demux_fd, pid, filter, mask, 1, 1)) { // crc check on + uint8_t tqmask[18] = {0xff}; + if(dvbdemux_set_section_filter(demux_fd, pid, filter, tqmask, 1, 1)) { // crc check on close(demux_fd); return -1; } @@ -780,7 +780,7 @@ int CamService::processPmt( int demux_fd ) void CamService::setState( PmtState st ) { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); switch ( st ) { case Ready: { int listmgnt; @@ -809,7 +809,7 @@ void CamService::setState( PmtState st ) int CamService::getState() { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); return state; } diff --git a/kaffeine/src/input/dvb/dvbcam.h b/kaffeine/src/input/dvb/dvbcam.h index ec9bf45..01832bf 100644 --- a/kaffeine/src/input/dvb/dvbcam.h +++ b/kaffeine/src/input/dvb/dvbcam.h @@ -33,9 +33,9 @@ #include <libdvben50221/en50221_stdcam.h> #include <libucsi/mpeg/section.h> -#include <qthread.h> -#include <qmutex.h> -#include <qptrlist.h> +#include <tqthread.h> +#include <tqmutex.h> +#include <tqptrlist.h> #include "channeldesc.h" #include "camdialog.h" @@ -51,7 +51,7 @@ -class CamService : protected QThread +class CamService : protected TQThread { public: enum PmtState{ NotReady=0, Ready, Added, Remove, Destroy }; @@ -82,7 +82,7 @@ private: struct mpeg_pmt_section *parsedPmt; PmtState state; bool isRunning; - QMutex mutex; + TQMutex mutex; int CamMaxService; }; @@ -107,9 +107,9 @@ public: int mmi_enq_length; int menuType; - QStringList menuList; + TQStringList menuList; - QMutex mutex; + TQMutex mutex; }; @@ -117,23 +117,25 @@ public: class MCamMenuDialog : public CamMenuDialog { Q_OBJECT + TQ_OBJECT public: MCamMenuDialog( StandardCam *sc ); private: StandardCam *stdcam; - QTimer readTimer; + TQTimer readTimer; private slots: void setMenu(); void validateClicked(); signals: - void enteredResponse( QString ); + void enteredResponse( TQString ); }; -class DvbCam : public QObject, public QThread +class DvbCam : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: DvbCam(int adapter, int ca_device, int demux_device, int ci_type, int maxService); ~DvbCam(); @@ -142,24 +144,24 @@ public: bool canPlay( ChannelDesc *chan ); static int probe( int adapter, int ca_device ); - void setAppType( QString s ) { appType=s; } - void setAppManu( QString s ) { appManu=s; } - void setManuCode( QString s ) { manuCode=s; } - void setMenuString( QString s ) { menuString=s; } - QString getAppType() { return appType; } - QString getAppManu() { return appManu; } - QString getManuCode() { return manuCode; } - QString getMenuString() { return menuString; } + void setAppType( TQString s ) { appType=s; } + void setAppManu( TQString s ) { appManu=s; } + void setManuCode( TQString s ) { manuCode=s; } + void setMenuString( TQString s ) { menuString=s; } + TQString getAppType() { return appType; } + TQString getAppManu() { return appManu; } + TQString getManuCode() { return manuCode; } + TQString getMenuString() { return menuString; } int getCamMaxService() { return CamMaxService; } int showCamDialog(); protected: void run(); - void timerEvent( QTimerEvent *e ); + void timerEvent( TQTimerEvent *e ); private slots: - void mmiResponse( QString s ); + void mmiResponse( TQString s ); void showMMI(); void closeMMI(); void enterMenu(); @@ -188,10 +190,10 @@ private: bool isRunning; - QPtrList<CamService> sidList; - QMutex sidMutex; + TQPtrList<CamService> sidList; + TQMutex sidMutex; - QString appType, appManu, manuCode, menuString; + TQString appType, appManu, manuCode, menuString; StandardCam *stdcam; en50221_session_layer *SessionLayer; diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp index 90e0489..869ca83 100644 --- a/kaffeine/src/input/dvb/dvbconfig.cpp +++ b/kaffeine/src/input/dvb/dvbconfig.cpp @@ -23,11 +23,11 @@ #include <unistd.h> #include <errno.h> -#include <qdir.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qregexp.h> -#include <qradiobutton.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqregexp.h> +#include <tqradiobutton.h> #include <klocale.h> #include <kiconloader.h> @@ -42,10 +42,10 @@ -MSpinBox::MSpinBox( QWidget *parent, int devNum ) : QSpinBox( 1, 4, 1, parent ) +MSpinBox::MSpinBox( TQWidget *tqparent, int devNum ) : TQSpinBox( 1, 4, 1, tqparent ) { deviceNumber = devNum; - connect( this, SIGNAL(valueChanged(int)), this, SLOT(slotValueChanged(int)) ); + connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)) ); } @@ -57,11 +57,11 @@ void MSpinBox::slotValueChanged( int value ) -MPushButton::MPushButton( QWidget *parent, int devNum, int lnbNum ) : KPushButton( parent ) +MPushButton::MPushButton( TQWidget *tqparent, int devNum, int lnbNum ) : KPushButton( tqparent ) { deviceNumber = devNum; lnbNumber = lnbNum; - connect( this, SIGNAL(clicked()), this, SLOT(isClicked()) ); + connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(isClicked()) ); } @@ -73,10 +73,10 @@ void MPushButton::isClicked() -MCAMButton::MCAMButton( QWidget *parent, int devNum ) : QPushButton( i18n("CAM"), parent ) +MCAMButton::MCAMButton( TQWidget *tqparent, int devNum ) : TQPushButton( i18n("CAM"), tqparent ) { deviceNumber = devNum; - connect( this, SIGNAL(clicked()), this, SLOT(isClicked()) ); + connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(isClicked()) ); } @@ -88,11 +88,11 @@ void MCAMButton::isClicked() -MComboBox::MComboBox( QWidget *parent, int devNum, int lnbNum ) : QComboBox( parent ) +MComboBox::MComboBox( TQWidget *tqparent, int devNum, int lnbNum ) : TQComboBox( tqparent ) { deviceNumber = devNum; lnbNumber = lnbNum; - connect( this, SIGNAL(activated(int)), this, SLOT(isActivated(int)) ); + connect( this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(isActivated(int)) ); } @@ -116,7 +116,7 @@ LNB::LNB() -Device::Device( int anum, int tnum, fe_type_t t, const QString &n, bool as ) +Device::Device( int anum, int tnum, fe_type_t t, const TQString &n, bool as ) { adapter = anum; tuner = tnum; @@ -135,7 +135,7 @@ Device::Device( int anum, int tnum, fe_type_t t, const QString &n, bool as ) -Category::Category( const QString &tname, const QString &ticon ) +Category::Category( const TQString &tname, const TQString &ticon ) { name = tname; icon = ticon; @@ -143,11 +143,11 @@ Category::Category( const QString &tname, const QString &ticon ) -DVBconfig::DVBconfig( const QString &dvbConf ) +DVBconfig::DVBconfig( const TQString &dvbConf ) { dvbConfigDir = dvbConf; dvbConfigIconsDir = dvbConf+"icons/"; - QDir dir; + TQDir dir; dir.setPath( dvbConfigIconsDir ); if ( !dir.exists() ) dir.mkdir( dvbConfigIconsDir ); @@ -178,19 +178,19 @@ bool DVBconfig::haveDvbDevice() int i, j, res, fdFrontend=0; struct dvb_frontend_info info; - QStringList list, flist; - QDir d; + TQStringList list, flist; + TQDir d; d.setPath( "/dev/dvb/" ); - list = d.entryList( "adapter*", QDir::Dirs, QDir::Name ); + list = d.entryList( "adapter*", TQDir::Dirs, TQDir::Name ); for ( i=0; i<(int)list.count(); i++ ) { d.setPath( "/dev/dvb/"+list[i]+"/" ); - flist = d.entryList( "frontend*", QDir::System, QDir::Name ); + flist = d.entryList( "frontend*", TQDir::System, TQDir::Name ); for ( j=0; j<(int)flist.count(); j++ ) { - fdFrontend = open( QString("/dev/dvb/%1/%2").arg( list[i] ).arg( flist[j] ).ascii(), O_RDWR); + fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( list[i] ).tqarg( flist[j] ).ascii(), O_RDWR); if ( fdFrontend>0 ) { if ( (res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) - perror( QString("/dev/dvb/%1/%2 FE_GET_INFO: ").arg( list[i] ).arg( flist[j] ).ascii() ); + perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").tqarg( list[i] ).tqarg( flist[j] ).ascii() ); else { close( fdFrontend ); return true; @@ -210,17 +210,17 @@ void DVBconfig::startup() int i=0, j=0, res, fdFrontend=0; struct dvb_frontend_info info; bool as; - QTime t1; + TQTime t1; - QStringList list, flist; - QString s, t; - QDir d; + TQStringList list, flist; + TQString s, t; + TQDir d; d.setPath( "/dev/dvb/" ); - list = d.entryList( "adapter*", QDir::Dirs, QDir::Name ); + list = d.entryList( "adapter*", TQDir::Dirs, TQDir::Name ); for ( i=0; i<(int)list.count(); i++ ) { d.setPath( "/dev/dvb/"+list[i]+"/" ); - flist = d.entryList( "frontend*", QDir::System, QDir::Name ); + flist = d.entryList( "frontend*", TQDir::System, TQDir::Name ); for ( j=0; j<(int)flist.count(); j++ ) { s = list[i]; t = flist[j]; @@ -228,8 +228,8 @@ void DVBconfig::startup() break; if ( !probeMfe && t!="frontend0" ) continue; - t1 = QTime::currentTime(); - fdFrontend = open( QString("/dev/dvb/%1/%2").arg( s ).arg( t ).ascii(), O_RDWR); + t1 = TQTime::currentTime(); + fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( s ).tqarg( t ).ascii(), O_RDWR); if ( fdFrontend>0 ) { if ( !(res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) { if ( (info.type==FE_OFDM) @@ -241,13 +241,13 @@ void DVBconfig::startup() as = true; else as = false; - fprintf(stderr,"/dev/dvb/%s/%s : opened ( %s ) (%dms)\n", s.ascii(), t.ascii(), info.name, t1.msecsTo(QTime::currentTime()) ); - devList.append( new Device( s.replace("adapter","").toInt(), t.replace("frontend","").toInt(), info.type, info.name, as ) ); + fprintf(stderr,"/dev/dvb/%s/%s : opened ( %s ) (%dms)\n", s.ascii(), t.ascii(), info.name, t1.msecsTo(TQTime::currentTime()) ); + devList.append( new Device( s.tqreplace("adapter","").toInt(), t.tqreplace("frontend","").toInt(), info.type, info.name, as ) ); } close( fdFrontend ); } else { - perror( QString("/dev/dvb/%1/%2 %3/%4").arg( s ).arg( t ).arg( errno ).arg( -EBUSY ).ascii() ); + perror( TQString("/dev/dvb/%1/%2 %3/%4").tqarg( s ).tqarg( t ).tqarg( errno ).tqarg( -EBUSY ).ascii() ); } } } @@ -275,22 +275,22 @@ void DVBconfig::setDownloadPercent( Job *job, unsigned long percent ) -bool DVBconfig::loadDvbData( QWidget *parent ) +bool DVBconfig::loadDvbData( TQWidget *tqparent ) { - QString s=""; + TQString s=""; FileCopyJob *job; - QFile f( dvbConfigDir+"dvbdata.tar.gz" ); + TQFile f( dvbConfigDir+"dvbdata.tar.gz" ); //if ( f.exists() ) f.remove(); - downProgress = new KProgressDialog( parent, "progress", i18n("Downloading... "), i18n("Copying data files..."), true ); + downProgress = new KProgressDialog( tqparent, "progress", i18n("Downloading... "), i18n("Copying data files..."), true ); downProgress->progressBar()->setTotalSteps( 100 ); //job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false ); job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false ); - connect( job, SIGNAL(result(KIO::Job*)), this, SLOT(setDownloadResult(KIO::Job*)) ); - connect( job, SIGNAL(percent(KIO::Job*,unsigned long)), this, SLOT(setDownloadPercent(KIO::Job*,unsigned long)) ); + connect( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(setDownloadResult(KIO::Job*)) ); + connect( job, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(KIO::Job*,unsigned long)) ); downProgress->exec(); - disconnect( job, SIGNAL(result(KIO::Job*)), this, SLOT(setDownloadResult(KIO::Job*)) ); - disconnect( job, SIGNAL(percent(KIO::Job*,unsigned long)), this, SLOT(setDownloadPercent(KIO::Job*,unsigned long)) ); + disconnect( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(setDownloadResult(KIO::Job*)) ); + disconnect( job, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(KIO::Job*,unsigned long)) ); if ( downProgress ) { delete downProgress; downProgress = 0; @@ -308,7 +308,7 @@ bool DVBconfig::loadDvbData( QWidget *parent ) bool DVBconfig::localData() { - QString s = locate("data","kaffeine/dvbdata.tar.gz"); + TQString s = locate("data","kaffeine/dvbdata.tar.gz"); KTar tar( s ); if ( tar.open( IO_ReadOnly ) ) { tar.directory()->copyTo( dvbConfigDir ); @@ -322,9 +322,9 @@ bool DVBconfig::localData() bool DVBconfig::haveData() { - if ( !QDir( dvbConfigDir+"dvb-s" ).exists() || !QDir( dvbConfigDir+"dvb-c" ).exists() || !QDir( dvbConfigDir+"dvb-t" ).exists() || !QDir( dvbConfigDir+"atsc" ).exists()) { + if ( !TQDir( dvbConfigDir+"dvb-s" ).exists() || !TQDir( dvbConfigDir+"dvb-c" ).exists() || !TQDir( dvbConfigDir+"dvb-t" ).exists() || !TQDir( dvbConfigDir+"atsc" ).exists()) { loadDvbData(0); - if ( !QDir( dvbConfigDir+"dvb-s" ).exists() || !QDir( dvbConfigDir+"dvb-c" ).exists() || !QDir( dvbConfigDir+"dvb-t" ).exists() || !QDir( dvbConfigDir+"atsc" ).exists() ) { + if ( !TQDir( dvbConfigDir+"dvb-s" ).exists() || !TQDir( dvbConfigDir+"dvb-c" ).exists() || !TQDir( dvbConfigDir+"dvb-t" ).exists() || !TQDir( dvbConfigDir+"atsc" ).exists() ) { if ( !localData() ) return false; } @@ -334,10 +334,10 @@ bool DVBconfig::haveData() -QStringList DVBconfig::getSourcesList( fe_type_t type ) +TQStringList DVBconfig::getSourcesList( fe_type_t type ) { - QString s; - QStringList list; + TQString s; + TQStringList list; switch ( type ) { case FE_QPSK : s = "dvb-s"; break; @@ -346,20 +346,20 @@ QStringList DVBconfig::getSourcesList( fe_type_t type ) case FE_ATSC : s = "atsc"; break; default : return list; } - list = QDir( dvbConfigDir+s ).entryList( QDir::Files, QDir::Name ); + list = TQDir( dvbConfigDir+s ).entryList( TQDir::Files, TQDir::Name ); return list; } -void DVBconfig::addCategory( const QString &name, const QString &icon ) +void DVBconfig::addCategory( const TQString &name, const TQString &icon ) { categories.append( new Category( name, icon ) ); } -void DVBconfig::removeCategory( const QString &name ) +void DVBconfig::removeCategory( const TQString &name ) { int i; @@ -373,7 +373,7 @@ void DVBconfig::removeCategory( const QString &name ) -void DVBconfig::changeIconCategory( const QString &name, const QString &icon ) +void DVBconfig::changeIconCategory( const TQString &name, const TQString &icon ) { int i; @@ -424,56 +424,56 @@ void DVBconfig::readFirst() void DVBconfig::readConfig() { - QSize size; - QString s; + TQSize size; + TQString s; int i, j; config->setGroup( "DVB Options" ); broadcastAddress = config->readEntry( "BroadcastAddress", "192.168.0.255" ); broadcastPort = config->readNumEntry( "BroadcastPort", 1234 ); senderPort = config->readNumEntry( "SenderPort", 1235 ); - size = QSize(600, 350); + size = TQSize(600, 350); epgSize = config->readSizeEntry( "EPG Geometry", &size ); - size = QSize(600, 300); + size = TQSize(600, 300); timerSize = config->readSizeEntry( "Timers Geometry", &size ); - size = QSize(300, 300); + size = TQSize(300, 300); scanSize = config->readSizeEntry( "Scan Geometry", &size ); beginMargin = config->readNumEntry( "BeginMargin", 5 ); endMargin = config->readNumEntry( "EndMargin", 10 ); instantDuration = config->readNumEntry( "InstantDuration", 120 ); - recordDir = config->readEntry( "RecordDir", QDir::homeDirPath() ); + recordDir = config->readEntry( "RecordDir", TQDir::homeDirPath() ); if ( !recordDir.endsWith("/") ) recordDir+= "/"; sizeFile = config->readNumEntry("SizeFile",0); - shiftDir = config->readEntry( "ShiftDir", QDir::homeDirPath() ); + shiftDir = config->readEntry( "ShiftDir", TQDir::homeDirPath() ); if ( !shiftDir.endsWith("/") ) shiftDir+= "/"; filenameFormat = config->readEntry( "filenameFormat", "%name" ); for ( i=0; i<(int)devList.count(); i++ ) { - devList.at(i)->source = config->readEntry( QString("DVB%1").arg(i), "" ); - devList.at(i)->tuningTimeout = config->readNumEntry( QString("DVB%1_TIMEOUT").arg(i), 1500 ); - devList.at(i)->camMaxService = config->readNumEntry( QString("DVB%1_CAM_MAX").arg(i), 1 ); - devList.at(i)->priority = config->readNumEntry( QString("DVB%1_PRIORITY").arg(i), 10 ); + devList.at(i)->source = config->readEntry( TQString("DVB%1").tqarg(i), "" ); + devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").tqarg(i), 1500 ); + devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").tqarg(i), 1 ); + devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").tqarg(i), 10 ); if ( devList.at(i)->type!=FE_QPSK ) continue; - devList.at(i)->numLnb = config->readNumEntry( QString("DVB%1_NLNB").arg(i), 1 ); + devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").tqarg(i), 1 ); for ( j=0; j<devList.at(i)->numLnb; j++ ) { - devList.at(i)->lnb[j].switchFreq = config->readNumEntry( QString("DVB%1_LNB%2_switch").arg(i).arg(j), 11700 ); - devList.at(i)->lnb[j].loFreq = config->readNumEntry( QString("DVB%1_LNB%2_lo").arg(i).arg(j), 9750 ); - devList.at(i)->lnb[j].hiFreq = config->readNumEntry( QString("DVB%1_LNB%2_hi").arg(i).arg(j), 10600 ); - devList.at(i)->lnb[j].rotorType = config->readNumEntry( QString("DVB%1_LNB%2_rotor").arg(i).arg(j), 0 ); - devList.at(i)->lnb[j].source = config->readListEntry( QString("DVB%1_LNB%2_source").arg(i).arg(j) ); - devList.at(i)->lnb[j].position = config->readIntListEntry( QString("DVB%1_LNB%2_position").arg(i).arg(j) ); - devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( QString("DVB%1_LNB%2_speed13v").arg(i).arg(j), 2.5 ); - devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( QString("DVB%1_LNB%2_speed18v").arg(i).arg(j), 1.5 ); + devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), 11700 ); + devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), 9750 ); + devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), 10600 ); + devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), 0 ); + devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j) ); + devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j) ); + devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), 2.5 ); + devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), 1.5 ); } - devList.at(i)->secMini = config->readNumEntry( QString("DVB%1_SEC_MINI").arg(i), 0 ); - devList.at(i)->secTwice = config->readNumEntry( QString("DVB%1_SEC_TWICE").arg(i), 0 ); - devList.at(i)->doS2 = config->readNumEntry( QString("DVB%1_DOS2").arg(i), 0 ); + devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").tqarg(i), 0 ); + devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), 0 ); + devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").tqarg(i), 0 ); } j = config->readNumEntry( "NumCategories", 0 ); for ( i=0; i<j; i++ ) - categories.append( new Category( config->readEntry( QString("CategoryName%1").arg(i), "" ), config->readEntry( QString("CategoryIcon%1").arg(i), "kaffeine" ) ) ); + categories.append( new Category( config->readEntry( TQString("CategoryName%1").tqarg(i), "" ), config->readEntry( TQString("CategoryIcon%1").tqarg(i), "kaffeine" ) ) ); allIcon = config->readEntry( "AllIcon", "kaffeine" ); tvIcon = config->readEntry( "TvIcon", "kdvbtv" ); radioIcon = config->readEntry( "RadioIcon", "kdvbra" ); @@ -512,31 +512,31 @@ void DVBconfig::saveConfig() config->writeEntry( "SenderPort", senderPort ); config->writeEntry( "ProbeMFE", probeMfe ); for ( i=0; i<(int)devList.count(); i++ ) { - config->writeEntry( QString("DVB%1").arg(i), devList.at(i)->source ); - config->writeEntry( QString("DVB%1_TIMEOUT").arg(i), devList.at(i)->tuningTimeout ); - config->writeEntry( QString("DVB%1_PRIORITY").arg(i), devList.at(i)->priority ); - config->writeEntry( QString("DVB%1_CAM_MAX").arg(i), devList.at(i)->camMaxService ); + config->writeEntry( TQString("DVB%1").tqarg(i), devList.at(i)->source ); + config->writeEntry( TQString("DVB%1_TIMEOUT").tqarg(i), devList.at(i)->tuningTimeout ); + config->writeEntry( TQString("DVB%1_PRIORITY").tqarg(i), devList.at(i)->priority ); + config->writeEntry( TQString("DVB%1_CAM_MAX").tqarg(i), devList.at(i)->camMaxService ); if ( devList.at(i)->type!=FE_QPSK ) continue; - config->writeEntry( QString("DVB%1_NLNB").arg(i), devList.at(i)->numLnb ); + config->writeEntry( TQString("DVB%1_NLNB").tqarg(i), devList.at(i)->numLnb ); for ( j=0; j<devList.at(i)->numLnb; j++ ) { - config->writeEntry( QString("DVB%1_LNB%2_switch").arg(i).arg(j), devList.at(i)->lnb[j].switchFreq ); - config->writeEntry( QString("DVB%1_LNB%2_lo").arg(i).arg(j), devList.at(i)->lnb[j].loFreq ); - config->writeEntry( QString("DVB%1_LNB%2_hi").arg(i).arg(j), devList.at(i)->lnb[j].hiFreq ); - config->writeEntry( QString("DVB%1_LNB%2_rotor").arg(i).arg(j), devList.at(i)->lnb[j].rotorType ); - config->writeEntry( QString("DVB%1_LNB%2_source").arg(i).arg(j), devList.at(i)->lnb[j].source ); - config->writeEntry( QString("DVB%1_LNB%2_position").arg(i).arg(j), devList.at(i)->lnb[j].position ); - config->writeEntry( QString("DVB%1_LNB%2_speed13v").arg(i).arg(j), devList.at(i)->lnb[j].speed13v ); - config->writeEntry( QString("DVB%1_LNB%2_speed18v").arg(i).arg(j), devList.at(i)->lnb[j].speed18v ); + config->writeEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), devList.at(i)->lnb[j].switchFreq ); + config->writeEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), devList.at(i)->lnb[j].loFreq ); + config->writeEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), devList.at(i)->lnb[j].hiFreq ); + config->writeEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), devList.at(i)->lnb[j].rotorType ); + config->writeEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j), devList.at(i)->lnb[j].source ); + config->writeEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j), devList.at(i)->lnb[j].position ); + config->writeEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed13v ); + config->writeEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed18v ); } - config->writeEntry( QString("DVB%1_SEC_MINI").arg(i), devList.at(i)->secMini ); - config->writeEntry( QString("DVB%1_SEC_TWICE").arg(i), devList.at(i)->secTwice ); - config->writeEntry( QString("DVB%1_DOS2").arg(i), devList.at(i)->doS2 ); + config->writeEntry( TQString("DVB%1_SEC_MINI").tqarg(i), devList.at(i)->secMini ); + config->writeEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), devList.at(i)->secTwice ); + config->writeEntry( TQString("DVB%1_DOS2").tqarg(i), devList.at(i)->doS2 ); } config->writeEntry( "NumCategories", categories.count() ); for ( i=0; i<(int)categories.count(); i++ ) { - config->writeEntry( QString("CategoryName%1").arg(i), categories.at(i)->name ); - config->writeEntry( QString("CategoryIcon%1").arg(i), categories.at(i)->icon ); + config->writeEntry( TQString("CategoryName%1").tqarg(i), categories.at(i)->name ); + config->writeEntry( TQString("CategoryIcon%1").tqarg(i), categories.at(i)->icon ); } config->writeEntry( "AllIcon", allIcon ); config->writeEntry( "TvIcon", tvIcon ); @@ -565,46 +565,46 @@ bool DVBconfig::firstRun() -DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, KaffeineDvbPlugin *p ) : - KDialogBase ( IconList, i18n("DVB Settings"), Ok|Cancel, Ok, parent, "dvbConfigDialog", true, true ) +DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *tqparent, KaffeineDvbPlugin *p ) : + KDialogBase ( IconList, i18n("DVB Settings"), Ok|Cancel, Ok, tqparent, "dvbConfigDialog", true, true ) { - QLabel *lab; + TQLabel *lab; KIconLoader *icon = new KIconLoader(); - QHBoxLayout *h1; - QString s; + TQHBoxLayout *h1; + TQString s; int i; - QVBoxLayout *vb; - QGroupBox *gb; - QGridLayout *grid, *sgrid; - QLabel *ident; - QLabel *dvbType; + TQVBoxLayout *vb; + TQGroupBox *gb; + TQGridLayout *grid, *sgrid; + TQLabel *ident; + TQLabel *dvbType; int gridLine; - QFrame *page; - QSpinBox *spin; + TQFrame *page; + TQSpinBox *spin; KPushButton *usals; - QWidget *swidg; - QStringList rotorList; rotorList<<i18n("No rotor")<<i18n("USALS rotor")<<i18n("Positions rotor")<<i18n("External positionner"); + TQWidget *swidg; + TQStringList rotorList; rotorList<<i18n("No rotor")<<i18n("USALS rotor")<<i18n("Positions rotor")<<i18n("External positionner"); dvbConfig = dc; timeoutSpin.setAutoDelete( true ); for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) { - page = addPage( i18n("DVB Device")+" "+QString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"), + page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").tqarg(dvbConfig->devList.at(i)->adapter).tqarg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"), KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) ); - vb = new QVBoxLayout( page, 6, 6 ); - gb = new QGroupBox( "", page ); - grid = new QGridLayout( gb, 1, 1, 20, 6 ); + vb = new TQVBoxLayout( page, 6, 6 ); + gb = new TQGroupBox( "", page ); + grid = new TQGridLayout( gb, 1, 1, 20, 6 ); gridLine = 0; - lab = new QLabel( i18n("<qt><b>Name:</b></qt>"), gb ); + lab = new TQLabel( i18n("<qt><b>Name:</b></qt>"), gb ); grid->addWidget( lab, gridLine, 0 ); - ident = new QLabel( dvbConfig->devList.at(i)->name, gb ); + ident = new TQLabel( dvbConfig->devList.at(i)->name, gb ); grid->addMultiCellWidget( ident, gridLine, gridLine, 1, 3 ); ++gridLine; - lab = new QLabel( i18n("<qt><b>Type:</b></qt>"), gb ); + lab = new TQLabel( i18n("<qt><b>Type:</b></qt>"), gb ); grid->addWidget( lab, gridLine, 0 ); - dvbType = new QLabel( gb ); + dvbType = new TQLabel( gb ); switch ( dvbConfig->devList.at(i)->type ) { case FE_QAM : dvbType->setText( i18n("Cable") ); break; case FE_OFDM : dvbType->setText( i18n("Terrestrial") ); break; @@ -615,54 +615,54 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, if ( dvbConfig->devList.at(i)->hasCAM ) { grid->addWidget( dvbType, gridLine, 1 ); MCAMButton *camb = new MCAMButton( gb, i ); - connect( camb, SIGNAL(clicked(int)), pan, SLOT(camClicked(int)) ); + connect( camb, TQT_SIGNAL(clicked(int)), pan, TQT_SLOT(camClicked(int)) ); grid->addWidget( camb, gridLine, 2 ); } else grid->addMultiCellWidget( dvbType, gridLine, gridLine, 1, 3 ); ++gridLine; - lab = new QLabel( i18n("Tuner priority (0=Don't use):"), gb ); + lab = new TQLabel( i18n("Tuner priority (0=Don't use):"), gb ); grid->addWidget( lab, gridLine, 0 ); - spin = new QSpinBox( 0, 99, 1, gb ); + spin = new TQSpinBox( 0, 99, 1, gb ); spin->setValue( dvbConfig->devList.at(i)->priority ); priority.append( spin ); grid->addWidget( spin, gridLine, 1 ); ++gridLine; - lab = new QLabel( i18n("Tuner timeout :"), gb ); + lab = new TQLabel( i18n("Tuner timeout :"), gb ); grid->addWidget( lab, gridLine, 0 ); - spin = new QSpinBox( 500, 5000, 100, gb ); + spin = new TQSpinBox( 500, 5000, 100, gb ); spin->setValue( dvbConfig->devList.at(i)->tuningTimeout ); timeoutSpin.append( spin ); grid->addWidget( spin, gridLine, 1 ); - lab = new QLabel( i18n("(ms)"), gb ); + lab = new TQLabel( i18n("(ms)"), gb ); grid->addWidget( lab, gridLine, 2 ); ++gridLine; if ( dvbConfig->devList.at(i)->type==FE_QPSK ) { - doS2[i] = new QCheckBox( i18n("S2 capable device"), gb ); + doS2[i] = new TQCheckBox( i18n("S2 capable device"), gb ); doS2[i]->setChecked( dvbConfig->devList.at(i)->doS2 ); grid->addWidget( doS2[i], gridLine, 0 ); ++gridLine; - lab = new QLabel( i18n("Number of LNBs:"), gb ); + lab = new TQLabel( i18n("Number of LNBs:"), gb ); grid->addWidget( lab, gridLine, 0 ); satNumber[i] = new MSpinBox( gb, i ); - connect( satNumber[i], SIGNAL(signalValueChanged(int,int)), this, SLOT(satNumberChanged(int,int))); + connect( satNumber[i], TQT_SIGNAL(signalValueChanged(int,int)), this, TQT_SLOT(satNumberChanged(int,int))); grid->addWidget( satNumber[i], gridLine, 1 ); usals = new KPushButton( gb ); usals->setGuiItem( KGuiItem(i18n("Set rotor coordinates..."), icon->loadIconSet("move", KIcon::Small) ) ); - connect( usals, SIGNAL(clicked()), this, SLOT(setUsals())); + connect( usals, TQT_SIGNAL(clicked()), this, TQT_SLOT(setUsals())); grid->addWidget( usals, gridLine, 2 ); ++gridLine; - secMini[i] = new QCheckBox( i18n("Mini DiSEqC (A-B)."), gb ); + secMini[i] = new TQCheckBox( i18n("Mini DiSEqC (A-B)."), gb ); secMini[i]->setChecked( dvbConfig->devList.at(i)->secMini ); secMini[i]->setEnabled( false ); grid->addWidget( secMini[i], gridLine, 1 ); - secTwice[i] = new QCheckBox( i18n("Send DiSEqC commands twice."), gb ); + secTwice[i] = new TQCheckBox( i18n("Send DiSEqC commands twice."), gb ); secTwice[i]->setChecked( dvbConfig->devList.at(i)->secTwice ); grid->addWidget( secTwice[i], gridLine, 0 ); @@ -672,20 +672,20 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, lnb0[i]->setGuiItem( KGuiItem(i18n("LNB 1 settings..."), icon->loadIconSet("hwinfo", KIcon::Small) ) ); lnb0[i]->setEnabled(true); grid->addWidget( lnb0[i], gridLine, 0 ); - connect( lnb0[i], SIGNAL(clicked(int,int)), this, SLOT(setLnb(int,int))); + connect( lnb0[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int))); rotor0[i] = new MComboBox( gb, i, 0 ); rotor0[i]->insertStringList( rotorList ); rotor0[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[0].rotorType ); grid->addWidget( rotor0[i], gridLine, 1 ); - connect( rotor0[i], SIGNAL(activated(int,int,int)), this, SLOT(setRotor(int,int,int))); - swidg = new QWidget( gb ); - sgrid = new QGridLayout( swidg, 1, 1, 0, 0 ); - sat0[i] = new QComboBox( swidg ); + connect( rotor0[i], TQT_SIGNAL(activated(int,int,int)), this, TQT_SLOT(setRotor(int,int,int))); + swidg = new TQWidget( gb ); + sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 ); + sat0[i] = new TQComboBox( swidg ); sat0[i]->insertStringList( dvbConfig->getSourcesList(dvbConfig->devList.at(i)->type) ); sgrid->addWidget( sat0[i], 0, 0 ); src0[i] = new MPushButton( swidg, i, 0 ); src0[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) ); - connect( src0[i], SIGNAL(clicked(int,int)), this, SLOT(setRotorSources(int,int)) ); + connect( src0[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setRotorSources(int,int)) ); sgrid->addWidget( src0[i], 1, 0 ); if ( dvbConfig->devList.at(i)->lnb[0].rotorType==0 ) { setSource( sat0[i], dvbConfig->devList.at(i)->lnb[0].source[0] ); @@ -701,23 +701,23 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, lnb1[i]->setGuiItem( KGuiItem(i18n("LNB 2 settings..."), icon->loadIconSet("hwinfo", KIcon::Small) ) ); lnb1[i]->setEnabled(false); grid->addWidget( lnb1[i], gridLine, 0 ); - connect( lnb1[i], SIGNAL(clicked(int,int)), this, SLOT(setLnb(int,int))); + connect( lnb1[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int))); rotor1[i] = new MComboBox( gb, i, 1 ); rotor1[i]->setEnabled( false ); rotor1[i]->insertStringList( rotorList ); rotor1[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[1].rotorType ); grid->addWidget( rotor1[i], gridLine, 1 ); - connect( rotor1[i], SIGNAL(activated(int,int,int)), this, SLOT(setRotor(int,int,int))); - swidg = new QWidget( gb ); - sgrid = new QGridLayout( swidg, 1, 1, 0, 0 ); - sat1[i] = new QComboBox( swidg ); + connect( rotor1[i], TQT_SIGNAL(activated(int,int,int)), this, TQT_SLOT(setRotor(int,int,int))); + swidg = new TQWidget( gb ); + sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 ); + sat1[i] = new TQComboBox( swidg ); sat1[i]->setEnabled(false); sat1[i]->insertStringList( dvbConfig->getSourcesList(dvbConfig->devList.at(i)->type) ); sgrid->addWidget( sat1[i], 0, 0 ); src1[i] = new MPushButton( swidg, i, 1 ); src1[i]->setEnabled(false); src1[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) ); - connect( src1[i], SIGNAL(clicked(int,int)), this, SLOT(setRotorSources(int,int)) ); + connect( src1[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setRotorSources(int,int)) ); sgrid->addWidget( src1[i], 1, 0 ); if ( dvbConfig->devList.at(i)->lnb[1].rotorType==0 ) { setSource( sat1[i], dvbConfig->devList.at(i)->lnb[1].source[0] ); @@ -733,23 +733,23 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, lnb2[i]->setGuiItem( KGuiItem(i18n("LNB 3 settings..."), icon->loadIconSet("hwinfo", KIcon::Small) ) ); lnb2[i]->setEnabled(false); grid->addWidget( lnb2[i], gridLine, 0 ); - connect( lnb2[i], SIGNAL(clicked(int,int)), this, SLOT(setLnb(int,int))); + connect( lnb2[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int))); rotor2[i] = new MComboBox( gb, i, 2 ); rotor2[i]->setEnabled(false); rotor2[i]->insertStringList( rotorList ); rotor2[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[2].rotorType ); grid->addWidget( rotor2[i], gridLine, 1 ); - connect( rotor2[i], SIGNAL(activated(int,int,int)), this, SLOT(setRotor(int,int,int))); - swidg = new QWidget( gb ); - sgrid = new QGridLayout( swidg, 1, 1, 0, 0 ); - sat2[i] = new QComboBox( swidg ); + connect( rotor2[i], TQT_SIGNAL(activated(int,int,int)), this, TQT_SLOT(setRotor(int,int,int))); + swidg = new TQWidget( gb ); + sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 ); + sat2[i] = new TQComboBox( swidg ); sat2[i]->setEnabled(false); sat2[i]->insertStringList( dvbConfig->getSourcesList(dvbConfig->devList.at(i)->type) ); sgrid->addWidget( sat2[i], 0, 0 ); src2[i] = new MPushButton( swidg, i, 2 ); src2[i]->setEnabled(false); src2[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) ); - connect( src2[i], SIGNAL(clicked(int,int)), this, SLOT(setRotorSources(int,int)) ); + connect( src2[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setRotorSources(int,int)) ); sgrid->addWidget( src2[i], 1, 0 ); if ( dvbConfig->devList.at(i)->lnb[2].rotorType==0 ) { setSource( sat2[i], dvbConfig->devList.at(i)->lnb[2].source[0] ); @@ -765,23 +765,23 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, lnb3[i]->setGuiItem( KGuiItem(i18n("LNB 4 settings..."), icon->loadIconSet("hwinfo", KIcon::Small) ) ); lnb3[i]->setEnabled(false); grid->addWidget( lnb3[i], gridLine, 0 ); - connect( lnb3[i], SIGNAL(clicked(int,int)), this, SLOT(setLnb(int,int))); + connect( lnb3[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int))); rotor3[i] = new MComboBox( gb, i, 3 ); rotor3[i]->setEnabled(false); rotor3[i]->insertStringList( rotorList ); rotor3[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[3].rotorType ); grid->addWidget( rotor3[i], gridLine, 1 ); - connect( rotor3[i], SIGNAL(activated(int,int,int)), this, SLOT(setRotor(int,int,int))); - swidg = new QWidget( gb ); - sgrid = new QGridLayout( swidg, 1, 1, 0, 0 ); - sat3[i] = new QComboBox( swidg ); + connect( rotor3[i], TQT_SIGNAL(activated(int,int,int)), this, TQT_SLOT(setRotor(int,int,int))); + swidg = new TQWidget( gb ); + sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 ); + sat3[i] = new TQComboBox( swidg ); sat3[i]->setEnabled(false); sat3[i]->insertStringList( dvbConfig->getSourcesList(dvbConfig->devList.at(i)->type) ); sgrid->addWidget( sat3[i], 0, 0 ); src3[i] = new MPushButton( swidg, i, 3 ); src3[i]->setEnabled(false); src3[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) ); - connect( src3[i], SIGNAL(clicked(int,int)), this, SLOT(setRotorSources(int,int)) ); + connect( src3[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setRotorSources(int,int)) ); sgrid->addWidget( src3[i], 1, 0 ); if ( dvbConfig->devList.at(i)->lnb[3].rotorType==0 ) { setSource( sat3[i], dvbConfig->devList.at(i)->lnb[3].source[0] ); @@ -796,9 +796,9 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, satNumber[i]->setValue( dvbConfig->devList.at(i)->numLnb ); } else { - lab = new QLabel( i18n("Source:"), gb ); + lab = new TQLabel( i18n("Source:"), gb ); grid->addWidget( lab, gridLine, 0 ); - sat0[i] = new QComboBox( gb ); + sat0[i] = new TQComboBox( gb ); if ( dvbConfig->devList.at(i)->canAutoscan ) sat0[i]->insertItem( "AUTO" ); sat0[i]->insertStringList( dvbConfig->getSourcesList(dvbConfig->devList.at(i)->type) ); @@ -807,7 +807,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, ++gridLine; if ( dvbConfig->devList.at(i)->canAutoscan ) { - lab = new QLabel( i18n("<qt>This device seems to support the <b><i>autoscan</i></b> feature. " + lab = new TQLabel( i18n("<qt>This device seems to support the <b><i>autoscan</i></b> feature. " "You can choose <b>AUTO</b> in Source list to let Kaffeine " "search for a range of frequencies.<br>" "If <b><i>autoscan</i></b> fails to find your channels, choose a real Source in list.</qt>"), gb ); @@ -815,7 +815,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, ++gridLine; } } - lab = new QLabel( i18n("<qt><i>If you can't find your network/location in the list, you'll have to create one. " + lab = new TQLabel( i18n("<qt><i>If you can't find your network/location in the list, you'll have to create one. " "Look in $HOME/.kde/share/apps/kaffeine/dvb-x/ and take an existing file as start point. " "Fill in with the values for your network/location and give it a sensible name " "(follow the naming convention). If you think your new file could be usefull for others, send it to " @@ -823,80 +823,80 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, grid->addMultiCellWidget( lab, gridLine, gridLine, 0, 3 ); vb->addWidget( gb ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Ignored, QSizePolicy::Ignored ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); } page = addPage(i18n("Recording"),i18n("DVB Recording Options"), KGlobal::instance()->iconLoader()->loadIcon( "hdd_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); - vb = new QVBoxLayout( page, 6, 6 ); - gb = new QGroupBox( "", page ); - grid = new QGridLayout( gb, 1, 1, 20, 6 ); + vb = new TQVBoxLayout( page, 6, 6 ); + gb = new TQGroupBox( "", page ); + grid = new TQGridLayout( gb, 1, 1, 20, 6 ); - lab = new QLabel( i18n("Records directory:"), gb ); + lab = new TQLabel( i18n("Records directory:"), gb ); grid->addWidget( lab, 0, 0 ); - recordDirLe = new QLineEdit( gb ); + recordDirLe = new TQLineEdit( gb ); recordDirLe->setReadOnly( true ); grid->addWidget( recordDirLe, 0, 1 ); - recordDirBtn = new QToolButton( gb ); + recordDirBtn = new TQToolButton( gb ); recordDirBtn->setIconSet( icon->loadIconSet("fileopen", KIcon::Small) ); grid->addWidget( recordDirBtn, 0, 2 ); - lab = new QLabel( i18n("Time shifting directory:"), gb ); + lab = new TQLabel( i18n("Time shifting directory:"), gb ); grid->addWidget( lab, 1, 0 ); - shiftDirLe = new QLineEdit( gb ); + shiftDirLe = new TQLineEdit( gb ); shiftDirLe->setReadOnly( true ); grid->addWidget( shiftDirLe, 1, 1 ); - shiftDirBtn = new QToolButton( gb ); + shiftDirBtn = new TQToolButton( gb ); shiftDirBtn->setIconSet( icon->loadIconSet("fileopen", KIcon::Small) ); grid->addWidget( shiftDirBtn, 1, 2 ); - lab = new QLabel( i18n("Begin margin:"), gb ); + lab = new TQLabel( i18n("Begin margin:"), gb ); grid->addWidget( lab, 2, 0 ); - beginSpin = new QSpinBox( gb ); - h1 = new QHBoxLayout(); + beginSpin = new TQSpinBox( gb ); + h1 = new TQHBoxLayout(); h1->addWidget( beginSpin ); - lab = new QLabel( i18n("(minutes)"), gb ); + lab = new TQLabel( i18n("(minutes)"), gb ); h1->addWidget( lab ); grid->addLayout( h1, 2, 1 ); - lab = new QLabel( i18n("End margin:"), gb ); + lab = new TQLabel( i18n("End margin:"), gb ); grid->addWidget( lab, 3, 0 ); - endSpin = new QSpinBox( gb ); - h1 = new QHBoxLayout(); + endSpin = new TQSpinBox( gb ); + h1 = new TQHBoxLayout(); h1->addWidget( endSpin ); - lab = new QLabel( i18n("(minutes)"), gb ); + lab = new TQLabel( i18n("(minutes)"), gb ); h1->addWidget( lab ); grid->addLayout( h1, 3, 1 ); - lab = new QLabel( i18n("Instant record duration:"), gb ); + lab = new TQLabel( i18n("Instant record duration:"), gb ); grid->addWidget( lab, 4, 0 ); - instantDurationSpin = new QSpinBox( 1, 1440, 1, gb ); - h1 = new QHBoxLayout(); + instantDurationSpin = new TQSpinBox( 1, 1440, 1, gb ); + h1 = new TQHBoxLayout(); h1->addWidget( instantDurationSpin ); - lab = new QLabel( i18n("(minutes)"), gb ); + lab = new TQLabel( i18n("(minutes)"), gb ); h1->addWidget( lab ); grid->addLayout( h1, 4, 1 ); - lab = new QLabel( i18n("Max file size (0=Unlimited):"), gb ); + lab = new TQLabel( i18n("Max file size (0=Unlimited):"), gb ); grid->addWidget( lab, 5, 0 ); - sizeFileSpin = new QSpinBox( 1, 9999, 1, gb ); + sizeFileSpin = new TQSpinBox( 1, 9999, 1, gb ); sizeFileSpin->setMinValue(0); - h1 = new QHBoxLayout(); + h1 = new TQHBoxLayout(); h1->addWidget( sizeFileSpin ); - lab = new QLabel( i18n("(MB)"), gb ); + lab = new TQLabel( i18n("(MB)"), gb ); h1->addWidget( lab ); grid->addLayout( h1, 5, 1 ); - lab = new QLabel( i18n("Filename Format:"), gb ); + lab = new TQLabel( i18n("Filename Format:"), gb ); grid->addWidget( lab, 7, 0 ); - filenameFormatLe = new QLineEdit( gb ); + filenameFormatLe = new TQLineEdit( gb ); grid->addWidget( filenameFormatLe, 7, 1 ); - helpNameBtn = new QToolButton( gb ); + helpNameBtn = new TQToolButton( gb ); helpNameBtn->setIconSet( icon->loadIconSet("help", KIcon::Small) ); grid->addWidget( helpNameBtn, 7, 2 ); vb->addWidget( gb ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Ignored, QSizePolicy::Ignored ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); recordDirLe->setText( dvbConfig->recordDir ); shiftDirLe->setText( dvbConfig->shiftDir ); @@ -908,25 +908,25 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, page = addPage(i18n("Broadcasting"),i18n("DVB Broadcasting"), KGlobal::instance()->iconLoader()->loadIcon( "network_local", KIcon::NoGroup, KIcon::SizeMedium ) ); - vb = new QVBoxLayout( page, 6, 6 ); - gb = new QGroupBox( "", page ); - grid = new QGridLayout( gb, 1, 1, 20, 6 ); + vb = new TQVBoxLayout( page, 6, 6 ); + gb = new TQGroupBox( "", page ); + grid = new TQGridLayout( gb, 1, 1, 20, 6 ); - lab = new QLabel( i18n("Broadcast address:"), gb ); + lab = new TQLabel( i18n("Broadcast address:"), gb ); grid->addWidget( lab, 0, 0 ); - broadcastLe = new QLineEdit( gb ); + broadcastLe = new TQLineEdit( gb ); grid->addWidget( broadcastLe, 0, 1 ); - lab = new QLabel( i18n("Broadcast port:"), gb ); + lab = new TQLabel( i18n("Broadcast port:"), gb ); grid->addWidget( lab, 1, 0 ); - bportSpin = new QSpinBox( 1, 65535, 1, gb ); + bportSpin = new TQSpinBox( 1, 65535, 1, gb ); grid->addWidget( bportSpin, 1, 1 ); - lab = new QLabel( i18n("Info port:"), gb ); + lab = new TQLabel( i18n("Info port:"), gb ); grid->addWidget( lab, 2, 0 ); - sportSpin = new QSpinBox( 1, 65535, 1, gb ); + sportSpin = new TQSpinBox( 1, 65535, 1, gb ); grid->addWidget( sportSpin, 2, 1 ); vb->addWidget( gb ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Ignored, QSizePolicy::Ignored ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); broadcastLe->setText( dvbConfig->broadcastAddress ); bportSpin->setValue( dvbConfig->broadcastPort ); @@ -934,23 +934,23 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, page = addPage(i18n("Misc"),i18n("Misc"), KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); - vb = new QVBoxLayout( page, 6, 6 ); - gb = new QGroupBox( "", page ); - grid = new QGridLayout( gb, 1, 1, 20, 6 ); + vb = new TQVBoxLayout( page, 6, 6 ); + gb = new TQGroupBox( "", page ); + grid = new TQGridLayout( gb, 1, 1, 20, 6 ); - probeMfe = new QCheckBox( i18n("Probe Multiple-Frontends (Restart required)."), gb ); + probeMfe = new TQCheckBox( i18n("Probe Multiple-Frontends (Restart required)."), gb ); probeMfe->setChecked( dvbConfig->probeMfe ); grid->addWidget( probeMfe, 0, 0 ); - lab = new QLabel( i18n("LiveShow ringbuffer size (MB) :"), gb ); + lab = new TQLabel( i18n("LiveShow ringbuffer size (MB) :"), gb ); grid->addWidget( lab, 1, 0 ); - ringBufSize = new QSpinBox( 2, 99, 1, gb ); + ringBufSize = new TQSpinBox( 2, 99, 1, gb ); ringBufSize->setValue( dvbConfig->ringBufSize ); grid->addWidget( ringBufSize, 1, 1 ); - lab = new QLabel( i18n("Default charset (restart needed):"), gb ); + lab = new TQLabel( i18n("Default charset (restart needed):"), gb ); grid->addWidget( lab, 2, 0 ); - charsetComb = new QComboBox( gb ); + charsetComb = new TQComboBox( gb ); charsetComb->insertItem( "ISO8859-1" ); charsetComb->insertItem( "ISO6937" ); if ( dvbConfig->defaultCharset=="ISO8859-1" ) @@ -959,39 +959,39 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, charsetComb->setCurrentItem( 1 ); grid->addWidget( charsetComb, 2, 1 ); - lab = new QLabel( i18n("Update scan data:"), gb ); + lab = new TQLabel( i18n("Update scan data:"), gb ); grid->addWidget( lab, 3, 0 ); updateBtn = new KPushButton( gb ); updateBtn->setGuiItem( KGuiItem(i18n("Download"), icon->loadIconSet("khtml_kget", KIcon::Small) ) ); grid->addWidget( updateBtn, 3, 1 ); - lab = new QLabel( i18n("Dump epg's events to \n~/kaffeine_dvb_events.tx:"), gb ); + lab = new TQLabel( i18n("Dump epg's events to \n~/kaffeine_dvb_events.tx:"), gb ); grid->addWidget( lab, 4, 0 ); dumpBtn = new KPushButton( gb ); dumpBtn->setGuiItem( KGuiItem(i18n("Dump"), icon->loadIconSet("filesave", KIcon::Small) ) ); grid->addWidget( dumpBtn, 4, 1 ); vb->addWidget( gb ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Ignored, QSizePolicy::Ignored ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); if ( p ) { page = addPage(i18n("DVB plugins"),i18n("DVB plugins"), KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); - vb = new QVBoxLayout( page, 6, 6 ); - gb = new QGroupBox( "", page ); - grid = new QGridLayout( gb, 1, 1, 20, 6 ); + vb = new TQVBoxLayout( page, 6, 6 ); + gb = new TQGroupBox( "", page ); + grid = new TQGridLayout( gb, 1, 1, 20, 6 ); KPushButton *btn = new KPushButton( p->pluginName(), gb ); grid->addWidget( btn, 0, 0 ); - connect( btn, SIGNAL(clicked()), p, SLOT(configDialog()) ); + connect( btn, TQT_SIGNAL(clicked()), p, TQT_SLOT(configDialog()) ); vb->addWidget( gb ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Ignored, QSizePolicy::Ignored ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); } - connect( recordDirBtn, SIGNAL(clicked()), this, SLOT(setRecordDir()) ); - connect( shiftDirBtn, SIGNAL(clicked()), this, SLOT(setShiftDir()) ); - connect( updateBtn, SIGNAL(clicked()), this, SLOT(downloadData()) ); - connect( helpNameBtn, SIGNAL(clicked()), this, SLOT(fileTemplateHelp()) ); + connect( recordDirBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRecordDir()) ); + connect( shiftDirBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setShiftDir()) ); + connect( updateBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadData()) ); + connect( helpNameBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(fileTemplateHelp()) ); delete icon; } @@ -1000,30 +1000,30 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, void DvbConfigDialog::setUsals() { KDialogBase *dlg = new KDialogBase( this, "usalsConfigDialog", true, i18n("Rotors settings"), Ok|Cancel, Ok, true ); - QGridLayout *grid; - QWidget *page = new QWidget( dlg ); + TQGridLayout *grid; + TQWidget *page = new TQWidget( dlg ); dlg->setMainWidget( page ); - QVBoxLayout *vb = new QVBoxLayout( page, 6, 6 ); - QLabel *lab = new QLabel( i18n("Set your position coordinates for rotors:"), page ); + TQVBoxLayout *vb = new TQVBoxLayout( page, 6, 6 ); + TQLabel *lab = new TQLabel( i18n("Set your position coordinates for rotors:"), page ); vb->addWidget( lab ); - lab = new QLabel( "(Sydney: -33.8916, 151.2417 - New York: 40.7139, -74.0063)", page ); + lab = new TQLabel( "(Sydney: -33.8916, 151.2417 - New York: 40.7139, -74.0063)", page ); vb->addWidget( lab ); - grid = new QGridLayout( 0, 1, 1 ); - lab = new QLabel( i18n("Latitude:"), page ); + grid = new TQGridLayout( 0, 1, 1 ); + lab = new TQLabel( i18n("Latitude:"), page ); grid->addWidget( lab, 0, 0 ); - QLineEdit *latitude = new QLineEdit( page ); - latitude->setText( QString().setNum( dvbConfig->usalsLatitude ) ); + TQLineEdit *latitude = new TQLineEdit( page ); + latitude->setText( TQString().setNum( dvbConfig->usalsLatitude ) ); grid->addWidget( latitude, 0, 1 ); - lab = new QLabel( i18n("Longitude:"), page ); + lab = new TQLabel( i18n("Longitude:"), page ); grid->addWidget( lab, 1, 0 ); - QLineEdit *longitude = new QLineEdit( page ); - longitude->setText( QString().setNum( dvbConfig->usalsLongitude ) ); + TQLineEdit *longitude = new TQLineEdit( page ); + longitude->setText( TQString().setNum( dvbConfig->usalsLongitude ) ); grid->addWidget( longitude, 1, 1 ); vb->addLayout( grid ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Ignored, QSizePolicy::Ignored ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); - if ( dlg->exec()==QDialog::Accepted ) { + if ( dlg->exec()==TQDialog::Accepted ) { dvbConfig->usalsLatitude = latitude->text().toDouble(); dvbConfig->usalsLongitude = longitude->text().toDouble(); for ( int i=0; i<(int)dvbConfig->devList.count(); i++ ) { @@ -1045,8 +1045,8 @@ void DvbConfigDialog::setRotorSources( int devNum, int lnbNum ) void DvbConfigDialog::setRotor( int index, int devNum, int lnbNum ) { - QComboBox *comb; - QPushButton *btn; + TQComboBox *comb; + TQPushButton *btn; switch ( lnbNum ) { case 0 : comb=sat0[devNum]; btn=src0[devNum]; break; @@ -1095,11 +1095,11 @@ loop: -void DvbConfigDialog::setSource( QComboBox *box, QString s ) +void DvbConfigDialog::setSource( TQComboBox *box, TQString s ) { int pos, i; - pos = s.find("|"); + pos = s.tqfind("|"); if ( pos>=0 ) s = s.right( s.length()-pos-1 ); for ( i=0; i<(int)box->count(); i++ ) { @@ -1148,7 +1148,7 @@ void DvbConfigDialog::fileTemplateHelp() void DvbConfigDialog::setRecordDir() { - QString s = KFileDialog::getExistingDirectory( recordDirLe->text().stripWhiteSpace() ); + TQString s = KFileDialog::getExistingDirectory( recordDirLe->text().stripWhiteSpace() ); if ( !s.isEmpty() ) recordDirLe->setText( s ); } @@ -1157,7 +1157,7 @@ void DvbConfigDialog::setRecordDir() void DvbConfigDialog::setShiftDir() { - QString s = KFileDialog::getExistingDirectory( shiftDirLe->text().stripWhiteSpace() ); + TQString s = KFileDialog::getExistingDirectory( shiftDirLe->text().stripWhiteSpace() ); if ( !s.isEmpty() ) shiftDirLe->setText( s ); } @@ -1166,7 +1166,7 @@ void DvbConfigDialog::setShiftDir() void DvbConfigDialog::accept() { - QString s; + TQString s; int i; if ( recordDirLe->text().stripWhiteSpace().isEmpty() ) { @@ -1184,12 +1184,12 @@ void DvbConfigDialog::accept() sportSpin->setFocus(); return; } - if ( !QRegExp("(\\d{1,3}\\.){3}\\d{1,3}").exactMatch( broadcastLe->text().stripWhiteSpace() ) ) { + if ( !TQRegExp("(\\d{1,3}\\.){3}\\d{1,3}").exactMatch( broadcastLe->text().stripWhiteSpace() ) ) { KMessageBox::sorry( this, i18n("Invalid broadcast address.") ); broadcastLe->setFocus(); return; } - if ( !filenameFormatLe->text().contains("%chan") && !filenameFormatLe->text().contains("%date") && !filenameFormatLe->text().contains("%name") ) { + if ( !filenameFormatLe->text().tqcontains("%chan") && !filenameFormatLe->text().tqcontains("%date") && !filenameFormatLe->text().tqcontains("%name") ) { KMessageBox::sorry( this, i18n("Invalid filename format.") ); filenameFormatLe->setFocus(); return; @@ -1271,61 +1271,61 @@ DvbConfigDialog::~DvbConfigDialog() -LnbConfig::LnbConfig( LNB *b, QWidget *parent ) : - KDialogBase ( parent, "lnbConfigDialog", true, i18n("LNB Settings"), Ok|Cancel, Ok, true ) +LnbConfig::LnbConfig( LNB *b, TQWidget *tqparent ) : + KDialogBase ( tqparent, "lnbConfigDialog", true, i18n("LNB Settings"), Ok|Cancel, Ok, true ) { - QGridLayout *grid; + TQGridLayout *grid; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget( page ); lnb = b; - QVBoxLayout *vb = new QVBoxLayout( page, 6, 6 ); - univ = new QPushButton( i18n("Universal LNB"), page ); - connect( univ, SIGNAL(clicked()), this, SLOT(setUniversal()) ); + TQVBoxLayout *vb = new TQVBoxLayout( page, 6, 6 ); + univ = new TQPushButton( i18n("Universal LNB"), page ); + connect( univ, TQT_SIGNAL(clicked()), this, TQT_SLOT(setUniversal()) ); vb->addWidget( univ ); - cmono = new QPushButton( i18n("C-Band LNB"), page ); - connect( cmono, SIGNAL(clicked()), this, SLOT(setCBandMono()) ); + cmono = new TQPushButton( i18n("C-Band LNB"), page ); + connect( cmono, TQT_SIGNAL(clicked()), this, TQT_SLOT(setCBandMono()) ); vb->addWidget( cmono ); - cmulti = new QPushButton( i18n("C-Band Multipoint LNB"), page ); - connect( cmulti, SIGNAL(clicked()), this, SLOT(setCBandMulti()) ); + cmulti = new TQPushButton( i18n("C-Band Multipoint LNB"), page ); + connect( cmulti, TQT_SIGNAL(clicked()), this, TQT_SLOT(setCBandMulti()) ); vb->addWidget( cmulti ); - grid = new QGridLayout( 0, 1, 1 ); - nLO = new QButtonGroup( 3, Qt::Horizontal, page ); - connect( nLO, SIGNAL(clicked(int)), this, SLOT(setDual(int)) ); - new QRadioButton( i18n("Dual LO"), nLO ); - new QRadioButton( i18n("Single LO"), nLO ); - new QRadioButton( i18n("H/V LO"), nLO ); + grid = new TQGridLayout( 0, 1, 1 ); + nLO = new TQButtonGroup( 3, Qt::Horizontal, page ); + connect( nLO, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setDual(int)) ); + new TQRadioButton( i18n("Dual LO"), nLO ); + new TQRadioButton( i18n("Single LO"), nLO ); + new TQRadioButton( i18n("H/V LO"), nLO ); grid->addMultiCellWidget( nLO, 0, 0, 0, 1 ); - slofLab = new QLabel( i18n("Dual LO switch frequency:")+i18n(" (MHz)"), page ); + slofLab = new TQLabel( i18n("Dual LO switch frequency:")+i18n(" (MHz)"), page ); grid->addWidget( slofLab, 1, 0 ); - slof = new QSpinBox( 0, 13000, 1, page ); + slof = new TQSpinBox( 0, 13000, 1, page ); grid->addWidget( slof, 1, 1 ); - loLab = new QLabel( i18n("Lo-band frequency:")+i18n(" (MHz)"), page ); + loLab = new TQLabel( i18n("Lo-band frequency:")+i18n(" (MHz)"), page ); grid->addWidget( loLab, 2, 0 ); - lo = new QSpinBox( 0, 13000, 1, page ); + lo = new TQSpinBox( 0, 13000, 1, page ); grid->addWidget( lo, 2, 1 ); - hiLab = new QLabel( i18n("Hi-band frequency:")+i18n(" (MHz)"), page ); + hiLab = new TQLabel( i18n("Hi-band frequency:")+i18n(" (MHz)"), page ); grid->addWidget( hiLab, 3, 0 ); - hi = new QSpinBox( 0, 13000, 1, page ); + hi = new TQSpinBox( 0, 13000, 1, page ); grid->addWidget( hi, 3, 1 ); - singleLab = new QLabel( i18n("Single LO frequency:")+i18n(" (MHz)"), page ); + singleLab = new TQLabel( i18n("Single LO frequency:")+i18n(" (MHz)"), page ); grid->addWidget( singleLab, 4, 0 ); - single = new QSpinBox( 0, 13000, 1, page ); + single = new TQSpinBox( 0, 13000, 1, page ); grid->addWidget( single, 4, 1 ); - verticalLab = new QLabel( i18n("Vertical pol. LO frequency:")+i18n(" (MHz)"), page ); + verticalLab = new TQLabel( i18n("Vertical pol. LO frequency:")+i18n(" (MHz)"), page ); grid->addWidget( verticalLab, 5, 0 ); - vertical = new QSpinBox( 0, 13000, 1, page ); + vertical = new TQSpinBox( 0, 13000, 1, page ); grid->addWidget( vertical, 5, 1 ); - horizontalLab = new QLabel( i18n("Horizontal pol. LO frequency:")+i18n(" (MHz)"), page ); + horizontalLab = new TQLabel( i18n("Horizontal pol. LO frequency:")+i18n(" (MHz)"), page ); grid->addWidget( horizontalLab, 6, 0 ); - horizontal = new QSpinBox( 0, 13000, 1, page ); + horizontal = new TQSpinBox( 0, 13000, 1, page ); grid->addWidget( horizontal, 6, 1 ); vb->addLayout( grid ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Ignored, QSizePolicy::Ignored ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); slof->setValue( lnb->switchFreq ); @@ -1463,78 +1463,78 @@ void LnbConfig::accept() -RotorConfig::RotorConfig( Device *d, DVBconfig *c, int lnb, QWidget *parent ) : - KDialogBase ( parent, "rotorConfigDialog", true, i18n("Rotor Settings"), Ok|Cancel, Ok, true ) +RotorConfig::RotorConfig( Device *d, DVBconfig *c, int lnb, TQWidget *tqparent ) : + KDialogBase ( tqparent, "rotorConfigDialog", true, i18n("Rotor Settings"), Ok|Cancel, Ok, true ) { int i; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget( page ); dev = d; config = c; lnbNum = lnb; - QVBoxLayout *vb = new QVBoxLayout( page, 6, 6 ); - QGridLayout *grid = new QGridLayout( 0, 1, 1 ); - QLabel *lab = new QLabel( i18n("Sattelite:"), page ); + TQVBoxLayout *vb = new TQVBoxLayout( page, 6, 6 ); + TQGridLayout *grid = new TQGridLayout( 0, 1, 1 ); + TQLabel *lab = new TQLabel( i18n("Sattelite:"), page ); grid->addWidget( lab, 0, 0 ); if ( dev->lnb[lnbNum].rotorType==2 ) { - lab = new QLabel( i18n("Position:"), page ); + lab = new TQLabel( i18n("Position:"), page ); grid->addWidget( lab, 0, 1 ); } - srcComb = new QComboBox( page ); + srcComb = new TQComboBox( page ); srcComb->insertStringList( config->getSourcesList( dev->type ) ); grid->addWidget( srcComb, 1, 0 ); - position = new QSpinBox( 0, 500, 1, page ); + position = new TQSpinBox( 0, 500, 1, page ); grid->addWidget( position, 1, 1 ); vb->addLayout( grid ); - vb->addItem( new QSpacerItem( 20, 10, QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + vb->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - addBtn = new QPushButton( i18n("Add to list"), page ); - connect( addBtn, SIGNAL(clicked()), this, SLOT(add()) ); + addBtn = new TQPushButton( i18n("Add to list"), page ); + connect( addBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()) ); vb->addWidget( addBtn ); - vb->addItem( new QSpacerItem( 20, 10, QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + vb->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - listView = new QListView( page ); + listView = new TQListView( page ); listView->addColumn( i18n("Sattelite:") ); vb->addWidget( listView ); - resetBtn = new QPushButton( i18n("Clear list"), page ); - connect( resetBtn, SIGNAL(clicked()), this, SLOT(reset()) ); + resetBtn = new TQPushButton( i18n("Clear list"), page ); + connect( resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset()) ); vb->addWidget( resetBtn ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); if ( dev->lnb[lnbNum].rotorType!=3 ) { - grid = new QGridLayout( 0, 1, 1 ); - lab = new QLabel( i18n("13V rotor speed:"), page ); + grid = new TQGridLayout( 0, 1, 1 ); + lab = new TQLabel( i18n("13V rotor speed:"), page ); grid->addWidget( lab, 0, 0 ); - speed13 = new QLineEdit( page ); - speed13->setText( QString().setNum( dev->lnb[lnbNum].speed13v ) ); + speed13 = new TQLineEdit( page ); + speed13->setText( TQString().setNum( dev->lnb[lnbNum].speed13v ) ); grid->addWidget( speed13, 0, 1 ); - lab = new QLabel( i18n("sec./ °"), page ); + lab = new TQLabel( i18n("sec./ °"), page ); grid->addWidget( lab, 0, 2 ); - lab = new QLabel( i18n("18V rotor speed:"), page ); + lab = new TQLabel( i18n("18V rotor speed:"), page ); grid->addWidget( lab, 1, 0 ); - speed18 = new QLineEdit( page ); - speed18->setText( QString().setNum( dev->lnb[lnbNum].speed18v ) ); + speed18 = new TQLineEdit( page ); + speed18->setText( TQString().setNum( dev->lnb[lnbNum].speed18v ) ); grid->addWidget( speed18, 1, 1 ); - lab = new QLabel( i18n("sec./ °"), page ); + lab = new TQLabel( i18n("sec./ °"), page ); grid->addWidget( lab, 1, 2 ); vb->addLayout( grid ); } - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Ignored, QSizePolicy::Ignored ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); if ( dev->lnb[lnbNum].rotorType==2 ) { listView->addColumn( i18n("Position:") ); for ( i=0; i<(int)dev->lnb[lnbNum].source.count(); i++ ) - new QListViewItem( listView, dev->lnb[lnbNum].source[i], QString().setNum(dev->lnb[lnbNum].position[i]) ); + new TQListViewItem( listView, dev->lnb[lnbNum].source[i], TQString().setNum(dev->lnb[lnbNum].position[i]) ); } else { position->hide(); for ( i=0; i<(int)dev->lnb[lnbNum].source.count(); i++ ) - new QListViewItem( listView, dev->lnb[lnbNum].source[i] ); + new TQListViewItem( listView, dev->lnb[lnbNum].source[i] ); } } @@ -1552,10 +1552,10 @@ void RotorConfig::reset() void RotorConfig::add() { if ( position->isHidden() ) { - new QListViewItem( listView, srcComb->currentText() ); + new TQListViewItem( listView, srcComb->currentText() ); } else { - new QListViewItem( listView, srcComb->currentText(), QString().setNum(position->value()) ); + new TQListViewItem( listView, srcComb->currentText(), TQString().setNum(position->value()) ); } } @@ -1564,7 +1564,7 @@ void RotorConfig::add() void RotorConfig::accept() { - QListViewItem *it; + TQListViewItem *it; if ( dev->lnb[lnbNum].rotorType!=3 ) { dev->lnb[lnbNum].speed18v = speed18->text().toDouble(); diff --git a/kaffeine/src/input/dvb/dvbconfig.h b/kaffeine/src/input/dvb/dvbconfig.h index 04f2bf1..f44756e 100644 --- a/kaffeine/src/input/dvb/dvbconfig.h +++ b/kaffeine/src/input/dvb/dvbconfig.h @@ -21,14 +21,14 @@ #ifndef DVBCONFIG_H #define DVBCONFIG_H -#include <qspinbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qtoolbutton.h> -#include <qbuttongroup.h> -#include <qlistview.h> -#include <qcheckbox.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqtoolbutton.h> +#include <tqbuttongroup.h> +#include <tqlistview.h> +#include <tqcheckbox.h> #include <kdialogbase.h> #include <kpushbutton.h> @@ -42,11 +42,12 @@ using namespace KIO; -class MSpinBox : public QSpinBox +class MSpinBox : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: - MSpinBox( QWidget *parent, int devNum ); + MSpinBox( TQWidget *tqparent, int devNum ); public slots: void slotValueChanged( int value ); signals: @@ -60,8 +61,9 @@ private: class MPushButton : public KPushButton { Q_OBJECT + TQ_OBJECT public: - MPushButton( QWidget *parent, int devNum, int lnbNum ); + MPushButton( TQWidget *tqparent, int devNum, int lnbNum ); private slots: void isClicked(); signals: @@ -73,11 +75,12 @@ private: -class MCAMButton : public QPushButton +class MCAMButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - MCAMButton( QWidget *parent, int devNum ); + MCAMButton( TQWidget *tqparent, int devNum ); private slots: void isClicked(); signals: @@ -88,11 +91,12 @@ private: -class MComboBox : public QComboBox +class MComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - MComboBox( QWidget *parent, int devNum, int lnbNum ); + MComboBox( TQWidget *tqparent, int devNum, int lnbNum ); private slots: void isActivated( int index ); signals: @@ -114,9 +118,9 @@ public: unsigned int hiFreq; int rotorType; double speed13v, speed18v; - QStringList source; - QValueList<int> position; - QString currentSource; + TQStringList source; + TQValueList<int> position; + TQString currentSource; }; @@ -124,11 +128,11 @@ public: class Device { public: - Device( int anum, int tnum, fe_type_t t, const QString &n, bool as ); + Device( int anum, int tnum, fe_type_t t, const TQString &n, bool as ); int adapter, tuner; fe_type_t type; - QString name; - QString source; + TQString name; + TQString source; int numLnb; LNB lnb[4]; bool canAutoscan; @@ -147,20 +151,21 @@ public: class Category { public: - Category( const QString &tname, const QString &ticon ); - QString name; - QString icon; + Category( const TQString &tname, const TQString &ticon ); + TQString name; + TQString icon; }; -class DVBconfig : public QObject +class DVBconfig : public TQObject { Q_OBJECT + TQ_OBJECT public: - DVBconfig( const QString &dvbConf ); + DVBconfig( const TQString &dvbConf ); ~DVBconfig(); void readFirst(); void readConfig(); @@ -169,29 +174,29 @@ public: void saveDvbChanOrder( int s, int col ); void startup(); static bool haveDvbDevice(); - bool loadDvbData( QWidget *parent ); + bool loadDvbData( TQWidget *tqparent ); bool localData(); - QStringList getSourcesList( fe_type_t type ); + TQStringList getSourcesList( fe_type_t type ); bool haveData(); bool firstRun(); - void addCategory( const QString &name, const QString &icon ); - void removeCategory( const QString &name ); - void changeIconCategory( const QString &name, const QString &icon ); + void addCategory( const TQString &name, const TQString &icon ); + void removeCategory( const TQString &name ); + void changeIconCategory( const TQString &name, const TQString &icon ); KConfig *config; - QString recordDir, shiftDir, filenameFormat; + TQString recordDir, shiftDir, filenameFormat; int beginMargin, endMargin, instantDuration, sizeFile; - QSize epgSize, scanSize, timerSize; - QPtrList<Device> devList; - QPtrList<Category> categories; - QString allIcon, tvIcon, radioIcon; - QString dvbConfigDir; - QString dvbConfigIconsDir; - QString broadcastAddress; + TQSize epgSize, scanSize, timerSize; + TQPtrList<Device> devList; + TQPtrList<Category> categories; + TQString allIcon, tvIcon, radioIcon; + TQString dvbConfigDir; + TQString dvbConfigIconsDir; + TQString broadcastAddress; int broadcastPort, senderPort; int lastChannel; - QValueList<int> splitSizes; - QString defaultCharset; + TQValueList<int> splitSizes; + TQString defaultCharset; double usalsLatitude, usalsLongitude; int probeMfe; int ringBufSize; @@ -215,22 +220,23 @@ class DvbPanel; class DvbConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, QWidget *parent, KaffeineDvbPlugin *p ); + DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *tqparent, KaffeineDvbPlugin *p ); ~DvbConfigDialog(); - void setSource( QComboBox *box, QString s ); + void setSource( TQComboBox *box, TQString s ); - QLineEdit *recordDirLe, *shiftDirLe, *broadcastLe, *filenameFormatLe; - QSpinBox *beginSpin, *endSpin, *instantDurationSpin, *bportSpin, *sportSpin, *sizeFileSpin; + TQLineEdit *recordDirLe, *shiftDirLe, *broadcastLe, *filenameFormatLe; + TQSpinBox *beginSpin, *endSpin, *instantDurationSpin, *bportSpin, *sportSpin, *sizeFileSpin; MSpinBox *satNumber[MAX_DEVICES]; - QCheckBox *secMini[MAX_DEVICES], *secTwice[MAX_DEVICES]; - QCheckBox *doS2[MAX_DEVICES]; - QComboBox *sat0[MAX_DEVICES]; - QComboBox *sat1[MAX_DEVICES]; - QComboBox *sat2[MAX_DEVICES]; - QComboBox *sat3[MAX_DEVICES]; + TQCheckBox *secMini[MAX_DEVICES], *secTwice[MAX_DEVICES]; + TQCheckBox *doS2[MAX_DEVICES]; + TQComboBox *sat0[MAX_DEVICES]; + TQComboBox *sat1[MAX_DEVICES]; + TQComboBox *sat2[MAX_DEVICES]; + TQComboBox *sat3[MAX_DEVICES]; MPushButton *src0[MAX_DEVICES]; MPushButton *src1[MAX_DEVICES]; MPushButton *src2[MAX_DEVICES]; @@ -244,13 +250,13 @@ public: MPushButton *lnb2[MAX_DEVICES]; MPushButton *lnb3[MAX_DEVICES]; KPushButton *updateBtn, *dumpBtn; - QToolButton *recordDirBtn, *shiftDirBtn, *helpNameBtn; + TQToolButton *recordDirBtn, *shiftDirBtn, *helpNameBtn; DVBconfig *dvbConfig; - QComboBox *charsetComb; - QPtrList<QSpinBox> timeoutSpin; - QPtrList<QSpinBox> priority; - QCheckBox *probeMfe; - QSpinBox *ringBufSize; + TQComboBox *charsetComb; + TQPtrList<TQSpinBox> timeoutSpin; + TQPtrList<TQSpinBox> priority; + TQCheckBox *probeMfe; + TQSpinBox *ringBufSize; private slots: @@ -274,10 +280,11 @@ protected slots: class LnbConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LnbConfig( LNB *b, QWidget *parent ); + LnbConfig( LNB *b, TQWidget *tqparent ); protected slots: @@ -289,11 +296,11 @@ protected slots: private: - QSpinBox *slof; - QSpinBox *lo, *hi, *single, *vertical, *horizontal; - QLabel *slofLab, *loLab, *hiLab, *singleLab, *verticalLab, *horizontalLab; - QButtonGroup *nLO; - QPushButton *univ, *cmono, *cmulti; + TQSpinBox *slof; + TQSpinBox *lo, *hi, *single, *vertical, *horizontal; + TQLabel *slofLab, *loLab, *hiLab, *singleLab, *verticalLab, *horizontalLab; + TQButtonGroup *nLO; + TQPushButton *univ, *cmono, *cmulti; LNB *lnb; }; @@ -303,10 +310,11 @@ private: class RotorConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - RotorConfig( Device *d, DVBconfig *c, int lnb, QWidget *parent ); + RotorConfig( Device *d, DVBconfig *c, int lnb, TQWidget *tqparent ); protected slots: @@ -319,11 +327,11 @@ private slots: private: - QSpinBox *position; - QComboBox *srcComb; - QListView *listView; - QPushButton *addBtn, *resetBtn; - QLineEdit *speed13, *speed18; + TQSpinBox *position; + TQComboBox *srcComb; + TQListView *listView; + TQPushButton *addBtn, *resetBtn; + TQLineEdit *speed13, *speed18; Device *dev; int lnbNum; diff --git a/kaffeine/src/input/dvb/dvbevents.cpp b/kaffeine/src/input/dvb/dvbevents.cpp index 13e1265..a6687bf 100644 --- a/kaffeine/src/input/dvb/dvbevents.cpp +++ b/kaffeine/src/input/dvb/dvbevents.cpp @@ -23,8 +23,8 @@ #include <sys/time.h> #include <sys/resource.h> -#include <qdatetime.h> -#include <qfile.h> +#include <tqdatetime.h> +#include <tqfile.h> #include <klocale.h> #include <kstandarddirs.h> @@ -35,12 +35,12 @@ -DVBevents::DVBevents( QString devType, int anum, int tnum, const QString &charset, EventTable *table ) +DVBevents::DVBevents( TQString devType, int anum, int tnum, const TQString &charset, EventTable *table ) : KaffeineDVBsection( anum, tnum, charset ) { events = table; KaffeineEpgPlugin *plug; - QString plugName; + TQString plugName; int error; KTrader::OfferList offers = KTrader::self()->query("KaffeineEpgPlugin"); @@ -48,7 +48,7 @@ DVBevents::DVBevents( QString devType, int anum, int tnum, const QString &charse for ( KTrader::OfferList::Iterator it=offers.begin(); it!=end; ++it ) { error = 0; KService::Ptr ptr = (*it); - if ( !ptr->name().contains(devType) ) + if ( !ptr->name().tqcontains(devType) ) continue; plug = KParts::ComponentFactory::createPartInstanceFromService<KaffeineEpgPlugin>(ptr, 0, ptr->name().ascii(), 0, 0, 0, &error ); plugName = ptr->desktopEntryName(); @@ -88,7 +88,7 @@ DVBevents::~DVBevents() bool DVBevents::shortEventDesc( unsigned char *buf, EventDesc *desc ) { - QString name, text; + TQString name, text; int len, len2; ShortEvent *ev; @@ -122,7 +122,7 @@ bool DVBevents::extEventDesc( unsigned char *buf, EventDesc *desc ) { int loop, len1, len2; unsigned char *b = buf; - QString s; + TQString s; if ( !safeLen( b+7 ) ) return false; @@ -144,7 +144,7 @@ bool DVBevents::extEventDesc( unsigned char *buf, EventDesc *desc ) if ( !s.isEmpty() ) s = s+" : "; s = s+getText(b+2+len1,len2); - desc->extEvents.append( new QString( s ) ); + desc->extEvents.append( new TQString( s ) ); b +=(2+len1+len2); loop -=(2+len1+len2); } @@ -154,7 +154,7 @@ bool DVBevents::extEventDesc( unsigned char *buf, EventDesc *desc ) if ( !safeLen( b+1+len1 ) ) return false; s = getText(b+1,len1); - desc->extEvents.append( new QString( s ) ); + desc->extEvents.append( new TQString( s ) ); return true; } @@ -167,10 +167,10 @@ bool DVBevents::tableEIT( unsigned char* buffer ) int i, sec; EventDesc *desc=0, *itdesc=0; EventSid *slist; - QPtrList<EventDesc> *currentEvents; + TQPtrList<EventDesc> *currentEvents; bool nodesc, parse; - QDateTime start, cur, dt; - unsigned int cdt = QDateTime::currentDateTime().toTime_t(); + TQDateTime start, cur, dt; + unsigned int cdt = TQDateTime::tqcurrentDateTime().toTime_t(); tid = getBits(buf,0,8); length = getBits(buf,12,12); @@ -187,7 +187,7 @@ bool DVBevents::tableEIT( unsigned char* buffer ) return false; slist->lock(); currentEvents = slist->getEvents(); - QPtrListIterator<EventDesc> it( *currentEvents ); + TQPtrListIterator<EventDesc> it( *currentEvents ); while ( length>4 ) { nodesc=parse=false; @@ -280,7 +280,7 @@ bool DVBevents::tableEIT( unsigned char* buffer ) if ( !nodesc ) { if ( start==desc->startDateTime ) goto ifend; - currentEvents->take( currentEvents->find( desc ) ); + currentEvents->take( currentEvents->tqfind( desc ) ); } desc->startDateTime = start; for ( i=0; i<(int)currentEvents->count(); i++ ) { @@ -298,7 +298,7 @@ ifend: if ( parse ) ++(desc->sn); if ( nodesc ) { - cur = QDateTime::currentDateTime(); + cur = TQDateTime::tqcurrentDateTime(); dt = desc->startDateTime; sec = desc->duration.hour()*3600+desc->duration.minute()*60+desc->duration.second(); if ( dt.addSecs( sec )<cur || desc->title.length()<3 ) { @@ -332,7 +332,7 @@ bool DVBevents::safeLen( unsigned char* buf ) -bool DVBevents::go( QString src, int freqKHz, bool all ) +bool DVBevents::go( TQString src, int freqKHz, bool all ) { int tid, i; diff --git a/kaffeine/src/input/dvb/dvbevents.h b/kaffeine/src/input/dvb/dvbevents.h index e5d693d..e8985b4 100644 --- a/kaffeine/src/input/dvb/dvbevents.h +++ b/kaffeine/src/input/dvb/dvbevents.h @@ -21,7 +21,7 @@ #ifndef DVBEVENTS_H #define DVBEVENTS_H -#include <qptrlist.h> +#include <tqptrlist.h> #include "kaffeinedvbsection.h" #include "kaffeinedvbevents.h" @@ -33,9 +33,9 @@ class DVBevents : public KaffeineDVBsection public: - DVBevents( QString devType, int anum, int tnum, const QString &charset, EventTable *table ); + DVBevents( TQString devType, int anum, int tnum, const TQString &charset, EventTable *table ); ~DVBevents(); - bool go( QString src, int freqKHz, bool all=false ); + bool go( TQString src, int freqKHz, bool all=false ); void stop(); private: @@ -52,8 +52,8 @@ private: EventTable *events; EventSource *currentSrc; - QPtrList<KaffeineEpgPlugin> plugs; - QStringList plugNames; + TQPtrList<KaffeineEpgPlugin> plugs; + TQStringList plugNames; }; #endif /* DVBEVENTS_H */ diff --git a/kaffeine/src/input/dvb/dvbout.cpp b/kaffeine/src/input/dvb/dvbout.cpp index c398707..0002170 100644 --- a/kaffeine/src/input/dvb/dvbout.cpp +++ b/kaffeine/src/input/dvb/dvbout.cpp @@ -61,9 +61,9 @@ DVBout::DVBout( ChannelDesc chan, int anum, int tnum, KaffeineDvbPlugin *p ) timeShifting = beginLive = false; haveRec = haveLive = instantRec = haveBroadcast = false; patpmt = wpatpmt = false; - connect( &stopRecTimer, SIGNAL(timeout()), this, SLOT(stopRec()) ); - connect( &timerPatPmt, SIGNAL(timeout()), this, SLOT(setPatPmt()) ); - if ( !pids.contains(8192) ) + connect( &stopRecTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(stopRec()) ); + connect( &timerPatPmt, TQT_SIGNAL(timeout()), this, TQT_SLOT(setPatPmt()) ); + if ( !pids.tqcontains(8192) ) timerPatPmt.start(500); } @@ -109,7 +109,7 @@ void DVBout::writePat() tspat[0x0d] = tspat[0x0e] = 0x00; tspat[0x0f] = 0xe0; tspat[0x10] = 0x10; // Program Map PID pmtpid = 0xff; - while ( pids.contains( pmtpid ) ) pmtpid--; + while ( pids.tqcontains( pmtpid ) ) pmtpid--; tspat[0x11] = 0x03; tspat[0x12] = 0xe8; tspat[0x13] = 0xe0; tspat[0x14] = pmtpid; // Put CRC in ts[0x15...0x18] calculateCRC( tspat + 0x05, tspat + 0x15 ); @@ -250,7 +250,7 @@ bool DVBout::hasBroadcast() const -bool DVBout::doPause( const QString &name ) // called from dvbstream::run() +bool DVBout::doPause( const TQString &name ) // called from dvbstream::run() { if ( !haveLive ) return false; @@ -289,7 +289,7 @@ void DVBout::setPatPmt() -bool DVBout::goLive( const QString &name, int ringBufSize ) +bool DVBout::goLive( const TQString &name, int ringBufSize ) { if ( fdPipe ) return false; @@ -300,7 +300,7 @@ bool DVBout::goLive( const QString &name, int ringBufSize ) writePat(); writePmt(); - if ( !pids.contains(8192) ) + if ( !pids.tqcontains(8192) ) patpmt = wpatpmt = true; wbufSize = ringBufSize*1024*1024/(TS_SIZE*NTS); wBuf = new unsigned char[TS_SIZE*NTS*wbufSize]; @@ -368,9 +368,9 @@ void DVBout::stopBroadcast() -bool DVBout::goRec( const QString &name, int maxsize, RecTimer *t ) +bool DVBout::goRec( const TQString &name, int maxsize, RecTimer *t ) { - QString fname=name; + TQString fname=name; if ( haveRec ) return false; @@ -381,13 +381,13 @@ bool DVBout::goRec( const QString &name, int maxsize, RecTimer *t ) if (maxsize>0) { fileMaxSize = (long long int)1048576*(long long int)maxsize; - fname=fileName+"_"+QString().setNum(fileNumber); + fname=fileName+"_"+TQString().setNum(fileNumber); } else { fileMaxSize = 0; fname=fileName; } - if ( QFile(fname+".m2t").exists() ) + if ( TQFile(fname+".m2t").exists() ) renameFile( fname, ".m2t" ); writePat(); writePmt(); @@ -402,8 +402,8 @@ bool DVBout::goRec( const QString &name, int maxsize, RecTimer *t ) haveRec = true; if ( recTimer ) { - QTime t = recTimer->duration.addSecs( QDateTime::currentDateTime().secsTo(recTimer->begin) ); - stopRecTimer.start( QTime().msecsTo( t ), true ); + TQTime t = recTimer->duration.addSecs( TQDateTime::tqcurrentDateTime().secsTo(recTimer->begin) ); + stopRecTimer.start( TQTime().msecsTo( t ), true ); } else instantRec = true; @@ -413,14 +413,14 @@ bool DVBout::goRec( const QString &name, int maxsize, RecTimer *t ) -void DVBout::renameFile( QString &name, const QString &ext ) +void DVBout::renameFile( TQString &name, const TQString &ext ) { int index=1; - while ( QFile(name+"-"+QString().setNum(index)+ext).exists() ) + while ( TQFile(name+"-"+TQString().setNum(index)+ext).exists() ) index++; - name = name+"-"+QString().setNum(index); + name = name+"-"+TQString().setNum(index); } @@ -457,11 +457,11 @@ void DVBout::process( unsigned char *buf, int size ) { int i, pid; unsigned char *buffer=buf; - QString fname; + TQString fname; for ( i=0; i<size; i+=TS_SIZE ) { pid = (((buffer[1] & 0x1f) << 8) | buffer[2]); - if ( pids.contains( pid ) || pids.contains( 8192) ) { + if ( pids.tqcontains( pid ) || pids.tqcontains( 8192) ) { memcpy( thBuf+thWrite, buffer, TS_SIZE ); thWrite+=TS_SIZE; if ( thWrite==(TS_SIZE*NTS ) ) { @@ -496,8 +496,8 @@ void DVBout::process( unsigned char *buf, int size ) if ((fileMaxSize>0)&&(outFile.size()>=fileMaxSize)) { outFile.close(); fileNumber++; - fname=fileName+"_"+QString().setNum(fileNumber); - if (QFile(fname+"_"+QString().setNum(fileNumber)+".m2t").exists() ) + fname=fileName+"_"+TQString().setNum(fileNumber); + if (TQFile(fname+"_"+TQString().setNum(fileNumber)+".m2t").exists() ) renameFile( fname, ".m2t" ); outFile.setName( fname+".m2t" ); diff --git a/kaffeine/src/input/dvb/dvbout.h b/kaffeine/src/input/dvb/dvbout.h index a037c7d..b52e511 100644 --- a/kaffeine/src/input/dvb/dvbout.h +++ b/kaffeine/src/input/dvb/dvbout.h @@ -21,13 +21,13 @@ #ifndef DVBOUT_H #define DVBOUT_H -#include <qobject.h> -#include <qthread.h> -#include <qmutex.h> -#include <qstring.h> -#include <qfile.h> -#include <qtimer.h> -#include <qvaluelist.h> +#include <tqobject.h> +#include <tqthread.h> +#include <tqmutex.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqvaluelist.h> #include "channeldesc.h" #include "ts2rtp.h" @@ -35,32 +35,33 @@ class KaffeineDvbPlugin; -class DVBout : public QObject, public QThread +class DVBout : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: DVBout( ChannelDesc chan, int anum, int tnum, KaffeineDvbPlugin *p ); ~DVBout(); void process( unsigned char *buf, int size ); - bool goLive( const QString &name, int ringBufSize ); + bool goLive( const TQString &name, int ringBufSize ); void preStopLive(); void stopLive(); bool goBroadcast( Ts2Rtp *r ); void stopBroadcast(); - bool goRec( const QString &name, int maxsize, RecTimer *t ); + bool goRec( const TQString &name, int maxsize, RecTimer *t ); bool hasRec() const; bool hasLive() const; bool hasBroadcast() const; bool hasInstantRec() const; bool timeShiftMode() const; - bool doPause( const QString &name ); + bool doPause( const TQString &name ); void changeTimer( int ms ); - QValueList<int> pidsList() { return pids; } + TQValueList<int> pidsList() { return pids; } ChannelDesc channel; - QValueList<int> dmx, pids; + TQValueList<int> dmx, pids; RecTimer *recTimer; public slots: @@ -76,13 +77,13 @@ private: void writePmt(); void writePat(); void calculateCRC( unsigned char *p_begin, unsigned char *p_end ); - void renameFile( QString &name, const QString &ext ); + void renameFile( TQString &name, const TQString &ext ); int pmtpid; bool patpmt, wpatpmt; bool timeShifting; - QString pipeName; - QFile outFile, liveFile; + TQString pipeName; + TQFile outFile, liveFile; int fdPipe; Ts2Rtp *rtp; unsigned char thBuf[188*100]; @@ -94,13 +95,13 @@ private: int thWrite; bool beginLive; bool haveRec, haveLive, instantRec, haveBroadcast; - QTimer stopRecTimer, timerPatPmt; - QMutex mutex; + TQTimer stopRecTimer, timerPatPmt; + TQMutex mutex; KaffeineDvbPlugin *plug; void *plugHandle; int fileNumber; - QString fileName; + TQString fileName; long long int fileMaxSize; int wbufSize; diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp index 1b62aec..058619a 100644 --- a/kaffeine/src/input/dvb/dvbpanel.cpp +++ b/kaffeine/src/input/dvb/dvbpanel.cpp @@ -20,17 +20,17 @@ #include <sys/statvfs.h> -#include <qlayout.h> -#include <qfile.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qapplication.h> -#include <qpopupmenu.h> -#include <qmap.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqapplication.h> +#include <tqpopupmenu.h> +#include <tqmap.h> #include <kiconloader.h> #include <klocale.h> @@ -63,44 +63,44 @@ -DIconViewItem::DIconViewItem( DvbPanel *pan, QIconView *parent, const QString &text, const QPixmap &icon ) - : KIconViewItem( parent, text, icon ) +DIconViewItem::DIconViewItem( DvbPanel *pan, TQIconView *tqparent, const TQString &text, const TQPixmap &icon ) + : KIconViewItem( tqparent, text, icon ) { panel = pan; } -void DIconViewItem::dropped( QDropEvent *e, const QValueList<QIconDragItem> & ) +void DIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> & ) { - QString s; + TQString s; if ( !dropEnabled() ) return; - if ( QTextDrag::decode( e, s ) ) + if ( TQTextDrag::decode( e, s ) ) panel->moveChannel( text(), s ); } -DListView::DListView( QWidget *parent ) : KListView( parent ) +DListView::DListView( TQWidget *tqparent ) : KListView( tqparent ) { visibleItems = 0; } -QDragObject* DListView::dragObject() +TQDragObject* DListView::dragObject() { if ( currentItem() ) - return new QTextDrag( currentItem()->text(1), this ); + return new TQTextDrag( currentItem()->text(1), this ); else return 0; } -DvbPanel::DvbPanel( QWidget *parent, QObject *objParent, const char *name ) : KaffeineInput(objParent,name) +DvbPanel::DvbPanel( TQWidget *tqparent, TQObject *objParent, const char *name ) : KaffeineInput(objParent,name) { browseDvbStream = -1; plug = NULL; @@ -113,124 +113,124 @@ DvbPanel::DvbPanel( QWidget *parent, QObject *objParent, const char *name ) : Ka timers.setAutoDelete( true ); dvb.setAutoDelete( true ); - mainWidget = new QVBox( parent ); - mainWidget->setSizePolicy( QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred) ); - split = new QSplitter( mainWidget ); + mainWidget = new TQVBox( tqparent ); + mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); + split = new TQSplitter( mainWidget ); split->setOpaqueResize( true ); - pbox = new QVBox( split ); + pbox = new TQVBox( split ); iconView = new KIconView( pbox ); - iconView->setVScrollBarMode( QScrollView::AlwaysOff ); - iconView->setHScrollBarMode( QScrollView::AlwaysOff ); + iconView->setVScrollBarMode( TQScrollView::AlwaysOff ); + iconView->setHScrollBarMode( TQScrollView::AlwaysOff ); iconView->horizontalScrollBar()->setFixedHeight( 0 ); - connect( iconView, SIGNAL(rightButtonPressed(QIconViewItem*,const QPoint&)), this, SLOT(catContextMenu(QIconViewItem*,const QPoint&)) ); - connect( iconView, SIGNAL(clicked(QIconViewItem*)), this, SLOT(catSelected(QIconViewItem*)) ); - iconView->setArrangement(QIconView::TopToBottom); + connect( iconView, TQT_SIGNAL(rightButtonPressed(TQIconViewItem*,const TQPoint&)), this, TQT_SLOT(catContextMenu(TQIconViewItem*,const TQPoint&)) ); + connect( iconView, TQT_SIGNAL(clicked(TQIconViewItem*)), this, TQT_SLOT(catSelected(TQIconViewItem*)) ); + iconView->setArrangement(TQIconView::TopToBottom); iconView->setMargin(0); iconView->setSpacing(0); iconView->setItemsMovable(false); - iconView->setResizeMode(QIconView::Adjust); - iconView->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ) ); - playerBox = new QVBox( pbox ); + iconView->setResizeMode(TQIconView::Adjust); + iconView->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); + playerBox = new TQVBox( pbox ); playerBox->setMinimumWidth( 200 ); - panel = new QFrame( split ); + panel = new TQFrame( split ); panel->setLineWidth(1); - panel->setFrameStyle(QFrame::Panel|QFrame::Sunken); + panel->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); split->moveToFirst( panel ); - split->setResizeMode( panel, QSplitter::KeepSize ); + split->setResizeMode( panel, TQSplitter::KeepSize ); - QVBoxLayout *vb = new QVBoxLayout( panel, 3, 3 ); - channelsBtn = new QToolButton( panel ); + TQVBoxLayout *vb = new TQVBoxLayout( panel, 3, 3 ); + channelsBtn = new TQToolButton( panel ); channelsBtn->setAutoRaise( true ); - QToolTip::add( channelsBtn, i18n("Channels")); - dateBtn = new QToolButton( panel ); + TQToolTip::add( channelsBtn, i18n("Channels")); + dateBtn = new TQToolButton( panel ); dateBtn->setAutoRaise( true ); - QToolTip::add( dateBtn, i18n("Timers")); - infoBtn = new QToolButton( panel ); + TQToolTip::add( dateBtn, i18n("Timers")); + infoBtn = new TQToolButton( panel ); infoBtn->setAutoRaise( true ); - QToolTip::add( infoBtn, i18n("Electronic Program Guide")); - osdBtn = new QToolButton( panel ); + TQToolTip::add( infoBtn, i18n("Electronic Program Guide")); + osdBtn = new TQToolButton( panel ); osdBtn->setAutoRaise( true ); - QToolTip::add( osdBtn, i18n("OSD")); - configBtn = new QToolButton( panel ); + TQToolTip::add( osdBtn, i18n("OSD")); + configBtn = new TQToolButton( panel ); configBtn->setAutoRaise( true ); - QToolTip::add( configBtn, i18n("DVB settings")); - recallBtn = new QToolButton( panel ); + TQToolTip::add( configBtn, i18n("DVB settings")); + recallBtn = new TQToolButton( panel ); recallBtn->setAutoRaise( true ); - QToolTip::add( recallBtn, i18n("Recall")); - QHBoxLayout *h1 = new QHBoxLayout(); - h1->addItem( new QSpacerItem( 1, 1, QSizePolicy::Preferred, QSizePolicy::Minimum ) ); + TQToolTip::add( recallBtn, i18n("Recall")); + TQHBoxLayout *h1 = new TQHBoxLayout(); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); h1->addWidget( channelsBtn ); h1->addWidget( dateBtn ); h1->addWidget( infoBtn ); h1->addWidget( osdBtn ); h1->addWidget( configBtn ); h1->addWidget( recallBtn ); - h1->addItem( new QSpacerItem( 1, 1, QSizePolicy::Preferred, QSizePolicy::Minimum ) ); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); vb->addLayout( h1 ); - h1 = new QHBoxLayout(); - searchBtn = new QToolButton( panel ); + h1 = new TQHBoxLayout(); + searchBtn = new TQToolButton( panel ); searchBtn->setAutoRaise( true ); - QToolTip::add( searchBtn, i18n("Search channel(s)")); - QLabel* filterLabel = new QLabel( i18n("Filter") + ":", panel ); + TQToolTip::add( searchBtn, i18n("Search channel(s)")); + TQLabel* filterLabel = new TQLabel( i18n("Filter") + ":", panel ); searchLE = new KLineEdit( panel ); - searchLE->setFocusPolicy( QWidget::ClickFocus ); + searchLE->setFocusPolicy( TQ_ClickFocus ); h1->addWidget( searchBtn ); h1->addWidget( filterLabel ); h1->addWidget( searchLE ); vb->addLayout( h1 ); channelsCb = new DListView( panel ); - channelsCb->setHScrollBarMode( QListView::AlwaysOff ); - //channelsCb->setPaletteBackgroundColor( QColor(255,255,200) ); - connect( channelsCb, SIGNAL(itemRenamed(QListViewItem*)), this, SLOT(channelNumberChanged(QListViewItem*)) ); - connect( channelsCb, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(channelSelected(QListViewItem*)) ); - connect( channelsCb, SIGNAL(clicked(QListViewItem*)), this, SLOT(channelClicked(QListViewItem*)) ); - connect( channelsCb, SIGNAL(contextMenuRequested(QListViewItem*,const QPoint&,int)), this, SLOT(channelPopup(QListViewItem*,const QPoint&,int)) ); + channelsCb->setHScrollBarMode( TQListView::AlwaysOff ); + //channelsCb->setPaletteBackgroundColor( TQColor(255,255,200) ); + connect( channelsCb, TQT_SIGNAL(itemRenamed(TQListViewItem*)), this, TQT_SLOT(channelNumberChanged(TQListViewItem*)) ); + connect( channelsCb, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(channelSelected(TQListViewItem*)) ); + connect( channelsCb, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(channelClicked(TQListViewItem*)) ); + connect( channelsCb, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, TQT_SLOT(channelPopup(TQListViewItem*,const TQPoint&,int)) ); channelsCb->setItemsRenameable( true ); channelsCb->addColumn( i18n("Number") ); channelsCb->addColumn( i18n("Name") ); channelsCb->addColumn( i18n("Source") ); channelsCb->setAllColumnsShowFocus( true ); - channelsCb->setSizePolicy( QSizePolicy (QSizePolicy::Preferred, QSizePolicy::MinimumExpanding) ); + channelsCb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) ); //channelsCb->setEnabled( false ); vb->addWidget( channelsCb ); - h1 = new QHBoxLayout(); - recordBtn = new QToolButton( panel ); - QToolTip::add( recordBtn, i18n("Instant Record") ); + h1 = new TQHBoxLayout(); + recordBtn = new TQToolButton( panel ); + TQToolTip::add( recordBtn, i18n("Instant Record") ); recordBtn->setToggleButton( true ); h1->addWidget( recordBtn ); - broadcastBtn = new QToolButton( panel ); - QToolTip::add( broadcastBtn, i18n("Broadcast") ); + broadcastBtn = new TQToolButton( panel ); + TQToolTip::add( broadcastBtn, i18n("Broadcast") ); h1->addWidget( broadcastBtn ); vb->addLayout( h1 ); - h1 = new QHBoxLayout(); - h1->addItem( new QSpacerItem( 1, 1, QSizePolicy::Preferred, QSizePolicy::Minimum ) ); + h1 = new TQHBoxLayout(); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); shiftLed = new KLed( panel ); - shiftLed->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + shiftLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); shiftLed->setDarkFactor( 500 ); shiftLed->off(); - QToolTip::add( shiftLed, i18n("Time shifting") ); + TQToolTip::add( shiftLed, i18n("Time shifting") ); h1->addWidget( shiftLed ); - h1->addItem( new QSpacerItem( 1, 1, QSizePolicy::Preferred, QSizePolicy::Minimum ) ); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); recordLed = new KLed( panel ); - recordLed->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); - recordLed->setColor( QColor( 255,0,0 ) ); + recordLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + recordLed->setColor( TQColor( 255,0,0 ) ); recordLed->setDarkFactor( 500 ); recordLed->off(); - QToolTip::add( recordLed, i18n("Recording") ); + TQToolTip::add( recordLed, i18n("Recording") ); h1->addWidget( recordLed ); - h1->addItem( new QSpacerItem( 1, 1, QSizePolicy::Preferred, QSizePolicy::Minimum ) ); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); broadcastLed = new KLed( panel ); - broadcastLed->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); - broadcastLed->setColor( QColor( 255,128,0 ) ); + broadcastLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + broadcastLed->setColor( TQColor( 255,128,0 ) ); broadcastLed->setDarkFactor( 500 ); broadcastLed->off(); - QToolTip::add( broadcastLed, i18n("Broadcasting") ); + TQToolTip::add( broadcastLed, i18n("Broadcasting") ); h1->addWidget( broadcastLed ); - h1->addItem( new QSpacerItem( 1, 1, QSizePolicy::Preferred, QSizePolicy::Minimum ) ); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); vb->addLayout( h1 ); KIconLoader *icon = new KIconLoader(); @@ -238,9 +238,9 @@ DvbPanel::DvbPanel( QWidget *parent, QObject *objParent, const char *name ) : Ka tvcPix = icon->loadIcon( "kdvbtvc", KIcon::Small ); raPix = icon->loadIcon( "kdvbra", KIcon::Small ); racPix = icon->loadIcon( "kdvbrac", KIcon::Small ); - QIconSet iconset; - iconset.setPixmap( icon->loadIcon( "filesave", KIcon::Small ), QIconSet::Small ); - iconset.setPixmap( icon->loadIcon( "player_record", KIcon::Small), QIconSet::Small, QIconSet::Normal, QIconSet::On ); + TQIconSet iconset; + iconset.setPixmap( icon->loadIcon( "filesave", KIcon::Small ), TQIconSet::Small ); + iconset.setPixmap( icon->loadIcon( "player_record", KIcon::Small), TQIconSet::Small, TQIconSet::Normal, TQIconSet::On ); recordBtn->setIconSet( iconset ); broadcastBtn->setIconSet( icon->loadIconSet("network_local", KIcon::Small) ); dateBtn->setIconSet( icon->loadIconSet("date", KIcon::Small) ); @@ -254,25 +254,25 @@ DvbPanel::DvbPanel( QWidget *parent, QObject *objParent, const char *name ) : Ka setXMLFile("kaffeinedvb.rc"); setupActions(); - connect( this, SIGNAL(zap(ChannelDesc*)), SLOT(dvbZap(ChannelDesc*)) ); - connect( configBtn, SIGNAL(clicked()), this, SLOT(showConfigDialog())); - connect( recallBtn, SIGNAL(clicked()), this, SLOT(recallZap())); - - connect( recordBtn, SIGNAL(clicked()), this, SLOT(setRecord()) ); - connect( broadcastBtn, SIGNAL(clicked()), this, SLOT(setBroadcast()) ); - connect( infoBtn, SIGNAL(clicked()), this, SLOT(showEvents()) ); - connect( channelsBtn, SIGNAL(clicked()), this, SLOT(scanner()) ); - connect( dateBtn, SIGNAL(clicked()), this, SLOT(showTimers()) ); - connect( osdBtn, SIGNAL(clicked()), this, SLOT(dvbOSD())); - connect( searchBtn, SIGNAL(clicked()), this, SLOT(resetSearch()) ); - connect(searchLE, SIGNAL(textChanged(const QString&)), this, SLOT(searchChannel(const QString&))); - - connect( &timersTimer, SIGNAL(timeout()), this, SLOT(checkTimers()) ); - connect( &osdTimer, SIGNAL(timeout()), this, SLOT(resetOSD()) ); - connect( &showOsdTimer, SIGNAL(timeout()), this, SLOT(dvbOSD()) ); - connect( &tuningTimer, SIGNAL(timeout()), this, SLOT(setTuning()) ); - connect( &stopTuningTimer, SIGNAL(timeout()), this, SLOT(setTuning()) ); - connect( &diskTimer, SIGNAL(timeout()), this, SLOT(diskStatus()) ); + connect( this, TQT_SIGNAL(zap(ChannelDesc*)), TQT_SLOT(dvbZap(ChannelDesc*)) ); + connect( configBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(showConfigDialog())); + connect( recallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(recallZap())); + + connect( recordBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRecord()) ); + connect( broadcastBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setBroadcast()) ); + connect( infoBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEvents()) ); + connect( channelsBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(scanner()) ); + connect( dateBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(showTimers()) ); + connect( osdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(dvbOSD())); + connect( searchBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetSearch()) ); + connect(searchLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(searchChannel(const TQString&))); + + connect( &timersTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkTimers()) ); + connect( &osdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resetOSD()) ); + connect( &showOsdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(dvbOSD()) ); + connect( &tuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) ); + connect( &stopTuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) ); + connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(disktqStatus()) ); setConfig(); @@ -295,7 +295,7 @@ void DvbPanel::togglePanel() -void DvbPanel::diskStatus() +void DvbPanel::disktqStatus() { double freemb; struct statvfs buf; @@ -307,37 +307,37 @@ void DvbPanel::diskStatus() freemb = (double)(((double)(buf.f_bavail)*(double)(buf.f_bsize))/(1024.0*1024.0)); if ( freemb<300 ) - emit showOSD( i18n("Warning: low disc space")+QString(" (%1").arg((int)freemb)+i18n("MB")+")", 5000, 3 ); + emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").tqarg((int)freemb)+i18n("MB")+")", 5000, 3 ); } -void DvbPanel::channelPopup( QListViewItem *it, const QPoint &pos, int col ) +void DvbPanel::channelPopup( TQListViewItem *it, const TQPoint &pos, int col ) { - QPoint p=pos; + TQPoint p=pos; if ( !it ) return; int i=col, j; - QImage img; - QPixmap pix; - QString name = it->text(1); - QString s; + TQImage img; + TQPixmap pix; + TQString name = it->text(1); + TQString s; - QPopupMenu *pop = new QPopupMenu(); + TQPopupMenu *pop = new TQPopupMenu(); pop->insertItem( i18n("Select icon..."), 1 ); pop->insertItem( i18n("Edit..."), 2 ); i = 0; - i = pop->exec( QCursor::pos() ); + i = pop->exec( TQCursor::pos() ); switch ( i ) { case 0 : break; case 1 : - s = KFileDialog::getOpenFileName( QString::null, "image/png image/jpeg image/gif image/x-bmp image/x-xpm", 0, i18n("Choose channel icon")); + s = KFileDialog::getOpenFileName( TQString(), "image/png image/jpeg image/gif image/x-bmp image/x-xpm", 0, i18n("Choose channel icon")); if ( s.isEmpty() ) break; - img = QImage( s ); + img = TQImage( s ); if ( img.isNull() ) break; if ( img.width()>img.height() ) @@ -362,12 +362,12 @@ void DvbPanel::channelPopup( QListViewItem *it, const QPoint &pos, int col ) delete pop; } -bool DvbPanel::editChannel( QString &name ) +bool DvbPanel::editChannel( TQString &name ) { int j; ChannelDesc *chan=0; - QStringList list; - QPixmap pix; + TQStringList list; + TQPixmap pix; for ( j=0; j<(int)channels.count(); j++ ) { chan = channels.at(j); @@ -408,7 +408,7 @@ bool DvbPanel::editChannel( QString &name ) -void DvbPanel::getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames ) +void DvbPanel::getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames ) { uiNames.append( i18n("Digital TV") ); iconNames.append( "tv" ); @@ -417,7 +417,7 @@ void DvbPanel::getTargets( QStringList &uiNames, QStringList &iconNames, QString -bool DvbPanel::execTarget( const QString &target ) +bool DvbPanel::execTarget( const TQString &target ) { if ( target=="DVB" ) { if ( !channelsCb->isEnabled() ) { @@ -425,7 +425,7 @@ bool DvbPanel::execTarget( const QString &target ) return true; } emit showMe( this ); - QTimer::singleShot( 100, this, SLOT(playLastChannel()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(playLastChannel()) ); return true; } return false; @@ -435,41 +435,41 @@ bool DvbPanel::execTarget( const QString &target ) void DvbPanel::setupActions() { - new KAction(i18n("OSD Next Channel"), "next", CTRL+SHIFT+Key_W, this, SLOT(dvbOSDNext()), actionCollection(), "dvb_browse_next"); - new KAction(i18n("OSD Previous Channel"), "previous", CTRL+SHIFT+Key_Q, this, SLOT(dvbOSDPrev()), actionCollection(),"dvb_browse_prev"); - new KAction(i18n("OSD Zap"), "ok", CTRL+SHIFT+Key_E, this, SLOT(dvbOSDZap()), actionCollection(), "dvb_browse_zap"); - new KAction(i18n("OSD Next Event"), "down", CTRL+SHIFT+Key_S, this, SLOT(dvbOSDAdvance()), actionCollection(), "dvb_browse_advance"); - new KAction(i18n("OSD Previous Event"), "up", CTRL+SHIFT+Key_A, this, SLOT(dvbOSDRetreat()), actionCollection(), "dvb_browse_retreat"); - new KAction(i18n("Instant Record"), "filesave", 0, this, SLOT(setRecord()), actionCollection(), "dvb_instant_record"); - new KAction(i18n("Recall"), "reload", CTRL+SHIFT+Key_Z, this, SLOT(recallZap()), actionCollection(), "dvb_recall"); - new KAction(i18n("Show OSD"), "info", Key_O, this, SLOT(dvbOSD()), actionCollection(), "dvb_show_osd"); - new KAction(i18n("EPG..."), "view_text", Key_G, this, SLOT(showEvents()), actionCollection(), "dvb_show_epg"); - new KAction(i18n("Timers..."), "date", Key_T, this, SLOT(showTimers()), actionCollection(), "dvb_show_timers"); - new KAction(i18n("Broadcasting..."), "network_local", Key_B, this, SLOT(setBroadcast()), actionCollection(), "dvb_show_broadcast"); - new KAction(i18n("Channels..."), "kdvbtv", Key_C, this, SLOT(scanner()), actionCollection(), "dvb_channels"); - new KAction(i18n("Configure DVB..."), "configure", CTRL|Key_C, this, SLOT(showConfigDialog()), actionCollection(), "dvb_config"); + new KAction(i18n("OSD Next Channel"), "next", CTRL+SHIFT+Key_W, this, TQT_SLOT(dvbOSDNext()), actionCollection(), "dvb_browse_next"); + new KAction(i18n("OSD Previous Channel"), "previous", CTRL+SHIFT+Key_Q, this, TQT_SLOT(dvbOSDPrev()), actionCollection(),"dvb_browse_prev"); + new KAction(i18n("OSD Zap"), "ok", CTRL+SHIFT+Key_E, this, TQT_SLOT(dvbOSDZap()), actionCollection(), "dvb_browse_zap"); + new KAction(i18n("OSD Next Event"), "down", CTRL+SHIFT+Key_S, this, TQT_SLOT(dvbOSDAdvance()), actionCollection(), "dvb_browse_advance"); + new KAction(i18n("OSD Previous Event"), "up", CTRL+SHIFT+Key_A, this, TQT_SLOT(dvbOSDRetreat()), actionCollection(), "dvb_browse_retreat"); + new KAction(i18n("Instant Record"), "filesave", 0, this, TQT_SLOT(setRecord()), actionCollection(), "dvb_instant_record"); + new KAction(i18n("Recall"), "reload", CTRL+SHIFT+Key_Z, this, TQT_SLOT(recallZap()), actionCollection(), "dvb_recall"); + new KAction(i18n("Show OSD"), "info", Key_O, this, TQT_SLOT(dvbOSD()), actionCollection(), "dvb_show_osd"); + new KAction(i18n("EPG..."), "view_text", Key_G, this, TQT_SLOT(showEvents()), actionCollection(), "dvb_show_epg"); + new KAction(i18n("Timers..."), "date", Key_T, this, TQT_SLOT(showTimers()), actionCollection(), "dvb_show_timers"); + new KAction(i18n("Broadcasting..."), "network_local", Key_B, this, TQT_SLOT(setBroadcast()), actionCollection(), "dvb_show_broadcast"); + new KAction(i18n("Channels..."), "kdvbtv", Key_C, this, TQT_SLOT(scanner()), actionCollection(), "dvb_channels"); + new KAction(i18n("Configure DVB..."), "configure", CTRL|Key_C, this, TQT_SLOT(showConfigDialog()), actionCollection(), "dvb_config"); } -QWidget *DvbPanel::wantPlayerWindow() +TQWidget *DvbPanel::wantPlayerWindow() { return playerBox; } -QWidget *DvbPanel::inputMainWidget() +TQWidget *DvbPanel::inputMainWidget() { return mainWidget; } -void DvbPanel::searchChannel( const QString &text ) +void DvbPanel::searchChannel( const TQString &text ) { int i, c=-1; - QListViewItemIterator it( channelsCb ); + TQListViewItemIterator it( channelsCb ); if ( !it.current() ) return; for ( i=0; i<channelsCb->columns(); i++ ) { @@ -484,7 +484,7 @@ void DvbPanel::searchChannel( const QString &text ) channelsCb->visibleItems = 0; while ( it.current() ) { - if ( text.isEmpty() || it.current()->text( c ).contains( text, false ) ) { + if ( text.isEmpty() || it.current()->text( c ).tqcontains( text, false ) ) { it.current()->setVisible(true); ++channelsCb->visibleItems; } @@ -505,7 +505,7 @@ void DvbPanel::resetSearch() -void DvbPanel::channelNumberChanged( QListViewItem *it ) +void DvbPanel::channelNumberChanged( TQListViewItem *it ) { int i, j; bool ok; @@ -539,7 +539,7 @@ void DvbPanel::channelNumberChanged( QListViewItem *it ) -void DvbPanel::catSelected( QIconViewItem *it ) +void DvbPanel::catSelected( TQIconViewItem *it ) { if ( !it ) return; @@ -556,13 +556,13 @@ void DvbPanel::catSelected( QIconViewItem *it ) -void DvbPanel::catContextMenu( QIconViewItem *it, const QPoint &p ) +void DvbPanel::catContextMenu( TQIconViewItem *it, const TQPoint &p ) { bool ok; - QString name, icon; + TQString name, icon; int i=0, ret; - QPopupMenu *pop = new QPopupMenu(); + TQPopupMenu *pop = new TQPopupMenu(); if ( !it ) { pop->insertItem( i18n("New Category..."), 0 ); } @@ -574,8 +574,8 @@ void DvbPanel::catContextMenu( QIconViewItem *it, const QPoint &p ) i = pop->exec( p ); switch ( i ) { case 0 : - name = KInputDialog::getText( i18n("New Category"), i18n("Enter a name for this category:"), QString::null, &ok); - for ( QIconViewItem *qitem = iconView->firstItem(); qitem; qitem = qitem->nextItem() ) { + name = KInputDialog::getText( i18n("New Category"), i18n("Enter a name for this category:"), TQString(), &ok); + for ( TQIconViewItem *qitem = iconView->firstItem(); qitem; qitem = qitem->nextItem() ) { if ( qitem->text()==name ) ok = false; } @@ -607,11 +607,11 @@ void DvbPanel::catContextMenu( QIconViewItem *it, const QPoint &p ) -void DvbPanel::moveChannel( const QString &cat, const QString &name ) +void DvbPanel::moveChannel( const TQString &cat, const TQString &name ) { int i; ChannelDesc *chan; - QListViewItem *it; + TQListViewItem *it; for ( i=0; i<(int)channels.count(); i++ ) { chan = channels.at(i); @@ -635,29 +635,29 @@ void DvbPanel::dumpEvents() EventSource *esrc; EventTsid *et; EventSid *es; - QPtrList<EventDesc> *esEvents; + TQPtrList<EventDesc> *esEvents; EventDesc *desc; int i, k, j, m, n; - QString s; + TQString s; - QFile f( QDir::homeDirPath()+"/kaffeine_dvb_events.txt" ); + TQFile f( TQDir::homeDirPath()+"/kaffeine_dvb_events.txt" ); if ( f.open(IO_WriteOnly|IO_Truncate) ) { fprintf( stderr, "Creating events file.\n"); - QTextStream tt( &f ); - tt << "Saved: "+QDateTime::currentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n"; + TQTextStream tt( &f ); + tt << "Saved: "+TQDateTime::tqcurrentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n"; k= 0; for( i=0; i<events.getNSource(); i++ ) { if ( !(esrc=events.getNEventSource( i )) ) continue; - tt << esrc->getSource()+QString(" : %1 TS with events.\n").arg( esrc->getNTsid() ); + tt << esrc->getSource()+TQString(" : %1 TS with events.\n").tqarg( esrc->getNTsid() ); for ( m=0; m<esrc->getNTsid(); m++ ) { if ( !(et=esrc->getNEventTsid( m )) ) continue; - tt << QString("TSID %1 : %2 services with events\n").arg( et->getTsid() ).arg( et->getNSid() ); + tt << TQString("TSID %1 : %2 services with events\n").tqarg( et->getTsid() ).tqarg( et->getNSid() ); for ( n=0; n<et->getNSid(); n++ ) { if ( !(es=et->getNEventSid( n )) ) continue; - tt << QString(" SID %1 : %2 events\n").arg( es->getSid() ).arg( es->getNDesc() ); + tt << TQString(" SID %1 : %2 events\n").tqarg( es->getSid() ).tqarg( es->getNDesc() ); k+= es->getNDesc(); } } @@ -681,10 +681,10 @@ void DvbPanel::dumpEvents() if ( !(desc=esEvents->at( j )) ) continue; tt << "Source: "+desc->source+"\n"; - tt << QString("Network ID: %1\n").arg(desc->nid); - tt << QString("Transport Stream ID: %1\n").arg(desc->tsid); - tt << QString("Service ID: %1\n").arg(desc->sid); - tt << QString("Event ID: %1\n").arg(desc->eid); + tt << TQString("Network ID: %1\n").tqarg(desc->nid); + tt << TQString("Transport Stream ID: %1\n").tqarg(desc->tsid); + tt << TQString("Service ID: %1\n").tqarg(desc->sid); + tt << TQString("Event ID: %1\n").tqarg(desc->eid); tt << "Title: "+desc->title+"\n"; tt << "Subtitle: "+desc->subtitle+"\n"; tt << desc->startDateTime.toString( "dd-MM-yyyy hh:mm:ss" )+"\n"; @@ -714,9 +714,9 @@ void DvbPanel::dumpEvents() -void DvbPanel::channelClicked( QListViewItem *it ) +void DvbPanel::channelClicked( TQListViewItem *it ) { - QPtrListIterator<ChannelDesc> iter( channels ); + TQPtrListIterator<ChannelDesc> iter( channels ); ChannelDesc *itdesc, *desc=0; DvbStream *d = 0; @@ -893,12 +893,12 @@ void DvbPanel::dvbOSDRetreat() void DvbPanel::dvbOSD(ChannelDesc liveChannel, DvbStream *d, int timeShift /* = 0 */) { - QStringList list; + TQStringList list; EventSource *esrc; EventSid *es; - QPtrList<EventDesc> *esEvents; + TQPtrList<EventDesc> *esEvents; EventDesc *desc; - QString s; + TQString s; int i, j, k; int first=0; @@ -956,14 +956,14 @@ void DvbPanel::dvbOSD(ChannelDesc liveChannel, DvbStream *d, int timeShift /* = s = s+" - "; s = s+desc->title; if ( !osdMode && !first && !myshift ) { - QDateTime dt = QDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); int secs = desc->startDateTime.secsTo( dt ); - i = QTime().secsTo( desc->duration ); + i = TQTime().secsTo( desc->duration ); if ( i!=0 ) i = secs*100/i; if ( i>100 ) i = 100; - list.append( QString("BAR")+QString().setNum( i ) ); + list.append( TQString("BAR")+TQString().setNum( i ) ); ++first; } list.append( s ); @@ -1025,7 +1025,7 @@ void DvbPanel::setConfig() KIconViewItem* item = NULL; DvbStream *d; - QString s = locateLocal("appdata", ""); + TQString s = locateLocal("appdata", ""); dvbConfig = new DVBconfig( s ); item = new DIconViewItem(this, iconView, i18n("All"), KGlobal::iconLoader()->loadIcon(dvbConfig->allIcon, KIcon::NoGroup, KIcon::SizeSmallMedium)); iconView->setFixedHeight( item->height()+iconView->horizontalScrollBar()->height() ); @@ -1059,22 +1059,22 @@ void DvbPanel::setConfig() d = new DvbStream( dvbConfig->devList.at(i), dvbConfig->defaultCharset, &events ); d->setPlug( plug ); dvb.append( d ); - connect( d, SIGNAL(shifting(bool)), this, SLOT(setShiftLed(bool)) ); - connect( d, SIGNAL(isBroadcasting(bool)), this, SLOT(setBroadcastLed(bool)) ); - connect( d, SIGNAL(timerEnded(RecTimer*)), this, SLOT(killTimer(RecTimer*)) ); - connect( d, SIGNAL(isRecording(bool)), this, SLOT(setRecordLed(bool)) ); - connect( d, SIGNAL(playDvb()), this, SLOT(pipeOpened()) ); - } - fifoName = QDir::homeDirPath()+"/.kaxtv.ts"; - QFile f( fifoName ); + connect( d, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(setShiftLed(bool)) ); + connect( d, TQT_SIGNAL(isBroadcasting(bool)), this, TQT_SLOT(setBroadcastLed(bool)) ); + connect( d, TQT_SIGNAL(timerEnded(RecTimer*)), this, TQT_SLOT(killTimer(RecTimer*)) ); + connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) ); + connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) ); + } + fifoName = TQDir::homeDirPath()+"/.kaxtv.ts"; + TQFile f( fifoName ); if ( f.exists() ) f.remove(); if ( (mkfifo( fifoName.ascii(), 0644 ))<0 ) { perror( fifoName.latin1() ); fifoName = ""; } - fifoName1 = QDir::homeDirPath()+"/.kaxtv1.ts"; - QFile f1( fifoName1 ); + fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts"; + TQFile f1( fifoName1 ); if ( f1.exists() ) f1.remove(); if ( (mkfifo( fifoName1.ascii(), 0644 ))<0 ) { @@ -1112,9 +1112,9 @@ loop: for ( i=0; i<(int)dvb.count(); i++ ) dvb.at(i)->probeCam(); DvbConfigDialog dlg( this, dvbConfig, mainWidget, plug ); - connect( dlg.dumpBtn, SIGNAL(clicked()), this, SLOT(dumpEvents()) ); + connect( dlg.dumpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(dumpEvents()) ); ret = dlg.exec(); - disconnect( dlg.dumpBtn, SIGNAL(clicked()), this, SLOT(dumpEvents()) ); + disconnect( dlg.dumpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(dumpEvents()) ); if ( ret==DvbConfigDialog::Rejected ) return; rtp->setSocket( dvbConfig->broadcastAddress, dvbConfig->broadcastPort, dvbConfig->senderPort ); @@ -1131,11 +1131,11 @@ void DvbPanel::camClicked( int devNum ) -QPtrList<Transponder> DvbPanel::getSourcesStatus() +TQPtrList<Transponder> DvbPanel::getSourcestqStatus() { int i, j; - QStringList list; - QPtrList<Transponder> ss; + TQStringList list; + TQPtrList<Transponder> ss; Transponder t; for ( i=0; i<(int)dvb.count(); i++ ) { @@ -1163,7 +1163,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch ) ChannelDesc *chan; KListViewItem *it, *visible=0; bool cont=false; - QPtrList<Transponder> trans = getSourcesStatus(); + TQPtrList<Transponder> trans = getSourcestqStatus(); trans.setAutoDelete( true ); searchLE->clear(); @@ -1193,7 +1193,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch ) } else if ( currentCategory!="All" && chan->category!=currentCategory ) continue; - it = new KListViewItem( channelsCb, QString().sprintf("%05d", chan->num), chan->name, chan->tp.source ); + it = new KListViewItem( channelsCb, TQString().sprintf("%05d", chan->num), chan->name, chan->tp.source ); if ( ch && ch==chan ) visible = it; it->setDragEnabled( true ); @@ -1228,7 +1228,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch ) DvbStream* DvbPanel::getWorkingDvb( int mode, ChannelDesc *chan ) { int i, ret; - QValueList<int> working; // free=0, hasLive=100, hasBroadcast=200, hasRec=300, can'tDoChannel=400 + TQValueList<int> working; // free=0, hasLive=100, hasBroadcast=200, hasRec=300, can'tDoChannel=400 for ( i=0; i<(int)dvb.count(); i++ ) working.append( 100-dvb.at(i)->getPriority() ); @@ -1276,7 +1276,7 @@ DvbStream* DvbPanel::getWorkingDvb( int mode, ChannelDesc *chan ) void DvbPanel::setBroadcast() { int ret, i; - QPtrList<ChannelDesc> list; + TQPtrList<ChannelDesc> list; bool live=false; DvbStream *d; @@ -1320,14 +1320,14 @@ void DvbPanel::checkTimers() bool live=false; RecTimer *t; ChannelDesc *chan; - QDateTime cur=QDateTime::currentDateTime(); + TQDateTime cur=TQDateTime::tqcurrentDateTime(); DvbStream *d; for ( i=0; i<(int)timers.count(); i++ ) { t = timers.at(i); if ( t->running ) continue; - if ( t->begin<=cur && cur<t->begin.addSecs(QTime().secsTo(t->duration)) ) { + if ( t->begin<=cur && cur<t->begin.addSecs(TQTime().secsTo(t->duration)) ) { chan = 0; for ( j=0; j<(int)channels.count(); j++ ) { if ( channels.at(j)->name==t->channel ) { @@ -1350,7 +1350,7 @@ void DvbPanel::checkTimers() } if ( d->startTimer( chan, dvbConfig->recordDir, dvbConfig->sizeFile, t, dvbConfig->filenameFormat ) ) { KProcess proc; - proc << QDir::homeDirPath()+"/bin/kaffeine_recording"; + proc << TQDir::homeDirPath()+"/bin/kaffeine_recording"; proc << "On"; proc.start( KProcess::DontCare ); t->running = 1; @@ -1380,7 +1380,7 @@ void DvbPanel::checkTimers() void DvbPanel::setRecord() { ChannelDesc curchan; - QString s=""; + TQString s=""; int ret, i, r=0; bool live=false; RecTimer *t, *rt; @@ -1406,17 +1406,17 @@ void DvbPanel::setRecord() s = desc->title; if ( s.isEmpty() ) { - if ( !dvbConfig->filenameFormat.contains("%chan") ) + if ( !dvbConfig->filenameFormat.tqcontains("%chan") ) s = curchan.name; - if ( !dvbConfig->filenameFormat.contains("%date") ) - s+="_"+QDateTime::currentDateTime().toString( "yyyyMMdd-hhmmss" ); + if ( !dvbConfig->filenameFormat.tqcontains("%date") ) + s+="_"+TQDateTime::tqcurrentDateTime().toString( "yyyyMMdd-hhmmss" ); } rt = new RecTimer(); rt->name = s; rt->channel = curchan.name; - rt->begin = QDateTime::currentDateTime(); - rt->duration = QTime( 0,0,0).addSecs( dvbConfig->instantDuration*60 ) ; + rt->begin = TQDateTime::tqcurrentDateTime(); + rt->duration = TQTime( 0,0,0).addSecs( dvbConfig->instantDuration*60 ) ; rt->running = 1; rt->mode = 0; @@ -1424,7 +1424,7 @@ void DvbPanel::setRecord() if ( ret==0 ) { if ( d->startTimer( &curchan, dvbConfig->recordDir, dvbConfig->sizeFile, rt, dvbConfig->filenameFormat ) ) { KProcess proc; - proc << QDir::homeDirPath()+"/bin/kaffeine_recording"; + proc << TQDir::homeDirPath()+"/bin/kaffeine_recording"; proc << "On"; proc.start( KProcess::DontCare ); @@ -1527,7 +1527,7 @@ void DvbPanel::killTimer( RecTimer *t ) for ( i=0; i<(int)timers.count(); i++ ) { if ( timers.at(i)==t ) { KProcess proc; - proc << QDir::homeDirPath()+"/bin/kaffeine_recording"; + proc << TQDir::homeDirPath()+"/bin/kaffeine_recording"; if ( recordLed->state()==KLed::On ) proc << "On"; else @@ -1590,30 +1590,30 @@ void DvbPanel::updateModeTimer( RecTimer *t ) void DvbPanel::showTimers() { int i; - QStringList list; - QMap<QString,QString> map; + TQStringList list; + TQMap<TQString,TQString> map; if ( channels.count()==0 ) { KMessageBox::sorry( 0, i18n("You may want to define some channel first!") ); return; } - for ( QPtrListIterator<ChannelDesc> it(channels); it.current(); ++it ) + for ( TQPtrListIterator<ChannelDesc> it(channels); it.current(); ++it ) map[it.current()->name] = it.current()->name; - QMap<QString,QString>::Iterator it; - QMap<QString,QString>::Iterator end(map.end()); + TQMap<TQString,TQString>::Iterator it; + TQMap<TQString,TQString>::Iterator end(map.end()); for ( it = map.begin(); it != end; ++it ) list.append( it.data() ); timersDialog = new KRecord( list, &timers, mainWidget, dvbConfig->timerSize ); for ( i=0; i<(int)dvb.count(); i++ ) { - connect( timersDialog, SIGNAL(updateTimer(RecTimer*,int)), dvb.at(i), SLOT(updateTimer(RecTimer*,int)) ); + connect( timersDialog, TQT_SIGNAL(updateTimer(RecTimer*,int)), dvb.at(i), TQT_SLOT(updateTimer(RecTimer*,int)) ); } - connect( this, SIGNAL(timersChanged()), timersDialog, SLOT(refresh()) ); + connect( this, TQT_SIGNAL(timersChanged()), timersDialog, TQT_SLOT(refresh()) ); timersDialog->exec(); for ( i=0; i<(int)dvb.count(); i++ ) { - disconnect( timersDialog, SIGNAL(updateTimer(RecTimer*,int)), dvb.at(i), SLOT(updateTimer(RecTimer*,int)) ); + disconnect( timersDialog, TQT_SIGNAL(updateTimer(RecTimer*,int)), dvb.at(i), TQT_SLOT(updateTimer(RecTimer*,int)) ); } - disconnect( this, SIGNAL(timersChanged()), timersDialog, SLOT(refresh()) ); + disconnect( this, TQT_SIGNAL(timersChanged()), timersDialog, TQT_SLOT(refresh()) ); dvbConfig->timerSize = timersDialog->size(); delete timersDialog; timersDialog = 0; @@ -1630,20 +1630,20 @@ int DvbPanel::getSNR( int device ) } -void DvbPanel::dvbNewTimer( QString name, QString channel, QString datetime, QString duration ) +void DvbPanel::dvbNewTimer( TQString name, TQString channel, TQString datetime, TQString duration ) { - newTimer( channel, name, QDateTime::fromString( datetime, Qt::ISODate ), QTime::fromString( duration ), false ); + newTimer( channel, name, TQDateTime::fromString( datetime, Qt::ISODate ), TQTime::fromString( duration ), false ); } -void DvbPanel::newTimer( QString channel, QString name, QDateTime begin, QTime duration, bool warn ) +void DvbPanel::newTimer( TQString channel, TQString name, TQDateTime begin, TQTime duration, bool warn ) { int i, r=0; RecTimer *t; RecTimer *rt = new RecTimer(); - rt->name = name.replace("/","_").replace(">","_").replace("<","_").replace(":","_").replace('"',"_").replace("\\","_").replace("|","_"); + rt->name = name.tqreplace("/","_").tqreplace(">","_").tqreplace("<","_").tqreplace(":","_").tqreplace('"',"_").tqreplace("\\","_").tqreplace("|","_"); rt->channel = channel; rt->begin = begin.addSecs( -(dvbConfig->beginMargin*60) ); rt->duration = duration.addSecs( (dvbConfig->beginMargin+dvbConfig->endMargin)*60 ) ; @@ -1692,12 +1692,12 @@ void DvbPanel::showEvents() { events.doClean( false ); KEvents dlg( &channels, &dvb, &events, mainWidget, dvbConfig->epgSize ); - connect( &dlg, SIGNAL(addTimer(QString,QString,QDateTime,QTime)), this, SLOT(newTimer(QString,QString,QDateTime,QTime)) ); - connect( &dlg, SIGNAL(zapTo(const QString &)), this, SLOT(channelSelected(const QString &)) ); + connect( &dlg, TQT_SIGNAL(addTimer(TQString,TQString,TQDateTime,TQTime)), this, TQT_SLOT(newTimer(TQString,TQString,TQDateTime,TQTime)) ); + connect( &dlg, TQT_SIGNAL(zapTo(const TQString &)), this, TQT_SLOT(channelSelected(const TQString &)) ); dlg.exec(); dvbConfig->epgSize = dlg.size(); - disconnect( &dlg, SIGNAL(addTimer(QString,QString,QDateTime,QTime)), this, SLOT(newTimer(QString,QString,QDateTime,QTime)) ); - disconnect( &dlg, SIGNAL(zapTo(const QString &)), this, SLOT(channelSelected(const QString &)) ); + disconnect( &dlg, TQT_SIGNAL(addTimer(TQString,TQString,TQDateTime,TQTime)), this, TQT_SLOT(newTimer(TQString,TQString,TQDateTime,TQTime)) ); + disconnect( &dlg, TQT_SIGNAL(zapTo(const TQString &)), this, TQT_SLOT(channelSelected(const TQString &)) ); events.doClean( true ); } @@ -1717,9 +1717,9 @@ void DvbPanel::setShiftLed( bool on ) -void DvbPanel::channelSelected( const QString &name ) +void DvbPanel::channelSelected( const TQString &name ) { - QPtrListIterator<ChannelDesc> iter( channels ); + TQPtrListIterator<ChannelDesc> iter( channels ); ChannelDesc *itdesc; iter.toFirst(); @@ -1734,9 +1734,9 @@ void DvbPanel::channelSelected( const QString &name ) -void DvbPanel::channelSelected( QListViewItem *it ) +void DvbPanel::channelSelected( TQListViewItem *it ) { - QPtrListIterator<ChannelDesc> iter( channels ); + TQPtrListIterator<ChannelDesc> iter( channels ); ChannelDesc *itdesc; if ( !it ) @@ -1825,7 +1825,7 @@ bool DvbPanel::playbackFinished( MRL& ) void DvbPanel::playLastChannel() { /*int ret, i, j; - QPtrList<ChannelDesc> list; + TQPtrList<ChannelDesc> list; bool live=false, ok=false; DvbStream *d; @@ -1844,7 +1844,7 @@ void DvbPanel::playLastChannel() } } if ( ! list.count() ) { - QTimer::singleShot( 2000, this, SLOT(playLastChannel()) ); + TQTimer::singleShot( 2000, this, TQT_SLOT(playLastChannel()) ); return; } d = getWorkingDvb( MODE_BROADCAST, list.at(0) ); @@ -1868,7 +1868,7 @@ void DvbPanel::playLastChannel() else fprintf( stderr, "Can't start broadcasting.\n"); - QTimer::singleShot( 2000, this, SLOT(playLastChannel()) ); + TQTimer::singleShot( 2000, this, TQT_SLOT(playLastChannel()) ); return;*/ @@ -1899,9 +1899,9 @@ void DvbPanel::next() if ( !channelsCb->isEnabled() ) return; - QListViewItem* nextItem; + TQListViewItem* nextItem; - QListViewItem* playingItem = channelsCb->findItem( QString().sprintf("%05d", dvbConfig->lastChannel), 0 ); + TQListViewItem* playingItem = channelsCb->tqfindItem( TQString().sprintf("%05d", dvbConfig->lastChannel), 0 ); if ( !playingItem == 0 ) // yes, it's in the current category { @@ -1925,9 +1925,9 @@ void DvbPanel::previous() if ( !channelsCb->isEnabled() ) return; - QListViewItem* prevItem; + TQListViewItem* prevItem; - QListViewItem* playingItem = channelsCb->findItem( QString().sprintf("%05d", dvbConfig->lastChannel), 0 ); + TQListViewItem* playingItem = channelsCb->tqfindItem( TQString().sprintf("%05d", dvbConfig->lastChannel), 0 ); if ( !playingItem == 0 ) // yes, it's in the current category { @@ -1987,13 +1987,13 @@ void DvbPanel::setTuning() void DvbPanel::finalZap( DvbStream *d, ChannelDesc *chan ) { - QString s, t; + TQString s, t; int i; emit setCurrentPlugin( this ); fprintf( stderr, "Tuning to: %s / autocount: %lu\n", chan->name.latin1(), autocount ); - QTime tm; + TQTime tm; tm.start(); if ( !d ) { @@ -2055,7 +2055,7 @@ void DvbPanel::finalZap( DvbStream *d, ChannelDesc *chan ) recallChannel = dvbConfig->lastChannel; dvbConfig->lastChannel = chan->num; } - //QTimer::singleShot( 3000, this, SLOT(playLastChannel()) ); + //TQTimer::singleShot( 3000, this, TQT_SLOT(playLastChannel()) ); } @@ -2074,7 +2074,7 @@ void DvbPanel::pauseLiveTV() if ( !d ) return; - timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+QDateTime::currentDateTime().toString("yyyyMMddThhmmss")+".m2t"; + timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::tqcurrentDateTime().toString("yyyyMMddThhmmss")+".m2t"; if ( d->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName ); } @@ -2118,13 +2118,13 @@ void DvbPanel::stopLive() bool DvbPanel::getChannelList() { bool ret=false; - QString s, c, t, u, type; + TQString s, c, t, u, type; int pos, tpos; ChannelDesc *chan; - QString src=""; + TQString src=""; int ns; KListViewItem *it; - QPixmap pix; + TQPixmap pix; maxChannelNumber = 0; minChannelNumber = -1; @@ -2143,18 +2143,18 @@ bool DvbPanel::getChannelList() } } - QFile f( locateLocal("appdata", "channels.dvb" ) ); + TQFile f( locateLocal("appdata", "channels.dvb" ) ); if ( f.open(IO_ReadOnly) ) { - QTextStream tt( &f ); + TQTextStream tt( &f ); while ( !tt.eof() ) { s = tt.readLine(); if ( s.startsWith("#") ) { - if ( s.contains("KaxTV") ) + if ( s.tqcontains("KaxTV") ) break; continue; } chan = new ChannelDesc(); - pos = s.find("|"); + pos = s.tqfind("|"); c = s.left( pos ); if ( c=="TV" || c=="TVC" ) chan->type=1; @@ -2163,13 +2163,13 @@ bool DvbPanel::getChannelList() if ( c=="TVC" || c=="RAC" ) chan->fta=1; s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); chan->name = s.left( pos ); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); c = s.left( pos ); s = s.right( s.length()-pos-1 ); - tpos = c.find("("); + tpos = c.tqfind("("); if ( tpos>0 ) chan->vpid = c.left(tpos).toUShort(); else @@ -2183,17 +2183,17 @@ bool DvbPanel::getChannelList() chan->vType = 2; if ( !chan->vpid ) chan->vType = 0; - pos = s.find("|"); + pos = s.tqfind("|"); c = s.left( pos ); s = s.right( s.length()-pos-1 ); - while ( (pos=c.find(","))!=-1 ) { + while ( (pos=c.tqfind(","))!=-1 ) { t = c.left(pos); chan->napid++; - if ( t.contains("(ac3)") ) { + if ( t.tqcontains("(ac3)") ) { chan->apid[chan->napid-1].ac3=1; t.remove("(ac3)"); } - if( (tpos=t.find("("))!=-1 ) { + if( (tpos=t.tqfind("("))!=-1 ) { t.remove(")"); chan->apid[chan->napid-1].lang=t.right( t.length()-tpos-1 ); t = t.left( tpos ); @@ -2201,16 +2201,16 @@ bool DvbPanel::getChannelList() chan->apid[chan->napid-1].pid=t.toUShort(); c = c.right( c.length()-pos-1 ); } - pos = s.find("|"); + pos = s.tqfind("|"); chan->ttpid = s.left(pos).toUShort(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); chan->sid = s.left(pos).toUShort(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); chan->tp.tsid = s.left(pos).toUShort(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); c = s.left(pos); if ( c.startsWith("T") ) { chan->tp.type=FE_OFDM; @@ -2230,17 +2230,17 @@ bool DvbPanel::getChannelList() chan->tp.source = "Atsc"; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); chan->tp.freq = s.left(pos).toULong(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); chan->tp.sr = s.left(pos).toULong(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); c = s.left( pos ); chan->tp.pol = c[0].latin1(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 0 : chan->tp.coderateH = FEC_NONE; break; case 12 : chan->tp.coderateH = FEC_1_2; break; @@ -2256,14 +2256,14 @@ bool DvbPanel::getChannelList() case -1 : chan->tp.coderateH = FEC_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 0 : chan->tp.inversion = INVERSION_OFF; break; case 1 : chan->tp.inversion = INVERSION_ON; break; case -1 : chan->tp.inversion = INVERSION_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 8 : chan->tp.modulation = QPSK; break; case 16 : chan->tp.modulation = QAM_16; break; @@ -2279,7 +2279,7 @@ bool DvbPanel::getChannelList() case -1 : chan->tp.modulation = QAM_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 0 : chan->tp.coderateL = FEC_NONE; break; case 12 : chan->tp.coderateL = FEC_1_2; break; @@ -2295,7 +2295,7 @@ bool DvbPanel::getChannelList() case -1 : chan->tp.coderateL = FEC_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 8 : chan->tp.bandwidth = BANDWIDTH_8_MHZ; break; case 7 : chan->tp.bandwidth = BANDWIDTH_7_MHZ; break; @@ -2303,14 +2303,14 @@ bool DvbPanel::getChannelList() case -1 : chan->tp.bandwidth = BANDWIDTH_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 2 : chan->tp.transmission = TRANSMISSION_MODE_2K; break; case 8 : chan->tp.transmission = TRANSMISSION_MODE_8K; break; case -1 : chan->tp.transmission = TRANSMISSION_MODE_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 32 : chan->tp.guard = GUARD_INTERVAL_1_32; break; case 16 : chan->tp.guard = GUARD_INTERVAL_1_16; break; @@ -2319,7 +2319,7 @@ bool DvbPanel::getChannelList() case -1 : chan->tp.guard = GUARD_INTERVAL_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 0 : chan->tp.hierarchy = HIERARCHY_NONE; break; case 1 : chan->tp.hierarchy = HIERARCHY_1; break; @@ -2328,39 +2328,39 @@ bool DvbPanel::getChannelList() case -1 : chan->tp.hierarchy = HIERARCHY_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); chan->num = s.left(pos).toUInt(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); c = s.left( pos ); s = s.right( s.length()-pos-1 ); - while ( (pos=c.find(","))!=-1 ) { + while ( (pos=c.tqfind(","))!=-1 ) { t = c.left(pos); - tpos=t.find("("); + tpos=t.tqfind("("); ns = (int)chan->nsubpid; chan->subpid[ns].pid = t.left(tpos).toUShort(); t = t.right( t.length()-tpos-1 ); - tpos=t.find(")"); + tpos=t.tqfind(")"); chan->subpid[ns].type = t.left(tpos).toUShort(); t = t.right( t.length()-tpos-2 ); - tpos=t.find(")"); + tpos=t.tqfind(")"); chan->subpid[ns].page = t.left(tpos).toUShort(); t = t.right( t.length()-tpos-2 ); - tpos=t.find(")"); + tpos=t.tqfind(")"); chan->subpid[ns].id = t.left(tpos).toUShort(); t = t.right( t.length()-tpos-2 ); - tpos=t.find(")"); + tpos=t.tqfind(")"); chan->subpid[ns].lang = t.left(tpos); c = c.right( c.length()-pos-1 ); chan->nsubpid++; } - pos = s.find("|"); + pos = s.tqfind("|"); chan->category = s.left( pos ); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); chan->tp.nid = s.left(pos).toUShort(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); switch ( s.left(pos).toInt() ) { case 20 : chan->tp.rolloff = ROLLOFF_20; break; case 25 : chan->tp.rolloff = ROLLOFF_25; break; @@ -2368,7 +2368,7 @@ bool DvbPanel::getChannelList() case -1 : chan->tp.rolloff = ROLLOFF_AUTO; } s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); chan->tp.S2 = s.left(pos).toInt(); if ( chan->tp.source.isEmpty() ) { @@ -2377,7 +2377,7 @@ bool DvbPanel::getChannelList() } chan->pix.load( dvbConfig->dvbConfigIconsDir+chan->name ); - it = new KListViewItem( channelsCb, QString().sprintf("%05d", chan->num), chan->name, chan->tp.source ); + it = new KListViewItem( channelsCb, TQString().sprintf("%05d", chan->num), chan->name, chan->tp.source ); it->setDragEnabled( true ); if ( !chan->pix.isNull() ) it->setPixmap( 1, chan->pix ); @@ -2417,12 +2417,12 @@ bool DvbPanel::saveChannelList() { bool ret=false; int i, k; - QString s; + TQString s; ChannelDesc *chan=0; - QFile f( locateLocal("appdata", "channels.dvb" ) ); + TQFile f( locateLocal("appdata", "channels.dvb" ) ); if ( f.open(IO_WriteOnly|IO_Truncate) ) { - QTextStream tt( &f ); + TQTextStream tt( &f ); tt<<"#Generated by Kaffeine 0.5\n"; for( i=0; i<(int)channels.count(); i++ ) { chan = channels.at(i); @@ -2575,35 +2575,35 @@ bool DvbPanel::saveChannelList() bool DvbPanel::getTimerList() { bool ret=false; - QString s; + TQString s; int pos; RecTimer *t; - QFile f( locateLocal("appdata", "timers.dvb" ) ); + TQFile f( locateLocal("appdata", "timers.dvb" ) ); if ( f.open(IO_ReadOnly) ) { - QTextStream tt( &f ); + TQTextStream tt( &f ); while ( !tt.eof() ) { s = tt.readLine(); if ( s.startsWith("#") ) continue; t = new RecTimer(); - pos = s.find("|"); + pos = s.tqfind("|"); t->name = s.left( pos ); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); t->channel = s.left( pos ); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); - t->begin = QDateTime::fromString( s.left( pos ), Qt::ISODate ); + pos = s.tqfind("|"); + t->begin = TQDateTime::fromString( s.left( pos ), Qt::ISODate ); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); - t->duration = QTime::fromString( s.left( pos ) ); + pos = s.tqfind("|"); + t->duration = TQTime::fromString( s.left( pos ) ); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); //t->filetype = s.left( pos ).toInt(); t->mode = 0; s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); t->mode = s.left( pos ).toInt(); t->running = 0; timers.append( t ); @@ -2620,12 +2620,12 @@ bool DvbPanel::saveTimerList() { bool ret=false; int i; - QString s; + TQString s; RecTimer *t; - QFile f( locateLocal("appdata", "timers.dvb" ) ); + TQFile f( locateLocal("appdata", "timers.dvb" ) ); if ( f.open(IO_WriteOnly|IO_Truncate) ) { - QTextStream tt( &f ); + TQTextStream tt( &f ); tt<<"#Generated by Kaffeine 0.5\n"; for( i=0; i<(int)timers.count(); i++ ) { t = timers.at(i); diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h index 444e641..18dcfc0 100644 --- a/kaffeine/src/input/dvb/dvbpanel.h +++ b/kaffeine/src/input/dvb/dvbpanel.h @@ -21,13 +21,13 @@ #ifndef DVBPANEL_H #define DVBPANEL_H -#include <qframe.h> -#include <qcombobox.h> -#include <qtoolbutton.h> -#include <qptrlist.h> -#include <qtimer.h> -#include <qsplitter.h> -#include <qvbox.h> +#include <tqframe.h> +#include <tqcombobox.h> +#include <tqtoolbutton.h> +#include <tqptrlist.h> +#include <tqtimer.h> +#include <tqsplitter.h> +#include <tqvbox.h> #include <kapp.h> #include <kpushbutton.h> @@ -56,13 +56,14 @@ class KaffeineDvbPlugin; class DListView : public KListView { Q_OBJECT + TQ_OBJECT public: - DListView( QWidget *parent ); + DListView( TQWidget *tqparent ); int visibleItems; protected: - virtual QDragObject* dragObject(); + virtual TQDragObject* dragObject(); }; @@ -70,9 +71,9 @@ protected: class DIconViewItem : public KIconViewItem { public: - DIconViewItem( DvbPanel *pan, QIconView *parent, const QString &text, const QPixmap &icon ); + DIconViewItem( DvbPanel *pan, TQIconView *tqparent, const TQString &text, const TQPixmap &icon ); protected: - void dropped( QDropEvent *e, const QValueList<QIconDragItem> & ); + void dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> & ); private: DvbPanel *panel; }; @@ -82,10 +83,11 @@ private: class DvbPanel : public KaffeineInput { Q_OBJECT + TQ_OBJECT public: - DvbPanel( QWidget *parent, QObject *objParent, const char *name=0); + DvbPanel( TQWidget *tqparent, TQObject *objParent, const char *name=0); ~DvbPanel(); bool getChannelList(); bool saveChannelList(); @@ -93,11 +95,11 @@ public: void setConfig(); void enableLiveDvb( bool on ); void checkFirstRun(); - void moveChannel( const QString &cat, const QString &name ); + void moveChannel( const TQString &cat, const TQString &name ); // Reimplemented from KaffeineInput - QWidget *wantPlayerWindow(); - QWidget *inputMainWidget(); + TQWidget *wantPlayerWindow(); + TQWidget *inputMainWidget(); void toggleLayout( bool ); bool close(); bool nextTrack( MRL& ); @@ -105,20 +107,20 @@ public: bool currentTrack( MRL& ); bool trackNumber( int, MRL& ); bool playbackFinished( MRL& ); - void getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames ); + void getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames ); void togglePanel(); - bool execTarget( const QString& ); + bool execTarget( const TQString& ); void saveConfig(); //*************************************** - QPtrList<ChannelDesc> channels; - QPtrList<RecTimer> timers; - QPtrList<DvbStream> dvb; - QString fifoName, fifoName1, currentFifo; - QString timeShiftFileName; + TQPtrList<ChannelDesc> channels; + TQPtrList<RecTimer> timers; + TQPtrList<DvbStream> dvb; + TQString fifoName, fifoName1, currentFifo; + TQString timeShiftFileName; Ts2Rtp *rtp; - QVBox *mainWidget; - QVBox *playerBox, *pbox; + TQVBox *mainWidget; + TQVBox *playerBox, *pbox; public slots: @@ -150,9 +152,9 @@ public slots: void dvbOSDAdvance(); void dvbOSDRetreat(); - void dvbNewTimer( QString name, QString channel, QString datetime, QString duration ); + void dvbNewTimer( TQString name, TQString channel, TQString datetime, TQString duration ); int getSNR( int device ); - void diskStatus(); + void disktqStatus(); void camClicked( int devNum ); private: @@ -161,22 +163,22 @@ private: bool getTimerList(); bool saveTimerList(); void fillChannelList( ChannelDesc *ch=0 ); - QPtrList<Transponder> getSourcesStatus(); + TQPtrList<Transponder> getSourcestqStatus(); void updateModeTimer( RecTimer *t ); DvbStream* getWorkingDvb( int mode, ChannelDesc *chan ); void dvbOSD(ChannelDesc liveChannel, DvbStream *d, int timeShift = 0); DvbStream* getLiveDVBStream(); - QPixmap tvPix, raPix, tvcPix, racPix; - QSplitter *split; - QFrame *panel; + TQPixmap tvPix, raPix, tvcPix, racPix; + TQSplitter *split; + TQFrame *panel; KIconView *iconView; DListView *channelsCb; - QToolButton *broadcastBtn, *recordBtn; - QToolButton *dateBtn, *infoBtn, *channelsBtn, *configBtn, *osdBtn, *recallBtn; + TQToolButton *broadcastBtn, *recordBtn; + TQToolButton *dateBtn, *infoBtn, *channelsBtn, *configBtn, *osdBtn, *recallBtn; KLed *shiftLed, *recordLed, *broadcastLed; - QTimer timersTimer; + TQTimer timersTimer; DVBconfig *dvbConfig; KRecord *timersDialog; int updown; @@ -184,14 +186,14 @@ private: int currentChannelNumber; Cleaner *cleaner; int osdMode; - QTimer osdTimer; - QTimer showOsdTimer; - QString currentCategory; + TQTimer osdTimer; + TQTimer showOsdTimer; + TQString currentCategory; bool isTuning; - QTimer tuningTimer, stopTuningTimer; - QTimer diskTimer; + TQTimer tuningTimer, stopTuningTimer; + TQTimer diskTimer; KLineEdit *searchLE; - QToolButton *searchBtn; + TQToolButton *searchBtn; int recallChannel; int browseDvbStream; @@ -199,28 +201,28 @@ private: int browseDvbTimeShift; KaffeineDvbPlugin *plug; - QString plugName; + TQString plugName; EventTable events; private slots: - void searchChannel( const QString &text ); + void searchChannel( const TQString &text ); void resetSearch(); void checkTimers(); - bool editChannel( QString &name ); - void channelSelected( QListViewItem *it ); - void channelClicked( QListViewItem *it ); - void channelSelected( const QString &name ); - void channelPopup( QListViewItem *it, const QPoint &pos, int col ); + bool editChannel( TQString &name ); + void channelSelected( TQListViewItem *it ); + void channelClicked( TQListViewItem *it ); + void channelSelected( const TQString &name ); + void channelPopup( TQListViewItem *it, const TQPoint &pos, int col ); void dvbZap( ChannelDesc *chan ); void finalZap( DvbStream *d, ChannelDesc *chan ); - void newTimer( QString channel, QString name, QDateTime begin, QTime duration, bool warn=true ); + void newTimer( TQString channel, TQString name, TQDateTime begin, TQTime duration, bool warn=true ); void dumpEvents(); void resetOSD(); - void catContextMenu( QIconViewItem*, const QPoint& ); - void catSelected( QIconViewItem* ); - void channelNumberChanged( QListViewItem* ); + void catContextMenu( TQIconViewItem*, const TQPoint& ); + void catSelected( TQIconViewItem* ); + void channelNumberChanged( TQListViewItem* ); void pipeOpened(); void setTuning(); @@ -229,13 +231,13 @@ signals: void zap( ChannelDesc* ); void playDvb(); void timersChanged(); - void dvbOpen( const QString &filename, const QString &chanName, int haveVideo ); + void dvbOpen( const TQString &filename, const TQString &chanName, int haveVideo ); void dvbStop(); void dvbPause( bool pauseLive ); - void setTimeShiftFilename( const QString& ); - void showOSD( const QString &text, int duration, int priority ); - void showDvbOSD( const QStringList& ); - void showDvbOSD( const QString&, const QStringList& ); + void setTimeShiftFilename( const TQString& ); + void showOSD( const TQString &text, int duration, int priority ); + void showDvbOSD( const TQStringList& ); + void showDvbOSD( const TQString&, const TQStringList& ); void updateTimer(RecTimer*, int); }; diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp index db29091..a436eff 100644 --- a/kaffeine/src/input/dvb/dvbsi.cpp +++ b/kaffeine/src/input/dvb/dvbsi.cpp @@ -23,7 +23,7 @@ #include <unistd.h> #include <sys/poll.h> -#include <qdir.h> +#include <tqdir.h> #include <kapplication.h> @@ -48,7 +48,7 @@ #define PSIP_TABLE_TYPE_TVCT 0xc8 #define PSIP_TABLE_TYPE_CVCT 0xc9 -NitSection::NitSection( QPtrList<Transponder> *tp, bool *end, bool *ok, int anum, int tnum ) : KaffeineDVBsection( anum, tnum ) +NitSection::NitSection( TQPtrList<Transponder> *tp, bool *end, bool *ok, int anum, int tnum ) : KaffeineDVBsection( anum, tnum ) { ended = end; transponders = tp; @@ -88,7 +88,7 @@ bool NitSection::getSection( int pid, int tid, int timeout ) int i, n=0; int skip=0; int last=1, current=0, loop=0; - QValueList<int> list; + TQValueList<int> list; if ( !setFilter( pid, tid, timeout ) ) return false; @@ -220,7 +220,7 @@ bool NitSection::tableNIT( unsigned char* buf ) void NitSection::satelliteDesc( unsigned char* buf, Transponder *trans ) { - QString s, t; + TQString s, t; trans->type = FE_QPSK; s = t.setNum( getBits(buf,16,32), 16 ); @@ -283,7 +283,7 @@ void NitSection::S2satelliteDesc( unsigned char* buf, Transponder *trans ) void NitSection::cableDesc( unsigned char* buf, Transponder *trans ) { - QString s, t; + TQString s, t; trans->type = FE_QAM; s = t.setNum( getBits(buf,16,32), 16 ); @@ -354,7 +354,7 @@ void NitSection::freqListDesc( unsigned char* buf, Transponder *trans ) { unsigned char len, type; unsigned char *b=buf; - QString s, t; + TQString s, t; unsigned long freq; len = getBits(b,8,8); @@ -390,7 +390,7 @@ void NitSection::freqListDesc( unsigned char* buf, Transponder *trans ) -DVBsi::DVBsi( bool *ok, int anum, int tnum, DvbStream *d, const QString &charset ) : KaffeineDVBsection( anum, tnum, charset ) +DVBsi::DVBsi( bool *ok, int anum, int tnum, DvbStream *d, const TQString &charset ) : KaffeineDVBsection( anum, tnum, charset ) { channels.setAutoDelete( true ); transponders.setAutoDelete( true ); @@ -433,7 +433,7 @@ bool DVBsi::tableSDT( unsigned char* buf ) { int length, loop; ChannelDesc *desc; - QString s; + TQString s; unsigned short tsid; unsigned short nid; @@ -478,7 +478,7 @@ bool DVBsi::tablePMT( unsigned char* buf ) int i; int pid=0; ChannelDesc *desc=0; - QString lang; + TQString lang; int ns; unsigned char st; bool audio, ac3; @@ -620,7 +620,7 @@ bool DVBsi::tablePAT( unsigned char *buf ) desc->tp.tsid = tsid; desc->sid = sid; desc->pmtpid = pmt; - desc->name = QString("TSID:%1-SID:%2").arg(tsid).arg(sid); + desc->name = TQString("TSID:%1-SID:%2").tqarg(tsid).tqarg(sid); } } @@ -635,7 +635,7 @@ bool DVBsi::getSection( int pid, int tid, int timeout, int sid ) int i, n=0; int skip=0; int last=1, current=0, loop=0; - QValueList<int> list, sidList; + TQValueList<int> list, sidList; int cursid; if ( !setFilter( pid, tid, timeout ) ) @@ -660,7 +660,7 @@ bool DVBsi::getSection( int pid, int tid, int timeout, int sid ) } cursid = getBits(buf+3,0,16); - if ( sid && cursid!=sid && !sidList.contains(cursid) ) { + if ( sid && cursid!=sid && !sidList.tqcontains(cursid) ) { sidList.append( cursid ); continue; } @@ -854,7 +854,7 @@ bool DVBsi::parseVCT( int pid, int tid, int timeout, int sid ) ChannelDesc *desc = new ChannelDesc(); desc->tp.tsid = channel_tsid; - desc->name = QString("%1-%2 %3").arg(major_channel_num).arg(minor_channel_num).arg(short_name); + desc->name = TQString("%1-%2 %3").tqarg(major_channel_num).tqarg(minor_channel_num).tqarg(short_name); desc->sid = program_number; if (access_controlled == 1) desc->fta = 1; @@ -931,12 +931,12 @@ void DVBsi::out( bool stopscan ) } if ( stopscan ) dvb->stopScan(); - KApplication::kApplication()->postEvent( this, new QTimerEvent( TIMER_EVENT_SCAN_END ) ); + KApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) ); } -void DVBsi::go( QPtrList<Transponder> trans, int mode ) +void DVBsi::go( TQPtrList<Transponder> trans, int mode ) { int i; @@ -954,7 +954,7 @@ void DVBsi::go( QPtrList<Transponder> trans, int mode ) -void DVBsi::timerEvent( QTimerEvent *e ) +void DVBsi::timerEvent( TQTimerEvent *e ) { switch ( e->timerId() ) { case TIMER_EVENT_SCAN_END : @@ -1107,14 +1107,14 @@ void DVBsi::run() fprintf(stderr,"dvbsi: The end :)\n"); isRunning = false; listChannels(); - KApplication::kApplication()->postEvent( this, new QTimerEvent( TIMER_EVENT_SCAN_END ) ); + KApplication::kApplication()->postEvent( this, new TQTimerEvent( TIMER_EVENT_SCAN_END ) ); } // !!!! only there for debugging !!!!!!!!!! bool DVBsi::listChannels() { - QString s,t; + TQString s,t; int i, valid=0; bool ac3; diff --git a/kaffeine/src/input/dvb/dvbsi.h b/kaffeine/src/input/dvb/dvbsi.h index 1146f85..0fe8999 100644 --- a/kaffeine/src/input/dvb/dvbsi.h +++ b/kaffeine/src/input/dvb/dvbsi.h @@ -31,7 +31,7 @@ class NitSection : public KaffeineDVBsection public: - NitSection( QPtrList<Transponder> *tp, bool *end, bool *ok, int anum, int tnum ); + NitSection( TQPtrList<Transponder> *tp, bool *end, bool *ok, int anum, int tnum ); ~NitSection(); bool getSection( int pid, int tid, int timeout=5000 ); bool tableNIT( unsigned char* buf ); @@ -43,7 +43,7 @@ public: void stop(); bool *ended; - QPtrList<Transponder> *transponders; + TQPtrList<Transponder> *transponders; protected: @@ -52,13 +52,14 @@ protected: -class DVBsi : public QObject, public KaffeineDVBsection +class DVBsi : public TQObject, public KaffeineDVBsection { Q_OBJECT + TQ_OBJECT public: - DVBsi( bool *ok, int anum, int tnum, DvbStream *d, const QString &charset ); + DVBsi( bool *ok, int anum, int tnum, DvbStream *d, const TQString &charset ); ~DVBsi(); bool getSection( int pid, int tid, int timeout=5000, int sid=0 ); bool listChannels(); @@ -72,8 +73,8 @@ public: virtual bool parseMGT( int pid, int tid, int timeout=5000, int sid=0 ); virtual bool parseVCT( int pid, int tid, int timeout=5000, int sid=0 ); - QPtrList<ChannelDesc> channels; - QPtrList<Transponder> transponders; + TQPtrList<ChannelDesc> channels; + TQPtrList<Transponder> transponders; DvbStream *dvb; int indexChannels; int progressTransponder; @@ -81,13 +82,13 @@ public: public slots: - void go( QPtrList<Transponder> trans, int mode=1 ); + void go( TQPtrList<Transponder> trans, int mode=1 ); void stop(); protected: virtual void run(); - virtual void timerEvent( QTimerEvent *e ); + virtual void timerEvent( TQTimerEvent *e ); private: diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp index 77bee5c..377f119 100644 --- a/kaffeine/src/input/dvb/dvbstream.cpp +++ b/kaffeine/src/input/dvb/dvbstream.cpp @@ -38,8 +38,8 @@ #include <linux/dvb/dmx.h> -#include <qdir.h> -#include <qprogressdialog.h> +#include <tqdir.h> +#include <tqprogressdialog.h> #include <klocale.h> #include <kapplication.h> @@ -55,7 +55,7 @@ -DvbStream::DvbStream( Device *d, const QString &charset, EventTable *et ) +DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et ) { dvbDevice = d; isRunning = false; @@ -65,13 +65,13 @@ DvbStream::DvbStream( Device *d, const QString &charset, EventTable *et ) fdFrontend = fdDvr = 0; ndmx = 0; currentTransponder = Transponder(); - frontendName = QString("/dev/dvb/adapter%1/frontend%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner ); - dvrName = QString("/dev/dvb/adapter%1/dvr%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner ); - demuxName = QString("/dev/dvb/adapter%1/demux%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner ); + frontendName = TQString("/dev/dvb/adapter%1/frontend%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); + dvrName = TQString("/dev/dvb/adapter%1/dvr%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); + demuxName = TQString("/dev/dvb/adapter%1/demux%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); out.setAutoDelete( true ); - QString deviceType="NONE"; + TQString deviceType="NONE"; switch ( dvbDevice->type ) { case FE_QPSK: deviceType = "DVBS"; break; case FE_OFDM: deviceType = "DVBT"; break; @@ -84,7 +84,7 @@ DvbStream::DvbStream( Device *d, const QString &charset, EventTable *et ) cam = NULL; plug = NULL; - connect( &statusTimer, SIGNAL(timeout()), this, SLOT(checkStatus()) ); + connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checktqStatus()) ); } @@ -118,24 +118,24 @@ void DvbStream::showCamDialog() -QStringList DvbStream::getSources( bool all ) +TQStringList DvbStream::getSources( bool all ) { if ( !all ) { if ( dvbDevice->type==FE_OFDM ) - return QStringList( "Terrestrial" ); + return TQStringList( "Terrestrial" ); if ( dvbDevice->type==FE_QAM ) - return QStringList( "Cable" ); + return TQStringList( "Cable" ); if ( dvbDevice->type==FE_ATSC ) - return QStringList( "Atsc" ); + return TQStringList( "Atsc" ); } - QStringList source; + TQStringList source; int i; if ( dvbDevice->type==FE_QPSK ) { for ( i=0; i<dvbDevice->numLnb; i++ ) source+= dvbDevice->lnb[i].source; } else { - QString s = dvbDevice->source; + TQString s = dvbDevice->source; source+= s.remove(0,2); } return source; @@ -158,7 +158,7 @@ bool DvbStream::canSource( ChannelDesc *chan ) return false; int i; for ( i=0; i<dvbDevice->numLnb; i++ ) { - if ( dvbDevice->lnb[i].source.contains(chan->tp.source) ) + if ( dvbDevice->lnb[i].source.tqcontains(chan->tp.source) ) return true; } return false; @@ -173,7 +173,7 @@ int DvbStream::getPriority() -int DvbStream::getSatPos( const QString &src ) +int DvbStream::getSatPos( const TQString &src ) { int i; @@ -181,7 +181,7 @@ int DvbStream::getSatPos( const QString &src ) return -1; for ( i=0; i<dvbDevice->numLnb; i++ ) - if ( dvbDevice->lnb[i].source.contains(src) ) + if ( dvbDevice->lnb[i].source.tqcontains(src) ) return i; return -1; } @@ -221,7 +221,7 @@ bool DvbStream::closeFe() -void DvbStream::connectStatus( bool con ) +void DvbStream::connecttqStatus( bool con ) { if ( con ) statusTimer.start( 1000 ); @@ -360,7 +360,7 @@ bool DvbStream::tuneDvb( ChannelDesc *chan, bool dvr ) freq*=1000; srate*=1000; - QTime t1 = QTime::currentTime(); + TQTime t1 = TQTime::currentTime(); if ( chan->tp.inversion==INVERSION_AUTO ) { if ( fe_info.caps & FE_CAN_INVERSION_AUTO ) @@ -375,8 +375,8 @@ bool DvbStream::tuneDvb( ChannelDesc *chan, bool dvr ) switch( fe_info.type ) { case FE_OFDM : { - QString s = fe_info.name; - //if ( s.contains("TerraTec/qanu USB2.0 Highspeed DVB-T Receiver") ) // cinergyT2 hack + TQString s = fe_info.name; + //if ( s.tqcontains("TerraTec/qanu USB2.0 Highspeed DVB-T Receiver") ) // cinergyT2 hack // freq+=167000; if (freq < 1000000) freq*=1000UL; @@ -452,8 +452,8 @@ bool DvbStream::tuneDvb( ChannelDesc *chan, bool dvr ) closeFe(); return false; } - fprintf( stderr, "Diseqc settings time = %d ms\n", t1.msecsTo( QTime::currentTime() ) ); - t1 = QTime::currentTime(); + fprintf( stderr, "Diseqc settings time = %d ms\n", t1.msecsTo( TQTime::currentTime() ) ); + t1 = TQTime::currentTime(); if ( chan->tp.S2 ) { fprintf(stderr,"\nTHIS IS DVB-S2 >>>>>>>>>>>>>>>>>>>\n"); cmdargs[0].cmd = DTV_DELIVERY_SYSTEM; cmdargs[0].u.data = SYS_DVBS2; @@ -513,7 +513,7 @@ bool DvbStream::tuneDvb( ChannelDesc *chan, bool dvr ) closeFe(); return false; } - QTime lockTime = QTime::currentTime(); + TQTime lockTime = TQTime::currentTime(); do { usleep( 100000 ); fprintf( stderr, "." ); @@ -526,7 +526,7 @@ bool DvbStream::tuneDvb( ChannelDesc *chan, bool dvr ) loop = 0; break; } - } while ( lockTime.msecsTo( QTime::currentTime() )<=dvbDevice->tuningTimeout ); + } while ( lockTime.msecsTo( TQTime::currentTime() )<=dvbDevice->tuningTimeout ); fprintf(stderr,"\n"); --loop; } @@ -537,7 +537,7 @@ bool DvbStream::tuneDvb( ChannelDesc *chan, bool dvr ) return false; } - fprintf( stderr, "Tuning time = %d ms\n", t1.msecsTo( QTime::currentTime() ) ); + fprintf( stderr, "Tuning time = %d ms\n", t1.msecsTo( TQTime::currentTime() ) ); if ( rotorMove ) dvbDevice->lnb[lnbPos].currentSource = chan->tp.source; @@ -654,7 +654,7 @@ void DvbStream::moveRotor( int switchPos, ChannelDesc *chan, int hiband, bool dv int rotor=0; int voltage18 = ( (chan->tp.pol=='H')||(chan->tp.pol=='h') ); int ci = 4 * switchPos + 2 * hiband + (voltage18 ? 1 : 0); - QString msg; + TQString msg; fprintf( stderr, "Driving rotor to %s\n", chan->tp.source.ascii() ); for ( i=0; i<(int)dvbDevice->lnb[switchPos].source.count(); i++ ) { @@ -697,16 +697,16 @@ void DvbStream::moveRotor( int switchPos, ChannelDesc *chan, int hiband, bool dv } } else { - QProgressDialog progress( msg, i18n("Cancel"), rotor*2, 0, "progress", true ); + TQProgressDialog progress( msg, i18n("Cancel"), rotor*2, 0, "progress", true ); for ( j=0; j<(rotor*2); j++ ) { progress.setProgress( j ); - qApp->processEvents(); + tqApp->processEvents(); if ( progress.wasCanceled() ) break; usleep( 500000 ); } progress.setProgress( rotor*2 ); - qApp->processEvents(); + tqApp->processEvents(); } if ( (ci/2)%2 ) { @@ -718,10 +718,10 @@ void DvbStream::moveRotor( int switchPos, ChannelDesc *chan, int hiband, bool dv -double DvbStream::getSourceAngle( QString source ) +double DvbStream::getSourceAngle( TQString source ) { double angle=1.0; - int pos = source.findRev("-"); + int pos = source.tqfindRev("-"); source.remove(0,pos+1); source = source.upper(); if ( source.endsWith("W") ) @@ -823,7 +823,7 @@ bool DvbStream::setPids( DVBout *o ) int i, dmx; struct dmx_pes_filter_params pesFilterParams; dmx_pes_type_t pestype = DMX_PES_OTHER; - QValueList<int> pidList; + TQValueList<int> pidList; pidList = o->pidsList(); @@ -869,9 +869,9 @@ void DvbStream::removePids( DVBout *o ) void DvbStream::removeOut( DVBout *o ) { - disconnect( o, SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); - disconnect( o, SIGNAL(playDvb()), this, SLOT(receivePlayDvb()) ); - disconnect( o, SIGNAL(shifting(bool)), this, SLOT(receiveShifting(bool)) ); + disconnect( o, TQT_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQT_SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); + disconnect( o, TQT_SIGNAL(playDvb()), this, TQT_SLOT(receivePlayDvb()) ); + disconnect( o, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(receiveShifting(bool)) ); delOut = o; while ( delOut ) usleep(100); @@ -879,7 +879,7 @@ void DvbStream::removeOut( DVBout *o ) -bool DvbStream::checkStatus() +bool DvbStream::checktqStatus() { int32_t strength; fe_status_t festatus; @@ -887,19 +887,19 @@ bool DvbStream::checkStatus() strength=0; ioctl(fdFrontend,FE_READ_SIGNAL_STRENGTH,&strength); - emit signalStatus(strength*100/65535); + emit signaltqStatus(strength*100/65535); strength=0; ioctl(fdFrontend,FE_READ_SNR,&strength); - emit snrStatus(strength*100/65535); + emit snrtqStatus(strength*100/65535); memset( &festatus, 0, sizeof(festatus) ); ioctl(fdFrontend,FE_READ_STATUS,&festatus); if (festatus & FE_HAS_LOCK) - emit lockStatus( true ); + emit locktqStatus( true ); else { - emit lockStatus( false ); + emit locktqStatus( false ); ret = false; } @@ -985,7 +985,7 @@ void DvbStream::run() -bool DvbStream::doPause( const QString &name ) +bool DvbStream::doPause( const TQString &name ) { //if ( !hasVideo() ) return false; @@ -1029,12 +1029,12 @@ bool DvbStream::running() const void DvbStream::receivePlayDvb() { - KApplication::kApplication()->postEvent( this, new QTimerEvent( 500 ) ); + KApplication::kApplication()->postEvent( this, new TQTimerEvent( 500 ) ); } -void DvbStream::timerEvent( QTimerEvent* ev ) +void DvbStream::timerEvent( TQTimerEvent* ev ) { switch ( ev->timerId() ) { case 500: @@ -1101,7 +1101,7 @@ void DvbStream::stopBroadcast() { int i; DVBout *o=0; - QPtrList<DVBout> p; + TQPtrList<DVBout> p; for ( i=0; i<(int)out.count(); i++ ) { o = out.at(i); @@ -1139,14 +1139,14 @@ int DvbStream::canStartBroadcast( bool &live, ChannelDesc *chan ) -bool DvbStream::startBroadcast( QPtrList<ChannelDesc> *list, Ts2Rtp *rtp ) +bool DvbStream::startBroadcast( TQPtrList<ChannelDesc> *list, Ts2Rtp *rtp ) { int i, j; bool stop=false, newout; DVBout *o=0; int no=0; ChannelDesc *chan=list->at(0); - QPtrList<ChannelDesc> broadcastList; + TQPtrList<ChannelDesc> broadcastList; broadcastList.setAutoDelete( true ); if ( !isTuned() ) { @@ -1174,9 +1174,9 @@ bool DvbStream::startBroadcast( QPtrList<ChannelDesc> *list, Ts2Rtp *rtp ) if ( !o ) { o = new DVBout( *list->at(i), dvbDevice->adapter, dvbDevice->tuner, plug ); - connect( o, SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); - connect( o, SIGNAL(playDvb()), this, SLOT(receivePlayDvb()) ); - connect( o, SIGNAL(shifting(bool)), this, SLOT(receiveShifting(bool)) ); + connect( o, TQT_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQT_SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); + connect( o, TQT_SIGNAL(playDvb()), this, TQT_SLOT(receivePlayDvb()) ); + connect( o, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(receiveShifting(bool)) ); out.append( o ); if ( !setPids( o ) ) { removePids( o ); @@ -1243,12 +1243,12 @@ int DvbStream::canStartTimer( bool &live, ChannelDesc *chan ) -bool DvbStream::startTimer( ChannelDesc *chan, QString path, int maxsize, RecTimer *t, QString name ) +bool DvbStream::startTimer( ChannelDesc *chan, TQString path, int maxsize, RecTimer *t, TQString name ) { int i; bool stop=false, newout=false; DVBout *o=0; - QPtrList<DVBout> p; + TQPtrList<DVBout> p; for ( i=0; i<(int)out.count(); i++ ) { if ( out.at(i)->channel.name==chan->name ) @@ -1288,9 +1288,9 @@ bool DvbStream::startTimer( ChannelDesc *chan, QString path, int maxsize, RecTim if ( !o ) { o = new DVBout( *chan, dvbDevice->adapter, dvbDevice->tuner, plug ); - connect( o, SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); - connect( o, SIGNAL(playDvb()), this, SLOT(receivePlayDvb()) ); - connect( o, SIGNAL(shifting(bool)), this, SLOT(receiveShifting(bool)) ); + connect( o, TQT_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQT_SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); + connect( o, TQT_SIGNAL(playDvb()), this, TQT_SLOT(receivePlayDvb()) ); + connect( o, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(receiveShifting(bool)) ); out.append( o ); if ( !setPids( o ) ) { if ( stop ) @@ -1302,10 +1302,10 @@ bool DvbStream::startTimer( ChannelDesc *chan, QString path, int maxsize, RecTim newout = true; } - if ( t->mode && !name.contains("%date") ) + if ( t->mode && !name.tqcontains("%date") ) name+= "-%date"; - name = name.replace( "%chan", chan->name ).replace("%date", t->begin.toString( "yyyyMMdd-hhmmss" ) ).replace("%name", t->name ); - name = name.replace( "/", "_" ).replace( ">", "_" ).replace("<","_").replace(":","_").replace('"',"_").replace("\\","_").replace("|","_"); + name = name.tqreplace( "%chan", chan->name ).tqreplace("%date", t->begin.toString( "yyyyMMdd-hhmmss" ) ).tqreplace("%name", t->name ); + name = name.tqreplace( "/", "_" ).tqreplace( ">", "_" ).tqreplace("<","_").tqreplace(":","_").tqreplace('"',"_").tqreplace("\\","_").tqreplace("|","_"); name = path+name; if ( !o->goRec( name, maxsize, t ) ) { @@ -1330,7 +1330,7 @@ bool DvbStream::startTimer( ChannelDesc *chan, QString path, int maxsize, RecTim -int DvbStream::goLive( ChannelDesc *chan, const QString &pipeName, int ringBufSize ) +int DvbStream::goLive( ChannelDesc *chan, const TQString &pipeName, int ringBufSize ) { int i; bool stop=false; @@ -1364,9 +1364,9 @@ int DvbStream::goLive( ChannelDesc *chan, const QString &pipeName, int ringBufSi if ( !o ) { o = new DVBout( *chan, dvbDevice->adapter, dvbDevice->tuner, plug ); - connect( o, SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); - connect( o, SIGNAL(playDvb()), this, SLOT(receivePlayDvb()) ); - connect( o, SIGNAL(shifting(bool)), this, SLOT(receiveShifting(bool)) ); + connect( o, TQT_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQT_SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); + connect( o, TQT_SIGNAL(playDvb()), this, TQT_SLOT(receivePlayDvb()) ); + connect( o, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(receiveShifting(bool)) ); out.append( o ); if ( !setPids( o ) ) { if ( stop ) @@ -1414,7 +1414,7 @@ void DvbStream::stopLive( ChannelDesc *chan ) { int i; DVBout *o; - QPtrList<DVBout> p; + TQPtrList<DVBout> p; bool camUsed = false; fprintf(stderr,"Asked to stop\n"); @@ -1481,7 +1481,7 @@ void DvbStream::stopFrontend() void DvbStream::setScanning( bool b ) { - connectStatus( b ); + connecttqStatus( b ); } diff --git a/kaffeine/src/input/dvb/dvbstream.h b/kaffeine/src/input/dvb/dvbstream.h index fe85f04..f793aa0 100644 --- a/kaffeine/src/input/dvb/dvbstream.h +++ b/kaffeine/src/input/dvb/dvbstream.h @@ -24,12 +24,12 @@ #include <sys/poll.h> #include <sys/stat.h> -#include <qthread.h> -#include <qptrlist.h> -#include <qfile.h> -#include <qobject.h> -#include <qtimer.h> -#include <qstringlist.h> +#include <tqthread.h> +#include <tqptrlist.h> +#include <tqfile.h> +#include <tqobject.h> +#include <tqtimer.h> +#include <tqstringlist.h> #include "channeldesc.h" #include "dvbout.h" @@ -45,45 +45,46 @@ class EventTable; -class DvbStream : public QObject, public QThread +class DvbStream : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public : enum { ErrDontSwitchAudio=-1, ErrCantTune=1, ErrCantSetPids=2, ErrIsRecording=3, ErrNoLive=4, ErrCantOpenFile=5, ErrIsBroadcasting=6, ErrCamUsed=7 }; - DvbStream( Device *d, const QString &charset, EventTable *et ); + DvbStream( Device *d, const TQString &charset, EventTable *et ); ~DvbStream(); int getAdapter() { return dvbDevice->adapter; } int getTuner() { return dvbDevice->tuner; } fe_type_t getType() {return dvbDevice->type; } void setPlug( KaffeineDvbPlugin *p ); - QStringList getSources( bool all=false ); + TQStringList getSources( bool all=false ); bool canSource( ChannelDesc *chan ); int getPriority(); bool tuneDvb( ChannelDesc *chan, bool dvr=true ); void stopFrontend(); virtual void run(); - int goLive( ChannelDesc *chan, const QString &pipeName, int ringBufSize ); + int goLive( ChannelDesc *chan, const TQString &pipeName, int ringBufSize ); void preStopLive(); void stopLive( ChannelDesc *chan ); void stop(); void stopScan(); void setScanning( bool b ); bool hasVideo(); - bool doPause( const QString &name ); + bool doPause( const TQString &name ); bool timeShiftMode(); bool running() const; ChannelDesc getLiveChannel(); Transponder getCurrentTransponder(); unsigned long getCurrentFreq(); bool isTuned(); - bool startTimer( ChannelDesc *chan, QString path, int maxsize, RecTimer *t, QString filename ); + bool startTimer( ChannelDesc *chan, TQString path, int maxsize, RecTimer *t, TQString filename ); int canStartTimer( bool &live, ChannelDesc *chan ); int canStartBroadcast( bool &live, ChannelDesc *chan ); - bool startBroadcast( QPtrList<ChannelDesc> *list, Ts2Rtp *rtp ); + bool startBroadcast( TQPtrList<ChannelDesc> *list, Ts2Rtp *rtp ); void stopBroadcast(); bool hasRec(); bool hasBroadcast(); @@ -98,7 +99,7 @@ public : public slots: - bool checkStatus(); + bool checktqStatus(); void receivePlayDvb(); void recordEnded( DVBout *o, RecTimer *t, bool kill ); void receiveShifting( bool b ); @@ -106,7 +107,7 @@ public slots: protected: - void timerEvent( QTimerEvent* ev ); + void timerEvent( TQTimerEvent* ev ); private : @@ -115,8 +116,8 @@ private : void rotorCommand( int cmd, int n1=0, int n2=0, int n3=0 ); void gotoX( double azimuth ); double getAzimuth( double angle ); - double getSourceAngle( QString source ); - int getSatPos( const QString &src ); + double getSourceAngle( TQString source ); + int getSatPos( const TQString &src ); bool setPids( DVBout *o ); void removePids( DVBout *o ); void removeOut( DVBout *o ); @@ -124,25 +125,25 @@ private : void startReading(); bool openFe(); bool closeFe(); - void connectStatus( bool con ); + void connecttqStatus( bool con ); - QFile liveFile; + TQFile liveFile; bool timeShifting; - QPtrList<DVBout> out; + TQPtrList<DVBout> out; Device *dvbDevice; int waitPause; DVBout *delOut; Transponder currentTransponder; - QString frontendName; - QString dvrName; - QString demuxName; + TQString frontendName; + TQString dvrName; + TQString demuxName; int fdFrontend; int ndmx; int fdDvr, fdPipe; bool isRunning; - QTimer statusTimer; - QString timeShiftFileName; + TQTimer statusTimer; + TQString timeShiftFileName; DvbCam *cam; bool camProbed; int diseqcTwice; @@ -155,10 +156,10 @@ signals: void isBroadcasting(bool); void timerEnded(RecTimer*); - void errorMsg( QString ); - void snrStatus( int ); - void signalStatus( int ); - void lockStatus( bool ); + void errorMsg( TQString ); + void snrtqStatus( int ); + void signaltqStatus( int ); + void locktqStatus( bool ); void shifting( bool ); }; diff --git a/kaffeine/src/input/dvb/kevents.cpp b/kaffeine/src/input/dvb/kevents.cpp index c24d1c4..5284813 100644 --- a/kaffeine/src/input/dvb/kevents.cpp +++ b/kaffeine/src/input/dvb/kevents.cpp @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qlayout.h> -#include <qfile.h> -#include <qdir.h> -#include <qpopupmenu.h> -#include <qcursor.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqpopupmenu.h> +#include <tqcursor.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqtooltip.h> #include <klocale.h> #include <kiconloader.h> @@ -37,19 +37,19 @@ -EListViewItem::EListViewItem( QListView *parent, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc ) : KListViewItem( parent, chanName, eBegin, eDuration, eTitle ) +EListViewItem::EListViewItem( TQListView *tqparent, TQString chanName, TQString eBegin, TQString eDuration, TQString eTitle, EventDesc *desc ) : KListViewItem( tqparent, chanName, eBegin, eDuration, eTitle ) { event = desc; } -int EListViewItem::compare( QListViewItem *i, int col, bool ascending ) const +int EListViewItem::compare( TQListViewItem *i, int col, bool ascending ) const { EListViewItem *ei = (EListViewItem*)i; if ( col != 1 ) - return QListViewItem::compare( i, col, ascending ); + return TQListViewItem::compare( i, col, ascending ); if ( event->startDateTime<ei->event->startDateTime ) return -1; @@ -60,7 +60,7 @@ int EListViewItem::compare( QListViewItem *i, int col, bool ascending ) const -KEvents::KEvents( QPtrList<ChannelDesc> *chans, QPtrList<DvbStream> *d, EventTable *t, QWidget *parent, QSize size ) : QDialog( parent ) +KEvents::KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventTable *t, TQWidget *tqparent, TQSize size ) : TQDialog( tqparent ) { dvb = d; events = t; @@ -68,9 +68,9 @@ KEvents::KEvents( QPtrList<ChannelDesc> *chans, QPtrList<DvbStream> *d, EventTab setCaption( i18n("Electronic Program Guide") ); - QGridLayout *grid = new QGridLayout( this, 1, 1, 11, 6, "grid"); - QHBoxLayout *hbox = new QHBoxLayout( 0, 0, 6, "hbox" ); - QVBoxLayout *vbox = new QVBoxLayout( 0, 0, 6 , "vbox"); + TQGridLayout *grid = new TQGridLayout( this, 1, 1, 11, 6, "grid"); + TQHBoxLayout *hbox = new TQHBoxLayout( 0, 0, 6, "hbox" ); + TQVBoxLayout *vbox = new TQVBoxLayout( 0, 0, 6 , "vbox"); resetBtn = new KPushButton( i18n("Refresh"), this ); hbox->addWidget( resetBtn ); @@ -81,36 +81,36 @@ KEvents::KEvents( QPtrList<ChannelDesc> *chans, QPtrList<DvbStream> *d, EventTab currentChannelEpgBtn = new KPushButton( i18n("Current Channel"), this ); hbox->addWidget( currentChannelEpgBtn ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); hbox->addItem( spacer ); vbox->addLayout( hbox); - hbox = new QHBoxLayout(); + hbox = new TQHBoxLayout(); - searchBtn = new QToolButton( this ); + searchBtn = new TQToolButton( this ); searchBtn->setAutoRaise( true ); - QToolTip::add( searchBtn, i18n("Electronic Program Guide Search")); + TQToolTip::add( searchBtn, i18n("Electronic Program Guide Search")); hbox->addWidget( searchBtn ); - QLabel* filterLabel = new QLabel( i18n("Search") + ":", this ); + TQLabel* filterLabel = new TQLabel( i18n("Search") + ":", this ); hbox->addWidget( filterLabel ); searchLineEdit = new KLineEdit(this); hbox->addWidget( searchLineEdit ); - tvradioCb = new QCheckBox(i18n("TV "), this ); - QToolTip::add( tvradioCb, i18n("Search TV Channels only (omit Radio)")); + tvradioCb = new TQCheckBox(i18n("TV "), this ); + TQToolTip::add( tvradioCb, i18n("Search TV Channels only (omit Radio)")); tvradioCb->setChecked(true); hbox->addWidget( tvradioCb); - titleCb = new QCheckBox(i18n("Titles "), this ); - QToolTip::add( titleCb, i18n("Search Event Titles only (omit Description)")); + titleCb = new TQCheckBox(i18n("Titles "), this ); + TQToolTip::add( titleCb, i18n("Search Event Titles only (omit Description)")); titleCb->setChecked(true); hbox->addWidget( titleCb); - ftaCb = new QCheckBox(i18n("FTA "), this ); - QToolTip::add( ftaCb, i18n("Search Free to Air Channels only (omit PayTV)")); + ftaCb = new TQCheckBox(i18n("FTA "), this ); + TQToolTip::add( ftaCb, i18n("Search Free to Air Channels only (omit PayTV)")); ftaCb->setChecked(false); hbox->addWidget( ftaCb); @@ -129,7 +129,7 @@ KEvents::KEvents( QPtrList<ChannelDesc> *chans, QPtrList<DvbStream> *d, EventTab grid->addWidget( listView, 1, 0 ); grid->setRowStretch( 1, 4 ); - textBrow = new QTextBrowser( this ); + textBrow = new TQTextBrowser( this ); grid->addWidget( textBrow, 2, 0 ); grid->setRowStretch( 2, 2 ); @@ -140,21 +140,21 @@ KEvents::KEvents( QPtrList<ChannelDesc> *chans, QPtrList<DvbStream> *d, EventTab currentChannelEpgBtn->setGuiItem( KGuiItem(i18n("Current Channel"), icon->loadIconSet("date", KIcon::Small) ) ); searchBtn->setIconSet( icon->loadIconSet("locationbar_erase", KIcon::Small) ); - new EListViewItem( (QListView*)listView, "Une chaine", "99/99/99 99:99 9999", "99:99 99", "un titre de programme", 0 ); + new EListViewItem( (TQListView*)listView, "Une chaine", "99/99/99 99:99 9999", "99:99 99", "un titre de programme", 0 ); resize( size ); - connect( resetBtn , SIGNAL( pressed() ), this, SLOT( reset() ) ); - connect( allBtn , SIGNAL( clicked() ), this, SLOT( setScheduled() ) ); - connect( currentNextBtn , SIGNAL( clicked() ), this, SLOT( setCurrentNext() ) ); - connect( currentChannelEpgBtn, SIGNAL( clicked() ), this, SLOT( setCurrentChannelEpg() ) ); - connect( searchBtn, SIGNAL( clicked() ), this, SLOT(resetSearch()) ); - connect( searchLineEdit, SIGNAL( returnPressed() ), this, SLOT( epgSearch() ) ); + connect( resetBtn , TQT_SIGNAL( pressed() ), this, TQT_SLOT( reset() ) ); + connect( allBtn , TQT_SIGNAL( clicked() ), this, TQT_SLOT( setScheduled() ) ); + connect( currentNextBtn , TQT_SIGNAL( clicked() ), this, TQT_SLOT( setCurrentNext() ) ); + connect( currentChannelEpgBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setCurrentChannelEpg() ) ); + connect( searchBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT(resetSearch()) ); + connect( searchLineEdit, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( epgSearch() ) ); - connect( listView, SIGNAL( mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ), - this, SLOT(mouseClickedSlot(int,QListViewItem*,const QPoint&,int)) ); + connect( listView, TQT_SIGNAL( mouseButtonClicked(int,TQListViewItem*,const TQPoint&,int) ), + this, TQT_SLOT(mouseClickedSlot(int,TQListViewItem*,const TQPoint&,int)) ); - connect( listView, SIGNAL(doubleClicked(QListViewItem*,const QPoint &,int)), - this, SLOT(zap(QListViewItem*,const QPoint &,int)) ); + connect( listView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)), + this, TQT_SLOT(zap(TQListViewItem*,const TQPoint &,int)) ); setMode( 1 ); delete icon; @@ -165,7 +165,7 @@ void KEvents::resetSearch() searchLineEdit->clear(); } -void KEvents::checkEpgSearch(QString searchword) +void KEvents::checkEpgSearch(TQString searchword) { int i, j, k, m, n, l; EventSource *esrc; @@ -174,7 +174,7 @@ void KEvents::checkEpgSearch(QString searchword) EventDesc *desc; EListViewItem *itt=0; ChannelDesc *ch; - QString s, begin, duration, title; + TQString s, begin, duration, title; bool found; for( k=0; k<events->getNSource(); k++ ) { @@ -203,11 +203,11 @@ void KEvents::checkEpgSearch(QString searchword) break; found=false; - if(desc->title.upper().find(searchword.upper())!=-1) + if(desc->title.upper().tqfind(searchword.upper())!=-1) found=true; if(!desc->subtitle.isEmpty()) { - if(desc->subtitle.upper().find(searchword.upper())!=-1) + if(desc->subtitle.upper().tqfind(searchword.upper())!=-1) found=true; } @@ -216,7 +216,7 @@ void KEvents::checkEpgSearch(QString searchword) for ( l=0; l<(int)desc->extEvents.count(); l++ ) { s = *desc->extEvents.at(l); if(!s.isEmpty()) { - if(s.upper().find(searchword.upper())!=-1) { + if(s.upper().tqfind(searchword.upper())!=-1) { found=true; s=""; break; @@ -228,7 +228,7 @@ void KEvents::checkEpgSearch(QString searchword) for ( l=0; l<(int)desc->shortEvents.count(); l++ ) { s = desc->shortEvents.at(l)->name; if(!s.isEmpty()) { - if(s.upper().find(searchword.upper())!=-1) { + if(s.upper().tqfind(searchword.upper())!=-1) { found=true; s=""; break; @@ -236,7 +236,7 @@ void KEvents::checkEpgSearch(QString searchword) } s = desc->shortEvents.at(l)->text; if(!s.isEmpty()) { - if(s.upper().find(searchword.upper())!=-1) { + if(s.upper().tqfind(searchword.upper())!=-1) { found=true; s=""; break; @@ -252,7 +252,7 @@ void KEvents::checkEpgSearch(QString searchword) duration = desc->duration.toString("hh:mm"); title = desc->title; - itt = new EListViewItem( (QListView*)listView, ch->name, begin, duration, title, desc ); + itt = new EListViewItem( (TQListView*)listView, ch->name, begin, duration, title, desc ); if ( !ch->pix.isNull() ) itt->setPixmap( 0, ch->pix ); @@ -267,7 +267,7 @@ void KEvents::checkEpgSearch(QString searchword) void KEvents::epgSearch() { - QString text = searchLineEdit->text(); + TQString text = searchLineEdit->text(); if (text.stripWhiteSpace().isEmpty()) return; listView->clear(); @@ -289,23 +289,23 @@ void KEvents::setCurrentChannelEpg() } -void KEvents::zap( QListViewItem* it, const QPoint &p, int col ) +void KEvents::zap( TQListViewItem* it, const TQPoint &p, int col ) { - QPoint pt=p; + TQPoint pt=p; int c=col; c++; - if ( it->text(0) != QString::null ) + if ( it->text(0) != TQString() ) emit zapTo( it->text(0) ); } -void KEvents::mouseClickedSlot( int btn, QListViewItem *it, const QPoint &p, int c ) +void KEvents::mouseClickedSlot( int btn, TQListViewItem *it, const TQPoint &p, int c ) { int i=c; - QPoint pt=p; - QString s; + TQPoint pt=p; + TQString s; if ( !it ) return; @@ -313,14 +313,14 @@ void KEvents::mouseClickedSlot( int btn, QListViewItem *it, const QPoint &p, int switch ( btn ) { case Qt::RightButton : { - QPopupMenu *pop = new QPopupMenu(); + TQPopupMenu *pop = new TQPopupMenu(); pop->insertItem( i18n("View All Programs"), 1 ); pop->insertSeparator(); pop->insertItem( i18n("Add to Timers"), 2 ); if ( ei->event->running==4 ) pop->setItemEnabled( 2, false ); i = 0; - i = pop->exec( QCursor::pos() ); + i = pop->exec( TQCursor::pos() ); switch ( i ) { case 0 : break; @@ -381,7 +381,7 @@ void KEvents::setCurrentNext() void KEvents::setScheduled() { - QListViewItem *it = listView->currentItem(); + TQListViewItem *it = listView->currentItem(); if ( !it ) return; setMode( 2, it->text(0) ); @@ -389,7 +389,7 @@ void KEvents::setScheduled() -void KEvents::setMode( int m, QString name ) +void KEvents::setMode( int m, TQString name ) { int i; @@ -430,7 +430,7 @@ void KEvents::checkNewEvent() EventDesc *desc; EListViewItem *itt=0; ChannelDesc *ch; - QString s, t, channel, begin, duration, title; + TQString s, t, channel, begin, duration, title; if ( mode==2 ) { if ( !chan ) @@ -447,7 +447,7 @@ void KEvents::checkNewEvent() title = desc->title; if ( title.isEmpty() ) continue; - itt = new EListViewItem( (QListView*)listView, chan->name, begin, duration, title, desc ); + itt = new EListViewItem( (TQListView*)listView, chan->name, begin, duration, title, desc ); if ( !chan->pix.isNull() ) itt->setPixmap( 0, chan->pix ); } @@ -462,7 +462,7 @@ void KEvents::checkNewEvent() title = desc->title; if ( title.isEmpty() ) continue; - itt = new EListViewItem( (QListView*)listView, ch->name, begin, duration, title, desc ); + itt = new EListViewItem( (TQListView*)listView, ch->name, begin, duration, title, desc ); if ( !ch->pix.isNull() ) itt->setPixmap( 0, ch->pix ); } diff --git a/kaffeine/src/input/dvb/kevents.h b/kaffeine/src/input/dvb/kevents.h index 3779452..20828f5 100644 --- a/kaffeine/src/input/dvb/kevents.h +++ b/kaffeine/src/input/dvb/kevents.h @@ -21,10 +21,10 @@ #ifndef KEVENTS_H #define KEVENTS_H -#include <qtimer.h> -#include <qdialog.h> -#include <qdatetime.h> -#include <qtextbrowser.h> +#include <tqtimer.h> +#include <tqdialog.h> +#include <tqdatetime.h> +#include <tqtextbrowser.h> #include <klistview.h> #include <kpushbutton.h> @@ -41,47 +41,48 @@ class EListViewItem : public KListViewItem public: - EListViewItem( QListView *parent, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc ); - virtual int compare( QListViewItem *i, int col, bool ascending ) const; + EListViewItem( TQListView *tqparent, TQString chanName, TQString eBegin, TQString eDuration, TQString eTitle, EventDesc *desc ); + virtual int compare( TQListViewItem *i, int col, bool ascending ) const; EventDesc *event; }; -class KEvents : public QDialog +class KEvents : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KEvents( QPtrList<ChannelDesc> *chans, QPtrList<DvbStream> *d, EventTable *t, QWidget *parent, QSize size ); + KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventTable *t, TQWidget *tqparent, TQSize size ); ~KEvents(); private slots: - void mouseClickedSlot( int btn, QListViewItem *it, const QPoint &p, int c ); + void mouseClickedSlot( int btn, TQListViewItem *it, const TQPoint &p, int c ); void reset(); - void setMode( int m, QString name="" ); + void setMode( int m, TQString name="" ); void setScheduled(); void setCurrentNext(); void setCurrentChannelEpg(); void epgSearch(); void resetSearch(); - void zap( QListViewItem* it, const QPoint &p, int col ); + void zap( TQListViewItem* it, const TQPoint &p, int col ); private: - void checkEpgSearch(QString searchword); + void checkEpgSearch(TQString searchword); void checkNewEvent(); - QPtrList<DvbStream> *dvb; + TQPtrList<DvbStream> *dvb; EventTable *events; KListView *listView; KPushButton *resetBtn, *currentNextBtn, *allBtn, *currentChannelEpgBtn; - QToolButton *searchBtn; - QCheckBox *titleCb,*tvradioCb,*ftaCb; - QPtrList<ChannelDesc> *channels; - QTextBrowser *textBrow; + TQToolButton *searchBtn; + TQCheckBox *titleCb,*tvradioCb,*ftaCb; + TQPtrList<ChannelDesc> *channels; + TQTextBrowser *textBrow; int mode; ChannelDesc *chan; @@ -91,8 +92,8 @@ protected: signals: - void addTimer( QString channel, QString name, QDateTime begin, QTime duration ); - void zapTo( const QString &channel ); + void addTimer( TQString channel, TQString name, TQDateTime begin, TQTime duration ); + void zapTo( const TQString &channel ); }; #endif /* KEVENTS_H */ diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp index 092cfb3..350566a 100644 --- a/kaffeine/src/input/dvb/kgradprogress.cpp +++ b/kaffeine/src/input/dvb/kgradprogress.cpp @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qpainter.h> -#include <qlabel.h> +#include <tqpainter.h> +#include <tqlabel.h> #include "kgradprogress.h" -KGradProgress::KGradProgress( QWidget *parent ) : QLabel( parent ) +KGradProgress::KGradProgress( TQWidget *tqparent ) : TQLabel( tqparent ) { barPix = 0; - colorUp = QColor( 0, 255, 0 ); - colorDown = QColor( 255, 0, 0 ); + colorUp = TQColor( 0, 255, 0 ); + colorDown = TQColor( 255, 0, 0 ); current = 0; - setFrameStyle( QFrame::Box | QFrame::Plain ); + setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth(1); setMidLineWidth(0); - setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred ); + tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); } @@ -43,7 +43,7 @@ void KGradProgress::setProgress( int progress ) { current = progress; draw(); - repaint(false); + tqrepaint(false); } @@ -56,15 +56,15 @@ void KGradProgress::draw() int h = height() - ( 2*off ); int w = width() - ( 2*off ); int per; - QString s; - QFont f; + TQString s; + TQFont f; s = s.setNum( current )+"%"; per = current*w/100; if ( barPix ) delete barPix; - barPix = new QPixmap( w, h, -1, QPixmap::BestOptim ); - QPainter p( barPix ); + barPix = new TQPixmap( w, h, -1, TQPixmap::BestOptim ); + TQPainter p( barPix ); p.fillRect( 0, 0, w, h, paletteBackgroundColor() ); for ( j=0; j<per; j++ ) { @@ -76,29 +76,29 @@ void KGradProgress::draw() a = 255-(2*(j-w/2)*255/w); b = 255; } - p.setPen( QColor( a, b, 0 ) ); + p.setPen( TQColor( a, b, 0 ) ); for ( i=0; i<h; i++ ) p.drawPoint( j+off, i+off ); } f = font(); f.setPointSize( int(h/1.2) ); p.setFont( f ); - p.setPen( QColor( 0, 0, 0 ) ); + p.setPen( TQColor( 0, 0, 0 ) ); p.drawText( w/2, (h/2)+(f.pointSize()/2), s ); p.end(); } -void KGradProgress::resizeEvent( QResizeEvent *e ) +void KGradProgress::resizeEvent( TQResizeEvent *e ) { - QSize s=e->size(); + TQSize s=e->size(); draw(); } -void KGradProgress::paintEvent(QPaintEvent *event) +void KGradProgress::paintEvent(TQPaintEvent *event) { int x, y, w, h; @@ -106,24 +106,24 @@ void KGradProgress::paintEvent(QPaintEvent *event) w = width() - (2*x); h = height() - (2*y); - QLabel::paintEvent( event ); + TQLabel::paintEvent( event ); bitBlt( this, x, y, barPix, 0, 0, w, h, CopyROP ); } -QSize KGradProgress::sizeHint() +TQSize KGradProgress::tqsizeHint() { - QLabel lab( "This is a progress bar.", 0 ); - return QSize( lab.width(), int(font().pointSize()*1.2) ); + TQLabel lab( "This is a progress bar.", 0 ); + return TQSize( lab.width(), int(font().pointSize()*1.2) ); } -QSizePolicy KGradProgress::sizePolicy() +TQSizePolicy KGradProgress::sizePolicy() { - return QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred ); + return TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); } diff --git a/kaffeine/src/input/dvb/kgradprogress.h b/kaffeine/src/input/dvb/kgradprogress.h index a55591e..f2365d9 100644 --- a/kaffeine/src/input/dvb/kgradprogress.h +++ b/kaffeine/src/input/dvb/kgradprogress.h @@ -21,23 +21,24 @@ #ifndef KGRADPROGRESS_H #define KGRADPROGRESS_H -#include <qlabel.h> -#include <qpixmap.h> +#include <tqlabel.h> +#include <tqpixmap.h> -class KGradProgress : public QLabel +class KGradProgress : public TQLabel { Q_OBJECT + TQ_OBJECT public: - KGradProgress( QWidget *parent ); + KGradProgress( TQWidget *tqparent ); ~KGradProgress(); - virtual void paintEvent(QPaintEvent *event); - virtual QSize sizeHint(); - virtual QSizePolicy sizePolicy(); + virtual void paintEvent(TQPaintEvent *event); + virtual TQSize tqsizeHint(); + virtual TQSizePolicy sizePolicy(); public slots: @@ -45,14 +46,14 @@ public slots: protected: - virtual void resizeEvent( QResizeEvent *e ); + virtual void resizeEvent( TQResizeEvent *e ); private: void draw(); - QPixmap *barPix; - QColor colorDown, colorUp; + TQPixmap *barPix; + TQColor colorDown, colorUp; int current; }; diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp index 7e14036..a9a59a1 100644 --- a/kaffeine/src/input/dvb/krecord.cpp +++ b/kaffeine/src/input/dvb/krecord.cpp @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qlayout.h> -#include <qlabel.h> -#include <qfile.h> -#include <qdir.h> -#include <qframe.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqframe.h> #include <klocale.h> #include <kiconloader.h> @@ -32,13 +32,13 @@ -KRecord::KRecord( QStringList chanList, QPtrList<RecTimer> *t, QWidget *parent, QSize size ) : QDialog( parent ) +KRecord::KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *tqparent, TQSize size ) : TQDialog( tqparent ) { timers = t; channelsList = chanList; - QVBoxLayout *vb = new QVBoxLayout( 0, 0, 6 ); - QLabel *lab = new QLabel( i18n("Timers list:"), this ); + TQVBoxLayout *vb = new TQVBoxLayout( 0, 0, 6 ); + TQLabel *lab = new TQLabel( i18n("Timers list:"), this ); vb->addWidget( lab ); list = new KListView( this ); @@ -50,7 +50,7 @@ KRecord::KRecord( QStringList chanList, QPtrList<RecTimer> *t, QWidget *parent, list->setResizePolicy( KListView::AutoOneFit ); list->setAllColumnsShowFocus( true ); list->setFullWidth( true ); - QListViewItem * item = new QListViewItem( list, 0 ); + TQListViewItem * item = new TQListViewItem( list, 0 ); item->setText( 0, "00" ); item->setText( 1, "Un nom assez long mais pas trop" ); item->setText( 2, "Une chaine du meme calibre" ); @@ -58,30 +58,30 @@ KRecord::KRecord( QStringList chanList, QPtrList<RecTimer> *t, QWidget *parent, item->setText( 4, "00:00mm" ); vb->addWidget( list ); - QVBoxLayout *vb1 = new QVBoxLayout( 0, 0, 6 ); + TQVBoxLayout *vb1 = new TQVBoxLayout( 0, 0, 6 ); newBtn = new KPushButton(i18n("New"), this); vb1->addWidget( newBtn ); editBtn = new KPushButton(i18n("Edit"), this); vb1->addWidget( editBtn ); deleteBtn = new KPushButton(i18n("Delete"), this); vb1->addWidget( deleteBtn ); - vb1->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) ); + vb1->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); - QHBoxLayout *hb = new QHBoxLayout( 0, 0, 6 ); + TQHBoxLayout *hb = new TQHBoxLayout( 0, 0, 6 ); hb->addLayout( vb ); hb->addLayout( vb1 ); - QHBoxLayout *hb1 = new QHBoxLayout( 0 ); - hb1->addItem( new QSpacerItem( 20, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum ) ); + TQHBoxLayout *hb1 = new TQHBoxLayout( 0 ); + hb1->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) ); okBtn = new KPushButton(i18n("Close"), this); hb1->addWidget( okBtn ); - QVBoxLayout *vb2 = new QVBoxLayout( this, 6, 6 ); + TQVBoxLayout *vb2 = new TQVBoxLayout( this, 6, 6 ); vb2->addLayout( hb ); - QFrame *line = new QFrame( this, "line1" ); - line->setFrameStyle( QFrame::HLine ); - line->setFrameShadow( QFrame::Sunken ); - line->setFrameShape( QFrame::HLine ); + TQFrame *line = new TQFrame( this, "line1" ); + line->setFrameStyle( TQFrame::HLine ); + line->setFrameShadow( TQFrame::Sunken ); + line->setFrameShape( TQFrame::HLine ); vb2->addWidget( line ); vb2->addLayout( hb1 ); @@ -97,10 +97,10 @@ KRecord::KRecord( QStringList chanList, QPtrList<RecTimer> *t, QWidget *parent, setCaption( i18n("Timers") ); - connect( okBtn, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( newBtn, SIGNAL(clicked()), this, SLOT(newTimer()) ); - connect( deleteBtn, SIGNAL(clicked()), this, SLOT(deleteTimer()) ); - connect( editBtn, SIGNAL(clicked()), this, SLOT(editTimer()) ); + connect( okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTimer()) ); + connect( deleteBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteTimer()) ); + connect( editBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editTimer()) ); refresh(); resize( size ); @@ -111,10 +111,10 @@ KRecord::KRecord( QStringList chanList, QPtrList<RecTimer> *t, QWidget *parent, void KRecord::refresh() { - QListViewItem *after, *itt; + TQListViewItem *after, *itt; RecTimer *ti; int i; - QString s; + TQString s; list->clear(); list->setSorting( -1 ); @@ -125,7 +125,7 @@ void KRecord::refresh() else s = ""; s = s+ti->name;*/ s = ti->name; - itt = new KListViewItem( (QListView*)list, "", s, ti->channel, KGlobal::locale()->formatDateTime( ti->begin ), ti->duration.toString("hh:mm") ); + itt = new KListViewItem( (TQListView*)list, "", s, ti->channel, KGlobal::locale()->formatDateTime( ti->begin ), ti->duration.toString("hh:mm") ); if ( ti->mode ) itt->setPixmap( 0, yesRepeat ); if ( ti->running ) @@ -139,7 +139,7 @@ void KRecord::refresh() void KRecord::newTimer() { - QListViewItem *itt, *after; + TQListViewItem *itt, *after; RecTimer *t = new RecTimer(); t->running = 0; @@ -150,7 +150,7 @@ void KRecord::newTimer() if ( ret==KTimerEditor::Accepted ) { *t = dlg.timer; after = where( t, true ); - itt = new KListViewItem( (QListView*)list, "", t->name, t->channel, KGlobal::locale()->formatDateTime( t->begin ), t->duration.toString("hh:mm") ); + itt = new KListViewItem( (TQListView*)list, "", t->name, t->channel, KGlobal::locale()->formatDateTime( t->begin ), t->duration.toString("hh:mm") ); if ( t->mode ) itt->setPixmap( 0, yesRepeat ); if ( t->running ) @@ -165,7 +165,7 @@ void KRecord::newTimer() void KRecord::editTimer() { - QListViewItem *it, *after; + TQListViewItem *it, *after; int i=0; RecTimer *t, *tn=0; @@ -195,7 +195,7 @@ void KRecord::editTimer() for ( i=0; i<(int)timers->count(); i++ ) { if ( timers->at(i)==tn ) { if ( tn->running ) { - int ms = tn->begin.time().secsTo( QTime::currentTime() ); + int ms = tn->begin.time().secsTo( TQTime::currentTime() ); ms = ((dlg.timer.duration.hour()*3600+dlg.timer.duration.minute()*60)-ms)*1000; if ( ms<2000 ) ms = 0; @@ -221,7 +221,7 @@ void KRecord::editTimer() void KRecord::deleteTimer() { - QListViewItem *it; + TQListViewItem *it; int i=0, ret; KIconLoader *icon = new KIconLoader(); @@ -250,9 +250,9 @@ void KRecord::deleteTimer() -QListViewItem* KRecord::where( RecTimer *rt, bool add ) +TQListViewItem* KRecord::where( RecTimer *rt, bool add ) { - QListViewItem *it, *ret=0; + TQListViewItem *it, *ret=0; int i, r=0; RecTimer *t; diff --git a/kaffeine/src/input/dvb/krecord.h b/kaffeine/src/input/dvb/krecord.h index 6a9f1f3..5ba399e 100644 --- a/kaffeine/src/input/dvb/krecord.h +++ b/kaffeine/src/input/dvb/krecord.h @@ -21,8 +21,8 @@ #ifndef KRECORD_H #define KRECORD_H -#include <qdialog.h> -#include <qpixmap.h> +#include <tqdialog.h> +#include <tqpixmap.h> #include <kpushbutton.h> #include <klistview.h> @@ -32,16 +32,17 @@ -class KRecord : public QDialog +class KRecord : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KRecord( QStringList chanList, QPtrList<RecTimer> *t, QWidget *parent, QSize size ); + KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *tqparent, TQSize size ); ~KRecord(); - QStringList channelsList; + TQStringList channelsList; protected slots: @@ -53,12 +54,12 @@ protected slots: private: - QListViewItem* where( RecTimer *rt, bool add=false ); + TQListViewItem* where( RecTimer *rt, bool add=false ); KPushButton *newBtn, *editBtn, *deleteBtn, *okBtn; KListView *list; - QPtrList<RecTimer> *timers; - QPixmap isRecording, yesRepeat; + TQPtrList<RecTimer> *timers; + TQPixmap isRecording, yesRepeat; signals: diff --git a/kaffeine/src/input/dvb/ktimereditor.cpp b/kaffeine/src/input/dvb/ktimereditor.cpp index 63993c0..c48cc49 100644 --- a/kaffeine/src/input/dvb/ktimereditor.cpp +++ b/kaffeine/src/input/dvb/ktimereditor.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klocale.h> #include <kiconloader.h> @@ -29,64 +29,64 @@ -KTimerEditor::KTimerEditor( bool newone, QStringList &chanList, RecTimer t, QWidget *parent ) : QDialog( parent ) +KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQWidget *tqparent ) : TQDialog( tqparent ) { int i; - QGridLayout *grid = new QGridLayout( 0, 1, 1, 11, 6 ); - QLabel *lab = new QLabel( i18n("Name:"), this ); + TQGridLayout *grid = new TQGridLayout( 0, 1, 1, 11, 6 ); + TQLabel *lab = new TQLabel( i18n("Name:"), this ); grid->addWidget( lab, 0, 0 ); - nameLe = new QLineEdit( this ); + nameLe = new TQLineEdit( this ); grid->addWidget( nameLe, 0, 1 ); - lab = new QLabel( i18n("Channel:"), this ); + lab = new TQLabel( i18n("Channel:"), this ); grid->addWidget( lab, 1, 0 ); - channelComb = new QComboBox( this ); + channelComb = new TQComboBox( this ); grid->addWidget( channelComb, 1, 1 ); - lab = new QLabel( i18n("Begin:"), this ); + lab = new TQLabel( i18n("Begin:"), this ); grid->addWidget( lab, 2, 0 ); - begin = new QDateTimeEdit( this ); + begin = new TQDateTimeEdit( this ); grid->addWidget( begin, 2, 1 ); - lab = new QLabel( i18n("Duration:"), this ); + lab = new TQLabel( i18n("Duration:"), this ); grid->addWidget( lab, 3, 0 ); - duration = new QTimeEdit( this ); + duration = new TQTimeEdit( this ); grid->addWidget( duration, 3, 1 ); - lab = new QLabel( i18n("End:"), this ); + lab = new TQLabel( i18n("End:"), this ); grid->addWidget( lab, 4, 0 ); - end = new QDateTimeEdit( this ); + end = new TQDateTimeEdit( this ); grid->addWidget( end, 4, 1 ); repeatBtn = new KPushButton( this ); grid->addWidget( repeatBtn, 5, 0 ); - repeatLab = new QLabel( this ); + repeatLab = new TQLabel( this ); grid->addWidget( repeatLab, 5, 1 ); - QFrame *line = new QFrame( this, "line1" ); - line->setFrameStyle( QFrame::HLine ); - line->setFrameShadow( QFrame::Sunken ); - line->setFrameShape( QFrame::HLine ); + TQFrame *line = new TQFrame( this, "line1" ); + line->setFrameStyle( TQFrame::HLine ); + line->setFrameShadow( TQFrame::Sunken ); + line->setFrameShape( TQFrame::HLine ); - QHBoxLayout *hb = new QHBoxLayout( 0, 0, 6 ); + TQHBoxLayout *hb = new TQHBoxLayout( 0, 0, 6 ); cancelBtn = new KPushButton( this ); hb->addWidget( cancelBtn ); - hb->addItem( new QSpacerItem( 20, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum ) ); + hb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) ); okBtn = new KPushButton( this ); okBtn->setDefault( true ); hb->addWidget( okBtn ); - QVBoxLayout *vb = new QVBoxLayout( this, 6, 6 ); + TQVBoxLayout *vb = new TQVBoxLayout( this, 6, 6 ); vb->addLayout( grid ); - vb->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) ); + vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); vb->addWidget( line ); vb->addLayout( hb ); timer = t; - //begin->dateEdit()->setOrder( QDateEdit::DMY ); + //begin->dateEdit()->setOrder( TQDateEdit::DMY ); channelComb->insertStringList( chanList ); if ( newone ) { - begin->setDateTime( QDateTime::currentDateTime() ); - duration->setTime( QTime(2,0,0) ); + begin->setDateTime( TQDateTime::tqcurrentDateTime() ); + duration->setTime( TQTime(2,0,0) ); } else { nameLe->setText( timer.name ); @@ -120,21 +120,21 @@ KTimerEditor::KTimerEditor( bool newone, QStringList &chanList, RecTimer t, QWid setCaption( i18n("Timer Editor") ); - connect( okBtn, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancelBtn, SIGNAL(clicked()), this, SLOT(reject()) ); - connect( repeatBtn, SIGNAL(clicked()), this, SLOT(setRepeat()) ); - connect( begin, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(setMaxEnd(const QDateTime&)) ); - connect( end, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(setDuration(const QDateTime&)) ); - connect( duration, SIGNAL(valueChanged(const QTime&)), this, SLOT(setEnd(const QTime&)) ); + connect( okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( repeatBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRepeat()) ); + connect( begin, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(setMaxEnd(const TQDateTime&)) ); + connect( end, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(setDuration(const TQDateTime&)) ); + connect( duration, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(setEnd(const TQTime&)) ); setMaxEnd( begin->dateTime() ); delete icon; } -void KTimerEditor::setMaxEnd( const QDateTime &dt ) +void KTimerEditor::setMaxEnd( const TQDateTime &dt ) { - QDateTime max = dt.addSecs( 23*3600+59*60+59 ); + TQDateTime max = dt.addSecs( 23*3600+59*60+59 ); end->dateEdit()->setMinValue( dt.date() ); end->dateEdit()->setMaxValue( max.date() ); setEnd( duration->time() ); @@ -142,20 +142,20 @@ void KTimerEditor::setMaxEnd( const QDateTime &dt ) -void KTimerEditor::setDuration( const QDateTime &dt ) +void KTimerEditor::setDuration( const TQDateTime &dt ) { - disconnect( duration, SIGNAL(valueChanged(const QTime&)), this, SLOT(setEnd(const QTime&)) ); - duration->setTime( QTime().addSecs( begin->dateTime().secsTo( dt ) ) ); - connect( duration, SIGNAL(valueChanged(const QTime&)), this, SLOT(setEnd(const QTime&)) ); + disconnect( duration, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(setEnd(const TQTime&)) ); + duration->setTime( TQTime().addSecs( begin->dateTime().secsTo( dt ) ) ); + connect( duration, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(setEnd(const TQTime&)) ); } -void KTimerEditor::setEnd( const QTime &t ) +void KTimerEditor::setEnd( const TQTime &t ) { - disconnect( end, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(setDuration(const QDateTime&)) ); - end->setDateTime( begin->dateTime().addSecs( QTime().secsTo( t ) ) ); - connect( end, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(setDuration(const QDateTime&)) ); + disconnect( end, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(setDuration(const TQDateTime&)) ); + end->setDateTime( begin->dateTime().addSecs( TQTime().secsTo( t ) ) ); + connect( end, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(setDuration(const TQDateTime&)) ); } @@ -185,22 +185,22 @@ void KTimerEditor::accept() return; } - if ( nameLe->text().stripWhiteSpace().contains("/") ) + if ( nameLe->text().stripWhiteSpace().tqcontains("/") ) goto stop; - if ( nameLe->text().stripWhiteSpace().contains(">") ) + if ( nameLe->text().stripWhiteSpace().tqcontains(">") ) goto stop; - if ( nameLe->text().stripWhiteSpace().contains("<") ) + if ( nameLe->text().stripWhiteSpace().tqcontains("<") ) goto stop; - if ( nameLe->text().stripWhiteSpace().contains("\\") ) + if ( nameLe->text().stripWhiteSpace().tqcontains("\\") ) goto stop; - if ( nameLe->text().stripWhiteSpace().contains(":") ) + if ( nameLe->text().stripWhiteSpace().tqcontains(":") ) goto stop; - if ( nameLe->text().stripWhiteSpace().contains("\"") ) + if ( nameLe->text().stripWhiteSpace().tqcontains("\"") ) goto stop; - if ( nameLe->text().stripWhiteSpace().contains("|") ) + if ( nameLe->text().stripWhiteSpace().tqcontains("|") ) goto stop; - if ( duration->time()<QTime(0,1) ) { + if ( duration->time()<TQTime(0,1) ) { KMessageBox::sorry( this, i18n("Duration must be at least 1 minute!") ); duration->setFocus(); return; diff --git a/kaffeine/src/input/dvb/ktimereditor.h b/kaffeine/src/input/dvb/ktimereditor.h index dfe1683..774a982 100644 --- a/kaffeine/src/input/dvb/ktimereditor.h +++ b/kaffeine/src/input/dvb/ktimereditor.h @@ -21,11 +21,11 @@ #ifndef KTIMEREDITOR_H #define KTIMEREDITOR_H -#include <qdialog.h> -#include <qcombobox.h> -#include <qlineedit.h> -#include <qdatetimeedit.h> -#include <qlabel.h> +#include <tqdialog.h> +#include <tqcombobox.h> +#include <tqlineedit.h> +#include <tqdatetimeedit.h> +#include <tqlabel.h> #include <kpushbutton.h> @@ -35,21 +35,22 @@ -class KTimerEditor : public QDialog +class KTimerEditor : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KTimerEditor( bool newone, QStringList &chanList, RecTimer t, QWidget *parent ); + KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQWidget *tqparent ); ~KTimerEditor(); KPushButton *okBtn, *cancelBtn, *repeatBtn; - QLabel *repeatLab; - QLineEdit *nameLe; - QComboBox *channelComb; - QDateTimeEdit *begin, *end; - QTimeEdit *duration; + TQLabel *repeatLab; + TQLineEdit *nameLe; + TQComboBox *channelComb; + TQDateTimeEdit *begin, *end; + TQTimeEdit *duration; RecTimer timer; public slots: @@ -59,9 +60,9 @@ public slots: protected slots: virtual void accept(); - void setDuration( const QDateTime &dt ); - void setEnd( const QTime &t ); - void setMaxEnd( const QDateTime &dt ); + void setDuration( const TQDateTime &dt ); + void setEnd( const TQTime &t ); + void setMaxEnd( const TQDateTime &dt ); }; #endif /* KTIMEREDITOR_H */ diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp index afa5e55..beb5645 100644 --- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp +++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp @@ -23,8 +23,8 @@ #include <sys/time.h> #include <sys/resource.h> -#include <qdatetime.h> -#include <qfile.h> +#include <tqdatetime.h> +#include <tqfile.h> #include <klocale.h> #include <kstandarddirs.h> @@ -69,19 +69,19 @@ EventSid::EventSid( int s ) EventSid::~EventSid() { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); events.clear(); } void EventSid::remove( EventDesc *d ) { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); events.remove( d ); } EventDesc *EventSid::getEventDesc( int n ) { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); return events.at(n); } @@ -96,13 +96,13 @@ EventTsid::EventTsid( int n, int t ) EventTsid::~EventTsid() { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); sidList.clear(); } EventSid *EventTsid::getNEventSid( int n ) { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); return sidList.at( n ); } @@ -110,7 +110,7 @@ EventSid *EventTsid::getEventSid( int sid ) { int i; - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); for ( i=0; i<(int)sidList.count(); i++ ) { if ( sidList.at(i)->getSid()==sid ) return sidList.at(i); @@ -140,7 +140,7 @@ EventDesc *EventTsid::getEventDesc( int sid, int n ) -EventSource::EventSource( QString src ) +EventSource::EventSource( TQString src ) { source = src; tsidList.setAutoDelete( true ); @@ -148,13 +148,13 @@ EventSource::EventSource( QString src ) EventSource::~EventSource() { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); tsidList.clear(); } EventTsid *EventSource::getNEventTsid( int n ) { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); return tsidList.at( n ); } @@ -206,14 +206,14 @@ EventDesc *EventSource::getEventDesc( int nid, int tsid, int sid, int n ) EventTable::EventTable() { srcList.setAutoDelete( true ); - connect ( &cleanTimer, SIGNAL(timeout()), this, SLOT(setClean()) ); + connect ( &cleanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setClean()) ); cleanTimer.start( 10000 ); epgLoaded = false; } EventTable::~EventTable() { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); srcList.clear(); } @@ -222,17 +222,17 @@ void EventTable::saveEpg() EventSource *esrc; EventTsid *et; EventSid *es; - QPtrList<EventDesc> *esEvents; + TQPtrList<EventDesc> *esEvents; EventDesc *desc; int i, k, j, m, n; - QCString c; + TQCString c; int count=0; unsigned char sync=0xff; - QTime t1=QTime::currentTime(); + TQTime t1=TQTime::currentTime(); - QFile f( locateLocal("appdata", "dvbepg.data" ) ); + TQFile f( locateLocal("appdata", "dvbepg.data" ) ); if ( f.open(IO_WriteOnly|IO_Truncate) ) { - QDataStream dt( &f ); + TQDataStream dt( &f ); for( i=0; i<getNSource(); i++ ) { if ( !(esrc=getNEventSource( i )) ) continue; @@ -283,7 +283,7 @@ void EventTable::saveEpg() } } f.close(); - fprintf( stderr, "Saved epg data : %d events (%d msecs)\n", count, t1.msecsTo(QTime::currentTime()) ); + fprintf( stderr, "Saved epg data : %d events (%d msecs)\n", count, t1.msecsTo(TQTime::currentTime()) ); } } @@ -297,16 +297,16 @@ void EventTable::loadEpg() char buf[EPGBUFSIZE]; int num=0; unsigned char sync; - QDateTime cur=QDateTime::currentDateTime(); - QTime t1=QTime::currentTime(); + TQDateTime cur=TQDateTime::tqcurrentDateTime(); + TQTime t1=TQTime::currentTime(); if ( epgLoaded ) return; epgLoaded = true; - QFile f( locateLocal("appdata", "dvbepg.data" ) ); + TQFile f( locateLocal("appdata", "dvbepg.data" ) ); if ( f.open(IO_ReadOnly) ) { - QDataStream dt( &f ); + TQDataStream dt( &f ); while (!dt.eof() ) { dt >> sync; if ( sync!=0xff ) { @@ -318,7 +318,7 @@ void EventTable::loadEpg() dt >> tmp; if ( !validString( f, desc, tmp, EPGBUFSIZE, num ) ) return; dt.readRawBytes( buf, tmp ); - desc->source = QString::fromUtf8( buf ); + desc->source = TQString::fromUtf8( buf ); dt >> desc->tid; dt >> desc->sid; dt >> desc->tsid; @@ -330,18 +330,18 @@ void EventTable::loadEpg() dt >> tmp; desc->startDateTime.setTime_t( tmp ); dt >> tmp; - desc->duration = QTime().addSecs( tmp ); + desc->duration = TQTime().addSecs( tmp ); dt >> count; for ( i=0; i<count; i++ ) { sev = new ShortEvent(); dt >> tmp; if ( !validString( f, desc, tmp, EPGBUFSIZE, num ) ) return; dt.readRawBytes( buf, tmp ); - sev->name = QString::fromUtf8( buf ); + sev->name = TQString::fromUtf8( buf ); dt >> tmp; if ( !validString( f, desc, tmp, EPGBUFSIZE, num ) ) return; dt.readRawBytes( buf, tmp ); - sev->text = QString::fromUtf8( buf ); + sev->text = TQString::fromUtf8( buf ); desc->shortEvents.append( sev ); } dt >> count; @@ -349,16 +349,16 @@ void EventTable::loadEpg() dt >> tmp; if ( !validString( f, desc, tmp, EPGBUFSIZE, num ) ) return; dt.readRawBytes( buf, tmp ); - desc->extEvents.append( new QString( QString::fromUtf8( buf ) ) ); + desc->extEvents.append( new TQString( TQString::fromUtf8( buf ) ) ); } dt >> tmp; if ( !validString( f, desc, tmp, EPGBUFSIZE, num ) ) return; dt.readRawBytes( buf, tmp ); - desc->title = QString::fromUtf8( buf ); + desc->title = TQString::fromUtf8( buf ); dt >> tmp; if ( !validString( f, desc, tmp, EPGBUFSIZE, num ) ) return; dt.readRawBytes( buf, tmp ); - desc->subtitle = QString::fromUtf8( buf ); + desc->subtitle = TQString::fromUtf8( buf ); if ( desc->startDateTime.addSecs( (desc->duration.hour()*3600)+(desc->duration.minute()*60)+desc->duration.second() )<cur ) delete desc; else { @@ -372,11 +372,11 @@ void EventTable::loadEpg() } } f.close(); - fprintf( stderr, "Loaded epg data : %d events (%d msecs)\n", num, t1.msecsTo(QTime::currentTime()) ); + fprintf( stderr, "Loaded epg data : %d events (%d msecs)\n", num, t1.msecsTo(TQTime::currentTime()) ); } } -bool EventTable::validString( QFile &f, EventDesc *d, int len, int buflen, int nev ) +bool EventTable::validString( TQFile &f, EventDesc *d, int len, int buflen, int nev ) { if ( len<1 || len>buflen ) { f.close(); @@ -412,11 +412,11 @@ void EventTable::run() EventTsid *et; EventSid *es; EventDesc *desc; - QDateTime dt, cur; + TQDateTime dt, cur; setpriority(PRIO_PROCESS, 0, 19); - cur = QDateTime::currentDateTime(); + cur = TQDateTime::tqcurrentDateTime(); for( k=0; k<getNSource(); k++ ) { if ( !(esrc=getNEventSource( k )) ) continue; @@ -439,15 +439,15 @@ void EventTable::run() EventSource *EventTable::getNEventSource( int n ) { - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); return srcList.at( n ); } -EventSource *EventTable::getEventSource( QString src ) +EventSource *EventTable::getEventSource( TQString src ) { int i; - QMutexLocker locker( &mutex ); + TQMutexLocker locker( &mutex ); for ( i=0; i<(int)srcList.count(); i++ ) { if ( srcList.at(i)->getSource()==src ) return srcList.at(i); @@ -457,7 +457,7 @@ EventSource *EventTable::getEventSource( QString src ) return es; } -EventDesc *EventTable::getEventDesc( QString src, int nid, int tsid, int sid, int n ) +EventDesc *EventTable::getEventDesc( TQString src, int nid, int tsid, int sid, int n ) { int i; EventSource *es=0; @@ -477,7 +477,7 @@ EventDesc *EventTable::getEventDesc( QString src, int nid, int tsid, int sid, in -KaffeineEpgPlugin::KaffeineEpgPlugin( QObject* parent, const char* name ) : KParts::Part( parent, name ) +KaffeineEpgPlugin::KaffeineEpgPlugin( TQObject* tqparent, const char* name ) : KParts::Part( tqparent, name ) { } diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h index 07dbd16..1553786 100644 --- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h +++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h @@ -21,10 +21,10 @@ #ifndef KAFFEINEDVBEVENTS_H #define KAFFEINEDVBEVENTS_H -#include <qtimer.h> -#include <qmutex.h> -#include <qfile.h> -#include <qobject.h> +#include <tqtimer.h> +#include <tqmutex.h> +#include <tqfile.h> +#include <tqobject.h> #include <kparts/part.h> @@ -40,8 +40,8 @@ public: ShortEvent(); ~ShortEvent(); - QString name; - QString text; + TQString name; + TQString text; }; class EventDesc @@ -52,7 +52,7 @@ public: EventDesc(); ~EventDesc(); - QString source; + TQString source; unsigned char tid; unsigned short sid; unsigned short tsid; @@ -61,12 +61,12 @@ public: unsigned char lsn; unsigned short eid; unsigned char running; - QDateTime startDateTime; - QTime duration; - QPtrList<ShortEvent> shortEvents; - QPtrList<QString> extEvents; - QString title; - QString subtitle; + TQDateTime startDateTime; + TQTime duration; + TQPtrList<ShortEvent> shortEvents; + TQPtrList<TQString> extEvents; + TQString title; + TQString subtitle; unsigned int loop; }; @@ -80,14 +80,14 @@ public: int getSid() { return sid; } void lock() { mutex.lock(); } void unlock() { mutex.unlock(); } - QPtrList<EventDesc> *getEvents() { return &events; } + TQPtrList<EventDesc> *getEvents() { return &events; } EventDesc *getEventDesc( int n ); int getNDesc() { return events.count(); } void remove( EventDesc *d ); private: - QMutex mutex; + TQMutex mutex; int sid; - QPtrList<EventDesc> events; + TQPtrList<EventDesc> events; }; @@ -104,9 +104,9 @@ public: int getNSid() { return sidList.count(); } EventDesc *getEventDesc( int sid, int n ); private: - QMutex mutex; + TQMutex mutex; int tsid, nid; - QPtrList<EventSid> sidList; + TQPtrList<EventSid> sidList; }; @@ -114,29 +114,30 @@ private: class EventSource { public: - EventSource( QString src ); + EventSource( TQString src ); ~EventSource(); EventSid *getEventSid( int nid, int tsid, int sid ); EventTsid *getNEventTsid( int n ); int getNTsid() { return tsidList.count(); } EventDesc *getEventDesc( int nid, int tsid, int sid, int n ); - QString getSource() { return source; } + TQString getSource() { return source; } private: - QMutex mutex; - QString source; - QPtrList<EventTsid> tsidList; + TQMutex mutex; + TQString source; + TQPtrList<EventTsid> tsidList; }; -class EventTable : public QObject, public QThread +class EventTable : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: EventTable(); ~EventTable(); - EventSource *getEventSource( QString src ); - EventDesc *getEventDesc( QString src, int nid, int tsid, int sid, int n ); + EventSource *getEventSource( TQString src ); + EventDesc *getEventDesc( TQString src, int nid, int tsid, int sid, int n ); EventSource *getNEventSource( int n ); int getNSource() { return srcList.count(); } void doClean( bool b ); @@ -145,10 +146,10 @@ public: protected: virtual void run(); private: - bool validString( QFile &f, EventDesc *d, int len, int buflen, int nev ); - QMutex mutex; - QPtrList<EventSource> srcList; - QTimer cleanTimer; + bool validString( TQFile &f, EventDesc *d, int len, int buflen, int nev ); + TQMutex mutex; + TQPtrList<EventSource> srcList; + TQTimer cleanTimer; bool epgLoaded; private slots: void setClean(); @@ -159,10 +160,11 @@ private slots: class KDE_EXPORT KaffeineEpgPlugin : public KParts::Part, public KaffeineDVBsection { Q_OBJECT + TQ_OBJECT public: - KaffeineEpgPlugin( QObject* parent, const char* name ); + KaffeineEpgPlugin( TQObject* tqparent, const char* name ); virtual ~KaffeineEpgPlugin(); - virtual bool go( QString /*src*/, int /*freqKhz*/ ) { return false; } + virtual bool go( TQString /*src*/, int /*freqKhz*/ ) { return false; } virtual void stop() {} void setTable( EventTable *table ) { events = table; } diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp index 54c912e..44619b7 100644 --- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp +++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp @@ -41,14 +41,14 @@ KaffeineDVBsection::KaffeineDVBsection() -KaffeineDVBsection::KaffeineDVBsection( int anum, int tnum, const QString &charset ) +KaffeineDVBsection::KaffeineDVBsection( int anum, int tnum, const TQString &charset ) { initSection( anum, tnum, charset ); } -void KaffeineDVBsection::initSection( int anum, int tnum, const QString &charset ) +void KaffeineDVBsection::initSection( int anum, int tnum, const TQString &charset ) { defaultCharset = charset.ascii(); adapter = anum; @@ -70,7 +70,7 @@ KaffeineDVBsection::~KaffeineDVBsection() bool KaffeineDVBsection::setFilter( int pid, int tid, int timeout, bool checkcrc ) { struct dmx_sct_filter_params sctfilter; - QString demuxer = QString("/dev/dvb/adapter%1/demux%2").arg( adapter ).arg( tuner ); + TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").tqarg( adapter ).tqarg( tuner ); if ((fdDemux = open( demuxer.ascii(), O_RDWR | O_NONBLOCK )) < 0) { perror ("open failed"); @@ -131,7 +131,7 @@ unsigned int KaffeineDVBsection::getBits( unsigned char *b, int offbits, int nbi -bool KaffeineDVBsection::doIconv( QCString &s, QCString table, char *buffer, int buflen ) +bool KaffeineDVBsection::doIconv( TQCString &s, TQCString table, char *buffer, int buflen ) { size_t inSize, outSize=buflen; char *inBuf, *outBuf; @@ -155,13 +155,13 @@ bool KaffeineDVBsection::doIconv( QCString &s, QCString table, char *buffer, int -QString KaffeineDVBsection::getText( unsigned char *buf, int length ) +TQString KaffeineDVBsection::getText( unsigned char *buf, int length ) { - QCString s; - QString ret=""; + TQCString s; + TQString ret=""; int i=0; char buffer[1000]; - QCString table=defaultCharset; + TQCString table=defaultCharset; if ( length==0 ) return ""; @@ -170,7 +170,7 @@ QString KaffeineDVBsection::getText( unsigned char *buf, int length ) if ( buf[i]<0x20 && (i+2)<length ) { if ( !s.isEmpty() ) { if ( doIconv( s, table, buffer, sizeof(buffer) ) ) { - ret += QString::fromUtf8( buffer ); + ret += TQString::fromUtf8( buffer ); s = ""; } } @@ -220,7 +220,7 @@ QString KaffeineDVBsection::getText( unsigned char *buf, int length ) if ( !s.isEmpty() ) { if ( doIconv( s, table, buffer, sizeof(buffer) ) ) { - ret += QString::fromUtf8( buffer ); + ret += TQString::fromUtf8( buffer ); } } return ret; @@ -228,10 +228,10 @@ QString KaffeineDVBsection::getText( unsigned char *buf, int length ) -QString KaffeineDVBsection::langDesc( unsigned char* buf ) +TQString KaffeineDVBsection::langDesc( unsigned char* buf ) { char c[4]; - QString s; + TQString s; memset( mempcpy( c, buf+2, 3 ), 0, 1 ); s = c; @@ -240,19 +240,19 @@ QString KaffeineDVBsection::langDesc( unsigned char* buf ) -QTime KaffeineDVBsection::getTime( unsigned char *buf ) +TQTime KaffeineDVBsection::getTime( unsigned char *buf ) { int h, m, s; h = ((getBits(buf,0,4)*10)+getBits(buf,4,4))%24; m = ((getBits(buf,8,4)*10)+getBits(buf,12,4))%60; s = ((getBits(buf,16,4)*10)+getBits(buf,20,4))%60; - return QTime( h, m, s ); + return TQTime( h, m, s ); } -QDate KaffeineDVBsection::getDate( unsigned char *buf ) +TQDate KaffeineDVBsection::getDate( unsigned char *buf ) { int i, j, m, D, Y, M, k, mjd; @@ -268,12 +268,12 @@ QDate KaffeineDVBsection::getDate( unsigned char *buf ) Y = i+k+1900; M = m-1-k*12; - return QDate( (Y>=1970)?Y:1970, (M>0 && M<13)?M:1, (D>0 && D<32)?D:1 ); + return TQDate( (Y>=1970)?Y:1970, (M>0 && M<13)?M:1, (D>0 && D<32)?D:1 ); } -QDateTime KaffeineDVBsection::getDateTime( unsigned char *buf ) +TQDateTime KaffeineDVBsection::getDateTime( unsigned char *buf ) { /*int hh, mm, ss; int i, j, m, D, Y, M, k, mjd; @@ -293,8 +293,8 @@ QDateTime KaffeineDVBsection::getDateTime( unsigned char *buf ) mm = ((getBits(buf+2,8,4)*10)+getBits(buf+2,12,4))%60; ss = ((getBits(buf+2,16,4)*10)+getBits(buf+2,20,4))%60; - QDateTime dt( QDate( (Y>=1970)?Y:1970, (M>0 && M<13)?M:1, (D>0 && D<32)?D:1 ), QTime( hh, mm, ss ) ); - QDateTime u( QDate( 1970, 1, 1 ), QTime( 0, 0, 0 ) ); + TQDateTime dt( TQDate( (Y>=1970)?Y:1970, (M>0 && M<13)?M:1, (D>0 && D<32)?D:1 ), TQTime( hh, mm, ss ) ); + TQDateTime u( TQDate( 1970, 1, 1 ), TQTime( 0, 0, 0 ) ); sec = u.secsTo( dt ); u.setTime_t( sec ); // UTC to local return u;*/ @@ -323,8 +323,8 @@ QDateTime KaffeineDVBsection::getDateTime( unsigned char *buf ) time_t p=timegm(t); if ( p>0 ) { t = localtime(&p); - return QDateTime( QDate( t->tm_year+1900, t->tm_mon+1, t->tm_mday ), QTime( t->tm_hour, t->tm_min, t->tm_sec ) ); + return TQDateTime( TQDate( t->tm_year+1900, t->tm_mon+1, t->tm_mday ), TQTime( t->tm_hour, t->tm_min, t->tm_sec ) ); } else - return QDateTime( QDate( 1970, 1, 1 ), QTime( 0, 0, 0 ) ); + return TQDateTime( TQDate( 1970, 1, 1 ), TQTime( 0, 0, 0 ) ); } diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.h b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.h index af451f2..7ad3d46 100644 --- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.h +++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.h @@ -24,40 +24,40 @@ #include <sys/poll.h> #include <linux/dvb/dmx.h> -#include <qthread.h> -#include <qdatetime.h> +#include <tqthread.h> +#include <tqdatetime.h> -class KaffeineDVBsection : public QThread +class KaffeineDVBsection : public TQThread { public: KaffeineDVBsection(); - KaffeineDVBsection( int anum, int tnum, const QString &charset="ISO8859-1" ); + KaffeineDVBsection( int anum, int tnum, const TQString &charset="ISO8859-1" ); ~KaffeineDVBsection(); - void initSection( int anum, int tnum, const QString &charset="ISO8859-1" ); + void initSection( int anum, int tnum, const TQString &charset="ISO8859-1" ); static unsigned int getBits( unsigned char *b, int offbits, int nbits ); protected: virtual void run() {} - QString langDesc( unsigned char* buf ); + TQString langDesc( unsigned char* buf ); bool setFilter( int pid, int tid, int timeout=5000, bool checkcrc=true ); void stopFilter(); - QString getText( unsigned char *buf, int length ); - bool doIconv( QCString &s, QCString table, char *buffer, int buflen ); - QTime getTime( unsigned char *buf ); - QDate getDate( unsigned char *buf ); - QDateTime getDateTime( unsigned char *buf ); + TQString getText( unsigned char *buf, int length ); + bool doIconv( TQCString &s, TQCString table, char *buffer, int buflen ); + TQTime getTime( unsigned char *buf ); + TQDate getDate( unsigned char *buf ); + TQDateTime getDateTime( unsigned char *buf ); int fdDemux; int indexChannels; bool isRunning; int adapter; int tuner; - QCString defaultCharset; + TQCString defaultCharset; struct pollfd pf[1]; }; diff --git a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.cpp b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.cpp index bd3e5b3..124bc3a 100644 --- a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.cpp +++ b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.cpp @@ -21,7 +21,7 @@ #include "kaffeinedvbplugin.h" #include "kaffeinedvbplugin.moc" -KaffeineDvbPlugin::KaffeineDvbPlugin(QObject* parent, const char* name) : KParts::Part( parent, name ) +KaffeineDvbPlugin::KaffeineDvbPlugin(TQObject* tqparent, const char* name) : KParts::Part( tqparent, name ) { } diff --git a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h index f112397..8737297 100644 --- a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h +++ b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h @@ -21,8 +21,8 @@ #ifndef KAFFEINEDVBPLUGIN_H #define KAFFEINEDVBPLUGIN_H -#include <qpopupmenu.h> -#include <qstring.h> +#include <tqpopupmenu.h> +#include <tqstring.h> #include <kparts/part.h> #include <kconfig.h> @@ -34,10 +34,11 @@ class KDE_EXPORT KaffeineDvbPlugin : public KParts::Part { Q_OBJECT + TQ_OBJECT public: - KaffeineDvbPlugin(QObject* parent, const char* name); + KaffeineDvbPlugin(TQObject* tqparent, const char* name); virtual ~KaffeineDvbPlugin(); - virtual QString pluginName() { return QString(); } + virtual TQString pluginName() { return TQString(); } // returns a "handle". virtual void* init( int /*sid*/ , int /*anum*/, int /*tnum*/, int /*fta*/ ) { return NULL; } diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp index 4e1a14c..c63f316 100644 --- a/kaffeine/src/input/dvb/scandialog.cpp +++ b/kaffeine/src/input/dvb/scandialog.cpp @@ -18,18 +18,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qlayout.h> -#include <qdir.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qlistview.h> -#include <qpopupmenu.h> -#include <qcursor.h> -#include <qwhatsthis.h> -#include <qapplication.h> -#include <qaccel.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqlistview.h> +#include <tqpopupmenu.h> +#include <tqcursor.h> +#include <tqwhatsthis.h> +#include <tqapplication.h> +#include <tqaccel.h> #include <klocale.h> #include <kiconloader.h> @@ -41,19 +41,19 @@ -DListViewItem::DListViewItem( QListView *parent, ChannelDesc *desc, QString label1, QString label2 ) - : QListViewItem( parent, label1, label2 ) +DListViewItem::DListViewItem( TQListView *tqparent, ChannelDesc *desc, TQString label1, TQString label2 ) + : TQListViewItem( tqparent, label1, label2 ) { chan = desc; } -ScanDialog::ScanDialog( QPtrList<DvbStream> *d, QPtrList<ChannelDesc> *ch, QSize size, QString src, const QString &charset ) +ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQSize size, TQString src, const TQString &charset ) { - QString s; + TQString s; int i, j; - QStringList list, tmp; + TQStringList list, tmp; KIconLoader *icon = new KIconLoader(); tvPix = icon->loadIcon( "kdvbtv", KIcon::Small ); @@ -71,7 +71,7 @@ ScanDialog::ScanDialog( QPtrList<DvbStream> *d, QPtrList<ChannelDesc> *ch, QSize tmp = dvb->at(i)->getSources( true ); for ( j=0; j<(int)tmp.count(); j++ ) { if ( tmp[j].startsWith( "AUTO" ) ) - list.append( QString("AUTO(%1:%2)").arg(dvb->at(i)->getAdapter()).arg(dvb->at(i)->getTuner()) ); + list.append( TQString("AUTO(%1:%2)").tqarg(dvb->at(i)->getAdapter()).tqarg(dvb->at(i)->getTuner()) ); else list.append( tmp[j] ); } @@ -82,42 +82,42 @@ ScanDialog::ScanDialog( QPtrList<DvbStream> *d, QPtrList<ChannelDesc> *ch, QSize transponders.setAutoDelete( true ); - QGridLayout *statLayout = new QGridLayout( statusFrame, 1, 1, 11, 6 ); + TQGridLayout *statLayout = new TQGridLayout( statusFrame, 1, 1, 11, 6 ); - QLabel *lab = new QLabel( i18n("Signal:"), statusFrame ); + TQLabel *lab = new TQLabel( i18n("Signal:"), statusFrame ); statLayout->addWidget( lab, 0, 0 ); signal = new KGradProgress( statusFrame ); statLayout->addWidget( signal, 0, 1 ); - lab = new QLabel( i18n("SNR:"), statusFrame ); + lab = new TQLabel( i18n("SNR:"), statusFrame ); statLayout->addWidget( lab, 1, 0 ); snr = new KGradProgress( statusFrame ); statLayout->addWidget( snr, 1, 1 ); - lab = new QLabel( i18n("Tuned:"), statusFrame ); + lab = new TQLabel( i18n("Tuned:"), statusFrame ); statLayout->addWidget( lab, 2, 0 ); lock = new KLed( statusFrame, "lockLed" ); lock->setState( KLed::Off ); lock->setDarkFactor( 500 ); statLayout->addWidget( lock, 2, 1 ); - progress = new QProgressBar( 100, statusFrame ); + progress = new TQProgressBar( 100, statusFrame ); progress->setIndicatorFollowsStyle( false ); progress->setProgress( 0 ); statLayout->addMultiCellWidget( progress, 3, 3, 0, 1 ); - progressLab = new QLabel( statusFrame ); + progressLab = new TQLabel( statusFrame ); statLayout->addMultiCellWidget( progressLab, 4, 4, 0, 1 ); channelsList->clear(); foundList->clear(); foundList->setAllColumnsShowFocus( true ); - foundList->setSelectionMode( QListView::Extended ); + foundList->setSelectionMode( TQListView::Extended ); channelsList->setSorting( 1 ); // sort by source 1st than channel name channelsList->setAllColumnsShowFocus( true ); - channelsList->setSelectionMode( QListView::Extended ); + channelsList->setSelectionMode( TQListView::Extended ); ChannelDesc *chan; - QListViewItem *it; + TQListViewItem *it; for ( int i=0; i<(int)chandesc->count(); i++ ) { chan = chandesc->at(i); - it = new QListViewItem( channelsList, chan->name, chan->tp.source ); + it = new TQListViewItem( channelsList, chan->name, chan->tp.source ); if ( !chan->pix.isNull() ) it->setPixmap( 0, chan->pix ); else { @@ -136,9 +136,9 @@ ScanDialog::ScanDialog( QPtrList<DvbStream> *d, QPtrList<ChannelDesc> *ch, QSize } } - startBtn->setPaletteForegroundColor( QColor(255,0,0) ); + startBtn->setPaletteForegroundColor( TQColor(255,0,0) ); - connect( searchComb, SIGNAL(activated(int)), this, SLOT(setDvb(int)) ); + connect( searchComb, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDvb(int)) ); ds = dvb->at(0); ds->setScanning( true ); @@ -148,25 +148,25 @@ ScanDialog::ScanDialog( QPtrList<DvbStream> *d, QPtrList<ChannelDesc> *ch, QSize offsetGroup->hide(); bool ok=false; dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset ); - connect( ds, SIGNAL(snrStatus(int)), snr, SLOT(setProgress(int)) ); - connect( ds, SIGNAL(signalStatus(int)), signal, SLOT(setProgress(int)) ); - connect( ds, SIGNAL(lockStatus(bool)), this, SLOT(setLock(bool)) ); - connect( dvbsi, SIGNAL(end(bool)), this, SLOT(siEnded(bool)) ); - - connect( &checkTimer, SIGNAL( timeout() ), this, SLOT( checkNewChannel() ) ); - connect( &progressTimer, SIGNAL( timeout() ), this, SLOT( setProgress() ) ); - connect( startBtn, SIGNAL(toggled(bool)), this, SLOT(scan(bool)) ); - connect( addfilteredBtn, SIGNAL(clicked()), this, SLOT(addFiltered()) ); - connect( addselectedBtn, SIGNAL(clicked()), this, SLOT(addSelected()) ); - connect( channelsList, SIGNAL(contextMenuRequested(QListViewItem*,const QPoint&,int)), this, SLOT(pop(QListViewItem*,const QPoint&,int)) ); - connect( channelsList, SIGNAL(doubleClicked(QListViewItem*,const QPoint &,int)), this, SLOT( slotChannelChanged(QListViewItem*,const QPoint &,int) ) ); - connect( newBtn, SIGNAL(clicked()), this, SLOT(newChannel()) ); - connect( delBtn, SIGNAL(clicked()), this, SLOT(deleteAll()) ); - connect( selectallBtn, SIGNAL(clicked()), this, SLOT(selectAll()) ); - - QAccel *ac = new QAccel( channelsList ); + connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); + connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); + connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); + connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); + + connect( &checkTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( checkNewChannel() ) ); + connect( &progressTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( setProgress() ) ); + connect( startBtn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(scan(bool)) ); + connect( addfilteredBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFiltered()) ); + connect( addselectedBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSelected()) ); + connect( channelsList, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, TQT_SLOT(pop(TQListViewItem*,const TQPoint&,int)) ); + connect( channelsList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)), this, TQT_SLOT( slotChannelChanged(TQListViewItem*,const TQPoint &,int) ) ); + connect( newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChannel()) ); + connect( delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteAll()) ); + connect( selectallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAll()) ); + + TQAccel *ac = new TQAccel( channelsList ); ac->insertItem( Key_Delete, 100 ); - ac->connectItem( 100, this, SLOT(deleteChannel()) ); + ac->connectItem( 100, this, TQT_SLOT(deleteChannel()) ); resize( size ); delete icon; @@ -181,12 +181,12 @@ void ScanDialog::selectAll() -void ScanDialog::slotChannelChanged( QListViewItem *_channel, const QPoint &, int ) +void ScanDialog::slotChannelChanged( TQListViewItem *_channel, const TQPoint &, int ) { if ( !_channel ) return; - QPixmap pix; - QString s = _channel->text(0); + TQPixmap pix; + TQString s = _channel->text(0); if ( edit( s, pix ) ) { _channel->setText( 0, s ); _channel->setPixmap( 0, pix ); @@ -198,7 +198,7 @@ void ScanDialog::slotChannelChanged( QListViewItem *_channel, const QPoint &, in void ScanDialog::setDvb( int index ) { int i, pos=0; - QStringList list; + TQStringList list; bool ok=false; for ( i=0; i<(int)dvb->count(); i++ ) { @@ -209,20 +209,20 @@ void ScanDialog::setDvb( int index ) checkTimer.stop(); if ( progressTimer.isActive() ) progressTimer.stop(); - disconnect( ds, SIGNAL(snrStatus(int)), snr, SLOT(setProgress(int)) ); - disconnect( ds, SIGNAL(signalStatus(int)), signal, SLOT(setProgress(int)) ); - disconnect( ds, SIGNAL(lockStatus(bool)), this, SLOT(setLock(bool)) ); - disconnect( dvbsi, SIGNAL(end(bool)), this, SLOT(siEnded(bool)) ); + disconnect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); + disconnect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); + disconnect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); + disconnect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); ds->setScanning( false ); dvbsi->stop(); delete dvbsi; ds = dvb->at(i); ds->setScanning( true ); dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset ); - connect( ds, SIGNAL(snrStatus(int)), snr, SLOT(setProgress(int)) ); - connect( ds, SIGNAL(signalStatus(int)), signal, SLOT(setProgress(int)) ); - connect( ds, SIGNAL(lockStatus(bool)), this, SLOT(setLock(bool)) ); - connect( dvbsi, SIGNAL(end(bool)), this, SLOT(siEnded(bool)) ); + connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); + connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); + connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); + connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); break; } } @@ -234,22 +234,22 @@ void ScanDialog::setDvb( int index ) -void ScanDialog::pop( QListViewItem *it, const QPoint &pos, int col ) +void ScanDialog::pop( TQListViewItem *it, const TQPoint &pos, int col ) { - QPoint p=pos; + TQPoint p=pos; if ( !it ) return; int i=col; - QPixmap pix; - QString s = it->text(0); + TQPixmap pix; + TQString s = it->text(0); - QPopupMenu *pop = new QPopupMenu(); + TQPopupMenu *pop = new TQPopupMenu(); pop->insertItem( i18n("Edit..."), 1 ); pop->insertItem( i18n("Delete"), 2 ); i = 0; - i = pop->exec( QCursor::pos() ); + i = pop->exec( TQCursor::pos() ); switch ( i ) { case 0 : break; @@ -270,17 +270,17 @@ void ScanDialog::pop( QListViewItem *it, const QPoint &pos, int col ) void ScanDialog::deleteChannel() { - QListViewItem *it = channelsList->currentItem(); + TQListViewItem *it = channelsList->currentItem(); if ( it ) deleteChannel( it->text(0) ); } -void ScanDialog::deleteChannel( QString name ) +void ScanDialog::deleteChannel( TQString name ) { int j, i; - QListViewItem *it; + TQListViewItem *it; for ( j=0; j<(int)chandesc->count(); j++ ) { if ( chandesc->at(j)->name==name ) { @@ -311,7 +311,7 @@ void ScanDialog::deleteChannel( QString name ) void ScanDialog::newChannel() { ChannelDesc chan; - QStringList list; + TQStringList list; //int i; //for ( i=0; i<(int)searchComb->count(); i++ ) list.append( searchComb->text(i) ); @@ -330,7 +330,7 @@ void ScanDialog::newChannel() chandesc->remove(); if ( ret==ChannelEditor::Accepted ) { chandesc->append( new ChannelDesc( chan ) ); - QListViewItem *it = new QListViewItem( channelsList, chan.name ); + TQListViewItem *it = new TQListViewItem( channelsList, chan.name ); if ( chan.type==1 ) { if ( chan.fta ) it->setPixmap( 0, tvcPix ); @@ -365,11 +365,11 @@ void ScanDialog::deleteAll() -bool ScanDialog::edit( QString &name, QPixmap &pix ) +bool ScanDialog::edit( TQString &name, TQPixmap &pix ) { int j; ChannelDesc *chan=0; - QStringList list, tmp; + TQStringList list, tmp; int i; for ( i=0; i<(int)dvb->count(); i++ ) { @@ -410,15 +410,15 @@ bool ScanDialog::edit( QString &name, QPixmap &pix ) -void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) +void ScanDialog::parseTp( TQString s, fe_type_t type, TQString src ) { Transponder *trans; - QString t; + TQString t; int pos; s = s.stripWhiteSpace(); trans = new Transponder(); - pos = s.find(" "); + pos = s.tqfind(" "); if ( s.left(pos)=="T" ) { trans->type=FE_OFDM; trans->source = "Terrestrial"; @@ -441,17 +441,17 @@ void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) } s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); - pos = s.find(" "); + pos = s.tqfind(" "); trans->freq = s.left(pos).toULong()/1000; s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); if ( trans->type!=FE_ATSC ) - pos = s.find(" "); + pos = s.tqfind(" "); if ( trans->type==FE_QPSK ) { trans->pol = s.left(pos).lower()[0].latin1(); s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); - pos = s.find(" "); + pos = s.tqfind(" "); } if ( trans->type!=FE_OFDM && trans->type!=FE_ATSC ) { trans->sr = s.left(pos).toULong()/1000; @@ -489,7 +489,7 @@ void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); - pos = s.find(" "); + pos = s.tqfind(" "); if ( s.left(pos)=="1/2" ) trans->coderateH = FEC_1_2; else if ( s.left(pos)=="2/3" ) @@ -512,7 +512,7 @@ void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) trans->coderateH = FEC_AUTO; s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); - pos = s.find(" "); + pos = s.tqfind(" "); if ( trans->type==FE_OFDM ) { if ( s.left(pos)=="1/2" ) trans->coderateL = FEC_1_2; @@ -542,7 +542,7 @@ void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); - pos = s.find(" "); + pos = s.tqfind(" "); } if ( trans->type!=FE_QPSK ) { if ( s.left(pos)=="QPSK" ) @@ -563,7 +563,7 @@ void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) if ( trans->type==FE_OFDM ) { s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); - pos = s.find(" "); + pos = s.tqfind(" "); if ( s.left(pos)=="8k" ) trans->transmission = TRANSMISSION_MODE_8K; else if ( s.left(pos)=="2k" ) @@ -573,7 +573,7 @@ void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); - pos = s.find(" "); + pos = s.tqfind(" "); if ( s.left(pos)=="1/32" ) trans->guard = GUARD_INTERVAL_1_32; else if ( s.left(pos)=="1/16" ) @@ -587,7 +587,7 @@ void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) s = s.right( s.length()-pos-1 ); s = s.stripWhiteSpace(); - pos = s.find(" "); + pos = s.tqfind(" "); if ( s.left(pos)=="1" ) trans->hierarchy = HIERARCHY_1; else if ( s.left(pos)=="2" ) @@ -606,7 +606,7 @@ void ScanDialog::parseTp( QString s, fe_type_t type, QString src ) bool ScanDialog::getTransData() { - QString s=sourcesPath; + TQString s=sourcesPath; transponders.clear(); @@ -614,25 +614,25 @@ bool ScanDialog::getTransData() int i; for ( i=177; i<227; i+=7 ) { if ( offset07->isChecked() ) { - s = QString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000 ); + s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000 ); parseTp( s, ds->getType(), "" ); } if ( offset125p->isChecked() ) { - s = QString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000+125000 ); + s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000+125000 ); parseTp( s, ds->getType(), "" ); } } for ( i=474; i<859; i+=8 ) { if ( offset167m->isChecked() ) { - s = QString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)-167000 ); + s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)-167000 ); parseTp( s, ds->getType(), "" ); } if ( offset0->isChecked() ) { - s = QString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( i*1000000 ); + s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( i*1000000 ); parseTp( s, ds->getType(), "" ); } if ( offset167p->isChecked() ) { - s = QString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+167000 ); + s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+167000 ); parseTp( s, ds->getType(), "" ); } } @@ -648,9 +648,9 @@ bool ScanDialog::getTransData() return false; } s += searchComb->currentText(); - QFile f( s ); + TQFile f( s ); if ( f.open(IO_ReadOnly) ) { - QTextStream tt( &f ); + TQTextStream tt( &f ); while ( !tt.eof() ) { s = tt.readLine(); if ( s.startsWith("#") ) @@ -670,7 +670,7 @@ bool ScanDialog::getTransData() void ScanDialog::checkDuplicateName( ChannelDesc *chan ) { - QString org, name; + TQString org, name; int i, j=1; bool loop; @@ -680,7 +680,7 @@ void ScanDialog::checkDuplicateName( ChannelDesc *chan ) loop = false; for ( i=0; i<(int)chandesc->count(); i++ ) { if ( name==chandesc->at(i)->name ) { - name = org+"-"+QString().setNum(j); + name = org+"-"+TQString().setNum(j); loop = true; ++j; break; @@ -724,7 +724,7 @@ bool ScanDialog::checkChannUpdate( ChannelDesc *chan ) break; } } - chandesc->replace(i,new ChannelDesc(*chan)); + chandesc->tqreplace(i,new ChannelDesc(*chan)); return false; } } @@ -736,7 +736,7 @@ void ScanDialog::addSelected() { ChannelDesc *chan; DListViewItem *dit, *odit; - QListViewItem *it; + TQListViewItem *it; dit = (DListViewItem*)foundList->firstChild(); while( dit ) { @@ -757,7 +757,7 @@ void ScanDialog::addSelected() chan->num = chandesc->count()+1; } chandesc->append( new ChannelDesc( *chan ) ); - it = new QListViewItem( channelsList, chan->name ); + it = new TQListViewItem( channelsList, chan->name ); if ( chan->type==1 ) { if ( chan->fta ) it->setPixmap( 0, tvcPix ); @@ -795,7 +795,7 @@ void ScanDialog::working( bool b ) void ScanDialog::addFiltered() { ChannelDesc *chan; - QListViewItem *it; + TQListViewItem *it; DListViewItem *dit, *odit; int m = dvbsi->channels.count(); int t=0; @@ -803,7 +803,7 @@ void ScanDialog::addFiltered() working( true ); startBtn->setEnabled( false ); progress->setProgress(0); - qApp->processEvents(); + tqApp->processEvents(); dit = (DListViewItem*)foundList->firstChild(); while( dit ) { @@ -863,7 +863,7 @@ void ScanDialog::addFiltered() chan->num = chandesc->count()+1; chandesc->append( new ChannelDesc( *chan ) ); - it = new QListViewItem( channelsList, chan->name ); + it = new TQListViewItem( channelsList, chan->name ); if ( chan->type==1 ) { if ( chan->fta ) it->setPixmap( 0, tvcPix ); @@ -902,7 +902,7 @@ void ScanDialog::siEnded( bool b ) startBtn->setOn( !b ); working( false ); startBtn->setText( i18n("START scan") ); - startBtn->setPaletteForegroundColor( QColor(255,0,0) ); + startBtn->setPaletteForegroundColor( TQColor(255,0,0) ); } @@ -929,14 +929,14 @@ void ScanDialog::scan( bool b ) progressTimer.start( 1000 ); working( true ); startBtn->setText( i18n("STOP scan") ); - startBtn->setPaletteForegroundColor( QColor(0,255,0) ); + startBtn->setPaletteForegroundColor( TQColor(0,255,0) ); searchComb->setEnabled( false ); } else { - //setCursor(QCursor(Qt::WaitCursor)); + //setCursor(TQCursor(TQt::WaitCursor)); startBtn->setText( i18n("Stopping...") ); startBtn->setEnabled( false ); - qApp->processEvents(); + tqApp->processEvents(); dvbsi->stop(); checkTimer.stop(); progressTimer.stop(); @@ -946,10 +946,10 @@ void ScanDialog::scan( bool b ) setLock( false ); progress->setProgress( 0 ); working( false ); - //setCursor(QCursor(Qt::ArrowCursor)); + //setCursor(TQCursor(TQt::ArrowCursor)); startBtn->setText( i18n("START scan") ); startBtn->setEnabled( true ); - startBtn->setPaletteForegroundColor( QColor(255,0,0) ); + startBtn->setPaletteForegroundColor( TQColor(255,0,0) ); searchComb->setEnabled( true ); } } @@ -1010,7 +1010,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan ) int i; DListViewItem *it; - it = new DListViewItem( foundList, chan, QString( "%1").arg( chan->tp.snr ), chan->name ); + it = new DListViewItem( foundList, chan, TQString( "%1").tqarg( chan->tp.snr ), chan->name ); if ( chan->type==1 ) { if ( scan ) @@ -1030,7 +1030,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan ) } if ( scan ) - progressLab->setText( QString( i18n("Found: %1 TV - %2 radio") ).arg(ntv).arg(nradio) ); + progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).tqarg(ntv).tqarg(nradio) ); if ( chan->provider.isEmpty() ) return; for ( i=0; i<providerComb->count(); i++ ) { diff --git a/kaffeine/src/input/dvb/scandialog.h b/kaffeine/src/input/dvb/scandialog.h index b73e6d2..d4eb034 100644 --- a/kaffeine/src/input/dvb/scandialog.h +++ b/kaffeine/src/input/dvb/scandialog.h @@ -21,9 +21,9 @@ #ifndef SCANDIALOG_H #define SCANDIALOG_H -#include <qtimer.h> -#include <qprogressbar.h> -#include <qlabel.h> +#include <tqtimer.h> +#include <tqprogressbar.h> +#include <tqlabel.h> #include <kled.h> @@ -36,12 +36,12 @@ class DvbStream; -class DListViewItem : public QListViewItem +class DListViewItem : public TQListViewItem { public: - DListViewItem( QListView *parent, ChannelDesc *desc, QString label1, QString label2 ); + DListViewItem( TQListView *tqparent, ChannelDesc *desc, TQString label1, TQString label2 ); ChannelDesc *chan; }; @@ -51,14 +51,15 @@ public: class ScanDialog : public ScanDialogUI { Q_OBJECT + TQ_OBJECT public: - ScanDialog( QPtrList<DvbStream> *d, QPtrList<ChannelDesc> *ch, QSize size, QString src, const QString &charset ); + ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQSize size, TQString src, const TQString &charset ); ~ScanDialog(); - QPtrList<Transponder> transponders; - QPtrList<ChannelDesc> *chandesc; + TQPtrList<Transponder> transponders; + TQPtrList<ChannelDesc> *chandesc; private slots: @@ -69,38 +70,38 @@ private slots: void addFiltered(); void addSelected(); void setProgress(); - void pop( QListViewItem *it, const QPoint &pos, int col ); + void pop( TQListViewItem *it, const TQPoint &pos, int col ); void deleteAll(); void selectAll(); void newChannel(); - void deleteChannel( QString name ); + void deleteChannel( TQString name ); void deleteChannel(); void setDvb(int); - void slotChannelChanged( QListViewItem*, const QPoint &, int ); + void slotChannelChanged( TQListViewItem*, const TQPoint &, int ); private: bool getTransData(); - bool edit( QString &name, QPixmap &pix ); + bool edit( TQString &name, TQPixmap &pix ); void working( bool b ); - void parseTp( QString s, fe_type_t type, QString src ); + void parseTp( TQString s, fe_type_t type, TQString src ); void addFound( ChannelDesc *chan, bool scan ); void checkDuplicateName( ChannelDesc *chan ); bool checkChannUpdate( ChannelDesc *chan ); - QPtrList<DvbStream> *dvb; + TQPtrList<DvbStream> *dvb; DvbStream *ds; KGradProgress *snr, *signal; - QProgressBar *progress; + TQProgressBar *progress; KLed *lock; DVBsi *dvbsi; - QTimer checkTimer, progressTimer; + TQTimer checkTimer, progressTimer; int nChannels; - QPixmap tvPix, raPix, tvcPix, racPix; + TQPixmap tvPix, raPix, tvcPix, racPix; int ntv, nradio; - QLabel *progressLab; - QString sourcesPath; - QString defaultCharset; + TQLabel *progressLab; + TQString sourcesPath; + TQString defaultCharset; }; #endif /* SCANDIALOG_H */ diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui index cdc1059..8dea923 100644 --- a/kaffeine/src/input/dvb/scandialogui.ui +++ b/kaffeine/src/input/dvb/scandialogui.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ScanDialogUI</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ScanDialogUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,23 +19,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </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="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -54,7 +54,7 @@ <string>(Right click to edit/delete)</string> </property> </widget> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Name</string> @@ -92,7 +92,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>newBtn</cstring> </property> @@ -100,7 +100,7 @@ <string>New...</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>delBtn</cstring> </property> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -127,15 +127,15 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>searchGroup</cstring> </property> @@ -146,12 +146,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="0"> + <widget class="TQComboBox" row="0" column="0"> <property name="name"> <cstring>searchComb</cstring> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>offsetGroup</cstring> </property> @@ -162,7 +162,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="3"> + <widget class="TQCheckBox" row="1" column="3"> <property name="name"> <cstring>offset167m</cstring> </property> @@ -170,7 +170,7 @@ <string>-167</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -178,7 +178,7 @@ <string>(7MHz)</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -186,7 +186,7 @@ <string>(8MHz)</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>offset167p</cstring> </property> @@ -194,7 +194,7 @@ <string>+167</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>offset125p</cstring> </property> @@ -202,7 +202,7 @@ <string>+125</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>offset0</cstring> </property> @@ -213,7 +213,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>offset07</cstring> </property> @@ -228,7 +228,7 @@ </widget> </grid> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>startBtn</cstring> </property> @@ -257,14 +257,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>18</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>statusFrame</cstring> </property> @@ -282,14 +282,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>19</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>filtersGroup</cstring> </property> @@ -300,7 +300,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>radioCb</cstring> </property> @@ -316,7 +316,7 @@ <string>Radio</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>tvCb</cstring> </property> @@ -332,7 +332,7 @@ <string>TV</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>providerCb</cstring> </property> @@ -348,7 +348,7 @@ <string>Provider:</string> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <property name="name"> <cstring>providerComb</cstring> </property> @@ -361,7 +361,7 @@ </sizepolicy> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ftaCb</cstring> </property> @@ -379,7 +379,7 @@ </widget> </grid> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addselectedBtn</cstring> </property> @@ -395,7 +395,7 @@ <string><< Add Selected</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addfilteredBtn</cstring> </property> @@ -413,7 +413,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox11</cstring> </property> @@ -424,7 +424,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>SNR</string> @@ -459,7 +459,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>selectallBtn</cstring> </property> @@ -485,9 +485,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -503,14 +503,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>okBtn</cstring> </property> @@ -544,5 +544,5 @@ <tabstop>addselectedBtn</tabstop> <tabstop>addfilteredBtn</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/dvb/sender.cpp b/kaffeine/src/input/dvb/sender.cpp index 27e5d9d..f829f1a 100644 --- a/kaffeine/src/input/dvb/sender.cpp +++ b/kaffeine/src/input/dvb/sender.cpp @@ -34,7 +34,7 @@ Sender::Sender() -bool Sender::makeSenderSocket( const QString &addr, int m_senderPort ) +bool Sender::makeSenderSocket( const TQString &addr, int m_senderPort ) { int sockopt=1; diff --git a/kaffeine/src/input/dvb/sender.h b/kaffeine/src/input/dvb/sender.h index 22e3a08..d41584a 100644 --- a/kaffeine/src/input/dvb/sender.h +++ b/kaffeine/src/input/dvb/sender.h @@ -26,13 +26,13 @@ #include <arpa/inet.h> #include <unistd.h> -#include <qthread.h> -#include <qstring.h> -#include <qobject.h> +#include <tqthread.h> +#include <tqstring.h> +#include <tqobject.h> -class Sender : public QThread, public QObject +class Sender : public TQThread, public TQObject { public: @@ -48,11 +48,11 @@ public: protected: - bool makeSenderSocket( const QString &addr, int m_senderPort ); + bool makeSenderSocket( const TQString &addr, int m_senderPort ); void closeSender(); bool isRunning; - QString sendList; + TQString sendList; }; diff --git a/kaffeine/src/input/dvb/subeditor.cpp b/kaffeine/src/input/dvb/subeditor.cpp index 1863606..314cb29 100644 --- a/kaffeine/src/input/dvb/subeditor.cpp +++ b/kaffeine/src/input/dvb/subeditor.cpp @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qlistbox.h> -#include <qspinbox.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqlistbox.h> +#include <tqspinbox.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <kmessagebox.h> #include <klocale.h> @@ -31,9 +31,9 @@ -SubEditor::SubEditor( ChannelDesc *chan, QWidget *parent ) : SubEditorUI( parent ) +SubEditor::SubEditor( ChannelDesc *chan, TQWidget *tqparent ) : SubEditorUI( tqparent ) { - QString s, t; + TQString s, t; int i; channel = chan; @@ -43,19 +43,19 @@ SubEditor::SubEditor( ChannelDesc *chan, QWidget *parent ) : SubEditorUI( parent if ( channel->nsubpid==channel->maxsubpid ) newBtn->setEnabled( false ); - connect( pidList, SIGNAL(highlighted(int)), this, SLOT(showProp(int)) ); - connect( upBtn, SIGNAL(clicked()), this, SLOT(itemUp()) ); - connect( downBtn, SIGNAL(clicked()), this, SLOT(itemDown()) ); - connect( delBtn, SIGNAL(clicked()), this, SLOT(itemDelete()) ); - connect( updateBtn, SIGNAL(clicked()), this, SLOT(itemUpdate()) ); - connect( newBtn, SIGNAL(clicked()), this, SLOT(itemNew()) ); + connect( pidList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(showProp(int)) ); + connect( upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemUp()) ); + connect( downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemDown()) ); + connect( delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemDelete()) ); + connect( updateBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemUpdate()) ); + connect( newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemNew()) ); } void SubEditor::insertItem( int index, bool updt ) { - QString s, t; + TQString s, t; s = t.setNum( channel->subpid[index].pid ); s = s+"("+t.setNum( channel->subpid[index].page )+")"; diff --git a/kaffeine/src/input/dvb/subeditor.h b/kaffeine/src/input/dvb/subeditor.h index 0a2b332..8b2c57c 100644 --- a/kaffeine/src/input/dvb/subeditor.h +++ b/kaffeine/src/input/dvb/subeditor.h @@ -29,10 +29,11 @@ class SubEditor : public SubEditorUI { Q_OBJECT + TQ_OBJECT public: - SubEditor( ChannelDesc *chan, QWidget *parent ); + SubEditor( ChannelDesc *chan, TQWidget *tqparent ); ~SubEditor(); private slots: diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui index 790b089..9fe1eca 100644 --- a/kaffeine/src/input/dvb/subeditorui.ui +++ b/kaffeine/src/input/dvb/subeditorui.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SubEditorUI</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SubEditorUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,9 +33,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -51,14 +51,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>okBtn</cstring> </property> @@ -68,15 +68,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -87,7 +87,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox" row="0" column="0"> + <widget class="TQListBox" row="0" column="0"> <item> <property name="text"> <string>New Item</string> @@ -99,31 +99,31 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <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="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>upBtn</cstring> </property> @@ -131,7 +131,7 @@ <string>Move Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>downBtn</cstring> </property> @@ -139,7 +139,7 @@ <string>Move Down</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>delBtn</cstring> </property> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -178,30 +178,30 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>180</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>updateBtn</cstring> </property> @@ -209,7 +209,7 @@ <string><< Update Selected</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>newBtn</cstring> </property> @@ -219,7 +219,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox9</cstring> </property> @@ -230,15 +230,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -246,7 +246,7 @@ <string>Pid:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -254,7 +254,7 @@ <string>Page:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -262,7 +262,7 @@ <string>Sub page:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -272,15 +272,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>pidSpin</cstring> </property> @@ -288,7 +288,7 @@ <number>8191</number> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>pageSpin</cstring> </property> @@ -296,7 +296,7 @@ <number>99999</number> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>ancSpin</cstring> </property> @@ -304,7 +304,7 @@ <number>99999</number> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>langLe</cstring> </property> @@ -350,5 +350,5 @@ <tabstop>ancSpin</tabstop> <tabstop>langLe</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaffeine/src/input/dvb/ts2rtp.cpp b/kaffeine/src/input/dvb/ts2rtp.cpp index 4784122..24ce175 100644 --- a/kaffeine/src/input/dvb/ts2rtp.cpp +++ b/kaffeine/src/input/dvb/ts2rtp.cpp @@ -65,7 +65,7 @@ Ts2Rtp::Ts2Rtp() psiBufferSize = 20*TS_SIZE; psiBuffer = (unsigned char*)malloc(psiBufferSize); - connect( &psiTimer, SIGNAL(timeout()), this, SLOT(setPSI()) ); + connect( &psiTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setPSI()) ); } @@ -81,7 +81,7 @@ Ts2Rtp::~Ts2Rtp() -void Ts2Rtp::setSocket( const QString &addr, int m_port, int m_senderPort ) +void Ts2Rtp::setSocket( const TQString &addr, int m_port, int m_senderPort ) { address = addr; port = m_port; @@ -90,11 +90,11 @@ void Ts2Rtp::setSocket( const QString &addr, int m_port, int m_senderPort ) -bool Ts2Rtp::addChannels( QPtrList<ChannelDesc> *channels ) +bool Ts2Rtp::addChannels( TQPtrList<ChannelDesc> *channels ) { int i, j, k, pmtpid=8191; ChannelDesc *desc, *d; - QValueList<int> pids; + TQValueList<int> pids; if ( !rtpSocket && !makeSocket() ) return false; @@ -102,16 +102,16 @@ bool Ts2Rtp::addChannels( QPtrList<ChannelDesc> *channels ) sendList = ""; for ( i=0; i<(int)channels->count(); i++ ) { desc = channels->at( i ); - sendList = sendList+desc->name+"|"+QString().setNum(desc->vpid)+"|"+QString().setNum(desc->apid[0].pid)+"|"; + sendList = sendList+desc->name+"|"+TQString().setNum(desc->vpid)+"|"+TQString().setNum(desc->apid[0].pid)+"|"; if ( desc->apid[0].ac3 ) sendList+= "y|"; else sendList+= "n|"; - sendList+= QString().setNum(desc->subpid[0].pid); + sendList+= TQString().setNum(desc->subpid[0].pid); sendList+= "|"; - sendList+= QString().setNum(desc->subpid[0].page); + sendList+= TQString().setNum(desc->subpid[0].page); sendList+= "|"; - sendList+= QString().setNum(desc->subpid[0].id); + sendList+= TQString().setNum(desc->subpid[0].id); sendList+= "|"; - sendList+= QString().setNum(desc->subpid[0].type); + sendList+= TQString().setNum(desc->subpid[0].type); sendList+= "|"; sendList+= desc->subpid[0].lang+"|"; for ( j=i; j<(int)channels->count(); j++ ) { @@ -123,7 +123,7 @@ bool Ts2Rtp::addChannels( QPtrList<ChannelDesc> *channels ) pids.append( d->apid[k].pid ); for ( k=0; k<d->nsubpid && k<MAX_DVBSUB; k++ ) pids.append( d->subpid[k].pid ); - while ( pmtpid==17 || pids.contains( pmtpid ) ) + while ( pmtpid==17 || pids.tqcontains( pmtpid ) ) --pmtpid; } desc->pmtpid = pmtpid--; @@ -261,7 +261,7 @@ void Ts2Rtp::setPSI() } -void Ts2Rtp::psiTables( QPtrList<ChannelDesc> *channels ) +void Ts2Rtp::psiTables( TQPtrList<ChannelDesc> *channels ) { unsigned char buf[15000]; int off, i, j, sectionOff, loopOff, descOff, max; diff --git a/kaffeine/src/input/dvb/ts2rtp.h b/kaffeine/src/input/dvb/ts2rtp.h index 36165e9..57ff246 100644 --- a/kaffeine/src/input/dvb/ts2rtp.h +++ b/kaffeine/src/input/dvb/ts2rtp.h @@ -31,8 +31,8 @@ #include <sys/socket.h> #include <arpa/inet.h> -#include <qptrlist.h> -#include <qtimer.h> +#include <tqptrlist.h> +#include <tqtimer.h> #include "sender.h" @@ -61,12 +61,13 @@ struct rtpheader { /* in network byte order */ class Ts2Rtp : public Sender { Q_OBJECT + TQ_OBJECT public: Ts2Rtp(); ~Ts2Rtp(); - void setSocket( const QString &addr, int m_port, int m_senderPort ); - bool addChannels( QPtrList<ChannelDesc> *channels ); + void setSocket( const TQString &addr, int m_port, int m_senderPort ); + bool addChannels( TQPtrList<ChannelDesc> *channels ); void removeChannels(); void process( unsigned char *buf, int size ); @@ -74,14 +75,14 @@ private: bool makeSocket(); void sendrtp( char *data, int len ); - void psiTables( QPtrList<ChannelDesc> *channels ); + void psiTables( TQPtrList<ChannelDesc> *channels ); void fillPackets( unsigned short pid, unsigned char *buf, int len, int &npack ); void calculateCRC( unsigned char *p_begin, unsigned char *p_end ); int rtpSocket; struct sockaddr_in rtpAddr; struct rtpheader hRtp; - QString address; + TQString address; int port, senderPort; unsigned char thBuf[188*10]; unsigned int CRC32[256]; @@ -89,7 +90,7 @@ private: unsigned char *psiBuffer; int psiBufferSize; int psiPackets; - QTimer psiTimer; + TQTimer psiTimer; bool writePsi; private slots: diff --git a/kaffeine/src/input/dvbclient/cdchannel.cpp b/kaffeine/src/input/dvbclient/cdchannel.cpp index 6b0fad1..41a235e 100644 --- a/kaffeine/src/input/dvbclient/cdchannel.cpp +++ b/kaffeine/src/input/dvbclient/cdchannel.cpp @@ -34,7 +34,7 @@ CdChannel::CdChannel() -CdChannel::CdChannel( const QString &n, int vp, int ap, int ac, int spid, int pg, int an, int tp, const QString &lg ) +CdChannel::CdChannel( const TQString &n, int vp, int ap, int ac, int spid, int pg, int an, int tp, const TQString &lg ) { name = n; vpid = vp; diff --git a/kaffeine/src/input/dvbclient/cdchannel.h b/kaffeine/src/input/dvbclient/cdchannel.h index 880d95e..1b56d80 100644 --- a/kaffeine/src/input/dvbclient/cdchannel.h +++ b/kaffeine/src/input/dvbclient/cdchannel.h @@ -21,7 +21,7 @@ #ifndef CDCHANNEL_H #define CDCHANNEL_H -#include <qstring.h> +#include <tqstring.h> @@ -31,15 +31,15 @@ class CdChannel public: CdChannel(); - CdChannel( const QString &n, int vp, int ap, int ac, int spid, int pg, int an, int tp, const QString &lg ); + CdChannel( const TQString &n, int vp, int ap, int ac, int spid, int pg, int an, int tp, const TQString &lg ); ~CdChannel(); - QString name; + TQString name; unsigned short vpid, apid; char ac3; unsigned short subpid, page, id; unsigned char type; - QString lang; + TQString lang; }; #endif /* CDCHANNEL_H */ diff --git a/kaffeine/src/input/dvbclient/cdcleaner.cpp b/kaffeine/src/input/dvbclient/cdcleaner.cpp index 58445a5..0a93c71 100644 --- a/kaffeine/src/input/dvbclient/cdcleaner.cpp +++ b/kaffeine/src/input/dvbclient/cdcleaner.cpp @@ -18,18 +18,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qdir.h> -#include <qstringlist.h> +#include <tqdir.h> +#include <tqstringlist.h> #include "cdcleaner.h" -CdCleaner::CdCleaner( const QString &path ) +CdCleaner::CdCleaner( const TQString &path ) { livePath = path; - connect( &timer, SIGNAL(timeout()), this, SLOT(doClean()) ); + connect( &timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doClean()) ); timer.start( 60*1000 ); } @@ -44,12 +44,12 @@ CdCleaner::~CdCleaner() void CdCleaner::doClean() { - start( QThread::LowestPriority ); + start( TQThread::LowestPriority ); } -void CdCleaner::setPath( const QString &path ) +void CdCleaner::setPath( const TQString &path ) { livePath = path; } @@ -58,11 +58,11 @@ void CdCleaner::setPath( const QString &path ) void CdCleaner::run() { - QStringList list; - QDir d; + TQStringList list; + TQDir d; d.setPath( livePath ); - list = d.entryList( "DVBClient-*.ts", QDir::Files, QDir::Name ); + list = d.entryList( "DVBClient-*.ts", TQDir::Files, TQDir::Name ); if ( list.count()>1 ) d.remove( list[0] ); } diff --git a/kaffeine/src/input/dvbclient/cdcleaner.h b/kaffeine/src/input/dvbclient/cdcleaner.h index e4423d6..0f20bd5 100644 --- a/kaffeine/src/input/dvbclient/cdcleaner.h +++ b/kaffeine/src/input/dvbclient/cdcleaner.h @@ -21,23 +21,24 @@ #ifndef CDCLEANER_H #define CDCLEANER_H -#include <qobject.h> -#include <qthread.h> -#include <qstring.h> -#include <qtimer.h> +#include <tqobject.h> +#include <tqthread.h> +#include <tqstring.h> +#include <tqtimer.h> -class CdCleaner : public QObject, public QThread +class CdCleaner : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: - CdCleaner( const QString &path ); + CdCleaner( const TQString &path ); ~CdCleaner(); - void setPath( const QString &path ); + void setPath( const TQString &path ); protected: @@ -49,8 +50,8 @@ private slots: private: - QTimer timer; - QString livePath; + TQTimer timer; + TQString livePath; }; #endif /* CDCLEANER_H */ diff --git a/kaffeine/src/input/dvbclient/cddump.cpp b/kaffeine/src/input/dvbclient/cddump.cpp index 075025a..9775cc2 100644 --- a/kaffeine/src/input/dvbclient/cddump.cpp +++ b/kaffeine/src/input/dvbclient/cddump.cpp @@ -29,7 +29,7 @@ -CdDump::CdDump( const QString &pipe ) +CdDump::CdDump( const TQString &pipe ) { unsigned int i, j, k; @@ -43,7 +43,7 @@ CdDump::CdDump( const QString &pipe ) isRunning = false; fifoName = pipe; - connect( &timerPatPmt, SIGNAL(timeout()), this, SLOT(setPatPmt()) ); + connect( &timerPatPmt, TQT_SIGNAL(timeout()), this, TQT_SLOT(setPatPmt()) ); timerPatPmt.start( 500 ); } @@ -185,7 +185,7 @@ void CdDump::setPatPmt() -bool CdDump::go( const QString &ad, int port, CdChannel c ) +bool CdDump::go( const TQString &ad, int port, CdChannel c ) { int sockopt=1; @@ -262,7 +262,7 @@ CdDump::~CdDump() -bool CdDump::doPause( const QString &name ) +bool CdDump::doPause( const TQString &name ) { if ( !timeShifting ) { timeShiftFileName = name; diff --git a/kaffeine/src/input/dvbclient/cddump.h b/kaffeine/src/input/dvbclient/cddump.h index 695eb4b..27be1b8 100644 --- a/kaffeine/src/input/dvbclient/cddump.h +++ b/kaffeine/src/input/dvbclient/cddump.h @@ -27,11 +27,11 @@ #include <sys/socket.h> #include <arpa/inet.h> -#include <qthread.h> -#include <qobject.h> -#include <qstring.h> -#include <qfile.h> -#include <qtimer.h> +#include <tqthread.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqtimer.h> #include "cdchannel.h" @@ -55,18 +55,19 @@ struct srtpheader { /* in network byte order */ -class CdDump : public QObject, public QThread +class CdDump : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public : - CdDump( const QString &pipe ); + CdDump( const TQString &pipe ); ~CdDump(); virtual void run(); - bool go( const QString &ad, int port, CdChannel c ); + bool go( const TQString &ad, int port, CdChannel c ); void stop(); - bool doPause( const QString &name ); + bool doPause( const TQString &name ); bool running() const; private slots: @@ -79,12 +80,12 @@ private : void writePat(); void calculateCRC( unsigned char *p_begin, unsigned char *p_end ); - QFile liveFile; + TQFile liveFile; bool timeShifting; - QString timeShiftFileName; + TQString timeShiftFileName; int waitPause; int fdPipe; - QString fifoName; + TQString fifoName; bool isRunning; int sock; struct sockaddr_in addr; @@ -93,7 +94,7 @@ private : unsigned char tspmt[188]; unsigned int CRC32[256]; int pmtpid; - QTimer timerPatPmt; + TQTimer timerPatPmt; bool patpmt; signals: diff --git a/kaffeine/src/input/dvbclient/cdlisten.cpp b/kaffeine/src/input/dvbclient/cdlisten.cpp index 89ea3c7..2493d11 100644 --- a/kaffeine/src/input/dvbclient/cdlisten.cpp +++ b/kaffeine/src/input/dvbclient/cdlisten.cpp @@ -29,7 +29,7 @@ CdListen::CdListen() { - connect( &timer, SIGNAL(timeout()), this, SLOT(updateList()) ); + connect( &timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList()) ); } @@ -65,7 +65,7 @@ void CdListen::stop() -bool CdListen::go( const QString &ad, int port ) +bool CdListen::go( const TQString &ad, int port ) { if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) { KMessageBox::information( 0, i18n("Can't open info socket."), i18n("DVB Client") ); diff --git a/kaffeine/src/input/dvbclient/cdlisten.h b/kaffeine/src/input/dvbclient/cdlisten.h index 2e1bc7e..3ae95e0 100644 --- a/kaffeine/src/input/dvbclient/cdlisten.h +++ b/kaffeine/src/input/dvbclient/cdlisten.h @@ -25,21 +25,22 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <qobject.h> -#include <qthread.h> -#include <qtimer.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqthread.h> +#include <tqtimer.h> +#include <tqstring.h> -class CdListen : public QObject, public QThread +class CdListen : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: CdListen(); ~CdListen(); virtual void run(); - bool go( const QString &ad, int port ); + bool go( const TQString &ad, int port ); void stop(); private slots: @@ -51,12 +52,12 @@ private: int sock; struct sockaddr_in addr; bool isRunning; - QTimer timer; - QString currentList, newList; + TQTimer timer; + TQString currentList, newList; signals: - void listChanged( const QString& ); + void listChanged( const TQString& ); }; #endif /* CDLISTEN_H */ diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp index f28d128..f71579d 100644 --- a/kaffeine/src/input/dvbclient/cdwidget.cpp +++ b/kaffeine/src/input/dvbclient/cdwidget.cpp @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <qapplication.h> -#include <qlayout.h> -#include <qdir.h> +#include <tqapplication.h> +#include <tqlayout.h> +#include <tqdir.h> #include <kiconloader.h> #include <klocale.h> @@ -29,19 +29,19 @@ -CdWidget::CdWidget( const QString &ad, int port, int info, const QString &tspath, QWidget *parent, QObject *objParent, const char *name ) +CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspath, TQWidget *tqparent, TQObject *objParent, const char *name ) : KaffeineInput( objParent, name ) { - mainWidget = new QVBox( parent ); - mainWidget->setSizePolicy( QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred) ); - split = new QSplitter( mainWidget ); + mainWidget = new TQVBox( tqparent ); + mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); + split = new TQSplitter( mainWidget ); split->setOpaqueResize( true ); - playerBox = new QVBox( split ); + playerBox = new TQVBox( split ); playerBox->setMinimumWidth( 200 ); - channelsLb = new QListBox( split ); + channelsLb = new TQListBox( split ); split->moveToFirst( channelsLb ); - channelsLb->setSizePolicy( QSizePolicy (QSizePolicy::Preferred, QSizePolicy::MinimumExpanding) ); - split->setResizeMode( channelsLb, QSplitter::KeepSize ); + channelsLb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) ); + split->setResizeMode( channelsLb, TQSplitter::KeepSize ); cdAddress = ad; cdPort = port; @@ -62,8 +62,8 @@ CdWidget::CdWidget( const QString &ad, int port, int info, const QString &tspath listen = new CdListen(); listen->go( cdAddress, cdInfo ); - fifoName = QDir::homeDirPath()+"/.kaxclient.ts"; - QFile f( fifoName ); + fifoName = TQDir::homeDirPath()+"/.kaxclient.ts"; + TQFile f( fifoName ); if ( f.exists() ) f.remove(); if ( (mkfifo( fifoName.ascii(), 0644 ))<0 ) { perror( fifoName.latin1() ); @@ -72,8 +72,8 @@ CdWidget::CdWidget( const QString &ad, int port, int info, const QString &tspath } else { dump = new CdDump( fifoName ); - connect( channelsLb, SIGNAL(selected(const QString &)), this, SLOT(channelSelected(const QString &)) ); - connect( listen, SIGNAL(listChanged(const QString&)), this, SLOT(updateList(const QString&)) ); + connect( channelsLb, TQT_SIGNAL(selected(const TQString &)), this, TQT_SLOT(channelSelected(const TQString &)) ); + connect( listen, TQT_SIGNAL(listChanged(const TQString&)), this, TQT_SLOT(updateList(const TQString&)) ); } lastChannel = 0; @@ -93,7 +93,7 @@ void CdWidget::togglePanel() -void CdWidget::getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames ) +void CdWidget::getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames ) { uiNames.append( i18n("DVB Client") ); iconNames.append( "network" ); @@ -102,11 +102,11 @@ void CdWidget::getTargets( QStringList &uiNames, QStringList &iconNames, QString -bool CdWidget::execTarget( const QString &target ) +bool CdWidget::execTarget( const TQString &target ) { if ( target=="DVBCLIENT" ) { emit showMe( this ); - QTimer::singleShot( 100, this, SLOT(playLastChannel()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(playLastChannel()) ); return true; } return false; @@ -114,14 +114,14 @@ bool CdWidget::execTarget( const QString &target ) -QWidget* CdWidget::wantPlayerWindow() +TQWidget* CdWidget::wantPlayerWindow() { return playerBox; } -QWidget* CdWidget::inputMainWidget() +TQWidget* CdWidget::inputMainWidget() { return mainWidget; } @@ -142,7 +142,7 @@ CdWidget::~CdWidget() void CdWidget::loadConfig( KConfig* config ) { - QValueList<int> sl; + TQValueList<int> sl; config->setGroup("DVBClient"); sl = config->readIntListEntry("SplitSizes"); @@ -164,12 +164,12 @@ void CdWidget::saveConfig() -void CdWidget::updateList( const QString &list ) +void CdWidget::updateList( const TQString &list ) { - QString c; - QString s = list; + TQString c; + TQString s = list; int pos; - QString name, lang; + TQString name, lang; int apid, vpid, ac3, subpid, page, id, type; if ( dump->running() ) @@ -180,32 +180,32 @@ void CdWidget::updateList( const QString &list ) chan.clear(); if ( list=="quit" ) return; - while ( (pos = s.find("|"))!=-1 ) { + while ( (pos = s.tqfind("|"))!=-1 ) { name = s.left( pos ); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); vpid = s.left( pos ).toInt(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); apid = s.left( pos ).toInt(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); if ( s.left( pos )=="n" ) ac3 = 0; else ac3 = 1; s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); subpid = s.left( pos ).toInt(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); page = s.left( pos ).toInt(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); id = s.left( pos ).toInt(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); type = s.left( pos ).toInt(); s = s.right( s.length()-pos-1 ); - pos = s.find("|"); + pos = s.tqfind("|"); lang = s.left( pos ); s = s.right( s.length()-pos-1 ); chan.append( new CdChannel( name, vpid, apid, ac3, subpid, page, id, type, lang ) ); @@ -302,7 +302,7 @@ void CdWidget::previous() -void CdWidget::channelSelected( const QString &name ) +void CdWidget::channelSelected( const TQString &name ) { int i; @@ -324,7 +324,7 @@ void CdWidget::pauseLiveTV() if ( !dump ) return; if ( dump->running() ) { - timeShiftFileName = cdShiftDir+"DVBClient-"+QDateTime::currentDateTime().toString( Qt::ISODate )+".ts"; + timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::tqcurrentDateTime().toString( Qt::ISODate )+".ts"; if ( dump->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName ); } } @@ -348,7 +348,7 @@ void CdWidget::enableLive( bool b ) -void CdWidget::setParam( const QString &ad, int port, int info, const QString &tspath ) +void CdWidget::setParam( const TQString &ad, int port, int info, const TQString &tspath ) { cdAddress = ad; cdPort = port; diff --git a/kaffeine/src/input/dvbclient/cdwidget.h b/kaffeine/src/input/dvbclient/cdwidget.h index 2862320..51d70fa 100644 --- a/kaffeine/src/input/dvbclient/cdwidget.h +++ b/kaffeine/src/input/dvbclient/cdwidget.h @@ -21,11 +21,11 @@ #ifndef CDWIDGET_H #define CDWIDGET_H -#include <qlistbox.h> -#include <qpixmap.h> -#include <qptrlist.h> -#include <qvbox.h> -#include <qsplitter.h> +#include <tqlistbox.h> +#include <tqpixmap.h> +#include <tqptrlist.h> +#include <tqvbox.h> +#include <tqsplitter.h> #include <kconfig.h> @@ -39,34 +39,35 @@ class CdWidget : public KaffeineInput { Q_OBJECT + TQ_OBJECT public: - CdWidget( const QString &ad, int port, int info, const QString &tspath, QWidget *parent, QObject *objParent, const char *name ); + CdWidget( const TQString &ad, int port, int info, const TQString &tspath, TQWidget *tqparent, TQObject *objParent, const char *name ); ~CdWidget(); - void setParam( const QString &ad, int port, int info, const QString &tspath ); + void setParam( const TQString &ad, int port, int info, const TQString &tspath ); void enableLive( bool b ); void playNumChannel( int num ); void next(); void previous(); // Reimplemented from KaffeineInput - QWidget *wantPlayerWindow(); - QWidget *inputMainWidget(); + TQWidget *wantPlayerWindow(); + TQWidget *inputMainWidget(); bool nextTrack( MRL& ); bool previousTrack( MRL& ); bool currentTrack( MRL& ); bool trackNumber( int, MRL& ); bool playbackFinished( MRL& ); - void getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames ); + void getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames ); void togglePanel(); - bool execTarget( const QString& ); + bool execTarget( const TQString& ); void saveConfig(); //*************************************** - QListBox *channelsLb; - QVBox *mainWidget; - QVBox *playerBox; + TQListBox *channelsLb; + TQVBox *mainWidget; + TQVBox *playerBox; public slots: @@ -78,30 +79,30 @@ private: void loadConfig( KConfig* config ); void saveConfig( KConfig* config ); - QSplitter *split; + TQSplitter *split; CdDump *dump; CdListen *listen; - QString cdAddress; + TQString cdAddress; int cdPort; int cdInfo; - QString cdShiftDir; - QPixmap tvPix, raPix; - QPtrList<CdChannel> chan; - QString fifoName; - QString timeShiftFileName; + TQString cdShiftDir; + TQPixmap tvPix, raPix; + TQPtrList<CdChannel> chan; + TQString fifoName; + TQString timeShiftFileName; CdCleaner *cleaner; int lastChannel; private slots: - void updateList( const QString &list ); - void channelSelected( const QString &name ); + void updateList( const TQString &list ); + void channelSelected( const TQString &name ); signals: - void dvbOpen(const QString&, const QString&, int); + void dvbOpen(const TQString&, const TQString&, int); void dvbStop(); - void setTimeShiftFilename( const QString& ); + void setTimeShiftFilename( const TQString& ); }; #endif /* CDWIDGET_H */ diff --git a/kaffeine/src/input/kaffeineinput.cpp b/kaffeine/src/input/kaffeineinput.cpp index 74d4a8b..0547c1c 100644 --- a/kaffeine/src/input/kaffeineinput.cpp +++ b/kaffeine/src/input/kaffeineinput.cpp @@ -20,7 +20,7 @@ #include "kaffeineinput.h" -KaffeineInput::KaffeineInput(QObject* parent, const char* name) : QObject( parent, name ) +KaffeineInput::KaffeineInput(TQObject* tqparent, const char* name) : TQObject( tqparent, name ) { } diff --git a/kaffeine/src/input/kaffeineinput.h b/kaffeine/src/input/kaffeineinput.h index 0670178..6b327f9 100644 --- a/kaffeine/src/input/kaffeineinput.h +++ b/kaffeine/src/input/kaffeineinput.h @@ -21,25 +21,26 @@ #ifndef KAFFEINEINPUT_H #define KAFFEINEINPUT_H -#include <qstring.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqwidget.h> #include <kxmlguiclient.h> class MRL; -class KaffeineInput : public QObject, public KXMLGUIClient +class KaffeineInput : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - KaffeineInput(QObject* parent, const char* name); + KaffeineInput(TQObject* tqparent, const char* name); virtual ~KaffeineInput(); // if you want the player window to be displayed on one of your widgets, return a pointer to that one. - virtual QWidget *wantPlayerWindow() {return NULL;} + virtual TQWidget *wantPlayerWindow() {return NULL;} // you MUST return your main widget (the one containing all your gui). - virtual QWidget *inputMainWidget() {return NULL;} + virtual TQWidget *inputMainWidget() {return NULL;} // called when the user want next track and you are the current input. // fill the MRL and return true to play your next track. @@ -74,10 +75,10 @@ public: virtual void mergeMeta(const MRL&) {} // shortcuts buttons to be displayed in the start window. - virtual void getTargets( QStringList&/*uiNames*/, QStringList&/*iconNames*/, QStringList&/*targetNames*/ ) {} + virtual void getTargets( TQStringList&/*uiNames*/, TQStringList&/*iconNames*/, TQStringList&/*targetNames*/ ) {} // play shortcut, return false if the target is not yours; - virtual bool execTarget( const QString&/*target*/ ) {return false;} + virtual bool execTarget( const TQString&/*target*/ ) {return false;} // toggle your panel (show / hide) if any virtual void togglePanel() {} @@ -97,7 +98,7 @@ signals: void play(const MRL&, KaffeineInput*/*this*/); // emit that if you want a message to be displayed in statusbar. (do that only if you are the current input, e.g. after play()) - void statusBarMessage(const QString&); + void statusBarMessage(const TQString&); // emit that if you want to stop the player. Be aware that it'll end with a call to playerStopped(). // you usually don't need that. |