From a488f17322d7ab91533147362613723797cbe2a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] 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 --- .../audiobrowser/googlefetcherdialog.cpp | 2 +- kaffeine/src/input/audiobrowser/playlist.cpp | 22 +++++++++---------- kaffeine/src/input/disc/disc.cpp | 2 +- kaffeine/src/input/disc/paranoiasettings.ui | 2 +- .../input/disc/plugins/mp3lame/lameconfig.ui | 2 +- .../input/disc/plugins/oggvorbis/oggconfig.ui | 2 +- kaffeine/src/input/dvb/audioeditorui.ui | 2 +- kaffeine/src/input/dvb/broadcasteditorui.ui | 2 +- kaffeine/src/input/dvb/camdialog.ui | 2 +- kaffeine/src/input/dvb/cammenudialog.ui | 2 +- kaffeine/src/input/dvb/channeleditorui.ui | 2 +- kaffeine/src/input/dvb/crontimerui.ui | 2 +- kaffeine/src/input/dvb/scandialogui.ui | 2 +- kaffeine/src/input/dvb/subeditorui.ui | 2 +- kaffeine/src/kaffeine.cpp | 4 ++-- kaffeine/src/kmultitabbar.cpp | 4 ++-- .../player-parts/dummy-part/dummy_part.cpp | 2 +- .../gstreamer-part/gstreamer_part.cpp | 6 ++--- .../src/player-parts/gstreamer-part/video.cpp | 2 +- .../player-parts/xine-part/kxinewidget.cpp | 6 ++--- .../src/player-parts/xine-part/xine_part.cpp | 4 ++-- kaffeine/src/startwindow.cpp | 2 +- 22 files changed, 39 insertions(+), 39 deletions(-) diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp index cf49424..fa6a2f4 100644 --- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp +++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp @@ -59,7 +59,7 @@ GoogleFetcherDialog::GoogleFetcherDialog(const TQString &name, m_iconWidget->arrangeItemsInGrid(); m_iconWidget->setItemsMovable(FALSE); - TQHBox *imgSize = new TQHBox(actionButton(User1)->tqparentWidget()); + TQHBox *imgSize = new TQHBox(actionButton(User1)->parentWidget()); //TQLabel *label = new TQLabel(imgSize); //label->setText(i18n("Image size:")); diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp index 752eb66..56864a6 100644 --- a/kaffeine/src/input/audiobrowser/playlist.cpp +++ b/kaffeine/src/input/audiobrowser/playlist.cpp @@ -75,14 +75,14 @@ RollTitle::RollTitle( TQWidget *tqparent ) : TQLabel( "I", tqparent ) { - TQColorGroup cg = tqparentWidget()->tqcolorGroup(); + TQColorGroup cg = parentWidget()->tqcolorGroup(); TQColor base = cg.base(); TQColor selection = cg.highlight(); int r = (base.red() + selection.red()) / 2; int b = (base.blue() + selection.blue()) / 2; int g = (base.green() + selection.green()) / 2; back = TQColor(r, g, b); - fore = tqparentWidget()->tqcolorGroup().text(); + fore = parentWidget()->tqcolorGroup().text(); setPaletteBackgroundColor( back ); setPaletteForegroundColor( fore ); setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); @@ -149,7 +149,7 @@ void RollTitle::rollTitle() void RollTitle::paintEvent( TQPaintEvent *pe ) { TQLabel::paintEvent( pe ); - TQColorGroup cg = tqparentWidget()->tqcolorGroup(); + TQColorGroup cg = parentWidget()->tqcolorGroup(); TQColor base = cg.base(); TQColor selection = cg.highlight(); int r = (base.red() + selection.red()) / 2; @@ -157,7 +157,7 @@ void RollTitle::paintEvent( TQPaintEvent *pe ) int g = (base.green() + selection.green()) / 2; back=TQColor(r,g,b); setPaletteBackgroundColor( back ); - fore = tqparentWidget()->tqcolorGroup().text(); + fore = parentWidget()->tqcolorGroup().text(); setPaletteForegroundColor( fore ); setTitle( title ); } @@ -1172,7 +1172,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after) { mrlList.clear(); kdDebug() << "PlayList: Try loading ram playlist\n"; - if (PlaylistImport::ram(mrl, mrlList, mainWidget->tqparentWidget())) + if (PlaylistImport::ram(mrl, mrlList, mainWidget->parentWidget())) { TQValueList::ConstIterator end(mrlList.end()); for (TQValueList::ConstIterator it = mrlList.begin(); it != end; ++it) @@ -1829,8 +1829,8 @@ void PlayList::nextPlaylist() m_playlistSelector->setCurrentItem(nextPlaylist); m_currentPlaylist = nextPlaylist; add(m_playlistDirectory + pl + ".kaffeine", NULL); - if (mainWidget->tqparentWidget()) - mainWidget->tqparentWidget()->setFocus(); + if (mainWidget->parentWidget()) + mainWidget->parentWidget()->setFocus(); } void PlayList::slotPlaylistActivated(int index) @@ -1842,8 +1842,8 @@ void PlayList::slotPlaylistActivated(int index) clearList(); m_currentPlaylist = index; add(m_playlistDirectory + pl + ".kaffeine", NULL); - if (mainWidget->tqparentWidget()) - mainWidget->tqparentWidget()->setFocus(); + if (mainWidget->parentWidget()) + mainWidget->parentWidget()->setFocus(); /* if (!isQueueMode()) { getCurrent(); @@ -1868,8 +1868,8 @@ void PlayList::slotNewPlaylistName(const TQString& text) kdDebug() << "PlayList: Set playlist name to: " << text << endl; m_playlistSelector->changeItem(text, m_currentPlaylist); saveCurrentPlaylist(); - if (mainWidget->tqparentWidget()) - mainWidget->tqparentWidget()->setFocus(); + if (mainWidget->parentWidget()) + mainWidget->parentWidget()->setFocus(); } TQString PlayList::queryCurrentPlaylist() diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp index ea56305..97b3ff4 100644 --- a/kaffeine/src/input/disc/disc.cpp +++ b/kaffeine/src/input/disc/disc.cpp @@ -50,7 +50,7 @@ MLabel::MLabel( TQWidget *tqparent ) : TQLabel( tqparent ) void MLabel::paintEvent( TQPaintEvent *pe ) { TQLabel::paintEvent( pe ); - TQColorGroup cg = tqparentWidget()->tqcolorGroup(); + TQColorGroup cg = parentWidget()->tqcolorGroup(); TQColor base = cg.base(); TQColor selection = cg.highlight(); int r = (base.red() + selection.red()) / 2; diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui index fb73518..e20c98f 100644 --- a/kaffeine/src/input/disc/paranoiasettings.ui +++ b/kaffeine/src/input/disc/paranoiasettings.ui @@ -248,5 +248,5 @@ reject() - + diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui index 9a157ac..09a2a87 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui +++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui @@ -191,5 +191,5 @@ reject() - + diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui index 969e776..b07342a 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui +++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui @@ -187,5 +187,5 @@ display(int) - + diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui index a6a93fd..2324983 100644 --- a/kaffeine/src/input/dvb/audioeditorui.ui +++ b/kaffeine/src/input/dvb/audioeditorui.ui @@ -315,5 +315,5 @@ langLe ac3Cb - + diff --git a/kaffeine/src/input/dvb/broadcasteditorui.ui b/kaffeine/src/input/dvb/broadcasteditorui.ui index 68abfe0..86da4cf 100644 --- a/kaffeine/src/input/dvb/broadcasteditorui.ui +++ b/kaffeine/src/input/dvb/broadcasteditorui.ui @@ -305,7 +305,7 @@ addToList() resetList() - + kpushbutton.h kpushbutton.h diff --git a/kaffeine/src/input/dvb/camdialog.ui b/kaffeine/src/input/dvb/camdialog.ui index 71597d6..9463cee 100644 --- a/kaffeine/src/input/dvb/camdialog.ui +++ b/kaffeine/src/input/dvb/camdialog.ui @@ -145,5 +145,5 @@ maxServiceSpin - + diff --git a/kaffeine/src/input/dvb/cammenudialog.ui b/kaffeine/src/input/dvb/cammenudialog.ui index 34d84f2..f6b5a00 100644 --- a/kaffeine/src/input/dvb/cammenudialog.ui +++ b/kaffeine/src/input/dvb/cammenudialog.ui @@ -63,5 +63,5 @@ inputLine menuText - + diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui index 1a73816..24abfbb 100644 --- a/kaffeine/src/input/dvb/channeleditorui.ui +++ b/kaffeine/src/input/dvb/channeleditorui.ui @@ -726,5 +726,5 @@ okBtn sourceComb - + diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui index 2223a75..5b7a3bd 100644 --- a/kaffeine/src/input/dvb/crontimerui.ui +++ b/kaffeine/src/input/dvb/crontimerui.ui @@ -346,7 +346,7 @@ accept() - + kpushbutton.h kpushbutton.h diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui index ee45f44..d85d58f 100644 --- a/kaffeine/src/input/dvb/scandialogui.ui +++ b/kaffeine/src/input/dvb/scandialogui.ui @@ -544,5 +544,5 @@ addselectedBtn addfilteredBtn - + diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui index 3f3c9d9..3935e78 100644 --- a/kaffeine/src/input/dvb/subeditorui.ui +++ b/kaffeine/src/input/dvb/subeditorui.ui @@ -350,5 +350,5 @@ ancSpin langLe - + diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp index 8d47b3f..d01007f 100644 --- a/kaffeine/src/kaffeine.cpp +++ b/kaffeine/src/kaffeine.cpp @@ -1174,7 +1174,7 @@ void Kaffeine::slotToggleFullscreen() * uuuh, ugly :-) * make sure there is no frame border around the player window */ - TQFrame* tabFrame = dynamic_cast(m_playerContainer->tqparentWidget()); + TQFrame* tabFrame = dynamic_cast(m_playerContainer->parentWidget()); if (tabFrame) { tabFrame->setFrameShape(TQFrame::NoFrame); @@ -1193,7 +1193,7 @@ void Kaffeine::slotToggleFullscreen() else { // restore frame style - TQFrame* tabFrame = dynamic_cast(m_playerContainer->tqparentWidget()); + TQFrame* tabFrame = dynamic_cast(m_playerContainer->parentWidget()); if (tabFrame) { tabFrame->setFrameStyle(TQFrame::TabWidgetPanel | TQFrame::Raised); diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp index a0a1c15..506db25 100644 --- a/kaffeine/src/kmultitabbar.cpp +++ b/kaffeine/src/kmultitabbar.cpp @@ -447,13 +447,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) void KMultiTabBarButton::hideEvent( TQHideEvent* he) { TQPushButton::hideEvent(he); - KMultiTabBar *tb=dynamic_cast(tqparentWidget()); + KMultiTabBar *tb=dynamic_cast(parentWidget()); if (tb) tb->updateSeparator(); } void KMultiTabBarButton::showEvent( TQShowEvent* he) { TQPushButton::showEvent(he); - KMultiTabBar *tb=dynamic_cast(tqparentWidget()); + KMultiTabBar *tb=dynamic_cast(parentWidget()); if (tb) tb->updateSeparator(); } diff --git a/kaffeine/src/player-parts/dummy-part/dummy_part.cpp b/kaffeine/src/player-parts/dummy-part/dummy_part.cpp index caf4e7b..a481054 100644 --- a/kaffeine/src/player-parts/dummy-part/dummy_part.cpp +++ b/kaffeine/src/player-parts/dummy-part/dummy_part.cpp @@ -27,7 +27,7 @@ typedef KParts::GenericFactory 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") { // we need an instance diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp index f5dc6ec..8d300f1 100644 --- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp @@ -53,7 +53,7 @@ typedef KParts::GenericFactory 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*/ ) : KaffeinePart( tqparent, name ? name : "GStreamerPart" ), 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 setInstance( GStreamerPartFactory::instance() ); - tqparentWidget->setPaletteBackgroundColor( TQColor(0,0,0) ); //black + parentWidget->setPaletteBackgroundColor( TQColor(0,0,0) ); //black bus = NULL; @@ -77,7 +77,7 @@ GStreamerPart::GStreamerPart( TQWidget* tqparentWidget, const char* /*widgetName m_status = GST_STATE_NULL; 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&)) ); m_video->setFocusPolicy( TQ_ClickFocus ); setWidget( m_video ); diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp index eda1d1b..84fec34 100644 --- a/kaffeine/src/player-parts/gstreamer-part/video.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp @@ -186,7 +186,7 @@ void VideoWindow::newState() void VideoWindow::setGeometry( int, int, int, int ) { TQSize frame = getFrameSize(); - TQSize window = tqparentWidget()->size(); + TQSize window = parentWidget()->size(); int x = 0, y = 0, width = 0, height = 0; if ( frame.width() == 0 || frame.height() == 0 ) { diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp index 4a0207e..5fa49f0 100644 --- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp @@ -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)); /* 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)) { - 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())); @@ -770,7 +770,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent ) } case TIMER_EVENT_RESIZE_PARENT: { - tqparentWidget()->resize(m_newParentSize); + parentWidget()->resize(m_newParentSize); break; } default: break; diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp index ff0e4d1..ee1514e 100644 --- a/kaffeine/src/player-parts/xine-part/xine_part.cpp +++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp @@ -66,7 +66,7 @@ typedef KParts::GenericFactory 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"), KaffeinePart(tqparent, name ? name : "XinePart"), 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; - m_xine = new KXineWidget(tqparentWidget, widgetName, configPath, logoPath, + m_xine = new KXineWidget(parentWidget, widgetName, configPath, logoPath, 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(stopDvb()), this, TQT_SIGNAL(stopDvb())); diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp index 622d7b1..038522c 100644 --- a/kaffeine/src/startwindow.cpp +++ b/kaffeine/src/startwindow.cpp @@ -66,7 +66,7 @@ SLabel::SLabel( TQWidget *tqparent ) : TQLabel( tqparent ) void SLabel::paintEvent( TQPaintEvent *pe ) { TQLabel::paintEvent( pe ); - TQColorGroup cg = tqparentWidget()->tqcolorGroup(); + TQColorGroup cg = parentWidget()->tqcolorGroup(); TQColor base = cg.base(); TQColor selection = cg.highlight(); int r = (base.red() + selection.red()) / 2;