summaryrefslogtreecommitdiffstats
path: root/src/kernel/qpixmap_x11.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-06 20:38:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-06 20:38:40 -0600
commiteb1d1e0dec5720ace27395e290b7093cd68b150d (patch)
tree04a199ef5ea853d86a6f9a44716c0874d41c20f6 /src/kernel/qpixmap_x11.cpp
parentae8aba1e0f17943046e6bfa889b169f7fc41da0d (diff)
downloadtqt3-eb1d1e0dec5720ace27395e290b7093cd68b150d.tar.gz
tqt3-eb1d1e0dec5720ace27395e290b7093cd68b150d.zip
Automated update from qt3
Diffstat (limited to 'src/kernel/qpixmap_x11.cpp')
-rw-r--r--src/kernel/qpixmap_x11.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index 328f78175..fb4168aa8 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -112,7 +112,7 @@ static XShmSegmentInfo xshminfo;
static XImage *xshmimg = 0;
static Pixmap xshmpm = 0;
-static void qt_cleanup_mitshm()
+static void tqt_cleanup_mitshm()
{
if ( xshmimg == 0 )
return;
@@ -137,11 +137,11 @@ static bool qt_create_mitshm_buffer( const TQPaintDevice* dev, int w, int h )
Visual *vis = (Visual*)dev->x11Visual();
if ( xshminit ) {
- qt_cleanup_mitshm();
+ tqt_cleanup_mitshm();
} else {
if ( !XShmQueryVersion(dpy, &major, &minor, &pixmaps_ok) )
return FALSE; // MIT Shm not supported
- tqAddPostRoutine( qt_cleanup_mitshm );
+ tqAddPostRoutine( tqt_cleanup_mitshm );
xshminit = TRUE;
}