Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

8 files changed, 16 insertions, 16 deletions

diff --git a/tdesu/Makefile.am b/tdesu/Makefile.am
index 926f3df5d..beec69d29 100644
--- a/tdesu/Makefile.am
+++ b/tdesu/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for libtdesu
 
-INCLUDES = -I$(top_srcdir)/kio/ $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio/ $(all_includes)
 
 lib_LTLIBRARIES = libtdesu.la
 libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp tdesu_pty.cpp
diff --git a/tdesu/client.cpp b/tdesu/client.cpp
index cbdc640e6..91e922250 100644
--- a/tdesu/client.cpp
+++ b/tdesu/client.cpp
@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kde_file.h>
 
 #include "client.h"
@@ -389,7 +389,7 @@ static TQString findDaemon()
 {
     TQString daemon = locate("bin", "tdesud");
     if (daemon.isEmpty()) // if not in TDEDIRS, rely on PATH
-	daemon = KStandardDirs::findExe("tdesud");
+	daemon = TDEStandardDirs::findExe("tdesud");
 
     if (daemon.isEmpty())
     {
diff --git a/tdesu/kcookie.cpp b/tdesu/kcookie.cpp
index 99b34ec4e..f5a2d547c 100644
--- a/tdesu/kcookie.cpp
+++ b/tdesu/kcookie.cpp
@@ -100,7 +100,7 @@ void KCookie::getXCookie()
     if (!memcmp(disp.data(), "localhost:", 10))
        disp.remove(0, 9);
 
-    TQString cmd = "xauth list "+KProcess::quote(disp);
+    TQString cmd = "xauth list "+TDEProcess::quote(disp);
     blockSigChild(); // pclose uses waitpid()
     if (!(f = popen(TQFile::encodeName(cmd), "r"))) 
     {
@@ -163,7 +163,7 @@ void KCookie::getICECookie()
         if (strncmp((*it).data(), m_dcopTransport.data(), m_dcopTransport.length()) != 0)
             continue;
         m_DCOPSrv = *it;
-	TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(KProcess::quote(m_DCOPSrv));
+	TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(TDEProcess::quote(m_DCOPSrv));
 	blockSigChild();
 	if (!(f = popen(cmd, "r")))
 	{
diff --git a/tdesu/process.cpp b/tdesu/process.cpp
index 692c01553..28e3bb110 100644
--- a/tdesu/process.cpp
+++ b/tdesu/process.cpp
@@ -48,7 +48,7 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
@@ -74,7 +74,7 @@ int PtyProcess::waitMS(int fd,int ms)
 */
 bool PtyProcess::checkPid(pid_t pid)
 {
-	KConfig* config = KGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup("super-user-command");
 	TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
 	//sudo does not accept signals from user so we except it
@@ -375,7 +375,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
         path = command;
     else 
     {
-        TQString file = KStandardDirs::findExe(command);
+        TQString file = TDEStandardDirs::findExe(command);
         if (file.isEmpty()) 
         {
             kdError(900) << k_lineinfo << command << " not found\n"; 
diff --git a/tdesu/ssh.cpp b/tdesu/ssh.cpp
index f45b38e7e..c23ca459b 100644
--- a/tdesu/ssh.cpp
+++ b/tdesu/ssh.cpp
@@ -32,7 +32,7 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "ssh.h"
diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp
index f5b435b40..4cd5864de 100644
--- a/tdesu/stub.cpp
+++ b/tdesu/stub.cpp
@@ -20,7 +20,7 @@
 #include <tqcstring.h>
 #include <kdatastream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 
diff --git a/tdesu/su.cpp b/tdesu/su.cpp
index c4e75772e..e29288ab9 100644
--- a/tdesu/su.cpp
+++ b/tdesu/su.cpp
@@ -33,9 +33,9 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "su.h"
@@ -55,7 +55,7 @@ SuProcess::SuProcess(const TQCString &user, const TQCString &command)
     m_User = user;
     m_Command = command;
 
-    KConfig* config = KGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup("super-user-command");
     superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
     if ( superUserCommand != "sudo" && superUserCommand != "su" ) {
@@ -128,8 +128,8 @@ int SuProcess::exec(const char *password, int check)
  
     if (::access(command, X_OK) != 0)
     {
-      ///        command = TQFile::encodeName(KGlobal::dirs()->findExe("su"));
-        command = TQFile::encodeName( KGlobal::dirs()->findExe(superUserCommand.ascii()) );
+      ///        command = TQFile::encodeName(TDEGlobal::dirs()->findExe("su"));
+        command = TQFile::encodeName( TDEGlobal::dirs()->findExe(superUserCommand.ascii()) );
         if (command.isEmpty())
             return check ? SuNotFound : -1;
     }
diff --git a/tdesu/tdesu_pty.cpp b/tdesu/tdesu_pty.cpp
index d3392ec5e..207c0a3e2 100644
--- a/tdesu/tdesu_pty.cpp
+++ b/tdesu/tdesu_pty.cpp
@@ -214,7 +214,7 @@ int PTY::grantpt()
 	return 0;
 
     // Use konsole_grantpty:
-    if (KStandardDirs::findExe("konsole_grantpty").isEmpty())
+    if (TDEStandardDirs::findExe("konsole_grantpty").isEmpty())
     {
 	kdError(900) << k_lineinfo << "konsole_grantpty not found.\n";
 	return -1;