Enable the modernize-deprecated-headers check on clang-tidy

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>

diff --git a/.clang-tidy b/.clang-tidy
index 203c6393c547c76ba1a6edb91444ade582ef2328..59e5956ea3e90f4b1eb7e5c476f84d35f5f9fbf0 100644 (file)
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -2,6 +2,7 @@ Checks: '-*,
     cppcoreguidelines-init-variables,
     modernize-avoid-bind,
     modernize-concat-nested-namespaces,
+    modernize-deprecated-headers,
     modernize-deprecated-ios-base-aliases,
     modernize-make-*,
     modernize-raw-string-literal,

diff --git a/src/3rdparty/qtlockedfile/qtlockedfile_unix.cpp b/src/3rdparty/qtlockedfile/qtlockedfile_unix.cpp
index 171178b5f113e97c4a37929de69f5fcfffd45774..d7460374fec47806b8ce873e427ac67cdc16881a 100644 (file)
--- a/src/3rdparty/qtlockedfile/qtlockedfile_unix.cpp
+++ b/src/3rdparty/qtlockedfile/qtlockedfile_unix.cpp
@@ -29,8 +29,8 @@
 
 #include "qtlockedfile.h"
 
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 #include <unistd.h>
 #include <fcntl.h>
 

diff --git a/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
index c563e2f2864d756e84cc59c63739c593b84540dd..8e652612bebbaf9e736e676d7defd733ddc2354c 100644 (file)
--- a/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
+++ b/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
@@ -41,7 +41,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
 #endif
 
 #if defined(Q_OS_UNIX)
-#include <time.h>
+#include <ctime>
 #include <unistd.h>
 #endif
 

diff --git a/src/common/c_jhash.h b/src/common/c_jhash.h
index e765a3767321435a075c34a608337993d390323c..47c9e64c726fd26cbea2c8e7a5821f89d1d07241 100644 (file)
--- a/src/common/c_jhash.h
+++ b/src/common/c_jhash.h
@@ -24,7 +24,7 @@
 #ifndef _C_JHASH_H
 #define _C_JHASH_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #define c_hashsize(n) ((uint8_t) 1 << (n))
 #define c_hashmask(n) (xhashsize(n) - 1)

diff --git a/src/common/utility.cpp b/src/common/utility.cpp
index 519bfc022cb1bb0f6c6352c310559b63e2397f33..29b43cb5928ba2bf057901ad533408e5f80b6aa7 100644 (file)
--- a/src/common/utility.cpp
+++ b/src/common/utility.cpp
@@ -44,8 +44,8 @@
 #include <unistd.h>
 #endif
 
-#include <math.h>
-#include <stdarg.h>
+#include <cmath>
+#include <cstdarg>
 #include <cstring>
 
 #if defined(Q_OS_WIN)

diff --git a/src/csync/csync.cpp b/src/csync/csync.cpp
index ea2dcc69b8a6c4e3e398c4d729413b5e021d1025..05fe052172caec2f197bab93d75efc91f85064c6 100644 (file)
--- a/src/csync/csync.cpp
+++ b/src/csync/csync.cpp
@@ -25,13 +25,13 @@
 #define _GNU_SOURCE
 #endif
 
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
 #include <sys/types.h>
-#include <stdbool.h>
+
 
 #include "c_lib.h"
 #include "csync_private.h"

diff --git a/src/csync/csync.h b/src/csync/csync.h
index 3e2158348987d0eba9c7d0038622e66bf5b7773f..fb9f4682d180cdcdfe2f6346217167a9a055e59e 100644 (file)
--- a/src/csync/csync.h
+++ b/src/csync/csync.h
@@ -36,8 +36,8 @@
 #include "ocsynclib.h"
 
 #include <sys/stat.h>
-#include <stdbool.h>
-#include <stdint.h>
+
+#include <cstdint>
 #include <sys/types.h>
 #include <config_csync.h>
 #include <functional>

diff --git a/src/csync/csync_macros.h b/src/csync/csync_macros.h
index 8bb3ae70707c384c2a08dbf0d5d70ad5ea72dcfa..0f505ec42db874b9887213bba0978eae33b7467a 100644 (file)
--- a/src/csync/csync_macros.h
+++ b/src/csync/csync_macros.h
@@ -22,8 +22,8 @@
 #ifndef _CSYNC_MACROS_H
 #define _CSYNC_MACROS_H
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 /* How many elements there are in a static array */
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))

diff --git a/src/csync/csync_misc.cpp b/src/csync/csync_misc.cpp
index 5bdb4ba29d8eea440a9c7ea6333db6cb579dc60a..1f4f1cc75c6cb69030fa1314dcaf251a5c311846 100644 (file)
--- a/src/csync/csync_misc.cpp
+++ b/src/csync/csync_misc.cpp
@@ -25,12 +25,12 @@
 #define _GNU_SOURCE
 #endif
 
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <climits>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include <sys/types.h>
-#include <errno.h>
+#include <cerrno>
 
 #if _WIN32
 # ifndef _WIN32_IE

diff --git a/src/csync/csync_private.h b/src/csync/csync_private.h
index d62031ed5c0fe08bb0210472253c4321d4de74eb..2345025d21d57e5f34ab88a3f99a3582a77d44b4 100644 (file)
--- a/src/csync/csync_private.h
+++ b/src/csync/csync_private.h
@@ -34,8 +34,8 @@
 
 #include <unordered_map>
 #include <QHash>
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
+
 #include <map>
 #include <set>
 #include <functional>

diff --git a/src/csync/csync_reconcile.cpp b/src/csync/csync_reconcile.cpp
index 7b664addddd294c8fba1f4aaf906a2b2c50d7539..3ea1efb647eb2dadebd38ab0fb5bdce33a61c98b 100644 (file)
--- a/src/csync/csync_reconcile.cpp
+++ b/src/csync/csync_reconcile.cpp
@@ -20,7 +20,7 @@
 
 #include "config_csync.h"
 
-#include <assert.h>
+#include <cassert>
 #include "csync_private.h"
 #include "csync_reconcile.h"
 #include "csync_util.h"
@@ -34,7 +34,7 @@ Q_LOGGING_CATEGORY(lcReconcile, "nextcloud.sync.csync.reconciler", QtInfoMsg)
 
 // Needed for PRIu64 on MinGW in C++ mode.
 #define __STDC_FORMAT_MACROS
-#include "inttypes.h"
+#include <cinttypes>
 
 /* Check if a file is ignored because one parent is ignored.
  * return the node of the ignored directoy if it's the case, or \c nullptr if it is not ignored */

diff --git a/src/csync/csync_update.cpp b/src/csync/csync_update.cpp
index f6f029ca6d4e844292f353116a73891ab2a1b239..d90a1059a5bed864630c0e5977ae7adb7b48571e 100644 (file)
--- a/src/csync/csync_update.cpp
+++ b/src/csync/csync_update.cpp
@@ -25,11 +25,11 @@
 #define _GNU_SOURCE
 #endif
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <cmath>
 
 #include "c_lib.h"
 
@@ -50,7 +50,7 @@
 
 // Needed for PRIu64 on MinGW in C++ mode.
 #define __STDC_FORMAT_MACROS
-#include <inttypes.h>
+#include <cinttypes>
 
 Q_LOGGING_CATEGORY(lcUpdate, "nextcloud.sync.csync.updater", QtInfoMsg)
 

diff --git a/src/csync/csync_util.cpp b/src/csync/csync_util.cpp
index d697070dc89f2c901117edca69affbf506dd4307..1daedafcede57e9238f807d65d7bdd3f427495f6 100644 (file)
--- a/src/csync/csync_util.cpp
+++ b/src/csync/csync_util.cpp
@@ -25,10 +25,10 @@
 #define _GNU_SOURCE
 #endif
 
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <time.h>
+#include <cerrno>
+#include <climits>
+#include <cstdio>
+#include <ctime>
 
 #include "common/c_jhash.h"
 #include "csync_util.h"

diff --git a/src/csync/csync_util.h b/src/csync/csync_util.h
index 187ecf7f889dc459cdb3148896bdd6394d756c10..bef83b54d96b134a170148faa1d1cf0a6e4dbaa8 100644 (file)
--- a/src/csync/csync_util.h
+++ b/src/csync/csync_util.h
@@ -22,7 +22,7 @@
 #ifndef _CSYNC_UTIL_H
 #define _CSYNC_UTIL_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "csync_private.h"
 

diff --git a/src/csync/std/c_alloc.h b/src/csync/std/c_alloc.h
index 8ff2eb08b74e8af4621616e7e81e2d58d918822b..166c5c8cd2975ec1499e41dc85c430312c3d81b7 100644 (file)
--- a/src/csync/std/c_alloc.h
+++ b/src/csync/std/c_alloc.h
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <stdlib.h>
+#include <stdlib.h> // NOLINT this is sometimes compiled in C mode
 
 #include "c_macro.h"
 

diff --git a/src/csync/std/c_lib.h b/src/csync/std/c_lib.h
index 2f0135ede70c0f9316e7fa5e3ed30391adc8f20c..e277f4e95690fd70aff0b923bc955ed142686a39 100644 (file)
--- a/src/csync/std/c_lib.h
+++ b/src/csync/std/c_lib.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <stdlib.h> // NOLINT this is sometimes compiled in C mode
+#include <string.h> // NOLINT this is sometimes compiled in C mode
 
 #include "c_macro.h"
 #include "c_alloc.h"

diff --git a/src/csync/std/c_macro.h b/src/csync/std/c_macro.h
index a4a0e1c1c5bf68f96efd67e9f2d8016fe613e323..e65c2c78096064a288e1dc2d56a4a25b29a36eb4 100644 (file)
--- a/src/csync/std/c_macro.h
+++ b/src/csync/std/c_macro.h
@@ -31,8 +31,8 @@
 #ifndef _C_MACRO_H
 #define _C_MACRO_H
 
-#include <stdint.h>
-#include <string.h>
+#include <stdint.h> // NOLINT this is sometimes compiled in C mode
+#include <string.h> // NOLINT this is sometimes compiled in C mode
 
 #define INT_TO_POINTER(i) (void *) i
 #define POINTER_TO_INT(p) *((int *) (p))

diff --git a/src/csync/std/c_private.h b/src/csync/std/c_private.h
index ba4f986e1e708e62dee4f9d595a6fc4c532833d0..1802c2f38d83e3e11476f2ff7f801e01e5ccec23 100644 (file)
--- a/src/csync/std/c_private.h
+++ b/src/csync/std/c_private.h
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #endif
 
-#include <errno.h>
+#include <errno.h>  // NOLINT this is sometimes compiled in C mode
 
 #ifdef __MINGW32__
 #define EDQUOT 0

diff --git a/src/csync/std/c_string.h b/src/csync/std/c_string.h
index 3066ee2b359469f5b087ec3e1f321a8f6abb5402..9c8b557d49c7ad293bac6d4c288a316d08afde63 100644 (file)
--- a/src/csync/std/c_string.h
+++ b/src/csync/std/c_string.h
@@ -39,7 +39,7 @@ extern "C" {
 #include "c_private.h"
 #include "c_macro.h"
 
-#include <stdlib.h>
+#include <stdlib.h> // NOLINT this is sometimes compiled in C mode
 
 /**
  * @brief Compare to strings case insensitively.

diff --git a/src/csync/vio/csync_vio.cpp b/src/csync/vio/csync_vio.cpp
index 9d2ec5b9186959d0d37f758cb95c646ca88bb358..c5485a9e65b5b78fe76dfa93f0b8e4a4a6884e4b 100644 (file)
--- a/src/csync/vio/csync_vio.cpp
+++ b/src/csync/vio/csync_vio.cpp
@@ -22,8 +22,8 @@
 #define _GNU_SOURCE
 #endif
 
-#include <errno.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstdio>
 #include "common/asserts.h"
 
 #include "csync_private.h"

diff --git a/src/csync/vio/csync_vio_local_unix.cpp b/src/csync/vio/csync_vio_local_unix.cpp
index 1f58623d59d951df0c5d21a5bfe8c29a7addc4dd..d1ecf997856b968a79e4fd933a820e491ed755af 100644 (file)
--- a/src/csync/vio/csync_vio_local_unix.cpp
+++ b/src/csync/vio/csync_vio_local_unix.cpp
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include <memory>
 

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 2caf63b5092d57f7a8fd33de34fc608bca0e1462..c70096730664b1cae9b285d5db65bbcf14ec75a9 100644 (file)
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -37,7 +37,7 @@
 #include "syncresult.h"
 #include "ignorelisttablewidget.h"
 
-#include <math.h>
+#include <cmath>
 
 #include <QDesktopServices>
 #include <QDialogButtonBox>

diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp
index d73e913f5829d5996a7afc440d069792b6ad6604..b86f55cf66e19c78ab7c10e843f9f3ce637d7102 100644 (file)
--- a/src/gui/folderwatcher.cpp
+++ b/src/gui/folderwatcher.cpp
@@ -15,7 +15,7 @@
 // event masks
 #include "folderwatcher.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <QFileInfo>
 #include <QFlags>

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index ee315d82e63876571b66fa68aaee8c0e9c3dc2dc..d22cae46205bbb98446f43a9490a98527e58cd6d 100644 (file)
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -37,7 +37,7 @@
 #include <QVBoxLayout>
 #include <QEvent>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace OCC {
 

diff --git a/src/gui/logbrowser.cpp b/src/gui/logbrowser.cpp
index 52119b7542a465cb1b0fe9faf671668fa1c8f1cb..34dc8891c1e6c1396c4db75b9b5bd0a7b876337b 100644 (file)
--- a/src/gui/logbrowser.cpp
+++ b/src/gui/logbrowser.cpp
@@ -14,7 +14,7 @@
 
 #include "logbrowser.h"
 
-#include "stdio.h"
+#include <cstdio>
 #include <iostream>
 
 #include <QDialogButtonBox>

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 060cc7ef75980de3c0142b00c8bab6a71b6ccac1..f4cac4b9cc8624dccf7f89f25b92a61a162cc222 100644 (file)
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -14,7 +14,7 @@
  */
 #include <QtGlobal>
 
-#include <signal.h>
+#include <csignal>
 
 #ifdef Q_OS_UNIX
 #include <sys/time.h>

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 8627d3f32d2b8239a269112648b5e53c37e8cd84..dc61f497728a607cfad72676af0f26a22445c3b9 100644 (file)
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -46,7 +46,7 @@
 #include <QPainter>
 #include <QListWidget>
 
-#include <string.h>
+#include <cstring>
 
 namespace OCC {
 

diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp
index 4d3a0d3deddc98d2aec300ccb238ea81f858e3e2..66528f8dcd0466632f2772b1034bfe345f3e739d 100644 (file)
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -25,7 +25,7 @@
 #include <QtGui>
 #include <QtWidgets>
 
-#include <stdio.h>
+#include <cstdio>
 
 namespace OCC {
 

diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
index aa7f0aaa4c8e4d25611f398a9aa4456a08e42969..912222dca764776dcb7c808f73c6be1e5daef3d3 100644 (file)
--- a/src/gui/wizard/owncloudwizard.cpp
+++ b/src/gui/wizard/owncloudwizard.cpp
@@ -35,7 +35,7 @@
 #include <QtCore>
 #include <QtGui>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace OCC {
 

diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index b6e1948d111a0c9310f645a7b2d5cf05b65ce228..a1d9b58cf41ee790aa7339a7373ee3821d802987 100644 (file)
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -32,7 +32,7 @@
 #include <qstack.h>
 #include <QCoreApplication>
 
-#include <time.h>
+#include <ctime>
 
 
 namespace OCC {

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 5fdd070c76ea8acf255af11193acb5c4121e5f33..7c79272b8ce836d385adb6d8d2ecde85a7101ff1 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -36,7 +36,7 @@
 #endif
 
 #include <climits>
-#include <assert.h>
+#include <cassert>
 
 #include <QCoreApplication>
 #include <QSslSocket>

diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h
index d186bc6271d7da123be3ebe943d112cc9ddae823..5409d46c4de874e1bad3fbfd302e7c92a7847e0e 100644 (file)
--- a/src/libsync/syncengine.h
+++ b/src/libsync/syncengine.h
@@ -16,7 +16,7 @@
 #ifndef CSYNCTHREAD_H
 #define CSYNCTHREAD_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <QMutex>
 #include <QThread>