Simplify nullptr comparisons where appropriate

Make the codebase consistent, we already have a lot of implicit pointer comparisons.

Exception: Stay explicit on return's, example:
  return _db != nullptr;

Signed-off-by: Michael Schuster <michael@schuster.ms>

diff --git a/shell_integration/windows/OCContextMenu/OCContextMenuFactory.cpp b/shell_integration/windows/OCContextMenu/OCContextMenuFactory.cpp
index 13eb904a9b2c47b460aa087246f2732f7f186dfa..e9652b3c7161a6ea09a092c9bcf8aae0ec65d04a 100644 (file)
--- a/shell_integration/windows/OCContextMenu/OCContextMenuFactory.cpp
+++ b/shell_integration/windows/OCContextMenu/OCContextMenuFactory.cpp
@@ -65,7 +65,7 @@ IFACEMETHODIMP OCContextMenuFactory::CreateInstance(IUnknown *pUnkOuter, REFIID
     HRESULT hr = CLASS_E_NOAGGREGATION;
 
     // pUnkOuter is used for aggregation. We do not support it in the sample.
-    if (pUnkOuter == nullptr) {
+    if (!pUnkOuter) {
         hr = E_OUTOFMEMORY;
 
         // Create the COM component.

diff --git a/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp b/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp
index 6c04734da13124cb697a4084870cbe406b9492a9..e855ff43f5cb14938bfe6d62ad09631dc006e192 100644 (file)
--- a/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp
+++ b/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp
@@ -33,7 +33,7 @@ HRESULT SetHKCRRegistryKeyAndValue(PCWSTR pszSubKey, PCWSTR pszValueName, PCWSTR
 
     if (SUCCEEDED(hr))
     {
-        if (pszData != nullptr)
+        if (pszData)
         {
             // Set the specified value of the key.
             DWORD cbData = lstrlen(pszData) * sizeof(*pszData);
@@ -72,7 +72,7 @@ HRESULT GetHKCRRegistryKeyAndValue(PCWSTR pszSubKey, PCWSTR pszValueName, PWSTR
 
 HRESULT OCContextMenuRegHandler::RegisterInprocServer(PCWSTR pszModule, const CLSID& clsid, PCWSTR pszFriendlyName, PCWSTR pszThreadModel)
 {
-    if (pszModule == nullptr || pszThreadModel == nullptr)
+    if (!pszModule || !pszThreadModel)
     {
         return E_INVALIDARG;
     }
@@ -136,7 +136,7 @@ HRESULT OCContextMenuRegHandler::UnregisterInprocServer(const CLSID& clsid)
 HRESULT OCContextMenuRegHandler::RegisterShellExtContextMenuHandler(
     PCWSTR pszFileType, const CLSID& clsid, PCWSTR pszFriendlyName)
 {
-    if (pszFileType == nullptr)
+    if (!pszFileType)
     {
         return E_INVALIDARG;
     }
@@ -180,7 +180,7 @@ HRESULT OCContextMenuRegHandler::RegisterShellExtContextMenuHandler(
 HRESULT OCContextMenuRegHandler::UnregisterShellExtContextMenuHandler(
     PCWSTR pszFileType, PCWSTR pszFriendlyName)
 {
-    if (pszFileType == nullptr)
+    if (!pszFileType)
     {
         return E_INVALIDARG;
     }

diff --git a/shell_integration/windows/OCOverlays/OCOverlayFactory.cpp b/shell_integration/windows/OCOverlays/OCOverlayFactory.cpp
index 34b22f5396f81b8a98859040fa71c26bfceac086..a1c095f920894fa30cfa1d4a46893d0d6a96bdcf 100644 (file)
--- a/shell_integration/windows/OCOverlays/OCOverlayFactory.cpp
+++ b/shell_integration/windows/OCOverlays/OCOverlayFactory.cpp
@@ -70,7 +70,7 @@ IFACEMETHODIMP OCOverlayFactory::CreateInstance(
 {
     HRESULT hResult = CLASS_E_NOAGGREGATION;
 
-    if (pUnkOuter != nullptr) { return hResult; }
+    if (pUnkOuter) { return hResult; }
 
     hResult = E_OUTOFMEMORY;
     OCOverlay *lrOverlay = new (std::nothrow) OCOverlay(_state);

diff --git a/shell_integration/windows/OCOverlays/OCOverlayRegistrationHandler.cpp b/shell_integration/windows/OCOverlays/OCOverlayRegistrationHandler.cpp
index b10d646719130046e3b2ed794da74916d1f9e5fd..d7d1fa40abea83a94f7d2ae5540978692e5e8123 100644 (file)
--- a/shell_integration/windows/OCOverlays/OCOverlayRegistrationHandler.cpp
+++ b/shell_integration/windows/OCOverlays/OCOverlayRegistrationHandler.cpp
@@ -73,7 +73,7 @@ HRESULT OCOverlayRegistrationHandler::RemoveRegistryEntries(PCWSTR friendlyName)
 
 HRESULT OCOverlayRegistrationHandler::RegisterCOMObject(PCWSTR modulePath, PCWSTR friendlyName, const CLSID& clsid)
 {
-    if (modulePath == nullptr) {
+    if (!modulePath) {
         return E_FAIL;
     }
 

diff --git a/src/common/utility_mac.cpp b/src/common/utility_mac.cpp
index befef0cbce0a675e70766b00dfb8af57ec37f93a..c093d8805ed853b0bafdff3fa9b916c1266592bd 100644 (file)
--- a/src/common/utility_mac.cpp
+++ b/src/common/utility_mac.cpp
@@ -124,7 +124,7 @@ static bool hasDarkSystray_private()
     CFStringRef darkInterfaceStyle = CFSTR("Dark");
     interfaceStyle = (CFStringRef)CFPreferencesCopyAppValue(interfaceStyleKey,
         kCFPreferencesCurrentApplication);
-    if (interfaceStyle != nullptr) {
+    if (interfaceStyle) {
         returnValue = (kCFCompareEqualTo == CFStringCompare(interfaceStyle, darkInterfaceStyle, 0));
         CFRelease(interfaceStyle);
     }

diff --git a/src/csync/csync.cpp b/src/csync/csync.cpp
index eea6322c0afb0a402ca168e501c900c84ecb0035..4d1b9ea2d5ff70038821beb49d474329be917bb8 100644 (file)
--- a/src/csync/csync.cpp
+++ b/src/csync/csync.cpp
@@ -67,7 +67,7 @@ csync_s::csync_s(const char *localUri, OCC::SyncJournalDb *statedb)
 int csync_update(CSYNC *ctx) {
   int rc = -1;
 
-  if (ctx == nullptr) {
+  if (!ctx) {
     errno = EBADF;
     return -1;
   }
@@ -256,14 +256,14 @@ csync_s::~csync_s() {
 }
 
 void *csync_get_userdata(CSYNC *ctx) {
-  if (ctx == nullptr) {
+  if (!ctx) {
     return nullptr;
   }
   return ctx->callbacks.userdata;
 }
 
 int csync_set_userdata(CSYNC *ctx, void *userdata) {
-  if (ctx == nullptr) {
+  if (!ctx) {
     return -1;
   }
 
@@ -273,7 +273,7 @@ int csync_set_userdata(CSYNC *ctx, void *userdata) {
 }
 
 csync_auth_callback csync_get_auth_callback(CSYNC *ctx) {
-  if (ctx == nullptr) {
+  if (!ctx) {
     return nullptr;
   }
 
@@ -281,7 +281,7 @@ csync_auth_callback csync_get_auth_callback(CSYNC *ctx) {
 }
 
 int csync_set_status(CSYNC *ctx, int status) {
-  if (ctx == nullptr || status < 0) {
+  if (!ctx || status < 0) {
     return -1;
   }
 
@@ -291,7 +291,7 @@ int csync_set_status(CSYNC *ctx, int status) {
 }
 
 CSYNC_STATUS csync_get_status(CSYNC *ctx) {
-  if (ctx == nullptr) {
+  if (!ctx) {
     return CSYNC_STATUS_ERROR;
   }
 
@@ -305,21 +305,21 @@ const char *csync_get_status_string(CSYNC *ctx)
 
 void csync_request_abort(CSYNC *ctx)
 {
-  if (ctx != nullptr) {
+  if (ctx) {
     ctx->abort = true;
   }
 }
 
 void csync_resume(CSYNC *ctx)
 {
-  if (ctx != nullptr) {
+  if (ctx) {
     ctx->abort = false;
   }
 }
 
 int  csync_abort_requested(CSYNC *ctx)
 {
-  if (ctx != nullptr) {
+  if (ctx) {
     return ctx->abort;
   } else {
     return (1 == 0);

diff --git a/src/csync/csync_update.cpp b/src/csync/csync_update.cpp
index 7ddd203f36dd0b9882f6775027f8d3b11eed6c75..94351a3f84b9a6a6cb1e317114e8780ff644c8f2 100644 (file)
--- a/src/csync/csync_update.cpp
+++ b/src/csync/csync_update.cpp
@@ -617,7 +617,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
   // if the etag of this dir is still the same, its content is restored from the
   // database.
   if( do_read_from_db ) {
-      if( ! fill_tree_from_db(ctx, db_uri) ) {
+      if(!fill_tree_from_db(ctx, db_uri)) {
         errno = ENOENT;
         ctx->status_code = CSYNC_STATUS_OPENDIR_ERROR;
         goto error;
@@ -625,7 +625,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
       return 0;
   }
 
-  if ((dh = csync_vio_opendir(ctx, uri)) == nullptr) {
+  if (!(dh = csync_vio_opendir(ctx, uri))) {
       if (ctx->abort) {
           qCDebug(lcUpdate, "Aborted!");
           ctx->status_code = CSYNC_STATUS_ABORTED;
@@ -783,7 +783,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
 
 error:
   ctx->remote.read_from_db = read_from_db;
-  if (dh != nullptr) {
+  if (dh) {
     csync_vio_closedir(ctx, dh);
   }
   return -1;

diff --git a/src/csync/csync_util.cpp b/src/csync/csync_util.cpp
index aabe1fdd5c55c1a4b2c07d57afaa4725c40d3f29..6700110e357faeca7b4907c529f78aa8354cb098 100644 (file)
--- a/src/csync/csync_util.cpp
+++ b/src/csync/csync_util.cpp
@@ -74,7 +74,7 @@ const char *csync_instruction_str(enum csync_instructions_e instr)
 {
   int idx = 0;
 
-  while (_instr[idx].instr_str != nullptr) {
+  while (_instr[idx].instr_str) {
     if (_instr[idx].instr_code == instr) {
       return _instr[idx].instr_str;
     }
@@ -92,7 +92,7 @@ void csync_memstat_check() {
 
   /* get process memory stats */
   fp = fopen("/proc/self/statm","r");
-  if (fp == nullptr) {
+  if (!fp) {
     return;
   }
   s = fscanf(fp, "%d%d%d%d%d%d%d", &m.size, &m.resident, &m.shared, &m.trs,

diff --git a/src/csync/std/c_utf8.cpp b/src/csync/std/c_utf8.cpp
index 4fb2c9273320b74fb3bc78c829d1aa2a8b484be6..93e6783041a4297baa7aa61ce0186d62e9e2d644 100644 (file)
--- a/src/csync/std/c_utf8.cpp
+++ b/src/csync/std/c_utf8.cpp
@@ -43,7 +43,7 @@
 /* Convert a locale String to UTF8 */
 QByteArray c_utf8_from_locale(const mbchar_t *wstr)
 {
-  if (wstr == nullptr) {
+  if (!wstr) {
     return QByteArray();
   }
 
@@ -87,7 +87,7 @@ extern "C" {
 /* Convert a an UTF8 string to locale */
 mbchar_t* c_utf8_string_to_locale(const char *str)
 {
-    if (str == nullptr ) {
+    if (!str) {
         return nullptr;
     }
 #ifdef _WIN32
@@ -111,7 +111,7 @@ mbchar_t* c_utf8_string_to_locale(const char *str)
 
  mbchar_t* c_utf8_path_to_locale(const char *str)
  {
-     if( str == nullptr ) {
+     if(!str) {
          return nullptr;
      } else {
  #ifdef _WIN32

diff --git a/src/csync/vio/csync_vio.cpp b/src/csync/vio/csync_vio.cpp
index 1d5e6f61023d7dad7749603e8f88ebae827e5bf6..9d2ec5b9186959d0d37f758cb95c646ca88bb358 100644 (file)
--- a/src/csync/vio/csync_vio.cpp
+++ b/src/csync/vio/csync_vio.cpp
@@ -53,7 +53,7 @@ csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) {
 int csync_vio_closedir(CSYNC *ctx, csync_vio_handle_t *dhandle) {
   int rc = -1;
 
-  if (dhandle == nullptr) {
+  if (!dhandle) {
     errno = EBADF;
     return -1;
   }

diff --git a/src/csync/vio/csync_vio_local_unix.cpp b/src/csync/vio/csync_vio_local_unix.cpp
index 17049746342369293f124e769d09b424f25887b8..7b64e51cc1a512005e19b0fbea9f9fbcb069deac 100644 (file)
--- a/src/csync/vio/csync_vio_local_unix.cpp
+++ b/src/csync/vio/csync_vio_local_unix.cpp
@@ -59,7 +59,7 @@ csync_vio_handle_t *csync_vio_local_opendir(const char *name) {
   dirname = c_utf8_path_to_locale(name);
 
   handle->dh = _topendir( dirname );
-  if (handle->dh == nullptr) {
+  if (!handle->dh) {
     c_free_locale_string(dirname);
     SAFE_FREE(handle);
     return nullptr;
@@ -75,7 +75,7 @@ int csync_vio_local_closedir(csync_vio_handle_t *dhandle) {
   dhandle_t *handle = nullptr;
   int rc = -1;
 
-  if (dhandle == nullptr) {
+  if (!dhandle) {
     errno = EBADF;
     return -1;
   }
@@ -99,7 +99,7 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *d
 
   do {
       dirent = _treaddir(handle->dh);
-      if (dirent == nullptr)
+      if (!dirent)
           return {};
   } while (qstrcmp(dirent->d_name, ".") == 0 || qstrcmp(dirent->d_name, "..") == 0);
 

diff --git a/src/csync/vio/csync_vio_local_win.cpp b/src/csync/vio/csync_vio_local_win.cpp
index 920cbf1fe84d6b4cd33fc9fd0757d0dace178928..a1d318c9271fc5cc8beca9a90e9e1c79852ea2b8 100644 (file)
--- a/src/csync/vio/csync_vio_local_win.cpp
+++ b/src/csync/vio/csync_vio_local_win.cpp
@@ -100,7 +100,7 @@ int csync_vio_local_closedir(csync_vio_handle_t *dhandle) {
   dhandle_t *handle = nullptr;
   int rc = -1;
 
-  if (dhandle == nullptr) {
+  if (!dhandle) {
     errno = EBADF;
     return -1;
   }

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 5831078c5395ffcd61496ff0b72e21e8a66be346..8b0a36c6f278c292cfe9ce11f3dff526485d5021 100644 (file)
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -495,7 +495,7 @@ void AccountSettings::slotLockForDecryptionError(const QByteArray& fileId, int h
 void AccountSettings::slotEditCurrentIgnoredFiles()
 {
     Folder *f = FolderMan::instance()->folder(selectedFolderAlias());
-    if (f == nullptr)
+    if (!f)
         return;
     openIgnoredFilesDialog(f->path());
 }

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 3ab24df781dba7d102112febe9436cf66ca4b98b..2cfaa5bba99d4f8bde0522bf5511b37c9ba6b0f8 100644 (file)
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -593,7 +593,7 @@ void FolderMan::slotRunOneEtagJob()
             //qCDebug(lcFolderMan) << "No more remote ETag check jobs to schedule.";
 
             /* now it might be a good time to check for restarting... */
-            if (_currentSyncFolder == nullptr && _appRestartRequired) {
+            if (!_currentSyncFolder && _appRestartRequired) {
                 restartApplication();
             }
         } else {
@@ -973,7 +973,7 @@ QStringList FolderMan::findFileInLocalFolders(const QString &relPath, const Acco
     QStringList re;
 
     foreach (Folder *folder, this->map().values()) {
-        if (acc != nullptr && folder->accountState()->account() != acc) {
+        if (acc && folder->accountState()->account() != acc) {
             continue;
         }
         QString path = folder->cleanPath();

diff --git a/src/gui/folderwatcher_linux.cpp b/src/gui/folderwatcher_linux.cpp
index f1acf6cd307af175ab598abee526276c3aef95c3..440927fbce16988ce18f2616393f95b9bf675b3c 100644 (file)
--- a/src/gui/folderwatcher_linux.cpp
+++ b/src/gui/folderwatcher_linux.cpp
@@ -158,7 +158,7 @@ void FolderWatcherPrivate::slotReceivedNotification(int fd)
     while (i + sizeof(struct inotify_event) < static_cast<unsigned int>(len)) {
         // cast an inotify_event
         event = (struct inotify_event *)&buffer[i];
-        if (event == nullptr) {
+        if (!event) {
             qCDebug(lcFolderWatcher) << "NULL event";
             i += sizeof(struct inotify_event);
             continue;

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index d0f49c683747b238d76ff9f7dcb1c34a6c64642c..83af6a9bdfd6d3f1856606f663298ed1b6315c01 100644 (file)
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -600,7 +600,7 @@ void ownCloudGui::slotHelp()
 
 void ownCloudGui::raiseDialog(QWidget *raiseWidget)
 {
-    if (raiseWidget && raiseWidget->parentWidget() == nullptr) {
+    if (raiseWidget && !raiseWidget->parentWidget()) {
         // Qt has a bug which causes parent-less dialogs to pop-under.
         raiseWidget->showNormal();
         raiseWidget->raise();

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 0c7674d7379b3e285c8cf0953293bf53be1d26af..66ac956f2c7a5c4db5e00c2cd114627ac44884de 100644 (file)
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -40,7 +40,7 @@ Systray *Systray::_instance = nullptr;
 
 Systray *Systray::instance()
 {
-    if (_instance == nullptr) {
+    if (!_instance) {
         _instance = new Systray();
     }
     return _instance;

diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index 7eb07ec51f04c2fa5d6841cd3310496c2e623eed..2c656de679d2b2961597480316127e09acc071d3 100644 (file)
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -419,7 +419,7 @@ void User::openLocalFolder()
 {
     const auto folder = getFolder();
 
-    if (folder != nullptr) {
+    if (folder) {
         QDesktopServices::openUrl(QUrl::fromLocalFile(folder->path()));
     }
 }
@@ -509,7 +509,7 @@ UserModel *UserModel::_instance = nullptr;
 
 UserModel *UserModel::instance()
 {
-    if (_instance == nullptr) {
+    if (!_instance) {
         _instance = new UserModel();
     }
     return _instance;
@@ -808,7 +808,7 @@ UserAppsModel *UserAppsModel::_instance = nullptr;
 
 UserAppsModel *UserAppsModel::instance()
 {
-    if (_instance == nullptr) {
+    if (!_instance) {
         _instance = new UserAppsModel();
     }
     return _instance;

diff --git a/src/libsync/bandwidthmanager.cpp b/src/libsync/bandwidthmanager.cpp
index d177a6275aefa576797abcfb776dbc96effe4a78..63ea83d3c25eca8136122195ba58dcfa7b8a9e4e 100644 (file)
--- a/src/libsync/bandwidthmanager.cpp
+++ b/src/libsync/bandwidthmanager.cpp
@@ -153,7 +153,7 @@ void BandwidthManager::relativeUploadMeasuringTimerExpired()
         _relativeUploadDelayTimer.start();
         return;
     }
-    if (_relativeLimitCurrentMeasuredDevice == nullptr) {
+    if (!_relativeLimitCurrentMeasuredDevice) {
         qCDebug(lcBandwidthManager) << "No device set, just waiting 1 sec";
         _relativeUploadDelayTimer.setInterval(1000);
         _relativeUploadDelayTimer.start();
@@ -247,7 +247,7 @@ void BandwidthManager::relativeDownloadMeasuringTimerExpired()
         _relativeDownloadDelayTimer.start();
         return;
     }
-    if (_relativeLimitCurrentMeasuredJob == nullptr) {
+    if (!_relativeLimitCurrentMeasuredJob) {
         qCDebug(lcBandwidthManager) << "No job set, just waiting 1 sec";
         _relativeDownloadDelayTimer.setInterval(1000);
         _relativeDownloadDelayTimer.start();

diff --git a/test/csync/encoding_tests/check_encoding.cpp b/test/csync/encoding_tests/check_encoding.cpp
index a28e9cc226910b2697483efddbfff1d7e5a1d480..22dc20e1ec35beaaf2bda71382b4174309326f48 100644 (file)
--- a/test/csync/encoding_tests/check_encoding.cpp
+++ b/test/csync/encoding_tests/check_encoding.cpp
@@ -93,17 +93,17 @@ static void check_to_multibyte(void **state)
 {
     int rc = -1;
 
-    mbchar_t *mb_string = c_utf8_path_to_locale( TESTSTRING );
-    mbchar_t *mb_null   = c_utf8_path_to_locale( nullptr );
+    mbchar_t *mb_string = c_utf8_path_to_locale(TESTSTRING);
+    mbchar_t *mb_null   = c_utf8_path_to_locale(nullptr);
 
     (void) state;
 
 #ifdef _WIN32
-    assert_int_equal( wcscmp( LTESTSTRING, mb_string), 0 );
+    assert_int_equal(wcscmp(LTESTSTRING, mb_string), 0);
 #else
     assert_string_equal(mb_string, TESTSTRING);
 #endif
-    assert_true( mb_null == nullptr );
+    assert_false(mb_null);
     assert_int_equal(rc, -1);
 
     c_free_locale_string(mb_string);
@@ -159,12 +159,12 @@ static void check_long_win_path(void **state)
             "olonglonglonglong\\file.txt";
 
     QByteArray new_long = OCC::FileSystem::pathtoUNC(QByteArray::fromRawData(longPath, strlen(longPath)));
-    // printf( "XXXXXXXXXXXX %s %d\n", new_long, mem_reserved);
+    // printf("XXXXXXXXXXXX %s %d\n", new_long, mem_reserved);
 
     assert_string_equal(new_long, longPathConv);
 
-    // printf( "YYYYYYYYYYYY %ld\n", strlen(new_long));
-    assert_int_equal( strlen(new_long), 286);
+    // printf("YYYYYYYYYYYY %ld\n", strlen(new_long));
+    assert_int_equal(strlen(new_long), 286);
 }
 
 int torture_run_tests(void)