From ebcececd59218997957afe1ef40f9514d22db99e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 31 Jan 2013 13:24:50 -0600
Subject: Rename KStandard for enhanced compatibility with KDE4

---
 sip/tdecore/kglobal.sip     | 2 +-
 sip/tdecore/kiconloader.sip | 4 ++--
 sip/tdecore/kinstance.sip   | 2 +-
 sip/tdecore/kstddirs.sip    | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sip/tdecore')

diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip
index 59515a3..97be5df 100644
--- a/sip/tdecore/kglobal.sip
+++ b/sip/tdecore/kglobal.sip
@@ -33,7 +33,7 @@ class TDEGlobal
 
 public:
     static TDEInstance*    instance ();
-    static KStandardDirs* dirs ();
+    static TDEStandardDirs* dirs ();
     static TDEConfig*      config ();
 
 %If ( KDE_3_2_0 -  )
diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip
index 5cc9a18..990725d 100644
--- a/sip/tdecore/kiconloader.sip
+++ b/sip/tdecore/kiconloader.sip
@@ -32,7 +32,7 @@ class KIconLoader
 
 
 public:
-                         KIconLoader (const TQString& = TQString ::null , KStandardDirs* = 0);
+                         KIconLoader (const TQString& = TQString ::null , TDEStandardDirs* = 0);
     void                 addAppDir (const TQString&);
     TQPixmap              loadIcon (const TQString&, KIcon::Group, int = 0, int = KIcon ::DefaultState , TQString* = 0, bool = 0) const;
 
@@ -60,7 +60,7 @@ public:
     int                  currentSize (KIcon::Group) const;
     KIconTheme*          theme ();
     KIconEffect*         iconEffect ();
-    void                 reconfigure (const TQString&, KStandardDirs*);
+    void                 reconfigure (const TQString&, TDEStandardDirs*);
     static TQPixmap       unknown ();
     bool                 alphaBlending (KIcon::Group) const;
 
diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip
index a32a074..94a23c3 100644
--- a/sip/tdecore/kinstance.sip
+++ b/sip/tdecore/kinstance.sip
@@ -35,7 +35,7 @@ public:
                          TDEInstance (const TQCString&);
                          TDEInstance (const TDEAboutData*);
                          TDEInstance (TDEInstance*);
-    KStandardDirs*       dirs () const;
+    TDEStandardDirs*       dirs () const;
     TDEConfig*             config () const;
 
 %If ( KDE_3_2_0 -  )
diff --git a/sip/tdecore/kstddirs.sip b/sip/tdecore/kstddirs.sip
index 005b8fe..576b7f9 100644
--- a/sip/tdecore/kstddirs.sip
+++ b/sip/tdecore/kstddirs.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KStandardDirs
+class TDEStandardDirs
 {
 %TypeHeaderCode
 #include <kstddirs.h>
@@ -32,7 +32,7 @@ class KStandardDirs
 
 
 public:
-                         KStandardDirs ();
+                         TDEStandardDirs ();
     void                 addPrefix (const TQString&);
     bool                 addResourceType (const char*, const TQString&);
     bool                 addResourceDir (const char*, const TQString&);
@@ -56,9 +56,9 @@ public:
     static bool          exists (const TQString&);
 
 private:
-                         KStandardDirs (const KStandardDirs&);
+                         TDEStandardDirs (const TDEStandardDirs&);
 
-};  // class KStandardDirs
+};  // class TDEStandardDirs
 
 
 %ModuleCode
-- 
cgit v1.2.1