[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] /: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-09-11 6:19:05
Message-ID: E1fzc0v-0003Iw-60 () code ! kde ! org
[Download RAW message or body]
Git commit 787217669e17f1276775e0cceb836745b552b46d by Yuri Chornoivan.
Committed on 11/09/2018 at 06:17.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +3 -3 CalligraProducts.cmake
M +1 -1 filters/libmsooxml/MsooXmlUtils.cpp
M +1 -1 gemini/CMakeLists.txt
M +0 -1 gemini/Theme.cpp
M +1 -1 gemini/cloud/dropbox/3rdparty/networkcontroller.cc
M +1 -1 libs/pigment/KoColorProfile.cpp
M +1 -1 plan/src/CMakeLists.txt
M +1 -1 plan/src/plugins/schedulers/CMakeLists.txt
M +0 -1 plugins/artistictextshape/ArtisticTextTool.cpp
M +0 -1 plugins/chartshape/AxesConfigWidget.cpp
M +0 -1 plugins/chartshape/OdfHelper.cpp
M +0 -1 plugins/chartshape/PlotAreaConfigWidget.cpp
M +0 -1 plugins/defaultTools/defaulttool/ChartResizeStrategy.cpp
M +0 -1 plugins/formulashape/FormulaCursor.cpp
M +0 -1 plugins/formulashape/FormulaEditor.cpp
M +1 -1 plugins/textediting/spellcheck/SpellCheck.cpp
M +0 -2 plugins/textshape/ShrinkToFitShapeContainer.h
M +0 -1 plugins/textshape/TextShape.cpp
M +0 -1 plugins/textshape/TextTool.cpp
M +1 -1 plugins/textshape/dialogs/ListLevelWidget.cpp
M +0 -1 plugins/textshape/dialogs/StyleManager.cpp
M +0 -2 plugins/videoshape/Plugin.h
M +0 -1 sheets/odf/SheetsOdfStyle.cpp
M +1 -1 windows/calligra_installer/simplifyHeatFragment.py
https://commits.kde.org/calligra/787217669e17f1276775e0cceb836745b552b46d
diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 4ae105a8511..aec6ba29a9a 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -30,7 +30,7 @@
# product or feature is missing another internal or external dependency. If
# optional (OPTIONAL), the rest of the set will still be build in that case.
# The products and features to include in a set can be listed directly or
-# indirectly: they can be named explicitely, but also by including other
+# indirectly: they can be named explicitly, but also by including other
# productsets in a set, whose products and features will then be part of the
# first set as well.
# Products, features and productsets can be listed as dependencies in multiple
@@ -249,7 +249,7 @@ calligra_define_productset(FILTERS_FLOW_IMPORT "All Flow import \
filters" FILTER_VISIO_TO_ODG
FILTER_WPG_TO_ODG
)
-#calligra_define_productset(FILTERS_FLOW_EXPORT "All Flow export filters" OPTIONAL \
) noone currently +#calligra_define_productset(FILTERS_FLOW_EXPORT "All Flow export \
filters" OPTIONAL ) none currently calligra_define_productset(FILTERS_FLOW "All \
Flow filters" OPTIONAL
FILTERS_FLOW_IMPORT
@@ -262,7 +262,7 @@ calligra_define_productset(FILTERS_STAGE_IMPORT "All Stage import \
filters" FILTER_PPT_TO_ODP
FILTER_PPTX_TO_ODP
)
-#calligra_define_productset(FILTERS_STAGE_EXPORT "All Stage export filters" \
OPTIONAL ) noone currently +#calligra_define_productset(FILTERS_STAGE_EXPORT "All \
Stage export filters" OPTIONAL ) none currently \
calligra_define_productset(FILTERS_STAGE "All Stage filters" OPTIONAL
FILTERS_STAGE_IMPORT
diff --git a/filters/libmsooxml/MsooXmlUtils.cpp \
b/filters/libmsooxml/MsooXmlUtils.cpp index 4f6feb732d9..5bbc5517567 100644
--- a/filters/libmsooxml/MsooXmlUtils.cpp
+++ b/filters/libmsooxml/MsooXmlUtils.cpp
@@ -178,7 +178,7 @@ KoFilter::ConversionStatus Utils::loadAndParse(QIODevice* io, \
KoXmlDocument& doc
<< " In line: " << errorLine << ", column: " << errorColumn << endl
<< " Error message: " << errorMsg;
errorMessage = i18n("Parsing error in the main document at line %1, column \
%2.\n"
- "Error message: %3", errorLine , errorColumn , \
i18n("QXml", errorMsg)); + "Error message: %3", errorLine \
, errorColumn , i18n(errorMsg)); return KoFilter::ParsingError;
}
debugMsooXml << "File" << fileName << "loaded and parsed.";
diff --git a/gemini/CMakeLists.txt b/gemini/CMakeLists.txt
index a9b2ccf07f2..2a5b2c02ce6 100644
--- a/gemini/CMakeLists.txt
+++ b/gemini/CMakeLists.txt
@@ -64,7 +64,7 @@ ecm_add_app_icon(calligragemini_SRCS ICONS ${ICONS_SRCS})
add_executable(calligrageminithumbnailhelper ${thumbnailhelper_SRCS})
target_link_libraries(calligrageminithumbnailhelper
komain
- KF5::Crash # needed to explicitely disable drkonqi if any plugin links to \
kdelibs4support + KF5::Crash # needed to explicitly disable drkonqi if any plugin \
links to kdelibs4support )
# Calligra Gemini application
diff --git a/gemini/Theme.cpp b/gemini/Theme.cpp
index b061277ecf1..30416141ed8 100644
--- a/gemini/Theme.cpp
+++ b/gemini/Theme.cpp
@@ -30,7 +30,6 @@
#include <QApplication>
#include <QWidget>
#include <QQmlComponent>
-#include <QUrl>
#include <QStandardPaths>
#include <KIconLoader>
diff --git a/gemini/cloud/dropbox/3rdparty/networkcontroller.cc \
b/gemini/cloud/dropbox/3rdparty/networkcontroller.cc index 4c3129728c2..d350d2929e8 \
100644
--- a/gemini/cloud/dropbox/3rdparty/networkcontroller.cc
+++ b/gemini/cloud/dropbox/3rdparty/networkcontroller.cc
@@ -93,7 +93,7 @@ void NetworkController::sslErrors(QNetworkReply *reply, const \
QList<QSslError> & }
if(errorDescription.length() > 0) {
- QString error = QString("An error occured when attempting to make a secure \
connection:%1").arg(errorDescription); + QString error = QString("An error \
occurred when attempting to make a secure connection:%1").arg(errorDescription); \
QMessageBox::StandardButton result = QMessageBox::question(0, "Error establishing \
secure connection.", QString("%1\n Do you wish to continue?").arg(error), \
QMessageBox::Yes | QMessageBox::No);
if(result == QMessageBox::Yes) {
diff --git a/libs/pigment/KoColorProfile.cpp b/libs/pigment/KoColorProfile.cpp
index c22aa40524c..20c7d2db10f 100644
--- a/libs/pigment/KoColorProfile.cpp
+++ b/libs/pigment/KoColorProfile.cpp
@@ -98,4 +98,4 @@ void KoColorProfile::setManufacturer(const QString &manufacturer)
void KoColorProfile::setCopyright(const QString ©right)
{
d->copyright = copyright;
-}
\ No newline at end of file
+}
diff --git a/plan/src/CMakeLists.txt b/plan/src/CMakeLists.txt
index 3941f73b93c..bbb42b4ebda 100644
--- a/plan/src/CMakeLists.txt
+++ b/plan/src/CMakeLists.txt
@@ -68,7 +68,7 @@ if (KF5AkonadiContact_FOUND)
# disable for now: there is a bug
# it only works if you use kde contacts (of course) but many use other stuff, so \
gets dissapointed add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
- message(WARNING "AkonadiContacs available, but funtion is disabled due to Bug \
311940") + message(WARNING "AkonadiContacs available, but function is disabled due \
to Bug 311940") endif ()
if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
diff --git a/plan/src/plugins/schedulers/CMakeLists.txt \
b/plan/src/plugins/schedulers/CMakeLists.txt index ef38f48dc7c..31a11b67801 100644
--- a/plan/src/plugins/schedulers/CMakeLists.txt
+++ b/plan/src/plugins/schedulers/CMakeLists.txt
@@ -1,5 +1,5 @@
## Disable librcps for now
-## It has some bugs, and should be extended to be really usefull
+## It has some bugs, and should be extended to be really useful
# set(LIBRCPS_MIN_VERSION "0.3")
# # macro_optional_find_package(LibRCPS)
# #
diff --git a/plugins/artistictextshape/ArtisticTextTool.cpp \
b/plugins/artistictextshape/ArtisticTextTool.cpp index d4e1afc668e..509341273d6 \
100644
--- a/plugins/artistictextshape/ArtisticTextTool.cpp
+++ b/plugins/artistictextshape/ArtisticTextTool.cpp
@@ -49,7 +49,6 @@
#include <QAction>
#include <QDebug>
-#include <QAction>
#include <QGridLayout>
#include <QToolButton>
#include <QCheckBox>
diff --git a/plugins/chartshape/AxesConfigWidget.cpp \
b/plugins/chartshape/AxesConfigWidget.cpp index 609bc35657d..8908ccbe576 100644
--- a/plugins/chartshape/AxesConfigWidget.cpp
+++ b/plugins/chartshape/AxesConfigWidget.cpp
@@ -51,7 +51,6 @@
#include "ChartProxyModel.h"
#include "PlotArea.h"
#include "Axis.h"
-#include "ui_AxesConfigWidget.h"
#include "NewAxisDialog.h"
#include "AxisScalingDialog.h"
#include "FontEditorDialog.h"
diff --git a/plugins/chartshape/OdfHelper.cpp b/plugins/chartshape/OdfHelper.cpp
index 9aca4f857b9..d7b5f7592aa 100644
--- a/plugins/chartshape/OdfHelper.cpp
+++ b/plugins/chartshape/OdfHelper.cpp
@@ -69,7 +69,6 @@
#include <KoOdfGradientBackground.h>
#include <KoPatternBackground.h>
#include <KoGradientBackground.h>
-#include <KoOdfWorkaround.h>
#include <KoOdfGraphicStyles.h>
#include "kochart_global.h"
diff --git a/plugins/chartshape/PlotAreaConfigWidget.cpp \
b/plugins/chartshape/PlotAreaConfigWidget.cpp index 0cc8579f32c..0cbf28d8dfe 100644
--- a/plugins/chartshape/PlotAreaConfigWidget.cpp
+++ b/plugins/chartshape/PlotAreaConfigWidget.cpp
@@ -63,7 +63,6 @@
#include "DataSet.h"
#include "Axis.h"
#include "ui_ChartTableEditor.h"
-#include "ui_PlotAreaConfigWidget.h"
#include "NewAxisDialog.h"
#include "AxisScalingDialog.h"
#include "FontEditorDialog.h"
diff --git a/plugins/defaultTools/defaulttool/ChartResizeStrategy.cpp \
b/plugins/defaultTools/defaulttool/ChartResizeStrategy.cpp index \
e15d4dae73d..ce5a72d1b16 100644
--- a/plugins/defaultTools/defaulttool/ChartResizeStrategy.cpp
+++ b/plugins/defaultTools/defaulttool/ChartResizeStrategy.cpp
@@ -24,7 +24,6 @@
#include <KoShapeContainer.h>
#include <KoCanvasBase.h>
#include <KoShapeManager.h>
-#include <KoShapeContainer.h>
#include <KoShapeContainerModel.h>
#include <commands/KoShapeMoveCommand.h>
#include <commands/KoShapeSizeCommand.h>
diff --git a/plugins/formulashape/FormulaCursor.cpp \
b/plugins/formulashape/FormulaCursor.cpp index d84e14fc14e..14100cbd170 100644
--- a/plugins/formulashape/FormulaCursor.cpp
+++ b/plugins/formulashape/FormulaCursor.cpp
@@ -29,7 +29,6 @@
#include "ElementFactory.h"
#include "OperatorElement.h"
#include "IdentifierElement.h"
-#include "ElementFactory.h"
#include "FormulaCommand.h"
#include "FormulaDebug.h"
diff --git a/plugins/formulashape/FormulaEditor.cpp \
b/plugins/formulashape/FormulaEditor.cpp index 4d9a4d84ac1..d06d51d35df 100644
--- a/plugins/formulashape/FormulaEditor.cpp
+++ b/plugins/formulashape/FormulaEditor.cpp
@@ -32,7 +32,6 @@
#include "ElementFactory.h"
#include "OperatorElement.h"
#include "IdentifierElement.h"
-#include "ElementFactory.h"
#include "FormulaCommand.h"
#include "FormulaDebug.h"
diff --git a/plugins/textediting/spellcheck/SpellCheck.cpp \
b/plugins/textediting/spellcheck/SpellCheck.cpp index ed9df42d11a..8c05ab6527a 100644
--- a/plugins/textediting/spellcheck/SpellCheck.cpp
+++ b/plugins/textediting/spellcheck/SpellCheck.cpp
@@ -251,7 +251,7 @@ void SpellCheck::documentChanged(int from, int charsRemoved, int \
charsAdded) return;
// If a simple edit, we use the cursor position to determine where
- // the change occured. This makes it possible to handle cases
+ // the change occurred. This makes it possible to handle cases
// where formatting of a block has changed, eg. when dropcaps is used.
// QTextDocument then reports the change as if the whole block has changed.
// Ex: Having a 10 char line and you add a char at pos 7:
diff --git a/plugins/textshape/ShrinkToFitShapeContainer.h \
b/plugins/textshape/ShrinkToFitShapeContainer.h index db17b1b656e..c3a9ca41f46 100644
--- a/plugins/textshape/ShrinkToFitShapeContainer.h
+++ b/plugins/textshape/ShrinkToFitShapeContainer.h
@@ -33,8 +33,6 @@
#include <KoShapeContainer_p.h>
#include <KoTextDocumentLayout.h>
-#include <KoXmlNS.h>
-#include <KoOdfLoadingContext.h>
#include <KoShapeLoadingContext.h>
#include <KoDocumentResourceManager.h>
diff --git a/plugins/textshape/TextShape.cpp b/plugins/textshape/TextShape.cpp
index 689199101b6..c633ef38f86 100644
--- a/plugins/textshape/TextShape.cpp
+++ b/plugins/textshape/TextShape.cpp
@@ -44,7 +44,6 @@
#include <KoText.h>
#include <KoTextDocument.h>
#include <KoTextDocumentLayout.h>
-#include <KoTextEditor.h>
#include <KoTextPage.h>
#include <KoTextShapeContainerModel.h>
#include <KoPageProvider.h>
diff --git a/plugins/textshape/TextTool.cpp b/plugins/textshape/TextTool.cpp
index d88b1cfcbc6..ad19da74ad9 100644
--- a/plugins/textshape/TextTool.cpp
+++ b/plugins/textshape/TextTool.cpp
@@ -37,7 +37,6 @@
#include "dialogs/TableDialog.h"
#include "dialogs/SectionFormatDialog.h"
#include "dialogs/SectionsSplitDialog.h"
-#include "dialogs/SimpleTableWidget.h"
#include "commands/AutoResizeCommand.h"
#include "commands/ChangeListLevelCommand.h"
#include "FontSizeAction.h"
diff --git a/plugins/textshape/dialogs/ListLevelWidget.cpp \
b/plugins/textshape/dialogs/ListLevelWidget.cpp index 84a11db92c0..c746e3a5111 100644
--- a/plugins/textshape/dialogs/ListLevelWidget.cpp
+++ b/plugins/textshape/dialogs/ListLevelWidget.cpp
@@ -173,7 +173,7 @@ void ListLevelWidget::setDisplay(const KoListLevelProperties \
&props) }
widget.format->setCurrentIndex(props.numberFormat());
- numberFormatChanged(props.numberFormat()); // enable/diable letterSynch checkbox
+ numberFormatChanged(props.numberFormat()); // enable/disable letterSynch \
checkbox widget.synchro->setChecked(props.letterSynchronization());
widget.prefix->setText(props.listItemPrefix());
widget.suffix->setText(props.listItemSuffix());
diff --git a/plugins/textshape/dialogs/StyleManager.cpp \
b/plugins/textshape/dialogs/StyleManager.cpp index ace6433ac0c..b06c33ac2ea 100644
--- a/plugins/textshape/dialogs/StyleManager.cpp
+++ b/plugins/textshape/dialogs/StyleManager.cpp
@@ -33,7 +33,6 @@
#include <QTabWidget>
#include <QInputDialog>
#include <QMessageBox>
-#include <QInputDialog>
#include <QDebug>
diff --git a/plugins/videoshape/Plugin.h b/plugins/videoshape/Plugin.h
index 92125881566..15d6f5c20f2 100644
--- a/plugins/videoshape/Plugin.h
+++ b/plugins/videoshape/Plugin.h
@@ -23,8 +23,6 @@
#include <QObject>
#include <QVariantList>
-#include <QVariantList>
-
class Plugin : public QObject
{
Q_OBJECT
diff --git a/sheets/odf/SheetsOdfStyle.cpp b/sheets/odf/SheetsOdfStyle.cpp
index b9274353b67..80b412bcd1a 100644
--- a/sheets/odf/SheetsOdfStyle.cpp
+++ b/sheets/odf/SheetsOdfStyle.cpp
@@ -45,7 +45,6 @@
#include <KoOdfWorkaround.h>
#include <KoStyleStack.h>
#include <KoUnit.h>
-#include <KoXmlNS.h>
#include "CalculationSettings.h"
#include "Condition.h"
diff --git a/windows/calligra_installer/simplifyHeatFragment.py \
b/windows/calligra_installer/simplifyHeatFragment.py index 9be5a83651b..af76ff1fdf4 \
100644
--- a/windows/calligra_installer/simplifyHeatFragment.py
+++ b/windows/calligra_installer/simplifyHeatFragment.py
@@ -16,4 +16,4 @@ for line in fin:
fout.write(line);
fout.close()
-print('Complete')
\ No newline at end of file
+print('Complete')
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic