From 65eca7929c22f0f0bc64135c02d85d1243df376c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:12:51 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 kolourpaint/tools/kptoolaction.cpp | 22 +++++++++++-----------
 kolourpaint/tools/kptoolaction.h   | 14 +++++++-------
 kolourpaint/tools/kptoolairspray.h |  2 +-
 kolourpaint/tools/kptoolpen.h      |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'kolourpaint/tools')

diff --git a/kolourpaint/tools/kptoolaction.cpp b/kolourpaint/tools/kptoolaction.cpp
index d45acb30..6d005981 100644
--- a/kolourpaint/tools/kptoolaction.cpp
+++ b/kolourpaint/tools/kptoolaction.cpp
@@ -32,10 +32,10 @@
 
 
 kpToolAction::kpToolAction (const TQString &text,
-                            const TQString &pic, const KShortcut &shortcut,
+                            const TQString &pic, const TDEShortcut &shortcut,
                             const TQObject *receiver, const char *slot,
                             TQObject *parent, const char *name)
-    : KToggleAction (text,
+    : TDEToggleAction (text,
                      pic, shortcut,
                      receiver, slot,
                      parent, name)
@@ -62,27 +62,27 @@ void kpToolAction::updateToolTip ()
 
 
 //
-// KToggleAction interface
+// TDEToggleAction interface
 //
 
-// public slot virtual [base KAction]
+// public slot virtual [base TDEAction]
 void kpToolAction::setText (const TQString &text)
 {
-    KToggleAction::setText (text);
+    TDEToggleAction::setText (text);
     updateToolTip ();
 }
 
-// public slot virtual [base KAction]
-bool kpToolAction::setShortcut (const KShortcut &shortcut)
+// public slot virtual [base TDEAction]
+bool kpToolAction::setShortcut (const TDEShortcut &shortcut)
 {
-    bool ret = KToggleAction::setShortcut (shortcut);
+    bool ret = TDEToggleAction::setShortcut (shortcut);
     updateToolTip ();
     return ret;
 }
 
 
 //
-// KToggleAction implements kpSingleKeyTriggersActionInterface
+// TDEToggleAction implements kpSingleKeyTriggersActionInterface
 //
 
 // public virtual [base kpSingleKeyTriggersActionInterface]
@@ -92,13 +92,13 @@ const char *kpToolAction::actionName () const
 }
 
 // public virtual [base kpSingleKeyTriggersActionInterface]
-KShortcut kpToolAction::actionShortcut () const
+TDEShortcut kpToolAction::actionShortcut () const
 {
     return shortcut ();
 }
 
 // public virtual [base kpSingleKeyTriggersActionInterface]
-void kpToolAction::actionSetShortcut (const KShortcut &shortcut)
+void kpToolAction::actionSetShortcut (const TDEShortcut &shortcut)
 {
     setShortcut (shortcut);
 }
diff --git a/kolourpaint/tools/kptoolaction.h b/kolourpaint/tools/kptoolaction.h
index 9979ed75..210c7668 100644
--- a/kolourpaint/tools/kptoolaction.h
+++ b/kolourpaint/tools/kptoolaction.h
@@ -33,8 +33,8 @@
 #include <kpsinglekeytriggersaction.h>
 
 
-// Same as KToggleAction but shows the first single key trigger in the tooltip.
-class kpToolAction : public KToggleAction,
+// Same as TDEToggleAction but shows the first single key trigger in the tooltip.
+class kpToolAction : public TDEToggleAction,
                      public kpSingleKeyTriggersActionInterface
 {
 Q_OBJECT
@@ -42,7 +42,7 @@ Q_OBJECT
 
 public:
     kpToolAction (const TQString &text,
-        const TQString &pic, const KShortcut &shortcut,
+        const TQString &pic, const TDEShortcut &shortcut,
         const TQObject *receiver, const char *slot,
         TQObject *parent, const char *name);
     virtual ~kpToolAction ();
@@ -57,12 +57,12 @@ protected:
 
 
     //
-    // KToggleAction interface
+    // TDEToggleAction interface
     //
 
 public slots:
     virtual void setText (const TQString &text);
-    virtual bool setShortcut (const KShortcut &shortcut);
+    virtual bool setShortcut (const TDEShortcut &shortcut);
 
 
     //
@@ -71,8 +71,8 @@ public slots:
 
 public:
     virtual const char *actionName () const;
-    virtual KShortcut actionShortcut () const;
-    virtual void actionSetShortcut (const KShortcut &shortcut);
+    virtual TDEShortcut actionShortcut () const;
+    virtual void actionSetShortcut (const TDEShortcut &shortcut);
 };
 
 
diff --git a/kolourpaint/tools/kptoolairspray.h b/kolourpaint/tools/kptoolairspray.h
index 44261aeb..e74159ca 100644
--- a/kolourpaint/tools/kptoolairspray.h
+++ b/kolourpaint/tools/kptoolairspray.h
@@ -94,7 +94,7 @@ public:
     virtual void execute ();
     virtual void unexecute ();
 
-    // interface for KToolAirSpray
+    // interface for TDEToolAirSpray
     void addPoints (const TQPointArray &points);
     void finalize ();
     void cancel ();
diff --git a/kolourpaint/tools/kptoolpen.h b/kolourpaint/tools/kptoolpen.h
index 857d1651..9bbcbb37 100644
--- a/kolourpaint/tools/kptoolpen.h
+++ b/kolourpaint/tools/kptoolpen.h
@@ -145,7 +145,7 @@ public:
     virtual void execute ();
     virtual void unexecute ();
 
-    // interface for KToolPen
+    // interface for TDEToolPen
     void updateBoundingRect (const TQPoint &point);
     void updateBoundingRect (const TQRect &rect);
     void finalize ();
-- 
cgit v1.2.1