Rename KStandard for enhanced compatibility with KDE4

11 files changed, 18 insertions, 18 deletions

diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index bf56dbd3..a6a9fd8c 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -199,7 +199,7 @@ TDEAboutData* KLinkStatusPart::createAboutData()
     about->addCredit("Mathieu Kooiman", 0, " quanta@map-is.nl");
     about->addCredit("Jens Herden", 0, "jens@tdewebdev.org");
 
-    TDEGlobal::dirs()->addResourceType("appicon", KStandardDirs::kde_default("data") + "klinkstatuspart/pics/");
+    TDEGlobal::dirs()->addResourceType("appicon", TDEStandardDirs::kde_default("data") + "klinkstatuspart/pics/");
 
     return about;
 }
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
index 9d516298..64b918d8 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
@@ -128,7 +128,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry )
 {
   TQString file = destinationPath(entry);
 
-  if ( KStandardDirs::exists( file ) ) {
+  if ( TDEStandardDirs::exists( file ) ) {
     int result = KMessageBox::warningContinueCancel( parentWidget(),
         i18n("The file '%1' already exists. Do you want to override it?")
         .arg( file ),
diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp
index 32c58bc1..3ea0b78e 100644
--- a/quanta/parts/kafka/htmlenhancer.cpp
+++ b/quanta/parts/kafka/htmlenhancer.cpp
@@ -39,7 +39,7 @@ HTMLEnhancer::HTMLEnhancer(KafkaDocument *_wkafkapart)
 {
 	m_showIconForScripts = true;
 	m_wkafkapart = _wkafkapart;
-	m_stddirs = new KStandardDirs();
+	m_stddirs = new TDEStandardDirs();
 }
 
 HTMLEnhancer::~HTMLEnhancer()
diff --git a/quanta/parts/kafka/htmlenhancer.h b/quanta/parts/kafka/htmlenhancer.h
index 9fdc8658..0bf0e020 100644
--- a/quanta/parts/kafka/htmlenhancer.h
+++ b/quanta/parts/kafka/htmlenhancer.h
@@ -25,7 +25,7 @@
 class TDEConfig;
 class Node;
 class KafkaDocument;
-class KStandardDirs;
+class TDEStandardDirs;
 
 /**
  * This class takes care of the following tasks for [X]HTML DTDs :
@@ -99,7 +99,7 @@ private:
 	KURL m_baseURL;
 	bool m_showIconForScripts;
 	KafkaDocument *m_wkafkapart;
-	KStandardDirs *m_stddirs;
+	TDEStandardDirs *m_stddirs;
 };
 
 #endif
diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp
index 03a7a0f6..c8517556 100644
--- a/quanta/parts/kafka/wkafkapart.cpp
+++ b/quanta/parts/kafka/wkafkapart.cpp
@@ -95,7 +95,7 @@ TQString ab = i18n("Ident all");
 	mainEnhancer =  new HTMLEnhancer(this);
 	domNodeProps.setAutoDelete(false);
 
-	KStandardDirs *m_stddirs = new KStandardDirs();
+	TDEStandardDirs *m_stddirs = new TDEStandardDirs();
 	TQFile file( m_stddirs->findResource("data", "kafkapart/entities" )/**locate("appdata","chars") */);
 	delete m_stddirs;
 	TQString tmp;
diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp
index 12bab9c6..b52f02f6 100644
--- a/quanta/plugins/quantaplugin.cpp
+++ b/quanta/plugins/quantaplugin.cpp
@@ -101,7 +101,7 @@ bool QuantaPlugin::load()
   TQString loc = location();
   if(loc.isEmpty())
   {
-    KStandardDirs *dirs = QuantaCommon::pluginDirs("lib");
+    TDEStandardDirs *dirs = QuantaCommon::pluginDirs("lib");
     loc = dirs->findResource("lib", fileName());
     delete dirs;
   }
@@ -267,7 +267,7 @@ bool QuantaPlugin::validatePluginInfo(const TQString & /*a_name*/,
   {
     if (valid)
     {
-      KStandardDirs *dirs = QuantaCommon::pluginDirs("lib");
+      TDEStandardDirs *dirs = QuantaCommon::pluginDirs("lib");
       if(dirs->findResource("lib", a_fileName).isNull())
         valid = false;
       delete dirs;
diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi
index 48793fe8..365a7cae 100644
--- a/quanta/quanta_uml.xmi
+++ b/quanta/quanta_uml.xmi
@@ -336,7 +336,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="347" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="348" value="" type="const QString" abstract="0" documentation="" name="s" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="349" type="KStandardDirs *" abstract="0" documentation="" name="pluginDirs" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="349" type="TDEStandardDirs *" abstract="0" documentation="" name="pluginDirs" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="350" value="" type="const char *" abstract="0" documentation="" name="type" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="351" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="qUrl" static="0" scope="200" >
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index dee83bca..8b3e34f0 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -2268,7 +2268,7 @@ void Document::checkDirtyStatus()
     {
       DirtyDlg *dlg = new DirtyDlg(url().path(), m_tempFileName, false, this);
       DirtyDialog *w = static_cast<DirtyDialog*>(dlg->mainWidget());
-      TQString kompareStr = KStandardDirs::findExe("kompare");
+      TQString kompareStr = TDEStandardDirs::findExe("kompare");
       if (kompareStr.isEmpty())
       {
         w->buttonCompare->setEnabled(false);
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 48f106b0..08b73763 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -1177,7 +1177,7 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
           w->warningLabel = 0L;
           w->setMinimumHeight(320);
           dlg->adjustSize();
-          if (KStandardDirs::findExe("kompare").isEmpty() || isUntitledDocument)
+          if (TDEStandardDirs::findExe("kompare").isEmpty() || isUntitledDocument)
           {
             w->buttonCompare->setEnabled(false);
             w->buttonLoad->setChecked(true);
@@ -1469,7 +1469,7 @@ void QuantaInit::checkRuntimeDependencies()
     dependency = *it;
     if (dependency.type == Dependency::Executable)
     {
-      if (KStandardDirs::findExe(dependency.execName).isNull())
+      if (TDEStandardDirs::findExe(dependency.execName).isNull())
         errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description);
 
     } else
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index e7f9380d..db1ce345 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -287,12 +287,12 @@ int eCol){
  return pos;
 }
 
-/** Returns a pointer to a KStandardDirs object usable for plugin searchup. type
+/** Returns a pointer to a TDEStandardDirs object usable for plugin searchup. type
 is the plugin binary type (exe or lib). The returned pointer must be deleted by
 the caller!! */
-KStandardDirs* QuantaCommon::pluginDirs(const char *type)
+TDEStandardDirs* QuantaCommon::pluginDirs(const char *type)
 {
- KStandardDirs *dirs = new KStandardDirs();
+ TDEStandardDirs *dirs = new TDEStandardDirs();
  dirs->addKDEDefaults();
  for (uint i = 0; i < qConfig.pluginSearchPaths.count(); i++)
  {
diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h
index 586b7e50..4553da9c 100644
--- a/quanta/utility/quantacommon.h
+++ b/quanta/utility/quantacommon.h
@@ -31,7 +31,7 @@
 class TQString;
 class DCOPReply;
 class KURL;
-class KStandardDirs;
+class TDEStandardDirs;
 class TQWidget;
 class Tag;
 
@@ -148,9 +148,9 @@ quotation setting*/
   /** Returns 0 if the (line,col) is inside the area specified by the other arguments,
       -1 if it is before the area and 1 if it is after. */
   static int isBetween(int line, int col, int bLine, int bCol, int eLine, int eCol);
-  /** Returns a pointer to a KStandardDirs object usable for plugin searchup. type is the plugin binary type (exe or lib). The returned
+  /** Returns a pointer to a TDEStandardDirs object usable for plugin searchup. type is the plugin binary type (exe or lib). The returned
 pointer must be deleted by the caller!! */
-  static KStandardDirs* pluginDirs(const char *type);
+  static TDEStandardDirs* pluginDirs(const char *type);
 
   /** Return true, if the url has the mimetype starting with type. */
   static bool checkMimeGroup(const KURL& url, const TQString& type);