From 25afe09ac82b22c491f794eea9851a20f3e45402 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 12 Jun 2001 12:20:33 -0400
Subject: ERR: Needed virtual destructor to correspond to virtual functions.
Also added several std:: qualifiers to string.
---
Source/FLTKDialog/CMakeSetupGUI.h | 2 +-
Source/FLTKDialog/CMakeSetupGUIImplementation.cxx | 16 ++++++++--------
Source/FLTKDialog/CMakeSetupGUIImplementation.h | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Source/FLTKDialog/CMakeSetupGUI.h b/Source/FLTKDialog/CMakeSetupGUI.h
index 1a35110..7524e3c 100644
--- a/Source/FLTKDialog/CMakeSetupGUI.h
+++ b/Source/FLTKDialog/CMakeSetupGUI.h
@@ -14,6 +14,7 @@
class CMakeSetupGUI {
public:
CMakeSetupGUI();
+ virtual ~CMakeSetupGUI();
Fl_Window *dialogWindow;
Fl_Input *sourcePathTextInput;
private:
@@ -35,7 +36,6 @@ private:
public:
Fl_Scroll *cacheValuesScroll;
Fl_Pack *propertyListPack;
- ~CMakeSetupGUI();
virtual void Close(void);
virtual void BuildProjectFiles(void);
virtual void BrowseForSourcePath(void);
diff --git a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
index 2ade1eb..c746d37 100644
--- a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
+++ b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
@@ -132,7 +132,7 @@ CMakeSetupGUIImplementation
return false;
}
- string expandedAbsolutePath = ExpandPathAndMakeItAbsolute( path );
+ std::string expandedAbsolutePath = ExpandPathAndMakeItAbsolute( path );
sourcePathTextInput->value( expandedAbsolutePath.c_str() );
@@ -152,9 +152,9 @@ CMakeSetupGUIImplementation
/**
* Expand environment variables in the path and make it absolute
*/
-string
+std::string
CMakeSetupGUIImplementation
-::ExpandPathAndMakeItAbsolute( const string & inputPath ) const
+::ExpandPathAndMakeItAbsolute( const std::string & inputPath ) const
{
char expandedPath[3000];
@@ -163,7 +163,7 @@ CMakeSetupGUIImplementation
char absolutePath[3000];
filename_absolute( absolutePath, expandedPath );
- string expandedAbsolutePath = absolutePath;
+ std::string expandedAbsolutePath = absolutePath;
return expandedAbsolutePath;
@@ -184,7 +184,7 @@ CMakeSetupGUIImplementation
return false;
}
- string expandedAbsolutePath = ExpandPathAndMakeItAbsolute( path );
+ std::string expandedAbsolutePath = ExpandPathAndMakeItAbsolute( path );
binaryPathTextInput->value( expandedAbsolutePath.c_str() );
@@ -212,7 +212,7 @@ CMakeSetupGUIImplementation
*/
bool
CMakeSetupGUIImplementation
-::VerifyBinaryPath( const string & path ) const
+::VerifyBinaryPath( const std::string & path ) const
{
bool pathIsOK = false;
@@ -229,7 +229,7 @@ CMakeSetupGUIImplementation
if( userWantsToCreateDirectory )
{
- string command = "mkdir ";
+ std::string command = "mkdir ";
command += path;
system( command.c_str() );
pathIsOK = true;
@@ -251,7 +251,7 @@ CMakeSetupGUIImplementation
*/
bool
CMakeSetupGUIImplementation
-::VerifySourcePath( const string & path ) const
+::VerifySourcePath( const std::string & path ) const
{
if( !filename_isdir( path.c_str() ) )
diff --git a/Source/FLTKDialog/CMakeSetupGUIImplementation.h b/Source/FLTKDialog/CMakeSetupGUIImplementation.h
index a7275b9..5133d9f 100644
--- a/Source/FLTKDialog/CMakeSetupGUIImplementation.h
+++ b/Source/FLTKDialog/CMakeSetupGUIImplementation.h
@@ -34,9 +34,9 @@ public:
virtual void FillCacheManagerFromCacheGUI( void );
private:
- virtual bool VerifyBinaryPath( const string & path ) const;
- virtual bool VerifySourcePath( const string & path ) const;
- virtual string ExpandPathAndMakeItAbsolute( const string & inputPath ) const;
+ virtual bool VerifyBinaryPath( const std::string & path ) const;
+ virtual bool VerifySourcePath( const std::string & path ) const;
+ virtual std::string ExpandPathAndMakeItAbsolute( const std::string & inputPath ) const;
private:
fltk::PropertyList m_CacheEntriesList;
--
cgit v0.12