Replace obsolete kstddirs.h with kstandarddirs.h

Signed-off-by: Michele Calgaro <[email protected]>

7 files changed, 9 insertions, 9 deletions

diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in
index 7ecda35e7..2597fddcc 100644
--- a/tdecore/configure.in.in
+++ b/tdecore/configure.in.in
@@ -1,4 +1,4 @@
-dnl Compile in the exec prefix to help kstddirs in finding dynamic libs
+dnl Compile in the exec prefix to help kstandarddirs in finding dynamic libs
 AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading])
 
 dnl Compile in kde_bindir to safely find tdesu_stub.
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index b7d41d136..8a0b59c5f 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -441,7 +441,7 @@ TQString TDEStandardDirs::findResourceDir( const char *type,
 
 #ifndef NDEBUG
     if(false && strcmp(type, "locale"))
-      fprintf(stderr, "KStdDirs::findResDir(): can't find \"%s\" in type \"%s\".\n", filename.ascii(), type);
+      fprintf(stderr, "TDEStandardDirs::findResourceDir(): can't find \"%s\" in type \"%s\".\n", filename.ascii(), type);
 #endif
 
     return TQString::null;
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index e40f7617f..79085dce1 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -20,8 +20,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifndef SSK_KSTDDIRS_H
-#define SSK_KSTDDIRS_H
+#ifndef _KSTANDARDDIRS_H
+#define _KSTANDARDDIRS_H
 
 #include <tqstring.h>
 #include <tqdict.h>
@@ -726,4 +726,4 @@ TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename,
 
 /*! @} */
 
-#endif // SSK_KSTDDIRS_H
+#endif // _KSTANDARDDIRS_H
diff --git a/tdecore/tests/CMakeLists.txt b/tdecore/tests/CMakeLists.txt
index e79dbfdeb..f4e8ae33c 100644
--- a/tdecore/tests/CMakeLists.txt
+++ b/tdecore/tests/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_library( tdeconfigtest SHARED AUTOMOC
 )
 
 set( CHECKS
-  tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest kstddirstest
+  tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest kstandarddirstest
   tdeuniqueapptest ktempfiletest krandomsequencetest kdebugtest
   ksocktest kstringhandlertest kcmdlineargstest tdeapptest kmemtest
   dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index cbf12cb2c..53b611efc 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/tdecore $(all_includes)
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 
 check_PROGRAMS = tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest \
-	kstddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \
+	kstandarddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \
 	kdebugtest ksocktest kstringhandlertest kcmdlineargstest tdeapptest \
 	kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \
 	cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
@@ -45,7 +45,7 @@ klocaletest_SOURCES = klocaletest.cpp
 #kcatalogue_SOURCES = kcatalogue.cpp libintl.cpp
 ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp
 kurltest_SOURCES = kurltest.cpp
-kstddirstest_SOURCES = kstddirstest.cpp
+kstandarddirstest_SOURCES = kstandarddirstest.cpp
 tdeprocesstest_SOURCES = tdeprocesstest.cpp
 tdeuniqueapptest_SOURCES = tdeuniqueapptest.cpp
 tdeapptest_SOURCES = tdeapptest.cpp
diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstandarddirstest.cpp
index ae6ea16bd..ae6ea16bd 100644
--- a/tdecore/tests/kstddirstest.cpp
+++ b/tdecore/tests/kstandarddirstest.cpp
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index aefa73192..f5cea7644 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -27,7 +27,7 @@
 #include <tdediroperator.h> 
 #include <tdelistview.h>
 #include <tdelocale.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 #include <tdetempfile.h> 
 #include <netaccess.h>