6 files changed, 17 insertions, 13 deletions
diff --git a/tdesu/CMakeLists.txt b/tdesu/CMakeLists.txt
index 4c33fb0d8..67ee4c645 100644
--- a/tdesu/CMakeLists.txt
+++ b/tdesu/CMakeLists.txt
@@ -40,6 +40,8 @@ else()
 endif()
 
 check_function_exists( getpeereid HAVE_GETPEEREID )
+check_function_exists( getpeerucred HAVE_GETPEERUCRED )
+
 check_include_file( "sys/select.h" HAVE_SYS_SELECT_H )
 check_include_file( "sys/wait.h" HAVE_SYS_WAIT_H )
 
diff --git a/tdesu/ChangeLog b/tdesu/ChangeLog
index f9bd05eb5..3d01f2e01 100644
--- a/tdesu/ChangeLog
+++ b/tdesu/ChangeLog
@@ -50,7 +50,7 @@ Wed, 8 Sep 99    Geert Jansen <g.t.jansen@stud.tue.nl>
 
 Wed, 1 Sep 99    Geert Jansen <g.t.jansen@stud.tue.nl>
 
-    * Deferred instantiation of kapp in tdesu.cpp.
+    * Deferred instantiation of tdeApp in tdesu.cpp.
     * Finished porting to KDE2.
 
 Sun, 29 Aug 99    Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/tdesu/tdesu/sudlg.h b/tdesu/tdesu/sudlg.h
index 2cc8dbe7e..669eea8e7 100644
--- a/tdesu/tdesu/sudlg.h
+++ b/tdesu/tdesu/sudlg.h
@@ -12,7 +12,7 @@
 class TDEsuDialog
     : public KPasswordDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index b36b0513b..b5c75471d 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
     
     {
         TDEStartupInfoId id;
-        id.initId( kapp->startupId());
+        id.initId( tdeApp->startupId());
         id.setupStartupEnv(); // make DESKTOP_STARTUP_ID env. var. available again
     }
 
@@ -272,7 +272,7 @@ static int startApp()
     
     QCStringList env;
     TQCString options;
-    env << ( "DESKTOP_STARTUP_ID=" + kapp->startupId());
+    env << ( "DESKTOP_STARTUP_ID=" + tdeApp->startupId());
     
     if (pw->pw_uid)
     {
@@ -348,7 +348,7 @@ static int startApp()
     if (needpw)
     {
         TDEStartupInfoId id;
-        id.initId( kapp->startupId());
+        id.initId( tdeApp->startupId());
         TDEStartupInfoData data;
         data.setSilent( TDEStartupInfoData::Yes );
         TDEStartupInfo::sendChange( id, data );
@@ -380,7 +380,7 @@ static int startApp()
     }
 
     // Some events may need to be handled (like a button animation)
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // Run command
     if (!change_uid)
diff --git a/tdesu/tdesud/secure.cpp b/tdesu/tdesud/secure.cpp
index dd778575e..e6a6c65c8 100644
--- a/tdesu/tdesud/secure.cpp
+++ b/tdesu/tdesud/secure.cpp
@@ -63,12 +63,12 @@ SocketSecurity::SocketSecurity(int sockfd)
 
 SocketSecurity::SocketSecurity(int sockfd)
 {
-    static bool warned_him = FALSE;
+    static bool warned_him = false;
 
     if (!warned_him) {
         kdWarning() << "Using void socket security. Please add support for your" << endl;
         kdWarning() << "platform to tdesu/tdesud/secure.cpp" << endl;
-        warned_him = TRUE;
+        warned_him = true;
     }
 
     // This passes the test made in handler.cpp
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index d463a400a..8bef2cfac 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -45,7 +45,8 @@
 #include <pwd.h>
 #include <errno.h>
 
-#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) &&\
+	!defined(Q_OS_SOLARIS)
 #include <sys/prctl.h>
 #endif
 #include <sys/time.h>
@@ -63,11 +64,11 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaboutdata.h>
 #include <tdesu/client.h>
 #include <tdesu/defaults.h>
@@ -251,7 +252,8 @@ int create_socket()
 
 int main(int argc, char *argv[])
 {
-#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) &&\
+	!defined(Q_OS_SOLARIS)
     prctl(PR_SET_DUMPABLE, 0);
 #endif