summaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/extensionsystem/CMakeLists.txt3
-rw-r--r--src/libs/utils/buildablehelperlibrary.cpp4
-rw-r--r--src/libs/utils/detailsbutton.cpp8
-rw-r--r--src/libs/utils/detailsbutton.h1
-rw-r--r--src/libs/utils/detailswidget.cpp10
-rw-r--r--src/libs/utils/detailswidget.h2
-rw-r--r--src/libs/utils/differ.cpp12
-rw-r--r--src/libs/utils/json.cpp18
-rw-r--r--src/libs/utils/reloadpromptutils.cpp18
-rw-r--r--src/libs/utils/reloadpromptutils.h1
10 files changed, 40 insertions, 37 deletions
diff --git a/src/libs/extensionsystem/CMakeLists.txt b/src/libs/extensionsystem/CMakeLists.txt
index 53f928153c..71e5cbd380 100644
--- a/src/libs/extensionsystem/CMakeLists.txt
+++ b/src/libs/extensionsystem/CMakeLists.txt
@@ -12,5 +12,8 @@ add_qtc_library(ExtensionSystem
pluginmanager.cpp pluginmanager.h pluginmanager_p.h
pluginspec.cpp pluginspec.h pluginspec_p.h
pluginview.cpp pluginview.h
+ EXPLICIT_MOC
+ pluginmanager.h
+ pluginmanager_p.h
SKIP_AUTOMOC pluginmanager.cpp
)
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index 0e19dba5e9..e1e75148fd 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -338,9 +338,7 @@ bool BuildableHelperLibrary::buildHelper(const BuildHelperArguments &arguments,
log->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
"Running %1 %2 ...\n")
.arg(makeFullPath.toUserOutput(), arguments.makeArguments.join(QLatin1Char(' '))));
- if (!runBuildProcess(proc, makeFullPath, arguments.makeArguments, 120, false, log, errorMessage))
- return false;
- return true;
+ return runBuildProcess(proc, makeFullPath, arguments.makeArguments, 120, false, log, errorMessage);
}
bool BuildableHelperLibrary::getHelperFileInfoFor(const QStringList &validBinaryFilenames,
diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp
index abceff7b2d..07c27d3b70 100644
--- a/src/libs/utils/detailsbutton.cpp
+++ b/src/libs/utils/detailsbutton.cpp
@@ -110,6 +110,14 @@ bool DetailsButton::event(QEvent *e)
return false;
}
+void DetailsButton::changeEvent(QEvent *e)
+{
+ if (e->type() == QEvent::EnabledChange) {
+ m_checkedPixmap = QPixmap();
+ m_uncheckedPixmap = QPixmap();
+ }
+}
+
void DetailsButton::paintEvent(QPaintEvent *e)
{
QWidget::paintEvent(e);
diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h
index dabbe75918..3c7286e9ee 100644
--- a/src/libs/utils/detailsbutton.h
+++ b/src/libs/utils/detailsbutton.h
@@ -71,6 +71,7 @@ public:
protected:
void paintEvent(QPaintEvent *e) override;
bool event(QEvent *e) override;
+ void changeEvent(QEvent *e) override;
private:
QPixmap cacheRendering(const QSize &size, bool checked);
diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp
index dd02d1a4a5..06159b101e 100644
--- a/src/libs/utils/detailswidget.cpp
+++ b/src/libs/utils/detailswidget.cpp
@@ -229,6 +229,16 @@ void DetailsWidget::setUseCheckBox(bool b)
d->updateControls();
}
+void DetailsWidget::setCheckable(bool b)
+{
+ d->m_summaryCheckBox->setEnabled(b);
+}
+
+void DetailsWidget::setExpandable(bool b)
+{
+ d->m_detailsButton->setEnabled(b);
+}
+
void DetailsWidget::setChecked(bool b)
{
d->m_summaryCheckBox->setChecked(b);
diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h
index f96f0f549d..e9c55c9eaf 100644
--- a/src/libs/utils/detailswidget.h
+++ b/src/libs/utils/detailswidget.h
@@ -78,6 +78,8 @@ public:
bool useCheckBox();
void setUseCheckBox(bool b);
+ void setCheckable(bool b);
+ void setExpandable(bool b);
void setIcon(const QIcon &icon);
static QPixmap createBackground(const QSize &size, int topHeight, QWidget *widget);
diff --git a/src/libs/utils/differ.cpp b/src/libs/utils/differ.cpp
index 16fc0ced01..74ec99c78c 100644
--- a/src/libs/utils/differ.cpp
+++ b/src/libs/utils/differ.cpp
@@ -236,16 +236,12 @@ static int cleanupSemanticsScore(const QString &text1, const QString &text2)
static bool isWhitespace(const QChar &c)
{
- if (c == ' ' || c == '\t')
- return true;
- return false;
+ return c == ' ' || c == '\t';
}
static bool isNewLine(const QChar &c)
{
- if (c == '\n')
- return true;
- return false;
+ return c == '\n';
}
/*
@@ -719,9 +715,7 @@ static bool diffWithWhitespaceExpandedInEqualities(const QList<Diff> &leftInput,
return false;
*rightOutput = decodeExpandedWhitespace(rightDiffList,
commonRightCodeMap, &ok);
- if (!ok)
- return false;
- return true;
+ return ok;
}
static void appendWithEqualitiesSquashed(const QList<Diff> &leftInput,
diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp
index 104cf571b9..b195e134d4 100644
--- a/src/libs/utils/json.cpp
+++ b/src/libs/utils/json.cpp
@@ -225,17 +225,13 @@ bool JsonSchema::typeMatches(const QString &expected, const QString &actual)
bool JsonSchema::isCheckableType(const QString &s)
{
- if (s == QLatin1String("string")
- || s == QLatin1String("number")
- || s == QLatin1String("integer")
- || s == QLatin1String("boolean")
- || s == QLatin1String("object")
- || s == QLatin1String("array")
- || s == QLatin1String("null")) {
- return true;
- }
-
- return false;
+ return s == QLatin1String("string")
+ || s == QLatin1String("number")
+ || s == QLatin1String("integer")
+ || s == QLatin1String("boolean")
+ || s == QLatin1String("object")
+ || s == QLatin1String("array")
+ || s == QLatin1String("null");
}
QStringList JsonSchema::validTypes() const
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index 09a9855784..210791157c 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -102,22 +102,14 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title,
}
QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer
- fileDeletedPrompt(const QString &fileName, bool triggerExternally, QWidget *parent)
+ fileDeletedPrompt(const QString &fileName, QWidget *parent)
{
const QString title = QCoreApplication::translate("Utils::fileDeletedPrompt",
"File Has Been Removed");
- QString msg;
- if (triggerExternally) {
- msg = QCoreApplication::translate("Utils::fileDeletedPrompt",
- "The file %1 has been removed from disk. "
- "Do you want to save it under a different name, or close "
- "the editor?").arg(QDir::toNativeSeparators(fileName));
- } else {
- msg = QCoreApplication::translate("Utils::fileDeletedPrompt",
- "The file %1 has been removed from disk. "
- "Do you want to save it under a different name, or close "
- "the editor?").arg(QDir::toNativeSeparators(fileName));
- }
+ QString msg = QCoreApplication::translate("Utils::fileDeletedPrompt",
+ "The file %1 has been removed from disk. "
+ "Do you want to save it under a different name, or close "
+ "the editor?").arg(QDir::toNativeSeparators(fileName));
QMessageBox box(QMessageBox::Question, title, msg, QMessageBox::NoButton, parent);
QPushButton *close =
box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Close"),
diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h
index 82aa409cf5..5b06596cd4 100644
--- a/src/libs/utils/reloadpromptutils.h
+++ b/src/libs/utils/reloadpromptutils.h
@@ -62,7 +62,6 @@ enum FileDeletedPromptAnswer {
};
QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer fileDeletedPrompt(const QString &fileName,
- bool triggerExternally,
QWidget *parent);
} // namespace Utils
View Lorry Controller Status