diff options
Diffstat (limited to 'klipper/toplevel.h')
| -rw-r--r-- | klipper/toplevel.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/klipper/toplevel.h b/klipper/toplevel.h index b8526e59f..3dbd0a069 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*- /* This file is part of the KDE project Copyright (C) by Andrew Stanley-Jones Copyright (C) 2004 Esben Mose Hansen <kde@mosehansen.dk> @@ -22,7 +21,7 @@ #define _TOPLEVEL_H_ #include <tdeapplication.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <tdepopupmenu.h> #include <tqmap.h> #include <tqpixmap.h> @@ -43,7 +42,7 @@ class KlipperSessionManaged; class KlipperWidget : public TQWidget, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: @@ -128,7 +127,7 @@ protected: bool ignoreClipboardChanges() const; TDEConfig* config() const { return m_config; } - bool isApplet() const { return m_config != kapp->config(); } + bool isApplet() const { return m_config != tdeApp->config(); } protected slots: void slotPopupMenu(); @@ -155,6 +154,7 @@ private slots: void slotClearOverflow(); void slotCheckPending(); + void slotDelayedSetClipboard(); private: @@ -187,6 +187,8 @@ private: bool bSynchronize :1; bool bSelectionTextOnly :1; bool bIgnoreImages :1; + bool bSavedSelectionMode :1; + bool bCheckForEmpty :1; /** * Avoid reacting to our own changes, using this @@ -202,6 +204,7 @@ private: TDEConfig* m_config; TQTimer m_overflowClearTimer; TQTimer m_pendingCheckTimer; + TQTimer m_setClipboardTimer; bool m_pendingContentsCheck; ClipboardPoll* poll; static TDEAboutData* about_data; @@ -212,7 +215,7 @@ private: class Klipper : public KlipperWidget { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: int newInstance(); |