summaryrefslogtreecommitdiffstats
path: root/src/viewarea.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/viewarea.cpp')
-rw-r--r--src/viewarea.cpp54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index daf5e5a..f814718 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -144,8 +144,8 @@ public:
SurfacePtr createSurface (NodePtr owner, const SRect & rect);
IRect toScreen (Single x, Single y, Single w, Single h);
void resize (const SRect & rect);
- void tqrepaint ();
- void tqrepaint (const SRect &rect);
+ void repaint ();
+ void repaint (const SRect &rect);
void video ();
NodePtrW current_video;
@@ -181,7 +181,7 @@ KDE_NO_EXPORT void ViewSurface::resize (const SRect &r) {
#endif
/*if (rect == nrect)
;//return;
- SRect pr = rect.unite (nrect); // for tqrepaint
+ SRect pr = rect.unite (nrect); // for repaint
rect = nrect;*/
}
@@ -197,14 +197,14 @@ KDE_NO_EXPORT IRect ViewSurface::toScreen (Single x, Single y, Single w, Single
}
KDE_NO_EXPORT
-void ViewSurface::tqrepaint (const SRect &r) {
+void ViewSurface::repaint (const SRect &r) {
markDirty ();
view_widget->scheduleRepaint (toScreen (r.x (), r.y (), r.width (), r.height ()));
- //kdDebug() << "Surface::tqrepaint x:" << (int)x << " y:" << (int)y << " w:" << (int)w << " h:" << (int)h << endl;
+ //kdDebug() << "Surface::repaint x:" << (int)x << " y:" << (int)y << " w:" << (int)w << " h:" << (int)h << endl;
}
KDE_NO_EXPORT
-void ViewSurface::tqrepaint () {
+void ViewSurface::repaint () {
markDirty ();
view_widget->scheduleRepaint (toScreen (0, 0, bounds.width (), bounds.height ()));
}
@@ -327,7 +327,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::traverseRegion (SMIL::RegionBase * reg) {
if (c->data)
c->data->accept (this);
}
- // finally visit tqchildren, accounting for z-order FIXME optimize
+ // finally visit children, accounting for z-order FIXME optimize
NodeRefList sorted;
for (NodePtr n = reg->firstChild (); n; n = n->nextSibling ()) {
if (n->id != SMIL::id_node_region)
@@ -1143,17 +1143,17 @@ KDE_NO_EXPORT void MouseVisitor::visit (Node * n) {
kdDebug () << "Mouse event ignored for " << n->nodeName () << endl;
}
-KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * tqlayout) {
- if (tqlayout->surface ()) {
+KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * layout) {
+ if (layout->surface ()) {
Matrix m = matrix;
- SRect rect = tqlayout->region_surface->bounds;
+ SRect rect = layout->region_surface->bounds;
matrix = Matrix (rect.x(), rect.y(),
- tqlayout->region_surface->xscale, tqlayout->region_surface->yscale);
+ layout->region_surface->xscale, layout->region_surface->yscale);
matrix.transform (m);
NodePtr node_save = node;
- node = tqlayout;
- for (NodePtr r = tqlayout->firstChild (); r; r = r->nextSibling ()) {
+ node = layout;
+ for (NodePtr r = layout->firstChild (); r; r = r->nextSibling ()) {
if (r->id == SMIL::id_node_region)
r->accept (this);
if (!node->active ())
@@ -1378,7 +1378,7 @@ KDE_NO_EXPORT void ViewArea::fullScreen () {
}
m_view->controlPanel ()->button (ControlPanel::button_playlist)->setIconSet (TQIconSet (TQPixmap (playlist_xpm)));
} else {
- m_topwindow_rect = tqtopLevelWidget ()->tqgeometry ();
+ m_topwindow_rect = topLevelWidget ()->geometry ();
reparent (0L, 0, tqApp->desktop()->screenGeometry(this).topLeft(), true);
showFullScreen ();
for (unsigned i = 0; i < m_collection->count (); ++i)
@@ -1425,7 +1425,7 @@ void ViewArea::minimalMode () {
m_view->setNoInfoMessages (false);
m_view->controlPanel ()->button (ControlPanel::button_playlist)->setIconSet (TQIconSet (TQPixmap (playlist_xpm)));
}
- m_topwindow_rect = tqtopLevelWidget ()->tqgeometry ();
+ m_topwindow_rect = topLevelWidget ()->geometry ();
}
KDE_NO_EXPORT void ViewArea::accelActivated () {
@@ -1447,7 +1447,7 @@ KDE_NO_EXPORT void ViewArea::mouseDoubleClickEvent (TQMouseEvent *) {
KDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) {
if (e->state () == Qt::NoButton) {
int vert_buttons_pos = height () - m_view->statusBarHeight ();
- int cp_height = m_view->controlPanel ()->tqmaximumSize ().height ();
+ int cp_height = m_view->controlPanel ()->maximumSize ().height ();
m_view->delayedShowButtons (e->y() > vert_buttons_pos-cp_height &&
e->y() < vert_buttons_pos);
}
@@ -1481,7 +1481,7 @@ KDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) {
if (surface->node)
surface->node->accept (&visitor);
#else
- tqrepaint (TQRect(rect.x, rect.y, rect.w, rect.h), false);
+ repaint (TQRect(rect.x, rect.y, rect.w, rect.h), false);
#endif
if (m_repaint_timer) {
killTimer (m_repaint_timer);
@@ -1510,7 +1510,7 @@ KDE_NO_EXPORT void ViewArea::updateSurfaceBounds () {
h -= m_view->controlPanel ()->isVisible ()
? (m_view->controlPanelMode () == View::CP_Only
? h
- : (Single) m_view->controlPanel()->tqmaximumSize ().height ())
+ : (Single) m_view->controlPanel()->maximumSize ().height ())
: Single (0);
surface->resize (SRect (x, y, w, h));
Mrl *mrl = surface->node ? surface->node->mrl () : NULL;
@@ -1545,7 +1545,7 @@ KDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) {
Single hcp = m_view->controlPanel ()->isVisible ()
? (m_view->controlPanelMode () == View::CP_Only
? h-hsb
- : (Single) m_view->controlPanel()->tqmaximumSize ().height ())
+ : (Single) m_view->controlPanel()->maximumSize ().height ())
: Single (0);
Single wws = w;
// move controlpanel over video when autohiding and playing
@@ -1593,13 +1593,13 @@ void ViewArea::setAudioVideoGeometry (const IRect &rect, unsigned int * bg_color
h = hfw;
}
}
- m_av_tqgeometry = TQRect (x, y, w, h);
- TQRect wrect = m_view->widgetStack ()->tqgeometry ();
- if (m_av_tqgeometry != wrect &&
- !(m_av_tqgeometry.width() <= 0 &&
+ m_av_geometry = TQRect (x, y, w, h);
+ TQRect wrect = m_view->widgetStack ()->geometry ();
+ if (m_av_geometry != wrect &&
+ !(m_av_geometry.width() <= 0 &&
wrect.width() <= 1 && wrect.height() <= 1)) {
m_view->widgetStack ()->setGeometry (x, y, w, h);
- wrect.unite (m_av_tqgeometry);
+ wrect.unite (m_av_geometry);
scheduleRepaint (IRect (wrect.x (), wrect.y (), wrect.width (), wrect.height ()));
}
if (bg_color)
@@ -1668,7 +1668,7 @@ KDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) {
} else if (e->timerId () == m_repaint_timer) {
killTimer (m_repaint_timer);
m_repaint_timer = 0;
- //tqrepaint (m_repaint_rect, false);
+ //repaint (m_repaint_rect, false);
syncVisual (m_repaint_rect.intersect (IRect (0, 0, width (), height ())));
} else {
kdError () << "unknown timer " << e->timerId () << " " << m_repaint_timer << endl;
@@ -1680,8 +1680,8 @@ KDE_NO_EXPORT void ViewArea::closeEvent (TQCloseEvent * e) {
//kdDebug () << "closeEvent" << endl;
if (m_fullscreen) {
fullScreen ();
- if (!m_parent->tqtopLevelWidget ()->isVisible ())
- m_parent->tqtopLevelWidget ()->show ();
+ if (!m_parent->topLevelWidget ()->isVisible ())
+ m_parent->topLevelWidget ()->show ();
e->ignore ();
} else
TQWidget::closeEvent (e);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-21 10:48:14 +0000