From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:15:55 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 klipper/toplevel.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'klipper/toplevel.h')

diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index 024fb87f7..59d7c7396 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -31,7 +31,7 @@
 
 class TQClipboard;
 class KToggleAction;
-class KAboutData;
+class TDEAboutData;
 class URLGrabber;
 class ClipboardPoll;
 class TQTime;
@@ -69,7 +69,7 @@ public:
     static void updateTimestamp();
     static void createAboutData();
     static void destroyAboutData();
-    static KAboutData* aboutData();
+    static TDEAboutData* aboutData();
 
 public slots:
     void saveSession();
@@ -204,7 +204,7 @@ private:
     TQTimer m_pendingCheckTimer;
     bool m_pendingContentsCheck;
     ClipboardPoll* poll;
-    static KAboutData* about_data;
+    static TDEAboutData* about_data;
 
     bool blockFetchingNewData();
     KlipperSessionManaged* session_managed;
-- 
cgit v1.2.1