summaryrefslogtreecommitdiffstats
path: root/kaffeine/src/player-parts
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commita488f17322d7ab91533147362613723797cbe2a5 (patch)
tree86da1beee8d526e5df26f5a0e53ae12ea3b92345 /kaffeine/src/player-parts
parent87d747592c0b39842626f7c8df6f552256ded6de (diff)
downloadkaffeine-a488f17322d7ab91533147362613723797cbe2a5.tar.gz
kaffeine-a488f17322d7ab91533147362613723797cbe2a5.zip
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
Diffstat (limited to 'kaffeine/src/player-parts')
-rw-r--r--kaffeine/src/player-parts/dummy-part/dummy_part.cpp2
-rw-r--r--kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp6
-rw-r--r--kaffeine/src/player-parts/gstreamer-part/video.cpp2
-rw-r--r--kaffeine/src/player-parts/xine-part/kxinewidget.cpp6
-rw-r--r--kaffeine/src/player-parts/xine-part/xine_part.cpp4
5 files changed, 10 insertions, 10 deletions
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<DummyPart> 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<GStreamerPart> 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<XinePart> 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()));