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

Rename a number of old tq methods that are no longer tq specific

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 62e4e67d99
commit 18f2e55a9d
61 changed files with 530 additions and 530 deletions
Show Stats Download Patch File Download Diff File

2
kaffeine/src/input/audiobrowser/googlefetcher.cpp
Unescape View File

@ -108,7 +108,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
kdDebug() << "Performing Google Search: " << url << endl; kdDebug() << "Performing Google Search: " << url << endl;
search.load(url.url()+TQString("&start=%1&sa=N").tqarg(galleryPage*20) ); search.load(url.url()+TQString("&start=%1&sa=N").arg(galleryPage*20) );
TQString text = search.toString().string(); TQString text = search.toString().string();

8
kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
Unescape View File

@ -87,9 +87,9 @@ GoogleFetcherDialog::~GoogleFetcherDialog()
void GoogleFetcherDialog::setLayout() void GoogleFetcherDialog::setLayout()
{ {
setCaption(TQString("%1 - %2 (%3)") setCaption(TQString("%1 - %2 (%3)")
.tqarg(m_artist) .arg(m_artist)
.tqarg(m_album) .arg(m_album)
.tqarg(m_imageList.size())); .arg(m_imageList.size()));
m_iconWidget->clear(); m_iconWidget->clear();
for(uint i = 0; i < m_imageList.size(); i++) for(uint i = 0; i < m_imageList.size(); i++)
@ -237,7 +237,7 @@ CoverIconViewItem::~CoverIconViewItem()
void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data) void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
{ {
int currentSize = m_buffer.size(); int currentSize = m_buffer.size();
m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim); m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size()); memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
} }

78
kaffeine/src/input/audiobrowser/playlist.cpp
Unescape View File

@ -46,18 +46,18 @@
#include <kurlcompletion.h> #include <kurlcompletion.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqclipboard.h> #include <clipboard.h>
#include <tqdragobject.h> #include <tqdragobject.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqdom.h> #include <tqdom.h>
#include <tqxml.h> #include <tqxml.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqheader.h> #include <tqheader.h>
#include <tqlayout.h> #include <layout.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <tqlistbox.h> #include <tqlistbox.h>
#include <tqtextcodec.h> #include <textcodec.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqinputdialog.h> #include <tqinputdialog.h>
#include <tqtimer.h> #include <tqtimer.h>
@ -75,14 +75,14 @@
RollTitle::RollTitle( TQWidget *parent ) : TQLabel( "I", parent ) RollTitle::RollTitle( TQWidget *parent ) : TQLabel( "I", parent )
{ {
TQColorGroup cg = parentWidget()->tqcolorGroup(); TQColorGroup cg = parentWidget()->colorGroup();
TQColor base = cg.base(); TQColor base = cg.base();
TQColor selection = cg.highlight(); TQColor selection = cg.highlight();
int r = (base.red() + selection.red()) / 2; int r = (base.red() + selection.red()) / 2;
int b = (base.blue() + selection.blue()) / 2; int b = (base.blue() + selection.blue()) / 2;
int g = (base.green() + selection.green()) / 2; int g = (base.green() + selection.green()) / 2;
back = TQColor(r, g, b); back = TQColor(r, g, b);
fore = parentWidget()->tqcolorGroup().text(); fore = parentWidget()->colorGroup().text();
setPaletteBackgroundColor( back ); setPaletteBackgroundColor( back );
setPaletteForegroundColor( fore ); setPaletteForegroundColor( fore );
setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
@ -115,7 +115,7 @@ void RollTitle::setTitle( TQString t )
{ {
TQLabel *lab = new TQLabel( t, this ); TQLabel *lab = new TQLabel( t, this );
lab->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); lab->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
lab->resize( lab->tqsizeHint() ); lab->resize( lab->sizeHint() );
int x = 2*lab->frameWidth(); int x = 2*lab->frameWidth();
titlePix = TQPixmap( lab->width()-x, height()-x, -1, TQPixmap::BestOptim ); titlePix = TQPixmap( lab->width()-x, height()-x, -1, TQPixmap::BestOptim );
delete lab; delete lab;
@ -149,7 +149,7 @@ void RollTitle::rollTitle()
void RollTitle::paintEvent( TQPaintEvent *pe ) void RollTitle::paintEvent( TQPaintEvent *pe )
{ {
TQLabel::paintEvent( pe ); TQLabel::paintEvent( pe );
TQColorGroup cg = parentWidget()->tqcolorGroup(); TQColorGroup cg = parentWidget()->colorGroup();
TQColor base = cg.base(); TQColor base = cg.base();
TQColor selection = cg.highlight(); TQColor selection = cg.highlight();
int r = (base.red() + selection.red()) / 2; int r = (base.red() + selection.red()) / 2;
@ -157,7 +157,7 @@ void RollTitle::paintEvent( TQPaintEvent *pe )
int g = (base.green() + selection.green()) / 2; int g = (base.green() + selection.green()) / 2;
back=TQColor(r,g,b); back=TQColor(r,g,b);
setPaletteBackgroundColor( back ); setPaletteBackgroundColor( back );
fore = parentWidget()->tqcolorGroup().text(); fore = parentWidget()->colorGroup().text();
setPaletteForegroundColor( fore ); setPaletteForegroundColor( fore );
setTitle( title ); setTitle( title );
} }
@ -169,10 +169,10 @@ struct CoverPopup : public TQWidget
CoverPopup(const TQPixmap &image, const TQPoint &p) : CoverPopup(const TQPixmap &image, const TQPoint &p) :
TQWidget(0, 0, WDestructiveClose | WX11BypassWM) TQWidget(0, 0, WDestructiveClose | WX11BypassWM)
{ {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
TQLabel *label = new TQLabel(this); TQLabel *label = new TQLabel(this);
tqlayout->addWidget(label); layout->addWidget(label);
label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
label->setLineWidth(1); label->setLineWidth(1);
label->setPixmap(image); label->setPixmap(image);
@ -283,7 +283,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
google = NULL; google = NULL;
mainWidget = new TQVBox( parent ); mainWidget = new TQVBox( parent );
//mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); //mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
hSplit = new TQSplitter( mainWidget ); hSplit = new TQSplitter( mainWidget );
hSplit->setOpaqueResize( true ); hSplit->setOpaqueResize( true );
panel = new TQVBox( hSplit ); panel = new TQVBox( hSplit );
@ -342,7 +342,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget); KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget);
kdDebug() << "PLAYLIST" << endl; kdDebug() << "PLAYLIST" << endl;
TQGridLayout* tqlayout = new TQGridLayout( playlist, 4, 2, 3 ); TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 );
m_list = new UrlListView(playlist); m_list = new UrlListView(playlist);
mainWidget->setAcceptDrops(true); mainWidget->setAcceptDrops(true);
@ -379,12 +379,12 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
m_list->setRenameable(TRACK_COLUMN); m_list->setRenameable(TRACK_COLUMN);
m_list->setAllColumnsShowFocus(true); m_list->setAllColumnsShowFocus(true);
m_list->setShowSortIndicator(true); m_list->setShowSortIndicator(true);
tqlayout->addMultiCellWidget(m_list, 3, 3, 0, 1); layout->addMultiCellWidget(m_list, 3, 3, 0, 1);
coverFrame = new CoverFrame( playlist ); coverFrame = new CoverFrame( playlist );
coverFrame->setFixedWidth( 80 ); coverFrame->setFixedWidth( 80 );
coverFrame->setFixedHeight( 80 ); coverFrame->setFixedHeight( 80 );
tqlayout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); layout->addMultiCellWidget(coverFrame, 0, 2, 0, 0);
TQHBoxLayout *h1 = new TQHBoxLayout(); TQHBoxLayout *h1 = new TQHBoxLayout();
searchBtn = new TQToolButton( playlist ); searchBtn = new TQToolButton( playlist );
@ -397,23 +397,23 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
m_playlistFilter = new KLineEdit(playlist); m_playlistFilter = new KLineEdit(playlist);
m_playlistFilter->setFocusPolicy(TQ_ClickFocus); m_playlistFilter->setFocusPolicy(TQ_ClickFocus);
h1->addWidget(m_playlistFilter); h1->addWidget(m_playlistFilter);
tqlayout->addLayout( h1, 2, 1 ); layout->addLayout( h1, 2, 1 );
TQHBoxLayout *h2 = new TQHBoxLayout(); TQHBoxLayout *h2 = new TQHBoxLayout();
TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist); TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist);
h2->addWidget(playlistLabel); h2->addWidget(playlistLabel);
m_playlistSelector = new KComboBox( playlist ); m_playlistSelector = new KComboBox( playlist );
m_playlistSelector->setMinimumWidth(10); m_playlistSelector->setMinimumWidth(10);
m_playlistSelector->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) ); m_playlistSelector->setSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) );
m_playlistSelector->setEditable(true); m_playlistSelector->setEditable(true);
m_playlistSelector->setDuplicatesEnabled(false); m_playlistSelector->setDuplicatesEnabled(false);
m_playlistSelector->setFocusPolicy(TQ_ClickFocus); m_playlistSelector->setFocusPolicy(TQ_ClickFocus);
TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'.")); TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'."));
h2->addWidget(m_playlistSelector); h2->addWidget(m_playlistSelector);
tqlayout->addLayout( h2, 1, 1 ); layout->addLayout( h2, 1, 1 );
roller = new RollTitle( playlist ); roller = new RollTitle( playlist );
tqlayout->addWidget( roller, 0, 1 ); layout->addWidget( roller, 0, 1 );
KAccel* accel = new KAccel(mainWidget); KAccel* accel = new KAccel(mainWidget);
accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected())); accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
@ -706,7 +706,7 @@ MRL PlayList::getCurrent()
if (isQueueMode()) if (isQueueMode())
{ {
m_queue.clear(); m_queue.clear();
updatetqStatus(); updateStatus();
} }
if (m_random) if (m_random)
@ -747,7 +747,7 @@ bool PlayList::nextTrack( MRL &mrl )
{ {
mrl = m_queue.first(); mrl = m_queue.first();
m_queue.remove(m_queue.begin()); m_queue.remove(m_queue.begin());
updatetqStatus(); updateStatus();
return true; return true;
} }
@ -802,7 +802,7 @@ bool PlayList::previousTrack( MRL &mrl )
if (isQueueMode()) if (isQueueMode())
{ {
m_queue.clear(); m_queue.clear();
updatetqStatus(); updateStatus();
} }
if (!m_currentEntry) { if (!m_currentEntry) {
@ -1349,7 +1349,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
delete progress; delete progress;
if (m_random) createRandomList(); if (m_random) createRandomList();
updatetqStatus(); updateStatus();
} }
void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after) void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after)
@ -1357,7 +1357,7 @@ void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after)
TQValueList<MRL>::ConstIterator end(mrlList.end()); TQValueList<MRL>::ConstIterator end(mrlList.end());
for (TQValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it) for (TQValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it)
after = insertItem(after, *it); after = insertItem(after, *it);
updatetqStatus(); updateStatus();
if (m_random) createRandomList(); if (m_random) createRandomList();
} }
@ -1419,7 +1419,7 @@ void PlayList::clearList()
m_playlistFilter->clear(); m_playlistFilter->clear();
m_searchSelection = false; m_searchSelection = false;
} }
updatetqStatus(); updateStatus();
m_currentEntry = NULL; m_currentEntry = NULL;
m_currentRandomListEntry = -1; m_currentRandomListEntry = -1;
} }
@ -1435,7 +1435,7 @@ void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after)
{ {
for (uint i=0; i < urls.count() ;i++) for (uint i=0; i < urls.count() ;i++)
{ {
//KURL url(TQUriDrag::tqunicodeUriToUri(urls[i])); //KURL url(TQUriDrag::unicodeUriToUri(urls[i]));
//newurls << url.path(-1); //newurls << url.path(-1);
//kdDebug() << "PlayList: Dropped " << url.path() << endl; //kdDebug() << "PlayList: Dropped " << url.path() << endl;
newurls << urls[i]; newurls << urls[i];
@ -1453,7 +1453,7 @@ void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after)
else else
if (strcmp(dev->format(), "text/x-moz-url") == 0) /* for mozilla drops */ if (strcmp(dev->format(), "text/x-moz-url") == 0) /* for mozilla drops */
{ {
TQByteArray data = dev->tqencodedData("text/plain"); TQByteArray data = dev->encodedData("text/plain");
TQString md(data); TQString md(data);
add(md, after); add(md, after);
} }
@ -1602,7 +1602,7 @@ void PlayList::mergeMeta(const MRL& mrl)
if (tmp->isVisible()) if (tmp->isVisible())
m_playTimeVisible += timeStringToMs(tmp->length()); m_playTimeVisible += timeStringToMs(tmp->length());
updatetqStatus(); updateStatus();
} }
} }
@ -1762,10 +1762,10 @@ void PlayList::slotRemoveSelected()
} }
if (m_random) createRandomList(); if (m_random) createRandomList();
updatetqStatus(); updateStatus();
} }
void PlayList::updatetqStatus() void PlayList::updateStatus()
{ {
TQString status; TQString status;
if (isQueueMode()) if (isQueueMode())
@ -1774,14 +1774,14 @@ void PlayList::updatetqStatus()
TQValueList<MRL>::ConstIterator end(m_queue.end()); TQValueList<MRL>::ConstIterator end(m_queue.end());
for (TQValueList<MRL>::ConstIterator it = m_queue.begin(); it != end; ++it) for (TQValueList<MRL>::ConstIterator it = m_queue.begin(); it != end; ++it)
total = total.addSecs(TQTime().secsTo((*it).length())); total = total.addSecs(TQTime().secsTo((*it).length()));
status = i18n("Queue: %1 Entries, Playtime: %2").tqarg(m_queue.count()).tqarg(total.toString("h:mm:ss")); status = i18n("Queue: %1 Entries, Playtime: %2").arg(m_queue.count()).arg(total.toString("h:mm:ss"));
} }
else else
{ {
//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 (Total: %3, %4)").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible)).arg(TQString::number(m_list->childCount())).arg(msToTimeString(m_playTime));
status = i18n("Entries: %1, Playtime: %2").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible)); status = i18n("Entries: %1, Playtime: %2").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible));
} }
emit statusBarMessage(status); emit statusBarMessage(status);
} }
@ -1886,7 +1886,7 @@ void PlayList::saveCurrentPlaylist()
void PlayList::removeCurrentPlaylist() void PlayList::removeCurrentPlaylist()
{ {
int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").tqarg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del()); int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").arg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
if (code == KMessageBox::Continue) if (code == KMessageBox::Continue)
{ {
TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine"; TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
@ -2121,7 +2121,7 @@ void PlayList::slotFindText(const TQString& text)
m_searchSelection = true; m_searchSelection = true;
if (m_random) createRandomList(); if (m_random) createRandomList();
updatetqStatus(); updateStatus();
} }
@ -2145,7 +2145,7 @@ void PlayList::slotPaste()
TQStrList list; TQStrList list;
if (TQUriDrag::decode(TQApplication::tqclipboard()->data(), list)) if (TQUriDrag::decode(TQApplication::clipboard()->data(), list))
{ {
TQStringList urls; TQStringList urls;
for (TQStrListIterator it(list); *it; ++it) for (TQStrListIterator it(list); *it; ++it)
@ -2155,7 +2155,7 @@ void PlayList::slotPaste()
} }
/** try to decode as text **/ /** try to decode as text **/
TQString text; TQString text;
if (TQTextDrag::decode(TQApplication::tqclipboard()->data(), text)) if (TQTextDrag::decode(TQApplication::clipboard()->data(), text))
{ {
add(text, lastSelected); add(text, lastSelected);
} }
@ -2170,10 +2170,10 @@ void PlayList::slotCopy()
for (uint i=0; i<selected.count(); i++) for (uint i=0; i<selected.count(); i++)
{ {
urlList.append(TQUriDrag::tqunicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url())); urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
} }
TQApplication::tqclipboard()->setData(new TQUriDrag(urlList)); TQApplication::clipboard()->setData(new TQUriDrag(urlList));
} }
void PlayList::slotSelectAll() void PlayList::slotSelectAll()
@ -2209,7 +2209,7 @@ void PlayList::slotPlaylistFromSelected()
void PlayList::slotAddToQueue(MRL mrl) void PlayList::slotAddToQueue(MRL mrl)
{ {
m_queue.append(mrl); m_queue.append(mrl);
updatetqStatus(); updateStatus();
} }
/**** helper ****/ /**** helper ****/

2
kaffeine/src/input/audiobrowser/playlist.h
Unescape View File

@ -239,7 +239,7 @@ private slots:
private: private:
TQListViewItem* insertItem(TQListViewItem* after, const MRL&); TQListViewItem* insertItem(TQListViewItem* after, const MRL&);
void updatetqStatus(); void updateStatus();
void createRandomList(); void createRandomList();
void getMetaInfo(MRL& mrl, const TQString& mimeName); void getMetaInfo(MRL& mrl, const TQString& mimeName);
void setupActions(); void setupActions();

10
kaffeine/src/input/audiobrowser/playlistitem.cpp
Unescape View File

@ -249,10 +249,10 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
{ {
if (isCurrent) if (isCurrent)
{ {
TQColorGroup tqcolorGroup = cg; TQColorGroup colorGroup = cg;
TQColor base = tqcolorGroup.base(); TQColor base = colorGroup.base();
TQColor selection = tqcolorGroup.highlight(); TQColor selection = colorGroup.highlight();
int r = (base.red() + selection.red()) / 2; int r = (base.red() + selection.red()) / 2;
int b = (base.blue() + selection.blue()) / 2; int b = (base.blue() + selection.blue()) / 2;
@ -260,8 +260,8 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
TQColor c(r, g, b); TQColor c(r, g, b);
tqcolorGroup.setColor(TQColorGroup::Base, c); colorGroup.setColor(TQColorGroup::Base, c);
TQListViewItem::paintCell(p, tqcolorGroup, column, width, align); TQListViewItem::paintCell(p, colorGroup, column, width, align);
} }
else else
return KListViewItem::paintCell(p, cg, column, width, align); return KListViewItem::paintCell(p, cg, column, width, align);

6
kaffeine/src/input/disc/cddb.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqtextstream.h> #include <textstream.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tqstring.h> #include <tqstring.h>
@ -302,7 +302,7 @@ bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream)
for (int i = 0; i < m_tracks; i++) for (int i = 0; i < m_tracks; i++)
{ {
if (m_names[i].isEmpty()) if (m_names[i].isEmpty())
m_names[i] += i18n("Track %1").tqarg(i); m_names[i] += i18n("Track %1").arg(i);
m_names[i].replace(TQRegExp("/"), "%2f"); m_names[i].replace(TQRegExp("/"), "%2f");
kdDebug(7101) << "CDDB: found Track " << i+1 << ": `" << m_names[i] kdDebug(7101) << "CDDB: found Track " << i+1 << ": `" << m_names[i]
<< "'" << endl; << "'" << endl;
@ -328,7 +328,7 @@ bool CDDB::searchLocal(unsigned int id, TQFile *ret_file)
{ {
TQDir dir; TQDir dir;
TQString filename; TQString filename;
filename = TQString("%1").tqarg(id, 0, 16).rightJustify(8, '0'); filename = TQString("%1").arg(id, 0, 16).rightJustify(8, '0');
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it) for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it)
{ {

52
kaffeine/src/input/disc/disc.cpp
Unescape View File

@ -19,7 +19,7 @@
*/ */
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqlayout.h> #include <layout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqcursor.h> #include <tqcursor.h>
@ -50,7 +50,7 @@ MLabel::MLabel( TQWidget *parent ) : TQLabel( parent )
void MLabel::paintEvent( TQPaintEvent *pe ) void MLabel::paintEvent( TQPaintEvent *pe )
{ {
TQLabel::paintEvent( pe ); TQLabel::paintEvent( pe );
TQColorGroup cg = parentWidget()->tqcolorGroup(); TQColorGroup cg = parentWidget()->colorGroup();
TQColor base = cg.base(); TQColor base = cg.base();
TQColor selection = cg.highlight(); TQColor selection = cg.highlight();
int r = (base.red() + selection.red()) / 2; int r = (base.red() + selection.red()) / 2;
@ -76,22 +76,22 @@ void MListView::resizeEvent( TQResizeEvent *rev )
Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name) Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
{ {
mainWidget = new TQVBox( parent ); mainWidget = new TQVBox( parent );
mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); mainWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
split = new TQSplitter( mainWidget ); split = new TQSplitter( mainWidget );
split->setOpaqueResize( true ); split->setOpaqueResize( true );
widg = new TQWidget( split ); widg = new TQWidget( split );
widg->setMinimumWidth( 200 ); widg->setMinimumWidth( 200 );
widg->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); widg->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
TQVBoxLayout *wb = new TQVBoxLayout( widg, 0, 0 ); TQVBoxLayout *wb = new TQVBoxLayout( widg, 0, 0 );
discLab = new MLabel( widg ); discLab = new MLabel( widg );
wb->addWidget( discLab ); wb->addWidget( discLab );
playerBox = new TQVBox( widg ); playerBox = new TQVBox( widg );
wb->addWidget( playerBox ); wb->addWidget( playerBox );
playerBox->setMinimumWidth( 200 ); playerBox->setMinimumWidth( 200 );
playerBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); playerBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
panel = new TQFrame( split ); panel = new TQFrame( split );
split->moveToFirst( panel ); split->moveToFirst( panel );
panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
split->setResizeMode( panel, TQSplitter::KeepSize ); split->setResizeMode( panel, TQSplitter::KeepSize );
TQVBoxLayout *vb = new TQVBoxLayout( panel, 3, 3 ); TQVBoxLayout *vb = new TQVBoxLayout( panel, 3, 3 );
@ -99,13 +99,13 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
cdBtn->setTextLabel( i18n("Play CD") ); cdBtn->setTextLabel( i18n("Play CD") );
cdBtn->setTextPosition( TQToolButton::Under ); cdBtn->setTextPosition( TQToolButton::Under );
cdBtn->setUsesTextLabel( true ); cdBtn->setUsesTextLabel( true );
cdBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); cdBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
TQToolTip::add( cdBtn, i18n("Play CD")); TQToolTip::add( cdBtn, i18n("Play CD"));
ripBtn = new TQToolButton( panel ); ripBtn = new TQToolButton( panel );
ripBtn->setTextLabel( i18n("Rip CD") ); ripBtn->setTextLabel( i18n("Rip CD") );
ripBtn->setTextPosition( TQToolButton::Under ); ripBtn->setTextPosition( TQToolButton::Under );
ripBtn->setUsesTextLabel( true ); ripBtn->setUsesTextLabel( true );
ripBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); ripBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
TQToolTip::add( ripBtn, i18n("Rip CD")); TQToolTip::add( ripBtn, i18n("Rip CD"));
TQHBoxLayout *h1 = new TQHBoxLayout(); TQHBoxLayout *h1 = new TQHBoxLayout();
@ -124,7 +124,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
artistLab = new TQLabel( "", panel ); artistLab = new TQLabel( "", panel );
artistLab->setLineWidth(1); artistLab->setLineWidth(1);
artistLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); artistLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
artistLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); artistLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
h1->addWidget( artistLab ); h1->addWidget( artistLab );
vb->addLayout( h1 ); vb->addLayout( h1 );
h1 = new TQHBoxLayout(); h1 = new TQHBoxLayout();
@ -132,7 +132,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
albumLab = new TQLabel( "", panel ); albumLab = new TQLabel( "", panel );
albumLab->setLineWidth(1); albumLab->setLineWidth(1);
albumLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); albumLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
albumLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); albumLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
h1->addWidget( albumLab ); h1->addWidget( albumLab );
vb->addLayout( h1 ); vb->addLayout( h1 );
@ -161,7 +161,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
enc->setTextPosition( TQToolButton::Under ); enc->setTextPosition( TQToolButton::Under );
enc->setUsesTextLabel( true ); enc->setUsesTextLabel( true );
enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) ); enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) );
enc->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) ); connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) );
vb->addWidget( encodeWidget ); vb->addWidget( encodeWidget );
encodeWidget->hide(); encodeWidget->hide();
@ -370,7 +370,7 @@ void Disc::trackSelected( TQListViewItem *it )
if ( !it ) if ( !it )
return; return;
MRL mrl( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); MRL mrl( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) ); mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );
@ -465,7 +465,7 @@ void Disc::startCD( const TQString &device, bool rip )
for ( i=0; i<para->getTracks(); i++ ) { for ( i=0; i<para->getTracks(); i++ ) {
it = new KListViewItem( list, TQString().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 ) { if ( i==0 ) {
mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
mrl.setTitle( cddb->track(i) ); mrl.setTitle( cddb->track(i) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );
@ -481,7 +481,7 @@ void Disc::startCD( const TQString &device, bool rip )
for ( i=0; i<para->getTracks(); i++ ) { for ( i=0; i<para->getTracks(); i++ ) {
it = new KListViewItem( list, TQString().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 ) { if ( i==0 ) {
mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
mrl.setTitle( cddb->track(i) ); mrl.setTitle( cddb->track(i) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );
@ -495,7 +495,7 @@ void Disc::startCD( const TQString &device, bool rip )
for ( i=0; i<para->getTracks(); i++ ) { for ( i=0; i<para->getTracks(); i++ ) {
it = new KListViewItem( list, TQString().sprintf("%02d", i+1), i18n("Track")+TQString().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 ) { if ( i==0 ) {
mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
mrl.setTitle( i18n("Track")+TQString().sprintf("%02d", i+1) ); mrl.setTitle( i18n("Track")+TQString().sprintf("%02d", i+1) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );
@ -531,7 +531,7 @@ void Disc::startDVD( const TQString &device )
bool ok=false; bool ok=false;
if ( !device.isEmpty() ) if ( !device.isEmpty() )
mrl.setURL( TQString("dvd://%1").tqarg(device) ); mrl.setURL( TQString("dvd://%1").arg(device) );
else { else {
DCOPRef mediamanager("kded","mediamanager"); DCOPRef mediamanager("kded","mediamanager");
DCOPReply reply = mediamanager.call("fullList()"); DCOPReply reply = mediamanager.call("fullList()");
@ -555,12 +555,12 @@ void Disc::startDVD( const TQString &device )
TQString 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 ); devList, 0, false, &ok );
if ( ok ) if ( ok )
mrl.setURL( TQString("dvd://%1").tqarg(choice) ); mrl.setURL( TQString("dvd://%1").arg(choice) );
else else
return; return;
} }
else if ( devList.count()==1 ) else if ( devList.count()==1 )
mrl.setURL( TQString("dvd://%1").tqarg(devList[0]) ); mrl.setURL( TQString("dvd://%1").arg(devList[0]) );
else { else {
//KMessageBox::information( 0, i18n("No DVD Video found."), i18n("Warning") ); //KMessageBox::information( 0, i18n("No DVD Video found."), i18n("Warning") );
//return; //return;
@ -591,7 +591,7 @@ void Disc::startVCD( const TQString &device )
bool ok=false; bool ok=false;
if ( !device.isEmpty() ) if ( !device.isEmpty() )
mrl.setURL( TQString("vcd://%1").tqarg(device) ); mrl.setURL( TQString("vcd://%1").arg(device) );
else { else {
DCOPRef mediamanager("kded","mediamanager"); DCOPRef mediamanager("kded","mediamanager");
DCOPReply reply = mediamanager.call("fullList()"); DCOPReply reply = mediamanager.call("fullList()");
@ -609,12 +609,12 @@ void Disc::startVCD( const TQString &device )
TQString 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 ); devList, 0, false, &ok );
if ( ok ) if ( ok )
mrl.setURL( TQString("vcd://%1").tqarg(choice) ); mrl.setURL( TQString("vcd://%1").arg(choice) );
else else
return; return;
} }
else if ( devList.count()==1 ) else if ( devList.count()==1 )
mrl.setURL( TQString("vcd://%1").tqarg(devList[0]) ); mrl.setURL( TQString("vcd://%1").arg(devList[0]) );
else { else {
//KMessageBox::information( 0, i18n("No (S)VCD found."), i18n("Warning") ); //KMessageBox::information( 0, i18n("No (S)VCD found."), i18n("Warning") );
//return; //return;
@ -649,7 +649,7 @@ bool Disc::currentTrack( MRL &mrl )
return false; return false;
while ( it!=0 ) { while ( it!=0 ) {
if ( it->text(0).toInt()==trackCurrent ) { if ( it->text(0).toInt()==trackCurrent ) {
mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) ); mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );
@ -681,7 +681,7 @@ bool Disc::nextTrack( MRL &mrl )
return false; return false;
while ( it!=0 ) { while ( it!=0 ) {
if ( it->text(0).toInt()==trackCurrent+1 ) { if ( it->text(0).toInt()==trackCurrent+1 ) {
mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) ); mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );
@ -695,7 +695,7 @@ bool Disc::nextTrack( MRL &mrl )
} }
it = list->firstChild(); it = list->firstChild();
mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) ); mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );
@ -718,7 +718,7 @@ bool Disc::previousTrack( MRL &mrl )
return false; return false;
while ( it!=0 ) { while ( it!=0 ) {
if ( it->text(0).toInt()==trackCurrent-1 ) { if ( it->text(0).toInt()==trackCurrent-1 ) {
mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) ); mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );
@ -746,7 +746,7 @@ bool Disc::trackNumber( int number, MRL &mrl )
return false; return false;
while ( it!=0 ) { while ( it!=0 ) {
if ( it->text(0).toInt()==number ) { if ( it->text(0).toInt()==number ) {
mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) ); mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() ); mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() ); mrl.setAlbum( albumLab->text() );

4
kaffeine/src/input/disc/paranoia.cpp
Unescape View File

@ -288,14 +288,14 @@ bool Paranoia::loadEncoder( TQWidget *parent )
KService::Ptr service = KService::serviceByDesktopName( encoderDesktop ); KService::Ptr service = KService::serviceByDesktopName( encoderDesktop );
if (!service) { if (!service) {
KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) ); KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) );
return false; return false;
} }
if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) { if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) {
currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error); currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error);
if (error > 0) { if (error > 0) {
KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) ); KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) );
return false; return false;
} }
else else

8
kaffeine/src/input/disc/paranoiasettings.ui
Unescape View File

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -165,7 +165,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>60</height> <height>60</height>
@ -174,7 +174,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -190,7 +190,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>152</width> <width>152</width>
<height>20</height> <height>20</height>

10
kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
Unescape View File

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -51,7 +51,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -108,7 +108,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -117,7 +117,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -133,7 +133,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>107</width> <width>107</width>
<height>20</height> <height>20</height>

8
kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
Unescape View File

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -98,7 +98,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>81</height> <height>81</height>
@ -107,7 +107,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -123,7 +123,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>157</width> <width>157</width>
<height>20</height> <height>20</height>

22
kaffeine/src/input/dvb/audioeditorui.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout24</cstring> <cstring>layout24</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -29,7 +29,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout23</cstring> <cstring>layout23</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -60,7 +60,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout21</cstring> <cstring>layout21</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -68,7 +68,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -76,7 +76,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -118,7 +118,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -146,7 +146,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -154,7 +154,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -258,7 +258,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout19</cstring> <cstring>layout19</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -274,7 +274,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>

6
kaffeine/src/input/dvb/broadcasteditorui.ui
Unescape View File

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

4
kaffeine/src/input/dvb/camdialog.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -29,7 +29,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

4
kaffeine/src/input/dvb/cammenudialog.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -34,7 +34,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

18
kaffeine/src/input/dvb/channeleditorui.ui
Unescape View File

@ -35,7 +35,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -43,7 +43,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -72,7 +72,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -83,7 +83,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -138,7 +138,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -261,7 +261,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -633,7 +633,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>166</height> <height>166</height>
@ -642,7 +642,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -666,7 +666,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>150</width> <width>150</width>
<height>20</height> <height>20</height>

20
kaffeine/src/input/dvb/crontimerui.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -29,7 +29,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>32</width> <width>32</width>
<height>20</height> <height>20</height>
@ -54,7 +54,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -138,7 +138,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>67</height> <height>67</height>
@ -157,7 +157,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>39</width> <width>39</width>
<height>20</height> <height>20</height>
@ -243,7 +243,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>32</width> <width>32</width>
<height>20</height> <height>20</height>
@ -262,7 +262,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>95</height> <height>95</height>
@ -271,7 +271,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -295,7 +295,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>177</width> <width>177</width>
<height>20</height> <height>20</height>

12
kaffeine/src/input/dvb/dvbcam.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqtextbrowser.h> #include <textbrowser.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
@ -79,7 +79,7 @@ int DvbCam::probe( int adapter, int ca_device )
int fdCa; int fdCa;
ca_caps_t cap; ca_caps_t cap;
ca_slot_info_t info; ca_slot_info_t info;
TQString s = TQString("/dev/dvb/adapter%1/ca%2").tqarg( adapter ).tqarg( ca_device ); TQString s = TQString("/dev/dvb/adapter%1/ca%2").arg( adapter ).arg( ca_device );
if ( (fdCa = open( s.ascii(), O_RDWR )) < 0) { if ( (fdCa = open( s.ascii(), O_RDWR )) < 0) {
fprintf(stderr, "DvbCam::probe(): %s:", s.ascii()); fprintf(stderr, "DvbCam::probe(): %s:", s.ascii());
@ -413,11 +413,11 @@ int DvbCam::aiCallback(void *arg, uint8_t slot_id, uint16_t session_number, uint
(void)session_number; (void)session_number;
fprintf(stderr, "CAM Application type: %02x\n", application_type); fprintf(stderr, "CAM Application type: %02x\n", application_type);
std->dvbcam->setAppType( TQString("0x%1").tqarg(application_type, 0, 16 ) ); std->dvbcam->setAppType( TQString("0x%1").arg(application_type, 0, 16 ) );
fprintf(stderr, "CAM Application manufacturer: %04x\n", application_manufacturer); fprintf(stderr, "CAM Application manufacturer: %04x\n", application_manufacturer);
std->dvbcam->setAppManu( TQString("0x%1").tqarg(application_manufacturer, 0, 16 ) ); std->dvbcam->setAppManu( TQString("0x%1").arg(application_manufacturer, 0, 16 ) );
fprintf(stderr, "CAM Manufacturer code: %04x\n", manufacturer_code); fprintf(stderr, "CAM Manufacturer code: %04x\n", manufacturer_code);
std->dvbcam->setManuCode( TQString("0x%1").tqarg(manufacturer_code, 0, 16 ) ); std->dvbcam->setManuCode( TQString("0x%1").arg(manufacturer_code, 0, 16 ) );
fprintf(stderr, "CAM Menu string: %.*s\n", menu_string_length, menu_string); fprintf(stderr, "CAM Menu string: %.*s\n", menu_string_length, menu_string);
TQString s = (const char*)menu_string; TQString s = (const char*)menu_string;
s.truncate( menu_string_length ); s.truncate( menu_string_length );
@ -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); fprintf(stderr, "%i. %.*s\n", i+1, items[i].text_length, items[i].text);
s = (const char*)items[i].text; s = (const char*)items[i].text;
s.truncate( items[i].text_length ); s.truncate( items[i].text_length );
std->menuList.append( TQString("%1. %2").tqarg(i+1).tqarg(s) ); std->menuList.append( TQString("%1. %2").arg(i+1).arg(s) );
} }

82
kaffeine/src/input/dvb/dvbconfig.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <errno.h> #include <errno.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqlayout.h> #include <layout.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
@ -187,10 +187,10 @@ bool DVBconfig::haveDvbDevice()
d.setPath( "/dev/dvb/"+list[i]+"/" ); d.setPath( "/dev/dvb/"+list[i]+"/" );
flist = d.entryList( "frontend*", TQDir::System, TQDir::Name ); flist = d.entryList( "frontend*", TQDir::System, TQDir::Name );
for ( j=0; j<(int)flist.count(); j++ ) { for ( j=0; j<(int)flist.count(); j++ ) {
fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( list[i] ).tqarg( flist[j] ).ascii(), O_RDWR); fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( list[i] ).arg( flist[j] ).ascii(), O_RDWR);
if ( fdFrontend>0 ) { if ( fdFrontend>0 ) {
if ( (res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) if ( (res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) )
perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").tqarg( list[i] ).tqarg( flist[j] ).ascii() ); perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").arg( list[i] ).arg( flist[j] ).ascii() );
else { else {
close( fdFrontend ); close( fdFrontend );
return true; return true;
@ -229,7 +229,7 @@ void DVBconfig::startup()
if ( !probeMfe && t!="frontend0" ) if ( !probeMfe && t!="frontend0" )
continue; continue;
t1 = TQTime::currentTime(); t1 = TQTime::currentTime();
fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( s ).tqarg( t ).ascii(), O_RDWR); fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( s ).arg( t ).ascii(), O_RDWR);
if ( fdFrontend>0 ) { if ( fdFrontend>0 ) {
if ( !(res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) { if ( !(res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) {
if ( (info.type==FE_OFDM) if ( (info.type==FE_OFDM)
@ -247,7 +247,7 @@ void DVBconfig::startup()
close( fdFrontend ); close( fdFrontend );
} }
else { else {
perror( TQString("/dev/dvb/%1/%2 %3/%4").tqarg( s ).tqarg( t ).tqarg( errno ).tqarg( -EBUSY ).ascii() ); perror( TQString("/dev/dvb/%1/%2 %3/%4").arg( s ).arg( t ).arg( errno ).arg( -EBUSY ).ascii() );
} }
} }
} }
@ -450,30 +450,30 @@ void DVBconfig::readConfig()
shiftDir+= "/"; shiftDir+= "/";
filenameFormat = config->readEntry( "filenameFormat", "%name" ); filenameFormat = config->readEntry( "filenameFormat", "%name" );
for ( i=0; i<(int)devList.count(); i++ ) { for ( i=0; i<(int)devList.count(); i++ ) {
devList.at(i)->source = config->readEntry( TQString("DVB%1").tqarg(i), "" ); devList.at(i)->source = config->readEntry( TQString("DVB%1").arg(i), "" );
devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").tqarg(i), 1500 ); devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").arg(i), 1500 );
devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").tqarg(i), 1 ); devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").arg(i), 1 );
devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").tqarg(i), 10 ); devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").arg(i), 10 );
if ( devList.at(i)->type!=FE_QPSK ) if ( devList.at(i)->type!=FE_QPSK )
continue; continue;
devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").tqarg(i), 1 ); devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").arg(i), 1 );
for ( j=0; j<devList.at(i)->numLnb; j++ ) { for ( j=0; j<devList.at(i)->numLnb; j++ ) {
devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), 11700 ); devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(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].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(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].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(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].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(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].source = config->readListEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j) );
devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j) ); devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(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].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(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)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), 1.5 );
} }
devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").tqarg(i), 0 ); devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").arg(i), 0 );
devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), 0 ); devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").arg(i), 0 );
devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").tqarg(i), 0 ); devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").arg(i), 0 );
} }
j = config->readNumEntry( "NumCategories", 0 ); j = config->readNumEntry( "NumCategories", 0 );
for ( i=0; i<j; i++ ) for ( i=0; i<j; i++ )
categories.append( new Category( config->readEntry( TQString("CategoryName%1").tqarg(i), "" ), config->readEntry( TQString("CategoryIcon%1").tqarg(i), "kaffeine" ) ) ); categories.append( new Category( config->readEntry( TQString("CategoryName%1").arg(i), "" ), config->readEntry( TQString("CategoryIcon%1").arg(i), "kaffeine" ) ) );
allIcon = config->readEntry( "AllIcon", "kaffeine" ); allIcon = config->readEntry( "AllIcon", "kaffeine" );
tvIcon = config->readEntry( "TvIcon", "kdvbtv" ); tvIcon = config->readEntry( "TvIcon", "kdvbtv" );
radioIcon = config->readEntry( "RadioIcon", "kdvbra" ); radioIcon = config->readEntry( "RadioIcon", "kdvbra" );
@ -512,31 +512,31 @@ void DVBconfig::saveConfig()
config->writeEntry( "SenderPort", senderPort ); config->writeEntry( "SenderPort", senderPort );
config->writeEntry( "ProbeMFE", probeMfe ); config->writeEntry( "ProbeMFE", probeMfe );
for ( i=0; i<(int)devList.count(); i++ ) { for ( i=0; i<(int)devList.count(); i++ ) {
config->writeEntry( TQString("DVB%1").tqarg(i), devList.at(i)->source ); config->writeEntry( TQString("DVB%1").arg(i), devList.at(i)->source );
config->writeEntry( TQString("DVB%1_TIMEOUT").tqarg(i), devList.at(i)->tuningTimeout ); config->writeEntry( TQString("DVB%1_TIMEOUT").arg(i), devList.at(i)->tuningTimeout );
config->writeEntry( TQString("DVB%1_PRIORITY").tqarg(i), devList.at(i)->priority ); config->writeEntry( TQString("DVB%1_PRIORITY").arg(i), devList.at(i)->priority );
config->writeEntry( TQString("DVB%1_CAM_MAX").tqarg(i), devList.at(i)->camMaxService ); config->writeEntry( TQString("DVB%1_CAM_MAX").arg(i), devList.at(i)->camMaxService );
if ( devList.at(i)->type!=FE_QPSK ) if ( devList.at(i)->type!=FE_QPSK )
continue; continue;
config->writeEntry( TQString("DVB%1_NLNB").tqarg(i), devList.at(i)->numLnb ); config->writeEntry( TQString("DVB%1_NLNB").arg(i), devList.at(i)->numLnb );
for ( j=0; j<devList.at(i)->numLnb; j++ ) { for ( j=0; j<devList.at(i)->numLnb; j++ ) {
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_switch").arg(i).arg(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_lo").arg(i).arg(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_hi").arg(i).arg(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_rotor").arg(i).arg(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_source").arg(i).arg(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_position").arg(i).arg(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_speed13v").arg(i).arg(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( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), devList.at(i)->lnb[j].speed18v );
} }
config->writeEntry( TQString("DVB%1_SEC_MINI").tqarg(i), devList.at(i)->secMini ); config->writeEntry( TQString("DVB%1_SEC_MINI").arg(i), devList.at(i)->secMini );
config->writeEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), devList.at(i)->secTwice ); config->writeEntry( TQString("DVB%1_SEC_TWICE").arg(i), devList.at(i)->secTwice );
config->writeEntry( TQString("DVB%1_DOS2").tqarg(i), devList.at(i)->doS2 ); config->writeEntry( TQString("DVB%1_DOS2").arg(i), devList.at(i)->doS2 );
} }
config->writeEntry( "NumCategories", categories.count() ); config->writeEntry( "NumCategories", categories.count() );
for ( i=0; i<(int)categories.count(); i++ ) { for ( i=0; i<(int)categories.count(); i++ ) {
config->writeEntry( TQString("CategoryName%1").tqarg(i), categories.at(i)->name ); config->writeEntry( TQString("CategoryName%1").arg(i), categories.at(i)->name );
config->writeEntry( TQString("CategoryIcon%1").tqarg(i), categories.at(i)->icon ); config->writeEntry( TQString("CategoryIcon%1").arg(i), categories.at(i)->icon );
} }
config->writeEntry( "AllIcon", allIcon ); config->writeEntry( "AllIcon", allIcon );
config->writeEntry( "TvIcon", tvIcon ); config->writeEntry( "TvIcon", tvIcon );
@ -589,7 +589,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
timeoutSpin.setAutoDelete( true ); timeoutSpin.setAutoDelete( true );
for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) { for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) {
page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").tqarg(dvbConfig->devList.at(i)->adapter).tqarg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"), page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) ); KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) );
vb = new TQVBoxLayout( page, 6, 6 ); vb = new TQVBoxLayout( page, 6, 6 );
gb = new TQGroupBox( "", page ); gb = new TQGroupBox( "", page );

4
kaffeine/src/input/dvb/dvbevents.cpp
Unescape View File

@ -170,7 +170,7 @@ bool DVBevents::tableEIT( unsigned char* buffer )
TQPtrList<EventDesc> *currentEvents; TQPtrList<EventDesc> *currentEvents;
bool nodesc, parse; bool nodesc, parse;
TQDateTime start, cur, dt; TQDateTime start, cur, dt;
unsigned int cdt = TQDateTime::tqcurrentDateTime().toTime_t(); unsigned int cdt = TQDateTime::currentDateTime().toTime_t();
tid = getBits(buf,0,8); tid = getBits(buf,0,8);
length = getBits(buf,12,12); length = getBits(buf,12,12);
@ -298,7 +298,7 @@ ifend:
if ( parse ) if ( parse )
++(desc->sn); ++(desc->sn);
if ( nodesc ) { if ( nodesc ) {
cur = TQDateTime::tqcurrentDateTime(); cur = TQDateTime::currentDateTime();
dt = desc->startDateTime; dt = desc->startDateTime;
sec = desc->duration.hour()*3600+desc->duration.minute()*60+desc->duration.second(); sec = desc->duration.hour()*3600+desc->duration.minute()*60+desc->duration.second();
if ( dt.addSecs( sec )<cur || desc->title.length()<3 ) { if ( dt.addSecs( sec )<cur || desc->title.length()<3 ) {

2
kaffeine/src/input/dvb/dvbout.cpp
Unescape View File

@ -402,7 +402,7 @@ bool DVBout::goRec( const TQString &name, int maxsize, RecTimer *t )
haveRec = true; haveRec = true;
if ( recTimer ) { if ( recTimer ) {
TQTime t = recTimer->duration.addSecs( TQDateTime::tqcurrentDateTime().secsTo(recTimer->begin) ); TQTime t = recTimer->duration.addSecs( TQDateTime::currentDateTime().secsTo(recTimer->begin) );
stopRecTimer.start( TQTime().msecsTo( t ), true ); stopRecTimer.start( TQTime().msecsTo( t ), true );
} }
else else

50
kaffeine/src/input/dvb/dvbpanel.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <sys/statvfs.h> #include <sys/statvfs.h>
#include <tqlayout.h> #include <layout.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqstringlist.h> #include <tqstringlist.h>
@ -114,7 +114,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
dvb.setAutoDelete( true ); dvb.setAutoDelete( true );
mainWidget = new TQVBox( parent ); mainWidget = new TQVBox( parent );
mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
split = new TQSplitter( mainWidget ); split = new TQSplitter( mainWidget );
split->setOpaqueResize( true ); split->setOpaqueResize( true );
pbox = new TQVBox( split ); pbox = new TQVBox( split );
@ -129,7 +129,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
iconView->setSpacing(0); iconView->setSpacing(0);
iconView->setItemsMovable(false); iconView->setItemsMovable(false);
iconView->setResizeMode(TQIconView::Adjust); iconView->setResizeMode(TQIconView::Adjust);
iconView->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); iconView->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
playerBox = new TQVBox( pbox ); playerBox = new TQVBox( pbox );
playerBox->setMinimumWidth( 200 ); playerBox->setMinimumWidth( 200 );
panel = new TQFrame( split ); panel = new TQFrame( split );
@ -192,7 +192,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
channelsCb->addColumn( i18n("Name") ); channelsCb->addColumn( i18n("Name") );
channelsCb->addColumn( i18n("Source") ); channelsCb->addColumn( i18n("Source") );
channelsCb->setAllColumnsShowFocus( true ); channelsCb->setAllColumnsShowFocus( true );
channelsCb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) ); channelsCb->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
//channelsCb->setEnabled( false ); //channelsCb->setEnabled( false );
vb->addWidget( channelsCb ); vb->addWidget( channelsCb );
@ -209,14 +209,14 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
h1 = new TQHBoxLayout(); h1 = new TQHBoxLayout();
h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
shiftLed = new KLed( panel ); shiftLed = new KLed( panel );
shiftLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); shiftLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
shiftLed->setDarkFactor( 500 ); shiftLed->setDarkFactor( 500 );
shiftLed->off(); shiftLed->off();
TQToolTip::add( shiftLed, i18n("Time shifting") ); TQToolTip::add( shiftLed, i18n("Time shifting") );
h1->addWidget( shiftLed ); h1->addWidget( shiftLed );
h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
recordLed = new KLed( panel ); recordLed = new KLed( panel );
recordLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); recordLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
recordLed->setColor( TQColor( 255,0,0 ) ); recordLed->setColor( TQColor( 255,0,0 ) );
recordLed->setDarkFactor( 500 ); recordLed->setDarkFactor( 500 );
recordLed->off(); recordLed->off();
@ -224,7 +224,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
h1->addWidget( recordLed ); h1->addWidget( recordLed );
h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
broadcastLed = new KLed( panel ); broadcastLed = new KLed( panel );
broadcastLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); broadcastLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
broadcastLed->setColor( TQColor( 255,128,0 ) ); broadcastLed->setColor( TQColor( 255,128,0 ) );
broadcastLed->setDarkFactor( 500 ); broadcastLed->setDarkFactor( 500 );
broadcastLed->off(); broadcastLed->off();
@ -272,7 +272,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
connect( &showOsdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(dvbOSD()) ); connect( &showOsdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(dvbOSD()) );
connect( &tuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) ); connect( &tuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) );
connect( &stopTuningTimer, 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()) ); connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(diskStatus()) );
setConfig(); setConfig();
@ -295,7 +295,7 @@ void DvbPanel::togglePanel()
void DvbPanel::disktqStatus() void DvbPanel::diskStatus()
{ {
double freemb; double freemb;
struct statvfs buf; struct statvfs buf;
@ -307,7 +307,7 @@ void DvbPanel::disktqStatus()
freemb = (double)(((double)(buf.f_bavail)*(double)(buf.f_bsize))/(1024.0*1024.0)); freemb = (double)(((double)(buf.f_bavail)*(double)(buf.f_bsize))/(1024.0*1024.0));
if ( freemb<300 ) if ( freemb<300 )
emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").tqarg((int)freemb)+i18n("MB")+")", 5000, 3 ); emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").arg((int)freemb)+i18n("MB")+")", 5000, 3 );
} }
@ -644,20 +644,20 @@ void DvbPanel::dumpEvents()
if ( f.open(IO_WriteOnly|IO_Truncate) ) { if ( f.open(IO_WriteOnly|IO_Truncate) ) {
fprintf( stderr, "Creating events file.\n"); fprintf( stderr, "Creating events file.\n");
TQTextStream tt( &f ); TQTextStream tt( &f );
tt << "Saved: "+TQDateTime::tqcurrentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n"; tt << "Saved: "+TQDateTime::currentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
k= 0; k= 0;
for( i=0; i<events.getNSource(); i++ ) { for( i=0; i<events.getNSource(); i++ ) {
if ( !(esrc=events.getNEventSource( i )) ) if ( !(esrc=events.getNEventSource( i )) )
continue; continue;
tt << esrc->getSource()+TQString(" : %1 TS with events.\n").tqarg( esrc->getNTsid() ); tt << esrc->getSource()+TQString(" : %1 TS with events.\n").arg( esrc->getNTsid() );
for ( m=0; m<esrc->getNTsid(); m++ ) { for ( m=0; m<esrc->getNTsid(); m++ ) {
if ( !(et=esrc->getNEventTsid( m )) ) if ( !(et=esrc->getNEventTsid( m )) )
continue; continue;
tt << TQString("TSID %1 : %2 services with events\n").tqarg( et->getTsid() ).tqarg( et->getNSid() ); tt << TQString("TSID %1 : %2 services with events\n").arg( et->getTsid() ).arg( et->getNSid() );
for ( n=0; n<et->getNSid(); n++ ) { for ( n=0; n<et->getNSid(); n++ ) {
if ( !(es=et->getNEventSid( n )) ) if ( !(es=et->getNEventSid( n )) )
continue; continue;
tt << TQString(" SID %1 : %2 events\n").tqarg( es->getSid() ).tqarg( es->getNDesc() ); tt << TQString(" SID %1 : %2 events\n").arg( es->getSid() ).arg( es->getNDesc() );
k+= es->getNDesc(); k+= es->getNDesc();
} }
} }
@ -681,10 +681,10 @@ void DvbPanel::dumpEvents()
if ( !(desc=esEvents->at( j )) ) if ( !(desc=esEvents->at( j )) )
continue; continue;
tt << "Source: "+desc->source+"\n"; tt << "Source: "+desc->source+"\n";
tt << TQString("Network ID: %1\n").tqarg(desc->nid); tt << TQString("Network ID: %1\n").arg(desc->nid);
tt << TQString("Transport Stream ID: %1\n").tqarg(desc->tsid); tt << TQString("Transport Stream ID: %1\n").arg(desc->tsid);
tt << TQString("Service ID: %1\n").tqarg(desc->sid); tt << TQString("Service ID: %1\n").arg(desc->sid);
tt << TQString("Event ID: %1\n").tqarg(desc->eid); tt << TQString("Event ID: %1\n").arg(desc->eid);
tt << "Title: "+desc->title+"\n"; tt << "Title: "+desc->title+"\n";
tt << "Subtitle: "+desc->subtitle+"\n"; tt << "Subtitle: "+desc->subtitle+"\n";
tt << desc->startDateTime.toString( "dd-MM-yyyy hh:mm:ss" )+"\n"; tt << desc->startDateTime.toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
@ -956,7 +956,7 @@ void DvbPanel::dvbOSD(ChannelDesc liveChannel, DvbStream *d, int timeShift /* =
s = s+" - "; s = s+" - ";
s = s+desc->title; s = s+desc->title;
if ( !osdMode && !first && !myshift ) { if ( !osdMode && !first && !myshift ) {
TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQDateTime dt = TQDateTime::currentDateTime();
int secs = desc->startDateTime.secsTo( dt ); int secs = desc->startDateTime.secsTo( dt );
i = TQTime().secsTo( desc->duration ); i = TQTime().secsTo( desc->duration );
if ( i!=0 ) if ( i!=0 )
@ -1131,7 +1131,7 @@ void DvbPanel::camClicked( int devNum )
TQPtrList<Transponder> DvbPanel::getSourcestqStatus() TQPtrList<Transponder> DvbPanel::getSourcesStatus()
{ {
int i, j; int i, j;
TQStringList list; TQStringList list;
@ -1163,7 +1163,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch )
ChannelDesc *chan; ChannelDesc *chan;
KListViewItem *it, *visible=0; KListViewItem *it, *visible=0;
bool cont=false; bool cont=false;
TQPtrList<Transponder> trans = getSourcestqStatus(); TQPtrList<Transponder> trans = getSourcesStatus();
trans.setAutoDelete( true ); trans.setAutoDelete( true );
searchLE->clear(); searchLE->clear();
@ -1320,7 +1320,7 @@ void DvbPanel::checkTimers()
bool live=false; bool live=false;
RecTimer *t; RecTimer *t;
ChannelDesc *chan; ChannelDesc *chan;
TQDateTime cur=TQDateTime::tqcurrentDateTime(); TQDateTime cur=TQDateTime::currentDateTime();
DvbStream *d; DvbStream *d;
for ( i=0; i<(int)timers.count(); i++ ) { for ( i=0; i<(int)timers.count(); i++ ) {
@ -1409,13 +1409,13 @@ void DvbPanel::setRecord()
if ( !dvbConfig->filenameFormat.contains("%chan") ) if ( !dvbConfig->filenameFormat.contains("%chan") )
s = curchan.name; s = curchan.name;
if ( !dvbConfig->filenameFormat.contains("%date") ) if ( !dvbConfig->filenameFormat.contains("%date") )
s+="_"+TQDateTime::tqcurrentDateTime().toString( "yyyyMMdd-hhmmss" ); s+="_"+TQDateTime::currentDateTime().toString( "yyyyMMdd-hhmmss" );
} }
rt = new RecTimer(); rt = new RecTimer();
rt->name = s; rt->name = s;
rt->channel = curchan.name; rt->channel = curchan.name;
rt->begin = TQDateTime::tqcurrentDateTime(); rt->begin = TQDateTime::currentDateTime();
rt->duration = TQTime( 0,0,0).addSecs( dvbConfig->instantDuration*60 ) ; rt->duration = TQTime( 0,0,0).addSecs( dvbConfig->instantDuration*60 ) ;
rt->running = 1; rt->running = 1;
rt->mode = 0; rt->mode = 0;
@ -2074,7 +2074,7 @@ void DvbPanel::pauseLiveTV()
if ( !d ) if ( !d )
return; return;
timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::tqcurrentDateTime().toString("yyyyMMddThhmmss")+".m2t"; timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::currentDateTime().toString("yyyyMMddThhmmss")+".m2t";
if ( d->doPause( timeShiftFileName ) ) if ( d->doPause( timeShiftFileName ) )
emit setTimeShiftFilename( timeShiftFileName ); emit setTimeShiftFilename( timeShiftFileName );
} }

4
kaffeine/src/input/dvb/dvbpanel.h
Unescape View File

@ -154,7 +154,7 @@ public slots:
void dvbNewTimer( TQString name, TQString channel, TQString datetime, TQString duration ); void dvbNewTimer( TQString name, TQString channel, TQString datetime, TQString duration );
int getSNR( int device ); int getSNR( int device );
void disktqStatus(); void diskStatus();
void camClicked( int devNum ); void camClicked( int devNum );
private: private:
@ -163,7 +163,7 @@ private:
bool getTimerList(); bool getTimerList();
bool saveTimerList(); bool saveTimerList();
void fillChannelList( ChannelDesc *ch=0 ); void fillChannelList( ChannelDesc *ch=0 );
TQPtrList<Transponder> getSourcestqStatus(); TQPtrList<Transponder> getSourcesStatus();
void updateModeTimer( RecTimer *t ); void updateModeTimer( RecTimer *t );
DvbStream* getWorkingDvb( int mode, ChannelDesc *chan ); DvbStream* getWorkingDvb( int mode, ChannelDesc *chan );

4
kaffeine/src/input/dvb/dvbsi.cpp
Unescape View File

@ -620,7 +620,7 @@ bool DVBsi::tablePAT( unsigned char *buf )
desc->tp.tsid = tsid; desc->tp.tsid = tsid;
desc->sid = sid; desc->sid = sid;
desc->pmtpid = pmt; desc->pmtpid = pmt;
desc->name = TQString("TSID:%1-SID:%2").tqarg(tsid).tqarg(sid); desc->name = TQString("TSID:%1-SID:%2").arg(tsid).arg(sid);
} }
} }
@ -854,7 +854,7 @@ bool DVBsi::parseVCT( int pid, int tid, int timeout, int sid )
ChannelDesc *desc = new ChannelDesc(); ChannelDesc *desc = new ChannelDesc();
desc->tp.tsid = channel_tsid; desc->tp.tsid = channel_tsid;
desc->name = TQString("%1-%2 %3").tqarg(major_channel_num).tqarg(minor_channel_num).tqarg(short_name); desc->name = TQString("%1-%2 %3").arg(major_channel_num).arg(minor_channel_num).arg(short_name);
desc->sid = program_number; desc->sid = program_number;
if (access_controlled == 1) if (access_controlled == 1)
desc->fta = 1; desc->fta = 1;

22
kaffeine/src/input/dvb/dvbstream.cpp
Unescape View File

@ -65,9 +65,9 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
fdFrontend = fdDvr = 0; fdFrontend = fdDvr = 0;
ndmx = 0; ndmx = 0;
currentTransponder = Transponder(); currentTransponder = Transponder();
frontendName = TQString("/dev/dvb/adapter%1/frontend%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); frontendName = TQString("/dev/dvb/adapter%1/frontend%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
dvrName = TQString("/dev/dvb/adapter%1/dvr%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); dvrName = TQString("/dev/dvb/adapter%1/dvr%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
demuxName = TQString("/dev/dvb/adapter%1/demux%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); demuxName = TQString("/dev/dvb/adapter%1/demux%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
out.setAutoDelete( true ); out.setAutoDelete( true );
@ -84,7 +84,7 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
cam = NULL; cam = NULL;
plug = NULL; plug = NULL;
connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checktqStatus()) ); connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkStatus()) );
} }
@ -221,7 +221,7 @@ bool DvbStream::closeFe()
void DvbStream::connecttqStatus( bool con ) void DvbStream::connectStatus( bool con )
{ {
if ( con ) if ( con )
statusTimer.start( 1000 ); statusTimer.start( 1000 );
@ -879,7 +879,7 @@ void DvbStream::removeOut( DVBout *o )
bool DvbStream::checktqStatus() bool DvbStream::checkStatus()
{ {
int32_t strength; int32_t strength;
fe_status_t festatus; fe_status_t festatus;
@ -887,19 +887,19 @@ bool DvbStream::checktqStatus()
strength=0; strength=0;
ioctl(fdFrontend,FE_READ_SIGNAL_STRENGTH,&strength); ioctl(fdFrontend,FE_READ_SIGNAL_STRENGTH,&strength);
emit signaltqStatus(strength*100/65535); emit signalStatus(strength*100/65535);
strength=0; strength=0;
ioctl(fdFrontend,FE_READ_SNR,&strength); ioctl(fdFrontend,FE_READ_SNR,&strength);
emit snrtqStatus(strength*100/65535); emit snrStatus(strength*100/65535);
memset( &festatus, 0, sizeof(festatus) ); memset( &festatus, 0, sizeof(festatus) );
ioctl(fdFrontend,FE_READ_STATUS,&festatus); ioctl(fdFrontend,FE_READ_STATUS,&festatus);
if (festatus & FE_HAS_LOCK) if (festatus & FE_HAS_LOCK)
emit locktqStatus( true ); emit lockStatus( true );
else { else {
emit locktqStatus( false ); emit lockStatus( false );
ret = false; ret = false;
} }
@ -1481,7 +1481,7 @@ void DvbStream::stopFrontend()
void DvbStream::setScanning( bool b ) void DvbStream::setScanning( bool b )
{ {
connecttqStatus( b ); connectStatus( b );
} }

10
kaffeine/src/input/dvb/dvbstream.h
Unescape View File

@ -99,7 +99,7 @@ public :
public slots: public slots:
bool checktqStatus(); bool checkStatus();
void receivePlayDvb(); void receivePlayDvb();
void recordEnded( DVBout *o, RecTimer *t, bool kill ); void recordEnded( DVBout *o, RecTimer *t, bool kill );
void receiveShifting( bool b ); void receiveShifting( bool b );
@ -125,7 +125,7 @@ private :
void startReading(); void startReading();
bool openFe(); bool openFe();
bool closeFe(); bool closeFe();
void connecttqStatus( bool con ); void connectStatus( bool con );
TQFile liveFile; TQFile liveFile;
bool timeShifting; bool timeShifting;
@ -157,9 +157,9 @@ signals:
void timerEnded(RecTimer*); void timerEnded(RecTimer*);
void errorMsg( TQString ); void errorMsg( TQString );
void snrtqStatus( int ); void snrStatus( int );
void signaltqStatus( int ); void signalStatus( int );
void locktqStatus( bool ); void lockStatus( bool );
void shifting( bool ); void shifting( bool );
}; };

2
kaffeine/src/input/dvb/kevents.cpp
Unescape View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <tqlayout.h> #include <layout.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>

2
kaffeine/src/input/dvb/kevents.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqdialog.h> #include <tqdialog.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqtextbrowser.h> #include <textbrowser.h>
#include <klistview.h> #include <klistview.h>
#include <kpushbutton.h> #include <kpushbutton.h>

6
kaffeine/src/input/dvb/kgradprogress.cpp
Unescape View File

@ -34,7 +34,7 @@ KGradProgress::KGradProgress( TQWidget *parent ) : TQLabel( parent )
setFrameStyle( TQFrame::Box | TQFrame::Plain ); setFrameStyle( TQFrame::Box | TQFrame::Plain );
setLineWidth(1); setLineWidth(1);
setMidLineWidth(0); setMidLineWidth(0);
tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
} }
@ -43,7 +43,7 @@ void KGradProgress::setProgress( int progress )
{ {
current = progress; current = progress;
draw(); draw();
tqrepaint(false); repaint(false);
} }
@ -113,7 +113,7 @@ void KGradProgress::paintEvent(TQPaintEvent *event)
TQSize KGradProgress::tqsizeHint() TQSize KGradProgress::sizeHint()
{ {
TQLabel lab( "This is a progress bar.", 0 ); TQLabel lab( "This is a progress bar.", 0 );
return TQSize( lab.width(), int(font().pointSize()*1.2) ); return TQSize( lab.width(), int(font().pointSize()*1.2) );

2
kaffeine/src/input/dvb/kgradprogress.h
Unescape View File

@ -37,7 +37,7 @@ public:
KGradProgress( TQWidget *parent ); KGradProgress( TQWidget *parent );
~KGradProgress(); ~KGradProgress();
virtual void paintEvent(TQPaintEvent *event); virtual void paintEvent(TQPaintEvent *event);
virtual TQSize tqsizeHint(); virtual TQSize sizeHint();
virtual TQSizePolicy sizePolicy(); virtual TQSizePolicy sizePolicy();
public slots: public slots:

2
kaffeine/src/input/dvb/krecord.cpp
Unescape View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqdir.h> #include <tqdir.h>

4
kaffeine/src/input/dvb/ktimereditor.cpp
Unescape View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <klocale.h> #include <klocale.h>
@ -85,7 +85,7 @@ KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQW
channelComb->insertStringList( chanList ); channelComb->insertStringList( chanList );
if ( newone ) { if ( newone ) {
begin->setDateTime( TQDateTime::tqcurrentDateTime() ); begin->setDateTime( TQDateTime::currentDateTime() );
duration->setTime( TQTime(2,0,0) ); duration->setTime( TQTime(2,0,0) );
} }
else { else {

4
kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
Unescape View File

@ -297,7 +297,7 @@ void EventTable::loadEpg()
char buf[EPGBUFSIZE]; char buf[EPGBUFSIZE];
int num=0; int num=0;
unsigned char sync; unsigned char sync;
TQDateTime cur=TQDateTime::tqcurrentDateTime(); TQDateTime cur=TQDateTime::currentDateTime();
TQTime t1=TQTime::currentTime(); TQTime t1=TQTime::currentTime();
if ( epgLoaded ) if ( epgLoaded )
@ -416,7 +416,7 @@ void EventTable::run()
setpriority(PRIO_PROCESS, 0, 19); setpriority(PRIO_PROCESS, 0, 19);
cur = TQDateTime::tqcurrentDateTime(); cur = TQDateTime::currentDateTime();
for( k=0; k<getNSource(); k++ ) { for( k=0; k<getNSource(); k++ ) {
if ( !(esrc=getNEventSource( k )) ) if ( !(esrc=getNEventSource( k )) )
continue; continue;

2
kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
Unescape View File

@ -70,7 +70,7 @@ KaffeineDVBsection::~KaffeineDVBsection()
bool KaffeineDVBsection::setFilter( int pid, int tid, int timeout, bool checkcrc ) bool KaffeineDVBsection::setFilter( int pid, int tid, int timeout, bool checkcrc )
{ {
struct dmx_sct_filter_params sctfilter; struct dmx_sct_filter_params sctfilter;
TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").tqarg( adapter ).tqarg( tuner ); TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").arg( adapter ).arg( tuner );
if ((fdDemux = open( demuxer.ascii(), O_RDWR | O_NONBLOCK )) < 0) { if ((fdDemux = open( demuxer.ascii(), O_RDWR | O_NONBLOCK )) < 0) {
perror ("open failed"); perror ("open failed");

36
kaffeine/src/input/dvb/scandialog.cpp
Unescape View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <tqlayout.h> #include <layout.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
@ -71,7 +71,7 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
tmp = dvb->at(i)->getSources( true ); tmp = dvb->at(i)->getSources( true );
for ( j=0; j<(int)tmp.count(); j++ ) { for ( j=0; j<(int)tmp.count(); j++ ) {
if ( tmp[j].startsWith( "AUTO" ) ) if ( tmp[j].startsWith( "AUTO" ) )
list.append( TQString("AUTO(%1:%2)").tqarg(dvb->at(i)->getAdapter()).tqarg(dvb->at(i)->getTuner()) ); list.append( TQString("AUTO(%1:%2)").arg(dvb->at(i)->getAdapter()).arg(dvb->at(i)->getTuner()) );
else else
list.append( tmp[j] ); list.append( tmp[j] );
} }
@ -148,9 +148,9 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
offsetGroup->hide(); offsetGroup->hide();
bool ok=false; bool ok=false;
dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset ); dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset );
connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
connect( &checkTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( checkNewChannel() ) ); connect( &checkTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( checkNewChannel() ) );
@ -209,9 +209,9 @@ void ScanDialog::setDvb( int index )
checkTimer.stop(); checkTimer.stop();
if ( progressTimer.isActive() ) if ( progressTimer.isActive() )
progressTimer.stop(); progressTimer.stop();
disconnect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); disconnect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
disconnect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); disconnect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
disconnect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); disconnect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
disconnect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); disconnect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
ds->setScanning( false ); ds->setScanning( false );
dvbsi->stop(); dvbsi->stop();
@ -219,9 +219,9 @@ void ScanDialog::setDvb( int index )
ds = dvb->at(i); ds = dvb->at(i);
ds->setScanning( true ); ds->setScanning( true );
dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset ); dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset );
connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
break; break;
} }
@ -614,25 +614,25 @@ bool ScanDialog::getTransData()
int i; int i;
for ( i=177; i<227; i+=7 ) { for ( i=177; i<227; i+=7 ) {
if ( offset07->isChecked() ) { if ( offset07->isChecked() ) {
s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000 ); s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000 );
parseTp( s, ds->getType(), "" ); parseTp( s, ds->getType(), "" );
} }
if ( offset125p->isChecked() ) { if ( offset125p->isChecked() ) {
s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000+125000 ); s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000+125000 );
parseTp( s, ds->getType(), "" ); parseTp( s, ds->getType(), "" );
} }
} }
for ( i=474; i<859; i+=8 ) { for ( i=474; i<859; i+=8 ) {
if ( offset167m->isChecked() ) { if ( offset167m->isChecked() ) {
s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)-167000 ); s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)-167000 );
parseTp( s, ds->getType(), "" ); parseTp( s, ds->getType(), "" );
} }
if ( offset0->isChecked() ) { if ( offset0->isChecked() ) {
s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( i*1000000 ); s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( i*1000000 );
parseTp( s, ds->getType(), "" ); parseTp( s, ds->getType(), "" );
} }
if ( offset167p->isChecked() ) { if ( offset167p->isChecked() ) {
s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+167000 ); s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+167000 );
parseTp( s, ds->getType(), "" ); parseTp( s, ds->getType(), "" );
} }
} }
@ -1010,7 +1010,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan )
int i; int i;
DListViewItem *it; DListViewItem *it;
it = new DListViewItem( foundList, chan, TQString( "%1").tqarg( chan->tp.snr ), chan->name ); it = new DListViewItem( foundList, chan, TQString( "%1").arg( chan->tp.snr ), chan->name );
if ( chan->type==1 ) { if ( chan->type==1 ) {
if ( scan ) if ( scan )
@ -1030,7 +1030,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan )
} }
if ( scan ) if ( scan )
progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).tqarg(ntv).tqarg(nradio) ); progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).arg(ntv).arg(nradio) );
if ( chan->provider.isEmpty() ) if ( chan->provider.isEmpty() )
return; return;
for ( i=0; i<providerComb->count(); i++ ) { for ( i=0; i<providerComb->count(); i++ ) {

16
kaffeine/src/input/dvb/scandialogui.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -29,7 +29,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -118,7 +118,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -129,7 +129,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -257,7 +257,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>18</height> <height>18</height>
@ -282,7 +282,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>19</height> <height>19</height>
@ -487,7 +487,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -503,7 +503,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>

24
kaffeine/src/input/dvb/subeditorui.ui
Unescape View File

@ -35,7 +35,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout19</cstring> <cstring>layout19</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -51,7 +51,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -70,7 +70,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -101,7 +101,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -109,7 +109,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -117,7 +117,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -159,7 +159,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -178,7 +178,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>180</height> <height>180</height>
@ -187,7 +187,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -195,7 +195,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -232,7 +232,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout10</cstring> <cstring>layout10</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -274,7 +274,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

8
kaffeine/src/input/dvbclient/cdwidget.cpp
Unescape View File

@ -19,7 +19,7 @@
*/ */
#include <tqapplication.h> #include <tqapplication.h>
#include <tqlayout.h> #include <layout.h>
#include <tqdir.h> #include <tqdir.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -33,14 +33,14 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa
: KaffeineInput( objParent, name ) : KaffeineInput( objParent, name )
{ {
mainWidget = new TQVBox( parent ); mainWidget = new TQVBox( parent );
mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
split = new TQSplitter( mainWidget ); split = new TQSplitter( mainWidget );
split->setOpaqueResize( true ); split->setOpaqueResize( true );
playerBox = new TQVBox( split ); playerBox = new TQVBox( split );
playerBox->setMinimumWidth( 200 ); playerBox->setMinimumWidth( 200 );
channelsLb = new TQListBox( split ); channelsLb = new TQListBox( split );
split->moveToFirst( channelsLb ); split->moveToFirst( channelsLb );
channelsLb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) ); channelsLb->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
split->setResizeMode( channelsLb, TQSplitter::KeepSize ); split->setResizeMode( channelsLb, TQSplitter::KeepSize );
cdAddress = ad; cdAddress = ad;
@ -324,7 +324,7 @@ void CdWidget::pauseLiveTV()
if ( !dump ) if ( !dump )
return; return;
if ( dump->running() ) { if ( dump->running() ) {
timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::tqcurrentDateTime().toString( Qt::ISODate )+".ts"; timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::currentDateTime().toString( Qt::ISODate )+".ts";
if ( dump->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName ); if ( dump->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName );
} }
} }

10
kaffeine/src/inputmanager.cpp
Unescape View File

@ -323,7 +323,7 @@ bool InputManager::playbackFinished( MRL &mrl )
void InputManager::statusBarMessage( const TQString &msg ) void InputManager::statusBarMessage( const TQString &msg )
{ {
kaffeine->slotChangePlaylisttqStatus( msg ); kaffeine->slotChangePlaylistStatus( msg );
} }
@ -530,13 +530,13 @@ void InputManager::fullscreen( bool b )
int id=0; int id=0;
if ( b ) { if ( b ) {
stack->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored); stack->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
oldMainWidget = currentMainWidget; oldMainWidget = currentMainWidget;
show( 2 ); show( 2 );
mtBar->hide(); mtBar->hide();
} }
else { else {
stack->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); stack->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
mtBar->show(); mtBar->show();
if ( oldMainWidget==startWindow ) if ( oldMainWidget==startWindow )
id = 1; id = 1;
@ -578,7 +578,7 @@ void PlayerContainer::dropEvent(TQDropEvent* dev)
{ {
for (uint i=0; i < urls.count() ;i++) for (uint i=0; i < urls.count() ;i++)
{ {
//KURL url(TQUriDrag::tqunicodeUriToUri(urls[i])); //KURL url(TQUriDrag::unicodeUriToUri(urls[i]));
//newurls << url.path(-1); //newurls << url.path(-1);
//kdDebug() << "Kaffeine: Dropped " << url.path() << endl; //kdDebug() << "Kaffeine: Dropped " << url.path() << endl;
newurls << urls[i]; newurls << urls[i];
@ -596,7 +596,7 @@ void PlayerContainer::dropEvent(TQDropEvent* dev)
else else
if (strcmp(dev->format(), "text/x-moz-url") == 0) // for mozilla drops if (strcmp(dev->format(), "text/x-moz-url") == 0) // for mozilla drops
{ {
TQByteArray data = dev->tqencodedData("text/plain"); TQByteArray data = dev->encodedData("text/plain");
TQString md(data); TQString md(data);
emit signalURLDropEvent(md); emit signalURLDropEvent(md);
} }

10
kaffeine/src/instwizard.cpp
Unescape View File

@ -49,7 +49,7 @@
void InstWizard::internalWizard() void InstWizard::internalWizard()
{ {
setCaption(i18n("Kaffeine %1 Installation Wizard").tqarg(KAFFEINE_VERSION)); setCaption(i18n("Kaffeine %1 Installation Wizard").arg(KAFFEINE_VERSION));
resize(400,400); resize(400,400);
/************** installation check ************************/ /************** installation check ************************/
@ -79,7 +79,7 @@ void InstWizard::internalWizard()
if (KDE::version() >= KDE_MAKE_VERSION(3,2,0)) if (KDE::version() >= KDE_MAKE_VERSION(3,2,0))
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>"; info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
else else
info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").tqarg("3.2") << "</font>"; info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").arg("3.2") << "</font>";
//XINE-LIB //XINE-LIB
//Should engine depending stuff be here? //Should engine depending stuff be here?
@ -96,13 +96,13 @@ void InstWizard::internalWizard()
if ((major == 1) && (minor == 0) && (sub == 0) && (xineVersion.contains("rc", false))) if ((major == 1) && (minor == 0) && (sub == 0) && (xineVersion.contains("rc", false)))
{ {
info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").tqarg("1.0") << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>"; info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").arg("1.0") << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
} }
else else
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>"; info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
} }
else else
info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").tqarg("1.0") info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").arg("1.0")
<< " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>"; << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
*/ */
//WIN32-CODECS //WIN32-CODECS
@ -272,7 +272,7 @@ void InstWizard::internalWizard()
void InstWizard::slotStdout(KProcess *, char *buffer, int buflen) void InstWizard::slotStdout(KProcess *, char *buffer, int buflen)
{ {
TQString output = TQString::tqfromLatin1(buffer, buflen); TQString output = TQString::fromLatin1(buffer, buflen);
kdDebug() << "WizardDialog: got from hdparm: " << output << "\n"; kdDebug() << "WizardDialog: got from hdparm: " << output << "\n";
stdout.append(output); stdout.append(output);
} }

22
kaffeine/src/kaffeine.cpp
Unescape View File

@ -59,7 +59,7 @@
#include <tdeversion.h> #include <tdeversion.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqlayout.h> #include <layout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqinputdialog.h> #include <tqinputdialog.h>
#include <kurldrag.h> #include <kurldrag.h>
@ -154,8 +154,8 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
//createStandardStatusBarAction(); //createStandardStatusBarAction();
createGUI("kaffeineui.rc"); createGUI("kaffeineui.rc");
//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").tqarg("0").tqarg("00:00:00").tqarg("0").tqarg("00:00:00"), 9, 0, true); //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").arg("0").arg("00:00:00").arg("0").arg("00:00:00"), 9, 0, true);
//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").tqarg("0").tqarg("0:00:00"), 9, 0, true); //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").arg("0").arg("0:00:00"), 9, 0, true);
//statusBar()->insertItem(i18n("No player"), 10, 0, true); //statusBar()->insertItem(i18n("No player"), 10, 0, true);
TQString stamp = locateLocal("appdata", "wizard_stamp_v0.7.1"); TQString stamp = locateLocal("appdata", "wizard_stamp_v0.7.1");
@ -367,7 +367,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
KService::Ptr service = KService::serviceByDesktopName(desktopName); KService::Ptr service = KService::serviceByDesktopName(desktopName);
if (!service) if (!service)
{ {
KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(desktopName), i18n("%1 not found in search path.").tqarg(TQString(desktopName)+ ".desktop")); KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(desktopName), i18n("%1 not found in search path.").arg(TQString(desktopName)+ ".desktop"));
return; return;
} }
@ -387,7 +387,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
int error = 0; int error = 0;
m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService<KaffeinePart>(service, m_playerContainer, service->name().ascii(), TQT_TQOBJECT(this), 0, m_engineParameters, &error); m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService<KaffeinePart>(service, m_playerContainer, service->name().ascii(), TQT_TQOBJECT(this), 0, m_engineParameters, &error);
if (error > 0) { if (error > 0) {
KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(service->name()), KLibLoader::self()->lastErrorMessage()); KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(service->name()), KLibLoader::self()->lastErrorMessage());
} }
else { else {
connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeCaption(const TQString&))); connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeCaption(const TQString&)));
@ -455,7 +455,7 @@ void Kaffeine::slotLoadingCanceled(const TQString& message)
delete m_mediaPart; delete m_mediaPart;
m_mediaPart = NULL; m_mediaPart = NULL;
} }
KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(name), message); KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(name), message);
} }
void Kaffeine::slotPlaybackFailed() void Kaffeine::slotPlaybackFailed()
@ -653,7 +653,7 @@ void Kaffeine::dropEvent(TQDropEvent* dev)
else else
if (strcmp(dev->format(), "text/x-moz-url") == 0) // for mozilla drops if (strcmp(dev->format(), "text/x-moz-url") == 0) // for mozilla drops
{ {
TQByteArray data = dev->tqencodedData("text/plain"); TQByteArray data = dev->encodedData("text/plain");
TQString md(data); TQString md(data);
load(md); load(md);
} }
@ -1087,7 +1087,7 @@ void Kaffeine::slotOpenFile()
KURL::List kurlList = KFileDialog::getOpenURLs(":kaffeine_openFile", fileFilter, 0, i18n("Open File(s)")); KURL::List kurlList = KFileDialog::getOpenURLs(":kaffeine_openFile", fileFilter, 0, i18n("Open File(s)"));
for (KURL::List::Iterator it = kurlList.begin(); it != kurlList.end(); ++it) for (KURL::List::Iterator it = kurlList.begin(); it != kurlList.end(); ++it)
if ((*it).isLocalFile() && (*it).path().tqendsWith(".iso", false)) if ((*it).isLocalFile() && (*it).path().endsWith(".iso", false))
(*it).setProtocol("dvd"); (*it).setProtocol("dvd");
TQStringList urlList = kurlList.toStringList(); TQStringList urlList = kurlList.toStringList();
@ -1439,7 +1439,7 @@ TQString Kaffeine::askForOtherDevice(const TQString& type)
TQVBox* page = dialog->makeVBoxMainWidget(); TQVBox* page = dialog->makeVBoxMainWidget();
page->setSpacing(5); page->setSpacing(5);
page->setMargin(5); page->setMargin(5);
new TQLabel(i18n("No %1 in drive, or wrong path to device.").tqarg(type), page); new TQLabel(i18n("No %1 in drive, or wrong path to device.").arg(type), page);
new TQLabel(TQString("\n") + i18n("Please select correct drive:"), page); new TQLabel(TQString("\n") + i18n("Please select correct drive:"), page);
DrivesCombo* drives = new DrivesCombo(page); DrivesCombo* drives = new DrivesCombo(page);
@ -1557,7 +1557,7 @@ void Kaffeine::slotChangeStatusbar(const TQString& )
} }
void Kaffeine::slotChangePlaylisttqStatus(const TQString& ) void Kaffeine::slotChangePlaylistStatus(const TQString& )
{ {
//statusBar()->changeItem(text, 9); //statusBar()->changeItem(text, 9);
} }
@ -1591,7 +1591,7 @@ void Kaffeine::slotFakeKeyEvent()
} }
} }
/** slots for meta to tqunicode encoding **/ /** slots for meta to unicode encoding **/
void Kaffeine::slotUseAlternateEncoding(bool useEncoding) void Kaffeine::slotUseAlternateEncoding(bool useEncoding)
{ {

2
kaffeine/src/kaffeine.h
Unescape View File

@ -128,7 +128,7 @@ public slots:
void slotLoadURLS(const TQStringList&); void slotLoadURLS(const TQStringList&);
void slotSwitchToPlayerWindow(); void slotSwitchToPlayerWindow();
void slotChangeStatusbar(const TQString&); void slotChangeStatusbar(const TQString&);
void slotChangePlaylisttqStatus(const TQString&); void slotChangePlaylistStatus(const TQString&);
void slotStop(); void slotStop();
void slotPlayUnPause(); void slotPlayUnPause();

112
kaffeine/src/kmultitabbar.cpp
Unescape View File

@ -29,7 +29,7 @@
#include "kmultitabbar_p.moc" #include "kmultitabbar_p.moc"
#include <tqbutton.h> #include <tqbutton.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <tqlayout.h> #include <layout.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqfontmetrics.h> #include <tqfontmetrics.h>
@ -111,7 +111,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
mainLayout->setAutoAdd(true); mainLayout->setAutoAdd(true);
} }
viewport()->tqrepaint(); viewport()->repaint();
} }
void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
@ -121,9 +121,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
if (m_position==KMultiTabBar::Right) if (m_position==KMultiTabBar::Right)
{ {
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height()); paint->drawLine(0,0,0,viewport()->height());
paint->setPen(tqcolorGroup().background().dark(120)); paint->setPen(colorGroup().background().dark(120));
paint->drawLine(1,0,1,viewport()->height()); paint->drawLine(1,0,1,viewport()->height());
@ -131,28 +131,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
else else
if (m_position==KMultiTabBar::Left) if (m_position==KMultiTabBar::Left)
{ {
paint->setPen(tqcolorGroup().light()); paint->setPen(colorGroup().light());
paint->drawLine(23,0,23,viewport()->height()); paint->drawLine(23,0,23,viewport()->height());
paint->drawLine(22,0,22,viewport()->height()); paint->drawLine(22,0,22,viewport()->height());
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height()); paint->drawLine(0,0,0,viewport()->height());
} }
else else
if (m_position==KMultiTabBar::Bottom) if (m_position==KMultiTabBar::Bottom)
{ {
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,viewport()->width(),0); paint->drawLine(0,0,viewport()->width(),0);
paint->setPen(tqcolorGroup().background().dark(120)); paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,1,viewport()->width(),1); paint->drawLine(0,1,viewport()->width(),1);
} }
else else
{ {
paint->setPen(tqcolorGroup().light()); paint->setPen(colorGroup().light());
paint->drawLine(0,23,viewport()->width(),23); paint->drawLine(0,23,viewport()->width(),23);
paint->drawLine(0,22,viewport()->width(),22); paint->drawLine(0,22,viewport()->width(),22);
/* paint->setPen(tqcolorGroup().shadow()); /* paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());*/ paint->drawLine(0,0,0,viewport()->height());*/
} }
@ -189,8 +189,8 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev)
void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) {
/* kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl; /* kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl;
kdDebug()<<"KMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl; kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/ kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
if (ev) TQScrollView::resizeEvent(ev); if (ev) TQScrollView::resizeEvent(ev);
if ( (m_style==KMultiTabBar::KDEV3) || if ( (m_style==KMultiTabBar::KDEV3) ||
@ -379,7 +379,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p
m_position=pos; m_position=pos;
for (uint i=0;i<m_tabs.count();i++) for (uint i=0;i<m_tabs.count();i++)
m_tabs.at(i)->setTabsPosition(m_position); m_tabs.at(i)->setTabsPosition(m_position);
viewport()->tqrepaint(); viewport()->repaint();
} }
@ -436,13 +436,13 @@ void KMultiTabBarButton::slotClicked()
void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos) void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos)
{ {
m_position=pos; m_position=pos;
tqrepaint(); repaint();
} }
void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
{ {
m_style=style; m_style=style;
tqrepaint(); repaint();
} }
void KMultiTabBarButton::hideEvent( TQHideEvent* he) { void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
@ -458,7 +458,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) {
} }
TQSize KMultiTabBarButton::tqsizeHint() const TQSize KMultiTabBarButton::sizeHint() const
{ {
constPolish(); constPolish();
@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
} }
#endif #endif
if ( isMenuButton() ) if ( isMenuButton() )
w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) { if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap(); TQPixmap *pm = (TQPixmap *)pixmap();
@ -484,7 +484,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
TQString s( text() ); TQString s( text() );
bool empty = s.isEmpty(); bool empty = s.isEmpty();
if ( empty ) if ( empty )
s = TQString::tqfromLatin1("XXXX"); s = TQString::fromLatin1("XXXX");
TQFontMetrics fm = fontMetrics(); TQFontMetrics fm = fontMetrics();
TQSize sz = fm.size( ShowPrefix, s ); TQSize sz = fm.size( ShowPrefix, s );
if(!empty || !w) if(!empty || !w)
@ -528,7 +528,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos)
} }
setPosition(pos); setPosition(pos);
// tqrepaint(); // repaint();
} }
void KMultiTabBarTab::setIcon(const TQString& icon) void KMultiTabBarTab::setIcon(const TQString& icon)
@ -581,12 +581,12 @@ void KMultiTabBarTab::updateState()
if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) { if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
setFixedWidth(24); setFixedWidth(24);
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) { if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
setFixedHeight(KMultiTabBarButton::tqsizeHint().width()); setFixedHeight(KMultiTabBarButton::sizeHint().width());
} else setFixedHeight(36); } else setFixedHeight(36);
} else { } else {
setFixedHeight(24); setFixedHeight(24);
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) { if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
setFixedWidth(KMultiTabBarButton::tqsizeHint().width()); setFixedWidth(KMultiTabBarButton::sizeHint().width());
} else setFixedWidth(36); } else setFixedWidth(36);
} }
} else { } else {
@ -637,7 +637,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
const int height = 24; const int height = 24;
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) { if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right)) if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right))
sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint(); sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
else sh=TQSize(this->width(),this->height()); else sh=TQSize(this->width(),this->height());
} }
else else
@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
if (down) st|=TQStyle::Style_On; if (down) st|=TQStyle::Style_On;
tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
switch (m_position) { switch (m_position) {
case KMultiTabBar::Left: case KMultiTabBar::Left:
@ -671,8 +671,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
paint->drawPixmap(0,0,pixmap); paint->drawPixmap(0,0,pixmap);
break; break;
} }
// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), // tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
// tqcolorGroup(),TQStyle::Style_Enabled); // colorGroup(),TQStyle::Style_Enabled);
} }
@ -682,58 +682,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap pixmap; TQPixmap pixmap;
if ( iconSet()) if ( iconSet())
pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ); pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
paint->fillRect(0, 0, 24, 24, tqcolorGroup().background()); paint->fillRect(0, 0, 24, 24, colorGroup().background());
if (!down) if (!down)
{ {
if (m_position==KMultiTabBar::Right) if (m_position==KMultiTabBar::Right)
{ {
paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background())); paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
paint->setPen(tqcolorGroup().background().dark(150)); paint->setPen(colorGroup().background().dark(150));
paint->drawLine(0,22,23,22); paint->drawLine(0,22,23,22);
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,23); paint->drawLine(0,0,0,23);
paint->setPen(tqcolorGroup().background().dark(120)); paint->setPen(colorGroup().background().dark(120));
paint->drawLine(1,0,1,23); paint->drawLine(1,0,1,23);
} }
else else
if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top)) if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top))
{ {
paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background())); paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
paint->setPen(tqcolorGroup().background().dark(120)); paint->setPen(colorGroup().background().dark(120));
paint->drawLine(23,0,23,23); paint->drawLine(23,0,23,23);
paint->setPen(tqcolorGroup().light()); paint->setPen(colorGroup().light());
paint->drawLine(0,22,23,22); paint->drawLine(0,22,23,22);
paint->drawLine(0,23,23,23); paint->drawLine(0,23,23,23);
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,23,0); paint->drawLine(0,0,23,0);
paint->setPen(tqcolorGroup().background().dark(120)); paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,1,23,1); paint->drawLine(0,1,23,1);
} }
else else
{ {
paint->setPen(tqcolorGroup().background().dark(120)); paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,23,23,23); paint->drawLine(0,23,23,23);
paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background())); paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
paint->setPen(tqcolorGroup().light()); paint->setPen(colorGroup().light());
paint->drawLine(23,0,23,23); paint->drawLine(23,0,23,23);
paint->drawLine(22,0,22,23); paint->drawLine(22,0,22,23);
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,23); paint->drawLine(0,0,0,23);
} }
@ -744,12 +744,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
{ {
if (m_position==KMultiTabBar::Right) if (m_position==KMultiTabBar::Right)
{ {
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-1,23,height()-1);
paint->drawLine(0,height()-2,23,height()-2); paint->drawLine(0,height()-2,23,height()-2);
paint->drawLine(23,0,23,height()-1); paint->drawLine(23,0,23,height()-1);
paint->drawLine(22,0,22,height()-1); paint->drawLine(22,0,22,height()-1);
paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light())); paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText) if (m_showActiveTabText)
@ -759,9 +759,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap tpixmap(height()-25-3, width()-2); TQPixmap tpixmap(height()-25-3, width()-2);
TQPainter painter(&tpixmap); TQPainter painter(&tpixmap);
painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
painter.setPen(tqcolorGroup().text()); painter.setPen(colorGroup().text());
painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
paint->rotate(90); paint->rotate(90);
@ -773,25 +773,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
else else
if (m_position==KMultiTabBar::Top) if (m_position==KMultiTabBar::Top)
{ {
paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light())); paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText) if (m_showActiveTabText)
{ {
paint->setPen(tqcolorGroup().text()); paint->setPen(colorGroup().text());
paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
} }
} }
else else
if (m_position==KMultiTabBar::Bottom) if (m_position==KMultiTabBar::Bottom)
{ {
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,23,width()-1,23); paint->drawLine(0,23,width()-1,23);
paint->drawLine(0,22,width()-1,22); paint->drawLine(0,22,width()-1,22);
paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light())); paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText) if (m_showActiveTabText)
{ {
paint->setPen(tqcolorGroup().text()); paint->setPen(colorGroup().text());
paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
} }
@ -800,10 +800,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
{ {
paint->setPen(tqcolorGroup().shadow()); paint->setPen(colorGroup().shadow());
paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-1,23,height()-1);
paint->drawLine(0,height()-2,23,height()-2); paint->drawLine(0,height()-2,23,height()-2);
paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light())); paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText) if (m_showActiveTabText)
{ {
@ -813,9 +813,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap tpixmap(height()-25-3, width()-2); TQPixmap tpixmap(height()-25-3, width()-2);
TQPainter painter(&tpixmap); TQPainter painter(&tpixmap);
painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
painter.setPen(tqcolorGroup().text()); painter.setPen(colorGroup().text());
painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
paint->rotate(-90); paint->rotate(-90);
@ -842,13 +842,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
if (bm==Vertical) if (bm==Vertical)
{ {
m_l=new TQVBoxLayout(this); m_l=new TQVBoxLayout(this);
tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
// setFixedWidth(24); // setFixedWidth(24);
} }
else else
{ {
m_l=new TQHBoxLayout(this); m_l=new TQHBoxLayout(this);
tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
// setFixedHeight(24); // setFixedHeight(24);
} }
m_l->setMargin(0); m_l->setMargin(0);
@ -992,7 +992,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */)
{ {
for (uint i=0;i<tabs()->count();i++) for (uint i=0;i<tabs()->count();i++)
tabs()->at(i)->resize(); tabs()->at(i)->resize();
tqrepaint(); repaint();
} }
TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();} TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();}

4
kaffeine/src/kmultitabbar.h
Unescape View File

@ -29,7 +29,7 @@
#include <tqscrollview.h> #include <tqscrollview.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <tqhbox.h> #include <tqhbox.h>
#include <tqlayout.h> #include <layout.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
@ -182,7 +182,7 @@ public slots:
*/ */
void setText(const TQString &); void setText(const TQString &);
TQSize tqsizeHint() const; TQSize sizeHint() const;
protected: protected:
KMultiTabBar::KMultiTabBarPosition m_position; KMultiTabBar::KMultiTabBarPosition m_position;

6
kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
Unescape View File

@ -737,7 +737,7 @@ void GStreamerPart::setAudioSink( TQString sinkName )
{ {
GstElement* sink = gst_element_factory_make(sinkName.ascii(), "audiosink"); GstElement* sink = gst_element_factory_make(sinkName.ascii(), "audiosink");
if ( !sink ) { if ( !sink ) {
KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(sinkName).tqarg(m_audioSinkName)); KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").arg(sinkName).arg(m_audioSinkName));
return; return;
} }
@ -785,7 +785,7 @@ bool GStreamerPart::initGStreamer()
*/ */
m_audiosink = gst_element_factory_make( m_audioSinkName.ascii(), "audiosink" ); m_audiosink = gst_element_factory_make( m_audioSinkName.ascii(), "audiosink" );
if ( !m_audiosink ) { if ( !m_audiosink ) {
KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").tqarg(m_audioSinkName)); KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").arg(m_audioSinkName));
if ( (m_audiosink = gst_element_factory_make("alsasink", "audiosink")) != NULL ) if ( (m_audiosink = gst_element_factory_make("alsasink", "audiosink")) != NULL )
kdDebug() << "GStreamerPart: Using audio-driver: alsasink" << endl; kdDebug() << "GStreamerPart: Using audio-driver: alsasink" << endl;
else { else {
@ -809,7 +809,7 @@ bool GStreamerPart::initGStreamer()
*/ */
m_videosink = gst_element_factory_make( m_videoSinkName.ascii(), "videosink" ); m_videosink = gst_element_factory_make( m_videoSinkName.ascii(), "videosink" );
if ( !m_videosink ) { if ( !m_videosink ) {
KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").tqarg(m_videoSinkName)); KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").arg(m_videoSinkName));
if ((m_videosink = gst_element_factory_make("xvimagesink", "videosink")) != NULL) if ((m_videosink = gst_element_factory_make("xvimagesink", "videosink")) != NULL)
kdDebug() << "GStreamerPart: Using video-driver: xvimagesink" << endl; kdDebug() << "GStreamerPart: Using video-driver: xvimagesink" << endl;
else { else {

42
kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include "gstreamerconfig.h" #include "gstreamerconfig.h"
@ -40,47 +40,47 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
setInitialSize(TQSize(400,300), true); setInitialSize(TQSize(400,300), true);
TQFrame* frame = NULL; TQFrame* frame = NULL;
TQGridLayout* tqlayout = NULL; TQGridLayout* layout = NULL;
TQLabel* label = NULL; TQLabel* label = NULL;
//Audio Page //Audio Page
frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel,
KIcon::SizeMedium)); KIcon::SizeMedium));
tqlayout = new TQGridLayout(frame, 10, 2); layout = new TQGridLayout(frame, 10, 2);
tqlayout->setMargin(10); layout->setMargin(10);
tqlayout->setSpacing(10); layout->setSpacing(10);
m_audioDriverBox = new KComboBox(frame); m_audioDriverBox = new KComboBox(frame);
m_audioDriverBox->insertStringList(audioDrivers); m_audioDriverBox->insertStringList(audioDrivers);
label = new TQLabel(i18n("Prefered audio driver"), frame); label = new TQLabel(i18n("Prefered audio driver"), frame);
tqlayout->addWidget(label, 1, 0); layout->addWidget(label, 1, 0);
tqlayout->addWidget(m_audioDriverBox, 1, 1); layout->addWidget(m_audioDriverBox, 1, 1);
tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
//Video Page //Video Page
frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
KIcon::SizeMedium)); KIcon::SizeMedium));
tqlayout = new TQGridLayout(frame, 10, 2); layout = new TQGridLayout(frame, 10, 2);
tqlayout->setMargin(10); layout->setMargin(10);
tqlayout->setSpacing(10); layout->setSpacing(10);
m_videoDriverBox = new KComboBox(frame); m_videoDriverBox = new KComboBox(frame);
m_videoDriverBox->insertStringList(videoDrivers); m_videoDriverBox->insertStringList(videoDrivers);
label = new TQLabel(i18n("Prefered video driver")+ "*", frame); label = new TQLabel(i18n("Prefered video driver")+ "*", frame);
tqlayout->addWidget(label, 1, 0); layout->addWidget(label, 1, 0);
tqlayout->addWidget(m_videoDriverBox, 1, 1); layout->addWidget(m_videoDriverBox, 1, 1);
tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
tqlayout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1); layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
//Media page //Media page
frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel, frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel,
KIcon::SizeMedium)); KIcon::SizeMedium));
tqlayout = new TQGridLayout(frame, 10, 2); layout = new TQGridLayout(frame, 10, 2);
tqlayout->setMargin(10); layout->setMargin(10);
tqlayout->setSpacing(10); layout->setSpacing(10);
m_driveEdit = new KLineEdit(frame); m_driveEdit = new KLineEdit(frame);
label = new TQLabel(i18n("CD, VCD, DVD drive"), frame); label = new TQLabel(i18n("CD, VCD, DVD drive"), frame);
tqlayout->addWidget(label, 1, 0); layout->addWidget(label, 1, 0);
tqlayout->addWidget(m_driveEdit, 1, 1); layout->addWidget(m_driveEdit, 1, 1);
tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
} }
GStreamerConfig::~GStreamerConfig() GStreamerConfig::~GStreamerConfig()

4
kaffeine/src/player-parts/gstreamer-part/video.cpp
Unescape View File

@ -134,7 +134,7 @@ void VideoWindow::newCapsset( const GstCaps *caps )
TQSize frame = getFrameSize(); TQSize frame = getFrameSize();
correctByAspectRatio( frame ); correctByAspectRatio( frame );
emit signalNewFrameSize( frame ); emit signalNewFrameSize( frame );
//set correct tqgeometry //set correct geometry
setGeometry(); setGeometry();
} }
@ -177,7 +177,7 @@ void VideoWindow::newState()
TQSize frame = getFrameSize(); TQSize frame = getFrameSize();
correctByAspectRatio( frame ); correctByAspectRatio( frame );
emit signalNewFrameSize( frame ); emit signalNewFrameSize( frame );
//set correct tqgeometry //set correct geometry
setGeometry(); setGeometry();
} }

10
kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <klocale.h> #include <klocale.h>
#include <tqslider.h> #include <tqslider.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqnamespace.h> #include <tqnamespace.h>
@ -39,7 +39,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
grid->setSpacing(5); grid->setSpacing(5);
TQLabel* hueText = new TQLabel(i18n("Hue"), page); TQLabel* hueText = new TQLabel(i18n("Hue"), page);
hueText->tqsetAlignment(AlignRight); hueText->setAlignment(AlignRight);
m_hueSlider = new TQSlider(Qt::Horizontal, page); m_hueSlider = new TQSlider(Qt::Horizontal, page);
m_hueSlider->setRange(-1000, 1000); m_hueSlider->setRange(-1000, 1000);
m_hueSlider->setSteps(10, 100); m_hueSlider->setSteps(10, 100);
@ -49,7 +49,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
grid->addWidget(m_hueSlider, 0, 1); grid->addWidget(m_hueSlider, 0, 1);
TQLabel* satText = new TQLabel(i18n("Saturation"), page); TQLabel* satText = new TQLabel(i18n("Saturation"), page);
satText->tqsetAlignment(AlignRight); satText->setAlignment(AlignRight);
m_satSlider = new TQSlider(Qt::Horizontal, page); m_satSlider = new TQSlider(Qt::Horizontal, page);
m_satSlider->setRange(-1000, 1000); m_satSlider->setRange(-1000, 1000);
m_satSlider->setSteps(10, 100); m_satSlider->setSteps(10, 100);
@ -59,7 +59,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
grid->addWidget(m_satSlider, 1, 1); grid->addWidget(m_satSlider, 1, 1);
TQLabel* contrastText = new TQLabel(i18n("Contrast"), page); TQLabel* contrastText = new TQLabel(i18n("Contrast"), page);
contrastText->tqsetAlignment(AlignRight); contrastText->setAlignment(AlignRight);
m_contrastSlider = new TQSlider(Qt::Horizontal, page); m_contrastSlider = new TQSlider(Qt::Horizontal, page);
m_contrastSlider->setRange(-1000, 1000); m_contrastSlider->setRange(-1000, 1000);
m_contrastSlider->setSteps(10, 100); m_contrastSlider->setSteps(10, 100);
@ -69,7 +69,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
grid->addWidget(m_contrastSlider, 2, 1); grid->addWidget(m_contrastSlider, 2, 1);
TQLabel* brightText = new TQLabel(i18n("Brightness"), page); TQLabel* brightText = new TQLabel(i18n("Brightness"), page);
brightText->tqsetAlignment(AlignRight); brightText->setAlignment(AlignRight);
m_brightSlider = new TQSlider(Qt::Horizontal, page); m_brightSlider = new TQSlider(Qt::Horizontal, page);
m_brightSlider->setRange(-1000, 1000); m_brightSlider->setRange(-1000, 1000);
m_brightSlider->setSteps(10, 100); m_brightSlider->setSteps(10, 100);

6
kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <layout.h>
#include "deinterlacequality.h" #include "deinterlacequality.h"
#include "deinterlacequality.moc" #include "deinterlacequality.moc"
@ -78,12 +78,12 @@ DeinterlaceQuality::DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent,
connect(m_customBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCustomBoxToggled(bool))); connect(m_customBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCustomBoxToggled(bool)));
m_customConfigButton = new KPushButton(i18n("Configure tvtime Deinterlace Plugin..."), mainWidget); m_customConfigButton = new KPushButton(i18n("Configure tvtime Deinterlace Plugin..."), mainWidget);
m_customConfigButton->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); m_customConfigButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
grid->addWidget(m_customConfigButton, 7, 1); grid->addWidget(m_customConfigButton, 7, 1);
connect(m_customConfigButton, TQT_SIGNAL(clicked()), filterDialog, TQT_SLOT(show())); connect(m_customConfigButton, TQT_SIGNAL(clicked()), filterDialog, TQT_SLOT(show()));
TQLabel* note = new TQLabel(i18n("* <i>May require a patched 2.4 kernel (like RedHat one) or 2.6 kernel.</i>"), mainWidget); TQLabel* note = new TQLabel(i18n("* <i>May require a patched 2.4 kernel (like RedHat one) or 2.6 kernel.</i>"), mainWidget);
note->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter); note->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
grid->addMultiCellWidget(note, 9, 9, 0, 1); grid->addMultiCellWidget(note, 9, 9, 0, 1);
} }

2
kaffeine/src/player-parts/xine-part/equalizer.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <tqlayout.h> #include <layout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqlabel.h> #include <tqlabel.h>

2
kaffeine/src/player-parts/xine-part/filterdialog.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <tqvbox.h> #include <tqvbox.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlayout.h> #include <layout.h>
#include <tqscrollview.h> #include <tqscrollview.h>
#include "filterdialog.h" #include "filterdialog.h"

194
kaffeine/src/player-parts/xine-part/kxinewidget.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqcursor.h> #include <tqcursor.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqtextcodec.h> #include <textcodec.h>
#include <xine/xineutils.h> #include <xine/xineutils.h>
@ -153,14 +153,14 @@ KXineWidget::~KXineWidget()
{ {
debugOut("Unwire audio filters"); debugOut("Unwire audio filters");
unwireAudioFilters(); unwireAudioFilters();
debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName )); debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName ));
delete m_visualPlugin; delete m_visualPlugin;
m_visualPlugin = NULL; m_visualPlugin = NULL;
} }
#else #else
if (m_xinePost) if (m_xinePost)
{ {
debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName)); debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
m_postAudioSource = xine_get_audio_source(m_xineStream); m_postAudioSource = xine_get_audio_source(m_xineStream);
xine_post_wire_audio_port(m_postAudioSource, m_audioDriver); xine_post_wire_audio_port(m_postAudioSource, m_audioDriver);
xine_post_dispose(m_xineEngine, m_xinePost); xine_post_dispose(m_xineEngine, m_xinePost);
@ -279,7 +279,7 @@ void KXineWidget::saveXineConfig()
xine_config_update_entry (m_xineEngine, &config); xine_config_update_entry (m_xineEngine, &config);
} }
debugOut(TQString("Save xine config to: %1").tqarg(m_configFilePath)); debugOut(TQString("Save xine config to: %1").arg(m_configFilePath));
xine_config_save(m_xineEngine, m_configFilePath.ascii()); xine_config_save(m_xineEngine, m_configFilePath.ascii());
} }
@ -331,7 +331,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height
/* frame size changed */ /* frame size changed */
if ( (video_width != vw->m_videoFrameWidth) || (video_height != vw->m_videoFrameHeight) ) if ( (video_width != vw->m_videoFrameWidth) || (video_height != vw->m_videoFrameHeight) )
{ {
debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").tqarg(video_width).tqarg(video_height).tqarg(video_aspect)); debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").arg(video_width).arg(video_height).arg(video_aspect));
vw->m_videoFrameWidth = video_width; vw->m_videoFrameWidth = video_width;
vw->m_videoFrameHeight = video_height; vw->m_videoFrameHeight = video_height;
vw->m_videoAspect = video_aspect; vw->m_videoAspect = video_aspect;
@ -343,7 +343,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height
{ {
vw->m_newParentSize = vw->parentWidget()->size() - TQSize((vw->width() - video_width), vw->height() - video_height); vw->m_newParentSize = vw->parentWidget()->size() - TQSize((vw->width() - video_width), vw->height() - video_height);
debugOut(TQString("Resize video window to: %1x%2").tqarg(vw->m_newParentSize.width()).tqarg(vw->m_newParentSize.height())); debugOut(TQString("Resize video window to: %1x%2").arg(vw->m_newParentSize.width()).arg(vw->m_newParentSize.height()));
/* we should not do a resize() inside a xine thread, /* we should not do a resize() inside a xine thread,
but post an event to the main thread */ but post an event to the main thread */
@ -391,7 +391,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL); channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
for(i = 0; i < channels; i++) for(i = 0; i < channels; i++)
{ {
slang = TQString("%1.").tqarg(i+1); slang = TQString("%1.").arg(i+1);
if (xine_get_audio_lang(vw->m_xineStream, i, lang)) if (xine_get_audio_lang(vw->m_xineStream, i, lang))
slang += lang; slang += lang;
tmp << slang; tmp << slang;
@ -415,7 +415,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_SPU_CHANNEL); channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_SPU_CHANNEL);
for(i = 0; i<channels; i++) for(i = 0; i<channels; i++)
{ {
slang = TQString("%1.").tqarg(i+1); slang = TQString("%1.").arg(i+1);
if (xine_get_spu_lang(vw->m_xineStream, i, lang)) if (xine_get_spu_lang(vw->m_xineStream, i, lang))
slang += lang; slang += lang;
tmp << slang; tmp << slang;
@ -472,7 +472,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
debugOut("xine event: dropped frames"); debugOut("xine event: dropped frames");
xine_dropped_frames_t* dropped = (xine_dropped_frames_t*)xineEvent->data; xine_dropped_frames_t* dropped = (xine_dropped_frames_t*)xineEvent->data;
warningOut(TQString("Skipped frames: %1 - discarded frames: %2").tqarg(dropped->skipped_frames/10).tqarg(dropped->discarded_frames/10)); warningOut(TQString("Skipped frames: %1 - discarded frames: %2").arg(dropped->skipped_frames/10).arg(dropped->discarded_frames/10));
break; break;
} }
@ -721,7 +721,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
} }
case TIMER_EVENT_NEW_STATUS: case TIMER_EVENT_NEW_STATUS:
{ {
emit signalXinetqStatus(m_statusString); emit signalXineStatus(m_statusString);
break; break;
} }
case TIMER_EVENT_CHANGE_CURSOR: case TIMER_EVENT_CHANGE_CURSOR:
@ -752,7 +752,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
else else
{ {
//restart //restart
warningOut(TQString("Message: '%1' was blocked!").tqarg(m_xineMessage)); warningOut(TQString("Message: '%1' was blocked!").arg(m_xineMessage));
m_recentMessagesTimer.start(1500); m_recentMessagesTimer.start(1500);
} }
break; break;
@ -795,7 +795,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
int pos, time, length; int pos, time, length;
debugOut(TQString("New video driver: %1").tqarg(entry->enum_values[entry->num_value])); debugOut(TQString("New video driver: %1").arg(entry->enum_values[entry->num_value]));
if (vw->m_osd) if (vw->m_osd)
{ {
@ -835,7 +835,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
vw->unwireAudioFilters(); vw->unwireAudioFilters();
if (vw->m_visualPlugin) if (vw->m_visualPlugin)
{ {
debugOut(TQString("Dispose visual plugin: %1").tqarg(vw->m_visualPluginName)); debugOut(TQString("Dispose visual plugin: %1").arg(vw->m_visualPluginName));
delete vw->m_visualPlugin; delete vw->m_visualPlugin;
vw->m_visualPlugin = NULL; vw->m_visualPlugin = NULL;
} }
@ -855,7 +855,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
if (!vw->m_videoDriver) if (!vw->m_videoDriver)
{ {
vw->m_xineError = i18n("Error: Can't init new Video Driver %1 - using %2!").tqarg(entry->enum_values[entry->num_value]).tqarg(vw->m_videoDriverName); vw->m_xineError = i18n("Error: Can't init new Video Driver %1 - using %2!").arg(entry->enum_values[entry->num_value]).arg(vw->m_videoDriverName);
TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR)); TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR));
playing = false; playing = false;
vw->m_videoDriver = xine_open_video_driver(vw->m_xineEngine, vw->m_videoDriver = xine_open_video_driver(vw->m_xineEngine,
@ -869,7 +869,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
else else
{ {
vw->m_videoDriverName = entry->enum_values[entry->num_value]; vw->m_videoDriverName = entry->enum_values[entry->num_value];
vw->m_statusString = i18n("Using Video Driver: %1").tqarg(vw->m_videoDriverName); vw->m_statusString = i18n("Using Video Driver: %1").arg(vw->m_videoDriverName);
TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS)); TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS));
} }
@ -902,7 +902,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
int pos, time, length; int pos, time, length;
debugOut(TQString("New audio driver: %1").tqarg(entry->enum_values[entry->num_value])); debugOut(TQString("New audio driver: %1").arg(entry->enum_values[entry->num_value]));
if (vw->m_osd) if (vw->m_osd)
{ {
@ -931,7 +931,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
vw->unwireAudioFilters(); vw->unwireAudioFilters();
if (vw->m_visualPlugin) if (vw->m_visualPlugin)
{ {
debugOut(TQString("Dispose visual plugin: %1").tqarg(vw->m_visualPluginName)); debugOut(TQString("Dispose visual plugin: %1").arg(vw->m_visualPluginName));
delete vw->m_visualPlugin; delete vw->m_visualPlugin;
vw->m_visualPlugin = NULL; vw->m_visualPlugin = NULL;
} }
@ -945,7 +945,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
if (!vw->m_audioDriver) if (!vw->m_audioDriver)
{ {
vw->m_xineError = i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(entry->enum_values[entry->num_value]).tqarg(vw->m_audioDriverName); vw->m_xineError = i18n("Error: Can't init new Audio Driver %1 - using %2!").arg(entry->enum_values[entry->num_value]).arg(vw->m_audioDriverName);
TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR)); TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR));
playing = false; playing = false;
vw->m_audioDriver = xine_open_audio_driver(vw->m_xineEngine, vw->m_audioDriverName.ascii(), NULL); vw->m_audioDriver = xine_open_audio_driver(vw->m_xineEngine, vw->m_audioDriverName.ascii(), NULL);
@ -953,7 +953,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
else else
{ {
vw->m_audioDriverName = entry->enum_values[entry->num_value]; vw->m_audioDriverName = entry->enum_values[entry->num_value];
vw->m_statusString = i18n("Using Audio Driver: %1").tqarg(vw->m_audioDriverName); vw->m_statusString = i18n("Using Audio Driver: %1").arg(vw->m_audioDriverName);
TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS)); TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS));
} }
@ -1109,7 +1109,7 @@ bool KXineWidget::initXine()
if (isXineReady()) if (isXineReady())
return true; return true;
emit signalXinetqStatus(i18n("Init xine...")); emit signalXineStatus(i18n("Init xine..."));
globalPosChanged(); /* get global pos of the window */ globalPosChanged(); /* get global pos of the window */
/**** INIT XINE DISPLAY ****/ /**** INIT XINE DISPLAY ****/
@ -1148,18 +1148,18 @@ bool KXineWidget::initXine()
int count = 1; int count = 1;
debugOut("Xinerama extension present"); debugOut("Xinerama extension present");
XineramaQueryScreens(x11Display(), &count); XineramaQueryScreens(x11Display(), &count);
debugOut(TQString("%1 screens detected").tqarg(count)); debugOut(TQString("%1 screens detected").arg(count));
if (count > 1) if (count > 1)
// multihead -> assuming square pixels // multihead -> assuming square pixels
m_displayRatio = 1.0; m_displayRatio = 1.0;
} }
#endif #endif
debugOut(TQString("Display aspect ratio (v/h): %1").tqarg(m_displayRatio));*/ debugOut(TQString("Display aspect ratio (v/h): %1").arg(m_displayRatio));*/
/**** INIT XINE ENGINE ****/ /**** INIT XINE ENGINE ****/
debugOut(TQString("Using xine version %1").tqarg(xine_get_version_string())); debugOut(TQString("Using xine version %1").arg(xine_get_version_string()));
m_xineEngine = xine_new(); m_xineEngine = xine_new();
if (!m_xineEngine) if (!m_xineEngine)
@ -1209,7 +1209,7 @@ bool KXineWidget::initXine()
else else
m_audioDriverName = m_audioChoices[i]; m_audioDriverName = m_audioChoices[i];
debugOut(TQString("Use audio driver %1").tqarg(m_audioDriverName)); debugOut(TQString("Use audio driver %1").arg(m_audioDriverName));
drivers = xine_list_video_output_plugins(m_xineEngine); drivers = xine_list_video_output_plugins(m_xineEngine);
i = 0; i = 0;
@ -1235,7 +1235,7 @@ bool KXineWidget::initXine()
else else
m_videoDriverName = m_videoChoices[i]; m_videoDriverName = m_videoChoices[i];
debugOut(TQString("Use video driver %1").tqarg(m_videoDriverName)); debugOut(TQString("Use video driver %1").arg(m_videoDriverName));
m_mixerInfo = strdup(i18n("Use software audio mixer").local8Bit()); m_mixerInfo = strdup(i18n("Use software audio mixer").local8Bit());
m_softwareMixer = (bool)xine_config_register_bool(m_xineEngine, "audio.mixer_software", 1, m_mixerInfo, m_softwareMixer = (bool)xine_config_register_bool(m_xineEngine, "audio.mixer_software", 1, m_mixerInfo,
@ -1307,7 +1307,7 @@ bool KXineWidget::initXine()
if (!m_videoDriver && m_videoDriverName != "auto") if (!m_videoDriver && m_videoDriverName != "auto")
{ {
emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").tqarg(m_videoDriverName)); emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").arg(m_videoDriverName));
m_videoDriverName = "auto"; m_videoDriverName = "auto";
m_videoDriver = xine_open_video_driver(m_xineEngine, m_videoDriver = xine_open_video_driver(m_xineEngine,
#ifndef HAVE_XCB #ifndef HAVE_XCB
@ -1331,7 +1331,7 @@ bool KXineWidget::initXine()
if (!m_audioDriver && m_audioDriverName != "auto") if (!m_audioDriver && m_audioDriverName != "auto")
{ {
emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").tqarg(m_audioDriverName)); emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").arg(m_audioDriverName));
m_audioDriverName = "auto"; m_audioDriverName = "auto";
m_audioDriver = xine_open_audio_driver (m_xineEngine, m_audioDriverName.ascii(), NULL); m_audioDriver = xine_open_audio_driver (m_xineEngine, m_audioDriverName.ascii(), NULL);
} }
@ -1377,7 +1377,7 @@ bool KXineWidget::initXine()
debugOut("xine init successful"); debugOut("xine init successful");
emit signalXinetqStatus(i18n("Ready")); emit signalXineStatus(i18n("Ready"));
emit signalXineReady(); emit signalXineReady();
/** something to play? **/ /** something to play? **/
@ -1395,12 +1395,12 @@ void KXineWidget::initOSD()
{ {
if (!xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize])) if (!xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize]))
{ {
debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").tqarg(m_osdFont)); debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").arg(m_osdFont));
free(m_osdFont); free(m_osdFont);
m_osdFont = strdup("sans"); m_osdFont = strdup("sans");
xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize]); xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize]);
} }
debugOut(TQString("Font for OSD: %1").tqarg(m_osdFont)); debugOut(TQString("Font for OSD: %1").arg(m_osdFont));
xine_osd_set_text_palette(m_osd, XINE_TEXTPALETTE_WHITE_BLACK_TRANSPARENT, XINE_OSD_TEXT1); xine_osd_set_text_palette(m_osd, XINE_TEXTPALETTE_WHITE_BLACK_TRANSPARENT, XINE_OSD_TEXT1);
m_osdUnscaled = (xine_osd_get_capabilities(m_osd) & XINE_OSD_CAP_UNSCALED); m_osdUnscaled = (xine_osd_get_capabilities(m_osd) & XINE_OSD_CAP_UNSCALED);
if (m_osdUnscaled) if (m_osdUnscaled)
@ -1428,7 +1428,7 @@ bool KXineWidget::playDvb()
{ {
if (!m_visualPlugin) if (!m_visualPlugin)
{ {
debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName)); debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL); m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL);
} }
@ -1438,7 +1438,7 @@ bool KXineWidget::playDvb()
{ {
if (m_visualPlugin) if (m_visualPlugin)
{ {
debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName)); debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
delete m_visualPlugin; delete m_visualPlugin;
m_visualPlugin = NULL; m_visualPlugin = NULL;
} }
@ -1508,7 +1508,7 @@ bool KXineWidget::playDvb()
m_posTimer.start(1000); m_posTimer.start(1000);
emit signalXinePlaying(); emit signalXinePlaying();
emit signalXinetqStatus(i18n("Playing")); emit signalXineStatus(i18n("Playing"));
return true; return true;
} }
@ -1882,7 +1882,7 @@ bool KXineWidget::openDvb()
} }
else fprintf(stderr,"xine pipe opened %s\n", m_trackURL.ascii()); else fprintf(stderr,"xine pipe opened %s\n", m_trackURL.ascii());
m_trackURL = "DVB"; m_trackURL = "DVB";
emit signalXinetqStatus(i18n("DVB: opening...")); emit signalXineStatus(i18n("DVB: opening..."));
TQTimer::singleShot( 0, this, TQT_SLOT(playDvb()) ); TQTimer::singleShot( 0, this, TQT_SLOT(playDvb()) );
return true; return true;
@ -1936,7 +1936,7 @@ void KXineWidget::slotPlay()
m_queue.remove(m_queue.find(m_trackURL)); m_queue.remove(m_queue.find(m_trackURL));
if (m_trackURL != m_logoFile) if (m_trackURL != m_logoFile)
emit signalXinetqStatus(i18n("Opening...")); emit signalXineStatus(i18n("Opening..."));
/* check for external subtitle file or save url */ /* check for external subtitle file or save url */
m_trackSubtitleURL = TQString(); m_trackSubtitleURL = TQString();
@ -1978,7 +1978,7 @@ void KXineWidget::slotPlay()
if ( turl.startsWith("/") ) if ( turl.startsWith("/") )
turl.prepend("file://"); turl.prepend("file://");
debugOut(TQString("Playing: %1").tqarg(turl.local8Bit().data())); debugOut(TQString("Playing: %1").arg(turl.local8Bit().data()));
xine_set_param( m_xineStream, XINE_PARAM_METRONOM_PREBUFFER, 12000 ); xine_set_param( m_xineStream, XINE_PARAM_METRONOM_PREBUFFER, 12000 );
if (!xine_open(m_xineStream, TQFile::encodeName(turl))) { if (!xine_open(m_xineStream, TQFile::encodeName(turl))) {
@ -2002,7 +2002,7 @@ void KXineWidget::slotPlay()
{ {
if (m_visualPluginName && (!m_xinePost)) if (m_visualPluginName && (!m_xinePost))
{ {
debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName)); debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
m_xinePost = xine_post_init(m_xineEngine, m_visualPluginName, 0, m_xinePost = xine_post_init(m_xineEngine, m_visualPluginName, 0,
&m_audioDriver, &m_audioDriver,
&m_videoDriver); &m_videoDriver);
@ -2016,7 +2016,7 @@ void KXineWidget::slotPlay()
{ {
if (m_xinePost) if (m_xinePost)
{ {
debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName)); debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
m_postAudioSource = xine_get_audio_source(m_xineStream); m_postAudioSource = xine_get_audio_source(m_xineStream);
xine_post_wire_audio_port(m_postAudioSource, m_audioDriver); xine_post_wire_audio_port(m_postAudioSource, m_audioDriver);
xine_post_dispose(m_xineEngine, m_xinePost); xine_post_dispose(m_xineEngine, m_xinePost);
@ -2053,7 +2053,7 @@ void KXineWidget::slotPlay()
CodecUtf8 = TQTextCodec::codecForName("UTF-8"); CodecUtf8 = TQTextCodec::codecForName("UTF-8");
TQString infotag; TQString infotag;
infotag = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE)); infotag = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE));
if (currentUtf8Locale) if (currentUtf8Locale)
m_trackTitle = infotag; m_trackTitle = infotag;
@ -2068,9 +2068,9 @@ void KXineWidget::slotPlay()
TQString trackArtist=NULL; TQString trackArtist=NULL;
TQString trackAlbum=NULL; TQString trackAlbum=NULL;
TQString trackComment=NULL; TQString trackComment=NULL;
trackArtist = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ARTIST)); trackArtist = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ARTIST));
trackAlbum = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ALBUM)); trackAlbum = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ALBUM));
trackComment = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_COMMENT)); trackComment = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_COMMENT));
if (currentUtf8Locale) if (currentUtf8Locale)
{ {
m_trackArtist = trackArtist; m_trackArtist = trackArtist;
@ -2157,9 +2157,9 @@ void KXineWidget::slotPlay()
{ {
emit signalXinePlaying(); emit signalXinePlaying();
if (hasSaveURL()) if (hasSaveURL())
emit signalXinetqStatus(i18n("Recording")); emit signalXineStatus(i18n("Recording"));
else else
emit signalXinetqStatus(i18n("Playing")); emit signalXineStatus(i18n("Playing"));
} }
} }
@ -2239,7 +2239,7 @@ void KXineWidget::sendXineError()
{ {
if (m_trackURL != m_logoFile) if (m_trackURL != m_logoFile)
{ {
emit signalXinetqStatus(i18n("Error")); emit signalXineStatus(i18n("Error"));
emit signalXineError(error); emit signalXineError(error);
} }
else else
@ -2248,7 +2248,7 @@ void KXineWidget::sendXineError()
else else
{ {
errorOut(error); errorOut(error);
errorOut(TQString("Can't play: %1 - trying next").tqarg(m_trackURL)); errorOut(TQString("Can't play: %1 - trying next").arg(m_trackURL));
TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, this, TQT_SLOT(slotPlay()));
} }
} }
@ -2290,7 +2290,7 @@ void KXineWidget::showOSDMessage(const TQString& message, uint duration, int pri
return; return;
prevOsdPriority = priority; prevOsdPriority = priority;
//debugOut(TQString("OSD: draw text: %1").tqarg(message)); //debugOut(TQString("OSD: draw text: %1").arg(message));
xine_osd_clear(m_osd); xine_osd_clear(m_osd);
xine_osd_draw_text(m_osd, 0, 0, message.local8Bit(), XINE_OSD_TEXT1); xine_osd_draw_text(m_osd, 0, 0, message.local8Bit(), XINE_OSD_TEXT1);
@ -2348,7 +2348,7 @@ void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* parent)
wireVideoFilters(); wireVideoFilters();
#else #else
parent = parent; parent = parent;
warningOut(TQString("Not implemented [CreateVideoFilter %1]").tqarg(name)); warningOut(TQString("Not implemented [CreateVideoFilter %1]").arg(name));
#endif #endif
} }
@ -2364,7 +2364,7 @@ void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* parent)
wireAudioFilters(); wireAudioFilters();
#else #else
parent = parent; parent = parent;
warningOut(TQString("Not implemented [CreateAudioFilter %1]").tqarg(name)); warningOut(TQString("Not implemented [CreateAudioFilter %1]").arg(name));
#endif #endif
} }
@ -2478,7 +2478,7 @@ void KXineWidget::wireAudioFilters()
{ {
if (!m_visualPlugin) if (!m_visualPlugin)
{ {
debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName)); debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL); m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL);
} }
@ -2488,7 +2488,7 @@ void KXineWidget::wireAudioFilters()
{ {
if (m_visualPlugin) if (m_visualPlugin)
{ {
debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName)); debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
delete m_visualPlugin; delete m_visualPlugin;
m_visualPlugin = NULL; m_visualPlugin = NULL;
} }
@ -2571,7 +2571,7 @@ TQStringList KXineWidget::getVisualPlugins() const
void KXineWidget::slotSetVisualPlugin(const TQString& visual) void KXineWidget::slotSetVisualPlugin(const TQString& visual)
{ {
if (m_visualPluginName == visual) return; if (m_visualPluginName == visual) return;
debugOut(TQString("New visualization plugin: %1").tqarg(visual)); debugOut(TQString("New visualization plugin: %1").arg(visual));
#ifndef USE_TQT_ONLY #ifndef USE_TQT_ONLY
unwireAudioFilters(); unwireAudioFilters();
@ -2660,7 +2660,7 @@ void KXineWidget::slotSetVolume(int vol)
if (!isXineReady()) return; if (!isXineReady()) return;
if (m_softwareMixer) if (m_softwareMixer)
{ {
//debugOut(TQString("Set software amplification level: %1").tqarg(vol)); //debugOut(TQString("Set software amplification level: %1").arg(vol));
if (m_volumeGain) if (m_volumeGain)
xine_set_param(m_xineStream, XINE_PARAM_AUDIO_AMP_LEVEL, vol*2); xine_set_param(m_xineStream, XINE_PARAM_AUDIO_AMP_LEVEL, vol*2);
else else
@ -2668,10 +2668,10 @@ void KXineWidget::slotSetVolume(int vol)
} }
else else
{ {
//debugOut(TQString("Set audio mixer volume: %1").tqarg(vol)); //debugOut(TQString("Set audio mixer volume: %1").arg(vol));
xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol); xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol);
} }
emit signalXinetqStatus(i18n("Volume") + ": " + TQString::number(vol) +"%"); emit signalXineStatus(i18n("Volume") + ": " + TQString::number(vol) +"%");
} }
uint KXineWidget::getVolume() const uint KXineWidget::getVolume() const
@ -2707,12 +2707,12 @@ void KXineWidget::slotToggleMute()
if (xine_get_param(m_xineStream, muteParam)) if (xine_get_param(m_xineStream, muteParam))
{ {
xine_set_param(m_xineStream, muteParam, 0); /* mute off */ xine_set_param(m_xineStream, muteParam, 0); /* mute off */
emit signalXinetqStatus(i18n("Mute Off")); emit signalXineStatus(i18n("Mute Off"));
} }
else else
{ {
xine_set_param(m_xineStream, muteParam, 1); /* mute on */ xine_set_param(m_xineStream, muteParam, 1); /* mute on */
emit signalXinetqStatus(i18n("Mute On")); emit signalXineStatus(i18n("Mute On"));
} }
} }
@ -2867,12 +2867,12 @@ void KXineWidget::slotStop()
TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, this, TQT_SLOT(slotPlay()));
} }
emit signalXinetqStatus(i18n("Stop")); emit signalXineStatus(i18n("Stop"));
} }
void KXineWidget::slotSetAudiocdDevice(const TQString& device) void KXineWidget::slotSetAudiocdDevice(const TQString& device)
{ {
debugOut(TQString("Set AudioCD device to %1").tqarg(device)); debugOut(TQString("Set AudioCD device to %1").arg(device));
xine_cfg_entry_t config; xine_cfg_entry_t config;
xine_config_lookup_entry(m_xineEngine, "input.cdda_device", &config); xine_config_lookup_entry(m_xineEngine, "input.cdda_device", &config);
@ -2884,7 +2884,7 @@ void KXineWidget::slotSetAudiocdDevice(const TQString& device)
void KXineWidget::slotSetVcdDevice(const TQString& device) void KXineWidget::slotSetVcdDevice(const TQString& device)
{ {
debugOut(TQString("Set VCD device to %1").tqarg(device)); debugOut(TQString("Set VCD device to %1").arg(device));
xine_cfg_entry_t config; xine_cfg_entry_t config;
xine_config_lookup_entry(m_xineEngine, "input.vcd_device", &config); xine_config_lookup_entry(m_xineEngine, "input.vcd_device", &config);
@ -2896,7 +2896,7 @@ void KXineWidget::slotSetVcdDevice(const TQString& device)
void KXineWidget::slotSetDvdDevice(const TQString& device) void KXineWidget::slotSetDvdDevice(const TQString& device)
{ {
debugOut(TQString("Set DVD device to %1").tqarg(device)); debugOut(TQString("Set DVD device to %1").arg(device));
xine_cfg_entry_t config; xine_cfg_entry_t config;
xine_config_lookup_entry(m_xineEngine, "input.dvd_device", &config); xine_config_lookup_entry(m_xineEngine, "input.dvd_device", &config);
@ -2966,7 +2966,7 @@ void KXineWidget::setStreamSaveDir(const TQString& dir)
if (!xine_config_lookup_entry(m_xineEngine, "misc.save_dir", &config)) return; /* older xine-lib */ if (!xine_config_lookup_entry(m_xineEngine, "misc.save_dir", &config)) return; /* older xine-lib */
debugOut(TQString("Set misc.save_dir to: %1").tqarg(dir)); debugOut(TQString("Set misc.save_dir to: %1").arg(dir));
config.str_value = TQFile::encodeName(dir).data(); config.str_value = TQFile::encodeName(dir).data();
xine_config_update_entry (m_xineEngine, &config); xine_config_update_entry (m_xineEngine, &config);
} }
@ -2982,7 +2982,7 @@ const TQString KXineWidget::getStreamSaveDir()
void KXineWidget::setBroadcasterPort(const uint port) void KXineWidget::setBroadcasterPort(const uint port)
{ {
debugOut(TQString("Set broadcaster port to %1").tqarg(port)); debugOut(TQString("Set broadcaster port to %1").arg(port));
xine_set_param(m_xineStream, XINE_PARAM_BROADCASTER_PORT, port); xine_set_param(m_xineStream, XINE_PARAM_BROADCASTER_PORT, port);
} }
@ -2997,7 +2997,7 @@ void KXineWidget::slotSpeedPause()
xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE); xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
m_posTimer.stop(); m_posTimer.stop();
if (m_currentSpeed != Undefined) if (m_currentSpeed != Undefined)
emit signalXinetqStatus(i18n("Pause")); emit signalXineStatus(i18n("Pause"));
m_currentSpeed = Pause; m_currentSpeed = Pause;
} }
} }
@ -3007,7 +3007,7 @@ void KXineWidget::slotSpeedNormal()
xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL); xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
m_posTimer.start(200); m_posTimer.start(200);
m_currentSpeed = Normal; m_currentSpeed = Normal;
emit signalXinetqStatus(i18n("Playing") + " "); emit signalXineStatus(i18n("Playing") + " ");
} }
void KXineWidget::slotSpeedFaster() void KXineWidget::slotSpeedFaster()
@ -3018,7 +3018,7 @@ void KXineWidget::slotSpeedFaster()
{ {
xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_4); xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_4);
m_currentSpeed = Fast2; m_currentSpeed = Fast2;
emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x2")); emit signalXineStatus(i18n("Fast Forward %1").arg("x2"));
break; break;
} }
case Fast2: case Fast2:
@ -3035,14 +3035,14 @@ void KXineWidget::slotSpeedFaster()
{ {
xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2); xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
m_currentSpeed = Slow1; m_currentSpeed = Slow1;
emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1")); emit signalXineStatus(i18n("Slow Motion %1").arg("x1"));
break; break;
} }
default: default:
{ {
xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2); xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
m_currentSpeed = Fast1; m_currentSpeed = Fast1;
emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1")); emit signalXineStatus(i18n("Fast Forward %1").arg("x1"));
break; break;
} }
} }
@ -3056,7 +3056,7 @@ void KXineWidget::slotSpeedSlower()
{ {
xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4); xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4);
m_currentSpeed = Slow2; m_currentSpeed = Slow2;
emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x2")); emit signalXineStatus(i18n("Slow Motion %1").arg("x2"));
break; break;
} }
case Slow2: case Slow2:
@ -3073,14 +3073,14 @@ void KXineWidget::slotSpeedSlower()
{ {
xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2); xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
m_currentSpeed = Fast1; m_currentSpeed = Fast1;
emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1")); emit signalXineStatus(i18n("Fast Forward %1").arg("x1"));
break; break;
} }
default: default:
{ {
xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2); xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
m_currentSpeed = Slow1; m_currentSpeed = Slow1;
emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1")); emit signalXineStatus(i18n("Slow Motion %1").arg("x1"));
break; break;
} }
} }
@ -3093,14 +3093,14 @@ TQString KXineWidget::getSupportedExtensions() const
void KXineWidget::slotSetAudioChannel(int ch) void KXineWidget::slotSetAudioChannel(int ch)
{ {
debugOut(TQString("Switch to audio channel %1").tqarg(ch-1)); debugOut(TQString("Switch to audio channel %1").arg(ch-1));
xine_set_param(m_xineStream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, ch-1); xine_set_param(m_xineStream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, ch-1);
} }
void KXineWidget::slotSetSubtitleChannel(int ch) void KXineWidget::slotSetSubtitleChannel(int ch)
{ {
debugOut(TQString("Switch to subtitle channel %1").tqarg(ch-1)); debugOut(TQString("Switch to subtitle channel %1").arg(ch-1));
xine_set_param(m_xineStream, XINE_PARAM_SPU_CHANNEL, ch-1); xine_set_param(m_xineStream, XINE_PARAM_SPU_CHANNEL, ch-1);
} }
@ -3306,7 +3306,7 @@ void KXineWidget::slotSetDeinterlaceConfig(const TQString& config)
if (m_deinterlaceFilter) if (m_deinterlaceFilter)
m_deinterlaceFilter->setConfig(config); m_deinterlaceFilter->setConfig(config);
#else #else
warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").tqarg(config)); warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").arg(config));
#endif #endif
} }
@ -3318,7 +3318,7 @@ void KXineWidget::slotToggleDeinterlace()
if (m_deinterlaceFilter) if (m_deinterlaceFilter)
{ {
m_deinterlaceEnabled = !m_deinterlaceEnabled; m_deinterlaceEnabled = !m_deinterlaceEnabled;
debugOut(TQString("Deinterlace enabled: %1").tqarg(m_deinterlaceEnabled)); debugOut(TQString("Deinterlace enabled: %1").arg(m_deinterlaceEnabled));
if ( m_deinterlaceEnabled ) s = i18n("Deinterlace: on"); if ( m_deinterlaceEnabled ) s = i18n("Deinterlace: on");
else s = i18n("Deinterlace: off"); else s = i18n("Deinterlace: off");
showOSDMessage( s, 2000 ); showOSDMessage( s, 2000 );
@ -3343,31 +3343,31 @@ void KXineWidget::slotToggleDeinterlace()
void KXineWidget::slotAspectRatioAuto() void KXineWidget::slotAspectRatioAuto()
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_AUTO); xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_AUTO);
emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("Auto")); emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("Auto"));
} }
void KXineWidget::slotAspectRatio4_3() void KXineWidget::slotAspectRatio4_3()
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_4_3); xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_4_3);
emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("4:3")); emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("4:3"));
} }
void KXineWidget::slotAspectRatioAnamorphic() void KXineWidget::slotAspectRatioAnamorphic()
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_ANAMORPHIC); xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_ANAMORPHIC);
emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("16:9")); emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("16:9"));
} }
void KXineWidget::slotAspectRatioSquare() void KXineWidget::slotAspectRatioSquare()
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_SQUARE); xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_SQUARE);
emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("1:1")); emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("1:1"));
} }
void KXineWidget::slotAspectRatioDVB() void KXineWidget::slotAspectRatioDVB()
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_DVB); xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_DVB);
emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1")); emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1"));
} }
void KXineWidget::slotZoomOutX() void KXineWidget::slotZoomOutX()
@ -3376,7 +3376,7 @@ void KXineWidget::slotZoomOutX()
{ {
m_currentZoomX -= 5; m_currentZoomX -= 5;
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX);
emit signalXinetqStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%"); emit signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
} }
} }
@ -3386,7 +3386,7 @@ void KXineWidget::slotZoomInX()
{ {
m_currentZoomX += 5; m_currentZoomX += 5;
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX);
emit signalXinetqStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%"); emit signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
} }
} }
@ -3396,7 +3396,7 @@ void KXineWidget::slotZoomOutY()
{ {
m_currentZoomY -= 5; m_currentZoomY -= 5;
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY);
emit signalXinetqStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%"); emit signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
} }
} }
@ -3406,7 +3406,7 @@ void KXineWidget::slotZoomInY()
{ {
m_currentZoomY += 5; m_currentZoomY += 5;
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY);
emit signalXinetqStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%"); emit signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
} }
} }
@ -3418,7 +3418,7 @@ void KXineWidget::slotZoomOut()
m_currentZoomX = m_currentZoomY = m_currentZoom; m_currentZoomX = m_currentZoomY = m_currentZoom;
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom);
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom);
emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
} }
} }
@ -3430,7 +3430,7 @@ void KXineWidget::slotZoomIn()
m_currentZoomX = m_currentZoomY = m_currentZoom; m_currentZoomX = m_currentZoomY = m_currentZoom;
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom);
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom);
emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
} }
} }
@ -3440,7 +3440,7 @@ void KXineWidget::slotZoomOff()
xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, 100); xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, 100);
m_currentZoom = 100; m_currentZoom = 100;
m_currentZoomX = m_currentZoomY = m_currentZoom; m_currentZoomX = m_currentZoomY = m_currentZoom;
emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
} }
TQTime KXineWidget::getLengthInfo() TQTime KXineWidget::getLengthInfo()
@ -3513,37 +3513,37 @@ void KXineWidget::getspuOffset(int& spuOffset) const
void KXineWidget::slotSetHue(int hue) void KXineWidget::slotSetHue(int hue)
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_HUE, hue); xine_set_param(m_xineStream, XINE_PARAM_VO_HUE, hue);
emit signalXinetqStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%"); emit signalXineStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%");
} }
void KXineWidget::slotSetSaturation(int sat) void KXineWidget::slotSetSaturation(int sat)
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_SATURATION, sat); xine_set_param(m_xineStream, XINE_PARAM_VO_SATURATION, sat);
emit signalXinetqStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%"); emit signalXineStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%");
} }
void KXineWidget::slotSetContrast(int contrast) void KXineWidget::slotSetContrast(int contrast)
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_CONTRAST, contrast); xine_set_param(m_xineStream, XINE_PARAM_VO_CONTRAST, contrast);
emit signalXinetqStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%"); emit signalXineStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%");
} }
void KXineWidget::slotSetBrightness(int bright) void KXineWidget::slotSetBrightness(int bright)
{ {
xine_set_param(m_xineStream, XINE_PARAM_VO_BRIGHTNESS, bright); xine_set_param(m_xineStream, XINE_PARAM_VO_BRIGHTNESS, bright);
emit signalXinetqStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%"); emit signalXineStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%");
} }
void KXineWidget::slotSetAVOffset(int av) void KXineWidget::slotSetAVOffset(int av)
{ {
xine_set_param(m_xineStream, XINE_PARAM_AV_OFFSET, av); xine_set_param(m_xineStream, XINE_PARAM_AV_OFFSET, av);
emit signalXinetqStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec")); emit signalXineStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec"));
} }
void KXineWidget::slotSetSpuOffset(int spu) void KXineWidget::slotSetSpuOffset(int spu)
{ {
xine_set_param(m_xineStream, XINE_PARAM_SPU_OFFSET, spu); xine_set_param(m_xineStream, XINE_PARAM_SPU_OFFSET, spu);
emit signalXinetqStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec")); emit signalXineStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec"));
} }
@ -3786,7 +3786,7 @@ TQImage KXineWidget::getScreenshot() const
else else
height = (int)((double) height / scaleFactor + 0.5); height = (int)((double) height / scaleFactor + 0.5);
debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").tqarg(screenShot.width()).tqarg(screenShot.height()).tqarg(width).tqarg(height)); debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").arg(screenShot.width()).arg(screenShot.height()).arg(width).arg(height));
screenShot = screenShot.smoothScale(width, height); screenShot = screenShot.smoothScale(width, height);
delete []rgbPile; delete []rgbPile;
@ -3849,7 +3849,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
break; break;
default: default:
{ {
warningOut(TQString("Screenshot: Format %1 not supportet!").tqarg((char*)&format)); warningOut(TQString("Screenshot: Format %1 not supportet!").arg((char*)&format));
delete [] yuv; delete [] yuv;
return; return;
} }
@ -3880,7 +3880,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
desired_ratio = 4.0 / 3.0; desired_ratio = 4.0 / 3.0;
break; break;
default: default:
warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").tqarg(ratio)); warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio));
case XINE_VO_ASPECT_STQUARE: case XINE_VO_ASPECT_STQUARE:
debugOut("Screenshot: got video aspect: 1:1"); debugOut("Screenshot: got video aspect: 1:1");
desired_ratio = image_ratio; desired_ratio = image_ratio;
@ -3888,7 +3888,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
} }
*/ */
debugOut(TQString("Screenshot: using scale factor: %1").tqarg(m_videoAspect)); debugOut(TQString("Screenshot: using scale factor: %1").arg(m_videoAspect));
scaleFactor = m_videoAspect; scaleFactor = m_videoAspect;
delete [] yuv; delete [] yuv;

2
kaffeine/src/player-parts/xine-part/kxinewidget.h
Unescape View File

@ -192,7 +192,7 @@ signals:
void signalXineFatal(const TQString& message); /** initXine() not successfull! **/ void signalXineFatal(const TQString& message); /** initXine() not successfull! **/
void signalXineError(const TQString& message); void signalXineError(const TQString& message);
void signalXineMessage(const TQString& message); void signalXineMessage(const TQString& message);
void signalXinetqStatus(const TQString& status); void signalXineStatus(const TQString& status);
void signalXineReady(); void signalXineReady();
void signalXinePlaying(); void signalXinePlaying();

12
kaffeine/src/player-parts/xine-part/postfilter.cpp
Unescape View File

@ -24,13 +24,13 @@
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqobject.h> #include <tqobject.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqtextedit.h> #include <textedit.h>
#include <stdio.h> #include <stdio.h>
@ -50,7 +50,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
xine_post_in_t* inputAPI = NULL; xine_post_in_t* inputAPI = NULL;
m_groupBox = new TQGroupBox(name, parent); m_groupBox = new TQGroupBox(name, parent);
m_groupBox->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); m_groupBox->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
TQGridLayout* grid = new TQGridLayout(m_groupBox, 2, 2); TQGridLayout* grid = new TQGridLayout(m_groupBox, 2, 2);
grid->setMargin( 20 ); grid->setMargin( 20 );
grid->setSpacing( 5 ); grid->setSpacing( 5 );
@ -147,7 +147,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
} }
descr = new TQLabel(TQString::fromUtf8(m_xinePostParameter->description ), m_groupBox); descr = new TQLabel(TQString::fromUtf8(m_xinePostParameter->description ), m_groupBox);
descr->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter); descr->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
grid->addWidget(descr, row, 1); grid->addWidget(descr, row, 1);
row++; row++;
m_xinePostParameter++; m_xinePostParameter++;
@ -157,14 +157,14 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
grid->addMultiCellWidget(sep, row, row, 0, 1); grid->addMultiCellWidget(sep, row, row, 0, 1);
row++; row++;
KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox); KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox);
deleteButton->tqsetSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); deleteButton->setSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotDeletePressed())); connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotDeletePressed()));
grid->addWidget(deleteButton, row, 0); grid->addWidget(deleteButton, row, 0);
if(inputAPI) if(inputAPI)
{ {
KPushButton* helpButton = new KPushButton(i18n("Help"), m_groupBox); KPushButton* helpButton = new KPushButton(i18n("Help"), m_groupBox);
helpButton->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); helpButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
connect(helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelpPressed())); connect(helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelpPressed()));
grid->addWidget(helpButton, row, 1); grid->addWidget(helpButton, row, 1);
} }

14
kaffeine/src/player-parts/xine-part/videosettings.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <klocale.h> #include <klocale.h>
#include <tqslider.h> #include <tqslider.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqnamespace.h> #include <tqnamespace.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
@ -48,7 +48,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
videoGrid->setMargin(10); videoGrid->setMargin(10);
TQLabel* hueText = new TQLabel(i18n("Hue"), videoGroup); TQLabel* hueText = new TQLabel(i18n("Hue"), videoGroup);
hueText->tqsetAlignment(AlignRight); hueText->setAlignment(AlignRight);
m_hueSlider = new TQSlider(Qt::Horizontal, videoGroup); m_hueSlider = new TQSlider(Qt::Horizontal, videoGroup);
m_hueSlider->setRange(0, 65535); m_hueSlider->setRange(0, 65535);
m_hueSlider->setSteps(10, 1000); m_hueSlider->setSteps(10, 1000);
@ -58,7 +58,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
videoGrid->addWidget(m_hueSlider, 0, 1); videoGrid->addWidget(m_hueSlider, 0, 1);
TQLabel* satText = new TQLabel(i18n("Saturation"), videoGroup); TQLabel* satText = new TQLabel(i18n("Saturation"), videoGroup);
satText->tqsetAlignment(AlignRight); satText->setAlignment(AlignRight);
m_satSlider = new TQSlider(Qt::Horizontal, videoGroup); m_satSlider = new TQSlider(Qt::Horizontal, videoGroup);
m_satSlider->setRange(0, 65535); m_satSlider->setRange(0, 65535);
m_satSlider->setSteps(10, 1000); m_satSlider->setSteps(10, 1000);
@ -68,7 +68,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
videoGrid->addWidget(m_satSlider, 1, 1); videoGrid->addWidget(m_satSlider, 1, 1);
TQLabel* contrastText = new TQLabel(i18n("Contrast"), videoGroup); TQLabel* contrastText = new TQLabel(i18n("Contrast"), videoGroup);
contrastText->tqsetAlignment(AlignRight); contrastText->setAlignment(AlignRight);
m_contrastSlider = new TQSlider(Qt::Horizontal, videoGroup); m_contrastSlider = new TQSlider(Qt::Horizontal, videoGroup);
m_contrastSlider->setRange(0, 65535); m_contrastSlider->setRange(0, 65535);
m_contrastSlider->setSteps(10, 1000); m_contrastSlider->setSteps(10, 1000);
@ -78,7 +78,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
videoGrid->addWidget(m_contrastSlider, 2, 1); videoGrid->addWidget(m_contrastSlider, 2, 1);
TQLabel* brightText = new TQLabel(i18n("Brightness"), videoGroup); TQLabel* brightText = new TQLabel(i18n("Brightness"), videoGroup);
brightText->tqsetAlignment(AlignRight); brightText->setAlignment(AlignRight);
m_brightSlider = new TQSlider(Qt::Horizontal, videoGroup); m_brightSlider = new TQSlider(Qt::Horizontal, videoGroup);
m_brightSlider->setRange(0, 65535); m_brightSlider->setRange(0, 65535);
m_brightSlider->setSteps(10, 1000); m_brightSlider->setSteps(10, 1000);
@ -88,7 +88,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
videoGrid->addWidget(m_brightSlider, 3, 1); videoGrid->addWidget(m_brightSlider, 3, 1);
TQLabel* avOffsetText = new TQLabel(i18n("Audio/Video Offset"), videoGroup); TQLabel* avOffsetText = new TQLabel(i18n("Audio/Video Offset"), videoGroup);
avOffsetText->tqsetAlignment(AlignRight); avOffsetText->setAlignment(AlignRight);
m_avOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup); m_avOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup);
m_avOffsetSlider->setRange(-90000, 90000); // +/- 1 sec m_avOffsetSlider->setRange(-90000, 90000); // +/- 1 sec
m_avOffsetSlider->setSteps(100, 10000); m_avOffsetSlider->setSteps(100, 10000);
@ -98,7 +98,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
videoGrid->addWidget(m_avOffsetSlider, 4, 1); videoGrid->addWidget(m_avOffsetSlider, 4, 1);
TQLabel* spuOffsetText = new TQLabel(i18n("Subtitle Offset"), videoGroup); TQLabel* spuOffsetText = new TQLabel(i18n("Subtitle Offset"), videoGroup);
spuOffsetText->tqsetAlignment(AlignRight); spuOffsetText->setAlignment(AlignRight);
m_spuOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup); m_spuOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup);
m_spuOffsetSlider->setRange(-90000, 90000); // +/- 1 sec m_spuOffsetSlider->setRange(-90000, 90000); // +/- 1 sec
m_spuOffsetSlider->setSteps(100, 10000); m_spuOffsetSlider->setSteps(100, 10000);

18
kaffeine/src/player-parts/xine-part/xine_part.cpp
Unescape View File

@ -212,7 +212,7 @@ bool XinePart::openURL(const MRL& mrl)
if (firstLine.contains("smil", false)) if (firstLine.contains("smil", false))
{ {
kdDebug() << "XinePart: Try loading smil playlist\n"; kdDebug() << "XinePart: Try loading smil playlist\n";
if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any tqlayout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes) if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any layout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes)
{ {
if (!PlaylistImport::smil(localFile, m_mrl, m_playlist)) if (!PlaylistImport::smil(localFile, m_mrl, m_playlist))
{ {
@ -304,7 +304,7 @@ void XinePart::slotPlay(bool forcePlay)
{ {
TQString sub; TQString sub;
if ((!mrl.subtitleFiles().isEmpty()) && (mrl.currentSubtitle() > -1)) if ((!mrl.subtitleFiles().isEmpty()) && (mrl.currentSubtitle() > -1))
sub = TQString("#subtitle:%1").tqarg(mrl.subtitleFiles()[mrl.currentSubtitle()]); sub = TQString("#subtitle:%1").arg(mrl.subtitleFiles()[mrl.currentSubtitle()]);
m_xine->clearQueue(); m_xine->clearQueue();
m_xine->appendToQueue(mrl.url() + sub ); m_xine->appendToQueue(mrl.url() + sub );
@ -786,7 +786,7 @@ void XinePart::slotNewPosition(int pos, const TQTime& playtime)
} }
else else
{ {
timeMessage = i18n("%1 of %2").tqarg(calcLength.toString("h:mm:ss")).tqarg(length.toString("h:mm:ss")); timeMessage = i18n("%1 of %2").arg(calcLength.toString("h:mm:ss")).arg(length.toString("h:mm:ss"));
m_xine->showOSDMessage(timeMessage, 600, OSD_MESSAGE_LOW_PRIORITY); m_xine->showOSDMessage(timeMessage, 600, OSD_MESSAGE_LOW_PRIORITY);
} }
} }
@ -1058,7 +1058,7 @@ void XinePart::slotMessage(const TQString& message)
KMessageBox::information(0, msg, i18n("xine Message")); KMessageBox::information(0, msg, i18n("xine Message"));
} }
void XinePart::slottqStatus(const TQString& status) void XinePart::slotStatus(const TQString& status)
{ {
emit setStatusBarText(status); emit setStatusBarText(status);
if ((status != i18n("Ready")) && (status != i18n("Playing"))) if ((status != i18n("Ready")) && (status != i18n("Playing")))
@ -1240,7 +1240,7 @@ void XinePart::slotInfo()
if (m_xine->hasSaveURL()) if (m_xine->hasSaveURL())
ts << "<tr><td><b>" << i18n("Save Stream as") << ":</b></td><td> " << m_xine->getSaveURL() << "</td></tr>"; ts << "<tr><td><b>" << i18n("Save Stream as") << ":</b></td><td> " << m_xine->getSaveURL() << "</td></tr>";
ts << "<tr><td></td><td></td></tr>"; // added for better tqlayout ts << "<tr><td></td><td></td></tr>"; // added for better layout
ts << "</table></qt>"; ts << "</table></qt>";
KMessageBox::information(0, info, i18n("Track info") ); KMessageBox::information(0, info, i18n("Track info") );
} }
@ -1442,7 +1442,7 @@ void XinePart::initActions()
(m_playTime, i18n("Short click: Toggle Timer Forward/Backward\nLong click: Toggle Timer OSD")); (m_playTime, i18n("Short click: Toggle Timer Forward/Backward\nLong click: Toggle Timer OSD"));
TQFontMetrics met(KGlobalSettings::generalFont()); TQFontMetrics met(KGlobalSettings::generalFont());
m_playTime->setFixedWidth(met.width("-55:55:55") + 6); m_playTime->setFixedWidth(met.width("-55:55:55") + 6);
m_playTime->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_playTime->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_playTime->setFocusPolicy(TQ_NoFocus); m_playTime->setFocusPolicy(TQ_NoFocus);
new KWidgetAction(m_playTime, i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime"); new KWidgetAction(m_playTime, i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime");
connect(m_playTime, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotButtonTimerPressed())); connect(m_playTime, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotButtonTimerPressed()));
@ -1473,7 +1473,7 @@ void XinePart::initConnections()
this, TQT_SLOT(slotChannelInfo(const TQStringList&, const TQStringList&, int, int ))); this, TQT_SLOT(slotChannelInfo(const TQStringList&, const TQStringList&, int, int )));
connect(m_xine, TQT_SIGNAL(signalXinePlaying()), TQT_TQOBJECT(this), TQT_SLOT(slotTrackPlaying())); connect(m_xine, TQT_SIGNAL(signalXinePlaying()), TQT_TQOBJECT(this), TQT_SLOT(slotTrackPlaying()));
connect(m_xine, TQT_SIGNAL(signalNewPosition(int, const TQTime&)), TQT_TQOBJECT(this), TQT_SLOT(slotNewPosition(int, const TQTime&))); connect(m_xine, TQT_SIGNAL(signalNewPosition(int, const TQTime&)), TQT_TQOBJECT(this), TQT_SLOT(slotNewPosition(int, const TQTime&)));
connect(m_xine, TQT_SIGNAL(signalXinetqStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slottqStatus(const TQString&))); connect(m_xine, TQT_SIGNAL(signalXineStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatus(const TQString&)));
connect(m_xine, TQT_SIGNAL(signalXineError(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotError(const TQString&))); connect(m_xine, TQT_SIGNAL(signalXineError(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotError(const TQString&)));
connect(m_xine, TQT_SIGNAL(signalXineMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotMessage(const TQString&))); connect(m_xine, TQT_SIGNAL(signalXineMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotMessage(const TQString&)));
connect(m_xine, TQT_SIGNAL(signalPlaybackFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotPlaybackFinished())); connect(m_xine, TQT_SIGNAL(signalPlaybackFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotPlaybackFinished()));
@ -1623,7 +1623,7 @@ void XinePart::audiocdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQS
for (uint i = 0; i < list.count(); i++) for (uint i = 0; i < list.count(); i++)
{ {
mrl = MRL(list[i]); mrl = MRL(list[i]);
mrl.setTitle(i18n("AudioCD Track %1").tqarg(i+1)); mrl.setTitle(i18n("AudioCD Track %1").arg(i+1));
mrl.setTrack(TQString::number(i+1)); mrl.setTrack(TQString::number(i+1));
if (xine_open(xineStreamForMeta, TQFile::encodeName(mrl.url()))) if (xine_open(xineStreamForMeta, TQFile::encodeName(mrl.url())))
{ {
@ -1698,7 +1698,7 @@ void XinePart::vcdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQStrin
mrl = MRL(list[i]); mrl = MRL(list[i]);
mrl.setMime("video/vcd"); mrl.setMime("video/vcd");
mrl.setTrack(TQString::number(i+1)); mrl.setTrack(TQString::number(i+1));
mrl.setTitle(i18n("VCD Track %1").tqarg(i+1)); mrl.setTitle(i18n("VCD Track %1").arg(i+1));
mrls.append(mrl); mrls.append(mrl);
} }
if (mrls.count()) if (mrls.count())

4
kaffeine/src/player-parts/xine-part/xine_part.h
Unescape View File

@ -169,7 +169,7 @@ private slots:
void slotConfigXine(); void slotConfigXine();
void slotError(const TQString&); void slotError(const TQString&);
void slotMessage(const TQString&); void slotMessage(const TQString&);
void slottqStatus(const TQString&); void slotStatus(const TQString&);
void slotNewTitle(); void slotNewTitle();
void slotNewLength(); void slotNewLength();
void slotNewFrameSize(); void slotNewFrameSize();
@ -206,7 +206,7 @@ private:
TQPoint m_oldPosition; TQPoint m_oldPosition;
TQTimer m_posCheckTimer; TQTimer m_posCheckTimer;
TQTimer m_osdTimerEnabler; /* Provide Long click on timer button */ TQTimer m_osdTimerEnabler; /* Provide Long click on timer button */
bool m_isOsdTimer; /* tqStatus of Osd Timer (on/off) */ bool m_isOsdTimer; /* Status of Osd Timer (on/off) */
int m_timerDirection; /* Counting Up or Down */ int m_timerDirection; /* Counting Up or Down */
int m_brightness, m_hue, m_contrast, m_saturation; int m_brightness, m_hue, m_contrast, m_saturation;

6
kaffeine/src/player-parts/xine-part/xineconfig.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqcolor.h> #include <tqcolor.h>
#include <tqfont.h> #include <tqfont.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqlayout.h> #include <layout.h>
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
@ -132,7 +132,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
m_keyName.remove( 0, m_keyName.find(".") + 1 ); m_keyName.remove( 0, m_keyName.find(".") + 1 );
TQLabel* description = new TQLabel(m_keyName + "\n" + TQString::fromLocal8Bit(entry->description), parent); TQLabel* description = new TQLabel(m_keyName + "\n" + TQString::fromLocal8Bit(entry->description), parent);
description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget(description, row, 1); grid->addWidget(description, row, 1);
KSeparator* separator = new KSeparator(Qt::Horizontal, parent); KSeparator* separator = new KSeparator(Qt::Horizontal, parent);
@ -272,7 +272,7 @@ XineConfig::XineConfig(const xine_t* const xine) :
else else
icon = "edit"; icon = "edit";
xineFrame = addPage(*it, i18n("%1 Options").tqarg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, xineFrame = addPage(*it, i18n("%1 Options").arg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel,
KIcon::SizeMedium)); KIcon::SizeMedium));
xineLayout = new TQVBoxLayout(xineFrame, marginHint(), spacingHint()); xineLayout = new TQVBoxLayout(xineFrame, marginHint(), spacingHint());
tabWidget = new TQTabWidget(xineFrame); tabWidget = new TQTabWidget(xineFrame);

6
kaffeine/src/pref.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
@ -41,7 +41,7 @@
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqtextcodec.h> #include <textcodec.h>
#include <kcharsets.h> #include <kcharsets.h>
@ -141,7 +141,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
gb = new TQGroupBox( "", misc ); gb = new TQGroupBox( "", misc );
grid = new TQGridLayout( gb, 1, 1, 20, 6 ); grid = new TQGridLayout( gb, 1, 1, 20, 6 );
KPushButton* clearRecent = new KPushButton( i18n("Clear"), gb); KPushButton* clearRecent = new KPushButton( i18n("Clear"), gb);
clearRecent->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); clearRecent->setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
connect(clearRecent, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalClearRecent())); connect(clearRecent, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalClearRecent()));
grid->addWidget(clearRecent, 0, 0); grid->addWidget(clearRecent, 0, 0);
TQLabel* clearLabel = new TQLabel(i18n("Clear recent files list"), gb); TQLabel* clearLabel = new TQLabel(i18n("Clear recent files list"), gb);

10
kaffeine/src/startwindow.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqhbox.h> #include <tqhbox.h>
#include <tqcolor.h> #include <tqcolor.h>
@ -66,7 +66,7 @@ SLabel::SLabel( TQWidget *parent ) : TQLabel( parent )
void SLabel::paintEvent( TQPaintEvent *pe ) void SLabel::paintEvent( TQPaintEvent *pe )
{ {
TQLabel::paintEvent( pe ); TQLabel::paintEvent( pe );
TQColorGroup cg = parentWidget()->tqcolorGroup(); TQColorGroup cg = parentWidget()->colorGroup();
TQColor base = cg.base(); TQColor base = cg.base();
TQColor selection = cg.highlight(); TQColor selection = cg.highlight();
int r = (base.red() + selection.red()) / 2; int r = (base.red() + selection.red()) / 2;
@ -92,7 +92,7 @@ StartWindow::StartWindow(TQWidget* parent, const char* name) : TQWidget(parent,
panel = new TQWidget( this ); panel = new TQWidget( this );
panel->setPaletteBackgroundColor(TQColor("White")); panel->setPaletteBackgroundColor(TQColor("White"));
panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
buttons.setAutoDelete( true ); buttons.setAutoDelete( true );
} }
@ -113,12 +113,12 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam
//f.setPointSize( f.pointSize()+2 ); //f.setPointSize( f.pointSize()+2 );
//f.setBold(true); //f.setBold(true);
//btn->setFont( f ); //btn->setFont( f );
btn->setTextLabel( TQString("&%1 %2").tqarg(buttons.count() + 1).tqarg(uiName)); btn->setTextLabel( TQString("&%1 %2").arg(buttons.count() + 1).arg(uiName));
TQToolTip::add(btn, uiName); TQToolTip::add(btn, uiName);
btn->setTextPosition( TQToolButton::Under ); btn->setTextPosition( TQToolButton::Under );
btn->setUsesTextLabel( true ); btn->setUsesTextLabel( true );
btn->setIconSet( KGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) ); btn->setIconSet( KGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) );
TQSize size = btn->tqsizeHint(); TQSize size = btn->sizeHint();
size.setHeight( size.height()+5 ); size.setHeight( size.height()+5 );
btn->resize( size ); btn->resize( size );
connect( btn, TQT_SIGNAL(executed(const TQString&)), this, TQT_SIGNAL(execTarget(const TQString&)) ); connect( btn, TQT_SIGNAL(executed(const TQString&)), this, TQT_SIGNAL(execTarget(const TQString&)) );

2
kaffeine/src/systemtray.cpp
Unescape View File

@ -72,7 +72,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent
m_osd = new TitleLabel; m_osd = new TitleLabel;
m_osd->setFrameStyle(TQFrame::Panel | TQFrame::Plain); m_osd->setFrameStyle(TQFrame::Panel | TQFrame::Plain);
m_osd->setLineWidth(1); m_osd->setLineWidth(1);
m_osd->tqsetAlignment(SingleLine); m_osd->setAlignment(SingleLine);
connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD())); connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD()));
setPixmap(KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22)); setPixmap(KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22));

Write Preview
Loading…
Cancel
Save