diff options
Diffstat (limited to 'kaffeine/src/player-parts/xine-part/kxinewidget.cpp')
| -rw-r--r-- | kaffeine/src/player-parts/xine-part/kxinewidget.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp index a30637b..9385759 100644 --- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp @@ -61,11 +61,11 @@ #define TIMER_EVENT_RESIZE_PARENT 300 -KXineWidget::KXineWidget(TQWidget* tqparent, const char* name, +KXineWidget::KXineWidget(TQWidget* parent, const char* name, const TQString& pathToConfigFile, const TQString& pathToLogoFile, const TQString& audioDriver, const TQString& videoDriver, bool startManual, bool verbose) - : TQWidget(tqparent,name), m_startXineManual(startManual), m_xineReady(false), + : TQWidget(parent,name), m_startXineManual(startManual), m_xineReady(false), m_logoFile(pathToLogoFile), m_preferedAudio(audioDriver), m_preferedVideo(videoDriver), m_xineVerbose(verbose), m_xineEngine(NULL), m_audioDriver(NULL), m_videoDriver(NULL), m_xineStream(NULL), connection(NULL), m_eventQueue(NULL), m_osd(NULL), m_osdUnscaled(false), m_osdShow(false), m_osdSize(0), m_osdFont(NULL), @@ -337,7 +337,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height vw->m_videoAspect = video_aspect; TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_FRAME_FORMAT_CHANGE)); - /* auto-resize tqparent widget */ + /* auto-resize parent widget */ if ((vw->m_autoresizeEnabled) && (vw->parentWidget()) && (vw->m_posTimer.isActive()) && (!vw->parentWidget()->isFullScreen()) && (video_width > 0) && (video_height > 0)) { @@ -2336,34 +2336,34 @@ TQStringList KXineWidget::getAudioFilterNames() const } #endif -void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* tqparent) +void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* parent) { #ifndef USE_TQT_ONLY unwireVideoFilters(); - PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, tqparent); + PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, parent); connect(filter, TQT_SIGNAL(signalDeleteMe(PostFilter*)), this, TQT_SLOT(slotDeleteVideoFilter(PostFilter*))); m_videoFilterList.append(filter); wireVideoFilters(); #else - tqparent = tqparent; + parent = parent; warningOut(TQString("Not implemented [CreateVideoFilter %1]").tqarg(name)); #endif } -void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* tqparent) +void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* parent) { #ifndef USE_TQT_ONLY unwireAudioFilters(); - PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, tqparent); + PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, parent); connect(filter, TQT_SIGNAL(signalDeleteMe(PostFilter*)), this, TQT_SLOT(slotDeleteAudioFilter(PostFilter*))); m_audioFilterList.append(filter); wireAudioFilters(); #else - tqparent = tqparent; + parent = parent; warningOut(TQString("Not implemented [CreateAudioFilter %1]").tqarg(name)); #endif } @@ -2804,7 +2804,7 @@ void KXineWidget::mousePressEvent(TQMouseEvent* mev) input.x = rect.x; input.y = rect.y; xine_event_send (m_xineStream, &event); - mev->accept(); /* don't send event to tqparent */ + mev->accept(); /* don't send event to parent */ } } @@ -3279,9 +3279,9 @@ void KXineWidget::slotEnableAutoresize(bool enable) ***************************************/ #ifndef USE_TQT_ONLY -void KXineWidget::createDeinterlacePlugin(const TQString& config, TQWidget* tqparent) +void KXineWidget::createDeinterlacePlugin(const TQString& config, TQWidget* parent) { - m_deinterlaceFilter = new PostFilter(config.section(':',0,0), m_xineEngine, m_audioDriver, m_videoDriver, tqparent); + m_deinterlaceFilter = new PostFilter(config.section(':',0,0), m_xineEngine, m_audioDriver, m_videoDriver, parent); if( !m_deinterlaceFilter->getInput() || !m_deinterlaceFilter->getOutput() ) { delete m_deinterlaceFilter; |