Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kaffeine@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 87d747592c
commit a488f17322

@ -59,7 +59,7 @@ GoogleFetcherDialog::GoogleFetcherDialog(const TQString &name,
m_iconWidget->arrangeItemsInGrid(); m_iconWidget->arrangeItemsInGrid();
m_iconWidget->setItemsMovable(FALSE); m_iconWidget->setItemsMovable(FALSE);
TQHBox *imgSize = new TQHBox(actionButton(User1)->tqparentWidget()); TQHBox *imgSize = new TQHBox(actionButton(User1)->parentWidget());
//TQLabel *label = new TQLabel(imgSize); //TQLabel *label = new TQLabel(imgSize);
//label->setText(i18n("Image size:")); //label->setText(i18n("Image size:"));

@ -75,14 +75,14 @@
RollTitle::RollTitle( TQWidget *tqparent ) : TQLabel( "I", tqparent ) RollTitle::RollTitle( TQWidget *tqparent ) : TQLabel( "I", tqparent )
{ {
TQColorGroup cg = tqparentWidget()->tqcolorGroup(); TQColorGroup cg = parentWidget()->tqcolorGroup();
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 = tqparentWidget()->tqcolorGroup().text(); fore = parentWidget()->tqcolorGroup().text();
setPaletteBackgroundColor( back ); setPaletteBackgroundColor( back );
setPaletteForegroundColor( fore ); setPaletteForegroundColor( fore );
setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
@ -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 = tqparentWidget()->tqcolorGroup(); TQColorGroup cg = parentWidget()->tqcolorGroup();
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 = tqparentWidget()->tqcolorGroup().text(); fore = parentWidget()->tqcolorGroup().text();
setPaletteForegroundColor( fore ); setPaletteForegroundColor( fore );
setTitle( title ); setTitle( title );
} }
@ -1172,7 +1172,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
{ {
mrlList.clear(); mrlList.clear();
kdDebug() << "PlayList: Try loading ram playlist\n"; kdDebug() << "PlayList: Try loading ram playlist\n";
if (PlaylistImport::ram(mrl, mrlList, mainWidget->tqparentWidget())) if (PlaylistImport::ram(mrl, mrlList, mainWidget->parentWidget()))
{ {
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)
@ -1829,8 +1829,8 @@ void PlayList::nextPlaylist()
m_playlistSelector->setCurrentItem(nextPlaylist); m_playlistSelector->setCurrentItem(nextPlaylist);
m_currentPlaylist = nextPlaylist; m_currentPlaylist = nextPlaylist;
add(m_playlistDirectory + pl + ".kaffeine", NULL); add(m_playlistDirectory + pl + ".kaffeine", NULL);
if (mainWidget->tqparentWidget()) if (mainWidget->parentWidget())
mainWidget->tqparentWidget()->setFocus(); mainWidget->parentWidget()->setFocus();
} }
void PlayList::slotPlaylistActivated(int index) void PlayList::slotPlaylistActivated(int index)
@ -1842,8 +1842,8 @@ void PlayList::slotPlaylistActivated(int index)
clearList(); clearList();
m_currentPlaylist = index; m_currentPlaylist = index;
add(m_playlistDirectory + pl + ".kaffeine", NULL); add(m_playlistDirectory + pl + ".kaffeine", NULL);
if (mainWidget->tqparentWidget()) if (mainWidget->parentWidget())
mainWidget->tqparentWidget()->setFocus(); mainWidget->parentWidget()->setFocus();
/* if (!isQueueMode()) /* if (!isQueueMode())
{ {
getCurrent(); getCurrent();
@ -1868,8 +1868,8 @@ void PlayList::slotNewPlaylistName(const TQString& text)
kdDebug() << "PlayList: Set playlist name to: " << text << endl; kdDebug() << "PlayList: Set playlist name to: " << text << endl;
m_playlistSelector->changeItem(text, m_currentPlaylist); m_playlistSelector->changeItem(text, m_currentPlaylist);
saveCurrentPlaylist(); saveCurrentPlaylist();
if (mainWidget->tqparentWidget()) if (mainWidget->parentWidget())
mainWidget->tqparentWidget()->setFocus(); mainWidget->parentWidget()->setFocus();
} }
TQString PlayList::queryCurrentPlaylist() TQString PlayList::queryCurrentPlaylist()

@ -50,7 +50,7 @@ MLabel::MLabel( TQWidget *tqparent ) : TQLabel( tqparent )
void MLabel::paintEvent( TQPaintEvent *pe ) void MLabel::paintEvent( TQPaintEvent *pe )
{ {
TQLabel::paintEvent( pe ); TQLabel::paintEvent( pe );
TQColorGroup cg = tqparentWidget()->tqcolorGroup(); TQColorGroup cg = parentWidget()->tqcolorGroup();
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;

@ -248,5 +248,5 @@
<slot>reject()</slot> <slot>reject()</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -191,5 +191,5 @@
<slot>reject()</slot> <slot>reject()</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -187,5 +187,5 @@
<slot>display(int)</slot> <slot>display(int)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -315,5 +315,5 @@
<tabstop>langLe</tabstop> <tabstop>langLe</tabstop>
<tabstop>ac3Cb</tabstop> <tabstop>ac3Cb</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -305,7 +305,7 @@
<slot>addToList()</slot> <slot>addToList()</slot>
<slot>resetList()</slot> <slot>resetList()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -145,5 +145,5 @@
<tabstops> <tabstops>
<tabstop>maxServiceSpin</tabstop> <tabstop>maxServiceSpin</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -63,5 +63,5 @@
<tabstop>inputLine</tabstop> <tabstop>inputLine</tabstop>
<tabstop>menuText</tabstop> <tabstop>menuText</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -726,5 +726,5 @@
<tabstop>okBtn</tabstop> <tabstop>okBtn</tabstop>
<tabstop>sourceComb</tabstop> <tabstop>sourceComb</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -346,7 +346,7 @@
<slot>accept()</slot> <slot>accept()</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -544,5 +544,5 @@
<tabstop>addselectedBtn</tabstop> <tabstop>addselectedBtn</tabstop>
<tabstop>addfilteredBtn</tabstop> <tabstop>addfilteredBtn</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -350,5 +350,5 @@
<tabstop>ancSpin</tabstop> <tabstop>ancSpin</tabstop>
<tabstop>langLe</tabstop> <tabstop>langLe</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -1174,7 +1174,7 @@ void Kaffeine::slotToggleFullscreen()
* uuuh, ugly :-) * uuuh, ugly :-)
* make sure there is no frame border around the player window * make sure there is no frame border around the player window
*/ */
TQFrame* tabFrame = dynamic_cast<TQFrame*>(m_playerContainer->tqparentWidget()); TQFrame* tabFrame = dynamic_cast<TQFrame*>(m_playerContainer->parentWidget());
if (tabFrame) if (tabFrame)
{ {
tabFrame->setFrameShape(TQFrame::NoFrame); tabFrame->setFrameShape(TQFrame::NoFrame);
@ -1193,7 +1193,7 @@ void Kaffeine::slotToggleFullscreen()
else else
{ {
// restore frame style // restore frame style
TQFrame* tabFrame = dynamic_cast<TQFrame*>(m_playerContainer->tqparentWidget()); TQFrame* tabFrame = dynamic_cast<TQFrame*>(m_playerContainer->parentWidget());
if (tabFrame) if (tabFrame)
{ {
tabFrame->setFrameStyle(TQFrame::TabWidgetPanel | TQFrame::Raised); tabFrame->setFrameStyle(TQFrame::TabWidgetPanel | TQFrame::Raised);

@ -447,13 +447,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
void KMultiTabBarButton::hideEvent( TQHideEvent* he) { void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
TQPushButton::hideEvent(he); TQPushButton::hideEvent(he);
KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget()); KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
if (tb) tb->updateSeparator(); if (tb) tb->updateSeparator();
} }
void KMultiTabBarButton::showEvent( TQShowEvent* he) { void KMultiTabBarButton::showEvent( TQShowEvent* he) {
TQPushButton::showEvent(he); TQPushButton::showEvent(he);
KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget()); KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
if (tb) tb->updateSeparator(); if (tb) tb->updateSeparator();
} }

@ -27,7 +27,7 @@ typedef KParts::GenericFactory<DummyPart> DummyPartFactory;
K_EXPORT_COMPONENT_FACTORY (libdummypart, DummyPartFactory); K_EXPORT_COMPONENT_FACTORY (libdummypart, DummyPartFactory);
DummyPart::DummyPart(TQWidget* tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name, const TQStringList& /*args*/) DummyPart::DummyPart(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name, const TQStringList& /*args*/)
: KaffeinePart(tqparent, name ? name : "DummyPart") : KaffeinePart(tqparent, name ? name : "DummyPart")
{ {
// we need an instance // we need an instance

@ -53,7 +53,7 @@ typedef KParts::GenericFactory<GStreamerPart> GStreamerPartFactory;
K_EXPORT_COMPONENT_FACTORY (libgstreamerpart, GStreamerPartFactory); K_EXPORT_COMPONENT_FACTORY (libgstreamerpart, GStreamerPartFactory);
GStreamerPart::GStreamerPart( TQWidget* tqparentWidget, const char* /*widgetName*/, TQObject* tqparent, const char* name, GStreamerPart::GStreamerPart( TQWidget* parentWidget, const char* /*widgetName*/, TQObject* tqparent, const char* name,
const TQStringList& /*args*/ ) const TQStringList& /*args*/ )
: KaffeinePart( tqparent, name ? name : "GStreamerPart" ), : KaffeinePart( tqparent, name ? name : "GStreamerPart" ),
m_play(NULL), m_videosink(NULL), m_audiosink(NULL), m_visual(NULL), m_videoSettings(NULL), m_play(NULL), m_videosink(NULL), m_audiosink(NULL), m_visual(NULL), m_videoSettings(NULL),
@ -61,7 +61,7 @@ GStreamerPart::GStreamerPart( TQWidget* tqparentWidget, const char* /*widgetName
{ {
// we need an instance // we need an instance
setInstance( GStreamerPartFactory::instance() ); setInstance( GStreamerPartFactory::instance() );
tqparentWidget->setPaletteBackgroundColor( TQColor(0,0,0) ); //black parentWidget->setPaletteBackgroundColor( TQColor(0,0,0) ); //black
bus = NULL; bus = NULL;
@ -77,7 +77,7 @@ GStreamerPart::GStreamerPart( TQWidget* tqparentWidget, const char* /*widgetName
m_status = GST_STATE_NULL; m_status = GST_STATE_NULL;
kdDebug() << "GStreamerPart: Creating video window" << endl; kdDebug() << "GStreamerPart: Creating video window" << endl;
m_video = new VideoWindow( tqparentWidget, m_videosink ); m_video = new VideoWindow( parentWidget, m_videosink );
connect( m_video, TQT_SIGNAL(signalNewFrameSize(const TQSize&)), this, TQT_SIGNAL(signalNewFrameSize(const TQSize&)) ); connect( m_video, TQT_SIGNAL(signalNewFrameSize(const TQSize&)), this, TQT_SIGNAL(signalNewFrameSize(const TQSize&)) );
m_video->setFocusPolicy( TQ_ClickFocus ); m_video->setFocusPolicy( TQ_ClickFocus );
setWidget( m_video ); setWidget( m_video );

@ -186,7 +186,7 @@ void VideoWindow::newState()
void VideoWindow::setGeometry( int, int, int, int ) void VideoWindow::setGeometry( int, int, int, int )
{ {
TQSize frame = getFrameSize(); TQSize frame = getFrameSize();
TQSize window = tqparentWidget()->size(); TQSize window = parentWidget()->size();
int x = 0, y = 0, width = 0, height = 0; int x = 0, y = 0, width = 0, height = 0;
if ( frame.width() == 0 || frame.height() == 0 ) { if ( frame.width() == 0 || frame.height() == 0 ) {

@ -338,10 +338,10 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height
TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_FRAME_FORMAT_CHANGE)); TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_FRAME_FORMAT_CHANGE));
/* auto-resize tqparent widget */ /* auto-resize tqparent widget */
if ((vw->m_autoresizeEnabled) && (vw->tqparentWidget()) && (vw->m_posTimer.isActive()) && (!vw->tqparentWidget()->isFullScreen()) if ((vw->m_autoresizeEnabled) && (vw->parentWidget()) && (vw->m_posTimer.isActive()) && (!vw->parentWidget()->isFullScreen())
&& (video_width > 0) && (video_height > 0)) && (video_width > 0) && (video_height > 0))
{ {
vw->m_newParentSize = vw->tqparentWidget()->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").tqarg(vw->m_newParentSize.width()).tqarg(vw->m_newParentSize.height()));
@ -770,7 +770,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
} }
case TIMER_EVENT_RESIZE_PARENT: case TIMER_EVENT_RESIZE_PARENT:
{ {
tqparentWidget()->resize(m_newParentSize); parentWidget()->resize(m_newParentSize);
break; break;
} }
default: break; default: break;

@ -66,7 +66,7 @@ typedef KParts::GenericFactory<XinePart> XinePartFactory;
K_EXPORT_COMPONENT_FACTORY (libxinepart, XinePartFactory) K_EXPORT_COMPONENT_FACTORY (libxinepart, XinePartFactory)
XinePart::XinePart(TQWidget* tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name, const TQStringList& args) XinePart::XinePart(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name, const TQStringList& args)
: DCOPObject("XinePartIface"), : DCOPObject("XinePartIface"),
KaffeinePart(tqparent, name ? name : "XinePart"), KaffeinePart(tqparent, name ? name : "XinePart"),
m_current(0), m_xine(NULL), m_pictureSettings(NULL), m_deinterlacerConfigWidget(NULL), m_current(0), m_xine(NULL), m_pictureSettings(NULL), m_deinterlacerConfigWidget(NULL),
@ -118,7 +118,7 @@ XinePart::XinePart(TQWidget* tqparentWidget, const char* widgetName, TQObject* t
kdDebug() << "XinePart: Using xine-config file: " << configPath << endl; kdDebug() << "XinePart: Using xine-config file: " << configPath << endl;
m_xine = new KXineWidget(tqparentWidget, widgetName, configPath, logoPath, m_xine = new KXineWidget(parentWidget, widgetName, configPath, logoPath,
audioDriver, videoDriver, /* start xine manual*/true, verbose); audioDriver, videoDriver, /* start xine manual*/true, verbose);
connect(m_xine, TQT_SIGNAL(signalXineFatal(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); connect(m_xine, TQT_SIGNAL(signalXineFatal(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
connect(m_xine, TQT_SIGNAL(stopDvb()), this, TQT_SIGNAL(stopDvb())); connect(m_xine, TQT_SIGNAL(stopDvb()), this, TQT_SIGNAL(stopDvb()));

@ -66,7 +66,7 @@ SLabel::SLabel( TQWidget *tqparent ) : TQLabel( tqparent )
void SLabel::paintEvent( TQPaintEvent *pe ) void SLabel::paintEvent( TQPaintEvent *pe )
{ {
TQLabel::paintEvent( pe ); TQLabel::paintEvent( pe );
TQColorGroup cg = tqparentWidget()->tqcolorGroup(); TQColorGroup cg = parentWidget()->tqcolorGroup();
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;

Loading…
Cancel
Save