diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2010-10-05 15:56:06 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2010-10-05 16:02:51 +0200 |
commit | c3d6f3f840b8f5c8de0f318f1e0d90df7efc7329 (patch) | |
tree | 061f3b373eef1f32b6e45cf59415bdce62a2198e /vcl | |
parent | b250344e88434741d4fae99a7ef198c46e020132 (diff) |
remove filtering of Qt's X11 events by our core
It doesn't seem to be necessary and it looks like a bad idea
to filter X events in Qt's X connection using the core which uses
another X connection.
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde4/VCLKDEApplication.cxx | 13 | ||||
-rw-r--r-- | vcl/unx/kde4/VCLKDEApplication.hxx | 6 |
3 files changed, 1 insertions, 20 deletions
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 4cb54761892e..4f32025e0d96 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -146,8 +146,6 @@ void KDEXLib::Init() Display* pDisp = QX11Info::display(); SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp); - m_pApplication->disp = pSalDisplay; - pInputMethod->CreateMethod( pDisp ); pInputMethod->AddConnectionWatch( pDisp, (void*)this ); pSalDisplay->SetInputMethod( pInputMethod ); diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx index 2cfb071e96ae..ccd0b8463750 100644 --- a/vcl/unx/kde4/VCLKDEApplication.cxx +++ b/vcl/unx/kde4/VCLKDEApplication.cxx @@ -36,17 +36,4 @@ VCLKDEApplication::VCLKDEApplication() : KApplication() { - disp = 0; } - -bool VCLKDEApplication::x11EventFilter(XEvent* event) -{ - //if we have a display and the display consumes the event - //do not process the event in qt - if (disp && disp->Dispatch(event) > 0) - { - return true; - } - - return false; -}
\ No newline at end of file diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx index 2edfddd69a9c..838d43356e2b 100644 --- a/vcl/unx/kde4/VCLKDEApplication.hxx +++ b/vcl/unx/kde4/VCLKDEApplication.hxx @@ -46,8 +46,4 @@ class VCLKDEApplication : public KApplication VCLKDEApplication(); virtual void commitData(QSessionManager&) {}; - - virtual bool x11EventFilter(XEvent* event); - - SalKDEDisplay* disp; -};
\ No newline at end of file +}; |