diff options
Diffstat (limited to 'x11-toolkits/qt32/files')
| -rw-r--r-- | x11-toolkits/qt32/files/patch-include-qmlined.h | 9 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/patch-qanimationwriter.cpp | 10 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/patch-qlistview.cpp | 11 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/patch-qpopupmenu.cpp | 11 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/patch-qtextedit.cpp | 20 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/qapplication.cpp.diff | 74 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/qapplication_p.h.diff | 16 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/qapplication_x11.cpp.diff | 48 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/qeffects.cpp.diff | 23 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/qwidget_x11.cpp.diff | 15 |
10 files changed, 0 insertions, 237 deletions
diff --git a/x11-toolkits/qt32/files/patch-include-qmlined.h b/x11-toolkits/qt32/files/patch-include-qmlined.h deleted file mode 100644 index 822c77855959..000000000000 --- a/x11-toolkits/qt32/files/patch-include-qmlined.h +++ /dev/null @@ -1,9 +0,0 @@ ---- include/qmlined.h.orig Sat Feb 15 02:26:37 2003 -+++ include/qmlined.h Sat Feb 15 02:27:45 2003 -@@ -22,5 +22,5 @@ - *****************************************************************************/ - #ifndef QMLINED_H - #define QMLINED_H --#include "qtmultilineedit.h" -+#include "qtextedit.h" - #endif diff --git a/x11-toolkits/qt32/files/patch-qanimationwriter.cpp b/x11-toolkits/qt32/files/patch-qanimationwriter.cpp deleted file mode 100644 index 9e7db8a94a02..000000000000 --- a/x11-toolkits/qt32/files/patch-qanimationwriter.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/qvfb/qanimationwriter.cpp.orig Wed Nov 27 02:45:38 2002 -+++ tools/qvfb/qanimationwriter.cpp Wed Nov 27 02:45:56 2002 -@@ -25,6 +25,7 @@ - - #include <png.h> - #include <netinet/in.h> // for htonl -+#include <limits.h> - - class QAnimationWriterData { - public: diff --git a/x11-toolkits/qt32/files/patch-qlistview.cpp b/x11-toolkits/qt32/files/patch-qlistview.cpp deleted file mode 100644 index 73882d3e9746..000000000000 --- a/x11-toolkits/qt32/files/patch-qlistview.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/widgets/qlistview.cpp.orig Mon Feb 24 09:30:39 2003 -+++ src/widgets/qlistview.cpp Mon May 12 19:42:07 2003 -@@ -6215,7 +6215,7 @@ - - void QListView::ensureItemVisible( const QListViewItem * i ) - { -- if ( !i ) -+ if ( !i || !i->isVisible() ) - return; - - QListViewItem *parent = i->parent(); diff --git a/x11-toolkits/qt32/files/patch-qpopupmenu.cpp b/x11-toolkits/qt32/files/patch-qpopupmenu.cpp deleted file mode 100644 index 78affc105b4a..000000000000 --- a/x11-toolkits/qt32/files/patch-qpopupmenu.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/widgets/qpopupmenu.cpp.orig Mon May 12 19:44:39 2003 -+++ src/widgets/qpopupmenu.cpp Mon May 12 19:45:42 2003 -@@ -1739,7 +1739,7 @@ - if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this) && - d->mouseMoveBuffer.contains( e->pos() ) ) { - actItem = item; -- popupSubMenuLater( style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 2, -+ popupSubMenuLater( style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 6, - this ); - return; - } diff --git a/x11-toolkits/qt32/files/patch-qtextedit.cpp b/x11-toolkits/qt32/files/patch-qtextedit.cpp deleted file mode 100644 index 7c22203692de..000000000000 --- a/x11-toolkits/qt32/files/patch-qtextedit.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/widgets/qtextedit.cpp.orig Mon Feb 24 09:30:37 2003 -+++ src/widgets/qtextedit.cpp Mon May 12 19:50:19 2003 -@@ -1863,7 +1863,7 @@ - } - setModified(); - emit textChanged(); -- emit selectionChanged(); -+ emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) ); - } - - /*! -@@ -4801,7 +4801,7 @@ - return; - if ( doc->hasSelection( QTextDocument::Standard ) ) - removeSelectedText(); -- if ( !m->provides( st.data() ) ) -+ if ( !QRichTextDrag::canDecode( m ) ) - return; - QString t; - if ( !QRichTextDrag::decode( m, t, st.data(), subtype ) ) diff --git a/x11-toolkits/qt32/files/qapplication.cpp.diff b/x11-toolkits/qt32/files/qapplication.cpp.diff deleted file mode 100644 index b84fd01f8f74..000000000000 --- a/x11-toolkits/qt32/files/qapplication.cpp.diff +++ /dev/null @@ -1,74 +0,0 @@ -=================================================================== -RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication.cpp,v -retrieving revision 1.61 -retrieving revision 1.62 -diff -u -p -r1.61 -r1.62 ---- qt-copy/src/kernel/qapplication.cpp 2002/11/13 16:46:34 1.61 -+++ qt-copy/src/kernel/qapplication.cpp 2002/11/14 08:57:34 1.62 -@@ -3257,6 +3257,66 @@ Q_EXPORT void qt_dispatchEnterLeave( QWi - } - - -+#ifdef Q_WS_MACX -+extern QWidget *qt_tryModalHelperMac( QWidget * top ); //qapplication_mac.cpp -+#endif -+ -+ -+/*!\internal -+ -+ Called from qapplication_<platform>.cpp, returns TRUE -+ if the widget should accept the event. -+ */ -+bool qt_tryModalHelper( QWidget *widget, QWidget **rettop ) { -+ QWidget *modal=0, *top=QApplication::activeModalWidget(); -+ if ( rettop ) *rettop = top; -+ -+ if ( qApp->activePopupWidget() ) -+ return TRUE; -+ -+#ifdef Q_WS_MACX -+ top = qt_tryModalHelperMac( top ); -+ if ( rettop ) *rettop = top; -+#endif -+ -+ QWidget* groupLeader = widget; -+ widget = widget->topLevelWidget(); -+ -+ if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal -+ modal = widget; -+ if ( !top || modal == top ) // don't block event -+ return TRUE; -+ -+ QWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget -+ while ( p ) { -+ if ( p == top ) -+ return TRUE; -+ p = p->parentWidget(); -+ } -+ -+ while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) ) -+ groupLeader = groupLeader->parentWidget(); -+ -+ if ( groupLeader ) { -+ // Does groupLeader have a child in qt_modal_stack? -+ bool unrelated = TRUE; -+ modal = qt_modal_stack->first(); -+ while (modal && unrelated) { -+ QWidget* p = modal->parentWidget(); -+ while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) { -+ p = p->parentWidget(); -+ } -+ modal = qt_modal_stack->next(); -+ if ( p == groupLeader ) unrelated = FALSE; -+ } -+ -+ if ( unrelated ) -+ return TRUE; // don't block event -+ } -+ return FALSE; -+} -+ -+ - /*! - Returns the desktop widget (also called the root window). - diff --git a/x11-toolkits/qt32/files/qapplication_p.h.diff b/x11-toolkits/qt32/files/qapplication_p.h.diff deleted file mode 100644 index 8b9268c696b8..000000000000 --- a/x11-toolkits/qt32/files/qapplication_p.h.diff +++ /dev/null @@ -1,16 +0,0 @@ -=================================================================== -RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_p.h,v -retrieving revision 1.21 -retrieving revision 1.22 -diff -u -p -r1.21 -r1.22 ---- qt-copy/src/kernel/qapplication_p.h 2002/11/13 16:46:34 1.21 -+++ qt-copy/src/kernel/qapplication_p.h 2002/11/14 08:57:34 1.22 -@@ -83,7 +83,6 @@ extern int qt_ncols_option; - - - extern void qt_dispatchEnterLeave( QWidget*, QWidget* ); -- -- -+extern bool qt_tryModalHelper( QWidget *, QWidget ** = 0 ); - - #endif diff --git a/x11-toolkits/qt32/files/qapplication_x11.cpp.diff b/x11-toolkits/qt32/files/qapplication_x11.cpp.diff deleted file mode 100644 index 877de05c5950..000000000000 --- a/x11-toolkits/qt32/files/qapplication_x11.cpp.diff +++ /dev/null @@ -1,48 +0,0 @@ -=================================================================== -RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_x11.cpp,v -retrieving revision 1.81 -retrieving revision 1.82 -diff -u -p -r1.81 -r1.82 ---- qt-copy/src/kernel/qapplication_x11.cpp 2002/11/13 16:46:34 1.81 -+++ qt-copy/src/kernel/qapplication_x11.cpp 2002/11/14 08:57:34 1.82 -@@ -3691,39 +3691,9 @@ void qt_leave_modal( QWidget *widget ) - - bool qt_try_modal( QWidget *widget, XEvent *event ) - { -- if ( qApp->activePopupWidget() ) -+ if ( qt_tryModalHelper( widget ) ) - return TRUE; - -- QWidget *modal=0, *top=QApplication::activeModalWidget(); -- -- QWidget* groupLeader = widget; -- widget = widget->topLevelWidget(); -- -- if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal -- modal = widget; -- if ( !top || modal == top ) // don't block event -- return TRUE; -- -- while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) ) -- groupLeader = groupLeader->parentWidget(); -- -- if ( groupLeader ) { -- // Does groupLeader have a child in qt_modal_stack? -- bool unrelated = TRUE; -- modal = qt_modal_stack->first(); -- while (modal && unrelated) { -- QWidget* p = modal->parentWidget(); -- while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) { -- p = p->parentWidget(); -- } -- modal = qt_modal_stack->next(); -- if ( p == groupLeader ) unrelated = FALSE; -- } -- -- if ( unrelated ) -- return TRUE; // don't block event -- } -- - bool block_event = FALSE; - switch ( event->type ) { - case ButtonPress: // disallow mouse/key events diff --git a/x11-toolkits/qt32/files/qeffects.cpp.diff b/x11-toolkits/qt32/files/qeffects.cpp.diff deleted file mode 100644 index 4ad9ee987455..000000000000 --- a/x11-toolkits/qt32/files/qeffects.cpp.diff +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -RCS file: /home2/webcvs/mirror/qt-copy/src/widgets/qeffects.cpp,v -retrieving revision 1.18 -retrieving revision 1.19 -diff -u -p -r1.18 -r1.19 ---- qt-copy/src/widgets/qeffects.cpp 2002/10/30 01:54:25 1.18 -+++ qt-copy/src/widgets/qeffects.cpp 2002/11/21 01:30:32 1.19 -@@ -275,6 +275,7 @@ void QAlphaWidget::render() - q_blend = 0; - deleteLater(); - } else { -+ widget->clearWState( WState_ForceHide ); - alphaBlend(); - pm = mixed; - repaint( FALSE ); -@@ -505,6 +506,7 @@ void QRollEffect::run( int time ) - void QRollEffect::scroll() - { - if ( !done ) { -+ widget->clearWState( WState_ForceHide ); - int tempel = checkTime.elapsed(); - if ( elapsed >= tempel ) - elapsed++; diff --git a/x11-toolkits/qt32/files/qwidget_x11.cpp.diff b/x11-toolkits/qt32/files/qwidget_x11.cpp.diff deleted file mode 100644 index de7fa1e41c6f..000000000000 --- a/x11-toolkits/qt32/files/qwidget_x11.cpp.diff +++ /dev/null @@ -1,15 +0,0 @@ -=================================================================== -RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qwidget_x11.cpp,v -retrieving revision 1.55 -retrieving revision 1.56 -diff -u -p -r1.55 -r1.56 ---- qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 16:46:35 1.55 -+++ qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 17:28:42 1.56 -@@ -1561,7 +1561,6 @@ void QWidget::showMinimized() - else { - topData()->showMode = 1; - show(); -- hideChildren( FALSE ); - } - } else { - show(); |