[Kde-cygwin-cvs] CVS: qt-3/src/kernel qapplication_win.cpp,1.1.2.30.2.78,1.1.2.30.2.79 qwidget_win.cpp,1.1.2.15.2.48,1.1.2.15.2.49

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/src/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3326/src/kernel

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qapplication_win.cpp qwidget_win.cpp 
Log Message:
removed qt4_QWidget_window( QWidget ) because it's the same like QWidget::topLevelwidget() :)

Index: qapplication_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qapplication_win.cpp,v
retrieving revision 1.1.2.30.2.78
retrieving revision 1.1.2.30.2.79
diff -u -r1.1.2.30.2.78 -r1.1.2.30.2.79
--- qapplication_win.cpp	9 Jul 2005 10:15:17 -0000	1.1.2.30.2.78
+++ qapplication_win.cpp	10 Jul 2005 10:42:42 -0000	1.1.2.30.2.79
@@ -166,8 +166,6 @@
 // one day in the future we will be able to have static objects in libraries....
 static QGuardedPtr<QWidget>* activeBeforePopup = 0; // focus handling with popups
 
-QWidget *qt4_QWidget_window( const QWidget *w );
-
 typedef int (*QwinEventFilter) (MSG*);
 QwinEventFilter qt_set_win_event_filter (QwinEventFilter filter);
 
@@ -2777,7 +2775,7 @@
         if (mw && mw->isDialog()) {
             // raise the entire application, not just the dialog
             while(mw->parentWidget() && mw->isDialog())
-                mw = qt4_QWidget_window( mw );
+                mw = mw->topLevelWidget();
             if (mw != QApplication::active_window)
                 SetWindowPos(mw->winId(), HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
         }
@@ -2878,7 +2876,7 @@
         else if (qApp->focusWidget())
             widget = (QETWidget*)qApp->focusWidget();
         else if (!widget || widget->winId() == GetFocus()) // We faked the message to go to exactly that widget.
-            widget = (QETWidget*) qt4_QWidget_window( widget );
+            widget = (QETWidget*) widget->topLevelWidget();
         if (widget->isEnabled())
             return ( widget->translateKeyEvent(msg, g != 0) );
         break;

Index: qwidget_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qwidget_win.cpp,v
retrieving revision 1.1.2.15.2.48
retrieving revision 1.1.2.15.2.49
diff -u -r1.1.2.15.2.48 -r1.1.2.15.2.49
--- qwidget_win.cpp	10 Jul 2005 10:38:40 -0000	1.1.2.15.2.48
+++ qwidget_win.cpp	10 Jul 2005 10:42:43 -0000	1.1.2.15.2.49
@@ -68,17 +68,6 @@
 
 extern "C" LRESULT CALLBACK qt_window_procedure ( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
 
-QWidget *qt4_QWidget_window( const QWidget *widget )
-{
-    QWidget *w = (QWidget *)widget;
-    QWidget *p = w->parentWidget();
-    while (!w->isTopLevel() && p) {
-        w = p;
-        p = p->parentWidget();
-    }
-    return w;
-}
-
 //Used in  QWidget::internalSetGeometry, QWidget::updateFrameStrut, QETWidget::translateConfigEvent
 void getWndBorderInfo( HWND hWnd, int& captionWidth, int& xBorderWidth, int& yBorderWidth )
 {