Diffstat (limited to 'core/applets/clipboardapplet') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/clipboardapplet/clipboard.cpp | 15 | ||||
-rw-r--r-- | core/applets/clipboardapplet/clipboard.h | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp index 5848d0f..4fbdf6f 100644 --- a/core/applets/clipboardapplet/clipboard.cpp +++ b/core/applets/clipboardapplet/clipboard.cpp | |||
@@ -123,10 +123,11 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( | |||
123 | m_clipboardPixmap = QPixmap ( paste_xpm ); | 123 | m_clipboardPixmap = QPixmap ( paste_xpm ); |
124 | 124 | ||
125 | QTimer *timer = new QTimer ( this ); | 125 | m_timer = new QTimer ( this ); |
126 | 126 | ||
127 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); | 127 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); |
128 | connect ( timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); | 128 | connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); |
129 | connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( ))); | ||
129 | 130 | ||
130 | timer-> start ( 1000 ); | 131 | m_timer-> start ( 1500 ); |
131 | 132 | ||
132 | m_menu = 0; | 133 | m_menu = 0; |
@@ -139,4 +140,12 @@ ClipboardApplet::~ClipboardApplet ( ) | |||
139 | } | 140 | } |
140 | 141 | ||
142 | void ClipboardApplet::shutdown ( ) | ||
143 | { | ||
144 | // the timer has to be stopped, or Qt/E will hang on quit() | ||
145 | // see launcher/desktop.cpp | ||
146 | |||
147 | m_timer-> stop ( ); | ||
148 | } | ||
149 | |||
141 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) | 150 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) |
142 | { | 151 | { |
diff --git a/core/applets/clipboardapplet/clipboard.h b/core/applets/clipboardapplet/clipboard.h index 84743d9..ec87d39 100644 --- a/core/applets/clipboardapplet/clipboard.h +++ b/core/applets/clipboardapplet/clipboard.h | |||
@@ -25,4 +25,6 @@ | |||
25 | #include <qstringlist.h> | 25 | #include <qstringlist.h> |
26 | 26 | ||
27 | class QTimer; | ||
28 | |||
27 | class ClipboardApplet : public QWidget | 29 | class ClipboardApplet : public QWidget |
28 | { | 30 | { |
@@ -39,4 +41,5 @@ private slots: | |||
39 | void action ( int ); | 41 | void action ( int ); |
40 | void newData ( ); | 42 | void newData ( ); |
43 | void shutdown ( ); | ||
41 | 44 | ||
42 | private: | 45 | private: |
@@ -45,4 +48,5 @@ private: | |||
45 | bool m_dirty; | 48 | bool m_dirty; |
46 | QString m_lasttext; | 49 | QString m_lasttext; |
50 | QTimer * m_timer; | ||
47 | 51 | ||
48 | QPixmap m_clipboardPixmap; | 52 | QPixmap m_clipboardPixmap; |