diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:04:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:04:27 -0600 |
| commit | 6d5c221f92a30236430b79d353690656d1e828b2 (patch) | |
| tree | 9033aef85c749b9b3480679d91dc05c67e71d7e8 | |
| parent | e5bc9e738a5995a7df7a1071917208c91eb67e69 (diff) | |
| download | amarok-6d5c221f.tar.gz amarok-6d5c221f.zip | |
Rename additional global functions and variables for tqt3
| -rw-r--r-- | amarok/src/osd.cpp | 6 | ||||
| -rw-r--r-- | amarok/src/playerwindow.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index a475f33a..18683cc8 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -137,7 +137,7 @@ OSDWidget::show() //virtual const TQRect newGeometry = determineMetrics( M ); if( m_translucency && !isShown() || !newGeometry.intersects( oldGeometry ) ) - m_screenshot = TQPixmap(TQPixmap::grabWindow( qt_xrootwin(), + m_screenshot = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), newGeometry.x(), newGeometry.y(), newGeometry.width(), newGeometry.height() )); @@ -145,7 +145,7 @@ OSDWidget::show() //virtual else if ( m_translucency ) { const TQRect unite = oldGeometry.unite( newGeometry ); - KPixmap pix = TQPixmap(TQPixmap::grabWindow( qt_xrootwin(), unite.x(), unite.y(), unite.width(), unite.height() )); + KPixmap pix = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), unite.x(), unite.y(), unite.width(), unite.height() )); TQPoint p = oldGeometry.topLeft() - unite.topLeft(); bitBlt( &pix, p, &m_screenshot ); @@ -528,7 +528,7 @@ OSDWidget::paintMe() int h = blendedImage.height(); Pixmap rawpixmap = m_buffer.handle(); XImage *image; - image = XGetImage (qt_xdisplay(), rawpixmap, 0, 0, w, h, AllPlanes, XYPixmap); + image = XGetImage (tqt_xdisplay(), rawpixmap, 0, 0, w, h, AllPlanes, XYPixmap); for (int y = 0; y < h; ++y) { TQRgb *ls = (TQRgb *)blendedImage.scanLine( y ); for (int x = 0; x < w; ++x) { diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 9c061cbd..7cd3590e 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -597,25 +597,25 @@ bool PlayerWidget::event( TQEvent *e ) if( info.mappingState() == NET::Withdrawn ) { - //extern Atom qt_wm_state; //XAtom defined by TQt + //extern Atom tqt_wm_state; //XAtom defined by TQt //TODO prevent the active Window flicker from playlist to player window please! //TODO look at code for TQWidget::show(); - //XDeleteProperty( qt_xdisplay(), id, qt_wm_state ); + //XDeleteProperty( tqt_xdisplay(), id, tqt_wm_state ); //parentWidget()->show(); - //if( !parentWidget()->isShown() ) XMapWindow( qt_xdisplay(), id ); + //if( !parentWidget()->isShown() ) XMapWindow( tqt_xdisplay(), id ); // unsigned long data[2]; // data[0] = (unsigned long) NormalState; // data[1] = (unsigned long) None; // -// XChangeProperty( qt_xdisplay(), id, qt_wm_state, qt_wm_state, 32, +// XChangeProperty( tqt_xdisplay(), id, tqt_wm_state, tqt_wm_state, 32, // PropModeReplace, (unsigned char *)data, 2); // // KWin::clearState( id, NET::Hidden ); // -// XMapWindow( qt_xdisplay(), id ); +// XMapWindow( tqt_xdisplay(), id ); // //KWin::deIconifyWindow( id, false ); parentWidget()->show(); |