author | wazlaf <wazlaf> | 2002-10-13 11:15:57 (UTC) |
---|---|---|
committer | wazlaf <wazlaf> | 2002-10-13 11:15:57 (UTC) |
commit | fb76065a9041fb9c0fef43127509dcdb2478c1ab (patch) (unidiff) | |
tree | e8d131f99f34d35b434484cd13805c0a32762d3e | |
parent | 72d9ce37fdd97b7ff37111e365cc8a14e0bbc52c (diff) | |
download | opie-fb76065a9041fb9c0fef43127509dcdb2478c1ab.zip opie-fb76065a9041fb9c0fef43127509dcdb2478c1ab.tar.gz opie-fb76065a9041fb9c0fef43127509dcdb2478c1ab.tar.bz2 |
compilation fixes
-rw-r--r-- | noncore/apps/opie-console/widget_layer.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/noncore/apps/opie-console/widget_layer.cpp b/noncore/apps/opie-console/widget_layer.cpp index 3875a6e..0364e66 100644 --- a/noncore/apps/opie-console/widget_layer.cpp +++ b/noncore/apps/opie-console/widget_layer.cpp | |||
@@ -59,19 +59,16 @@ bool WidgetLayer::eventFilter( QObject *obj, QEvent *e ) | |||
59 | { | 59 | { |
60 | if ( (e->type() == QEvent::Accel || | 60 | if ( (e->type() == QEvent::Accel || |
61 | e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this ) { | 61 | e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this ) { |
62 | static_cast<QKeyEvent *>( e )->ignore(); | 62 | static_cast<QKeyEvent *>( e )->ignore(); |
63 | return true; | 63 | return true; |
64 | } | 64 | } |
65 | if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) | 65 | if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) |
66 | return FALSE; // not us | 66 | return FALSE; // not us |
67 | if ( e->type() == QEvent::Wheel) { | ||
68 | QApplication::sendEvent( m_scrollbar, e); | ||
69 | } | ||
70 | 67 | ||
71 | #ifdef FAKE_CTRL_AND_ALT | 68 | #ifdef FAKE_CTRL_AND_ALT |
72 | static bool control = FALSE; | 69 | static bool control = FALSE; |
73 | static bool alt = FALSE; | 70 | static bool alt = FALSE; |
74 | // qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:"); | 71 | // qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:"); |
75 | bool dele=FALSE; | 72 | bool dele=FALSE; |
76 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { | 73 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { |
77 | QKeyEvent* ke = (QKeyEvent*)e; | 74 | QKeyEvent* ke = (QKeyEvent*)e; |
@@ -118,24 +115,16 @@ QChar(a,0)); | |||
118 | } else | 115 | } else |
119 | emit keyPressed( ke ); // expose | 116 | emit keyPressed( ke ); // expose |
120 | ke->accept(); | 117 | ke->accept(); |
121 | #ifdef FAKE_CTRL_AND_ALT | 118 | #ifdef FAKE_CTRL_AND_ALT |
122 | if ( dele ) delete e; | 119 | if ( dele ) delete e; |
123 | #endif | 120 | #endif |
124 | return true; // stop the event | 121 | return true; // stop the event |
125 | } | 122 | } |
126 | if ( e->type() == QEvent::Enter ) { | ||
127 | QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()), | ||
128 | this, SLOT(onClearSelection()) ); | ||
129 | } | ||
130 | if ( e->type() == QEvent::Leave ) { | ||
131 | QObject::connect( (QObject*)cb, SIGNAL(dataChanged()), | ||
132 | this, SLOT(onClearSelection()) ); | ||
133 | } | ||
134 | return QFrame::eventFilter( obj, e ); | 123 | return QFrame::eventFilter( obj, e ); |
135 | } | 124 | } |
136 | 125 | ||
137 | 126 | ||
138 | /* --------------------------------- screen --------------------------------- */ | 127 | /* --------------------------------- screen --------------------------------- */ |
139 | 128 | ||
140 | 129 | ||
141 | void WidgetLayer::propagateSize() | 130 | void WidgetLayer::propagateSize() |