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

---
 tdeui/kcmodule.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tdeui/kcmodule.h')

diff --git a/tdeui/kcmodule.h b/tdeui/kcmodule.h
index bba06ae4a..c237ad163 100644
--- a/tdeui/kcmodule.h
+++ b/tdeui/kcmodule.h
@@ -29,11 +29,11 @@
 
 class TQStringList;
 
-class KAboutData;
+class TDEAboutData;
 class KConfigDialogManager;
 class KConfigSkeleton;
 class KCModulePrivate;
-class KInstance;
+class TDEInstance;
 
 /**
  * The base class for control center modules.
@@ -91,7 +91,7 @@ public:
    */
   KCModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() );
 
-  KCModule(KInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
+  KCModule(TDEInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
 
   /*
    * Destroys the module.
@@ -182,15 +182,15 @@ public:
    * If you override you should  have it return a pointer to a constant.
    *
    *
-   * @returns the KAboutData for this module
+   * @returns the TDEAboutData for this module
    */
-  virtual const KAboutData *aboutData() const;
+  virtual const TDEAboutData *aboutData() const;
   
   /**
-   * This sets the KAboutData returned by aboutData()
+   * This sets the TDEAboutData returned by aboutData()
    * @since 3.3
    */
-   void setAboutData( KAboutData* about );
+   void setAboutData( TDEAboutData* about );
 
   /**
    * Indicate which buttons will be used.
@@ -228,7 +228,7 @@ public:
    */
   bool useRootOnlyMsg() const;
 
-  KInstance *instance() const;
+  TDEInstance *instance() const;
 
   /**
    * @return a list of @ref KConfigDialogManager's in use, if any.
-- 
cgit v1.2.1