Merge branch 'master' of git@github.com:danmar/cppcheck
This commit is contained in:
commit
d5762b8003
|
@ -18,7 +18,7 @@
|
||||||
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message utf8="true">
|
||||||
<location filename="about.ui" line="65"/>
|
<location filename="about.ui" line="65"/>
|
||||||
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
@ -117,9 +117,9 @@ kate -l(line) (file)</source>
|
||||||
<message>
|
<message>
|
||||||
<location filename="main.ui" line="26"/>
|
<location filename="main.ui" line="26"/>
|
||||||
<location filename="mainwindow.cpp" line="239"/>
|
<location filename="mainwindow.cpp" line="239"/>
|
||||||
<location filename="mainwindow.cpp" line="446"/>
|
<location filename="mainwindow.cpp" line="448"/>
|
||||||
<location filename="mainwindow.cpp" line="544"/>
|
<location filename="mainwindow.cpp" line="546"/>
|
||||||
<location filename="mainwindow.cpp" line="562"/>
|
<location filename="mainwindow.cpp" line="564"/>
|
||||||
<source>Cppcheck</source>
|
<source>Cppcheck</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -299,84 +299,69 @@ kate -l(line) (file)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="442"/>
|
<location filename="mainwindow.cpp" line="444"/>
|
||||||
<source>Cannot exit while checking.
|
<source>Cannot exit while checking.
|
||||||
|
|
||||||
Stop the checking before exiting.</source>
|
Stop the checking before exiting.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="488"/>
|
<location filename="mainwindow.cpp" line="490"/>
|
||||||
<source>License</source>
|
<source>License</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="495"/>
|
<location filename="mainwindow.cpp" line="497"/>
|
||||||
<source>Authors</source>
|
<source>Authors</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="503"/>
|
<location filename="mainwindow.cpp" line="505"/>
|
||||||
<source>XML files (*.xml);;Text files (*.txt)</source>
|
<source>XML files (*.xml);;Text files (*.txt)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="505"/>
|
<location filename="mainwindow.cpp" line="507"/>
|
||||||
<source>Save the report file</source>
|
<source>Save the report file</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="513"/>
|
<location filename="mainwindow.cpp" line="515"/>
|
||||||
<source>XML files (*.xml)</source>
|
<source>XML files (*.xml)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="546"/>
|
<location filename="mainwindow.cpp" line="548"/>
|
||||||
<source>Cppcheck - %1</source>
|
<source>Cppcheck - %1</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="563"/>
|
<location filename="mainwindow.cpp" line="565"/>
|
||||||
<source>Failed to change language:
|
<source>Failed to change the language:
|
||||||
|
|
||||||
%1</source>
|
%1
|
||||||
|
|
||||||
|
</source>
|
||||||
|
<oldsource>Failed to change language:
|
||||||
|
|
||||||
|
%1</oldsource>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>QObject</name>
|
<name>QObject</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="12"/>
|
<location filename="translationhandler.cpp" line="88"/>
|
||||||
<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"/>
|
|
||||||
<source>Incorrect language specified!</source>
|
<source>Incorrect language specified!</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<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>
|
<source>Failed to load language from file %1</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -429,7 +414,8 @@ Stop the checking before exiting.</source>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="resultstree.cpp" line="426"/>
|
<location filename="resultstree.cpp" line="426"/>
|
||||||
<source>You can open this error by specifying applications in program'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's settings.</oldsource>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
||||||
<translation>Cppcheck - A tool for static C/C++ code analysis.</translation>
|
<translation>Cppcheck - A tool for static C/C++ code analysis.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message utf8="true">
|
||||||
<location filename="about.ui" line="65"/>
|
<location filename="about.ui" line="65"/>
|
||||||
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
||||||
<translation>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</translation>
|
<translation>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</translation>
|
||||||
|
@ -130,9 +130,9 @@ kate -l(line) (file)</translation>
|
||||||
<message>
|
<message>
|
||||||
<location filename="main.ui" line="26"/>
|
<location filename="main.ui" line="26"/>
|
||||||
<location filename="mainwindow.cpp" line="239"/>
|
<location filename="mainwindow.cpp" line="239"/>
|
||||||
<location filename="mainwindow.cpp" line="446"/>
|
<location filename="mainwindow.cpp" line="448"/>
|
||||||
<location filename="mainwindow.cpp" line="544"/>
|
<location filename="mainwindow.cpp" line="546"/>
|
||||||
<location filename="mainwindow.cpp" line="562"/>
|
<location filename="mainwindow.cpp" line="564"/>
|
||||||
<source>Cppcheck</source>
|
<source>Cppcheck</source>
|
||||||
<translation>Cppcheck</translation>
|
<translation>Cppcheck</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -312,7 +312,7 @@ kate -l(line) (file)</translation>
|
||||||
<translation>No suitable files found to check!</translation>
|
<translation>No suitable files found to check!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="442"/>
|
<location filename="mainwindow.cpp" line="444"/>
|
||||||
<source>Cannot exit while checking.
|
<source>Cannot exit while checking.
|
||||||
|
|
||||||
Stop the checking before exiting.</source>
|
Stop the checking before exiting.</source>
|
||||||
|
@ -321,41 +321,46 @@ Stop the checking before exiting.</source>
|
||||||
Stop the checking before exiting.</translation>
|
Stop the checking before exiting.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="488"/>
|
<location filename="mainwindow.cpp" line="490"/>
|
||||||
<source>License</source>
|
<source>License</source>
|
||||||
<translation>License</translation>
|
<translation>License</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="495"/>
|
<location filename="mainwindow.cpp" line="497"/>
|
||||||
<source>Authors</source>
|
<source>Authors</source>
|
||||||
<translation>Authors</translation>
|
<translation>Authors</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="503"/>
|
<location filename="mainwindow.cpp" line="505"/>
|
||||||
<source>XML files (*.xml);;Text files (*.txt)</source>
|
<source>XML files (*.xml);;Text files (*.txt)</source>
|
||||||
<translation>XML files (*.xml);;Text files (*.txt)</translation>
|
<translation>XML files (*.xml);;Text files (*.txt)</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="505"/>
|
<location filename="mainwindow.cpp" line="507"/>
|
||||||
<source>Save the report file</source>
|
<source>Save the report file</source>
|
||||||
<translation>Save the report file</translation>
|
<translation>Save the report file</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="513"/>
|
<location filename="mainwindow.cpp" line="515"/>
|
||||||
<source>XML files (*.xml)</source>
|
<source>XML files (*.xml)</source>
|
||||||
<translation>XML files (*.xml)</translation>
|
<translation>XML files (*.xml)</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="546"/>
|
<location filename="mainwindow.cpp" line="548"/>
|
||||||
<source>Cppcheck - %1</source>
|
<source>Cppcheck - %1</source>
|
||||||
<translation>Cppcheck - %1</translation>
|
<translation>Cppcheck - %1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="563"/>
|
<location filename="mainwindow.cpp" line="565"/>
|
||||||
<source>Failed to change language:
|
<source>Failed to change the language:
|
||||||
|
|
||||||
%1</source>
|
%1
|
||||||
<translation>Failed to change language:
|
|
||||||
|
</source>
|
||||||
|
<oldsource>Failed to change language:
|
||||||
|
|
||||||
|
%1</oldsource>
|
||||||
|
<translation type="unfinished">Failed to change language:
|
||||||
|
|
||||||
%1</translation>
|
%1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -363,37 +368,37 @@ Stop the checking before exiting.</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>QObject</name>
|
<name>QObject</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="12"/>
|
|
||||||
<source>English</source>
|
<source>English</source>
|
||||||
<translation>English</translation>
|
<translation type="obsolete">English</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="13"/>
|
|
||||||
<source>Finnish</source>
|
<source>Finnish</source>
|
||||||
<translation>Finnish</translation>
|
<translation type="obsolete">Finnish</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="14"/>
|
|
||||||
<source>Swedish</source>
|
<source>Swedish</source>
|
||||||
<translation>Swedish</translation>
|
<translation type="obsolete">Swedish</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="15"/>
|
|
||||||
<source>German</source>
|
<source>German</source>
|
||||||
<translation>German</translation>
|
<translation type="obsolete">German</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="16"/>
|
|
||||||
<source>Russian</source>
|
<source>Russian</source>
|
||||||
<translation>Russian</translation>
|
<translation type="obsolete">Russian</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="69"/>
|
<location filename="translationhandler.cpp" line="88"/>
|
||||||
<source>Incorrect language specified!</source>
|
<source>Incorrect language specified!</source>
|
||||||
<translation>Incorrect language specified!</translation>
|
<translation>Incorrect language specified!</translation>
|
||||||
</message>
|
</message>
|
||||||
<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>
|
<source>Failed to load language from file %1</source>
|
||||||
<translation>Failed to load language from file %1</translation>
|
<translation>Failed to load language from file %1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -446,8 +451,9 @@ Stop the checking before exiting.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="resultstree.cpp" line="426"/>
|
<location filename="resultstree.cpp" line="426"/>
|
||||||
<source>You can open this error by specifying applications in program's settings.</source>
|
<source>Configure the text file viewer program in Cppcheck preferences/Applications.</source>
|
||||||
<translation>You can open this error by specifying applications in program's settings.</translation>
|
<oldsource>You can open this error by specifying applications in program's settings.</oldsource>
|
||||||
|
<translation type="unfinished">You can open this error by specifying applications in program's settings.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="resultstree.cpp" line="471"/>
|
<location filename="resultstree.cpp" line="471"/>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
||||||
<translation>Cppcheck - Työkalu C/C++ koodin staattiseen analysointiin.</translation>
|
<translation>Cppcheck - Työkalu C/C++ koodin staattiseen analysointiin.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message utf8="true">
|
||||||
<location filename="about.ui" line="65"/>
|
<location filename="about.ui" line="65"/>
|
||||||
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
||||||
<translation>Copyright (C) 2007-2009 Daniel Marjamäki ja cppcheck tiimi.</translation>
|
<translation>Copyright (C) 2007-2009 Daniel Marjamäki ja cppcheck tiimi.</translation>
|
||||||
|
@ -132,9 +132,9 @@ kate -l(line) (file)
|
||||||
<message>
|
<message>
|
||||||
<location filename="main.ui" line="26"/>
|
<location filename="main.ui" line="26"/>
|
||||||
<location filename="mainwindow.cpp" line="239"/>
|
<location filename="mainwindow.cpp" line="239"/>
|
||||||
<location filename="mainwindow.cpp" line="446"/>
|
<location filename="mainwindow.cpp" line="448"/>
|
||||||
<location filename="mainwindow.cpp" line="544"/>
|
<location filename="mainwindow.cpp" line="546"/>
|
||||||
<location filename="mainwindow.cpp" line="562"/>
|
<location filename="mainwindow.cpp" line="564"/>
|
||||||
<source>Cppcheck</source>
|
<source>Cppcheck</source>
|
||||||
<translation>Cppcheck</translation>
|
<translation>Cppcheck</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -314,7 +314,7 @@ kate -l(line) (file)
|
||||||
<translation>Tarkistettavaksi sopivia tiedostoja ei löytynyt!</translation>
|
<translation>Tarkistettavaksi sopivia tiedostoja ei löytynyt!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="442"/>
|
<location filename="mainwindow.cpp" line="444"/>
|
||||||
<source>Cannot exit while checking.
|
<source>Cannot exit while checking.
|
||||||
|
|
||||||
Stop the checking before exiting.</source>
|
Stop the checking before exiting.</source>
|
||||||
|
@ -323,77 +323,82 @@ Stop the checking before exiting.</source>
|
||||||
Lopeta tarkistus ennen ohjelman sammuttamista.</translation>
|
Lopeta tarkistus ennen ohjelman sammuttamista.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="488"/>
|
<location filename="mainwindow.cpp" line="490"/>
|
||||||
<source>License</source>
|
<source>License</source>
|
||||||
<translation>Lisenssi</translation>
|
<translation>Lisenssi</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="495"/>
|
<location filename="mainwindow.cpp" line="497"/>
|
||||||
<source>Authors</source>
|
<source>Authors</source>
|
||||||
<translation>Tekijät</translation>
|
<translation>Tekijät</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="503"/>
|
<location filename="mainwindow.cpp" line="505"/>
|
||||||
<source>XML files (*.xml);;Text files (*.txt)</source>
|
<source>XML files (*.xml);;Text files (*.txt)</source>
|
||||||
<translation>XML-tiedostot (*.xml);;Tekstitiedostot (*.txt)</translation>
|
<translation>XML-tiedostot (*.xml);;Tekstitiedostot (*.txt)</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="505"/>
|
<location filename="mainwindow.cpp" line="507"/>
|
||||||
<source>Save the report file</source>
|
<source>Save the report file</source>
|
||||||
<translation>Tallenna raportti</translation>
|
<translation>Tallenna raportti</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="513"/>
|
<location filename="mainwindow.cpp" line="515"/>
|
||||||
<source>XML files (*.xml)</source>
|
<source>XML files (*.xml)</source>
|
||||||
<translation>XML-tiedostot (*xml)</translation>
|
<translation>XML-tiedostot (*xml)</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="546"/>
|
<location filename="mainwindow.cpp" line="548"/>
|
||||||
<source>Cppcheck - %1</source>
|
<source>Cppcheck - %1</source>
|
||||||
<translation>Cppcheck - %1</translation>
|
<translation>Cppcheck - %1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="563"/>
|
<location filename="mainwindow.cpp" line="565"/>
|
||||||
<source>Failed to change language:
|
<source>Failed to change the language:
|
||||||
|
|
||||||
%1</source>
|
%1
|
||||||
<translation>Kielen %1 vaihto epäonnistui</translation>
|
|
||||||
|
</source>
|
||||||
|
<oldsource>Failed to change language:
|
||||||
|
|
||||||
|
%1</oldsource>
|
||||||
|
<translation type="unfinished">Kielen %1 vaihto epäonnistui</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>QObject</name>
|
<name>QObject</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="12"/>
|
|
||||||
<source>English</source>
|
<source>English</source>
|
||||||
<translation>Englanti</translation>
|
<translation type="obsolete">Englanti</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="13"/>
|
|
||||||
<source>Finnish</source>
|
<source>Finnish</source>
|
||||||
<translation>Suomi</translation>
|
<translation type="obsolete">Suomi</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="14"/>
|
|
||||||
<source>Swedish</source>
|
<source>Swedish</source>
|
||||||
<translation>Ruotsi</translation>
|
<translation type="obsolete">Ruotsi</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="15"/>
|
|
||||||
<source>German</source>
|
<source>German</source>
|
||||||
<translation>Saksa</translation>
|
<translation type="obsolete">Saksa</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="16"/>
|
|
||||||
<source>Russian</source>
|
<source>Russian</source>
|
||||||
<translation>Venäjä</translation>
|
<translation type="obsolete">Venäjä</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="69"/>
|
<location filename="translationhandler.cpp" line="88"/>
|
||||||
<source>Incorrect language specified!</source>
|
<source>Incorrect language specified!</source>
|
||||||
<translation>Virheellinen kieli valittu!</translation>
|
<translation>Virheellinen kieli valittu!</translation>
|
||||||
</message>
|
</message>
|
||||||
<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>
|
<source>Failed to load language from file %1</source>
|
||||||
<translation>Kielen lataaminen tiedostosta %1 epäonnistui</translation>
|
<translation>Kielen lataaminen tiedostosta %1 epäonnistui</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -446,8 +451,9 @@ Lopeta tarkistus ennen ohjelman sammuttamista.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="resultstree.cpp" line="426"/>
|
<location filename="resultstree.cpp" line="426"/>
|
||||||
<source>You can open this error by specifying applications in program's settings.</source>
|
<source>Configure the text file viewer program in Cppcheck preferences/Applications.</source>
|
||||||
<translation>Voit asetuksista määritellä muita ohjelmia joilla avata tämän virheen sisältävän tiedoston.</translation>
|
<oldsource>You can open this error by specifying applications in program'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>
|
||||||
<message>
|
<message>
|
||||||
<location filename="resultstree.cpp" line="471"/>
|
<location filename="resultstree.cpp" line="471"/>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message utf8="true">
|
||||||
<location filename="about.ui" line="65"/>
|
<location filename="about.ui" line="65"/>
|
||||||
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
@ -119,9 +119,9 @@ kate -l(line) (file)</source>
|
||||||
<message>
|
<message>
|
||||||
<location filename="main.ui" line="26"/>
|
<location filename="main.ui" line="26"/>
|
||||||
<location filename="mainwindow.cpp" line="239"/>
|
<location filename="mainwindow.cpp" line="239"/>
|
||||||
<location filename="mainwindow.cpp" line="446"/>
|
<location filename="mainwindow.cpp" line="448"/>
|
||||||
<location filename="mainwindow.cpp" line="544"/>
|
<location filename="mainwindow.cpp" line="546"/>
|
||||||
<location filename="mainwindow.cpp" line="562"/>
|
<location filename="mainwindow.cpp" line="564"/>
|
||||||
<source>Cppcheck</source>
|
<source>Cppcheck</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -301,84 +301,69 @@ kate -l(line) (file)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="442"/>
|
<location filename="mainwindow.cpp" line="444"/>
|
||||||
<source>Cannot exit while checking.
|
<source>Cannot exit while checking.
|
||||||
|
|
||||||
Stop the checking before exiting.</source>
|
Stop the checking before exiting.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="488"/>
|
<location filename="mainwindow.cpp" line="490"/>
|
||||||
<source>License</source>
|
<source>License</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="495"/>
|
<location filename="mainwindow.cpp" line="497"/>
|
||||||
<source>Authors</source>
|
<source>Authors</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="503"/>
|
<location filename="mainwindow.cpp" line="505"/>
|
||||||
<source>XML files (*.xml);;Text files (*.txt)</source>
|
<source>XML files (*.xml);;Text files (*.txt)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="505"/>
|
<location filename="mainwindow.cpp" line="507"/>
|
||||||
<source>Save the report file</source>
|
<source>Save the report file</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="513"/>
|
<location filename="mainwindow.cpp" line="515"/>
|
||||||
<source>XML files (*.xml)</source>
|
<source>XML files (*.xml)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="546"/>
|
<location filename="mainwindow.cpp" line="548"/>
|
||||||
<source>Cppcheck - %1</source>
|
<source>Cppcheck - %1</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="563"/>
|
<location filename="mainwindow.cpp" line="565"/>
|
||||||
<source>Failed to change language:
|
<source>Failed to change the language:
|
||||||
|
|
||||||
%1</source>
|
%1
|
||||||
|
|
||||||
|
</source>
|
||||||
|
<oldsource>Failed to change language:
|
||||||
|
|
||||||
|
%1</oldsource>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>QObject</name>
|
<name>QObject</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="12"/>
|
<location filename="translationhandler.cpp" line="88"/>
|
||||||
<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"/>
|
|
||||||
<source>Incorrect language specified!</source>
|
<source>Incorrect language specified!</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<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>
|
<source>Failed to load language from file %1</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -431,7 +416,8 @@ Stop the checking before exiting.</source>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="resultstree.cpp" line="426"/>
|
<location filename="resultstree.cpp" line="426"/>
|
||||||
<source>You can open this error by specifying applications in program'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's settings.</oldsource>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
<source>Cppcheck - A tool for static C/C++ code analysis.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message utf8="true">
|
||||||
<location filename="about.ui" line="65"/>
|
<location filename="about.ui" line="65"/>
|
||||||
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
<source>Copyright (C) 2007-2009 Daniel Marjamäki and cppcheck team.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
@ -119,9 +119,9 @@ kate -l(line) (file)</source>
|
||||||
<message>
|
<message>
|
||||||
<location filename="main.ui" line="26"/>
|
<location filename="main.ui" line="26"/>
|
||||||
<location filename="mainwindow.cpp" line="239"/>
|
<location filename="mainwindow.cpp" line="239"/>
|
||||||
<location filename="mainwindow.cpp" line="446"/>
|
<location filename="mainwindow.cpp" line="448"/>
|
||||||
<location filename="mainwindow.cpp" line="544"/>
|
<location filename="mainwindow.cpp" line="546"/>
|
||||||
<location filename="mainwindow.cpp" line="562"/>
|
<location filename="mainwindow.cpp" line="564"/>
|
||||||
<source>Cppcheck</source>
|
<source>Cppcheck</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -301,84 +301,69 @@ kate -l(line) (file)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="442"/>
|
<location filename="mainwindow.cpp" line="444"/>
|
||||||
<source>Cannot exit while checking.
|
<source>Cannot exit while checking.
|
||||||
|
|
||||||
Stop the checking before exiting.</source>
|
Stop the checking before exiting.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="488"/>
|
<location filename="mainwindow.cpp" line="490"/>
|
||||||
<source>License</source>
|
<source>License</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="495"/>
|
<location filename="mainwindow.cpp" line="497"/>
|
||||||
<source>Authors</source>
|
<source>Authors</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="503"/>
|
<location filename="mainwindow.cpp" line="505"/>
|
||||||
<source>XML files (*.xml);;Text files (*.txt)</source>
|
<source>XML files (*.xml);;Text files (*.txt)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="505"/>
|
<location filename="mainwindow.cpp" line="507"/>
|
||||||
<source>Save the report file</source>
|
<source>Save the report file</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="513"/>
|
<location filename="mainwindow.cpp" line="515"/>
|
||||||
<source>XML files (*.xml)</source>
|
<source>XML files (*.xml)</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="546"/>
|
<location filename="mainwindow.cpp" line="548"/>
|
||||||
<source>Cppcheck - %1</source>
|
<source>Cppcheck - %1</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="563"/>
|
<location filename="mainwindow.cpp" line="565"/>
|
||||||
<source>Failed to change language:
|
<source>Failed to change the language:
|
||||||
|
|
||||||
%1</source>
|
%1
|
||||||
|
|
||||||
|
</source>
|
||||||
|
<oldsource>Failed to change language:
|
||||||
|
|
||||||
|
%1</oldsource>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>QObject</name>
|
<name>QObject</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="translationhandler.cpp" line="12"/>
|
<location filename="translationhandler.cpp" line="88"/>
|
||||||
<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"/>
|
|
||||||
<source>Incorrect language specified!</source>
|
<source>Incorrect language specified!</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<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>
|
<source>Failed to load language from file %1</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -431,7 +416,8 @@ Stop the checking before exiting.</source>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="resultstree.cpp" line="426"/>
|
<location filename="resultstree.cpp" line="426"/>
|
||||||
<source>You can open this error by specifying applications in program'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's settings.</oldsource>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
@ -161,11 +161,8 @@ void MainWindow::LoadSettings()
|
||||||
mUI.mActionToolbar->setChecked(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
|
mUI.mActionToolbar->setChecked(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
|
||||||
mUI.mToolBar->setVisible(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
|
mUI.mToolBar->setVisible(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
|
||||||
|
|
||||||
|
|
||||||
mApplications->LoadSettings(mSettings);
|
mApplications->LoadSettings(mSettings);
|
||||||
|
|
||||||
QString error = "";
|
|
||||||
|
|
||||||
SetLanguage(mSettings->value(SETTINGS_LANGUAGE, mTranslation->SuggestLanguage()).toInt());
|
SetLanguage(mSettings->value(SETTINGS_LANGUAGE, mTranslation->SuggestLanguage()).toInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -295,6 +292,13 @@ Settings MainWindow::GetCppcheckSettings()
|
||||||
{
|
{
|
||||||
result.addAutoAllocClass(classname.toStdString());
|
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;
|
QString error;
|
||||||
if (!mTranslation->SetLanguage(index, error))
|
if (!mTranslation->SetLanguage(index, error))
|
||||||
{
|
{
|
||||||
QMessageBox msg(QMessageBox::Warning,
|
QMessageBox msg(QMessageBox::Critical,
|
||||||
tr("Cppcheck"),
|
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,
|
QMessageBox::Ok,
|
||||||
this);
|
this);
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,9 @@ static const char ProjectElementName[] = "project";
|
||||||
static const char AllocElementName[] = "autodealloc";
|
static const char AllocElementName[] = "autodealloc";
|
||||||
static const char ClassElementName[] = "class";
|
static const char ClassElementName[] = "class";
|
||||||
static const char ClassNameAttrib[] = "name";
|
static const char ClassNameAttrib[] = "name";
|
||||||
|
static const char IncludDirElementName[] = "includedir";
|
||||||
|
static const char DirElementName[] = "dir";
|
||||||
|
static const char DirNameAttrib[] = "name";
|
||||||
|
|
||||||
ProjectFile::ProjectFile(QObject *parent) :
|
ProjectFile::ProjectFile(QObject *parent) :
|
||||||
QObject(parent)
|
QObject(parent)
|
||||||
|
@ -60,6 +63,9 @@ bool ProjectFile::Read(const QString &filename)
|
||||||
// Find allocelement from inside project element
|
// Find allocelement from inside project element
|
||||||
if (insideProject && xmlReader.name() == AllocElementName)
|
if (insideProject && xmlReader.name() == AllocElementName)
|
||||||
ReadAutoAllocClasses(xmlReader);
|
ReadAutoAllocClasses(xmlReader);
|
||||||
|
|
||||||
|
if (insideProject && xmlReader.name() == IncludDirElementName)
|
||||||
|
ReadIncludeDirs(xmlReader);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case QXmlStreamReader::EndElement:
|
case QXmlStreamReader::EndElement:
|
||||||
|
@ -90,6 +96,11 @@ QStringList ProjectFile::GetDeAllocatedClasses() const
|
||||||
return mDeAllocatedClasses;
|
return mDeAllocatedClasses;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QStringList ProjectFile::GetIncludeDirs() const
|
||||||
|
{
|
||||||
|
return mIncludeDirs;
|
||||||
|
}
|
||||||
|
|
||||||
void ProjectFile::ReadAutoAllocClasses(QXmlStreamReader &reader)
|
void ProjectFile::ReadAutoAllocClasses(QXmlStreamReader &reader)
|
||||||
{
|
{
|
||||||
QXmlStreamReader::TokenType type;
|
QXmlStreamReader::TokenType type;
|
||||||
|
@ -131,3 +142,45 @@ void ProjectFile::ReadAutoAllocClasses(QXmlStreamReader &reader)
|
||||||
}
|
}
|
||||||
while (!allRead);
|
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);
|
||||||
|
}
|
||||||
|
|
|
@ -49,9 +49,25 @@ public:
|
||||||
*/
|
*/
|
||||||
QStringList GetDeAllocatedClasses() const;
|
QStringList GetDeAllocatedClasses() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Get list of include directories.
|
||||||
|
* @return list of directories.
|
||||||
|
*/
|
||||||
|
QStringList GetIncludeDirs() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
/**
|
||||||
|
* @brief Read list of automatically deallocated classes from XML.
|
||||||
|
* @param reader XML stream reader.
|
||||||
|
*/
|
||||||
void ReadAutoAllocClasses(QXmlStreamReader &reader);
|
void ReadAutoAllocClasses(QXmlStreamReader &reader);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Read list of include directories from XML.
|
||||||
|
* @param reader XML stream reader.
|
||||||
|
*/
|
||||||
|
void ReadIncludeDirs(QXmlStreamReader &reader);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -63,6 +79,11 @@ private:
|
||||||
* @brief List of automatically deallocated classes.
|
* @brief List of automatically deallocated classes.
|
||||||
*/
|
*/
|
||||||
QStringList mDeAllocatedClasses;
|
QStringList mDeAllocatedClasses;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief List of include directories used to search include files.
|
||||||
|
*/
|
||||||
|
QStringList mIncludeDirs;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PROJECT_FILE_H
|
#endif // PROJECT_FILE_H
|
||||||
|
|
|
@ -421,9 +421,9 @@ void ResultsTree::StartApplication(QStandardItem *target, int application)
|
||||||
//If there are now application's specified, tell the user about it
|
//If there are now application's specified, tell the user about it
|
||||||
if (mApplications->GetApplicationCount() == 0)
|
if (mApplications->GetApplicationCount() == 0)
|
||||||
{
|
{
|
||||||
QMessageBox msg(QMessageBox::Warning,
|
QMessageBox msg(QMessageBox::Information,
|
||||||
tr("Cppcheck"),
|
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,
|
QMessageBox::Ok,
|
||||||
this);
|
this);
|
||||||
msg.exec();
|
msg.exec();
|
||||||
|
|
|
@ -26,6 +26,9 @@
|
||||||
<string>Results</string>
|
<string>Results</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
|
<property name="margin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QProgressBar" name="mProgress">
|
<widget class="QProgressBar" name="mProgress">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "translationhandler.h"
|
#include "translationhandler.h"
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
#include <QFile>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
TranslationHandler::TranslationHandler(QObject *parent) :
|
TranslationHandler::TranslationHandler(QObject *parent) :
|
||||||
|
@ -47,7 +48,7 @@ TranslationHandler::TranslationHandler(QObject *parent) :
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
qDebug() << "Failed to load english translation!";
|
qDebug() << "Failed to load English translation!";
|
||||||
delete english;
|
delete english;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -88,6 +89,14 @@ bool TranslationHandler::SetLanguage(const int index, QString &error)
|
||||||
return false;
|
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
|
//Load the new language
|
||||||
if (!mTranslator->load(mFiles[index]))
|
if (!mTranslator->load(mFiles[index]))
|
||||||
|
|
|
@ -262,7 +262,7 @@ void CheckClass::ClassChecking_VarList_Initialize(const Token *tok1, const Token
|
||||||
|
|
||||||
void CheckClass::constructors()
|
void CheckClass::constructors()
|
||||||
{
|
{
|
||||||
const char pattern_class[] = "class %var% {";
|
const char pattern_class[] = "class %var% [{:]";
|
||||||
|
|
||||||
// Locate class
|
// Locate class
|
||||||
const Token *tok1 = Token::findmatch(_tokenizer->tokens(), pattern_class);
|
const Token *tok1 = Token::findmatch(_tokenizer->tokens(), pattern_class);
|
||||||
|
|
|
@ -159,7 +159,7 @@ std::string CppCheck::parseFromArgs(int argc, const char* const argv[])
|
||||||
if (path[path.length()-1] != '/' && path[path.length()-1] != '\\')
|
if (path[path.length()-1] != '/' && path[path.length()-1] != '\\')
|
||||||
path += '/';
|
path += '/';
|
||||||
|
|
||||||
_includePaths.push_back(path);
|
_settings._includePaths.push_back(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Include paths
|
// Include paths
|
||||||
|
@ -344,13 +344,13 @@ unsigned int CppCheck::check()
|
||||||
{
|
{
|
||||||
// File content was given as a string
|
// File content was given as a string
|
||||||
std::istringstream iss(_fileContents[ _filenames[c] ]);
|
std::istringstream iss(_fileContents[ _filenames[c] ]);
|
||||||
preprocessor.preprocess(iss, filedata, configurations, fname, _includePaths);
|
preprocessor.preprocess(iss, filedata, configurations, fname, _settings._includePaths);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Only file name was given, read the content from file
|
// Only file name was given, read the content from file
|
||||||
std::ifstream fin(fname.c_str());
|
std::ifstream fin(fname.c_str());
|
||||||
preprocessor.preprocess(fin, filedata, configurations, fname, _includePaths);
|
preprocessor.preprocess(fin, filedata, configurations, fname, _settings._includePaths);
|
||||||
}
|
}
|
||||||
|
|
||||||
int checkCount = 0;
|
int checkCount = 0;
|
||||||
|
|
|
@ -141,10 +141,6 @@ private:
|
||||||
/** Current configuration */
|
/** Current configuration */
|
||||||
std::string cfg;
|
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;
|
std::list<std::string> _xmllist;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,10 @@ public:
|
||||||
Default value is 0. */
|
Default value is 0. */
|
||||||
int _exitCode;
|
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 */
|
/** Fill list of automaticly deallocated classes */
|
||||||
void autoDealloc(std::istream &istr);
|
void autoDealloc(std::istream &istr);
|
||||||
|
|
||||||
|
|
|
@ -2656,6 +2656,17 @@ bool Tokenizer::simplifyRedundantParanthesis()
|
||||||
ret = true;
|
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% )") ||
|
if (Token::Match(tok, "( ( %bool% )") ||
|
||||||
Token::Match(tok, "( ( %num% )"))
|
Token::Match(tok, "( ( %num% )"))
|
||||||
{
|
{
|
||||||
|
|
|
@ -192,6 +192,18 @@ private:
|
||||||
"};\n");
|
"};\n");
|
||||||
|
|
||||||
ASSERT_EQUALS("[test.cpp:10]: (style) Member variable not initialized in the constructor 'Fred::_code'\n", errout.str());
|
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()
|
void uninitVarEnum()
|
||||||
|
|
|
@ -379,6 +379,9 @@ private:
|
||||||
// remove parantheses..
|
// remove parantheses..
|
||||||
ASSERT_EQUALS("= p ; ", tok("= (p);"));
|
ASSERT_EQUALS("= p ; ", tok("= (p);"));
|
||||||
ASSERT_EQUALS("if ( a < p ) { } ", tok("if(a<(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..
|
// keep parantheses..
|
||||||
ASSERT_EQUALS("= a ; ", tok("= (char)a;"));
|
ASSERT_EQUALS("= a ; ", tok("= (char)a;"));
|
||||||
|
|
|
@ -90,8 +90,8 @@ Name: modifypath; Description: &Add {#MyAppName} folder to your system path; Fla
|
||||||
Type: files; Name: {app}\COPYING
|
Type: files; Name: {app}\COPYING
|
||||||
|
|
||||||
[Files]
|
[Files]
|
||||||
|
; Core / command line
|
||||||
Source: ..\Build\Release\cppcheck.exe; DestDir: {app}; Flags: ignoreversion; Components: Core
|
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: ..\COPYING; DestDir: {app}; DestName: COPYING.txt; Flags: ignoreversion; Components: Core
|
||||||
Source: ..\readme.txt; DestDir: {app}; Flags: ignoreversion; Components: Core
|
Source: ..\readme.txt; DestDir: {app}; Flags: ignoreversion; Components: Core
|
||||||
Source: ..\AUTHORS; DestDir: {app}; DestName: AUTHORS.txt; 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}\Microsoft.VC90.CRT.manifest; DestDir: {app}; Components: Core
|
||||||
Source: {#RuntimesFolder}\msvcp90.dll; DestDir: {app}; Components: Core
|
Source: {#RuntimesFolder}\msvcp90.dll; DestDir: {app}; Components: Core
|
||||||
Source: {#RuntimesFolder}\msvcr90.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
|
; QT runtimes
|
||||||
Source: {#RuntimesFolder}\QtCore4.dll; DestDir: {app}; Components: QTGui
|
Source: {#RuntimesFolder}\QtCore4.dll; DestDir: {app}; Components: QTGui
|
||||||
Source: {#RuntimesFolder}\QtGui4.dll; DestDir: {app}; Components: QTGui
|
Source: {#RuntimesFolder}\QtGui4.dll; DestDir: {app}; Components: QTGui
|
||||||
|
|
|
@ -17,11 +17,16 @@ Files the installer needs:
|
||||||
/COPYING
|
/COPYING
|
||||||
/readme.txt
|
/readme.txt
|
||||||
/AUTHORS
|
/AUTHORS
|
||||||
/gui/release/gui.exe
|
|
||||||
/Release/cppcheck.exe
|
/Release/cppcheck.exe
|
||||||
/win_installer/icon.bmp
|
/win_installer/icon.bmp
|
||||||
/win_installer/LargeLogo.bmp
|
/win_installer/LargeLogo.bmp
|
||||||
/win_installer/
|
/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
|
NOTE: Remember to convert COPYING and AUTHORS to Windows EOL format! Otherwise
|
||||||
Windows Notepad (default viewer) can't show then properly.
|
Windows Notepad (default viewer) can't show then properly.
|
||||||
|
|
Loading…
Reference in New Issue