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

---
 src/kreplacements/kreplacements.cpp | 4 ++--
 src/kreplacements/kreplacements.h   | 2 +-
 src/main.cpp                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index 3aad865..fae9723 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -423,7 +423,7 @@ void KMainWindow::slotHelp()
 }
 
 
-TQString KStandardDirs::findResource(const TQString& resource, const TQString& /*appName*/)
+TQString TDEStandardDirs::findResource(const TQString& resource, const TQString& /*appName*/)
 {
    if (resource=="config")
    {
@@ -445,7 +445,7 @@ void TDEConfig::readConfigFile( const TQString& configFileName )
    }
    else
    {
-      m_fileName = KStandardDirs().findResource("config","kdiff3rc");
+      m_fileName = TDEStandardDirs().findResource("config","kdiff3rc");
    }
 
    TQFile f( m_fileName );
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index dae652f..b3bcfaf 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -310,7 +310,7 @@ public:
    void setPageSelection(e_PageSelection);
 };
 
-class KStandardDirs
+class TDEStandardDirs
 {
 public:
    TQString findResource(const TQString& resource, const TQString& appName);
diff --git a/src/main.cpp b/src/main.cpp
index 429dc2a..e3a163c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -65,7 +65,7 @@ static KCmdLineOptions options2[] =
 void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, TQStringList& ignorableOptions)
 {
    vOptions.insert( vOptions.end(), options, (KCmdLineOptions*)((char*)options+sizeof(options)));
-   TQString configFileName = KStandardDirs().findResource("config","kdiff3rc");
+   TQString configFileName = TDEStandardDirs().findResource("config","kdiff3rc");
    TQFile configFile( configFileName );
    if ( configFile.open( IO_ReadOnly ) )
    {
-- 
cgit v1.2.3