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

---
 kcontrol/background/bgdialog.h     | 4 ++--
 kcontrol/background/bgrender.cpp   | 2 +-
 kcontrol/background/bgrender.h     | 4 ++--
 kcontrol/background/bgsettings.cpp | 6 +++---
 kcontrol/background/bgsettings.h   | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kcontrol/background')

diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h
index 2a76acd52..08dfe13be 100644
--- a/kcontrol/background/bgdialog.h
+++ b/kcontrol/background/bgdialog.h
@@ -30,7 +30,7 @@
 #include "bgdefaults.h"
 
 class BGMonitorArrangement;
-class KStandardDirs;
+class TDEStandardDirs;
 
 class BGDialog : public BGDialog_UI
 {
@@ -84,7 +84,7 @@ protected slots:
 protected:
    void getEScreen();
    TDEGlobalBackgroundSettings *m_pGlobals;
-   KStandardDirs *m_pDirs;
+   TDEStandardDirs *m_pDirs;
    bool m_multidesktop;
    bool m_useViewports;
    int m_curDesk;
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 9c207e409..ce0dac119 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -990,7 +990,7 @@ void KBackgroundRenderer::saveCacheFile()
     if( m_Image.isNull())
         fullWallpaperBlend(); // generate from m_Pixmap
     TQString f = cacheFileName();
-    if( KStandardDirs::exists( f ) || m_Cached )
+    if( TDEStandardDirs::exists( f ) || m_Cached )
         utime( TQFile::encodeName( f ), NULL );
     else {
         m_Image.save( f, "PNG" );
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index b10f4033c..56317013f 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -27,7 +27,7 @@ class TDEConfig;
 class TDEProcess;
 class KTempFile;
 class KShellProcess;
-class KStandardDirs;
+class TDEStandardDirs;
 
 /**
  * This class renders a desktop background to a TQImage. The operation is
@@ -109,7 +109,7 @@ private:
     TQPixmap m_Pixmap;
     TQTimer *m_pTimer;
 
-    KStandardDirs *m_pDirs;
+    TDEStandardDirs *m_pDirs;
     KShellProcess *m_pProc;
     
 };
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 7bc17a215..b879d1216 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -182,7 +182,7 @@ int KBackgroundPattern::hash()
 /* static */
 TQStringList KBackgroundPattern::list()
 {
-    KStandardDirs *dirs = TDEGlobal::dirs();
+    TDEStandardDirs *dirs = TDEGlobal::dirs();
     dirs->addResourceType("dtop_pattern", dirs->kde_default("data") +
                           "kdesktop/patterns");
     TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop",
@@ -393,7 +393,7 @@ int KBackgroundProgram::hash()
 /* static */
 TQStringList KBackgroundProgram::list()
 {
-    KStandardDirs *dirs = TDEGlobal::dirs();
+    TDEStandardDirs *dirs = TDEGlobal::dirs();
     dirs->addResourceType("dtop_program", dirs->kde_default("data") +
                           "kdesktop/programs");
     TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop",
@@ -651,7 +651,7 @@ void KBackgroundSettings::setWallpaperMode(int mode)
 
 void KBackgroundSettings::setWallpaperList(TQStringList list)
 {
-    KStandardDirs *d = TDEGlobal::dirs();
+    TDEStandardDirs *d = TDEGlobal::dirs();
     if (m_WallpaperList == list)
 	return;
 
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index d007f5753..0e16a87e9 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -17,7 +17,7 @@
 #include <tqvaluevector.h>
 
 template <class TQString, class T> class TQMap;
-class KStandardDirs;
+class TDEStandardDirs;
 class KSimpleConfig;
 class TDEConfig;
 class TQString;
@@ -66,7 +66,7 @@ private:
     int m_Hash;
     TQString m_Name, m_Comment;
     TQString m_Pattern, m_File;
-    KStandardDirs *m_pDirs;
+    TDEStandardDirs *m_pDirs;
     KSimpleConfig *m_pConfig;
 };
 
@@ -137,7 +137,7 @@ private:
     TQString m_Name, m_Command;
     TQString m_PreviewCommand, m_Comment;
     TQString m_Executable, m_File;
-    KStandardDirs *m_pDirs;
+    TDEStandardDirs *m_pDirs;
     KSimpleConfig *m_pConfig;
 };
 
@@ -283,7 +283,7 @@ private:
     TQString m_CurrentWallpaperName;
 
     TDEConfig *m_pConfig;
-    KStandardDirs *m_pDirs;
+    TDEStandardDirs *m_pDirs;
     bool m_bDeleteConfig;
     bool m_bEnabled;
 
-- 
cgit v1.2.1