clean up leaks

This commit is contained in:
Bill Hoffman 2002-12-09 10:07:35 -05:00
parent b472d792be
commit fdd4cf7cf4
3 changed files with 14 additions and 8 deletions

View File

@ -5,9 +5,6 @@
#include "CMakeSetup.h" #include "CMakeSetup.h"
#include "CMakeSetupDialog.h" #include "CMakeSetupDialog.h"
#include "CMakeCommandLineInfo.h" #include "CMakeCommandLineInfo.h"
#include "../cmListFileCache.h"
#include "../cmCacheManager.h"
#include "../cmDynamicLoader.h"
#ifdef _DEBUG #ifdef _DEBUG
#define new DEBUG_NEW #define new DEBUG_NEW
@ -76,9 +73,6 @@ BOOL CMakeSetup::InitInstance()
// dismissed with Cancel // dismissed with Cancel
} }
// clean up globals
cmListFileCache::GetInstance()->ClearCache();
cmDynamicLoader::FlushCache();
// Since the dialog has been closed, return FALSE so that we exit the // Since the dialog has been closed, return FALSE so that we exit the
// application, rather than start the application's message pump. // application, rather than start the application's message pump.
return FALSE; return FALSE;

View File

@ -9,10 +9,12 @@
#include "MakeHelp.h" #include "MakeHelp.h"
#include "PathDialog.h" #include "PathDialog.h"
#include "CMakeSetupDialog.h" #include "CMakeSetupDialog.h"
#include "CMakeCommandLineInfo.h" #include "CMakeCommandLineInfo.h"
#include "../cmListFileCache.h"
#include "../cmCacheManager.h" #include "../cmCacheManager.h"
#include "../cmake.h" #include "../cmake.h"
#include "../cmGlobalGenerator.h" #include "../cmGlobalGenerator.h"
#include "../cmDynamicLoader.h"
#ifdef _DEBUG #ifdef _DEBUG
#define new DEBUG_NEW #define new DEBUG_NEW
#undef THIS_FILE #undef THIS_FILE
@ -167,6 +169,14 @@ CMakeSetupDialog::CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo,
} }
CMakeSetupDialog::~CMakeSetupDialog()
{
delete m_CMakeInstance;
// clean up globals
cmListFileCache::GetInstance()->ClearCache();
cmDynamicLoader::FlushCache();
}
void CMakeSetupDialog::DoDataExchange(CDataExchange* pDX) void CMakeSetupDialog::DoDataExchange(CDataExchange* pDX)
{ {
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);

View File

@ -37,7 +37,9 @@ class CMakeSetupDialog : public CDialog
// Construction // Construction
public: public:
CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo, CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo,
CWnd* pParent = NULL); CWnd* pParent = NULL);
~CMakeSetupDialog();
// return the cmake that is currently being used // return the cmake that is currently being used
cmake *GetCMakeInstance() { cmake *GetCMakeInstance() {
return m_CMakeInstance; } return m_CMakeInstance; }