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

Merge branch 'master' of git@github.com:danmar/cppcheck

This commit is contained in:
Vesa Pikki 2009-07-04 11:07:23 +03:00
parent e656c951e5 462117485d
commit d5762b8003
20 changed files with 302 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
gui/cppcheck_de.ts
View File

@ -18,7 +18,7 @@
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
<translation type="unfinished"></translation>
</message>
<message>
<message utf8="true">
<location filename="about.ui" line="65"/>
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
<translation type="unfinished"></translation>
@ -117,9 +117,9 @@ kate -l(line) (file)</source>
<message>
<location filename="main.ui" line="26"/>
<location filename="mainwindow.cpp" line="239"/>
<location filename="mainwindow.cpp" line="446"/>
<location filename="mainwindow.cpp" line="544"/>
<location filename="mainwindow.cpp" line="562"/>
<location filename="mainwindow.cpp" line="448"/>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="564"/>
<source>Cppcheck</source>
<translation type="unfinished"></translation>
</message>
@ -299,84 +299,69 @@ kate -l(line) (file)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="442"/>
<location filename="mainwindow.cpp" line="444"/>
<source>Cannot exit while checking.
Stop the checking before exiting.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="488"/>
<location filename="mainwindow.cpp" line="490"/>
<source>License</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="495"/>
<location filename="mainwindow.cpp" line="497"/>
<source>Authors</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="503"/>
<location filename="mainwindow.cpp" line="505"/>
<source>XML files (*.xml);;Text files (*.txt)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="505"/>
<location filename="mainwindow.cpp" line="507"/>
<source>Save the report file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="513"/>
<location filename="mainwindow.cpp" line="515"/>
<source>XML files (*.xml)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="548"/>
<source>Cppcheck - %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="563"/>
<source>Failed to change language:
<location filename="mainwindow.cpp" line="565"/>
<source>Failed to change the language:
%1</source>
%1
</source>
<oldsource>Failed to change language:
%1</oldsource>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="translationhandler.cpp" line="12"/>
<source>English</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="13"/>
<source>Finnish</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="14"/>
<source>Swedish</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="15"/>
<source>German</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="16"/>
<source>Russian</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="69"/>
<location filename="translationhandler.cpp" line="88"/>
<source>Incorrect language specified!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="77"/>
<location filename="translationhandler.cpp" line="96"/>
<source>Language file %1.qm not found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="104"/>
<source>Failed to load language from file %1</source>
<translation type="unfinished"></translation>
</message>
@ -429,7 +414,8 @@ Stop the checking before exiting.</source>
</message>
<message>
<location filename="resultstree.cpp" line="426"/>
<source>You can open this error by specifying applications in program&apos;s settings.</source>
<source>Configure the text file viewer program in Cppcheck preferences/Applications.</source>
<oldsource>You can open this error by specifying applications in program&apos;s settings.</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

64
gui/cppcheck_en.ts
View File

@ -18,7 +18,7 @@
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
<translation>Cppcheck - A tool for static C/C++ code analysis.</translation>
</message>
<message>
<message utf8="true">
<location filename="about.ui" line="65"/>
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
<translation>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</translation>
@ -130,9 +130,9 @@ kate -l(line) (file)</translation>
<message>
<location filename="main.ui" line="26"/>
<location filename="mainwindow.cpp" line="239"/>
<location filename="mainwindow.cpp" line="446"/>
<location filename="mainwindow.cpp" line="544"/>
<location filename="mainwindow.cpp" line="562"/>
<location filename="mainwindow.cpp" line="448"/>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="564"/>
<source>Cppcheck</source>
<translation>Cppcheck</translation>
</message>
@ -312,7 +312,7 @@ kate -l(line) (file)</translation>
<translation>No suitable files found to check!</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="442"/>
<location filename="mainwindow.cpp" line="444"/>
<source>Cannot exit while checking.
Stop the checking before exiting.</source>
@ -321,41 +321,46 @@ Stop the checking before exiting.</source>
Stop the checking before exiting.</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="488"/>
<location filename="mainwindow.cpp" line="490"/>
<source>License</source>
<translation>License</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="495"/>
<location filename="mainwindow.cpp" line="497"/>
<source>Authors</source>
<translation>Authors</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="503"/>
<location filename="mainwindow.cpp" line="505"/>
<source>XML files (*.xml);;Text files (*.txt)</source>
<translation>XML files (*.xml);;Text files (*.txt)</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="505"/>
<location filename="mainwindow.cpp" line="507"/>
<source>Save the report file</source>
<translation>Save the report file</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="513"/>
<location filename="mainwindow.cpp" line="515"/>
<source>XML files (*.xml)</source>
<translation>XML files (*.xml)</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="548"/>
<source>Cppcheck - %1</source>
<translation>Cppcheck - %1</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="563"/>
<source>Failed to change language:
<location filename="mainwindow.cpp" line="565"/>
<source>Failed to change the language:
%1</source>
<translation>Failed to change language:
%1
</source>
<oldsource>Failed to change language:
%1</oldsource>
<translation type="unfinished">Failed to change language:
%1</translation>
</message>
@ -363,37 +368,37 @@ Stop the checking before exiting.</translation>
<context>
<name>QObject</name>
<message>
<location filename="translationhandler.cpp" line="12"/>
<source>English</source>
<translation>English</translation>
<translation type="obsolete">English</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="13"/>
<source>Finnish</source>
<translation>Finnish</translation>
<translation type="obsolete">Finnish</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="14"/>
<source>Swedish</source>
<translation>Swedish</translation>
<translation type="obsolete">Swedish</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="15"/>
<source>German</source>
<translation>German</translation>
<translation type="obsolete">German</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="16"/>
<source>Russian</source>
<translation>Russian</translation>
<translation type="obsolete">Russian</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="69"/>
<location filename="translationhandler.cpp" line="88"/>
<source>Incorrect language specified!</source>
<translation>Incorrect language specified!</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="77"/>
<location filename="translationhandler.cpp" line="96"/>
<source>Language file %1.qm not found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="104"/>
<source>Failed to load language from file %1</source>
<translation>Failed to load language from file %1</translation>
</message>
@ -446,8 +451,9 @@ Stop the checking before exiting.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="426"/>
<source>You can open this error by specifying applications in program&apos;s settings.</source>
<translation>You can open this error by specifying applications in program&apos;s settings.</translation>
<source>Configure the text file viewer program in Cppcheck preferences/Applications.</source>
<oldsource>You can open this error by specifying applications in program&apos;s settings.</oldsource>
<translation type="unfinished">You can open this error by specifying applications in program&apos;s settings.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="471"/>

64
gui/cppcheck_fi.ts
View File

@ -18,7 +18,7 @@
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
<translation>Cppcheck - Työkalu C/C++ koodin staattiseen analysointiin.</translation>
</message>
<message>
<message utf8="true">
<location filename="about.ui" line="65"/>
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
<translation>Copyright (C) 2007-2009 Daniel Marjamäki ja cppcheck tiimi.</translation>
@ -132,9 +132,9 @@ kate -l(line) (file)
<message>
<location filename="main.ui" line="26"/>
<location filename="mainwindow.cpp" line="239"/>
<location filename="mainwindow.cpp" line="446"/>
<location filename="mainwindow.cpp" line="544"/>
<location filename="mainwindow.cpp" line="562"/>
<location filename="mainwindow.cpp" line="448"/>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="564"/>
<source>Cppcheck</source>
<translation>Cppcheck</translation>
</message>
@ -314,7 +314,7 @@ kate -l(line) (file)
<translation>Tarkistettavaksi sopivia tiedostoja ei löytynyt!</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="442"/>
<location filename="mainwindow.cpp" line="444"/>
<source>Cannot exit while checking.
Stop the checking before exiting.</source>
@ -323,77 +323,82 @@ Stop the checking before exiting.</source>
Lopeta tarkistus ennen ohjelman sammuttamista.</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="488"/>
<location filename="mainwindow.cpp" line="490"/>
<source>License</source>
<translation>Lisenssi</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="495"/>
<location filename="mainwindow.cpp" line="497"/>
<source>Authors</source>
<translation>Tekijät</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="503"/>
<location filename="mainwindow.cpp" line="505"/>
<source>XML files (*.xml);;Text files (*.txt)</source>
<translation>XML-tiedostot (*.xml);;Tekstitiedostot (*.txt)</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="505"/>
<location filename="mainwindow.cpp" line="507"/>
<source>Save the report file</source>
<translation>Tallenna raportti</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="513"/>
<location filename="mainwindow.cpp" line="515"/>
<source>XML files (*.xml)</source>
<translation>XML-tiedostot (*xml)</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="548"/>
<source>Cppcheck - %1</source>
<translation>Cppcheck - %1</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="563"/>
<source>Failed to change language:
<location filename="mainwindow.cpp" line="565"/>
<source>Failed to change the language:
%1</source>
<translation>Kielen %1 vaihto epäonnistui</translation>
%1
</source>
<oldsource>Failed to change language:
%1</oldsource>
<translation type="unfinished">Kielen %1 vaihto epäonnistui</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="translationhandler.cpp" line="12"/>
<source>English</source>
<translation>Englanti</translation>
<translation type="obsolete">Englanti</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="13"/>
<source>Finnish</source>
<translation>Suomi</translation>
<translation type="obsolete">Suomi</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="14"/>
<source>Swedish</source>
<translation>Ruotsi</translation>
<translation type="obsolete">Ruotsi</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="15"/>
<source>German</source>
<translation>Saksa</translation>
<translation type="obsolete">Saksa</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="16"/>
<source>Russian</source>
<translation>Venäjä</translation>
<translation type="obsolete">Venäjä</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="69"/>
<location filename="translationhandler.cpp" line="88"/>
<source>Incorrect language specified!</source>
<translation>Virheellinen kieli valittu!</translation>
</message>
<message>
<location filename="translationhandler.cpp" line="77"/>
<location filename="translationhandler.cpp" line="96"/>
<source>Language file %1.qm not found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="104"/>
<source>Failed to load language from file %1</source>
<translation>Kielen lataaminen tiedostosta %1 epäonnistui</translation>
</message>
@ -446,8 +451,9 @@ Lopeta tarkistus ennen ohjelman sammuttamista.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="426"/>
<source>You can open this error by specifying applications in program&apos;s settings.</source>
<translation>Voit asetuksista määritellä muita ohjelmia joilla avata tämän virheen sisältävän tiedoston.</translation>
<source>Configure the text file viewer program in Cppcheck preferences/Applications.</source>
<oldsource>You can open this error by specifying applications in program&apos;s settings.</oldsource>
<translation type="unfinished">Voit asetuksista määritellä muita ohjelmia joilla avata tämän virheen sisältävän tiedoston.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="471"/>

70
gui/cppcheck_ru.ts
View File

@ -18,7 +18,7 @@
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
<translation type="unfinished"></translation>
</message>
<message>
<message utf8="true">
<location filename="about.ui" line="65"/>
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
<translation type="unfinished"></translation>
@ -119,9 +119,9 @@ kate -l(line) (file)</source>
<message>
<location filename="main.ui" line="26"/>
<location filename="mainwindow.cpp" line="239"/>
<location filename="mainwindow.cpp" line="446"/>
<location filename="mainwindow.cpp" line="544"/>
<location filename="mainwindow.cpp" line="562"/>
<location filename="mainwindow.cpp" line="448"/>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="564"/>
<source>Cppcheck</source>
<translation type="unfinished"></translation>
</message>
@ -301,84 +301,69 @@ kate -l(line) (file)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="442"/>
<location filename="mainwindow.cpp" line="444"/>
<source>Cannot exit while checking.
Stop the checking before exiting.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="488"/>
<location filename="mainwindow.cpp" line="490"/>
<source>License</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="495"/>
<location filename="mainwindow.cpp" line="497"/>
<source>Authors</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="503"/>
<location filename="mainwindow.cpp" line="505"/>
<source>XML files (*.xml);;Text files (*.txt)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="505"/>
<location filename="mainwindow.cpp" line="507"/>
<source>Save the report file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="513"/>
<location filename="mainwindow.cpp" line="515"/>
<source>XML files (*.xml)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="548"/>
<source>Cppcheck - %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="563"/>
<source>Failed to change language:
<location filename="mainwindow.cpp" line="565"/>
<source>Failed to change the language:
%1</source>
%1
</source>
<oldsource>Failed to change language:
%1</oldsource>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="translationhandler.cpp" line="12"/>
<source>English</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="13"/>
<source>Finnish</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="14"/>
<source>Swedish</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="15"/>
<source>German</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="16"/>
<source>Russian</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="69"/>
<location filename="translationhandler.cpp" line="88"/>
<source>Incorrect language specified!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="77"/>
<location filename="translationhandler.cpp" line="96"/>
<source>Language file %1.qm not found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="104"/>
<source>Failed to load language from file %1</source>
<translation type="unfinished"></translation>
</message>
@ -431,7 +416,8 @@ Stop the checking before exiting.</source>
</message>
<message>
<location filename="resultstree.cpp" line="426"/>
<source>You can open this error by specifying applications in program&apos;s settings.</source>
<source>Configure the text file viewer program in Cppcheck preferences/Applications.</source>
<oldsource>You can open this error by specifying applications in program&apos;s settings.</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

70
gui/cppcheck_se.ts
View File

@ -18,7 +18,7 @@
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
<translation type="unfinished"></translation>
</message>
<message>
<message utf8="true">
<location filename="about.ui" line="65"/>
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
<translation type="unfinished"></translation>
@ -119,9 +119,9 @@ kate -l(line) (file)</source>
<message>
<location filename="main.ui" line="26"/>
<location filename="mainwindow.cpp" line="239"/>
<location filename="mainwindow.cpp" line="446"/>
<location filename="mainwindow.cpp" line="544"/>
<location filename="mainwindow.cpp" line="562"/>
<location filename="mainwindow.cpp" line="448"/>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="564"/>
<source>Cppcheck</source>
<translation type="unfinished"></translation>
</message>
@ -301,84 +301,69 @@ kate -l(line) (file)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="442"/>
<location filename="mainwindow.cpp" line="444"/>
<source>Cannot exit while checking.
Stop the checking before exiting.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="488"/>
<location filename="mainwindow.cpp" line="490"/>
<source>License</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="495"/>
<location filename="mainwindow.cpp" line="497"/>
<source>Authors</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="503"/>
<location filename="mainwindow.cpp" line="505"/>
<source>XML files (*.xml);;Text files (*.txt)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="505"/>
<location filename="mainwindow.cpp" line="507"/>
<source>Save the report file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="513"/>
<location filename="mainwindow.cpp" line="515"/>
<source>XML files (*.xml)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="546"/>
<location filename="mainwindow.cpp" line="548"/>
<source>Cppcheck - %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="563"/>
<source>Failed to change language:
<location filename="mainwindow.cpp" line="565"/>
<source>Failed to change the language:
%1</source>
%1
</source>
<oldsource>Failed to change language:
%1</oldsource>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="translationhandler.cpp" line="12"/>
<source>English</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="13"/>
<source>Finnish</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="14"/>
<source>Swedish</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="15"/>
<source>German</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="16"/>
<source>Russian</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="69"/>
<location filename="translationhandler.cpp" line="88"/>
<source>Incorrect language specified!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="77"/>
<location filename="translationhandler.cpp" line="96"/>
<source>Language file %1.qm not found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationhandler.cpp" line="104"/>
<source>Failed to load language from file %1</source>
<translation type="unfinished"></translation>
</message>
@ -431,7 +416,8 @@ Stop the checking before exiting.</source>
</message>
<message>
<location filename="resultstree.cpp" line="426"/>
<source>You can open this error by specifying applications in program&apos;s settings.</source>
<source>Configure the text file viewer program in Cppcheck preferences/Applications.</source>
<oldsource>You can open this error by specifying applications in program&apos;s settings.</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

16
gui/mainwindow.cpp
View File

@ -161,11 +161,8 @@ void MainWindow::LoadSettings()
mUI.mActionToolbar->setChecked(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
mUI.mToolBar->setVisible(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
mApplications->LoadSettings(mSettings);
QString error = "";
SetLanguage(mSettings->value(SETTINGS_LANGUAGE, mTranslation->SuggestLanguage()).toInt());
}
@ -295,6 +292,13 @@ Settings MainWindow::GetCppcheckSettings()
{
result.addAutoAllocClass(classname.toStdString());
}
QStringList dirs = pfile.GetIncludeDirs();
QString dir;
foreach(dir, dirs)
{
result._includePaths.push_back(dir.toStdString());
}
}
}
@ -564,9 +568,9 @@ void MainWindow::SetLanguage(int index)
QString error;
if (!mTranslation->SetLanguage(index, error))
{
QMessageBox msg(QMessageBox::Warning,
QMessageBox msg(QMessageBox::Critical,
tr("Cppcheck"),
QString(tr("Failed to change language:\n\n%1")).arg(error),
QString(tr("Failed to change the language:\n\n%1\n\n")).arg(error),
QMessageBox::Ok,
this);
@ -582,7 +586,7 @@ void MainWindow::SetLanguage(int index)
if (languages.size() <= actions.size())
{
for (int i = 0;i < languages.size();i++)
for (int i = 0; i < languages.size(); i++)
{
actions[i]->setText(tr(languages[i].toLatin1()));
}

53
gui/projectfile.cpp
View File

@ -26,6 +26,9 @@ static const char ProjectElementName[] = "project";
static const char AllocElementName[] = "autodealloc";
static const char ClassElementName[] = "class";
static const char ClassNameAttrib[] = "name";
static const char IncludDirElementName[] = "includedir";
static const char DirElementName[] = "dir";
static const char DirNameAttrib[] = "name";
ProjectFile::ProjectFile(QObject *parent) :
QObject(parent)
@ -60,6 +63,9 @@ bool ProjectFile::Read(const QString &filename)
// Find allocelement from inside project element
if (insideProject && xmlReader.name() == AllocElementName)
ReadAutoAllocClasses(xmlReader);
if (insideProject && xmlReader.name() == IncludDirElementName)
ReadIncludeDirs(xmlReader);
break;
case QXmlStreamReader::EndElement:
@ -90,6 +96,11 @@ QStringList ProjectFile::GetDeAllocatedClasses() const
return mDeAllocatedClasses;
}
QStringList ProjectFile::GetIncludeDirs() const
{
return mIncludeDirs;
}
void ProjectFile::ReadAutoAllocClasses(QXmlStreamReader &reader)
{
QXmlStreamReader::TokenType type;
@ -131,3 +142,45 @@ void ProjectFile::ReadAutoAllocClasses(QXmlStreamReader &reader)
}
while (!allRead);
}
void ProjectFile::ReadIncludeDirs(QXmlStreamReader &reader)
{
QXmlStreamReader::TokenType type;
bool allRead = false;
do
{
type = reader.readNext();
switch (type)
{
case QXmlStreamReader::StartElement:
// Read dir-elements
if (reader.name().toString() == DirElementName)
{
QXmlStreamAttributes attribs = reader.attributes();
QString name = attribs.value("", DirNameAttrib).toString();
if (!name.isEmpty())
mIncludeDirs << name;
}
break;
case QXmlStreamReader::EndElement:
if (reader.name().toString() == IncludDirElementName)
allRead = true;
break;
// Not handled
case QXmlStreamReader::NoToken:
case QXmlStreamReader::Invalid:
case QXmlStreamReader::StartDocument:
case QXmlStreamReader::EndDocument:
case QXmlStreamReader::Characters:
case QXmlStreamReader::Comment:
case QXmlStreamReader::DTD:
case QXmlStreamReader::EntityReference:
case QXmlStreamReader::ProcessingInstruction:
break;
}
}
while (!allRead);
}

21
gui/projectfile.h
View File

@ -49,9 +49,25 @@ public:
*/
QStringList GetDeAllocatedClasses() const;
/**
* @brief Get list of include directories.
* @return list of directories.
*/
QStringList GetIncludeDirs() const;
protected:
/**
* @brief Read list of automatically deallocated classes from XML.
* @param reader XML stream reader.
*/
void ReadAutoAllocClasses(QXmlStreamReader &reader);
/**
* @brief Read list of include directories from XML.
* @param reader XML stream reader.
*/
void ReadIncludeDirs(QXmlStreamReader &reader);
private:
/**
@ -63,6 +79,11 @@ private:
* @brief List of automatically deallocated classes.
*/
QStringList mDeAllocatedClasses;
/**
* @brief List of include directories used to search include files.
*/
QStringList mIncludeDirs;
};
#endif // PROJECT_FILE_H

4
gui/resultstree.cpp
View File

@ -421,9 +421,9 @@ void ResultsTree::StartApplication(QStandardItem *target, int application)
//If there are now application's specified, tell the user about it
if (mApplications->GetApplicationCount() == 0)
{
QMessageBox msg(QMessageBox::Warning,
QMessageBox msg(QMessageBox::Information,
tr("Cppcheck"),
tr("You can open this error by specifying applications in program's settings."),
tr("Configure the text file viewer program in Cppcheck preferences/Applications."),
QMessageBox::Ok,
this);
msg.exec();

3
gui/resultsview.ui
View File

@ -26,6 +26,9 @@
<string>Results</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QProgressBar" name="mProgress">
<property name="sizePolicy">

11
gui/translationhandler.cpp
View File

@ -19,6 +19,7 @@
#include "translationhandler.h"
#include <QApplication>
#include <QFile>
#include <QDebug>
TranslationHandler::TranslationHandler(QObject *parent) :
@ -47,7 +48,7 @@ TranslationHandler::TranslationHandler(QObject *parent) :
}
else
{
qDebug() << "Failed to load english translation!";
qDebug() << "Failed to load English translation!";
delete english;
}
}
@ -88,6 +89,14 @@ bool TranslationHandler::SetLanguage(const int index, QString &error)
return false;
}
// Check translation file exists before trying to load it
if (!QFile::exists(mFiles[index]))
{
QString filename(mFiles[index]);
error = QObject::tr("Language file %1.qm not found!");
error = error.arg(mFiles[index]);
return false;
}
//Load the new language
if (!mTranslator->load(mFiles[index]))

2
src/checkclass.cpp
View File

@ -262,7 +262,7 @@ void CheckClass::ClassChecking_VarList_Initialize(const Token *tok1, const Token
void CheckClass::constructors()
{
const char pattern_class[] = "class %var% {";
const char pattern_class[] = "class %var% [{:]";
// Locate class
const Token *tok1 = Token::findmatch(_tokenizer->tokens(), pattern_class);

6
src/cppcheck.cpp
View File

@ -159,7 +159,7 @@ std::string CppCheck::parseFromArgs(int argc, const char* const argv[])
if (path[path.length()-1] != '/' && path[path.length()-1] != '\\')
path += '/';
_includePaths.push_back(path);
_settings._includePaths.push_back(path);
}
// Include paths
@ -344,13 +344,13 @@ unsigned int CppCheck::check()
{
// File content was given as a string
std::istringstream iss(_fileContents[ _filenames[c] ]);
preprocessor.preprocess(iss, filedata, configurations, fname, _includePaths);
preprocessor.preprocess(iss, filedata, configurations, fname, _settings._includePaths);
}
else
{
// Only file name was given, read the content from file
std::ifstream fin(fname.c_str());
preprocessor.preprocess(fin, filedata, configurations, fname, _includePaths);
preprocessor.preprocess(fin, filedata, configurations, fname, _settings._includePaths);
}
int checkCount = 0;

4
src/cppcheck.h
View File

@ -141,10 +141,6 @@ private:
/** Current configuration */
std::string cfg;
/** List of include paths, e.g. "my/includes/" which should be used
for finding include files inside source files. */
std::list<std::string> _includePaths;
std::list<std::string> _xmllist;
};

4
src/settings.h
View File

@ -64,6 +64,10 @@ public:
Default value is 0. */
int _exitCode;
/** List of include paths, e.g. "my/includes/" which should be used
for finding include files inside source files. */
std::list<std::string> _includePaths;
/** Fill list of automaticly deallocated classes */
void autoDealloc(std::istream &istr);

11
src/tokenize.cpp
View File

@ -2656,6 +2656,17 @@ bool Tokenizer::simplifyRedundantParanthesis()
ret = true;
}
if (Token::Match(tok->previous(), "( ( %var% )") && tok->next()->varId() != 0)
{
// We have "( var )", remove the paranthesis
tok = tok->previous();
tok->deleteNext();
tok = tok->next();
tok->deleteNext();
ret = true;
continue;
}
if (Token::Match(tok, "( ( %bool% )") ||
Token::Match(tok, "( ( %num% )"))
{

12
test/testclass.cpp
View File

@ -192,6 +192,18 @@ private:
"};\n");
ASSERT_EQUALS("[test.cpp:10]: (style) Member variable not initialized in the constructor 'Fred::_code'\n", errout.str());
checkUninitVar("class A{};\n"
"\n"
"class B : public A\n"
"{\n"
"public:\n"
" B() {}\n"
"private:\n"
" float f;\n"
"};\n");
ASSERT_EQUALS("[test.cpp:6]: (style) Member variable not initialized in the constructor 'B::f'\n", errout.str());
}
void uninitVarEnum()

3
test/testsimplifytokens.cpp
View File

@ -379,6 +379,9 @@ private:
// remove parantheses..
ASSERT_EQUALS("= p ; ", tok("= (p);"));
ASSERT_EQUALS("if ( a < p ) { } ", tok("if(a<(p)){}"));
ASSERT_EQUALS("void f ( ) { int p ; if ( p == -1 ) { } } ", tok("void f(){int p; if((p)==-1){}}"));
ASSERT_EQUALS("void f ( ) { int p ; if ( -1 == p ) { } } ", tok("void f(){int p; if(-1==(p)){}}"));
ASSERT_EQUALS("void f ( ) { int p ; if ( p ) { } } ", tok("void f(){int p; if((p)){}}"));
// keep parantheses..
ASSERT_EQUALS("= a ; ", tok("= (char)a;"));

10
win_installer/cppcheck.iss
View File

@ -90,8 +90,8 @@ Name: modifypath; Description: &Add {#MyAppName} folder to your system path; Fla
Type: files; Name: {app}\COPYING
[Files]
; Core / command line
Source: ..\Build\Release\cppcheck.exe; DestDir: {app}; Flags: ignoreversion; Components: Core
Source: ..\gui\Release\gui.exe; DestDir: {app}; Flags: ignoreversion; Components: QTGui
Source: ..\COPYING; DestDir: {app}; DestName: COPYING.txt; Flags: ignoreversion; Components: Core
Source: ..\readme.txt; DestDir: {app}; Flags: ignoreversion; Components: Core
Source: ..\AUTHORS; DestDir: {app}; DestName: AUTHORS.txt; Flags: ignoreversion; Components: Core
@ -99,6 +99,14 @@ Source: ..\AUTHORS; DestDir: {app}; DestName: AUTHORS.txt; Flags: ignoreversion;
Source: {#RuntimesFolder}\Microsoft.VC90.CRT.manifest; DestDir: {app}; Components: Core
Source: {#RuntimesFolder}\msvcp90.dll; DestDir: {app}; Components: Core
Source: {#RuntimesFolder}\msvcr90.dll; DestDir: {app}; Components: Core
; GUI executable
Source: ..\gui\Release\gui.exe; DestDir: {app}; Flags: ignoreversion; Components: QTGui
; GUI translations
Source: ..\gui\cppcheck_de.qm; DestDir: {app}; Components: QTGui
Source: ..\gui\cppcheck_en.qm; DestDir: {app}; Components: QTGui
Source: ..\gui\cppcheck_fi.qm; DestDir: {app}; Components: QTGui
Source: ..\gui\cppcheck_ru.qm; DestDir: {app}; Components: QTGui
Source: ..\gui\cppcheck_se.qm; DestDir: {app}; Components: QTGui
; QT runtimes
Source: {#RuntimesFolder}\QtCore4.dll; DestDir: {app}; Components: QTGui
Source: {#RuntimesFolder}\QtGui4.dll; DestDir: {app}; Components: QTGui

7
win_installer/readme.txt
View File

@ -17,11 +17,16 @@ Files the installer needs:
/COPYING
/readme.txt
/AUTHORS
/gui/release/gui.exe
/Release/cppcheck.exe
/win_installer/icon.bmp
/win_installer/LargeLogo.bmp
/win_installer/
/gui/release/gui.exe
/gui/cppcheck_de.qm
/gui/cppcheck_en.qm
/gui/cppcheck_fi.qm
/gui/cppcheck_ru.qm
/gui/cppcheck_se.qm
NOTE: Remember to convert COPYING and AUTHORS to Windows EOL format! Otherwise
Windows Notepad (default viewer) can't show then properly.