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

GUI: Refactoring, split out getAddonPath()

This commit is contained in:
Daniel Marjamäki 2017-08-03 17:26:16 +02:00
parent 14efd2fdf5
commit 1be04346b3
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gui/checkthread.cpp
View File

@ -72,15 +72,7 @@ void CheckThread::run()
return; return;
} }
QString addonPath; QString addonPath = getAddonPath();
if (QFileInfo(mDataDir + "/threadsafety.py").exists())
addonPath = mDataDir;
else if (QDir(mDataDir + "/addons").exists())
addonPath = mDataDir + "/addons";
else if (mDataDir.endsWith("/cfg")) {
if (QDir(mDataDir.mid(0,mDataDir.size()-3) + "addons").exists())
addonPath = mDataDir.mid(0,mDataDir.size()-3) + "addons";
}
bool needDump = mAddons.contains("y2038") || mAddons.contains("threadsafety") || mAddons.contains("cert") || mAddons.contains("misra"); bool needDump = mAddons.contains("y2038") || mAddons.contains("threadsafety") || mAddons.contains("cert") || mAddons.contains("misra");
QString file = mResult.getNextFile(); QString file = mResult.getNextFile();
@ -182,6 +174,18 @@ void CheckThread::stop()
mCppcheck.terminate(); mCppcheck.terminate();
} }
QString CheckThread::getAddonPath() const {
if (QFileInfo(mDataDir + "/threadsafety.py").exists())
return mDataDir;
else if (QDir(mDataDir + "/addons").exists())
return mDataDir + "/addons";
else if (mDataDir.endsWith("/cfg")) {
if (QDir(mDataDir.mid(0,mDataDir.size()-3) + "addons").exists())
return mDataDir.mid(0,mDataDir.size()-3) + "addons";
}
return QString();
}
void CheckThread::parseAddonErrors(QString err, QString tool) void CheckThread::parseAddonErrors(QString err, QString tool)
{ {
QTextStream in(&err, QIODevice::ReadOnly); QTextStream in(&err, QIODevice::ReadOnly);

2
gui/checkthread.h
View File

@ -106,6 +106,8 @@ protected:
CppCheck mCppcheck; CppCheck mCppcheck;
private: private:
QString getAddonPath() const;
void parseAddonErrors(QString err, QString tool); void parseAddonErrors(QString err, QString tool);
void parseClangErrors(QString err); void parseClangErrors(QString err);