Additional k => tde renaming and fixes

6 files changed, 12 insertions, 9 deletions

diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES
index e2037e382..c646c13cd 100644
--- a/tdeio/tdefile/NOTES
+++ b/tdeio/tdefile/NOTES
@@ -48,7 +48,7 @@ KFileView's requests to KDirLister's methods.
 
 This class inherits from KFileChooserWidget and adds the file management
 operations. It uses a KFileOperations class (taken from the current
-KonqOperations) for all KIO operations, and it uses KFileUndo, taken from
+KonqOperations) for all TDEIO operations, and it uses KFileUndo, taken from
 the KonqUndo stuff. The popupMenu method is reimplemented to add those
 operations to it.
 
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index f865e2f2d..c0e315359 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -3193,7 +3193,10 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props )
   m_terminalBool = config.readBoolEntry( "Terminal" );
   m_terminalOptionStr = config.readEntry( "TerminalOptions" );
   m_suidBool = config.readBoolEntry( "X-TDE-SubstituteUID" ) || config.readBoolEntry( "X-KDE-SubstituteUID" );
-  m_suidUserStr = config.readEntry( "X-TDE-Username" );
+  if( config.hasKey( "X-TDE-Username" ))
+    m_suidUserStr = config.readEntry( "X-TDE-Username" );
+  else
+    m_suidUserStr = config.readEntry( "X-KDE-Username" );
   if( config.hasKey( "StartupNotify" ))
     m_startupBool = config.readBoolEntry( "StartupNotify", true );
   else
diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h
index 95bf5c5ba..6ce658e18 100644
--- a/tdeio/tdefile/tdediroperator.h
+++ b/tdeio/tdefile/tdediroperator.h
@@ -18,8 +18,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KDIROPERATOR_H_
-#define KDIROPERATOR_H_
+#ifndef TDEDIROPERATOR_H_
+#define TDEDIROPERATOR_H_
 
 #include <tqwidget.h>
 #include <tqptrstack.h>
diff --git a/tdeio/tdefile/tderecentdirs.h b/tdeio/tdefile/tderecentdirs.h
index cc9be16b4..ca1a5bbe2 100644
--- a/tdeio/tdefile/tderecentdirs.h
+++ b/tdeio/tdefile/tderecentdirs.h
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  *
  */
-#ifndef __KRECENTDIRS_H
-#define __KRECENTDIRS_H
+#ifndef __TDERECENTDIRS_H
+#define __TDERECENTDIRS_H
 
 #include <tqstringlist.h>
 
diff --git a/tdeio/tdefile/tderecentdocument.h b/tdeio/tdefile/tderecentdocument.h
index b788c0dc2..a3ee1b6b7 100644
--- a/tdeio/tdefile/tderecentdocument.h
+++ b/tdeio/tdefile/tderecentdocument.h
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  *
  */
-#ifndef __KRECENTDOCUMENT_H
-#define __KRECENTDOCUMENT_H
+#ifndef __TDERECENTDOCUMENT_H
+#define __TDERECENTDOCUMENT_H
 
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/tdeio/tdefile/tests/Makefile.am b/tdeio/tdefile/tests/Makefile.am
index d869f11f5..8f48db918 100644
--- a/tdeio/tdefile/tests/Makefile.am
+++ b/tdeio/tdefile/tests/Makefile.am
@@ -29,7 +29,7 @@ check_PROGRAMS = kfstest kurlrequestertest tdefiletreeviewtest \
 
 METASOURCES = AUTO
 
-LDADD = $(LIB_KIO)
+LDADD = $(LIB_TDEIO)
 kcustommenueditortest_SOURCES = kcustommenueditortest.cpp
 kurlrequestertest_SOURCES = kurlrequestertest.cpp
 kfstest_SOURCES = kfstest.cpp kfdtest.cpp