Rename several symbols {qt=>tqt}Fat-Zer/minor/refactoring

Symbols renamed:
 * {qt=>tqt}_desktopwidget_update_workarea
 * {qt=>tqt}_desktopwidget_workarea_dirty
 * {qt=>tqt}_net_supports
 * {qt=>tqt}_net_workarea
 * {qt=>tqt}_x11_create_desktop_on_screen

All those are internal symbols; the changes don't affect API/ABI. No
additional changes required.

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

4 files changed, 42 insertions, 42 deletions

diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp
index efeb03abc..573bda956 100644
--- a/src/dialogs/tqdialog.cpp
+++ b/src/dialogs/tqdialog.cpp
@@ -677,7 +677,7 @@ extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long )
 #undef FocusIn
 // defined in tqapplication_x11.cpp
 extern Atom qt_net_wm_full_placement;
-extern bool qt_net_supports(Atom atom);
+extern bool tqt_net_supports(Atom atom);
 #endif // TQ_WS_X11
 
 /*!
@@ -699,7 +699,7 @@ void TQDialog::show()
 
     if ( !did_resize )
 	adjustSize();
-    if( !qt_net_supports( qt_net_wm_full_placement )) {
+    if( !tqt_net_supports( qt_net_wm_full_placement )) {
 	if ( has_relpos && !did_move ) {
 	    adjustPositionInternal( parentWidget(), true );
 	} else if ( !did_move ) {
diff --git a/src/kernel/tqapplication_x11.cpp b/src/kernel/tqapplication_x11.cpp
index 5b0bba96e..17648b759 100644
--- a/src/kernel/tqapplication_x11.cpp
+++ b/src/kernel/tqapplication_x11.cpp
@@ -254,7 +254,7 @@ Atom		qt_net_supported	= 0;
 Atom		qt_net_wm_name		= 0;
 Atom		qt_net_wm_icon_name	= 0;
 Atom		qt_net_virtual_roots	= 0;
-Atom		qt_net_workarea		= 0;
+Atom		tqt_net_workarea	= 0;
 Atom		qt_net_wm_state		= 0;
 Atom		qt_net_wm_state_modal	= 0;
 Atom		qt_net_wm_state_max_v	= 0;
@@ -311,7 +311,7 @@ Atom		qt_net_wm_sync_request     	= 0;
 Window qt_x11_wm_client_leader = 0;
 
 // function to update the workarea of the screen - in tqdesktopwidget_x11.cpp
-extern void qt_desktopwidget_update_workarea();
+extern void tqt_desktopwidget_update_workarea();
 
 // current focus model
 static const int FocusModel_Unknown = -1;
@@ -1491,7 +1491,7 @@ void qt_get_net_supported()
 }
 
 
-bool qt_net_supports(Atom atom)
+bool tqt_net_supports(Atom atom)
 {
     if (! qt_net_supported_list)
 	return false;
@@ -1516,7 +1516,7 @@ void qt_get_net_virtual_roots()
 	delete [] qt_net_virtual_root_list;
     qt_net_virtual_root_list = 0;
 
-    if (! qt_net_supports(qt_net_virtual_roots))
+    if (! tqt_net_supports(qt_net_virtual_roots))
 	return;
 
     Atom type;
@@ -2025,7 +2025,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 
 	qt_x11_intern_atom( "_NET_SUPPORTED", &qt_net_supported );
 	qt_x11_intern_atom( "_NET_VIRTUAL_ROOTS", &qt_net_virtual_roots );
-	qt_x11_intern_atom( "_NET_WORKAREA", &qt_net_workarea );
+	qt_x11_intern_atom( "_NET_WORKAREA", &tqt_net_workarea );
 	qt_x11_intern_atom( "_NET_WM_STATE", &qt_net_wm_state );
 	qt_x11_intern_atom( "_NET_WM_STATE_MODAL", &qt_net_wm_state_modal );
 	qt_x11_intern_atom( "_NET_WM_STATE_MAXIMIZED_VERT", &qt_net_wm_state_max_v );
@@ -3448,8 +3448,8 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 		qt_get_net_supported();
 	    } else if ( event->xproperty.atom == qt_net_virtual_roots ) {
 		qt_get_net_virtual_roots();
-	    } else if ( event->xproperty.atom == qt_net_workarea ) {
-		qt_desktopwidget_update_workarea();
+	    } else if ( event->xproperty.atom == tqt_net_workarea ) {
+		tqt_desktopwidget_update_workarea();
 	    }
 	} else if ( widget ) {
 	    widget->translatePropertyEvent(event);
@@ -4579,8 +4579,8 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event)
 
 	bool send_event = false;
 
-        if (qt_net_supports(qt_net_wm_state_max_v)
-            && qt_net_supports(qt_net_wm_state_max_h)) {
+        if (tqt_net_supports(qt_net_wm_state_max_v)
+            && tqt_net_supports(qt_net_wm_state_max_h)) {
             if (max && !isMaximized()) {
                 setWState(WState_Maximized);
                 send_event = true;
@@ -4590,7 +4590,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event)
             }
         }
 
-        if (qt_net_supports(qt_net_wm_state_fullscreen)) {
+        if (tqt_net_supports(qt_net_wm_state_fullscreen)) {
             if (full && !isFullScreen()) {
                 setWState(WState_FullScreen);
                 send_event = true;
diff --git a/src/kernel/tqdesktopwidget_x11.cpp b/src/kernel/tqdesktopwidget_x11.cpp
index 706063b10..6e167bfe5 100644
--- a/src/kernel/tqdesktopwidget_x11.cpp
+++ b/src/kernel/tqdesktopwidget_x11.cpp
@@ -43,17 +43,17 @@
 #include <cstdlib>
 
 // defined in tqwidget_x11.cpp
-extern int qt_x11_create_desktop_on_screen;
+extern int tqt_x11_create_desktop_on_screen;
 
 // defined in tqapplication_x11.cpp
-extern Atom qt_net_workarea;
-extern bool qt_net_supports(Atom atom);
+extern Atom tqt_net_workarea;
+extern bool tqt_net_supports(Atom atom);
 
 // function to update the workarea of the screen
-static bool qt_desktopwidget_workarea_dirty = true;
-void qt_desktopwidget_update_workarea()
+static bool tqt_desktopwidget_workarea_dirty = true;
+void tqt_desktopwidget_update_workarea()
 {
-    qt_desktopwidget_workarea_dirty = true;
+    tqt_desktopwidget_workarea_dirty = true;
 }
 
 
@@ -199,7 +199,7 @@ void TQDesktopWidgetPrivate::init()
 }
 
 // the TQDesktopWidget itself will be created on the default screen
-// as qt_x11_create_desktop_on_screen defaults to -1
+// as tqt_x11_create_desktop_on_screen defaults to -1
 TQDesktopWidget::TQDesktopWidget()
     : TQWidget( 0, "desktop", WType_Desktop )
 {
@@ -251,9 +251,9 @@ TQWidget *TQDesktopWidget::screen( int screen )
     if ( ! d->screens[screen] ||            // not created yet
          ! d->screens[screen]->isDesktop()  // reparented away
        ) {
-        qt_x11_create_desktop_on_screen = screen;
+        tqt_x11_create_desktop_on_screen = screen;
         d->screens[screen] = new TQSingleDesktopWidget;
-        qt_x11_create_desktop_on_screen = -1;
+        tqt_x11_create_desktop_on_screen = -1;
     }
 
     return d->screens[screen];
@@ -261,11 +261,11 @@ TQWidget *TQDesktopWidget::screen( int screen )
 
 const TQRect& TQDesktopWidget::availableGeometry( int screen ) const
 {
-    if ( qt_desktopwidget_workarea_dirty ) {
+    if ( tqt_desktopwidget_workarea_dirty ) {
         // the workareas are dirty, invalidate them
         for ( int i = 0; i < d->screenCount; ++i )
             d->workareas[i] = TQRect();
-        qt_desktopwidget_workarea_dirty = false;
+        tqt_desktopwidget_workarea_dirty = false;
     }
 
     if ( screen < 0 || screen >= d->screenCount )
@@ -274,7 +274,7 @@ const TQRect& TQDesktopWidget::availableGeometry( int screen ) const
     if ( d->workareas[screen].isValid() )
         return d->workareas[screen];
 
-    if ( ! isVirtualDesktop() && qt_net_supports( qt_net_workarea ) ) {
+    if ( ! isVirtualDesktop() && tqt_net_supports( tqt_net_workarea ) ) {
         Atom ret;
         int format, e;
         unsigned char *data = 0;
@@ -282,7 +282,7 @@ const TQRect& TQDesktopWidget::availableGeometry( int screen ) const
 
         e = XGetWindowProperty( TQPaintDevice::x11AppDisplay(),
                                 TQPaintDevice::x11AppRootWindow( screen ),
-                                qt_net_workarea, 0, 4, False, XA_CARDINAL,
+                                tqt_net_workarea, 0, 4, False, XA_CARDINAL,
                                 &ret, &format, &nitems, &after, &data );
 
         if ( e == Success && ret == XA_CARDINAL &&
@@ -353,6 +353,6 @@ int TQDesktopWidget::screenNumber( const TQPoint &point ) const
 void TQDesktopWidget::resizeEvent( TQResizeEvent *event )
 {
     d->init();
-    qt_desktopwidget_workarea_dirty = true;
+    tqt_desktopwidget_workarea_dirty = true;
     TQWidget::resizeEvent( event );
 }
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index 808d2ef4c..084dd7fef 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -98,7 +98,7 @@ extern bool qt_use_xsync;
 // defined in tqfont_x11.cpp
 extern bool tqt_has_xft;
 
-int qt_x11_create_desktop_on_screen = -1;
+int tqt_x11_create_desktop_on_screen = -1;
 
 /*****************************************************************************
   TQWidget member functions
@@ -158,7 +158,7 @@ extern Atom qt_net_virtual_roots;
 extern bool qt_broken_wm;
 
 // defined in tqapplication_x11.cpp
-extern bool qt_net_supports(Atom);
+extern bool tqt_net_supports(Atom);
 extern unsigned long *qt_net_virtual_root_list;
 
 #if defined (QT_TABLET_SUPPORT)
@@ -349,11 +349,11 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	initializeWindow = true;
 
     if ( desktop &&
-	 qt_x11_create_desktop_on_screen >= 0 &&
-	 qt_x11_create_desktop_on_screen != x11Screen() ) {
+	 tqt_x11_create_desktop_on_screen >= 0 &&
+	 tqt_x11_create_desktop_on_screen != x11Screen() ) {
 	// desktop on a certain screen other than the default requested
 	TQPaintDeviceX11Data* xd = getX11Data( true );
-	xd->x_screen = qt_x11_create_desktop_on_screen;
+	xd->x_screen = tqt_x11_create_desktop_on_screen;
 	xd->x_depth = TQPaintDevice::x11AppDepth( xd->x_screen );
 	xd->x_cells = TQPaintDevice::x11AppCells( xd->x_screen );
 	xd->x_colormap = TQPaintDevice::x11AppColormap( xd->x_screen );
@@ -552,7 +552,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	ulong wsa_mask = 0;
 
 	if ( testWFlags(WStyle_Splash) ) {
-            if (qt_net_supports(qt_net_wm_window_type_splash)) {
+            if (tqt_net_supports(qt_net_wm_window_type_splash)) {
                 clearWFlags( WX11BypassWM );
 	    } else {
 		setWFlags( WX11BypassWM | WStyle_Tool | WStyle_NoBorder );
@@ -1010,7 +1010,7 @@ void TQWidget::x11SetWindowType( X11WindowType type )
         return;
     if( type == X11WindowTypeSelect ) {
         if ( testWFlags(WStyle_Splash)) {
-            if (qt_net_supports(qt_net_wm_window_type_splash)) {
+            if (tqt_net_supports(qt_net_wm_window_type_splash)) {
                 net_wintypes[curr_wintype++] = qt_net_wm_window_type_splash;
             }
         } else if (inherits("TQToolBar")) {
@@ -1829,7 +1829,7 @@ void TQWidget::setWindowState(uint newstate)
         TQTLWExtra *top = topData();
 
 	if ((oldstate & WindowMaximized) != (newstate & WindowMaximized)) {
-	    if (qt_net_supports(qt_net_wm_state_max_h) && qt_net_supports(qt_net_wm_state_max_v)) {
+	    if (tqt_net_supports(qt_net_wm_state_max_h) && tqt_net_supports(qt_net_wm_state_max_v)) {
 		qt_net_change_wm_state(this, (newstate & WindowMaximized),
 				       qt_net_wm_state_max_h, qt_net_wm_state_max_v);
 	    } else if (! (newstate & WindowFullScreen)) {
@@ -1858,7 +1858,7 @@ void TQWidget::setWindowState(uint newstate)
 	}
 
 	if ((oldstate & WindowFullScreen) != (newstate & WindowFullScreen)) {
-	    if (qt_net_supports(qt_net_wm_state_fullscreen)) {
+	    if (tqt_net_supports(qt_net_wm_state_fullscreen)) {
 		qt_net_change_wm_state(this, (newstate & WindowFullScreen),
 				       qt_net_wm_state_fullscreen);
 	    } else {
@@ -1977,8 +1977,8 @@ void TQWidget::showWindow()
 	}
 
  	if (isMaximized() && !isFullScreen()
-	    && !(qt_net_supports(qt_net_wm_state_max_h)
-		 && qt_net_supports(qt_net_wm_state_max_v))) {
+	    && !(tqt_net_supports(qt_net_wm_state_max_h)
+		 && tqt_net_supports(qt_net_wm_state_max_v))) {
  	    XMapWindow( x11Display(), winId() );
  	    tqt_wait_for_window_manager(this);
 
@@ -2002,7 +2002,7 @@ void TQWidget::showWindow()
  	    return;
  	}
 
-	if (isFullScreen() && !qt_net_supports(qt_net_wm_state_fullscreen)) {
+	if (isFullScreen() && !tqt_net_supports(qt_net_wm_state_fullscreen)) {
  	    XMapWindow(x11Display(), winId());
  	    tqt_wait_for_window_manager(this);
 	    return;
@@ -2162,10 +2162,10 @@ void TQWidget::internalSetGeometry( int x, int y, int w, int h, bool isMove )
     if ( testWFlags(WType_Desktop) )
 	return;
     if (isTopLevel()) {
-        if (!qt_net_supports(qt_net_wm_state_max_h)
-            && !qt_net_supports(qt_net_wm_state_max_v))
+        if (!tqt_net_supports(qt_net_wm_state_max_h)
+            && !tqt_net_supports(qt_net_wm_state_max_v))
             clearWState(WState_Maximized);
-        if (!qt_net_supports(qt_net_wm_state_fullscreen))
+        if (!tqt_net_supports(qt_net_wm_state_fullscreen))
             clearWState(WState_FullScreen);
 	topData()->normalGeometry = TQRect(0, 0, -1, -1);
     } else {
@@ -2865,7 +2865,7 @@ void TQWidget::updateFrameStrut() const
 		XFree(data_ret);
 
 	    break;
-	} else if (qt_net_supports(qt_net_virtual_roots) && qt_net_virtual_root_list) {
+	} else if (tqt_net_supports(qt_net_virtual_roots) && qt_net_virtual_root_list) {
 	    int i = 0;
 	    while (qt_net_virtual_root_list[i] != 0) {
 		if (qt_net_virtual_root_list[i++] == p)