[cleanup] Remove unused code (#3588)

* [cleanup] Remove set but never used `ContextCpp::m_cppFileBmp`

* [cleanup] Remove unused CallGraph/toolbaricons.h

* [cleanup] Remove set but never used `Manager::m_repositionEditor`

* [cleanup] Remove unused `pos` parameter of `PHPCodeCompletion::FindDefinition`

* [cleanup] Remove unused `requiredVersion` parameter of `CodeLiteApp::DoFindMenuFile`

Author: Jarod42

CallGraph/callgraph.cpp

@@ -27,21 +27,16 @@
 
 #include "fileutils.h"
 #include "macromanager.h"
-#include "string.h"
-#include "toolbaricons.h"
 #include "uicallgraphpanel.h"
 #include "uisettingsdlg.h"
 #include "workspace.h"
 
 #include <wx/aboutdlg.h>
-#include <wx/artprov.h>
 #include <wx/bitmap.h>
 #include <wx/datetime.h>
 #include <wx/image.h>
 #include <wx/msgdlg.h>
 #include <wx/mstream.h>
-#include <wx/sstream.h>
-#include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 #include <wx/xrc/xmlres.h>
 

CallGraph/toolbaricons.h

@@ -593,9 +593,9 @@ bool CodeLiteApp::OnInit()
     ::wxSetWorkingDirectory(homeDir);
     // Load all of the XRC files that will be used. You can put everything
     // into one giant XRC file if you wanted, but then they become more
-    // diffcult to manage, and harder to reuse in later projects.
+    // difficult to manage, and harder to reuse in later projects.
     // The menubar
-    if (!wxXmlResource::Get()->Load(DoFindMenuFile(ManagerST::Get()->GetInstallDir(), wxT("2.0"))))
+    if (!wxXmlResource::Get()->Load(DoFindMenuFile(ManagerST::Get()->GetInstallDir())))
         return false;
 
     // keep the startup directory
@@ -950,9 +950,8 @@ void CodeLiteApp::MSWReadRegistry()
 #endif
 }
 
-wxString CodeLiteApp::DoFindMenuFile(const wxString& installDirectory, const wxString& requiredVersion)
+wxString CodeLiteApp::DoFindMenuFile(const wxString& installDirectory)
 {
-    wxUnusedVar(requiredVersion);
     wxFileName menu_xrc{ installDirectory, MENU_XRC };
     menu_xrc.AppendDir("rc");
     return menu_xrc.GetFullPath();

LiteEditor/app.cpp

@@ -59,7 +59,7 @@ class CodeLiteApp : public wxApp
     bool IsSingleInstance(const wxCmdLineParser& parser);
     void DoCopyGdbPrinters();
     void MSWReadRegistry();
-    wxString DoFindMenuFile(const wxString& installDirectory, const wxString& requiredVersion);
+    wxString DoFindMenuFile(const wxString& installDirectory);
     void AdjustPathForCygwinIfNeeded();
     void AdjustPathForMSYSIfNeeded();
     void PrintUsage(const wxCmdLineParser& parser);

LiteEditor/app.h

@@ -142,10 +142,6 @@ struct SFileSort {
 
 //----------------------------------------------------------------------------------
 
-wxBitmap ContextCpp::m_cppFileBmp = wxNullBitmap;
-wxBitmap ContextCpp::m_hFileBmp = wxNullBitmap;
-wxBitmap ContextCpp::m_otherFileBmp = wxNullBitmap;
-
 BEGIN_EVENT_TABLE(ContextCpp, wxEvtHandler)
 EVT_UPDATE_UI(XRCID("find_decl"), ContextCpp::OnUpdateUI)
 EVT_UPDATE_UI(XRCID("find_impl"), ContextCpp::OnUpdateUI)
@@ -1536,15 +1532,6 @@ void ContextCpp::ApplySettings()
 
     DoApplySettings(lexPtr);
 
-    // create all images used by the cpp context
-    if (!m_cppFileBmp.IsOk()) {
-        // Initialise the file bitmaps
-        BitmapLoader* bmpLoader = PluginManager::Get()->GetStdIcons();
-        m_cppFileBmp = bmpLoader->LoadBitmap("mime-cpp");
-        m_hFileBmp = bmpLoader->LoadBitmap("mime-h");
-        m_otherFileBmp = bmpLoader->LoadBitmap("mime-txt");
-    }
-
     // delete uneeded commands
     rCtrl.CmdKeyClear('/', wxSTC_KEYMOD_CTRL);
     rCtrl.CmdKeyClear('/', wxSTC_KEYMOD_CTRL | wxSTC_KEYMOD_SHIFT);

LiteEditor/context_cpp.cpp

@@ -42,10 +42,6 @@ class ContextCpp : public ContextBase
     std::map<wxString, int> m_propertyInt;
     wxMenu* m_rclickMenu;
 
-    static wxBitmap m_cppFileBmp;
-    static wxBitmap m_hFileBmp;
-    static wxBitmap m_otherFileBmp;
-
 protected:
     void OnShowCodeNavMenu(clCodeCompletionEvent& e);
     void OnCodeCompleteFiles(clCodeCompletionEvent& event);

LiteEditor/context_cpp.h

@@ -259,7 +259,6 @@ Manager::Manager(void)
     , m_frameLineno(wxNOT_FOUND)
     , m_watchDlg(NULL)
     , m_retagInProgress(false)
-    , m_repositionEditor(true)
 {
     Bind(wxEVT_RESTART_CODELITE, &Manager::OnRestart, this);
     Bind(wxEVT_FORCE_RESTART_CODELITE, &Manager::OnForcedRestart, this);
@@ -3425,6 +3424,5 @@ void Manager::OnDebuggerAtFileLine(clDebugEvent& event)
 
         DbgMarkDebuggerLine(fileName, lineNumber);
         UpdateDebuggerPane();
-        SetRepositionEditor(true);
     }
 }

LiteEditor/manager.cpp

@@ -101,8 +101,6 @@ class Manager : public wxEvtHandler, public IDebuggerObserver
     wxArrayString m_dbgWatchExpressions;
     DisplayVariableDlg* m_watchDlg;
     bool m_retagInProgress;
-    bool m_repositionEditor; // flag used for debugging, should editor be repositioned after user updates like "add
-                             // watch"
     DbgStackInfo m_dbgCurrentFrameInfo;
     PerspectiveManager m_perspectiveManager;
     clDebuggerTerminalPOSIX m_debuggerTerminal;
@@ -133,9 +131,6 @@ class Manager : public wxEvtHandler, public IDebuggerObserver
     bool IsShutdownInProgress() const { return m_isShutdown; }
     void SetShutdownInProgress(bool b) { m_isShutdown = b; }
 
-    bool GetRepositionEditor() const { return m_repositionEditor; }
-    void SetRepositionEditor(bool b) { m_repositionEditor = b; }
-
     void OnRestart(clCommandEvent& event);
     void OnForcedRestart(clCommandEvent& event);
     void OnFindInFilesDismissed(clFindInFilesEvent& event);

LiteEditor/manager.h

@@ -221,10 +221,6 @@ void WatchesTable::UpdateVariableObjects()
 
 void WatchesTable::RefreshValues(bool repositionEditor)
 {
-    // indicate in the global manager if we want to actually reposition the editor's position after the
-    // dbgr->QueryFileLine() refresh
-    ManagerST::Get()->SetRepositionEditor(repositionEditor);
-
     // loop over the childrens, if we got a valid variable object, re-evaluate it
     wxTreeItemId root = m_listTable->GetRootItem();
     if(root.IsOk() == false)

LiteEditor/simpletable.cpp

@@ -406,9 +406,8 @@ void PHPCodeCompletion::OnTypeinfoTip(clCodeCompletionEvent& e)
     }
 }
 
-PHPLocation::Ptr_t PHPCodeCompletion::FindDefinition(IEditor* editor, int pos)
+PHPLocation::Ptr_t PHPCodeCompletion::FindDefinition(IEditor* editor)
 {
-    wxUnusedVar(pos);
     CHECK_PHP_WORKSPACE_RET_NULL();
     PHPLocation::Ptr_t loc; // Null
     if(IsPHPFile(editor)) {
@@ -646,16 +645,16 @@ void PHPCodeCompletion::OnQuickJump(clCodeCompletionEvent& e)
     CHECK_EXPECTED_RETURN(IsPHPFile(editor), true);
 
     e.Skip(false);
-    GotoDefinition(editor, editor->GetCurrentPosition());
+    GotoDefinition(editor);
 }
 
-void PHPCodeCompletion::GotoDefinition(IEditor* editor, int pos)
+void PHPCodeCompletion::GotoDefinition(IEditor* editor)
 {
     CHECK_PTR_RET(editor);
     wxStyledTextCtrl* sci = editor->GetCtrl();
     CHECK_PTR_RET(sci);
 
-    PHPLocation::Ptr_t definitionLocation = FindDefinition(editor, pos);
+    PHPLocation::Ptr_t definitionLocation = FindDefinition(editor);
     CHECK_PTR_RET(definitionLocation);
 
     // Open the file (make sure we use the 'OpenFile' so we will get a browsing record)