[LINT] error 834

Operator ‘Name’ followed by operator ‘Name’ is confusing.

In the cases fixed here, there was no real possible confusion: simply +'s and
-'s. However, keeping this clean would allow us to uncover potential mishaps
with *'s and /'s in the future.

Signed-off-by: Jocelyn Legault <[email protected]>

Author: joce

PythonScript/src/ConsoleDialog.cpp

@@ -784,8 +784,8 @@ bool ConsoleDialog::parseVSErrorLine(LineDetails *lineDetails)
 							break;
 						}
 
-						char *lineNumber = new char[endLineNoPos - startLineNoPos + 2];
-						strncpy_s(lineNumber, endLineNoPos - startLineNoPos + 2, lineDetails->line + startLineNoPos, endLineNoPos - startLineNoPos);
+						char *lineNumber = new char[(endLineNoPos - startLineNoPos) + 2];
+						strncpy_s(lineNumber, (endLineNoPos - startLineNoPos) + 2, lineDetails->line + startLineNoPos, endLineNoPos - startLineNoPos);
                         lineDetails->errorLineNo = strtoul(lineNumber, NULL, 0) - 1;
 						delete[] lineNumber;
                         lineDetails->filenameEnd = startLineNoPos - 1;

PythonScript/src/MenuManager.cpp

@@ -1077,17 +1077,17 @@ void MenuManager::idsInitialised()
 	{
 		if ((idx_t)m_funcItems[i]._cmdID != lastID + 1)
 		{
-			m_originalDynamicMenuManager->addBlock(startBlock, lastID - startBlock + 1);
-			m_dynamicMenuManager->addBlock(startBlock, lastID - startBlock + 1);
+			m_originalDynamicMenuManager->addBlock(startBlock, (lastID - startBlock) + 1);
+			m_dynamicMenuManager->addBlock(startBlock, (lastID - startBlock) + 1);
 			startBlock = (idx_t)m_funcItems[i]._cmdID;
 		}
 		lastID = (idx_t)m_funcItems[i]._cmdID;
 	}
 
-	if (startBlock != (idx_t)m_funcItems[m_dynamicStartIndex + m_originalDynamicCount - 1]._cmdID)
+	if (startBlock != (idx_t)m_funcItems[(m_dynamicStartIndex + m_originalDynamicCount) - 1]._cmdID)
 	{
-		m_originalDynamicMenuManager->addBlock(startBlock, lastID - startBlock + 1);
-		m_dynamicMenuManager->addBlock(startBlock, lastID - startBlock + 1);
+		m_originalDynamicMenuManager->addBlock(startBlock, (lastID - startBlock) + 1);
+		m_dynamicMenuManager->addBlock(startBlock, (lastID - startBlock) + 1);
 	}
 }
 

PythonScript/src/ShortcutDlg.cpp

@@ -230,7 +230,7 @@ void ShortcutDlg::onInitDialog()
 
 	RECT rect;
 	::GetClientRect(m_hListToolbarItems, &rect);
-	m_toolbarColumnWidth = (size_t)(rect.right - rect.left - 18);
+	m_toolbarColumnWidth = (size_t)((rect.right - rect.left) - 18);
 	lvCol.cx = m_toolbarColumnWidth;
 	ListView_InsertColumn(m_hListToolbarItems, 0, &lvCol);