diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:13:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:13:21 -0600 |
| commit | 973b82a5b271e07036dedbed227ff0592f0e18ad (patch) | |
| tree | aadc3a318fbae76efa514227adbe1e38b9a5d05f /kbstateapplet/kbstate.h | |
| parent | d1366b97bcc67b2662d5c5058b46c7666a087d12 (diff) | |
| download | tdeaccessibility-973b82a5b271e07036dedbed227ff0592f0e18ad.tar.gz tdeaccessibility-973b82a5b271e07036dedbed227ff0592f0e18ad.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kbstateapplet/kbstate.h')
| -rw-r--r-- | kbstateapplet/kbstate.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h index 26aa513..e910df2 100644 --- a/kbstateapplet/kbstate.h +++ b/kbstateapplet/kbstate.h @@ -48,7 +48,7 @@ class TimeoutIcon : public StatusIcon { Q_OBJECT public: - TimeoutIcon (KInstance *instance, const TQString &text, + TimeoutIcon (TDEInstance *instance, const TQString &text, const TQString &featurename, TQWidget *parent, const char *name=0); ~TimeoutIcon (); @@ -66,7 +66,7 @@ private: TQPixmap pixmap; TQPixmap image; TQTimer timer; - KInstance *instance; + TDEInstance *instance; private slots: void timeout (); @@ -76,7 +76,7 @@ class KeyIcon : public StatusIcon { Q_OBJECT public: - KeyIcon (int keyId, KInstance *instance, + KeyIcon (int keyId, TDEInstance *instance, TQWidget *parent, const char *name=0); ~KeyIcon (); void setState (bool latched, bool locked); @@ -100,14 +100,14 @@ private: bool isLocked; bool tristate; int keyId; - KInstance *instance; + TDEInstance *instance; }; class MouseIcon : public StatusIcon { Q_OBJECT public: - MouseIcon (KInstance *instance, TQWidget *parent, const char *name=0); + MouseIcon (TDEInstance *instance, TQWidget *parent, const char *name=0); ~MouseIcon (); void setState (int state); void setActiveKey (int activekey); @@ -129,7 +129,7 @@ class MouseIcon : public StatusIcon { TQPixmap middleDotSelected; TQPixmap rightDotSelected; int state, activekey; - KInstance *instance; + TDEInstance *instance; }; class KbStateApplet : public KPanelApplet { @@ -198,7 +198,7 @@ private: bool showModifiers, showLockkeys, showMouse, showAccessX; bool fillSpace; - KInstance *instance; + TDEInstance *instance; XkbDescPtr xkb; }; |