summaryrefslogtreecommitdiffstats
path: root/src/kernel/qwidget_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/qwidget_x11.cpp
parentae8aba1e0f17943046e6bfa889b169f7fc41da0d (diff)
downloadtqt3-eb1d1e0dec5720ace27395e290b7093cd68b150d.tar.gz
tqt3-eb1d1e0dec5720ace27395e290b7093cd68b150d.zip
Automated update from qt3
Diffstat (limited to 'src/kernel/qwidget_x11.cpp')
-rw-r--r--src/kernel/qwidget_x11.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index d26313160..71c36373b 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -207,7 +207,7 @@ Window qt_XCreateSimpleWindow( const TQWidget *creator,
void qt_XDestroyWindow( const TQWidget *destroyer,
Display *display, Window window );
-Q_EXPORT void qt_x11_enforce_cursor( TQWidget * w )
+Q_EXPORT void tqt_x11_enforce_cursor( TQWidget * w )
{
if ( w->testWState( TQt::WState_OwnCursor ) ) {
TQCursor * oc = TQApplication::overrideCursor();
@@ -225,7 +225,7 @@ Q_EXPORT void qt_x11_enforce_cursor( TQWidget * w )
}
}
-Q_EXPORT void qt_wait_for_window_manager( TQWidget* w )
+Q_EXPORT void tqt_wait_for_window_manager( TQWidget* w )
{
TQApplication::flushX();
XEvent ev;
@@ -754,7 +754,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
} else if ( topLevel ) { // set X cursor
setWState( WState_OwnCursor );
if ( initializeWindow )
- qt_x11_enforce_cursor( this );
+ tqt_x11_enforce_cursor( this );
}
if ( destroyw )
@@ -800,7 +800,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows )
if ( isTopLevel() )
qt_deferred_map_take( this );
if ( testWFlags(WShowModal) ) // just be sure we leave modal
- qt_leave_modal( this );
+ tqt_leave_modal( this );
else if ( testWFlags(WType_Popup) )
tqApp->closePopup( this );
@@ -1210,7 +1210,7 @@ void TQWidget::setCursor( const TQCursor &cursor )
extra->curs = new TQCursor(cursor);
}
setWState( WState_OwnCursor );
- qt_x11_enforce_cursor( this );
+ tqt_x11_enforce_cursor( this );
XFlush( x11Display() );
}
@@ -1222,7 +1222,7 @@ void TQWidget::unsetCursor()
}
if ( !isTopLevel() )
clearWState( WState_OwnCursor );
- qt_x11_enforce_cursor( this );
+ tqt_x11_enforce_cursor( this );
XFlush( x11Display() );
}
@@ -1932,7 +1932,7 @@ void TQWidget::showWindow()
&& !(qt_net_supports(qt_net_wm_state_max_h)
&& qt_net_supports(qt_net_wm_state_max_v))) {
XMapWindow( x11Display(), winId() );
- qt_wait_for_window_manager(this);
+ tqt_wait_for_window_manager(this);
// if the wm was not smart enough to adjust our size, do that manually
updateFrameStrut();
@@ -1956,7 +1956,7 @@ void TQWidget::showWindow()
if (isFullScreen() && !qt_net_supports(qt_net_wm_state_fullscreen)) {
XMapWindow(x11Display(), winId());
- qt_wait_for_window_manager(this);
+ tqt_wait_for_window_manager(this);
return;
}
}