From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdecore/kglobalaccel_x11.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdecore/kglobalaccel_x11.h') diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h index 3022e0d90..e28df060d 100644 --- a/tdecore/kglobalaccel_x11.h +++ b/tdecore/kglobalaccel_x11.h @@ -30,13 +30,13 @@ /** * @internal */ -class KGlobalAccelPrivate : public TQWidget, public KAccelBase +class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase { - friend class KGlobalAccel; + friend class TDEGlobalAccel; Q_OBJECT public: - KGlobalAccelPrivate(); - virtual ~KGlobalAccelPrivate(); + TDEGlobalAccelPrivate(); + virtual ~TDEGlobalAccelPrivate(); virtual void setEnabled( bool bEnabled ); -- cgit v1.2.3