Fix several warnings (#3438)

* [cleanup] Fix warnings about unreachable code * [cleanup] Remove warning "'clFileName::GetRemotePath': recursive on all control paths, function will cause runtime stack overflow" by removing unused methods. * [cleanup] Fix warnings: - unused variables - possibly uninitialized variables * [cleanup] Fix warnings: - unused variable - declaration of 'v' hides previous declaration * [cleanup] Fix warning: "declaration of 'i' hides previous declaration" * [cleanup] Fix warning: "type name first seen using 'class' now seen using 'struct'" * [cleanup] Fix warning: "'where': local variable is initialized but not referenced" * [cleanup] Fix warning: "type name first seen using 'class' now seen using 'struct'"
eranif · Aug 2, 2024 · 1e601a5 · 1e601a5
1 parent eb4a462
commit 1e601a5
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 35 deletions.
diff --git a/CMakePlugin/CMakeProjectSettings.h b/CMakePlugin/CMakeProjectSettings.h
@@ -69,8 +69,9 @@
  *
  * @note Only "Unix Makefiles" generator is supported now.
  */
-struct CMakeProjectSettings
+class CMakeProjectSettings
 {
+public:
     /// If CMake build is enabled.
     bool enabled;
 

diff --git a/CallGraph/callgraph.cpp b/CallGraph/callgraph.cpp
@@ -290,11 +290,11 @@ wxString CallGraph::GetGprofPath()
     return wxEmptyString;
 #else
     gprofPath = LocateApp(GPROF_FILENAME_EXE);
-#endif
 
     confData.SetGprofPath(gprofPath);
     m_mgr->GetConfigTool()->WriteObject(wxT("CallGraph"), &confData);
     return gprofPath;
+#endif
 }
 
 //---- Get Dot Path -----------------------------------------------------------
@@ -313,13 +313,13 @@ wxString CallGraph::GetDotPath()
     return wxEmptyString;
 #else
     dotPath = LocateApp(DOT_FILENAME_EXE);
-#endif
 
     confData.SetDotPath(dotPath);
 
     m_mgr->GetConfigTool()->WriteObject(wxT("CallGraph"), &confData);
 
     return dotPath;
+#endif
 }
 
 //---- Show CallGraph event ---------------------------------------------------

diff --git a/CodeLite/PHP/PHPLookupTable.cpp b/CodeLite/PHP/PHPLookupTable.cpp
@@ -1203,7 +1203,6 @@ bool PHPLookupTable::CheckDiskImage(wxSQLite3Database& db, const wxFileName& fil
         clWARNING() << "PHP: database image is corrupted:" << filename.GetFullPath() << clEndl;
         return false;
     }
-    return true;
 }
 
 void PHPLookupTable::EnsureIntegrity(const wxFileName& filename)

diff --git a/CodeLite/SocketAPI/clConnectionString.cpp b/CodeLite/SocketAPI/clConnectionString.cpp
@@ -22,8 +22,9 @@ void clConnectionString::DoParse(const wxString& connectionString)
 #ifdef __WXMSW__
         clWARNING() << "unix protocol is not suppported on Windows" << clEndl;
         return;
-#endif
+#else
         m_protocol = kUnixLocalSocket;
+#endif
     } else {
         clWARNING() << "Invalid protocol in connection string:" << connectionString << clEndl;
         return;

diff --git a/CodeLite/SocketAPI/clSocketClientAsync.cpp b/CodeLite/SocketAPI/clSocketClientAsync.cpp
@@ -65,7 +65,6 @@ void* clSocketAsyncThread::Entry()
     } else {
         return ServerMain();
     }
-    return nullptr;
 }
 
 void* clSocketAsyncThread::ServerMain()

diff --git a/CodeLite/clFileName.cpp b/CodeLite/clFileName.cpp
@@ -144,9 +144,3 @@ const wxString& clFileName::GetRemoteFullPath() const
     }
     return m_remotePath;
 }
-
-wxString clFileName::GetRemotePath() const { return wxFileName(GetRemotePath(), wxPATH_UNIX).GetPath(wxPATH_UNIX); }
-
-wxString clFileName::GetRemoteFullName() const { return wxFileName(GetRemotePath(), wxPATH_UNIX).GetFullName(); }
-
-wxString clFileName::GetRemoteName() const { return wxFileName(GetRemotePath(), wxPATH_UNIX).GetName(); }
diff --git a/CodeLite/clFileName.hpp b/CodeLite/clFileName.hpp
@@ -43,9 +43,6 @@ class WXDLLIMPEXP_CL clFileName : public wxFileName
 
     inline bool IsRemote() const { return m_isRemote; }
     const wxString& GetRemoteFullPath() const;
-    wxString GetRemoteFullName() const;
-    wxString GetRemoteName() const;
-    wxString GetRemotePath() const;
 };
 
 #endif // CLFILENAME_HPP
diff --git a/CodeLite/database/tags_storage_sqlite3.cpp b/CodeLite/database/tags_storage_sqlite3.cpp
@@ -1869,7 +1869,6 @@ bool TagsStorageSQLite::CheckIntegrity() const
         // this can only happen if we have a corrupt disk image
         return false;
     }
-    return true;
 }
 
 void TagsStorageSQLite::GetTagsByPathAndKind(const wxString& path, std::vector<TagEntryPtr>& tags,

diff --git a/DebugAdapterClient/DAPMainView.cpp b/DebugAdapterClient/DAPMainView.cpp
@@ -210,7 +210,6 @@ void DAPMainView::OnScopeItemExpanding(wxTreeEvent& event)
     wxTreeItemId item = event.GetItem();
     CHECK_ITEM_RET(item);
 
-    wxTreeItemIdValue cookie;
     m_variablesTree->Begin();
     if(m_variablesTree->ItemHasChildren(item)) {
         m_variablesTree->DeleteChildren(item);

diff --git a/DebugAdapterClient/DebugAdapterClient.cpp b/DebugAdapterClient/DebugAdapterClient.cpp
@@ -986,9 +986,9 @@ void DebugAdapterClient::OnDapInitializeResponse(DAPEvent& event)
     LOG_DEBUG(LOG) << "working directory:" << m_session.working_directory << endl;
 
     // FIXME: apply the environment here
-    auto v = m_session.command;
-    LOG_DEBUG(LOG) << "Calling Launch() with command:" << v << endl;
+    LOG_DEBUG(LOG) << "Calling Launch() with command:" << m_session.command << endl;
     if (m_session.dap_server.GetLaunchType() == DapLaunchType::LAUNCH) {
+        auto v = m_session.command;
         m_client.Launch(std::move(v), m_session.working_directory, m_session.MakeEnvironment());
 
     } else {

diff --git a/ExternalTools/externaltools.cpp b/ExternalTools/externaltools.cpp
@@ -202,7 +202,6 @@ void ExternalToolsPlugin::DoRecreateToolbar()
     }
 
     // Add the tools
-    int where = XRCID("external_tools_monitor");
     for(size_t i = 0; i < tools.size(); i++) {
         const ToolInfo& ti = tools[i];
 

diff --git a/MemCheck/memcheckerror.h b/MemCheck/memcheckerror.h
@@ -88,7 +88,9 @@ class MemCheckErrorLocationReferrer: public wxClientData
  * @class MemCheckErrorLocation
  * @brief Represents on record from error stacktrace.
  */
-struct MemCheckErrorLocation {
+class MemCheckErrorLocation
+{
+public:
     bool operator==(const MemCheckErrorLocation & other) const;
     bool operator!=(const MemCheckErrorLocation & other) const;
 
@@ -140,7 +142,9 @@ struct MemCheckErrorLocation {
  *
  * Aditional records have also stacttrace, so they are implemented same as errors. Auxiliary record implemented as list of error. Some tool have more than one auxiliary section. Type is used to distinguish between them.
  */
-struct MemCheckError {
+class MemCheckError
+{
+public:
     enum Type { TYPE_ERROR, TYPE_AUXILIARY };
     MemCheckError();
 

diff --git a/Plugin/clRegistery.cpp b/Plugin/clRegistery.cpp
@@ -51,8 +51,9 @@ wxString clRegistery::ReadValueString(const wxString& valueName)
     wxString value;
     m_regKey->QueryValue(valueName, value);
     return value;
-#endif
+#else
     return wxEmptyString;
+#endif
 }
 
 wxString clRegistery::GetFirstChild()

diff --git a/Plugin/wxCustomStatusBar.cpp b/Plugin/wxCustomStatusBar.cpp
@@ -97,7 +97,7 @@ void wxCustomStatusBarFieldText::SetText(const wxString& text)
 #if defined(__WXOSX__) || defined(__WXMSW__)
             m_parent->Refresh();
             return;
-#endif
+#else
             // Make sure we draw only when the "art" objects are in sync with the field
             // and with the bar itself
             if((m_rect.GetHeight() > 0) && (m_rect.GetWidth() > 0)) {
@@ -141,6 +141,7 @@ void wxCustomStatusBarFieldText::SetText(const wxString& text)
                 m_parent->PrepareDC(cdc);
                 cdc.DrawBitmap(bmp, m_rect.GetTopLeft(), true);
             }
+#endif
         }
     }
 }

diff --git a/TestDir/makedir.cpp b/TestDir/makedir.cpp
@@ -41,8 +41,8 @@ int main(int argc, char** argv)
             argument.Replace(wxT("\\"), wxT("/"));
             wxArrayString arr = wxStringTokenize(argument, wxT("/"), wxTOKEN_STRTOK);
             wxString path;
-            for(size_t i = 0; i < arr.GetCount(); i++) {
-                path << arr.Item(i) << wxT("/");
+            for (const auto& subdir : arr) {
+                path << subdir << wxT("/");
                 wxMkdir(path, 0777);
             }
         }

diff --git a/codelite_vim/vimCommands.cpp b/codelite_vim/vimCommands.cpp
@@ -1267,7 +1267,6 @@ bool VimCommand::Command_call()
 
     case COMMANDVI::y0: {
         int pos_init_yw = m_ctrl->GetCurrentPos();
-        int repeat_yw = std::max(1, m_repeat) * std::max(1, m_actions);
         m_ctrl->Home();
         int pos_end_yw = m_ctrl->GetCurrentPos();
         m_listCopiedStr.push_back(m_ctrl->GetTextRange(pos_init_yw, pos_end_yw));
@@ -1279,7 +1278,6 @@ bool VimCommand::Command_call()
     } break;
     case COMMANDVI::y$: {
         int pos_init_yw = m_ctrl->GetCurrentPos();
-        int repeat_yw = std::max(1, m_repeat) * std::max(1, m_actions);
         m_ctrl->LineEnd();
         int pos_end_yw = m_ctrl->GetCurrentPos();
         m_listCopiedStr.push_back(m_ctrl->GetTextRange(pos_init_yw, pos_end_yw));
@@ -1291,7 +1289,6 @@ bool VimCommand::Command_call()
     } break;
     case COMMANDVI::y_caret: {
         int pos_init_yw = m_ctrl->GetCurrentPos();
-        int repeat_yw = std::max(1, m_repeat) * std::max(1, m_actions);
         m_ctrl->Home();
         if(m_ctrl->GetCharAt(m_ctrl->GetCurrentPos()) <= 32)
             m_ctrl->WordRight();
@@ -1896,10 +1893,9 @@ bool VimCommand::command_call_visual_block_mode()
 
 wxString VimCommand::get_text_at_position(VimCommand::eTypeTextSearch typeTextToSearch)
 {
-
-    long pos, start, end;
-
-    pos = m_ctrl->GetCurrentPos();
+    const long pos = m_ctrl->GetCurrentPos();
+    long start = 0;
+    long end = 0;
 
     switch(typeTextToSearch) {
     case kAllWord:
@@ -3071,7 +3067,6 @@ long VimCommand::goToMatchingParentesis(long start_pos)
         '\"',
         '\"',
     };
-    SEARCH_DIRECTION direction;
     long pos = start_pos;
     long max_n_char = m_ctrl->GetTextLength();
     wxChar currChar = m_ctrl->GetCharAt(pos);

diff --git a/wxcrafter/src/wxcrafter_plugin.cpp b/wxcrafter/src/wxcrafter_plugin.cpp
@@ -999,11 +999,13 @@ bool wxCrafterPlugin::IsMainViewActive()
 {
     return true; // IIUC this function was protecting against outside events being caught when in Tabbed mode and a
                  // different tab was active
+#if 0
     if(!m_mgr) {
         return true;
     } else {
         return IsTabMode() && m_mainPanel && m_mgr->GetActivePage() == m_mainPanel;
     }
+#endif
 }
 
 // plugin menu

diff --git a/wxcrafter/src/wxgui_helpers.cpp b/wxcrafter/src/wxgui_helpers.cpp
@@ -454,7 +454,6 @@ wxString wxCrafter::ColourToCpp(const wxString& guiname)
         }
         return code;
     }
-    return "";
 }
 
 wxString wxCrafter::ESCAPE(const wxString& s)
-Original file line number
+Diff line change
@@ Expand Up / @@ -454,7 +454,6 @@ wxString wxCrafter::ColourToCpp(const wxString& guiname) @@
             }
             return code;
         }
-        return "";
     }
     wxString wxCrafter::ESCAPE(const wxString& s)
@@ Expand Down @@