summaryrefslogtreecommitdiffstats
path: root/kcontrol/randr/krandrapp.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-06 19:44:37 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:26:36 +0200
commitfc260a60f60da219361a82a7ae871fdac55408d7 (patch)
treef854b854d526b19b381a05cf54a64a95673a81cc /kcontrol/randr/krandrapp.h
parent6dbf47b221d709244550b0177ddd18052670729d (diff)
downloadtdebase-fc260a60f60da219361a82a7ae871fdac55408d7.tar.gz
tdebase-fc260a60f60da219361a82a7ae871fdac55408d7.zip
Implement X11 event merging in krandrtray
This closes Bug 758 (cherry picked from commit f2ef0ca599f2e400b75c1f15bd379647a436bc54)
Diffstat (limited to 'kcontrol/randr/krandrapp.h')
-rw-r--r--kcontrol/randr/krandrapp.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/kcontrol/randr/krandrapp.h b/kcontrol/randr/krandrapp.h
index 3b8895fc8..766b0056c 100644
--- a/kcontrol/randr/krandrapp.h
+++ b/kcontrol/randr/krandrapp.h
@@ -19,6 +19,7 @@
#ifndef KRANDRAPP_H
#define KRANDRAPP_H
+#include <tqtimer.h>
#include <kuniqueapplication.h>
class KRandRSystemTray;
@@ -32,8 +33,12 @@ public:
virtual bool x11EventFilter(XEvent * e);
+private slots:
+ void handleX11ConfigChangeEvent();
+
private:
KRandRSystemTray* m_tray;
+ TQTimer m_eventMergingTimer;
};
#endif