From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:21:02 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kio/kfile/kpropertiesdialog.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'kio/kfile/kpropertiesdialog.h')

diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h
index 91439f8cc..d6a8223dd 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/kio/kfile/kpropertiesdialog.h
@@ -878,15 +878,15 @@ private:
  * @deprecated replaced with KDesktopPropsPlugin
  */
  /// Remove in KDE4
-class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin
+class KIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
   /**
    * Constructor
    */
-  KApplicationPropsPlugin( KPropertiesDialog *_props );
-  virtual ~KApplicationPropsPlugin();
+  TDEApplicationPropsPlugin( KPropertiesDialog *_props );
+  virtual ~TDEApplicationPropsPlugin();
 
   virtual void applyChanges();
 
@@ -910,8 +910,8 @@ private:
   TQPushButton *addExtensionButton;
   TQPushButton *delExtensionButton;
 
-  class KApplicationPropsPluginPrivate;
-  KApplicationPropsPluginPrivate *d;
+  class TDEApplicationPropsPluginPrivate;
+  TDEApplicationPropsPluginPrivate *d;
 };
 
 #endif
-- 
cgit v1.2.3