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

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

Conflicts:
	gui/mainwindow.cpp
This commit is contained in:
Vesa Pikki 2009-07-02 19:16:50 +03:00
parent 32725c872e df7ca21a31
commit 7d2c26bd25
9 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/aboutdialog.cpp
View File

@ -46,12 +46,18 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
QLabel *gpl = new QLabel(tr("This program is licensed under the terms " \
"of the GNU General Public License version 3"));
gpl->setWordWrap(true);
QString url = "<a href=\"http://cppcheck.wiki.sourceforge.net/\">http://cppcheck.wiki.sourceforge.net/</a>";
QString homepageText = QString(tr("Visit Cppcheck homepage at %1")).arg(url);
QLabel *homepage = new QLabel(homepageText);
homepage->setOpenExternalLinks(true);
homepage->setWordWrap(true);
QPushButton *quit = new QPushButton(tr("Close"));
mainLayout->addWidget(name);
mainLayout->addWidget(ver);
mainLayout->addWidget(copy);
mainLayout->addWidget(gpl);
mainLayout->addWidget(homepage);
mainLayout->addStretch();
mainLayout->addLayout(btnLayout);

2
gui/applicationlist.cpp
View File

@ -136,7 +136,7 @@ void ApplicationList::Copy(ApplicationList *list)
}
Clear();
for (int i = 0;i < list->GetApplicationCount();i++)
for (int i = 0; i < list->GetApplicationCount(); i++)
{
AddApplicationType(list->GetApplicationName(i), list->GetApplicationPath(i));
}

7
gui/cppcheck_de.ts
View File

@ -24,7 +24,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="49"/>
<location filename="aboutdialog.cpp" line="50"/>
<source>Visit Cppcheck homepage at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="54"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>

7
gui/cppcheck_en.ts
View File

@ -24,7 +24,12 @@
<translation>This program is licensed under the terms of the GNU General Public License version 3</translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="49"/>
<location filename="aboutdialog.cpp" line="50"/>
<source>Visit Cppcheck homepage at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="54"/>
<source>Close</source>
<translation>Close</translation>
</message>

7
gui/cppcheck_fi.ts
View File

@ -24,7 +24,12 @@
<translation>Tämä ohjelma on lisensoitu GNU General Public Lisenssin version 3 alaiseksi</translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="49"/>
<location filename="aboutdialog.cpp" line="50"/>
<source>Visit Cppcheck homepage at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="54"/>
<source>Close</source>
<translation>Sulje</translation>
</message>

7
gui/cppcheck_ru.ts
View File

@ -24,7 +24,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="49"/>
<location filename="aboutdialog.cpp" line="50"/>
<source>Visit Cppcheck homepage at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="54"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>

7
gui/cppcheck_se.ts
View File

@ -24,7 +24,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="49"/>
<location filename="aboutdialog.cpp" line="50"/>
<source>Visit Cppcheck homepage at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="aboutdialog.cpp" line="54"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>

4
gui/mainwindow.cpp
View File

@ -107,7 +107,7 @@ void MainWindow::CreateLanguageMenuItems()
QStringList languages = mTranslation->GetNames();
for (int i = 0;i < languages.size();i++)
for (int i = 0; i < languages.size(); i++)
{
//Create an action for each language
//Language name is pre translated
@ -593,7 +593,7 @@ void MainWindow::MapLanguage(QAction *action)
{
//Find the action that has the language that user clicked
QList<QAction *> actions = mLanguages->actions();
for (int i = 0;i < actions.size();i++)
for (int i = 0; i < actions.size(); i++)
{
if (actions[i] == action)
{

2
gui/resultstree.cpp
View File

@ -354,7 +354,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
if (mContextItem && mApplications->GetApplicationCount() > 0 && mContextItem->parent())
{
//Go through all applications and add them to the context menu
for (int i = 0;i < mApplications->GetApplicationCount();i++)
for (int i = 0; i < mApplications->GetApplicationCount(); i++)
{
//Create an action for the application
QAction *start = new QAction(mApplications->GetApplicationName(i), &menu);