walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Windows Qt compilation fixes. 

FileLister::RecursiveAddFiles failed to compile in Windows when GUI was compiled. Since that method wasn't used in Qt build I ifdeffed it out.

Also removed vcl related code from checkdialog since that was removed from release.
This commit is contained in:
unknown 2009-03-07 18:53:50 +02:00
parent 15fc47660c
commit bc6e1a74d0
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/checkdialog.cpp
View File

@ -84,7 +84,7 @@ CheckDialog::CheckDialog(QSettings &programSettings) :
mSecurity = AddCheckbox(layout, tr("Security"), tr("Check security"), false); mSecurity = AddCheckbox(layout, tr("Security"), tr("Check security"), false);
//Vcl //Vcl
mVcl = AddCheckbox(layout, tr("Vcl"), tr("Check vcl"), false); //mVcl = AddCheckbox(layout, tr("Vcl"), tr("Check vcl"), false);
@ -227,7 +227,7 @@ Settings CheckDialog::GetSettings()
result._xml = CheckStateToBool(mXml->checkState()); result._xml = CheckStateToBool(mXml->checkState());
result._unusedFunctions = CheckStateToBool(mUnusedFunctions->checkState()); result._unusedFunctions = CheckStateToBool(mUnusedFunctions->checkState());
result._security = CheckStateToBool(mSecurity->checkState()); result._security = CheckStateToBool(mSecurity->checkState());
result._vcl = CheckStateToBool(mVcl->checkState()); //result._vcl = CheckStateToBool(mVcl->checkState());
result._jobs = mJobs->text().toInt(); result._jobs = mJobs->text().toInt();
return result; return result;
} }

14
src/filelister.cpp
View File

@ -32,8 +32,10 @@
#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__) #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
#include <windows.h> #include <windows.h>
#include <shlwapi.h> #include <shlwapi.h>
#if !defined(QT_CORE_LIB)
#pragma comment(lib, "shlwapi.lib") #pragma comment(lib, "shlwapi.lib")
#endif #endif
#endif
std::string FileLister::simplifyPath(const char *originalPath) std::string FileLister::simplifyPath(const char *originalPath)
{ {
@ -150,12 +152,22 @@ void FileLister::RecursiveAddFiles(std::vector<std::string> &filenames, const st
} }
#endif #endif
///////////////////////////////////////////////////////////////////////////////
////// This code is for MinGW and Qt ///////////////////////////
///////////////////////////////////////////////////////////////////////////////
#if defined(__MINGW32__) && defined(QT_CORE_LIB)
void FileLister::RecursiveAddFiles(std::vector<std::string> &filenames, const std::string &path, bool recursive)
{
//This method is not used by Qt build
}
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
////// This code is for Borland C++ and Visual C++ //////////////////////////// ////// This code is for Borland C++ and Visual C++ ////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__) #if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)) && !defined(QT_CORE_LIB)
void FileLister::RecursiveAddFiles(std::vector<std::string> &filenames, const std::string &path, bool recursive) void FileLister::RecursiveAddFiles(std::vector<std::string> &filenames, const std::string &path, bool recursive)
{ {