kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ERR: Needed virtual destructor to correspond to virtual functions. Also added several std:: qualifiers to string.

This commit is contained in:
Brad King 2001-06-12 12:20:33 -04:00
parent f03ee2a53d
commit 25afe09ac8
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/FLTKDialog/CMakeSetupGUI.h
View File

@ -14,6 +14,7 @@
class CMakeSetupGUI { class CMakeSetupGUI {
public: public:
CMakeSetupGUI(); CMakeSetupGUI();
virtual ~CMakeSetupGUI();
Fl_Window *dialogWindow; Fl_Window *dialogWindow;
Fl_Input *sourcePathTextInput; Fl_Input *sourcePathTextInput;
private: private:
@ -35,7 +36,6 @@ private:
public: public:
Fl_Scroll *cacheValuesScroll; Fl_Scroll *cacheValuesScroll;
Fl_Pack *propertyListPack; Fl_Pack *propertyListPack;
~CMakeSetupGUI();
virtual void Close(void); virtual void Close(void);
virtual void BuildProjectFiles(void); virtual void BuildProjectFiles(void);
virtual void BrowseForSourcePath(void); virtual void BrowseForSourcePath(void);

16
Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
View File

@ -132,7 +132,7 @@ CMakeSetupGUIImplementation
return false; return false;
} }
string expandedAbsolutePath = ExpandPathAndMakeItAbsolute( path ); std::string expandedAbsolutePath = ExpandPathAndMakeItAbsolute( path );
sourcePathTextInput->value( expandedAbsolutePath.c_str() ); sourcePathTextInput->value( expandedAbsolutePath.c_str() );
@ -152,9 +152,9 @@ CMakeSetupGUIImplementation
/** /**
* Expand environment variables in the path and make it absolute * Expand environment variables in the path and make it absolute
*/ */
string std::string
CMakeSetupGUIImplementation CMakeSetupGUIImplementation
::ExpandPathAndMakeItAbsolute( const string & inputPath ) const ::ExpandPathAndMakeItAbsolute( const std::string & inputPath ) const
{ {
char expandedPath[3000]; char expandedPath[3000];
@ -163,7 +163,7 @@ CMakeSetupGUIImplementation
char absolutePath[3000]; char absolutePath[3000];
filename_absolute( absolutePath, expandedPath ); filename_absolute( absolutePath, expandedPath );
string expandedAbsolutePath = absolutePath; std::string expandedAbsolutePath = absolutePath;
return expandedAbsolutePath; return expandedAbsolutePath;
@ -184,7 +184,7 @@ CMakeSetupGUIImplementation
return false; return false;
} }
string expandedAbsolutePath = ExpandPathAndMakeItAbsolute( path ); std::string expandedAbsolutePath = ExpandPathAndMakeItAbsolute( path );
binaryPathTextInput->value( expandedAbsolutePath.c_str() ); binaryPathTextInput->value( expandedAbsolutePath.c_str() );
@ -212,7 +212,7 @@ CMakeSetupGUIImplementation
*/ */
bool bool
CMakeSetupGUIImplementation CMakeSetupGUIImplementation
::VerifyBinaryPath( const string & path ) const ::VerifyBinaryPath( const std::string & path ) const
{ {
bool pathIsOK = false; bool pathIsOK = false;
@ -229,7 +229,7 @@ CMakeSetupGUIImplementation
if( userWantsToCreateDirectory ) if( userWantsToCreateDirectory )
{ {
string command = "mkdir "; std::string command = "mkdir ";
command += path; command += path;
system( command.c_str() ); system( command.c_str() );
pathIsOK = true; pathIsOK = true;
@ -251,7 +251,7 @@ CMakeSetupGUIImplementation
*/ */
bool bool
CMakeSetupGUIImplementation CMakeSetupGUIImplementation
::VerifySourcePath( const string & path ) const ::VerifySourcePath( const std::string & path ) const
{ {
if( !filename_isdir( path.c_str() ) ) if( !filename_isdir( path.c_str() ) )

6
Source/FLTKDialog/CMakeSetupGUIImplementation.h
View File

@ -34,9 +34,9 @@ public:
virtual void FillCacheManagerFromCacheGUI( void ); virtual void FillCacheManagerFromCacheGUI( void );
private: private:
virtual bool VerifyBinaryPath( const string & path ) const; virtual bool VerifyBinaryPath( const std::string & path ) const;
virtual bool VerifySourcePath( const string & path ) const; virtual bool VerifySourcePath( const std::string & path ) const;
virtual string ExpandPathAndMakeItAbsolute( const string & inputPath ) const; virtual std::string ExpandPathAndMakeItAbsolute( const std::string & inputPath ) const;
private: private:
fltk::PropertyList m_CacheEntriesList; fltk::PropertyList m_CacheEntriesList;