From 61123092ab0e1c39a81b296071f13f851a91e3df Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 29 Jul 2009 09:11:37 +0200
Subject: [PATCH] Fixed compiler/lupdate/uic warnings.
Add missing Q_OBJECTS where tr() was used.
---
src/libs/utils/stylehelper.cpp | 10 ----------
src/plugins/cvs/checkoutwizard.h | 1 +
src/plugins/debugger/dumperoptionpage.ui | 4 ----
src/plugins/genericprojectmanager/genericproject.cpp | 2 ++
src/plugins/git/clonewizard.h | 1 +
src/plugins/git/gitorious/gitoriousclonewizard.h | 1 +
.../qt4projectmanager/gettingstartedwelcomepage.h | 1 +
src/plugins/qtscripteditor/qtscriptcodecompletion.cpp | 2 ++
src/plugins/subversion/checkoutwizard.h | 1 +
src/plugins/welcome/communitywelcomepagewidget.cpp | 4 ++--
src/shared/qscripthighlighter/qscripthighlighter.cpp | 2 +-
11 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 01f5b6371d6..69557b1b3c7 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -126,16 +126,6 @@ void StyleHelper::setBaseColor(const QColor &color)
}
}
-static QColor mergedColors(const QColor &colorA, const QColor &colorB, int factor = 50)
-{
- const int maxFactor = 100;
- QColor tmp = colorA;
- tmp.setRed((tmp.red() * factor) / maxFactor + (colorB.red() * (maxFactor - factor)) / maxFactor);
- tmp.setGreen((tmp.green() * factor) / maxFactor + (colorB.green() * (maxFactor - factor)) / maxFactor);
- tmp.setBlue((tmp.blue() * factor) / maxFactor + (colorB.blue() * (maxFactor - factor)) / maxFactor);
- return tmp;
-}
-
void StyleHelper::verticalGradient(QPainter *painter, const QRect &spanRect, const QRect &clipRect)
{
QString key;
diff --git a/src/plugins/cvs/checkoutwizard.h b/src/plugins/cvs/checkoutwizard.h
index a35eda2c25c..ca380d1126c 100644
--- a/src/plugins/cvs/checkoutwizard.h
+++ b/src/plugins/cvs/checkoutwizard.h
@@ -37,6 +37,7 @@ namespace Internal {
class CheckoutWizard : public VCSBase::BaseCheckoutWizard
{
+ Q_OBJECT
public:
explicit CheckoutWizard(QObject *parent = 0);
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index d85f98c3707..ddba465b5fa 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -98,10 +98,6 @@
</widget>
</item>
</layout>
- <zorder></zorder>
- <zorder>checkBoxDebugDebuggingHelpers</zorder>
- <zorder>checkBoxUseDebuggingHelpers</zorder>
- <zorder></zorder>
</widget>
</item>
<item>
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 7f3ead47382..68eda119dcd 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -356,6 +356,7 @@ void GenericProject::setToolChainId(const QString &toolChainId)
QString GenericProject::buildParser(const QString &buildConfiguration) const
{
+ Q_UNUSED(buildConfiguration)
if (m_toolChain) {
switch (m_toolChain->type()) {
case ProjectExplorer::ToolChain::GCC:
@@ -448,6 +449,7 @@ GenericProjectNode *GenericProject::rootProjectNode() const
QStringList GenericProject::files(FilesMode fileMode) const
{
+ Q_UNUSED(fileMode)
return m_files; // ### TODO: handle generated files here.
}
diff --git a/src/plugins/git/clonewizard.h b/src/plugins/git/clonewizard.h
index 241be32d75a..d3f7cd0ded2 100644
--- a/src/plugins/git/clonewizard.h
+++ b/src/plugins/git/clonewizard.h
@@ -37,6 +37,7 @@ namespace Internal {
class CloneWizard : public VCSBase::BaseCheckoutWizard
{
+ Q_OBJECT
public:
explicit CloneWizard(QObject *parent = 0);
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.h b/src/plugins/git/gitorious/gitoriousclonewizard.h
index 0004463b965..362f6fd914c 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.h
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.h
@@ -39,6 +39,7 @@ namespace Internal {
// Gitorious-hosted projects.
class GitoriousCloneWizard : public VCSBase::BaseCheckoutWizard
{
+ Q_OBJECT
public:
explicit GitoriousCloneWizard(QObject *parent = 0);
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
index 2534f7ae0ca..77e8b177371 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
@@ -39,6 +39,7 @@ class GettingStartedWelcomePageWidget;
class GettingStartedWelcomePage : public ExtensionSystem::IWelcomePage
{
+ Q_OBJECT
public:
GettingStartedWelcomePage();
diff --git a/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp b/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
index 40100dd116b..3bd00719934 100644
--- a/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
+++ b/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
@@ -27,6 +27,8 @@ bool QtScriptCodeCompletion::supportsEditor(TextEditor::ITextEditable *editor)
#if 0 // ### disable JS Completion. It's pretty buggy and it can crash Creator.
if (qobject_cast<ScriptEditor *>(editor->widget()))
return true;
+#else
+ Q_UNUSED(editor)
#endif
return false;
diff --git a/src/plugins/subversion/checkoutwizard.h b/src/plugins/subversion/checkoutwizard.h
index 6b651c87888..2f2f0a22d4d 100644
--- a/src/plugins/subversion/checkoutwizard.h
+++ b/src/plugins/subversion/checkoutwizard.h
@@ -37,6 +37,7 @@ namespace Internal {
class CheckoutWizard : public VCSBase::BaseCheckoutWizard
{
+ Q_OBJECT
public:
explicit CheckoutWizard(QObject *parent = 0);
diff --git a/src/plugins/welcome/communitywelcomepagewidget.cpp b/src/plugins/welcome/communitywelcomepagewidget.cpp
index 40c72fed57f..e4e713cd193 100644
--- a/src/plugins/welcome/communitywelcomepagewidget.cpp
+++ b/src/plugins/welcome/communitywelcomepagewidget.cpp
@@ -39,8 +39,8 @@ namespace Internal {
CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) :
QWidget(parent),
- ui(new Ui::CommunityWelcomePageWidget),
- m_rssFetcher(new RSSFetcher(7))
+ m_rssFetcher(new RSSFetcher(7)),
+ ui(new Ui::CommunityWelcomePageWidget)
{
ui->setupUi(this);
ui->labsTitleLabel->setStyledText(tr("News From the Qt Labs"));
diff --git a/src/shared/qscripthighlighter/qscripthighlighter.cpp b/src/shared/qscripthighlighter/qscripthighlighter.cpp
index 8d8c0c0548e..0f94c1061fe 100644
--- a/src/shared/qscripthighlighter/qscripthighlighter.cpp
+++ b/src/shared/qscripthighlighter/qscripthighlighter.cpp
@@ -454,7 +454,7 @@ void QScriptHighlighter::highlightKeyword(int currentPos, const QString &buffer)
if (buffer.isEmpty())
return;
- if (m_duiEnabled && buffer.at(0).isUpper() || (! m_duiEnabled && buffer.at(0) == QLatin1Char('Q'))) {
+ if ((m_duiEnabled && buffer.at(0).isUpper()) || (! m_duiEnabled && buffer.at(0) == QLatin1Char('Q'))) {
setFormat(currentPos - buffer.length(), buffer.length(), m_formats[TypeFormat]);
} else {
if (qscriptKeywords.contains(buffer))
--
GitLab