Branch: r14.0.x

0b309fbf 2018-08-14 11:31:58 gregory guy 
the typedef specifier gets ignored in the declaration anyway.

(cherry picked from commit cdd90c2c88a8569f67e4606a00e5277257928a76)
M kuser/editDefaults.h

kuser/editDefaults.h

diff --git a/kuser/editDefaults.h b/kuser/editDefaults.h
index c85fc3f..55e77c8 100644
--- a/kuser/editDefaults.h
+++ b/kuser/editDefaults.h
@@ -31,7 +31,7 @@
 namespace TDEABC { class LdapConfigWidget; }
 namespace TDEIO { class Job; }
 
-typedef struct SambaDomain {
+struct SambaDomain {
   TQString name;
   TQString sid;
   uint ridbase;
29482e7e 2018-08-14 11:32:21 gregory guy 
According to the doc, TDEIO::NetAccess::del should have two parameters

(cherry picked from commit 4a9ff636bfab18568bafe4f3d06e91108e078705)
M kuser/kuser.cpp

kuser/kuser.cpp

diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index d0d7f4d..ffe24f1 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -748,7 +748,7 @@
 
   if (!stat(TQFile::encodeName(p_dir), &sb))
     if (S_ISDIR(sb.st_mode) && sb.st_uid == p_uid) {
-      if (!TDEIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) {
+      if (!TDEIO::NetAccess::del(KURL::fromPathOrURL(p_dir), NULL)) {
              KMessageBox::error( 0, i18n("Cannot remove home folder %1.\nError: %2")
                        .arg(p_dir).arg(TDEIO::NetAccess::lastErrorString()) );
       }