[labplot] /: Fix minor EBN issues

[Yuri Chornoivan]

Git commit 96aae4d06e67c50a4bb9e8683614747eac4d7d7e by Yuri Chornoivan.
Committed on 10/08/2018 at 16:15.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

Signed-off-by: Yuri Chornoivan <***@ukr.net>

M +1 -1 CMakeLists.txt
M +1 -1 admin/asan_symbolize.py
M +1 -1 liborigin/OriginAnyParser.cpp
M +1 -1 src/backend/core/Project.cpp
M +1 -1 src/backend/datasources/LiveDataSource.cpp
M +1 -1 src/backend/datasources/LiveDataSource.h
M +5 -5 src/backend/datasources/filters/AsciiFilter.cpp
M +2 -2 src/backend/datasources/projects/OriginProjectParser.cpp
M +1 -1 src/backend/spreadsheet/Spreadsheet.cpp
M +4 -4 src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
M +1 -1 src/kdefrontend/MainWin.cpp
M +1 -1 src/kdefrontend/datasources/ImportFileDialog.cpp
M +3 -3 src/kdefrontend/datasources/ImportFileWidget.cpp
M +2 -1 src/kdefrontend/dockwidgets/BarChartPlotDock.cpp
M +2 -1 src/kdefrontend/dockwidgets/BarChartPlotDock.h
M +2 -2 src/kdefrontend/dockwidgets/HistogramDock.cpp
M +2 -2 src/kdefrontend/dockwidgets/LiveDataDock.cpp
M +2 -2 src/kdefrontend/spreadsheet/PlotDataDialog.cpp

https://commits.kde.org/labplot/96aae4d06e67c50a4bb9e8683614747eac4d7d7e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 886d137d..090f98f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,7 +103,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel")
message(STATUS "Intel C++ compiler detected, adding compile flags")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${GENERIC_CXX_FLAGS}")
- #-std=c++0x comes with cmake's general flags, depricated in icc, remove it
+ #-std=c++0x comes with cmake's general flags, deprecated in icc, remove it
string(REPLACE "-std=c++0x" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "PGI")
message(STATUS "PGI C++ compiler detected, adding compile flags")
diff --git a/admin/asan_symbolize.py b/admin/asan_symbolize.py
index 60d4c2af..3679c02d 100644
--- a/admin/asan_symbolize.py
+++ b/admin/asan_symbolize.py
@@ -51,7 +51,7 @@ class Symbolizer(object):
def symbolize(self, addr, binary, offset):
"""Symbolize the given address (pair of binary and offset).

- Overriden in subclasses.
+ Overridden in subclasses.
Args:
addr: virtual address of an instruction.
binary: path to executable/shared object containing this instruction.
diff --git a/liborigin/OriginAnyParser.cpp b/liborigin/OriginAnyParser.cpp
index c9e863ef..07d79492 100644
--- a/liborigin/OriginAnyParser.cpp
+++ b/liborigin/OriginAnyParser.cpp
@@ -850,7 +850,7 @@ void OriginAnyParser::readProjectLeaf(tree<ProjectNode>::iterator current_folder

void OriginAnyParser::readAttachmentList() {
/* Attachments are divided in two groups (which can be empty)
- first group is preceeded by two integers: 4096 (0x1000) and number_of_attachments followed as usual by a '\n' mark
+ first group is preceded by two integers: 4096 (0x1000) and number_of_attachments followed as usual by a '\n' mark
second group is a series of (header, name, data) triplets without the '\n' mark.
*/

diff --git a/src/backend/core/Project.cpp b/src/backend/core/Project.cpp
index 7f816ffa..5fe471ed 100644
--- a/src/backend/core/Project.cpp
+++ b/src/backend/core/Project.cpp
@@ -130,7 +130,7 @@ Project::Project() : Folder(i18n("Project")), d(new Private()) {

Project::~Project() {
//if the project is being closed and the live data sources still continue reading the data,
- //the dependend objects (columns, etc.), which are already deleted maybe here, are still being notified about the changes.
+ //the dependent objects (columns, etc.), which are already deleted maybe here, are still being notified about the changes.
//->stop reading the live data sources prior to deleting all objects.
for (auto* lds : children<LiveDataSource>())
lds->pauseReading();
diff --git a/src/backend/datasources/LiveDataSource.cpp b/src/backend/datasources/LiveDataSource.cpp
index 8ef35624..72373f18 100644
--- a/src/backend/datasources/LiveDataSource.cpp
+++ b/src/backend/datasources/LiveDataSource.cpp
@@ -642,7 +642,7 @@ void LiveDataSource::readyRead() {
// dynamic_cast<BinaryFilter*>(m_filter)->readFromLiveDeviceNotFile(*m_device, this);

//since we won't have the timer to call read() where we create new connections
- //for sequencial devices in read() we just request data/connect to servers
+ //for sequential devices in read() we just request data/connect to servers
if (m_updateType == NewData)
read();
}
diff --git a/src/backend/datasources/LiveDataSource.h b/src/backend/datasources/LiveDataSource.h
index 34b5f609..6df2d8b0 100644
--- a/src/backend/datasources/LiveDataSource.h
+++ b/src/backend/datasources/LiveDataSource.h
@@ -70,7 +70,7 @@ public:
};

enum ReadingType {
- ContinuousFixed = 0, // read continously sampleSize number of samples (lines)
+ ContinuousFixed = 0, // read continuously sampleSize number of samples (lines)
FromEnd, // read sampleSize number of samples (lines) from end
TillEnd, // read until the end
WholeFile // reread whole file
diff --git a/src/backend/datasources/filters/AsciiFilter.cpp b/src/backend/datasources/filters/AsciiFilter.cpp
index 3fe624a6..cd4fc030 100644
--- a/src/backend/datasources/filters/AsciiFilter.cpp
+++ b/src/backend/datasources/filters/AsciiFilter.cpp
@@ -784,7 +784,7 @@ qint64 AsciiFilterPrivate::readFromLiveDevice(QIODevice& device, AbstractDataSou
DEBUG(" Reading type = " << ENUM_TO_STRING(LiveDataSource, ReadingType, readingType));

//move to the last read position, from == total bytes read
- //since the other source types are sequencial we cannot seek on them
+ //since the other source types are sequential we cannot seek on them
if (spreadsheet->sourceType() == LiveDataSource::SourceType::FileOrPipe)
device.seek(from);

@@ -2198,7 +2198,7 @@ void AsciiFilterPrivate::readMQTTTopic(const QString& message, const QString& to

if (readingType != MQTTClient::ReadingType::TillEnd) {
newLinesForSampleSizeNotTillEnd++;
- //for Continous reading and FromEnd we read sample rate number of lines if possible
+ //for Continuous reading and FromEnd we read sample rate number of lines if possible
if (newLinesForSampleSizeNotTillEnd == spreadsheet->sampleSize()) {
sampleSizeReached = true;
break;
@@ -2403,7 +2403,7 @@ void AsciiFilterPrivate::readMQTTTopic(const QString& message, const QString& to
linesToRead = newLinesTillEnd;
} else {
//we read max sample size number of lines when the reading mode
- //is ContinouslyFixed or FromEnd
+ //is ContinuouslyFixed or FromEnd
if(spreadsheet->sampleSize() <= spreadsheet->keepNValues())
linesToRead = qMin(spreadsheet->sampleSize(), newLinesTillEnd);
else
@@ -2496,7 +2496,7 @@ void AsciiFilterPrivate::readMQTTTopic(const QString& message, const QString& to
}
} else {
//we read max sample rate number of lines when the reading mode
- //is ContinouslyFixed or FromEnd
+ //is ContinuouslyFixed or FromEnd
currentRow = m_actualRows - linesToRead;
}
}
@@ -2712,7 +2712,7 @@ void AsciiFilterPrivate::readMQTTTopic(const QString& message, const QString& to

/*!
* \brief Prepares the filter to read from messages received by the MQTTTopic.
- * Returns whether the preparation was successfull or not
+ * Returns whether the preparation was successful or not
* \param message
* \param topic
*/
diff --git a/src/backend/datasources/projects/OriginProjectParser.cpp b/src/backend/datasources/projects/OriginProjectParser.cpp
index 871ace50..e93d235b 100644
--- a/src/backend/datasources/projects/OriginProjectParser.cpp
+++ b/src/backend/datasources/projects/OriginProjectParser.cpp
@@ -925,7 +925,7 @@ bool OriginProjectParser::loadMatrix(Matrix* matrix, bool preview, size_t sheetI
for (int j = 0; j < colCount; j++)
matrix->setColumnWidth(j, layer.width * scaling_factor);

- //TODO: check colum major vs. row major to improve the performance here
+ //TODO: check column major vs. row major to improve the performance here
for (int i = 0; i < rowCount; i++) {
for (int j = 0; j < colCount; j++)
matrix->setCell(i, j, layer.data[j + i*colCount]);
@@ -1152,7 +1152,7 @@ bool OriginProjectParser::loadWorksheet(Worksheet* worksheet, bool preview) {
//the text before these formatting tags, if available, is interpreted as the legend title
QString legendTitle;

- //search for the first occurance of the legend symbol substring
+ //search for the first occurrence of the legend symbol substring
int index = legendText.indexOf(QLatin1String("\\l("), 0, Qt::CaseInsensitive);
if (index != -1)
legendTitle = legendText.left(index);
diff --git a/src/backend/spreadsheet/Spreadsheet.cpp b/src/backend/spreadsheet/Spreadsheet.cpp
index 3fcf3472..012ebb1e 100644
--- a/src/backend/spreadsheet/Spreadsheet.cpp
+++ b/src/backend/spreadsheet/Spreadsheet.cpp
@@ -874,7 +874,7 @@ int Spreadsheet::resize(AbstractFileFilter::ImportMode mode, QStringList colName
}
}

- //rename the columns that are already available and supress the dataChanged signal for them
+ //rename the columns that are already available and suppress the dataChanged signal for them
for (int i = 0; i < childCount<Column>(); i++) {
if (mode == AbstractFileFilter::Replace)
child<Column>(i)->setSuppressDataChangedSignal(true);
diff --git a/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp b/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
index b679f866..eda0a9ce 100644
--- a/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
+++ b/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
@@ -2431,14 +2431,14 @@ void CartesianPlotPrivate::mouseMoveEvent(QGraphicsSceneMouseEvent* event) {
if (xRangeFormat == CartesianPlot::Numeric)
info = QString::fromUtf8("Δx=") + QString::number(logicalEnd.x()-logicalStart.x());
else
- info = i18n("from x=%1 to x=%2").arg(QDateTime::fromMSecsSinceEpoch(logicalStart.x()).toString(xRangeDateTimeFormat),
+ info = i18n("from x=%1 to x=%2", QDateTime::fromMSecsSinceEpoch(logicalStart.x()).toString(xRangeDateTimeFormat),
QDateTime::fromMSecsSinceEpoch(logicalEnd.x()).toString(xRangeDateTimeFormat));

info += QLatin1String(", ");
if (yRangeFormat == CartesianPlot::Numeric)
info += QString::fromUtf8("Δy=") + QString::number(logicalEnd.y()-logicalStart.y());
else
- info += i18n("from y=%1 to y=%2").arg(QDateTime::fromMSecsSinceEpoch(logicalStart.y()).toString(xRangeDateTimeFormat),
+ info += i18n("from y=%1 to y=%2", QDateTime::fromMSecsSinceEpoch(logicalStart.y()).toString(xRangeDateTimeFormat),
QDateTime::fromMSecsSinceEpoch(logicalEnd.y()).toString(xRangeDateTimeFormat));
} else if (mouseMode == CartesianPlot::ZoomXSelectionMode) {
m_selectionEnd.setX(event->pos().x());
@@ -2447,7 +2447,7 @@ void CartesianPlotPrivate::mouseMoveEvent(QGraphicsSceneMouseEvent* event) {
if (xRangeFormat == CartesianPlot::Numeric)
info = QString::fromUtf8("Δx=") + QString::number(logicalEnd.x()-logicalStart.x());
else
- info = i18n("from x=%1 to x=%2").arg(QDateTime::fromMSecsSinceEpoch(logicalStart.x()).toString(xRangeDateTimeFormat),
+ info = i18n("from x=%1 to x=%2", QDateTime::fromMSecsSinceEpoch(logicalStart.x()).toString(xRangeDateTimeFormat),
QDateTime::fromMSecsSinceEpoch(logicalEnd.x()).toString(xRangeDateTimeFormat));
} else if (mouseMode == CartesianPlot::ZoomYSelectionMode) {
m_selectionEnd.setX(dataRect.width()/2);
@@ -2456,7 +2456,7 @@ void CartesianPlotPrivate::mouseMoveEvent(QGraphicsSceneMouseEvent* event) {
if (yRangeFormat == CartesianPlot::Numeric)
info = QString::fromUtf8("Δy=") + QString::number(logicalEnd.y()-logicalStart.y());
else
- info = i18n("from y=%1 to y=%2").arg(QDateTime::fromMSecsSinceEpoch(logicalStart.y()).toString(xRangeDateTimeFormat),
+ info = i18n("from y=%1 to y=%2", QDateTime::fromMSecsSinceEpoch(logicalStart.y()).toString(xRangeDateTimeFormat),
QDateTime::fromMSecsSinceEpoch(logicalEnd.y()).toString(xRangeDateTimeFormat));
}
q->info(info);
diff --git a/src/kdefrontend/MainWin.cpp b/src/kdefrontend/MainWin.cpp
index f1353f12..8a23e983 100644
--- a/src/kdefrontend/MainWin.cpp
+++ b/src/kdefrontend/MainWin.cpp
@@ -807,7 +807,7 @@ void MainWin::updateGUI() {
#ifdef HAVE_CANTOR_LIBS
CantorWorksheet* cantorworksheet = this->activeCantorWorksheet();
if(cantorworksheet) {
- // enable Cantor Worksheet related menues
+ // enable Cantor Worksheet related menus
factory->container("cas_worksheet", this)->setEnabled(true);
CantorWorksheetView* view=qobject_cast<CantorWorksheetView*>(cantorworksheet->view());
QMenu* menu=qobject_cast<QMenu*>(factory->container("cas_worksheet", this));
diff --git a/src/kdefrontend/datasources/ImportFileDialog.cpp b/src/kdefrontend/datasources/ImportFileDialog.cpp
index 1e95def9..8c7c679f 100644
--- a/src/kdefrontend/datasources/ImportFileDialog.cpp
+++ b/src/kdefrontend/datasources/ImportFileDialog.cpp
@@ -157,7 +157,7 @@ void ImportFileDialog::importToLiveDataSource(LiveDataSource* source, QStatusBar

QTime timer;
timer.start();
- DEBUG(" Inital read()");
+ DEBUG(" Initial read()");
source->read();
statusBar->showMessage( i18n("Live data source created in %1 seconds.", (float)timer.elapsed()/1000) );

diff --git a/src/kdefrontend/datasources/ImportFileWidget.cpp b/src/kdefrontend/datasources/ImportFileWidget.cpp
index 57ddf36b..5e3dbf7d 100644
--- a/src/kdefrontend/datasources/ImportFileWidget.cpp
+++ b/src/kdefrontend/datasources/ImportFileWidget.cpp
@@ -1380,7 +1380,7 @@ void ImportFileWidget::updateSubscriptionTree() {
/*!
*\brief Restores the children of a top level item in twSubscriptions if it contains wildcards
*
- * \param topic pointer to a top level item in twTopics wich represents the root of the subscription topic
+ * \param topic pointer to a top level item in twTopics which represents the root of the subscription topic
* \param subscription pointer to a top level item in twSubscriptions, this is the item whose children will be restored
* \param list QStringList containing the levels of the subscription topic
* \param level the level's number which is being investigated
@@ -2348,7 +2348,7 @@ void ImportFileWidget::mqttConnection() {
}

/*!
- *\brief called when the client connects to the broker succesfully, it subscribes to every topic (# wildcard)
+ *\brief called when the client connects to the broker successfully, it subscribes to every topic (# wildcard)
* in order to later list every available topic
*/
void ImportFileWidget::onMqttConnect() {
@@ -2377,7 +2377,7 @@ void ImportFileWidget::onMqttConnect() {
}

/*!
- *\brief called when the client disconnects from the broker succesfully
+ *\brief called when the client disconnects from the broker successfully
* removes every information about the former connection
*/
void ImportFileWidget::onMqttDisconnect() {
diff --git a/src/kdefrontend/dockwidgets/BarChartPlotDock.cpp b/src/kdefrontend/dockwidgets/BarChartPlotDock.cpp
index 0962df36..8b2af315 100644
--- a/src/kdefrontend/dockwidgets/BarChartPlotDock.cpp
+++ b/src/kdefrontend/dockwidgets/BarChartPlotDock.cpp
@@ -23,4 +23,5 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, *
* Boston, MA 02110-1301 USA *
* *
- ***************************************************************************/
\ No newline at end of file
+ ***************************************************************************/
+
\ No newline at end of file
diff --git a/src/kdefrontend/dockwidgets/BarChartPlotDock.h b/src/kdefrontend/dockwidgets/BarChartPlotDock.h
index 0962df36..8b2af315 100644
--- a/src/kdefrontend/dockwidgets/BarChartPlotDock.h
+++ b/src/kdefrontend/dockwidgets/BarChartPlotDock.h
@@ -23,4 +23,5 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, *
* Boston, MA 02110-1301 USA *
* *
- ***************************************************************************/
\ No newline at end of file
+ ***************************************************************************/
+
\ No newline at end of file
diff --git a/src/kdefrontend/dockwidgets/HistogramDock.cpp b/src/kdefrontend/dockwidgets/HistogramDock.cpp
index 1da52a8c..f8f963d6 100644
--- a/src/kdefrontend/dockwidgets/HistogramDock.cpp
+++ b/src/kdefrontend/dockwidgets/HistogramDock.cpp
@@ -826,7 +826,7 @@ void HistogramDock::valuesTypeChanged(int index) {
curve->setValuesType(valuesType);
}

-//TODO: very similiar to ColumnDock
+//TODO: very similar to ColumnDock
void HistogramDock::showValuesColumnFormat(const Column* column){
if (!column){
// no valid column is available
@@ -860,7 +860,7 @@ void HistogramDock::showValuesColumnFormat(const Column* column){
}
}

-//TODO: very similiar to ColumnDock
+//TODO: very similar to ColumnDock
void HistogramDock::updateValuesFormatWidgets(const AbstractColumn::ColumnMode columnMode) {
ui.cbValuesFormat->clear();

diff --git a/src/kdefrontend/dockwidgets/LiveDataDock.cpp b/src/kdefrontend/dockwidgets/LiveDataDock.cpp
index b528c839..f8fe6d2f 100644
--- a/src/kdefrontend/dockwidgets/LiveDataDock.cpp
+++ b/src/kdefrontend/dockwidgets/LiveDataDock.cpp
@@ -818,7 +818,7 @@ void LiveDataDock::statisticsChanged(QListWidgetItem *item) {
}

/*!
- *\brief called when the client connects to the broker succesfully, it subscribes to every topic (# wildcard)
+ *\brief called when the client connects to the broker successfully, it subscribes to every topic (# wildcard)
* in order to later list every available topic
*/
void LiveDataDock::onMQTTConnect() {
@@ -1306,7 +1306,7 @@ void LiveDataDock::addSubscriptionChildren(QTreeWidgetItem * topic, QTreeWidgetI
/*!
*\brief Restores the children of a top level item in twSubscriptions if it contains wildcards
*
- * \param topic pointer to a top level item in twTopics wich represents the root of the subscription topic
+ * \param topic pointer to a top level item in twTopics which represents the root of the subscription topic
* \param subscription pointer to a top level item in twSubscriptions, this is the item whose children will be restored
* \param list QStringList containing the levels of the subscription topic
* \param level the level's number which is being investigated
diff --git a/src/kdefrontend/spreadsheet/PlotDataDialog.cpp b/src/kdefrontend/spreadsheet/PlotDataDialog.cpp
index e7ae4abb..6b797493 100644
--- a/src/kdefrontend/spreadsheet/PlotDataDialog.cpp
+++ b/src/kdefrontend/spreadsheet/PlotDataDialog.cpp
@@ -321,7 +321,7 @@ void PlotDataDialog::plot() {
CartesianPlot* plot = new CartesianPlot( i18n("Plot data from %1", m_spreadsheet->name()) );
plot->initDefault(CartesianPlot::FourAxes);

- //set the axis titles befor we add the plot to the worksheet
+ //set the axis titles before we add the plot to the worksheet
//set the x-axis names
const QString& xColumnName = ui->cbXColumn->currentText();
for (auto axis : plot->children<Axis>()) {
@@ -366,7 +366,7 @@ void PlotDataDialog::plot() {
CartesianPlot* plot = new CartesianPlot( i18n("Plot data from %1", m_spreadsheet->name()) );
plot->initDefault(CartesianPlot::FourAxes);

- //set the axis titles befor we add the plot to the worksheet
+ //set the axis titles before we add the plot to the worksheet
//set the x-axis names
const QString& xColumnName = ui->cbXColumn->currentText();
for (auto axis : plot->children<Axis>()) {

[Yuri Chornoivan]

Git commit 424e34b77ea8b25744e64946d07edf9e1df0869b by Yuri Chornoivan.
Committed on 11/08/2018 at 09:39.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

Signed-off-by: Yuri Chornoivan <***@ukr.net>

M +2 -2 configure-printer/ConfigurePrinterInterface.cpp
M +2 -1 configure-printer/SelectMakeModelDialog.cpp
M +1 -1 libkcups/KCupsConnection.cpp
M +1 -1 libkcups/PrinterModel.cpp
M +2 -2 printer-manager-kcm/PrinterDelegate.cpp
M +1 -1 printer-manager-kcm/PrinterDelegate.h

https://commits.kde.org/print-manager/424e34b77ea8b25744e64946d07edf9e1df0869b

diff --git a/configure-printer/ConfigurePrinterInterface.cpp b/configure-printer/ConfigurePrinterInterface.cpp
index e2f5179..12a2109 100644
--- a/configure-printer/ConfigurePrinterInterface.cpp
+++ b/configure-printer/ConfigurePrinterInterface.cpp
@@ -26,8 +26,8 @@
#include <KCupsRequest.h>
#include <KCupsPrinter.h>

-#include <QtDBus/QDBusConnection>
-#include <QtCore/QTimer>
+#include <QDBusConnection>
+#include <QTimer>
#include <KWindowSystem>
#include <QDialog>

diff --git a/configure-printer/SelectMakeModelDialog.cpp b/configure-printer/SelectMakeModelDialog.cpp
index e9d2190..455ed2e 100644
--- a/configure-printer/SelectMakeModelDialog.cpp
+++ b/configure-printer/SelectMakeModelDialog.cpp
@@ -18,6 +18,8 @@
* Boston, MA 02110-1301, USA. *
***************************************************************************/

+#include "SelectMakeModelDialog.h"
+
#include <QVBoxLayout>
#include <QPushButton>

@@ -28,7 +30,6 @@
#include <KIconLoader>
#include <KPixmapSequence>

-#include "SelectMakeModelDialog.h"
#include "Debug.h"

SelectMakeModelDialog::SelectMakeModelDialog(const QString &make, const QString &makeModel, QWidget *parent) :
diff --git a/libkcups/KCupsConnection.cpp b/libkcups/KCupsConnection.cpp
index 0408a58..d273fda 100644
--- a/libkcups/KCupsConnection.cpp
+++ b/libkcups/KCupsConnection.cpp
@@ -536,7 +536,7 @@ void KCupsConnection::updateSubscription()
if (m_requestedDBusEvents != currentEvents) {
m_requestedDBusEvents = currentEvents;

- // If we alread have a subscription lets cancel
+ // If we already have a subscription lets cancel
// and create a new one
if (m_subscriptionId >= 0) {
cancelDBusSubscription();
diff --git a/libkcups/PrinterModel.cpp b/libkcups/PrinterModel.cpp
index d7ed42d..18249c3 100644
--- a/libkcups/PrinterModel.cpp
+++ b/libkcups/PrinterModel.cpp
@@ -25,7 +25,7 @@
#include <QDateTime>
#include <QMimeData>
#include <QDBusConnection>
-#include <QtDBus/QDBusInterface>
+#include <QDBusInterface>
#include <QPointer>

#include <KUser>
diff --git a/printer-manager-kcm/PrinterDelegate.cpp b/printer-manager-kcm/PrinterDelegate.cpp
index 4589a47..7d7c68e 100644
--- a/printer-manager-kcm/PrinterDelegate.cpp
+++ b/printer-manager-kcm/PrinterDelegate.cpp
@@ -23,8 +23,8 @@

#include <cmath>

-#include <QtGui/QPainter>
-#include <QtWidgets/QStyleOption>
+#include <QPainter>
+#include <QStyleOption>

#include <KIconLoader>

diff --git a/printer-manager-kcm/PrinterDelegate.h b/printer-manager-kcm/PrinterDelegate.h
index fbbeaf0..a200c59 100644
--- a/printer-manager-kcm/PrinterDelegate.h
+++ b/printer-manager-kcm/PrinterDelegate.h
@@ -22,7 +22,7 @@
#define PRINTER_DELEGATE_H

#include <QApplication>
-#include <QtWidgets/QStyledItemDelegate>
+#include <QStyledItemDelegate>

class QPainter;

[Yuri Chornoivan]

Git commit 885da6c7897ace7bc0cad70f32205f80864c1fd9 by Yuri Chornoivan.
Committed on 11/08/2018 at 09:58.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

Signed-off-by: Yuri Chornoivan <***@ukr.net>

M +1 -1 addons/close-except-like/close_except_plugin.cpp
M +5 -5 addons/lumen/dcd.cpp
M +6 -6 addons/lumen/dcd.h
M +0 -1 addons/lumen/lumen.cpp
M +5 -5 addons/search/htmldelegate.cpp
M +1 -2 addons/xmlcheck/plugin_katexmlcheck.cpp
M +2 -2 addons/xmltools/plugin_katexmltools.cpp
M +1 -1 kate/kateconfigdialog.cpp
M +1 -1 urlinfo.h

https://commits.kde.org/kate/885da6c7897ace7bc0cad70f32205f80864c1fd9

diff --git a/addons/close-except-like/close_except_plugin.cpp b/addons/close-except-like/close_except_plugin.cpp
index d0a1b4286..566428ccd 100644
--- a/addons/close-except-like/close_except_plugin.cpp
+++ b/addons/close-except-like/close_except_plugin.cpp
@@ -36,7 +36,7 @@
#include <KActionCollection>
#include <KPluginFactory>
#include <KPluginLoader>
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
#include <QUrl>
#include <kio/global.h>
#include <KXMLGUIFactory>
diff --git a/addons/lumen/dcd.cpp b/addons/lumen/dcd.cpp
index 3019203f2..1c399ab59 100644
--- a/addons/lumen/dcd.cpp
+++ b/addons/lumen/dcd.cpp
@@ -19,11 +19,11 @@
**/

#include "dcd.h"
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
-#include <QtCore/QFile>
-#include <QtCore/QRegularExpression>
-#include <QtGui/QIcon>
+#include <QDebug>
+#include <QProcess>
+#include <QFile>
+#include <QRegularExpression>
+#include <QIcon>


char DCDCompletionItemType::toChar(DCDCompletionItemType e)
diff --git a/addons/lumen/dcd.h b/addons/lumen/dcd.h
index e7cb778d6..96b318f66 100644
--- a/addons/lumen/dcd.h
+++ b/addons/lumen/dcd.h
@@ -21,12 +21,12 @@
#ifndef LUMEN_DCD_H
#define LUMEN_DCD_H

-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
-#include <QtCore/QFile>
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtGui/QIcon>
+#include <QDebug>
+#include <QProcess>
+#include <QFile>
+#include <QObject>
+#include <QMap>
+#include <QIcon>


namespace DCDCompletionType { enum DCDCompletionType { Identifiers, Calltips }; }
diff --git a/addons/lumen/lumen.cpp b/addons/lumen/lumen.cpp
index 31f328cfa..09609fd27 100644
--- a/addons/lumen/lumen.cpp
+++ b/addons/lumen/lumen.cpp
@@ -25,7 +25,6 @@
#include <KTextEditor/Range>
#include <KTextEditor/View>
#include <KTextEditor/CodeCompletionInterface>
-#include <KTextEditor/CodeCompletionInterface>
#include <KTextEditor/TextHintInterface>
#include <KTextEditor/MainWindow>
#include <kactioncollection.h>
diff --git a/addons/search/htmldelegate.cpp b/addons/search/htmldelegate.cpp
index 73d687d5a..e663b6fe5 100644
--- a/addons/search/htmldelegate.cpp
+++ b/addons/search/htmldelegate.cpp
@@ -20,11 +20,11 @@

#include "htmldelegate.h"

-#include <QtGui/QPainter>
-#include <QtCore/QModelIndex>
-#include <QtGui/QTextDocument>
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextCharFormat>
+#include <QPainter>
+#include <QModelIndex>
+#include <QTextDocument>
+#include <QAbstractTextDocumentLayout>
+#include <QTextCharFormat>
#include <KLocalizedString>

SPHtmlDelegate::SPHtmlDelegate( QObject* parent )
diff --git a/addons/xmlcheck/plugin_katexmlcheck.cpp b/addons/xmlcheck/plugin_katexmlcheck.cpp
index a3f3a830a..e1551ec02 100644
--- a/addons/xmlcheck/plugin_katexmlcheck.cpp
+++ b/addons/xmlcheck/plugin_katexmlcheck.cpp
@@ -65,7 +65,6 @@
#include <kpluginfactory.h>
#include <QProcess>

-#include <QAction>
#include <QComboBox>
#include <QFile>
#include <QFileDialog>
@@ -371,7 +370,7 @@ bool PluginKateXMLCheckView::slotValidate()
} else {
dtdname = re_doctype.cap(3);
}
- if( !dtdname.startsWith("http:") ) { // todo: u_dtd.isLocalFile() doesn't work :-(
+ if( !dtdname.startsWith(QLatin1String("http:")) ) { // todo: u_dtd.isLocalFile() doesn't work :-(
// a local DTD is used
m_validating = true;
args << "--valid";
diff --git a/addons/xmltools/plugin_katexmltools.cpp b/addons/xmltools/plugin_katexmltools.cpp
index 62be3b19d..c3fa73fe6 100644
--- a/addons/xmltools/plugin_katexmltools.cpp
+++ b/addons/xmltools/plugin_katexmltools.cpp
@@ -980,7 +980,7 @@ QString PluginKateXMLToolsCompletionModel::getParentElement(KTextEditor::View &k
bool PluginKateXMLToolsCompletionModel::isOpeningTag(const QString &tag)
{
return (!isClosingTag(tag) && !isEmptyTag(tag) &&
- !tag.startsWith("<?") && !tag.startsWith("<!"));
+ !tag.startsWith(QLatin1String("<?")) && !tag.startsWith("<!"));
}

/**
@@ -989,7 +989,7 @@ bool PluginKateXMLToolsCompletionModel::isOpeningTag(const QString &tag)
*/
bool PluginKateXMLToolsCompletionModel::isClosingTag(const QString &tag)
{
- return (tag.startsWith("</"));
+ return (tag.startsWith(QLatin1String("</")));
}

bool PluginKateXMLToolsCompletionModel::isEmptyTag(const QString &tag)
diff --git a/kate/kateconfigdialog.cpp b/kate/kateconfigdialog.cpp
index 37884d4e4..efe811920 100644
--- a/kate/kateconfigdialog.cpp
+++ b/kate/kateconfigdialog.cpp
@@ -260,7 +260,7 @@ void KateConfigDialog::slotCurrentPageChanged(KPageWidgetItem *current, KPageWid
if (info->pluginPage) {
return;
}
- qCDebug(LOG_KATE) << "creating config page (shouldnt get here)";
+ qCDebug(LOG_KATE) << "creating config page (should not get here)";
info->pluginPage = info->plugin->configPage(info->idInPlugin, info->pageParent);
info->pageParent->layout()->addWidget(info->pluginPage);
info->pluginPage->show();
diff --git a/urlinfo.h b/urlinfo.h
index 31369dac8..c9e179a8c 100644
--- a/urlinfo.h
+++ b/urlinfo.h
@@ -98,7 +98,7 @@ public:
QUrl url;

/**
- * initial cursor position, if any found inside the path as line/colum specification at the end
+ * initial cursor position, if any found inside the path as line/column specification at the end
*/
KTextEditor::Cursor cursor;
};

[Yuri Chornoivan]

Git commit a6ef814f6d6c3a7ef25885946c4288654058c3b0 by Yuri Chornoivan.
Committed on 11/08/2018 at 13:38.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

Signed-off-by: Yuri Chornoivan <***@ukr.net>

M +1 -1 cmake/CMakeLists.txt
M +1 -1 cmake/modules/CMakeLists.txt
M +1 -1 helperlibs/CMakeLists.txt
M +1 -1 images/CMakeLists.txt
M +1 -1 libchoqok/ui/choqoktabbar.cpp
M +1 -1 microblogs/friendica/friendicaeditaccount.cpp
M +1 -1 microblogs/laconica/laconicaeditaccount.cpp
M +1 -1 microblogs/ocs/CMakeLists.txt
M +1 -1 microblogs/pumpio/pumpiomessagedialog.h
M +1 -1 microblogs/pumpio/pumpiomicroblogwidget.h
M +1 -1 microblogs/twitter/twittertextedit.cpp
M +1 -1 plugins/shorteners/tinyarro_ws/tinyarro_ws.cpp
M +3 -3 plugins/uploaders/flickr/flickrconfig.cpp
M +1 -1 plugins/uploaders/twitpic/twitpic.cpp

https://commits.kde.org/choqok/a6ef814f6d6c3a7ef25885946c4288654058c3b0

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 2a632ae4..8e2019b6 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(modules)
\ No newline at end of file
+add_subdirectory(modules)
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 845a8071..09c6d696 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -1,4 +1,4 @@
# install the cmake files

set(cmakeFiles FindChoqok.cmake)
-install( FILES ${cmakeFiles} DESTINATION ${DATA_INSTALL_DIR}/cmake/modules )
\ No newline at end of file
+install( FILES ${cmakeFiles} DESTINATION ${DATA_INSTALL_DIR}/cmake/modules )
diff --git a/helperlibs/CMakeLists.txt b/helperlibs/CMakeLists.txt
index 3b89ffe3..e4b1665d 100644
--- a/helperlibs/CMakeLists.txt
+++ b/helperlibs/CMakeLists.txt
@@ -1,2 +1,2 @@
add_subdirectory( gnusocialapihelper )
-add_subdirectory( twitterapihelper )
\ No newline at end of file
+add_subdirectory( twitterapihelper )
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt
index 6c2f6128..cb0469cf 100644
--- a/images/CMakeLists.txt
+++ b/images/CMakeLists.txt
@@ -5,4 +5,4 @@ install(
FILES
splash_screen.png
DESTINATION ${DATA_INSTALL_DIR}/choqok/images
-)
\ No newline at end of file
+)
diff --git a/libchoqok/ui/choqoktabbar.cpp b/libchoqok/ui/choqoktabbar.cpp
index 11d9899f..dfe0c040 100644
--- a/libchoqok/ui/choqoktabbar.cpp
+++ b/libchoqok/ui/choqoktabbar.cpp
@@ -778,7 +778,7 @@ void ChoqokTabBar::contextMenuRequest(const QPoint &)
QAction size_b(i18n("Big") , this);
QAction styled(i18n("Styled Panel") , this);

- /*! ------------- Setting Up Datas --------------- */
+ /*! ------------- Setting Up Data --------------- */
north.setData(ChoqokTabBar::North);
west.setData(ChoqokTabBar::West);
east.setData(ChoqokTabBar::East);
diff --git a/microblogs/friendica/friendicaeditaccount.cpp b/microblogs/friendica/friendicaeditaccount.cpp
index 802deeed..f478a250 100644
--- a/microblogs/friendica/friendicaeditaccount.cpp
+++ b/microblogs/friendica/friendicaeditaccount.cpp
@@ -184,7 +184,7 @@ Choqok::Account *FriendicaEditAccountWidget::apply()
// isAuthenticated = false;
// while(!isAuthenticated){
// QString verifier = KInputDialog::getText( i18n("Security code"),
-// i18nc("Security code recieved from StatusNet",
+// i18nc("Security code received from StatusNet",
// "Enter security code:"));
// if(verifier.isEmpty())
// return;
diff --git a/microblogs/laconica/laconicaeditaccount.cpp b/microblogs/laconica/laconicaeditaccount.cpp
index 5afd5028..69bc4d40 100644
--- a/microblogs/laconica/laconicaeditaccount.cpp
+++ b/microblogs/laconica/laconicaeditaccount.cpp
@@ -186,7 +186,7 @@ Choqok::Account *LaconicaEditAccountWidget::apply()
// isAuthenticated = false;
// while(!isAuthenticated){
// QString verifier = KInputDialog::getText( i18n("Security code"),
-// i18nc("Security code recieved from StatusNet",
+// i18nc("Security code received from StatusNet",
// "Enter security code:"));
// if(verifier.isEmpty())
// return;
diff --git a/microblogs/ocs/CMakeLists.txt b/microblogs/ocs/CMakeLists.txt
index 474ea8b4..cc37a38a 100644
--- a/microblogs/ocs/CMakeLists.txt
+++ b/microblogs/ocs/CMakeLists.txt
@@ -30,4 +30,4 @@ PUBLIC
install(TARGETS choqok_ocs DESTINATION ${PLUGIN_INSTALL_DIR})
install( FILES choqok_ocs.desktop DESTINATION ${SERVICES_INSTALL_DIR})

-add_subdirectory(icons)
\ No newline at end of file
+add_subdirectory(icons)
diff --git a/microblogs/pumpio/pumpiomessagedialog.h b/microblogs/pumpio/pumpiomessagedialog.h
index 249a6e60..1c0a8a72 100644
--- a/microblogs/pumpio/pumpiomessagedialog.h
+++ b/microblogs/pumpio/pumpiomessagedialog.h
@@ -54,4 +54,4 @@ private:

};

-#endif // PUMPIOMESSAGEDIALOG_H
\ No newline at end of file
+#endif // PUMPIOMESSAGEDIALOG_H
diff --git a/microblogs/pumpio/pumpiomicroblogwidget.h b/microblogs/pumpio/pumpiomicroblogwidget.h
index 9dd7bc3a..6a1a3b08 100644
--- a/microblogs/pumpio/pumpiomicroblogwidget.h
+++ b/microblogs/pumpio/pumpiomicroblogwidget.h
@@ -40,4 +40,4 @@ protected:

};

-#endif // PUMPIOMICROBLOGWIDGET_H
\ No newline at end of file
+#endif // PUMPIOMICROBLOGWIDGET_H
diff --git a/microblogs/twitter/twittertextedit.cpp b/microblogs/twitter/twittertextedit.cpp
index 31662621..e0897a95 100644
--- a/microblogs/twitter/twittertextedit.cpp
+++ b/microblogs/twitter/twittertextedit.cpp
@@ -67,7 +67,7 @@ void TwitterTextEdit::updateRemainingCharsCount()
int remain = charLimit() - count;

for (const QString &url: UrlUtils::detectUrls(txt)) {
- // Twitter does not wrapps urls with login informations
+ // Twitter does not wrapps urls with login information
if (!url.contains(QLatin1Char('@'))) {
int diff = -1;
if (url.startsWith(QLatin1String("http://"))) {
diff --git a/plugins/shorteners/tinyarro_ws/tinyarro_ws.cpp b/plugins/shorteners/tinyarro_ws/tinyarro_ws.cpp
index 927cb0a2..fcbf5cee 100644
--- a/plugins/shorteners/tinyarro_ws/tinyarro_ws.cpp
+++ b/plugins/shorteners/tinyarro_ws/tinyarro_ws.cpp
@@ -75,4 +75,4 @@ QString Tinyarro_ws::shorten(const QString &url)
return url;
}

-#include "tinyarro_ws.moc"
\ No newline at end of file
+#include "tinyarro_ws.moc"
diff --git a/plugins/uploaders/flickr/flickrconfig.cpp b/plugins/uploaders/flickr/flickrconfig.cpp
index ff520c91..1ca6565f 100644
--- a/plugins/uploaders/flickr/flickrconfig.cpp
+++ b/plugins/uploaders/flickr/flickrconfig.cpp
@@ -166,7 +166,7 @@ void FlickrConfig::getFrob()
errMsg = i18n("The requested service is temporarily unavailable. Try again later");
break;
default:
- errMsg = i18n("Unknown Error:%1. Please try again later").arg(errCode);
+ errMsg = i18n("Unknown Error:%1. Please try again later", errCode);
break;
}
}
@@ -240,7 +240,7 @@ void FlickrConfig::getToken()
errMsg = i18n("The requested service is temporarily unavailable. Try again later");
break;
default:
- errMsg = i18n("Something happens wrong. Error %1. Try again later").arg(errCode);
+ errMsg = i18n("Something happens wrong. Error %1. Try again later", errCode);
break;
}
}
@@ -277,7 +277,7 @@ void FlickrConfig::setAuthenticated(bool authenticated)
if (authenticated) {
ui.authButton->setIcon(QIcon::fromTheme(QLatin1String("object-unlocked")));
ui.authLed->on();
- ui.authLabel->setText(i18n("Authorized as %1").arg(m_username));
+ ui.authLabel->setText(i18n("Authorized as %1", m_username));
if (!m_fullname.isEmpty()) {
ui.authLabel->setText(ui.authLabel->text() + QStringLiteral(" (%1)").arg(m_fullname.toHtmlEscaped()));
}
diff --git a/plugins/uploaders/twitpic/twitpic.cpp b/plugins/uploaders/twitpic/twitpic.cpp
index ca0fccec..4444cafa 100644
--- a/plugins/uploaders/twitpic/twitpic.cpp
+++ b/plugins/uploaders/twitpic/twitpic.cpp
@@ -133,4 +133,4 @@ void Twitpic::slotUpload(KJob *job)
}
}

-#include "twitpic.moc"
\ No newline at end of file
+#include "twitpic.moc"

[Yuri Chornoivan]

Git commit 78aa674b1a266843a7d72f0462b2bfd7728d9569 by Yuri Chornoivan.
Committed on 11/08/2018 at 15:28.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +0 -1 ktorrent/main.cpp
M +1 -1 ktorrent/view/scanextender.cpp
M +0 -1 libktcore/groups/groupmanager.cpp
M +1 -1 plasma/CMakeLists.txt
M +0 -1 plugins/infowidget/GeoIP.c
M +1 -1 plugins/ipfilter/downloadandconvertjob.cpp
M +1 -1 plugins/scripting/scripts/CMakeLists.txt
M +1 -1 plugins/scripting/scripts/auto_resume/CMakeLists.txt
M +1 -1 plugins/scripting/scripts/test.py
M +1 -1 plugins/scripting/scripts/tracker_groups/CMakeLists.txt
M +2 -2 plugins/webinterface/actionhandler.cpp
M +4 -4 plugins/webinterface/httpserver.cpp
M +1 -1 plugins/webinterface/loginhandler.cpp
M +2 -2 plugins/webinterface/settingsgenerator.cpp
M +1 -1 plugins/webinterface/torrentposthandler.cpp
M +2 -2 scripts/kcfg_qobject_gen.py

https://commits.kde.org/ktorrent/78aa674b1a266843a7d72f0462b2bfd7728d9569

diff --git a/ktorrent/main.cpp b/ktorrent/main.cpp
index d296bb3d..5c8fa51f 100644
--- a/ktorrent/main.cpp
+++ b/ktorrent/main.cpp
@@ -51,7 +51,6 @@

#include "version.h"
#include "ktversion.h"
-#include <torrent/globals.h>
#include <util/error.h>
#include <util/log.h>
#include <util/functions.h>
diff --git a/ktorrent/view/scanextender.cpp b/ktorrent/view/scanextender.cpp
index 4d1b8a19..2e347653 100644
--- a/ktorrent/view/scanextender.cpp
+++ b/ktorrent/view/scanextender.cpp
@@ -130,7 +130,7 @@ namespace kt
if (j->error() && !j->errorText().isEmpty())
{
error_msg->show();
- error_msg->setText(i18n("<font color=\"red\">%1</font>").arg(j->errorText()));
+ error_msg->setText(i18n("<font color=\"red\">%1</font>", j->errorText()));
emit resized(this);
}
}
diff --git a/libktcore/groups/groupmanager.cpp b/libktcore/groups/groupmanager.cpp
index 57ff90a4..9ef434dd 100644
--- a/libktcore/groups/groupmanager.cpp
+++ b/libktcore/groups/groupmanager.cpp
@@ -33,7 +33,6 @@
#include <interfaces/torrentinterface.h>
#include "torrentgroup.h"
#include "allgroup.h"
-#include "torrentgroup.h"
#include "ungroupedgroup.h"
#include "functiongroup.h"

diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 1caa6b10..43edb0a9 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -1,2 +1,2 @@
add_subdirectory(dataengine)
-add_subdirectory(applet)
\ No newline at end of file
+add_subdirectory(applet)
diff --git a/plugins/infowidget/GeoIP.c b/plugins/infowidget/GeoIP.c
index a996ebb6..b25df6bc 100644
--- a/plugins/infowidget/GeoIP.c
+++ b/plugins/infowidget/GeoIP.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#ifndef _WIN32
-#include <netdb.h>
#include <netinet/in.h> /* For ntohl */
#include <arpa/inet.h>
#else
diff --git a/plugins/ipfilter/downloadandconvertjob.cpp b/plugins/ipfilter/downloadandconvertjob.cpp
index 9ba556c0..90306134 100644
--- a/plugins/ipfilter/downloadandconvertjob.cpp
+++ b/plugins/ipfilter/downloadandconvertjob.cpp
@@ -144,7 +144,7 @@ namespace kt
}
else if(ptr.name() == QStringLiteral("application/x-7z-compressed"))
{
- QString msg = i18n("7z files are not supported", url.toDisplayString());
+ QString msg = i18n("7z files are not supported");
if (mode == Verbose)
KMessageBox::error(nullptr, msg);
else
diff --git a/plugins/scripting/scripts/CMakeLists.txt b/plugins/scripting/scripts/CMakeLists.txt
index dbcd3050..dcdf9bc7 100644
--- a/plugins/scripting/scripts/CMakeLists.txt
+++ b/plugins/scripting/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
add_subdirectory(email_notifications)
add_subdirectory(auto_resume)
add_subdirectory(tracker_groups)
-add_subdirectory(auto_remove)
\ No newline at end of file
+add_subdirectory(auto_remove)
diff --git a/plugins/scripting/scripts/auto_resume/CMakeLists.txt b/plugins/scripting/scripts/auto_resume/CMakeLists.txt
index 8f0af8dd..7935f90c 100644
--- a/plugins/scripting/scripts/auto_resume/CMakeLists.txt
+++ b/plugins/scripting/scripts/auto_resume/CMakeLists.txt
@@ -1,3 +1,3 @@
install(FILES auto_resume.desktop DESTINATION ${DATA_INSTALL_DIR}/ktorrent/scripts/auto_resume)
install(FILES auto_resume.py DESTINATION ${DATA_INSTALL_DIR}/ktorrent/scripts/auto_resume)
-install(FILES auto_resume.ui DESTINATION ${DATA_INSTALL_DIR}/ktorrent/scripts/auto_resume)
\ No newline at end of file
+install(FILES auto_resume.ui DESTINATION ${DATA_INSTALL_DIR}/ktorrent/scripts/auto_resume)
diff --git a/plugins/scripting/scripts/test.py b/plugins/scripting/scripts/test.py
index e0546460..05d81499 100644
--- a/plugins/scripting/scripts/test.py
+++ b/plugins/scripting/scripts/test.py
@@ -21,4 +21,4 @@ for t in tors:
tor = KTorrent.torrent(t)
KTorrent.log("Torrent %s = %s" % (t, tor.name()))
for i in range(0,tor.numFiles()):
- KTorrent.log("File %i = %s" % (i,tor.filePath(i)))
\ No newline at end of file
+ KTorrent.log("File %i = %s" % (i,tor.filePath(i)))
diff --git a/plugins/scripting/scripts/tracker_groups/CMakeLists.txt b/plugins/scripting/scripts/tracker_groups/CMakeLists.txt
index c7037c36..27cbe668 100644
--- a/plugins/scripting/scripts/tracker_groups/CMakeLists.txt
+++ b/plugins/scripting/scripts/tracker_groups/CMakeLists.txt
@@ -1,2 +1,2 @@
install(FILES tracker_groups.desktop DESTINATION ${DATA_INSTALL_DIR}/ktorrent/scripts/tracker_groups)
-install(FILES tracker_groups.py DESTINATION ${DATA_INSTALL_DIR}/ktorrent/scripts/tracker_groups)
\ No newline at end of file
+install(FILES tracker_groups.py DESTINATION ${DATA_INSTALL_DIR}/ktorrent/scripts/tracker_groups)
diff --git a/plugins/webinterface/actionhandler.cpp b/plugins/webinterface/actionhandler.cpp
index 60e2e7c4..d384f85d 100644
--- a/plugins/webinterface/actionhandler.cpp
+++ b/plugins/webinterface/actionhandler.cpp
@@ -205,11 +205,11 @@ namespace kt
}
}
}
- else if (cmd.startsWith("file_"))
+ else if (cmd.startsWith(QLatin1String("file_")))
{
return file(cmd, arg);
}
- else if (cmd.startsWith("shutdown"))
+ else if (cmd.startsWith(QLatin1String("shutdown")))
{
QTimer::singleShot(500, qApp, SLOT(quit()));
return true;
diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
index d33484a4..5e7d4748 100644
--- a/plugins/webinterface/httpserver.cpp
+++ b/plugins/webinterface/httpserver.cpp
@@ -177,7 +177,7 @@ namespace kt

QString username;
QString challenge_hash;
- QStringList params = QString(data).split("&");
+ QStringList params = QString(data).split('&');
for (QStringList::iterator i = params.begin(); i != params.end(); i++)
{
QString t = *i;
@@ -401,7 +401,7 @@ namespace kt

HttpResponseHeader rhdr(200, hdr.majorVersion(), hdr.minorVersion());
setDefaultResponseHeaders(rhdr, "text/html", true);
- if (path.endsWith("login.html"))
+ if (path.endsWith(QLatin1String("login.html")))
{
// clear cookie in case of login page
QDateTime dt = QDateTime::currentDateTime().addDays(-1);
@@ -514,7 +514,7 @@ namespace kt
Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format
*/
- QStringList sl = str.split(" ");
+ QStringList sl = str.split(' ');
if (sl.count() == 6)
{
// RFC 1123 format
@@ -533,7 +533,7 @@ namespace kt
else if (sl.count() == 4)
{
// RFC 1036
- QStringList dl = sl[1].split("-");
+ QStringList dl = sl[1].split('-');
if (dl.count() != 3)
return QDateTime();

diff --git a/plugins/webinterface/loginhandler.cpp b/plugins/webinterface/loginhandler.cpp
index 4948b31e..9b28a2a3 100644
--- a/plugins/webinterface/loginhandler.cpp
+++ b/plugins/webinterface/loginhandler.cpp
@@ -63,7 +63,7 @@ namespace kt
// login is OK, so redirect to page
HttpResponseHeader rhdr(301);
server->setDefaultResponseHeaders(rhdr, "text/html", true);
- rhdr.setValue("Location", "/" + page);
+ rhdr.setValue("Location", '/' + page);
hdlr->send(rhdr, QByteArray());
}
else
diff --git a/plugins/webinterface/settingsgenerator.cpp b/plugins/webinterface/settingsgenerator.cpp
index 43f6285e..17099c12 100644
--- a/plugins/webinterface/settingsgenerator.cpp
+++ b/plugins/webinterface/settingsgenerator.cpp
@@ -77,11 +77,11 @@ namespace kt

void SettingsGenerator::post(HttpClientHandler* hdlr, const QHttpRequestHeader& hdr, const QByteArray& data)
{
- QStringList params = QString(data).split("&");
+ QStringList params = QString(data).split('&');
foreach (const QString& p, params)
{
// p should look like param=value
- QStringList items = p.split("=");
+ QStringList items = p.split('=');
if (items.count() != 2)
continue;

diff --git a/plugins/webinterface/torrentposthandler.cpp b/plugins/webinterface/torrentposthandler.cpp
index 7747f09a..044336e2 100644
--- a/plugins/webinterface/torrentposthandler.cpp
+++ b/plugins/webinterface/torrentposthandler.cpp
@@ -98,7 +98,7 @@ namespace kt
// redirect to page mentioned in page parameter
HttpResponseHeader rhdr(301);
server->setDefaultResponseHeaders(rhdr, "text/html", true);
- rhdr.setValue("Location", "/" + page);
+ rhdr.setValue("Location", '/' + page);
hdlr->send(rhdr, QByteArray());
}
}
diff --git a/scripts/kcfg_qobject_gen.py b/scripts/kcfg_qobject_gen.py
index 5ce0fb2c..fa77e8bd 100755
--- a/scripts/kcfg_qobject_gen.py
+++ b/scripts/kcfg_qobject_gen.py
@@ -122,7 +122,7 @@ class KCfgFile:
if kcfg_type in self.type_map:
return self.type_map[kcfg_type]
else:
- raise "Unkown type %s" % (kcfg_type)
+ raise "Unknown type %s" % (kcfg_type)

def writeDeclarations(self,indent,output):
for entry in self.entries:
@@ -237,4 +237,4 @@ def main(args):

if __name__ == "__main__":
main(sys.argv[1:])
- exit(0)
\ No newline at end of file
+ exit(0)

[Yuri Chornoivan]

Git commit 9d6729ea0dc4f3e935d16a0da41184df08c51c59 by Yuri Chornoivan.
Committed on 14/08/2018 at 11:09.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 examples/ktcli/ktcli.cpp
M +0 -1 src/bcodec/bnode.h
M +1 -1 src/dht/kbucket.h
M +1 -1 src/dht/kbuckettable.cpp
M +1 -1 src/diskio/chunk.cpp
M +1 -1 src/diskio/deletedatafilesjob.cpp
M +1 -1 src/diskio/multifilecache.cpp
M +1 -1 src/diskio/piecedata.cpp
M +1 -1 src/download/chunkdownload.h
M +2 -2 src/download/httpresponseheader.h
M +1 -1 src/download/piece.cpp
M +1 -1 src/download/request.cpp
M +0 -1 src/interfaces/chunkselectorinterface.cpp
M +1 -1 src/interfaces/monitorinterface.h
M +1 -1 src/interfaces/peerinterface.cpp
M +1 -1 src/interfaces/peerinterface.h
M +1 -1 src/interfaces/serverinterface.cpp
M +1 -1 src/interfaces/trackerinterface.cpp
M +1 -1 src/interfaces/webseedinterface.h
M +1 -1 src/magnet/magnetlink.h
M +1 -1 src/mse/rc4encryptor.cpp
M +1 -1 src/net/reverseresolver.cpp
M +1 -1 src/net/streamsocket.cpp
M +1 -1 src/net/wakeuppipe.cpp
M +1 -1 src/peer/accessmanager.h
M +1 -1 src/peer/badpeerslist.cpp
M +1 -1 src/peer/peer.cpp
M +1 -1 src/peer/peerprotocolextension.cpp
M +1 -1 src/peer/peerprotocolextension.h
M +1 -1 src/torrent/jobqueue.cpp
M +1 -1 src/torrent/torrentstats.cpp
M +1 -1 src/tracker/httptracker.cpp
M +1 -1 src/tracker/tracker.cpp
M +1 -1 src/tracker/trackermanager.cpp
M +1 -1 src/upnp/httprequest.cpp
M +1 -1 src/upnp/upnpdescriptionparser.cpp
M +1 -1 src/upnp/upnpmcastsocket.cpp
M +1 -1 src/upnp/upnprouter.cpp
M +1 -1 src/util/decompressfilejob.cpp
M +1 -1 src/util/error.cpp
M +1 -1 src/util/extractfilejob.cpp
M +1 -1 src/util/fileops.cpp
M +1 -1 src/util/logsystemmanager.cpp
M +1 -1 src/util/signalcatcher.cpp
M +1 -1 src/util/signalcatcher.h
M +1 -1 src/utp/pollpipe.cpp
M +1 -1 src/utp/remotewindow.h
M +1 -1 testlib/utils.cpp

https://commits.kde.org/libktorrent/9d6729ea0dc4f3e935d16a0da41184df08c51c59

diff --git a/examples/ktcli/ktcli.cpp b/examples/ktcli/ktcli.cpp
index 33b47c4..e31a8d1 100644
--- a/examples/ktcli/ktcli.cpp
+++ b/examples/ktcli/ktcli.cpp
@@ -18,14 +18,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

+#include "ktcli.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <time.h>
#include <QDir>
#include <QCommandLineParser>

-#include "ktcli.h"
-
#include <version.h>
#include <util/error.h>
#include <util/functions.h>
diff --git a/src/bcodec/bnode.h b/src/bcodec/bnode.h
index 7ae70b0..216b519 100644
--- a/src/bcodec/bnode.h
+++ b/src/bcodec/bnode.h
@@ -22,7 +22,6 @@

#include <QList>
#include <QVariant>
-#include <QList>
#include <QByteArray>
#include <util/constants.h>
#include <ktorrent_export.h>
diff --git a/src/dht/kbucket.h b/src/dht/kbucket.h
index 151a069..18f734b 100644
--- a/src/dht/kbucket.h
+++ b/src/dht/kbucket.h
@@ -88,7 +88,7 @@ namespace dht
/**
* Inserts an entry into the bucket.
* @param entry The entry to insert
- * @return true If the bucket needs to be splitted, false otherwise
+ * @return true If the bucket needs to be split, false otherwise
*/
bool insert(const KBucketEntry & entry);

diff --git a/src/dht/kbuckettable.cpp b/src/dht/kbuckettable.cpp
index 5fdf9bc..ea8e8f7 100644
--- a/src/dht/kbuckettable.cpp
+++ b/src/dht/kbuckettable.cpp
@@ -68,7 +68,7 @@ namespace dht
{
if((*kb)->insert(entry))
{
- // Bucket needs to be splitted
+ // Bucket needs to be split
std::pair<KBucket::Ptr, KBucket::Ptr> result = (*kb)->split();
/*
Out(SYS_DHT | LOG_DEBUG) << "Splitting bucket " << (*kb)->minKey().toString() << "-" << (*kb)->maxKey().toString() << endl;
diff --git a/src/diskio/chunk.cpp b/src/diskio/chunk.cpp
index 2006ebe..1a95642 100644
--- a/src/diskio/chunk.cpp
+++ b/src/diskio/chunk.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

-#include <util/sha1hash.h>
#include "chunk.h"
+#include <util/sha1hash.h>
#include "cache.h"
#include "piecedata.h"
#ifndef Q_WS_WIN
diff --git a/src/diskio/deletedatafilesjob.cpp b/src/diskio/deletedatafilesjob.cpp
index 2f589ed..b415042 100644
--- a/src/diskio/deletedatafilesjob.cpp
+++ b/src/diskio/deletedatafilesjob.cpp
@@ -18,13 +18,13 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "deletedatafilesjob.h"
#include <QDir>
#include <kio/deletejob.h>
#include <kio/jobuidelegate.h>
#include <util/log.h>
#include <util/fileops.h>
#include <util/functions.h>
-#include "deletedatafilesjob.h"

namespace bt
{
diff --git a/src/diskio/multifilecache.cpp b/src/diskio/multifilecache.cpp
index 7170ae7..0a513ad 100644
--- a/src/diskio/multifilecache.cpp
+++ b/src/diskio/multifilecache.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <QSet>
#include "multifilecache.h"
+#include <QSet>
#include <errno.h>
#include <qdir.h>
#include <qstringlist.h>
diff --git a/src/diskio/piecedata.cpp b/src/diskio/piecedata.cpp
index acd4036..4d40034 100644
--- a/src/diskio/piecedata.cpp
+++ b/src/diskio/piecedata.cpp
@@ -18,12 +18,12 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "piecedata.h"
#include <klocalizedstring.h>
#include <util/log.h>
#ifndef Q_WS_WIN
#include <util/signalcatcher.h>
#endif
-#include "piecedata.h"
#include "chunk.h"
#include <util/file.h>
#include <util/sha1hashgen.h>
diff --git a/src/download/chunkdownload.h b/src/download/chunkdownload.h
index a021f36..39fbd79 100644
--- a/src/download/chunkdownload.h
+++ b/src/download/chunkdownload.h
@@ -162,7 +162,7 @@ namespace bt
* Load from a File
* @param file The File
* @param hdr Header for the chunk
- * @param update_hash Wether or not to update the hash
+ * @param update_hash Whether or not to update the hash
*/
bool load(File & file,ChunkDownloadHeader & hdr,bool update_hash = true);

diff --git a/src/download/httpresponseheader.h b/src/download/httpresponseheader.h
index ec65eb1..0e62387 100644
--- a/src/download/httpresponseheader.h
+++ b/src/download/httpresponseheader.h
@@ -36,6 +36,6 @@ private:
QMap<QString, QString> values;
int _majVer;
int _minVer;
- int _statCode;
+ int _statCode;
QString _reasonPhr;
-};
\ No newline at end of file
+};
diff --git a/src/download/piece.cpp b/src/download/piece.cpp
index 2ccac58..cba5fc4 100644
--- a/src/download/piece.cpp
+++ b/src/download/piece.cpp
@@ -32,4 +32,4 @@ namespace bt


}
-#endif
\ No newline at end of file
+#endif
diff --git a/src/download/request.cpp b/src/download/request.cpp
index 6277ef3..f4854bc 100644
--- a/src/download/request.cpp
+++ b/src/download/request.cpp
@@ -47,4 +47,4 @@ namespace bt
}

}
-#endif
\ No newline at end of file
+#endif
diff --git a/src/interfaces/chunkselectorinterface.cpp b/src/interfaces/chunkselectorinterface.cpp
index 953c83f..8680d5f 100644
--- a/src/interfaces/chunkselectorinterface.cpp
+++ b/src/interfaces/chunkselectorinterface.cpp
@@ -20,7 +20,6 @@
***************************************************************************/
#include "chunkselectorinterface.h"
#include <boost/concept_check.hpp>
-#include <boost/concept_check.hpp>

namespace bt
{
diff --git a/src/interfaces/monitorinterface.h b/src/interfaces/monitorinterface.h
index 863ebc5..dc86931 100644
--- a/src/interfaces/monitorinterface.h
+++ b/src/interfaces/monitorinterface.h
@@ -85,7 +85,7 @@ namespace bt
/**
* Preview status of a file has changed.
* @param file The file
- * @param preview Wether or not it is available
+ * @param preview Whether or not it is available
*/
virtual void filePreviewChanged(TorrentFileInterface* file,bool preview) = 0;
};
diff --git a/src/interfaces/peerinterface.cpp b/src/interfaces/peerinterface.cpp
index 2786afa..cf9145e 100644
--- a/src/interfaces/peerinterface.cpp
+++ b/src/interfaces/peerinterface.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <util/functions.h>
#include "peerinterface.h"
+#include <util/functions.h>

namespace bt
{
diff --git a/src/interfaces/peerinterface.h b/src/interfaces/peerinterface.h
index 478142d..7361968 100644
--- a/src/interfaces/peerinterface.h
+++ b/src/interfaces/peerinterface.h
@@ -34,7 +34,7 @@ namespace bt
* @brief Interface for a Peer
*
* This is the interface for a Peer, it allows other classes to
- * get statistics about a Peer, and provides some basic funtionality provided by a Peer.
+ * get statistics about a Peer, and provides some basic functionality provided by a Peer.
*/
class KTORRENT_EXPORT PeerInterface
{
diff --git a/src/interfaces/serverinterface.cpp b/src/interfaces/serverinterface.cpp
index 6bcdf9b..f55f8f1 100644
--- a/src/interfaces/serverinterface.cpp
+++ b/src/interfaces/serverinterface.cpp
@@ -115,7 +115,7 @@ namespace bt
QStringList ips = NetworkInterfaceIPAddresses(iface);
if (ips.count() == 0)
{
- // Interface does not exist, so add any adresses
+ // Interface does not exist, so add any addresses
ips << QHostAddress(QHostAddress::AnyIPv6).toString() << QHostAddress(QHostAddress::Any).toString();
}

diff --git a/src/interfaces/trackerinterface.cpp b/src/interfaces/trackerinterface.cpp
index 35d0817..0e548b1 100644
--- a/src/interfaces/trackerinterface.cpp
+++ b/src/interfaces/trackerinterface.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <klocalizedstring.h>
#include "trackerinterface.h"
+#include <klocalizedstring.h>

namespace bt
{
diff --git a/src/interfaces/webseedinterface.h b/src/interfaces/webseedinterface.h
index 8198cc8..8b121ca 100644
--- a/src/interfaces/webseedinterface.h
+++ b/src/interfaces/webseedinterface.h
@@ -40,7 +40,7 @@ namespace bt
/// Disable or enable the webseed
virtual void setEnabled(bool on);

- /// Wether or not the webseed is enabled
+ /// Whether or not the webseed is enabled
bool isEnabled() const {return enabled;}

/// Get the URL of the webseed
diff --git a/src/magnet/magnetlink.h b/src/magnet/magnetlink.h
index 7868adc..5fc3b6c 100644
--- a/src/magnet/magnetlink.h
+++ b/src/magnet/magnetlink.h
@@ -32,7 +32,7 @@ namespace bt
MagnetLink class
magnet links have the format:
magnet:?xt=urn:btih:info_hash&dn=name&tr=tracker-url[,tracker-url...]
- note: a comma-seperated list will not work with other clients likely
+ note: a comma-separated list will not work with other clients likely
optional parameters are
to=torrent-file-url (need not be valid)
pt=path-to-download-in-torrent
diff --git a/src/mse/rc4encryptor.cpp b/src/mse/rc4encryptor.cpp
index 9710857..ecce0d4 100644
--- a/src/mse/rc4encryptor.cpp
+++ b/src/mse/rc4encryptor.cpp
@@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "rc4encryptor.h"
#include <util/log.h>
#include <util/functions.h>
-#include "rc4encryptor.h"

using namespace bt;

diff --git a/src/net/reverseresolver.cpp b/src/net/reverseresolver.cpp
index 45497d1..f6f7e6f 100644
--- a/src/net/reverseresolver.cpp
+++ b/src/net/reverseresolver.cpp
@@ -18,9 +18,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

+#include "reverseresolver.h"
#include <sys/socket.h>
#include <netdb.h>
-#include "reverseresolver.h"


namespace net
diff --git a/src/net/streamsocket.cpp b/src/net/streamsocket.cpp
index befd491..b69a609 100644
--- a/src/net/streamsocket.cpp
+++ b/src/net/streamsocket.cpp
@@ -84,4 +84,4 @@ namespace net
return 0;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/net/wakeuppipe.cpp b/src/net/wakeuppipe.cpp
index eff8d82..88c17e6 100644
--- a/src/net/wakeuppipe.cpp
+++ b/src/net/wakeuppipe.cpp
@@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "net/wakeuppipe.h"
#include <util/log.h>
#include <util/functions.h>
-#include "net/wakeuppipe.h"

using namespace bt;

diff --git a/src/peer/accessmanager.h b/src/peer/accessmanager.h
index 1bcb693..224b826 100644
--- a/src/peer/accessmanager.h
+++ b/src/peer/accessmanager.h
@@ -33,7 +33,7 @@ namespace bt
/**
@author Joris Guisson

- Class which determines wether or not we allow an IP to connect to us.
+ Class which determines whether or not we allow an IP to connect to us.
It uses blocklists to do this. Blocklists should register with this class.
By default it has one blocklist, the banned peers list.
*/
diff --git a/src/peer/badpeerslist.cpp b/src/peer/badpeerslist.cpp
index 3bfea26..a7e8e84 100644
--- a/src/peer/badpeerslist.cpp
+++ b/src/peer/badpeerslist.cpp
@@ -18,8 +18,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <net/address.h>
#include "badpeerslist.h"
+#include <net/address.h>

namespace bt
{
diff --git a/src/peer/peer.cpp b/src/peer/peer.cpp
index 72d7a38..4c6b181 100644
--- a/src/peer/peer.cpp
+++ b/src/peer/peer.cpp
@@ -618,7 +618,7 @@ namespace bt
}
}

- // if no data is being sent or recieved, and there are pending requests
+ // if no data is being sent or received, and there are pending requests
// increment the connection stalled timer
if (getUploadRate() > 100 || getDownloadRate() > 100 ||
(uploader->getNumRequests() == 0 && sock->numPendingPieceUploads() == 0 && downloader->getNumRequests() == 0))
diff --git a/src/peer/peerprotocolextension.cpp b/src/peer/peerprotocolextension.cpp
index fda22c4..7f7a1bd 100644
--- a/src/peer/peerprotocolextension.cpp
+++ b/src/peer/peerprotocolextension.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

-#include <stdio.h>
#include "peerprotocolextension.h"
+#include <stdio.h>
#include "peer.h"

namespace bt
diff --git a/src/peer/peerprotocolextension.h b/src/peer/peerprotocolextension.h
index 171f445..5328c8f 100644
--- a/src/peer/peerprotocolextension.h
+++ b/src/peer/peerprotocolextension.h
@@ -40,7 +40,7 @@ namespace bt
PeerProtocolExtension(bt::Uint32 id,Peer* peer);
virtual ~PeerProtocolExtension();

- /// Virtual update function does nothing, needs to be overriden if update
+ /// Virtual update function does nothing, needs to be overridden if update
virtual void update();

/// Does this needs to be update
diff --git a/src/torrent/jobqueue.cpp b/src/torrent/jobqueue.cpp
index 8077ed6..2ea59ea 100644
--- a/src/torrent/jobqueue.cpp
+++ b/src/torrent/jobqueue.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <util/log.h>
#include "jobqueue.h"
+#include <util/log.h>
#include "job.h"
#include "torrentcontrol.h"

diff --git a/src/torrent/torrentstats.cpp b/src/torrent/torrentstats.cpp
index e55b337..d5d0490 100644
--- a/src/torrent/torrentstats.cpp
+++ b/src/torrent/torrentstats.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <klocalizedstring.h>
#include "torrentstats.h"
+#include <klocalizedstring.h>
#include <util/functions.h>

namespace bt
diff --git a/src/tracker/httptracker.cpp b/src/tracker/httptracker.cpp
index 3d29b71..e8e8c1a 100644
--- a/src/tracker/httptracker.cpp
+++ b/src/tracker/httptracker.cpp
@@ -487,7 +487,7 @@ namespace bt
if (proxy_on)
{
QString p = QString("%1:%2").arg(proxy).arg(proxy_port);
- if (!p.startsWith("http://"))
+ if (!p.startsWith(QLatin1String("http://")))
p = "http://" + p;
// set the proxy if the doNotUseKDEProxy ix enabled (URL must be valid to)
QUrl url(p);
diff --git a/src/tracker/tracker.cpp b/src/tracker/tracker.cpp
index df98175..6671cd0 100644
--- a/src/tracker/tracker.cpp
+++ b/src/tracker/tracker.cpp
@@ -65,7 +65,7 @@ namespace bt
if (ip.isNull())
return;

- if (custom_ip.endsWith(".i2p"))
+ if (custom_ip.endsWith(QLatin1String(".i2p")))
{
custom_ip_resolved = custom_ip;
}
diff --git a/src/tracker/trackermanager.cpp b/src/tracker/trackermanager.cpp
index 6548686..71fa5e6 100644
--- a/src/tracker/trackermanager.cpp
+++ b/src/tracker/trackermanager.cpp
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "trackermanager.h"
#include <QTextStream>
#include <QFile>
#include <klocalizedstring.h>
@@ -27,7 +28,6 @@
#include <torrent/torrentcontrol.h>
#include <torrent/torrent.h>
#include <peer/peermanager.h>
-#include "trackermanager.h"

namespace bt
{
diff --git a/src/upnp/httprequest.cpp b/src/upnp/httprequest.cpp
index a472b4b..71c4578 100644
--- a/src/upnp/httprequest.cpp
+++ b/src/upnp/httprequest.cpp
@@ -18,6 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

+#include "httprequest.h"
#include <QHostAddress>
#include <QNetworkReply>
#include <QStringList>
@@ -26,7 +27,6 @@
#include <KLocalizedString>

#include <util/log.h>
-#include "httprequest.h"

namespace bt
{
diff --git a/src/upnp/upnpdescriptionparser.cpp b/src/upnp/upnpdescriptionparser.cpp
index c439f7f..f9b6e40 100644
--- a/src/upnp/upnpdescriptionparser.cpp
+++ b/src/upnp/upnpdescriptionparser.cpp
@@ -18,13 +18,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

+#include "upnpdescriptionparser.h"
#include <QtXml>
#include <QStack>

#include <util/fileops.h>
#include <util/log.h>
#include "upnprouter.h"
-#include "upnpdescriptionparser.h"

using namespace bt;

diff --git a/src/upnp/upnpmcastsocket.cpp b/src/upnp/upnpmcastsocket.cpp
index bd3e6de..6aedbb0 100644
--- a/src/upnp/upnpmcastsocket.cpp
+++ b/src/upnp/upnpmcastsocket.cpp
@@ -18,6 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

+#include "upnpmcastsocket.h"
#include <QFile>
#include <QStringList>
#include <QTextStream>
@@ -32,7 +33,6 @@
#endif
#include <arpa/inet.h>
#include <util/log.h>
-#include "upnpmcastsocket.h"


namespace bt
diff --git a/src/upnp/upnprouter.cpp b/src/upnp/upnprouter.cpp
index f51ebcd..a440807 100644
--- a/src/upnp/upnprouter.cpp
+++ b/src/upnp/upnprouter.cpp
@@ -18,6 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

+#include "upnprouter.h"
#include <cstdlib>

#include <QDir>
@@ -37,7 +38,6 @@
#include <util/waitjob.h>
#include <peer/accessmanager.h>
#include <version.h>
-#include "upnprouter.h"
#include "upnpdescriptionparser.h"
#include "soap.h"
#include "httprequest.h"
diff --git a/src/util/decompressfilejob.cpp b/src/util/decompressfilejob.cpp
index 086ae50..ea25a1a 100644
--- a/src/util/decompressfilejob.cpp
+++ b/src/util/decompressfilejob.cpp
@@ -18,13 +18,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

+#include "decompressfilejob.h"
#include <QFile>
#include <QMimeDatabase>
#include <kcompressiondevice.h>
#include <KFilterDev>
#include <util/log.h>
#include <util/fileops.h>
-#include "decompressfilejob.h"

namespace bt
{
diff --git a/src/util/error.cpp b/src/util/error.cpp
index 62aa939..941356f 100644
--- a/src/util/error.cpp
+++ b/src/util/error.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <util/log.h>
#include "error.h"
+#include <util/log.h>

namespace bt
{
diff --git a/src/util/extractfilejob.cpp b/src/util/extractfilejob.cpp
index 4caeefe..48f7f52 100644
--- a/src/util/extractfilejob.cpp
+++ b/src/util/extractfilejob.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

-#include <QThread>
#include "extractfilejob.h"
+#include <QThread>
#include <QFile>

namespace bt
diff --git a/src/util/fileops.cpp b/src/util/fileops.cpp
index 928a316..c76b0e3 100644
--- a/src/util/fileops.cpp
+++ b/src/util/fileops.cpp
@@ -692,7 +692,7 @@ namespace bt
if (fptr.open(QIODevice::ReadOnly))
return fptr.readAll();
else
- throw Error(i18n("Unable to open file %1: %2").arg(path).arg(fptr.errorString()));
+ throw Error(i18n("Unable to open file %1: %2", path, fptr.errorString()));
}

}
diff --git a/src/util/logsystemmanager.cpp b/src/util/logsystemmanager.cpp
index b7d1b13..5b29c86 100644
--- a/src/util/logsystemmanager.cpp
+++ b/src/util/logsystemmanager.cpp
@@ -18,9 +18,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "logsystemmanager.h"
#include <klocalizedstring.h>
#include "log.h"
-#include "logsystemmanager.h"

namespace bt
{
diff --git a/src/util/signalcatcher.cpp b/src/util/signalcatcher.cpp
index bdd7d63..88d299c 100644
--- a/src/util/signalcatcher.cpp
+++ b/src/util/signalcatcher.cpp
@@ -17,10 +17,10 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "signalcatcher.h"
#include <klocalizedstring.h>
#include <sys/socket.h>
#include <unistd.h>
-#include "signalcatcher.h"
#include "log.h"

#ifndef Q_WS_WIN
diff --git a/src/util/signalcatcher.h b/src/util/signalcatcher.h
index ab94bdd..989a020 100644
--- a/src/util/signalcatcher.h
+++ b/src/util/signalcatcher.h
@@ -56,7 +56,7 @@ namespace bt
BusError(bool write_operation);
virtual ~BusError();

- /// Wether or not the SIGBUS was triggered by a write operation
+ /// Whether or not the SIGBUS was triggered by a write operation
bool write_operation;
};

diff --git a/src/utp/pollpipe.cpp b/src/utp/pollpipe.cpp
index 80eacfa..daacde5 100644
--- a/src/utp/pollpipe.cpp
+++ b/src/utp/pollpipe.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

-#include <util/log.h>
#include "pollpipe.h"
+#include <util/log.h>
#include "connection.h"

using namespace bt;
diff --git a/src/utp/remotewindow.h b/src/utp/remotewindow.h
index 6dd1499..685222e 100644
--- a/src/utp/remotewindow.h
+++ b/src/utp/remotewindow.h
@@ -100,7 +100,7 @@ namespace utp
/// Get the number of unacked packets
bt::Uint32 numUnackedPackets() const {return unacked_packets.count();}

- /// A timeout occured
+ /// A timeout occurred
void timeout(Retransmitter* conn);

/// Get the window usage factor
diff --git a/testlib/utils.cpp b/testlib/utils.cpp
index 1cc688d..38b8691 100644
--- a/testlib/utils.cpp
+++ b/testlib/utils.cpp
@@ -24,4 +24,4 @@ bt::Uint64 RandomSize(bt::Uint64 min_size,bt::Uint64 max_size)
{
bt::Uint64 r = max_size - min_size;
return min_size + qrand() % r;
-}
\ No newline at end of file
+}

[Yuri Chornoivan]

Git commit 9e1f5a06c8ce16f01f57b19f68cbf27519a24e63 by Yuri Chornoivan.
Committed on 14/08/2018 at 13:00.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +0 -1 plugins/Commands/ATSPI/atspiconfiguration.cpp
M +0 -1 plugins/Commands/ATSPI/test/atspiscannertest.cpp
M +2 -2 plugins/Conditions/FaceDetection/facedetectioncondition.cpp
M +1 -1 plugins/Conditions/FaceDetection/facedetectioncondition.h
M +1 -1 plugins/Conditions/LipDetection/lipdetectioncondition.h
M +1 -1 simon/src/simonmodelmanagementui/ImportTrainingData/importtrainingdata.cpp
M +0 -1 simon/src/welcomepage.cpp
M +0 -1 simonlib/eventsimulation/xeventsprivate.cpp
M +0 -1 simonlib/simonactions/actionmanager.cpp
M +0 -1 simonlib/simonactions/commandmodel.cpp
M +0 -1 simonlib/simonactions/commandtablemodel.cpp
M +0 -1 simonlib/simonddatabaseaccess/databaseaccess.cpp
M +0 -1 simonlib/simonmodeltest/fileresultmodel.cpp
M +0 -1 simonlib/simonmodeltest/modeltest.cpp
M +0 -1 simonlib/simonprogresstracking/compositeprogresswidget.cpp
M +0 -1 simonlib/simonprogresstracking/progresswidget.cpp
M +1 -1 simonlib/simonrecognizer/recognizer.h
M +0 -1 simonlib/simonscenarios/trainingmanager.cpp
M +0 -1 simonlib/simonscenarios/trainingmanager.h
M +0 -1 simonlib/simonsound/postprocessing.cpp
M +0 -1 simonlib/simonsound/recwidget.cpp
M +0 -1 simonlib/simonuicomponents/addserverconnection.cpp
M +0 -1 simonlib/simonuicomponents/guievents.cpp
M +0 -1 simonlib/simonuicomponents/serveraddressselector.cpp
M +1 -1 simonlib/simonvision/webcamdispatcher.h
M +1 -1 simonlib/speechmodelcompilation/modelcompilersphinx.h

https://commits.kde.org/simon/9e1f5a06c8ce16f01f57b19f68cbf27519a24e63

diff --git a/plugins/Commands/ATSPI/atspiconfiguration.cpp b/plugins/Commands/ATSPI/atspiconfiguration.cpp
index c0cd0bb1..5fb8c88f 100644
--- a/plugins/Commands/ATSPI/atspiconfiguration.cpp
+++ b/plugins/Commands/ATSPI/atspiconfiguration.cpp
@@ -25,7 +25,6 @@
#include <KAboutData>
#include <KMessageBox>
#include <KStandardDirs>
-#include <KPluginFactory>
#include <QString>
#include <QTableView>
#include <QThread>
diff --git a/plugins/Commands/ATSPI/test/atspiscannertest.cpp b/plugins/Commands/ATSPI/test/atspiscannertest.cpp
index dd30b043..7739562c 100644
--- a/plugins/Commands/ATSPI/test/atspiscannertest.cpp
+++ b/plugins/Commands/ATSPI/test/atspiscannertest.cpp
@@ -23,7 +23,6 @@
#include <QWidget>
#include <KApplication>
#include <KCmdLineArgs>
-#include <QSignalSpy>
#include <QDebug>
#include <QTimer>
#include "../atspiscanner.h"
diff --git a/plugins/Conditions/FaceDetection/facedetectioncondition.cpp b/plugins/Conditions/FaceDetection/facedetectioncondition.cpp
index 87cc6846..5973d652 100644
--- a/plugins/Conditions/FaceDetection/facedetectioncondition.cpp
+++ b/plugins/Conditions/FaceDetection/facedetectioncondition.cpp
@@ -52,9 +52,9 @@ QDomElement FaceDetectionCondition::privateSerialize(QDomDocument *doc, QDomElem
QString FaceDetectionCondition::name()
{
if (!isInverted())
- return i18nc("Detecting the presense of user from the webcam", "Presence of user");
+ return i18nc("Detecting the presence of user from the webcam", "Presence of user");
else
- return i18nc("Detecting the presense of user from the webcam", "Absence of user");
+ return i18nc("Detecting the presence of user from the webcam", "Absence of user");
}

bool FaceDetectionCondition::privateDeSerialize(QDomElement elem)
diff --git a/plugins/Conditions/FaceDetection/facedetectioncondition.h b/plugins/Conditions/FaceDetection/facedetectioncondition.h
index 53426c58..cb27262c 100644
--- a/plugins/Conditions/FaceDetection/facedetectioncondition.h
+++ b/plugins/Conditions/FaceDetection/facedetectioncondition.h
@@ -37,7 +37,7 @@ public:
virtual CreateConditionWidget* getCreateConditionWidget(QWidget *parent);

public slots:
- // Slot is connect to the signal in the Analyzer which will be emmitted when there will be any change the presense of user (hasFace)
+ // Slot is connect to the signal in the Analyzer which will be emmitted when there will be any change the presence of user (hasFace)
void manageConditionState(bool hasFace);

private:
diff --git a/plugins/Conditions/LipDetection/lipdetectioncondition.h b/plugins/Conditions/LipDetection/lipdetectioncondition.h
index a50575b3..f9395232 100644
--- a/plugins/Conditions/LipDetection/lipdetectioncondition.h
+++ b/plugins/Conditions/LipDetection/lipdetectioncondition.h
@@ -37,7 +37,7 @@ public:
virtual CreateConditionWidget* getCreateConditionWidget(QWidget *parent);

public slots:
- // Slot is connect to the signal in the Analyzer which will be emmitted when there will be any change the presense of user (isSpeaking)
+ // Slot is connect to the signal in the Analyzer which will be emmitted when there will be any change the presence of user (isSpeaking)
void manageConditionState(bool isSpeaking,int thresholdValue);

private:
diff --git a/simon/src/simonmodelmanagementui/ImportTrainingData/importtrainingdata.cpp b/simon/src/simonmodelmanagementui/ImportTrainingData/importtrainingdata.cpp
index 5e3149aa..66b8da9e 100644
--- a/simon/src/simonmodelmanagementui/ImportTrainingData/importtrainingdata.cpp
+++ b/simon/src/simonmodelmanagementui/ImportTrainingData/importtrainingdata.cpp
@@ -108,7 +108,7 @@ void ImportTrainingData::run()
if (!dataFiles) return;

emit progress(0, dataFiles->count());
- emit status(i18nc("%1 is file count", "Importing %1 File...", "Importing %1 Files...", dataFiles->count()));
+ emit status(i18ncp("%1 is file count", "Importing %1 File...", "Importing %1 Files...", dataFiles->count()));

QStringList *newFiles = processSounds(*dataFiles, wavDestDir);
delete dataFiles;
diff --git a/simon/src/welcomepage.cpp b/simon/src/welcomepage.cpp
index 351eb43d..db409591 100644
--- a/simon/src/welcomepage.cpp
+++ b/simon/src/welcomepage.cpp
@@ -27,7 +27,6 @@
#include <simonscenarioui/scenariomanagementdialog.h>
#include <simonscenarios/modelmanager.h>
#include <simonscenarios/scenariomanager.h>
-#include <simonscenarios/modelmanager.h>
#include <simonscenarios/scenario.h>
#include <simonscenarios/model.h>
#include <simonscenarios/trainingtext.h>
diff --git a/simonlib/eventsimulation/xeventsprivate.cpp b/simonlib/eventsimulation/xeventsprivate.cpp
index 481ee803..99a1947b 100644
--- a/simonlib/eventsimulation/xeventsprivate.cpp
+++ b/simonlib/eventsimulation/xeventsprivate.cpp
@@ -29,7 +29,6 @@
#include "xeventsprivate.h" //krazy:exclude=includes

// #include "../Logging/logger.h"
-#include <KLocalizedString>

XEventsPrivate::XEventsPrivate(const char* displayName)
{
diff --git a/simonlib/simonactions/actionmanager.cpp b/simonlib/simonactions/actionmanager.cpp
index 9a7df236..d26e5c3a 100644
--- a/simonlib/simonactions/actionmanager.cpp
+++ b/simonlib/simonactions/actionmanager.cpp
@@ -42,7 +42,6 @@
#include <KStandardDirs>
#include <KDesktopFile>
#include <KDebug>
-#include <KLocalizedString>
#include <KXmlGuiWindow>
#include <KXMLGUIClient>
#include <KXMLGUIFactory>
diff --git a/simonlib/simonactions/commandmodel.cpp b/simonlib/simonactions/commandmodel.cpp
index 6f147560..cda9a149 100644
--- a/simonlib/simonactions/commandmodel.cpp
+++ b/simonlib/simonactions/commandmodel.cpp
@@ -19,7 +19,6 @@

#include "commandmodel.h"
#include <KLocalizedString>
-#include <KLocalizedString>
#include <QMutexLocker>

CommandModel::CommandModel(CommandList CL)
diff --git a/simonlib/simonactions/commandtablemodel.cpp b/simonlib/simonactions/commandtablemodel.cpp
index 069b6375..34193823 100644
--- a/simonlib/simonactions/commandtablemodel.cpp
+++ b/simonlib/simonactions/commandtablemodel.cpp
@@ -20,7 +20,6 @@

#include "commandtablemodel.h"
#include <KLocalizedString>
-#include <KLocalizedString>
#include <QDebug>
#include <QMutexLocker>

diff --git a/simonlib/simonddatabaseaccess/databaseaccess.cpp b/simonlib/simonddatabaseaccess/databaseaccess.cpp
index 8235d65c..396deafd 100644
--- a/simonlib/simonddatabaseaccess/databaseaccess.cpp
+++ b/simonlib/simonddatabaseaccess/databaseaccess.cpp
@@ -29,7 +29,6 @@
#include <KConfig>
#include <KConfigGroup>
#include <KUrl>
-#include <KLocalizedString>

DatabaseAccess::DatabaseAccess(QObject* parent) : QObject(parent),
db(0),
diff --git a/simonlib/simonmodeltest/fileresultmodel.cpp b/simonlib/simonmodeltest/fileresultmodel.cpp
index c39df979..fc980f44 100644
--- a/simonlib/simonmodeltest/fileresultmodel.cpp
+++ b/simonlib/simonmodeltest/fileresultmodel.cpp
@@ -22,7 +22,6 @@
#include <QDir>
#include <QColor>

-#include <KLocalizedString>
#include <KLocalizedString>
#include <KColorScheme>

diff --git a/simonlib/simonmodeltest/modeltest.cpp b/simonlib/simonmodeltest/modeltest.cpp
index 53159d24..2070470a 100644
--- a/simonlib/simonmodeltest/modeltest.cpp
+++ b/simonlib/simonmodeltest/modeltest.cpp
@@ -49,7 +49,6 @@
#include <KComponentData>
#include <KAboutData>
#include <KDebug>
-#include <KLocalizedString>

#ifdef Q_OS_WIN
#include <windows.h>
diff --git a/simonlib/simonprogresstracking/compositeprogresswidget.cpp b/simonlib/simonprogresstracking/compositeprogresswidget.cpp
index 6b202e59..5a7af233 100644
--- a/simonlib/simonprogresstracking/compositeprogresswidget.cpp
+++ b/simonlib/simonprogresstracking/compositeprogresswidget.cpp
@@ -29,7 +29,6 @@
#include <KLocalizedString>
#include <KIcon>
#include <KPushButton>
-#include <KLocalizedString>

CompositeProgressWidget::CompositeProgressWidget(QWidget* parent): QWidget(parent)
{
diff --git a/simonlib/simonprogresstracking/progresswidget.cpp b/simonlib/simonprogresstracking/progresswidget.cpp
index 18b92c6c..9d8a2474 100644
--- a/simonlib/simonprogresstracking/progresswidget.cpp
+++ b/simonlib/simonprogresstracking/progresswidget.cpp
@@ -26,7 +26,6 @@
#include <QProgressBar>
#include <KPushButton>
#include <KLocalizedString>
-#include <KLocalizedString>

ProgressWidget::ProgressWidget(QPointer<Operation> O, ProgressWidgetStyle style, QWidget* parent) : QWidget(parent),
op(O)
diff --git a/simonlib/simonrecognizer/recognizer.h b/simonlib/simonrecognizer/recognizer.h
index c5cdb70c..e99d42a5 100644
--- a/simonlib/simonrecognizer/recognizer.h
+++ b/simonlib/simonrecognizer/recognizer.h
@@ -30,7 +30,7 @@ class RecognitionConfiguration;
/*!
* \class Recognizer
* \brief The Recognizer class initialize recognition with given configuration
- * and recognize audio files using method which specifed in inherited classes.
+ * and recognize audio files using method which specified in inherited classes.
*
* \version 0.1
* \date 14.08.2012
diff --git a/simonlib/simonscenarios/trainingmanager.cpp b/simonlib/simonscenarios/trainingmanager.cpp
index 7d494c8a..a5af99a5 100644
--- a/simonlib/simonscenarios/trainingmanager.cpp
+++ b/simonlib/simonscenarios/trainingmanager.cpp
@@ -37,7 +37,6 @@
#include <KLocalizedString>
#include <KStandardDirs>
#include <KDateTime>
-#include <KLocalizedString>
#include <math.h>

TrainingManager* TrainingManager::m_instance;
diff --git a/simonlib/simonscenarios/trainingmanager.h b/simonlib/simonscenarios/trainingmanager.h
index f2d6c811..e9f77ed3 100644
--- a/simonlib/simonscenarios/trainingmanager.h
+++ b/simonlib/simonscenarios/trainingmanager.h
@@ -27,7 +27,6 @@
#include <QMutex>
#include <QList>
#include "simonmodelmanagement_export.h"
-#include "promptstable.h"

/**
* @class TrainingManager
diff --git a/simonlib/simonsound/postprocessing.cpp b/simonlib/simonsound/postprocessing.cpp
index f364e898..b3ec63ea 100644
--- a/simonlib/simonsound/postprocessing.cpp
+++ b/simonlib/simonsound/postprocessing.cpp
@@ -24,7 +24,6 @@
#include <QCoreApplication>
#include <QObject>
#include <KLocalizedString>
-#include <KLocalizedString>
#include "soundconfig.h"

PostProcessing::PostProcessing(QObject *parent) : QObject(parent)
diff --git a/simonlib/simonsound/recwidget.cpp b/simonlib/simonsound/recwidget.cpp
index b3ca2691..5f3d6829 100644
--- a/simonlib/simonsound/recwidget.cpp
+++ b/simonlib/simonsound/recwidget.cpp
@@ -38,7 +38,6 @@
#include <KIcon>
#include <KMessageBox>
#include <KPushButton>
-#include <KLocalizedString>

#include "ui_recwidget.h"

diff --git a/simonlib/simonuicomponents/addserverconnection.cpp b/simonlib/simonuicomponents/addserverconnection.cpp
index e799d4b1..d27816dc 100644
--- a/simonlib/simonuicomponents/addserverconnection.cpp
+++ b/simonlib/simonuicomponents/addserverconnection.cpp
@@ -24,7 +24,6 @@
#include <KLineEdit>
#include <KIntNumInput>
#include <QFormLayout>
-#include <KLocalizedString>

AddServerConnection::AddServerConnection(QWidget *parent) : KDialog(parent)
{
diff --git a/simonlib/simonuicomponents/guievents.cpp b/simonlib/simonuicomponents/guievents.cpp
index 07dbcae6..badb000a 100644
--- a/simonlib/simonuicomponents/guievents.cpp
+++ b/simonlib/simonuicomponents/guievents.cpp
@@ -22,7 +22,6 @@
#include <QRegExp>
#include <QStringList>
#include <KLocalizedString>
-#include <KLocalizedString>

GuiEvents::GuiEvents(QObject *parent) : QObject(parent)
{
diff --git a/simonlib/simonuicomponents/serveraddressselector.cpp b/simonlib/simonuicomponents/serveraddressselector.cpp
index 849b8ecd..67ff137a 100644
--- a/simonlib/simonuicomponents/serveraddressselector.cpp
+++ b/simonlib/simonuicomponents/serveraddressselector.cpp
@@ -26,7 +26,6 @@
#include <KLineEdit>
#include <KLocalizedString>
#include <KMessageBox>
-#include <KLocalizedString>

ServerAddressSelector::ServerAddressSelector(QWidget *parent) : QWidget(parent)
{
diff --git a/simonlib/simonvision/webcamdispatcher.h b/simonlib/simonvision/webcamdispatcher.h
index 5161efdd..f7e6ad56 100644
--- a/simonlib/simonvision/webcamdispatcher.h
+++ b/simonlib/simonvision/webcamdispatcher.h
@@ -43,7 +43,7 @@ public:

private:

- // Webcam disptacher will be initialized when there is atleast on Analyzer registered
+ // Webcam disptacher will be initialized when there is at least on Analyzer registered
void initWebcamDispatcher();

// Webcam disptacher will be closed when there is no Analyzer registered
diff --git a/simonlib/speechmodelcompilation/modelcompilersphinx.h b/simonlib/speechmodelcompilation/modelcompilersphinx.h
index fb6bd9d9..96000981 100644
--- a/simonlib/speechmodelcompilation/modelcompilersphinx.h
+++ b/simonlib/speechmodelcompilation/modelcompilersphinx.h
@@ -49,7 +49,7 @@ protected:
bool pack(const QString& targetArchive, const QString& name);

private:
- //programms
+ //programs
QString m_SphinxTrain;
QString m_Bw;
QString m_Sphinx_fe;

[Yuri Chornoivan]

Git commit 84cc8d4a1470dda0d91fe0937deb6eba059b7c82 by Yuri Chornoivan.
Committed on 14/08/2018 at 13:11.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/common/property/testproperty.cpp
M +2 -2 autotests/kcm/profilemanagementmocks.cpp
M +1 -1 src/kded/tabletbackend.h
M +1 -1 src/kded/xsetwacomadaptor.cpp

https://commits.kde.org/wacomtablet/84cc8d4a1470dda0d91fe0937deb6eba059b7c82

diff --git a/autotests/common/property/testproperty.cpp b/autotests/common/property/testproperty.cpp
index 1c8419f..4a5991b 100644
--- a/autotests/common/property/testproperty.cpp
+++ b/autotests/common/property/testproperty.cpp
@@ -42,7 +42,7 @@ void TestProperty::test()
{
/*
* Just some very basic tests to test the functors and proper class initialization.
- * Most code shoud have been covered already by TestEnum.
+ * Most code should have been covered already by TestEnum.
*/
Property test = Property::AbsWheelUp;
QVERIFY(test == test);
diff --git a/autotests/kcm/profilemanagementmocks.cpp b/autotests/kcm/profilemanagementmocks.cpp
index 7fa77da..9c7219c 100644
--- a/autotests/kcm/profilemanagementmocks.cpp
+++ b/autotests/kcm/profilemanagementmocks.cpp
@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#include <QtTest>
-
#include "profilemanagementmocks.h"

+#include <QtTest>
+
void Wacom::ProfileManagementIntegrityChecker::setTabletId(const QString &tabletId)
{
Q_UNUSED(tabletId)
diff --git a/src/kded/tabletbackend.h b/src/kded/tabletbackend.h
index cf163fd..abfcd21 100644
--- a/src/kded/tabletbackend.h
+++ b/src/kded/tabletbackend.h
@@ -34,7 +34,7 @@ class TabletBackendPrivate;
/**
* The tablet backend which is used to set properties on a tablet.
* The properties which are available depend on the property adapters
- * which were addded to the backend.
+ * which were added to the backend.
*/
class TabletBackend : public TabletBackendInterface
{
diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
index 039c5b4..6b0a645 100644
--- a/src/kded/xsetwacomadaptor.cpp
+++ b/src/kded/xsetwacomadaptor.cpp
@@ -156,7 +156,7 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
kernelButtonNumber = hwButtonNumber;
}

- //qCDebug(KDED) << QString::fromLatin1("Mapping tablet button %1 to X11 buton %2.").arg(hwButtonNumber).arg(kernelButtonNumber);
+ //qCDebug(KDED) << QString::fromLatin1("Mapping tablet button %1 to X11 button %2.").arg(hwButtonNumber).arg(kernelButtonNumber);

modifiedParam = QString(QLatin1String("Button %1")).arg(kernelButtonNumber);
}

[Yuri Chornoivan]

Git commit b8b330dd210a71f5b81f94812e26da67a23fd8da by Yuri Chornoivan.
Committed on 15/08/2018 at 07:32.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 libs/flake/tools/KoShapeRubberSelectStrategy.cpp
M +1 -1 libs/pigment/KoColorProfile.cpp
M +1 -1 libs/ui/KisSessionResource.h
M +1 -1 libs/ui/KisWindowLayoutResource.h
M +1 -1 libs/ui/dialogs/KisNewWindowLayoutDialog.h
M +1 -1 libs/ui/dialogs/KisSessionManagerDialog.h
M +1 -1 libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
M +1 -1 libs/ui/widgets/kis_tone_curve_widget.cpp
M +1 -1 libs/ui/widgets/kis_tone_curve_widget.h
M +1 -1 plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
M +3 -3 plugins/extensions/clonesarray/dlg_clonesarray.cpp
M +1 -1 plugins/filters/indexcolors/indexcolorpalette.h
M +1 -1 plugins/filters/levelfilter/levelfilter.cpp
M +1 -1 plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
M +1 -1 plugins/filters/unsharp/unsharp.cpp

https://commits.kde.org/krita/b8b330dd210a71f5b81f94812e26da67a23fd8da

diff --git a/libs/flake/tools/KoShapeRubberSelectStrategy.cpp b/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
index 83862e25d00..b6463dd1610 100644
--- a/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
+++ b/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
@@ -119,4 +119,4 @@ KUndo2Command *KoShapeRubberSelectStrategy::createCommand()
QRectF KoShapeRubberSelectStrategy::selectedRectangle() const {
Q_D(const KoShapeRubberSelectStrategy);
return d->selectedRect();
-}
\ No newline at end of file
+}
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 &copyright)
{
d->copyright = copyright;
-}
\ No newline at end of file
+}
diff --git a/libs/ui/KisSessionResource.h b/libs/ui/KisSessionResource.h
index 257bccb9b7f..6ae173bcc7f 100644
--- a/libs/ui/KisSessionResource.h
+++ b/libs/ui/KisSessionResource.h
@@ -43,4 +43,4 @@ private:
};


-#endif
\ No newline at end of file
+#endif
diff --git a/libs/ui/KisWindowLayoutResource.h b/libs/ui/KisWindowLayoutResource.h
index ef50b0903b8..7ca38ccc8e9 100644
--- a/libs/ui/KisWindowLayoutResource.h
+++ b/libs/ui/KisWindowLayoutResource.h
@@ -58,4 +58,4 @@ private:
QScopedPointer<Private> d;
};

-#endif
\ No newline at end of file
+#endif
diff --git a/libs/ui/dialogs/KisNewWindowLayoutDialog.h b/libs/ui/dialogs/KisNewWindowLayoutDialog.h
index 1266d8c2962..3608dc441d4 100644
--- a/libs/ui/dialogs/KisNewWindowLayoutDialog.h
+++ b/libs/ui/dialogs/KisNewWindowLayoutDialog.h
@@ -33,4 +33,4 @@ public:
bool primaryWorkspaceFollowsFocus() const;
};

-#endif
\ No newline at end of file
+#endif
diff --git a/libs/ui/dialogs/KisSessionManagerDialog.h b/libs/ui/dialogs/KisSessionManagerDialog.h
index a3e400daed4..5ba4566f928 100644
--- a/libs/ui/dialogs/KisSessionManagerDialog.h
+++ b/libs/ui/dialogs/KisSessionManagerDialog.h
@@ -47,4 +47,4 @@ private:
KisSessionResource *getSelectedSession() const;
};

-#endif
\ No newline at end of file
+#endif
diff --git a/libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp b/libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
index 01c7fec92ed..0531e150cde 100644
--- a/libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
+++ b/libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
@@ -91,4 +91,4 @@ void KisMultipliersDoubleSliderSpinBox::setExponentRatio(qreal dbl)
d->form.sliderSpinBox->setExponentRatio(dbl);
}

-#include "moc_kis_multipliers_double_slider_spinbox.cpp"
\ No newline at end of file
+#include "moc_kis_multipliers_double_slider_spinbox.cpp"
diff --git a/libs/ui/widgets/kis_tone_curve_widget.cpp b/libs/ui/widgets/kis_tone_curve_widget.cpp
index cc197e8e437..679fed4fd50 100644
--- a/libs/ui/widgets/kis_tone_curve_widget.cpp
+++ b/libs/ui/widgets/kis_tone_curve_widget.cpp
@@ -359,4 +359,4 @@ void KisToneCurveWidget::resizeEvent(QResizeEvent* event)
setMinimumWidth(height());
setMaximumWidth(height());
d->needUpdatePixmap = true;
-}
\ No newline at end of file
+}
diff --git a/libs/ui/widgets/kis_tone_curve_widget.h b/libs/ui/widgets/kis_tone_curve_widget.h
index d0d657c4ae2..21f01ba5633 100644
--- a/libs/ui/widgets/kis_tone_curve_widget.h
+++ b/libs/ui/widgets/kis_tone_curve_widget.h
@@ -64,4 +64,4 @@ private :
Private* const d;
};

-#endif /* KISTONECURVEWIDGET_H */
\ No newline at end of file
+#endif /* KISTONECURVEWIDGET_H */
diff --git a/plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp b/plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
index 1f7d70b6ca9..7051282cd8c 100644
--- a/plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
+++ b/plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
@@ -54,4 +54,4 @@ ArtisticColorSelectorPlugin::ArtisticColorSelectorPlugin(QObject* parent, const
KoDockRegistry::instance()->add(new ArtisticColorSelectorDockFactory());
}

-#include "artisticcolorselector_plugin.moc"
\ No newline at end of file
+#include "artisticcolorselector_plugin.moc"
diff --git a/plugins/extensions/clonesarray/dlg_clonesarray.cpp b/plugins/extensions/clonesarray/dlg_clonesarray.cpp
index 51447ae480d..f553c213928 100644
--- a/plugins/extensions/clonesarray/dlg_clonesarray.cpp
+++ b/plugins/extensions/clonesarray/dlg_clonesarray.cpp
@@ -223,14 +223,14 @@ void DlgClonesArray::reapplyClones()
int endColumn = m_page->numPositiveColumns->value() - 1;
int endRow = m_page->numPositiveRows->value() - 1;

- QString positiveGroupName = QString(i18n("+ Array of %1")).arg(m_baseLayer->name());
+ QString positiveGroupName = i18n("+ Array of %1", m_baseLayer->name());
KisGroupLayerSP positiveGroupLayer = new KisGroupLayer(image, positiveGroupName, OPACITY_OPAQUE_U8);
m_applicator->applyCommand(new KisImageLayerAddCommand(image, positiveGroupLayer, m_baseLayer->parent(), m_baseLayer, false, true), KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE);

KisGroupLayerSP negativeGroupLayer;

if (startRow < 0 || startColumn < 0) {
- QString negativeGroupName = QString(i18n("- Array of %1")).arg(m_baseLayer->name());
+ QString negativeGroupName = i18n("- Array of %1", m_baseLayer->name());
negativeGroupLayer = new KisGroupLayer(image, negativeGroupName, OPACITY_OPAQUE_U8);
m_applicator->applyCommand(new KisImageLayerAddCommand(image, negativeGroupLayer, m_baseLayer->parent(), m_baseLayer->prevSibling(), false, true), KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE);
}
@@ -243,7 +243,7 @@ void DlgClonesArray::reapplyClones()
KisNodeSP parent = choosePositiveGroup ? positiveGroupLayer : negativeGroupLayer;


- QString cloneName = QString("Clone %1, %2").arg(col).arg(row);
+ QString cloneName = i18n("Clone %1, %2", col, row);
KisCloneLayerSP clone = new KisCloneLayer(m_baseLayer, image, cloneName, OPACITY_OPAQUE_U8);
clone->setX(-row * rowXOffset + col * columnXOffset);
clone->setY(-row * rowYOffset + col * columnYOffset);
diff --git a/plugins/filters/indexcolors/indexcolorpalette.h b/plugins/filters/indexcolors/indexcolorpalette.h
index 820304787c5..7833878ac53 100644
--- a/plugins/filters/indexcolors/indexcolorpalette.h
+++ b/plugins/filters/indexcolors/indexcolorpalette.h
@@ -63,4 +63,4 @@ struct IndexColorPalette
QPair< int, int > getNeighbours(int mainClr) const;
};

-#endif // INDEXCOLORPALETTE_H
\ No newline at end of file
+#endif // INDEXCOLORPALETTE_H
diff --git a/plugins/filters/levelfilter/levelfilter.cpp b/plugins/filters/levelfilter/levelfilter.cpp
index 9e997614580..ab2697a414e 100644
--- a/plugins/filters/levelfilter/levelfilter.cpp
+++ b/plugins/filters/levelfilter/levelfilter.cpp
@@ -38,4 +38,4 @@ LevelFilter::~LevelFilter()
{
}

-#include "levelfilter.moc"
\ No newline at end of file
+#include "levelfilter.moc"
diff --git a/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp b/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
index b986fcdfd91..d4b93f5892f 100644
--- a/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
+++ b/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
@@ -38,4 +38,4 @@ KisSmallTilesFilterPlugin::~KisSmallTilesFilterPlugin()
{
}

-#include "kis_small_tiles_filter_plugin.moc"
\ No newline at end of file
+#include "kis_small_tiles_filter_plugin.moc"
diff --git a/plugins/filters/unsharp/unsharp.cpp b/plugins/filters/unsharp/unsharp.cpp
index a829881b115..118c6541146 100644
--- a/plugins/filters/unsharp/unsharp.cpp
+++ b/plugins/filters/unsharp/unsharp.cpp
@@ -38,4 +38,4 @@ UnsharpPlugin::~UnsharpPlugin()
{
}

-#include "unsharp.moc"
\ No newline at end of file
+#include "unsharp.moc"

[Yuri Chornoivan]

Git commit 0d6221b0e426a9dcab7a83ae30bebc8259b2aaea by Yuri Chornoivan.
Committed on 16/08/2018 at 17:12.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 lib/kdev5-php/testprovider/phpunitprovider.cpp
M +1 -1 umbrello/dialogs/dontaskagain.h
M +1 -1 umbrello/umlwidgets/widgetbase.cpp

https://commits.kde.org/umbrello/0d6221b0e426a9dcab7a83ae30bebc8259b2aaea

diff --git a/lib/kdev5-php/testprovider/phpunitprovider.cpp b/lib/kdev5-php/testprovider/phpunitprovider.cpp
index 6f891b23a..172fd6f89 100644
--- a/lib/kdev5-php/testprovider/phpunitprovider.cpp
+++ b/lib/kdev5-php/testprovider/phpunitprovider.cpp
@@ -68,7 +68,7 @@ void PhpUnitProvider::updateReady(const IndexedString& document, const Reference

DUChainReadLocker lock;
if (!context) {
- qCDebug(TESTPROVIDER) << "Recieved null context for file: " << document;
+ qCDebug(TESTPROVIDER) << "Received null context for file: " << document;
return;
}

diff --git a/umbrello/dialogs/dontaskagain.h b/umbrello/dialogs/dontaskagain.h
index 1258bc85f..24ce38748 100644
--- a/umbrello/dialogs/dontaskagain.h
+++ b/umbrello/dialogs/dontaskagain.h
@@ -81,7 +81,7 @@ protected slots:

/**
* Dialogs provided by namespace KMessageBox support a feature to hide dialogs on user request
- * by specifing the parameter dontAskAgainName, which adds a checkbox named "Don't ask again"
+ * by specifying the parameter dontAskAgainName, which adds a checkbox named "Don't ask again"
* to the related dialog.
*
* What is currently missing in KMessageBox namespace and therefore provided by class
diff --git a/umbrello/umlwidgets/widgetbase.cpp b/umbrello/umlwidgets/widgetbase.cpp
index 1e3df79c7..34fb21899 100644
--- a/umbrello/umlwidgets/widgetbase.cpp
+++ b/umbrello/umlwidgets/widgetbase.cpp
@@ -502,7 +502,7 @@ void WidgetBase::setAutoResize(bool state)
* A virtual method for the widget to display a property dialog box.
* Subclasses should reimplment this appropriately.
* In case the user cancels the dialog or there are some requirements
- * not fullfilled the method returns false; true otherwise.
+ * not fulfilled the method returns false; true otherwise.
*
* @return true - properties has been applyed
* @return false - properties has not been applied

[Yuri Chornoivan]

Git commit c7722c4078a520e008d37e92e60fed04a653f31e by Yuri Chornoivan.
Committed on 17/08/2018 at 18:05.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +0 -2 conf/editannottooldialog.cpp
M +1 -1 core/documentcommands.cpp
M +10 -10 core/synctex/synctex_parser.c
M +3 -3 core/synctex/synctex_parser_advanced.h
M +1 -1 core/synctex/synctex_parser_utils.c
M +1 -1 doc/CMakeLists.txt
M +1 -1 generators/poppler/generator_pdf.cpp
M +1 -1 kdocumentviewer.h
M +4 -4 ui/annotationpopup.h
M +1 -1 ui/annotationpropertiesdialog.cpp
M +2 -2 ui/annotationproxymodels.cpp
M +2 -2 ui/annotationproxymodels.h
M +1 -1 ui/annotwindow.cpp
M +1 -1 ui/bookmarklist.cpp
M +1 -1 ui/debug_ui.h
M +1 -1 ui/fileprinterpreview.cpp
M +1 -1 ui/magnifierview.cpp
M +1 -1 ui/minibar.cpp
M +1 -1 ui/pagepainter.cpp
M +3 -3 ui/pagepainter.h
M +2 -2 ui/pageviewannotator.cpp
M +1 -1 ui/presentationwidget.cpp
M +9 -9 ui/side_reviews.cpp
M +3 -3 ui/side_reviews.h
M +1 -1 ui/snapshottaker.cpp

https://commits.kde.org/okular/c7722c4078a520e008d37e92e60fed04a653f31e

diff --git a/conf/editannottooldialog.cpp b/conf/editannottooldialog.cpp
index 1b8a9e2c6..18b81e1e5 100644
--- a/conf/editannottooldialog.cpp
+++ b/conf/editannottooldialog.cpp
@@ -19,8 +19,6 @@
#include <QtXml/QDomElement>
#include <KConfigGroup>
#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QVBoxLayout>

#include "core/annotations.h"
#include "ui/annotationwidgets.h"
diff --git a/core/documentcommands.cpp b/core/documentcommands.cpp
index 3b9348bd4..72aec67f5 100644
--- a/core/documentcommands.cpp
+++ b/core/documentcommands.cpp
@@ -143,7 +143,7 @@ bool RemoveAnnotationCommand::refreshInternalPageReferences( const QVector< Okul
if ( !m_done )
{
// We don't always update m_annotation because it can happen that the annotation remove has been undo
- // and that annotation addition has also been undone so the the annotation pointer is stored inside
+ // and that annotation addition has also been undone so the annotation pointer is stored inside
// a previous AddAnnotationCommand and thus doesn't need updating because it didn't change
// because of the document reload
auto a = newPagesVector[m_pageNumber]->annotation( m_annotation->uniqueName() );
diff --git a/core/synctex/synctex_parser.c b/core/synctex/synctex_parser.c
index 4c1923b9a..f409e158e 100644
--- a/core/synctex/synctex_parser.c
+++ b/core/synctex/synctex_parser.c
@@ -660,12 +660,12 @@ static synctex_open_s __synctex_open_v2(const char * output, synctex_io_mode_t i
quoteless_synctex_name = NULL;
}
}
- /* The operation is successfull, return the arguments by value. */
+ /* The operation is successful, return the arguments by value. */
open.status = SYNCTEX_STATUS_OK;
return open;
}

-/* Opens the ouput file, taking into account the eventual build_directory.
+/* Opens the output file, taking into account the eventual build_directory.
* - returns: an open structure which status is
* SYNCTEX_STATUS_OK on success,
* SYNCTEX_STATUS_ERROR on failure.
@@ -5881,7 +5881,7 @@ synctex_scanner_p synctex_scanner_parse(synctex_scanner_p scanner) {
scanner->pre_unit = 8192;
scanner->pre_x_offset = scanner->pre_y_offset = 578;
/* initialize the offset with a fake unprobable value,
- * If there is a post scriptum section, this value will be overriden by the real life value */
+ * If there is a post scriptum section, this value will be overridden by the real life value */
scanner->x_offset = scanner->y_offset = 6.027e23f;
scanner->reader->line_number = 1;

@@ -7368,7 +7368,7 @@ static synctex_nd_s _synctex_point_h_ordered_distance_v2
width = _synctex_data_width(node);
min = _synctex_data_h(node);
max = min + (width>0?width:-width);
- /* We allways have min <= max */
+ /* We always have min <= max */
if (hit->h<min) {
nd.distance = min - hit->h; /* regions 1+4+7, result is > 0 */
} else if (hit->h>max) {
@@ -7382,7 +7382,7 @@ static synctex_nd_s _synctex_point_h_ordered_distance_v2
width = synctex_node_width(node);
min = synctex_node_h(node);
max = min + (width>0?width:-width);
- /* We allways have min <= max */
+ /* We always have min <= max */
if (hit->h<min) {
nd.distance = min - hit->h; /* regions 1+4+7, result is > 0 */
} else if (hit->h>max) {
@@ -7397,7 +7397,7 @@ static synctex_nd_s _synctex_point_h_ordered_distance_v2
width = synctex_node_hbox_width(node);
min = synctex_node_hbox_h(node);
max = min + (width>0?width:-width);
- /* We allways have min <= max */
+ /* We always have min <= max */
if (hit->h<min) {
nd.distance = min - hit->h; /* regions 1+4+7, result is > 0 */
} else if (hit->h>max) {
@@ -7509,7 +7509,7 @@ static synctex_nd_s _synctex_point_v_ordered_distance_v2
min = synctex_node_v(node);
max = min + _synctex_abs(_synctex_data_depth(node));
min -= _synctex_abs(_synctex_data_height(node));
- /* We allways have min <= max */
+ /* We always have min <= max */
if (hit->v<min) {
nd.distance = min - hit->v; /* regions 1+2+3, result is > 0 */
} else if (hit->v>max) {
@@ -7523,7 +7523,7 @@ static synctex_nd_s _synctex_point_v_ordered_distance_v2
min = synctex_node_v(node);
max = min + _synctex_abs(synctex_node_depth(node));
min -= _synctex_abs(synctex_node_height(node));
- /* We allways have min <= max */
+ /* We always have min <= max */
if (hit->v<min) {
nd.distance = min - hit->v; /* regions 1+2+3, result is > 0 */
} else if (hit->v>max) {
@@ -7540,7 +7540,7 @@ static synctex_nd_s _synctex_point_v_ordered_distance_v2
max = min + (depth>0?depth:-depth);
height = synctex_node_hbox_height(node);
min -= (height>0?height:-height);
- /* We allways have min <= max */
+ /* We always have min <= max */
if (hit->v<min) {
nd.distance = min - hit->v; /* regions 1+2+3, result is > 0 */
} else if (hit->v>max) {
@@ -7556,7 +7556,7 @@ static synctex_nd_s _synctex_point_v_ordered_distance_v2
min = _synctex_data_v(node);
max = min + _synctex_abs(_synctex_data_depth(_synctex_tree_parent(node)));
min -= _synctex_abs(_synctex_data_height(_synctex_tree_parent(node)));
- /* We allways have min <= max */
+ /* We always have min <= max */
if (hit->v<min) {
nd.distance = min - hit->v; /* regions 1+2+3, result is > 0 */
} else if (hit->v>max) {
diff --git a/core/synctex/synctex_parser_advanced.h b/core/synctex/synctex_parser_advanced.h
index e395aaff7..b374965a4 100644
--- a/core/synctex/synctex_parser_advanced.h
+++ b/core/synctex/synctex_parser_advanced.h
@@ -65,7 +65,7 @@ extern "C" {

/**
* These are the masks for the synctex node types.
- * int's are 32 bits at leats.
+ * int's are 32 bits at least.
*/
enum {
synctex_shift_root,
@@ -322,7 +322,7 @@ extern "C" {
* Proxies are used to support pdf forms.
* The ref primary nodes are replaced by a tree
* of proxy nodes which duplicate the tree of primary
- * nodes available in the refered form.
+ * nodes available in the referred form.
* Roughly speaking, the primary nodes of the form
* know what to display, the proxy nodes know where.
* Handles are used in queries. They point to either
@@ -447,7 +447,7 @@ extern "C" {
*/
void synctex_iterator_free(synctex_iterator_p iterator);
/**
- * Wether the iterator actually points to an object.
+ * Whether the iterator actually points to an object.
* - argument iterator: the object to iterate on...
*/
synctex_bool_t synctex_iterator_has_next(synctex_iterator_p iterator);
diff --git a/core/synctex/synctex_parser_utils.c b/core/synctex/synctex_parser_utils.c
index 3c0d63b71..70efcd716 100644
--- a/core/synctex/synctex_parser_utils.c
+++ b/core/synctex/synctex_parser_utils.c
@@ -323,7 +323,7 @@ int _synctex_copy_with_quoting_last_path_component(const char * src, char ** des
if(src && dest_ref) {
const char * lpc;
# define dest (*dest_ref)
- dest = NULL; /* Default behavior: no change and sucess. */
+ dest = NULL; /* Default behavior: no change and success. */
lpc = _synctex_last_path_component(src);
if(strlen(lpc)) {
if(strchr(lpc,' ') && lpc[0]!='"' && lpc[strlen(lpc)-1]!='"') {
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index dd7cc3ded..2e4fab66a 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -2,4 +2,4 @@
#
#
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR okular)
-kdoctools_create_manpage(man-okular.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
\ No newline at end of file
+kdoctools_create_manpage(man-okular.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 9310b7c2e..fb621c412 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -387,7 +387,7 @@ Okular::Action* createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool
// If links should not be deleted it probably means that they
// are part of a nextActions chain. There is no support
// to resolveMediaLinkReferences on nextActions. It would also
- // be neccessary to ensure that resolveMediaLinkReferences does
+ // be necessary to ensure that resolveMediaLinkReferences does
// not delete the Links which are part of a nextActions list
// to avoid a double deletion.
qCDebug(OkularPdfDebug) << "parsing rendition link without deletion is not supported. Action chain might be broken.";
diff --git a/kdocumentviewer.h b/kdocumentviewer.h
index d1218879e..02d30ff61 100644
--- a/kdocumentviewer.h
+++ b/kdocumentviewer.h
@@ -12,7 +12,7 @@

#include "okularpart_export.h"

-#include <QtCore/QStringList>
+#include <QStringList>

class QUrl;

diff --git a/ui/annotationpopup.h b/ui/annotationpopup.h
index 424f1de77..9d5b48fbc 100644
--- a/ui/annotationpopup.h
+++ b/ui/annotationpopup.h
@@ -10,10 +10,10 @@
#ifndef ANNOTATIONPOPUP_H
#define ANNOTATIONPOPUP_H

-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QPair>
-#include <QtCore/QPoint>
+#include <QObject>
+#include <QList>
+#include <QPair>
+#include <QPoint>

namespace Okular {
class Annotation;
diff --git a/ui/annotationpropertiesdialog.cpp b/ui/annotationpropertiesdialog.cpp
index f15032083..1a828b6da 100644
--- a/ui/annotationpropertiesdialog.cpp
+++ b/ui/annotationpropertiesdialog.cpp
@@ -14,7 +14,7 @@
#include <qlayout.h>
#include <qlabel.h>
#include <qheaderview.h>
-#include <QtWidgets/qpushbutton.h>
+#include <qpushbutton.h>
#include <qtextedit.h>
#include <QIcon>
#include <klineedit.h>
diff --git a/ui/annotationproxymodels.cpp b/ui/annotationproxymodels.cpp
index eab99dc63..cf5621c0f 100644
--- a/ui/annotationproxymodels.cpp
+++ b/ui/annotationproxymodels.cpp
@@ -9,8 +9,8 @@

#include "annotationproxymodels.h"

-#include <QtCore/QList>
-#include <QtCore/QItemSelection>
+#include <QList>
+#include <QItemSelection>

#include <QIcon>

diff --git a/ui/annotationproxymodels.h b/ui/annotationproxymodels.h
index 8b914c25b..13a7448dd 100644
--- a/ui/annotationproxymodels.h
+++ b/ui/annotationproxymodels.h
@@ -10,8 +10,8 @@
#ifndef ANNOTATIONPROXYMODEL_H
#define ANNOTATIONPROXYMODEL_H

-#include <QtCore/QSortFilterProxyModel>
-#include <QtCore/QPair>
+#include <QSortFilterProxyModel>
+#include <QPair>

/**
* A proxy model, which filters out all pages except the
diff --git a/ui/annotwindow.cpp b/ui/annotwindow.cpp
index d069a3c1e..b1bfea64d 100644
--- a/ui/annotwindow.cpp
+++ b/ui/annotwindow.cpp
@@ -28,7 +28,7 @@
#include <qtoolbutton.h>
#include <KLocalizedString>
#include <ktextedit.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <qaction.h>
#include <kstandardaction.h>
#include <qmenu.h>
diff --git a/ui/bookmarklist.cpp b/ui/bookmarklist.cpp
index ff26132fc..ebbf3787e 100644
--- a/ui/bookmarklist.cpp
+++ b/ui/bookmarklist.cpp
@@ -17,7 +17,7 @@
#include <qtoolbar.h>
#include <qtreewidget.h>
#include <QMenu>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QIcon>

#include <KLocalizedString>
diff --git a/ui/debug_ui.h b/ui/debug_ui.h
index 4d0da5b34..7b8e98358 100644
--- a/ui/debug_ui.h
+++ b/ui/debug_ui.h
@@ -11,7 +11,7 @@
#ifndef OKULAR_DEBUG_UI_P_H
#define OKULAR_DEBUG_UI_P_H

-#include <QtCore/qloggingcategory.h>
+#include <qloggingcategory.h>

Q_DECLARE_LOGGING_CATEGORY(OkularUiDebug)

diff --git a/ui/fileprinterpreview.cpp b/ui/fileprinterpreview.cpp
index 0ae3aa9b8..ab186e4d0 100644
--- a/ui/fileprinterpreview.cpp
+++ b/ui/fileprinterpreview.cpp
@@ -27,7 +27,7 @@
#include <kpluginfactory.h>
#include <kpluginloader.h>
#include <ksharedconfig.h>
-#include <QtCore/qloggingcategory.h>
+#include <qloggingcategory.h>

#include "debug_ui.h"

diff --git a/ui/magnifierview.cpp b/ui/magnifierview.cpp
index c766f9f55..cef941ecf 100644
--- a/ui/magnifierview.cpp
+++ b/ui/magnifierview.cpp
@@ -175,7 +175,7 @@ void MagnifierView::drawTicks( QPainter *p )
p->drawLine(0, height() - 1, 0, 0);

// ticks
- // TODO posibility to switch units (pt, mm, cc, in, printing dots)
+ // TODO possibility to switch units (pt, mm, cc, in, printing dots)
float ps = (float)SCALE * 5;// how much pixels in widget is one pixel in document * how often
int tw = 10; // tick size in pixels

diff --git a/ui/minibar.cpp b/ui/minibar.cpp
index df5af1d53..f831176bb 100644
--- a/ui/minibar.cpp
+++ b/ui/minibar.cpp
@@ -17,7 +17,7 @@
#include <qpushbutton.h>
#include <qlabel.h>
#include <qlayout.h>
-#include <QtWidgets/QToolButton>
+#include <QToolButton>
#include <qvalidator.h>
#include <qpainter.h>
#include <QIcon>
diff --git a/ui/pagepainter.cpp b/ui/pagepainter.cpp
index f54cf2445..618ff7833 100644
--- a/ui/pagepainter.cpp
+++ b/ui/pagepainter.cpp
@@ -16,7 +16,7 @@
#include <qpixmap.h>
#include <qvarlengtharray.h>
#include <kiconloader.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QApplication>
#include <QIcon>

diff --git a/ui/pagepainter.h b/ui/pagepainter.h
index c3cb3dbf4..94bfc85d7 100644
--- a/ui/pagepainter.h
+++ b/ui/pagepainter.h
@@ -10,9 +10,9 @@
#ifndef _OKULAR_PAGEPAINTER_H_
#define _OKULAR_PAGEPAINTER_H_

-#include <QtGui/QBrush>
-#include <QtGui/QImage>
-#include <QtGui/QPen>
+#include <QBrush>
+#include <QImage>
+#include <QPen>

#include "core/area.h" // for NormalizedPoint

diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp
index 83bf0fb04..6dbe5b510 100644
--- a/ui/pageviewannotator.cpp
+++ b/ui/pageviewannotator.cpp
@@ -10,7 +10,7 @@
#include "pageviewannotator.h"

// qt / kde includes
-#include <QtCore/qloggingcategory.h>
+#include <qloggingcategory.h>
#include <qapplication.h>
#include <qfile.h>
#include <qcolor.h>
@@ -24,7 +24,7 @@
#include <KLocalizedString>

#include <kuser.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <qmenu.h>

// system includes
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index d54dc4600..9d81f4e45 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -10,7 +10,7 @@
#include "presentationwidget.h"

// qt/kde includes
-#include <QtCore/qloggingcategory.h>
+#include <qloggingcategory.h>
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage>
#include <QtDBus/QDBusReply>
diff --git a/ui/side_reviews.cpp b/ui/side_reviews.cpp
index 9d31c6809..25e358816 100644
--- a/ui/side_reviews.cpp
+++ b/ui/side_reviews.cpp
@@ -10,15 +10,15 @@
#include "side_reviews.h"

// qt/kde includes
-#include <QtCore/QStringList>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLayout>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
-#include <QtWidgets/QSizePolicy>
-#include <QtGui/QTextDocument>
-#include <QtWidgets/QToolBar>
-#include <QtWidgets/QTreeView>
+#include <QStringList>
+#include <QHeaderView>
+#include <QLayout>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QSizePolicy>
+#include <QTextDocument>
+#include <QToolBar>
+#include <QTreeView>

#include <qaction.h>
#include <KLocalizedString>
diff --git a/ui/side_reviews.h b/ui/side_reviews.h
index ed281a969..79c99df1d 100644
--- a/ui/side_reviews.h
+++ b/ui/side_reviews.h
@@ -10,9 +10,9 @@
#ifndef _OKULAR_SIDE_REVIEWS_H_
#define _OKULAR_SIDE_REVIEWS_H_

-#include <QtCore/QModelIndexList>
-#include <QtCore/QVector>
-#include <QtWidgets/QWidget>
+#include <QModelIndexList>
+#include <QVector>
+#include <QWidget>

#include "core/observer.h"

diff --git a/ui/snapshottaker.cpp b/ui/snapshottaker.cpp
index 6eabf95c7..693d1e184 100644
--- a/ui/snapshottaker.cpp
+++ b/ui/snapshottaker.cpp
@@ -12,7 +12,7 @@
#include <phonon/mediaobject.h>
#include <phonon/videowidget.h>

-#include <QtGui/QImage>
+#include <QImage>

SnapshotTaker::SnapshotTaker(const QUrl &url, QObject *parent )
: QObject( parent )

[Yuri Chornoivan]

Git commit 73e0b8219c2c2a6acd2c3878cb2c3f8f6942b830 by Yuri Chornoivan.
Committed on 18/08/2018 at 07:51.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +0 -2 app/abstractcontextmanageritem.cpp
M +0 -1 app/fileopscontextmanageritem.cpp
M +0 -1 app/filtercontroller.cpp
M +1 -1 importer/importdialog.cpp
M +0 -1 importer/main.cpp
M +0 -1 lib/contextmanager.cpp
M +0 -1 lib/documentview/documentviewcontroller.cpp
M +0 -1 lib/slidecontainer.h
M +2 -2 tests/auto/contextmanagertest.cpp
M +0 -1 tests/auto/placetreemodeltest.cpp
M +2 -2 tests/manual/thumbnailgen.cpp

https://commits.kde.org/gwenview/73e0b8219c2c2a6acd2c3878cb2c3f8f6942b830

diff --git a/app/abstractcontextmanageritem.cpp b/app/abstractcontextmanageritem.cpp
index e58f91bf..07575282 100644
--- a/app/abstractcontextmanageritem.cpp
+++ b/app/abstractcontextmanageritem.cpp
@@ -19,8 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "abstractcontextmanageritem.h"

-#include "abstractcontextmanageritem.h"
-
// Local
#include <lib/contextmanager.h>

diff --git a/app/fileopscontextmanageritem.cpp b/app/fileopscontextmanageritem.cpp
index d32ce95c..2e47b419 100644
--- a/app/fileopscontextmanageritem.cpp
+++ b/app/fileopscontextmanageritem.cpp
@@ -47,7 +47,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <KRun>
#include <KXMLGUIClient>
#include <KUrlMimeData>
-#include <KFileItemActions>
#include <KFileItemListProperties>
#include <KIO/OpenFileManagerWindowJob>

diff --git a/app/filtercontroller.cpp b/app/filtercontroller.cpp
index c3bfb47c..898a8b00 100644
--- a/app/filtercontroller.cpp
+++ b/app/filtercontroller.cpp
@@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
// KDE
#include <KComboBox>
#include <KIconLoader>
-#include <QLineEdit>
#include <KLocalizedString>

// Local
diff --git a/importer/importdialog.cpp b/importer/importdialog.cpp
index 53838008..627853d9 100644
--- a/importer/importdialog.cpp
+++ b/importer/importdialog.cpp
@@ -232,7 +232,7 @@ void ImportDialog::setSourceUrl(const QUrl& url, const QString& deviceUdi)
}
} else {
Solid::Device device(deviceUdi);
- name = device.vendor() + " " + device.product();
+ name = device.vendor() + ' ' + device.product();
iconName = device.icon();
}
d->mThumbnailPage->setSourceUrl(url, iconName, name);
diff --git a/importer/main.cpp b/importer/main.cpp
index 0603bacc..4497cc6b 100644
--- a/importer/main.cpp
+++ b/importer/main.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

// KDE
#include <KAboutData>
-#include <QCommandLineParser>
#include <KLocalizedString>
#include <QLocale>

diff --git a/lib/contextmanager.cpp b/lib/contextmanager.cpp
index 2243ea99..f28db260 100644
--- a/lib/contextmanager.cpp
+++ b/lib/contextmanager.cpp
@@ -18,7 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

*/
#include "contextmanager.h"
-#include "contextmanager.h"

// Qt
#include <QItemSelectionModel>
diff --git a/lib/documentview/documentviewcontroller.cpp b/lib/documentview/documentviewcontroller.cpp
index 895d6398..5cf2d3f6 100644
--- a/lib/documentview/documentviewcontroller.cpp
+++ b/lib/documentview/documentviewcontroller.cpp
@@ -36,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
#include <QAction>
#include <QHBoxLayout>
#include <QDebug>
-#include <QAction>

namespace Gwenview
{
diff --git a/lib/slidecontainer.h b/lib/slidecontainer.h
index a1dea292..f386808e 100644
--- a/lib/slidecontainer.h
+++ b/lib/slidecontainer.h
@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

// Qt
#include <QPointer>
-#include <QPointer>
#include <QFrame>

#include <lib/gwenviewlib_export.h>
diff --git a/tests/auto/contextmanagertest.cpp b/tests/auto/contextmanagertest.cpp
index c24bcac7..50917ec7 100644
--- a/tests/auto/contextmanagertest.cpp
+++ b/tests/auto/contextmanagertest.cpp
@@ -64,7 +64,7 @@ void ContextManagerTest::testRemove()
manager.selectionModel()->setCurrentIndex(dirModel.index(1, 0), QItemSelectionModel::Select);

// Remove "b", `manager` should select "c"
- sandBox.remove("b");
+ sandBox.remove('b');
dirModel.dirLister()->updateDirectory(dirUrl);
while (dirModel.rowCount() == 3) {
QTest::qWait(100);
@@ -75,7 +75,7 @@ void ContextManagerTest::testRemove()
QCOMPARE(currentIndex.data(Qt::DisplayRole).toString(), QStringLiteral("c"));

// Remove "c", `manager` should select "a"
- sandBox.remove("c");
+ sandBox.remove('c');
dirModel.dirLister()->updateDirectory(dirUrl);
while (dirModel.rowCount() == 2) {
QTest::qWait(100);
diff --git a/tests/auto/placetreemodeltest.cpp b/tests/auto/placetreemodeltest.cpp
index 7fa01b71..b0d850ba 100644
--- a/tests/auto/placetreemodeltest.cpp
+++ b/tests/auto/placetreemodeltest.cpp
@@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// KDE
#include <QDebug>
#include <QStandardPaths>
-#include <QStandardPaths>
#include <qtest.h>
#include <kio_version.h>

diff --git a/tests/manual/thumbnailgen.cpp b/tests/manual/thumbnailgen.cpp
index f0c7f994..4a5d3270 100644
--- a/tests/manual/thumbnailgen.cpp
+++ b/tests/manual/thumbnailgen.cpp
@@ -88,8 +88,8 @@ int main(int argc, char** argv)
return 1;
}
}
- if (!thumbnailBaseDirName.endsWith("/")) {
- thumbnailBaseDirName += "/";
+ if (!thumbnailBaseDirName.endsWith('/')) {
+ thumbnailBaseDirName += '/';
}
ThumbnailProvider::setThumbnailBaseDir(thumbnailBaseDirName);
}

[Yuri Chornoivan]

Git commit 1ea77376179044ae9569e086f032e78bf5dbadcd by Yuri Chornoivan.
Committed on 18/08/2018 at 07:59.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 src/alignment-congealing/funnelreal.cpp
M +2 -2 src/detection/opencvfacedetector.cpp
M +1 -1 src/identity.h
M +1 -1 tests/gui/faceitem.cpp

https://commits.kde.org/libkface/1ea77376179044ae9569e086f032e78bf5dbadcd

diff --git a/src/alignment-congealing/funnelreal.cpp b/src/alignment-congealing/funnelreal.cpp
index 2f3164c..dc52fd1 100644
--- a/src/alignment-congealing/funnelreal.cpp
+++ b/src/alignment-congealing/funnelreal.cpp
@@ -110,7 +110,7 @@ public:
const cv::Mat& image,
const int width, const int height) const;

- /// Part 2: Returns a small vector containg transformation parameters
+ /// Part 2: Returns a small vector containing transformation parameters
std::vector<float> computeTransform(const std::vector<std::vector<std::vector<float> > > &originalFeatures,
const int width, const int height) const;

@@ -612,7 +612,7 @@ void FunnelReal::Private::getSIFTdescripter(std::vector<float> &descripter,

if(sum < .0000001f)
{
- //float dn = 1.0f / (signed)descripter.size(); // is unused, dont know
+ //float dn = 1.0f / (signed)descripter.size(); // is unused, don't know
for(int i=0; i<(signed)descripter.size(); i++)
descripter[i] = 0;

diff --git a/src/detection/opencvfacedetector.cpp b/src/detection/opencvfacedetector.cpp
index ed99d27..26336d3 100644
--- a/src/detection/opencvfacedetector.cpp
+++ b/src/detection/opencvfacedetector.cpp
@@ -462,7 +462,7 @@ QList<QRect> OpenCVFaceDetector::cascadeResult(const cv::Mat& inputImage,

std::vector<cv::Rect> faces;
cascade.detectMultiScale(inputImage, faces,
- params.searchIncrement, // Increase search scale by this factor everytime
+ params.searchIncrement, // Increase search scale by this factor every time
params.grouping, // Drop groups of less than n detections
params.flags, // Optionally, pre-test regions by edge detection
params.minSize // Minimum face size to look for
@@ -581,7 +581,7 @@ bool OpenCVFaceDetector::verifyFace(const cv::Mat& inputImage, const QRect& face

foundFaces = cascadeResult(extendedFaceImg, d->cascades[i], d->verifyingParams);

- // We dont need to check the size of found regions, the minSize in verifyingParams is large enough
+ // We don't need to check the size of found regions, the minSize in verifyingParams is large enough
if (!foundFaces.empty())
frontalFaceVotes++;
}
diff --git a/src/identity.h b/src/identity.h
index 409b8a0..4cc3385 100644
--- a/src/identity.h
+++ b/src/identity.h
@@ -49,7 +49,7 @@ public:
/**
* Wraps a libkface recognition Identity.
* An identity refers to a natural person.
- * There is an internal id which is used the the libkface storage,
+ * There is an internal id which is used for the libkface storage,
* and a number of attributes which map the identity to the outside.
* Prespecified attributes:
* "fullName" The full name as on the ID card, e.g. "Peter Brown"
diff --git a/tests/gui/faceitem.cpp b/tests/gui/faceitem.cpp
index 605c360..8e33dce 100644
--- a/tests/gui/faceitem.cpp
+++ b/tests/gui/faceitem.cpp
@@ -138,7 +138,7 @@ FaceItem::FaceItem(QGraphicsItem* const parent, QGraphicsScene* const scene, con
o.setAlignment(Qt::AlignCenter);
doc->setDefaultTextOption(o);

- // Get coordinates of the name relative the the scene
+ // Get coordinates of the name relative to the scene
QRectF r = d->faceName->mapRectToScene(d->faceName->boundingRect());

// Draw the bounding name rectangle with the scene coordinates

[Yuri Chornoivan]

Git commit 68989188f1091408ee89d7d006a28072ee630cb8 by Yuri Chornoivan.
Committed on 18/08/2018 at 08:08.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 src/interface.h
M +0 -4 tests/kipicmd/main.cpp
M +3 -3 tests/plugins/kxmlhelloworld/plugin_kxmlhelloworld.cpp

https://commits.kde.org/libkipi/68989188f1091408ee89d7d006a28072ee630cb8

diff --git a/src/interface.h b/src/interface.h
index 1b3cc3f..7710bf7 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -85,7 +85,7 @@ enum Features
HostSupportsTags = 1 << 9, /** This feature specifies whether the host application supports keywords for images. */
HostSupportsRating = 1 << 10, /** This feature specifies whether the host application supports rating values for images. */
HostSupportsThumbnails = 1 << 11, /** This feature specifies that host application can provide image thumbnails. */
- HostSupportsReadWriteLock = 1 << 12, /** This feature specifies that host application has mechanism to lock/unlock items to prevent concurent operations. */
+ HostSupportsReadWriteLock = 1 << 12, /** This feature specifies that host application has mechanism to lock/unlock items to prevent concurrent operations. */
HostSupportsPickLabel = 1 << 13, /** This feature specifies whether the host application supports pick label values for images, used for photograph workflow. */
HostSupportsColorLabel = 1 << 14, /** This feature specifies whether the host application supports color label values for images, used to sort item with color flag. */
HostSupportsItemReservation = 1 << 15, /** This feature specifies whether the host application supports item reservation. */
diff --git a/tests/kipicmd/main.cpp b/tests/kipicmd/main.cpp
index cd4a7e8..8bbb147 100644
--- a/tests/kipicmd/main.cpp
+++ b/tests/kipicmd/main.cpp
@@ -50,10 +50,6 @@
# include <kexiv2/kexiv2.h>
#endif

-// Local includes
-
-#include "kipiinterface.h"
-
using namespace KXMLKipiCmd;
using namespace KIPI;

diff --git a/tests/plugins/kxmlhelloworld/plugin_kxmlhelloworld.cpp b/tests/plugins/kxmlhelloworld/plugin_kxmlhelloworld.cpp
index 77fe15a..7897c13 100644
--- a/tests/plugins/kxmlhelloworld/plugin_kxmlhelloworld.cpp
+++ b/tests/plugins/kxmlhelloworld/plugin_kxmlhelloworld.cpp
@@ -23,7 +23,7 @@
/** Take a care about includes order, to prevent compilation problem.
* 1/ class header file.
* 2/ C ansi if really necessary.
- * 3/ C++ (always prefered than C ansi.
+ * 3/ C++ (always preferred than C ansi.
* 4/ Extra libraries such as openCV for ex.
* 4/ Qt.
* 5/ KDE.
@@ -78,7 +78,7 @@ namespace KIPIKXMLHelloWorldPlugin
for that.
*/

-/** Using private container everywhere is clear to speed up compilation and reduce source code depencies through header files.
+/** Using private container everywhere is clear to speed up compilation and reduce source code dependencies through header files.
* See this url for details : http://techbase.kde.org/Policies/Binary_Compatibility_Issues_With_C%2B%2B#Using_a_d-Pointer
*/
class Plugin_KXMLHelloWorld::Private
@@ -124,7 +124,7 @@ Plugin_KXMLHelloWorld::Plugin_KXMLHelloWorld(QObject* const parent, const QVaria
/** This is needed to setup the plugin gui and to merge with the kipi host
* application gui.
* The name of the UI file must be: nameofpluginui.rc, where "nameofplugin"
- * is the name given to the plugin factory, usualy: kipiplugin_<name> .
+ * is the name given to the plugin factory, usually: kipiplugin_<name> .
* UI file of the plugin must be installed in kipi data dir.
*/
setUiBaseName("kipiplugin_kxmlhelloworldui.rc");

[Yuri Chornoivan]

Git commit a5e5e4abe691300f9f0492c8afd3eb3abf6e7c59 by Yuri Chornoivan.
Committed on 18/08/2018 at 09:09.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 commands/imagelib/transforms/kpTransformRotateCommand.cpp
M +1 -1 commands/tools/selection/text/kpToolTextGiveContentCommand.h
M +1 -1 document/kpDocumentSaveOptions.cpp
M +1 -1 environments/tools/kpToolEnvironment.h
M +1 -2 lgpl/generic/kpColorCollection.cpp
M +1 -1 scan/sanedialog.cpp
M +1 -1 tools/polygonal/kpToolPolygonalBase.h
M +0 -2 views/kpView_Events.cpp

https://commits.kde.org/kolourpaint/a5e5e4abe691300f9f0492c8afd3eb3abf6e7c59

diff --git a/commands/imagelib/transforms/kpTransformRotateCommand.cpp b/commands/imagelib/transforms/kpTransformRotateCommand.cpp
index d71d1ce0..d09ab8e5 100644
--- a/commands/imagelib/transforms/kpTransformRotateCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformRotateCommand.cpp
@@ -121,7 +121,7 @@ void kpTransformRotateCommand::execute ()
// reverse.
// 2. If it's not a lossless rotation, "m_oldImage" already holds
// a copy of the old image. In this case, we actually save very
- // little with this line (just, the computed transpareny mask) since
+ // little with this line (just, the computed transparency mask) since
// kpImage is copy-on-write.
m_oldSelectionPtr->setBaseImage (kpImage ());

diff --git a/commands/tools/selection/text/kpToolTextGiveContentCommand.h b/commands/tools/selection/text/kpToolTextGiveContentCommand.h
index f7b623e3..6a7a2f16 100644
--- a/commands/tools/selection/text/kpToolTextGiveContentCommand.h
+++ b/commands/tools/selection/text/kpToolTextGiveContentCommand.h
@@ -40,7 +40,7 @@ class kpTextSelection;
// text line. This must be executed before any manipulations can be made
// to a text selection.
//
-// Text analogue of kpToolSelectionPullFromDocumentCommand.
+// Text analog of kpToolSelectionPullFromDocumentCommand.
class kpToolTextGiveContentCommand :
public kpAbstractSelectionContentCommand
{
diff --git a/document/kpDocumentSaveOptions.cpp b/document/kpDocumentSaveOptions.cpp
index ae279ff3..2331661d 100644
--- a/document/kpDocumentSaveOptions.cpp
+++ b/document/kpDocumentSaveOptions.cpp
@@ -550,7 +550,7 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableColorDepth (const QString &mi
defaultMimeTypes << QLatin1String ("image/bmp");
defaultMimeTypes << QLatin1String ("image/x-pcx");

- // TODO: Only 1, 24 not 8; Qt only sees 32 but "file" cmd realises
+ // TODO: Only 1, 24 not 8; Qt only sees 32 but "file" cmd realizes
// it's either 1 or 24.
defaultMimeTypes << QLatin1String ("image/x-rgb");

diff --git a/environments/tools/kpToolEnvironment.h b/environments/tools/kpToolEnvironment.h
index 2a455ab0..4bd63481 100644
--- a/environments/tools/kpToolEnvironment.h
+++ b/environments/tools/kpToolEnvironment.h
@@ -93,7 +93,7 @@ public:
// 2. A change to selection transparency (background color, color similarity
// percentage, change from opaque to transparent).
//
- // It is not used when the transpareny is opaque or when changing from
+ // It is not used when the transparency is opaque or when changing from
// transparent to opaque, as you're not using Color Similarity in these
// cases.
//
diff --git a/lgpl/generic/kpColorCollection.cpp b/lgpl/generic/kpColorCollection.cpp
index 3ad44e60..bd16e57f 100644
--- a/lgpl/generic/kpColorCollection.cpp
+++ b/lgpl/generic/kpColorCollection.cpp
@@ -35,7 +35,6 @@
#include <KMessageBox>
#include "kpLogCategories.h"
#include <kstringhandler.h>
-#include "kpLogCategories.h"

#include <QDir>
#include <QFile>
@@ -266,7 +265,7 @@ static void SaveToFile (kpColorCollectionPrivate *d, QIODevice *device)
QTextStream str (device);

QString description = d->desc.trimmed();
- description = '#'+description.split( "\n", QString::KeepEmptyParts).join("\n#");
+ description = '#'+description.split( '\n', QString::KeepEmptyParts).join("\n#");

str << "KDE RGB Palette\n";
str << description << "\n";
diff --git a/scan/sanedialog.cpp b/scan/sanedialog.cpp
index 21dbcf3f..1579a450 100644
--- a/scan/sanedialog.cpp
+++ b/scan/sanedialog.cpp
@@ -32,7 +32,7 @@
#include <KWindowConfig>
#include <KConfigGroup>

-#include <QtWidgets/QPushButton>
+#include <QPushButton>

SaneDialog::SaneDialog(QWidget *parent)
: KPageDialog(parent)
diff --git a/tools/polygonal/kpToolPolygonalBase.h b/tools/polygonal/kpToolPolygonalBase.h
index bbe33f46..cd2c2b6d 100644
--- a/tools/polygonal/kpToolPolygonalBase.h
+++ b/tools/polygonal/kpToolPolygonalBase.h
@@ -166,7 +166,7 @@ protected:
// Reimplement this if not all points are used to construct connected lines.
// For instance, the Curve tool will return "true" to construct a line, on
// the initial drag. However, for the following 2 control points, it returns
- // "false". The Curve tool realises it is an initial drag if points() only
+ // "false". The Curve tool realizes it is an initial drag if points() only
// returns 2 points.
virtual bool drawingALine () const { return true; }
public:
diff --git a/views/kpView_Events.cpp b/views/kpView_Events.cpp
index 96caeb3d..e7f1d1dd 100644
--- a/views/kpView_Events.cpp
+++ b/views/kpView_Events.cpp
@@ -44,8 +44,6 @@

#include "tools/kpTool.h"

-#include "kpLogCategories.h"
-
//---------------------------------------------------------------------

// protected virtual [base QWidget]

[Yuri Chornoivan]

Git commit 2dd6d62aeda04eae79b573ee3dcae9c192c883f5 by Yuri Chornoivan.
Committed on 18/08/2018 at 13:38.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 CMakeLists.txt
M +0 -1 src/PlatformBackends/X11ImageGrabber.cpp

https://commits.kde.org/spectacle/2dd6d62aeda04eae79b573ee3dcae9c192c883f5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a049cc..e73f5de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,7 +102,7 @@ endif()

# fail build if none of the platform backends can be found
if (NOT XCB_FOUND OR NOT XCB_COMPONENTS_FOUND)
- message(FATAL_ERROR "No suitable backend platform was found. Currenty supported platforms are: XCB Components Required: ${XCB_COMPONENTS_ERRORS}")
+ message(FATAL_ERROR "No suitable backend platform was found. Currently supported platforms are: XCB Components Required: ${XCB_COMPONENTS_ERRORS}")
endif()

# hand off to subdirectories
diff --git a/src/PlatformBackends/X11ImageGrabber.cpp b/src/PlatformBackends/X11ImageGrabber.cpp
index 6fc7305..e5d2d75 100644
--- a/src/PlatformBackends/X11ImageGrabber.cpp
+++ b/src/PlatformBackends/X11ImageGrabber.cpp
@@ -39,7 +39,6 @@
#include <QX11Info>
#include <QtMath>

-#include <KWindowSystem>
#include <KWindowInfo>

#include <xcb/xcb_cursor.h>

[Yuri Chornoivan]

Git commit d1f1caedd3e05ea7320de25edc1c65ebabb7df94 by Yuri Chornoivan.
Committed on 19/08/2018 at 18:38.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 agents/invitations/invitationsagent.cpp
M +2 -2 agents/maildispatcher/sendjob.cpp
M +1 -1 resources/dav/resource/davgroupwareresource.cpp
M +1 -1 resources/imap/imapresourcebase.h
M +5 -5 resources/kolab/pimkolab/calendaring/event.h
M +1 -1 resources/kolab/pimkolab/conversion/kabcconversion.cpp
M +1 -1 resources/kolab/pimkolab/kolabformat/errorhandler.h
M +1 -1 resources/kolab/pimkolab/utils/kolabformatchecker.cpp
M +6 -6 resources/tomboynotes/o2/o0simplecrypt.h
M +1 -1 resources/tomboynotes/o2/o2.cpp
M +1 -1 resources/tomboynotes/tomboycollectionsdownloadjob.cpp
M +1 -1 resources/tomboynotes/tomboyitemdownloadjob.cpp
M +1 -1 resources/tomboynotes/tomboyitemuploadjob.cpp

https://commits.kde.org/kdepim-runtime/d1f1caedd3e05ea7320de25edc1c65ebabb7df94

diff --git a/agents/invitations/invitationsagent.cpp b/agents/invitations/invitationsagent.cpp
index 6af04b822..70a993d82 100644
--- a/agents/invitations/invitationsagent.cpp
+++ b/agents/invitations/invitationsagent.cpp
@@ -49,8 +49,8 @@
#include <KMime/Message>

#include <QTimer>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
+#include <QDBusInterface>
+#include <QDBusReply>
#include <QStandardPaths>
#include <QTimeZone>

diff --git a/agents/maildispatcher/sendjob.cpp b/agents/maildispatcher/sendjob.cpp
index a9114b1fd..118576f10 100644
--- a/agents/maildispatcher/sendjob.cpp
+++ b/agents/maildispatcher/sendjob.cpp
@@ -45,8 +45,8 @@
#include <AkonadiCore/ServerManager>

#include <QTimer>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
+#include <QDBusInterface>
+#include <QDBusReply>

using namespace Akonadi;
using namespace KMime;
diff --git a/resources/dav/resource/davgroupwareresource.cpp b/resources/dav/resource/davgroupwareresource.cpp
index 04d786a4b..99f6b1e7c 100644
--- a/resources/dav/resource/davgroupwareresource.cpp
+++ b/resources/dav/resource/davgroupwareresource.cpp
@@ -748,7 +748,7 @@ void DavGroupwareResource::onRetrieveCollectionsFinished(KJob *job)
* We unfortunately have to update the CTag now in the cache
* as this information will not be available when retrieveItems()
* is called. We leave it untouched in the collection attribute
- * and will only update it there after sucessfull sync.
+ * and will only update it there after successful sync.
*/
if (!davCollection.CTag().isEmpty()) {
mCTagCache.insert(davCollection.url().toDisplayString(), davCollection.CTag());
diff --git a/resources/imap/imapresourcebase.h b/resources/imap/imapresourcebase.h
index ca88ec980..d876c3ff9 100644
--- a/resources/imap/imapresourcebase.h
+++ b/resources/imap/imapresourcebase.h
@@ -75,7 +75,7 @@ public Q_SLOTS:
QString dumpResourceToString() const override;

protected:
- using ResourceBase::retrieveItems; // supress -Woverload-virtual
+ using ResourceBase::retrieveItems; // suppress -Woverload-virtual

protected Q_SLOTS:
void startIdleIfNeeded();
diff --git a/resources/kolab/pimkolab/calendaring/event.h b/resources/kolab/pimkolab/calendaring/event.h
index f76f3e3c6..0fbedd9fb 100644
--- a/resources/kolab/pimkolab/calendaring/event.h
+++ b/resources/kolab/pimkolab/calendaring/event.h
@@ -83,17 +83,17 @@ public:
Kolab::Attendee getAttendee(const std::string &);

/**
- * Returns the next occurence for a recurring event.
+ * Returns the next occurrence for a recurring event.
*
- * If the start date of the event is passed in, the second occurence is returned (so it can be used in a for loop to loop through all occurences).
+ * If the start date of the event is passed in, the second occurrence is returned (so it can be used in a for loop to loop through all occurences).
*
- * If there is no next occurence or the event is not recurring at all an invalid cDateTime is returned.
+ * If there is no next occurrence or the event is not recurring at all an invalid cDateTime is returned.
*/
Kolab::cDateTime getNextOccurence(const Kolab::cDateTime &);

/**
- * Returns the corresponding end date-time for a specific occurence.
- * @param start is the start date of the occurence.
+ * Returns the corresponding end date-time for a specific occurrence.
+ * @param start is the start date of the occurrence.
*/
Kolab::cDateTime getOccurenceEndDate(const Kolab::cDateTime &start);

diff --git a/resources/kolab/pimkolab/conversion/kabcconversion.cpp b/resources/kolab/pimkolab/conversion/kabcconversion.cpp
index 3f40086a9..c8e6f9515 100644
--- a/resources/kolab/pimkolab/conversion/kabcconversion.cpp
+++ b/resources/kolab/pimkolab/conversion/kabcconversion.cpp
@@ -438,7 +438,7 @@ KContacts::Addressee toKABC(const Kolab::Contact &contact)
KContacts::Addressee addressee;
addressee.setUid(fromStdString(contact.uid()));
addressee.setCategories(toStringList(contact.categories()));
- //addressee.setName(fromStdString(contact.name()));//This one is only for compatiblity (and results in a non-existing name property)
+ //addressee.setName(fromStdString(contact.name()));//This one is only for compatibility (and results in a non-existing name property)
addressee.setFormattedName(fromStdString(contact.name())); //This on corresponds to fn

const Kolab::NameComponents &nc = contact.nameComponents();
diff --git a/resources/kolab/pimkolab/kolabformat/errorhandler.h b/resources/kolab/pimkolab/kolabformat/errorhandler.h
index 7d026af46..3b27137d5 100644
--- a/resources/kolab/pimkolab/kolabformat/errorhandler.h
+++ b/resources/kolab/pimkolab/kolabformat/errorhandler.h
@@ -30,7 +30,7 @@ class DebugStream;
* Kolab Error Handler
*
* Errors are reported during an operation, but the operation might still succeed.
- * The error handler therefore contains all errors which occured during a single operation,
+ * The error handler therefore contains all errors which occurred during a single operation,
* and must be cleared at the start of a new operation.
*
* A user of the kolabobject classes should check ErrorHandler::error() after every operation.
diff --git a/resources/kolab/pimkolab/utils/kolabformatchecker.cpp b/resources/kolab/pimkolab/utils/kolabformatchecker.cpp
index cbc11aaa5..cace6e766 100644
--- a/resources/kolab/pimkolab/utils/kolabformatchecker.cpp
+++ b/resources/kolab/pimkolab/utils/kolabformatchecker.cpp
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
Kolab::KolabObjectReader reader(message);

if (Kolab::ErrorHandler::errorOccured()) {
- cout << "Errors occured during parsing." << endl;
+ cout << "Errors occurred during parsing." << endl;
returnValue = -1;
} else {
cout << "Parsed message without error." << endl;
diff --git a/resources/tomboynotes/o2/o0simplecrypt.h b/resources/tomboynotes/o2/o0simplecrypt.h
index 79955e05e..4fce48d24 100644
--- a/resources/tomboynotes/o2/o0simplecrypt.h
+++ b/resources/tomboynotes/o2/o0simplecrypt.h
@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

If you do not provide a key, or if something else is wrong, the encryption and
decryption function will return an empty string or will return a string containing nonsense.
- lastError() will return a value indicating if the method was succesful, and if not, why not.
+ lastError() will return a value indicating if the method was successful, and if not, why not.

SimpleCrypt is prepared for the case that the encryption and decryption
algorithm is changed in a later version, by prepending a version identifier to the cypertext.
@@ -79,7 +79,7 @@ public:
ProtectionHash /*!< A cryptographic hash is used to verify the integrity of the data. This method produces a much stronger, but longer check */
};
/**
- Error describes the type of error that occured.
+ Error describes the type of error that occurred.
*/
enum Error {
ErrorNoError, /*!< No error occurred. */
@@ -192,7 +192,7 @@ public:
Decrypts a cyphertext string encrypted with this class with the set key back to the
plain text version.

- If an error occured, such as non-matching keys between encryption and decryption,
+ If an error occurred, such as non-matching keys between encryption and decryption,
an empty string or a string containing nonsense may be returned.
*/
QString decryptToString(const QString &cyphertext);
@@ -200,7 +200,7 @@ public:
Decrypts a cyphertext string encrypted with this class with the set key back to the
plain text version.

- If an error occured, such as non-matching keys between encryption and decryption,
+ If an error occurred, such as non-matching keys between encryption and decryption,
an empty string or a string containing nonsense may be returned.
*/
QByteArray decryptToByteArray(const QString &cyphertext);
@@ -208,7 +208,7 @@ public:
Decrypts a cyphertext binary encrypted with this class with the set key back to the
plain text version.

- If an error occured, such as non-matching keys between encryption and decryption,
+ If an error occurred, such as non-matching keys between encryption and decryption,
an empty string or a string containing nonsense may be returned.
*/
QString decryptToString(const QByteArray &cypher);
@@ -216,7 +216,7 @@ public:
Decrypts a cyphertext binary encrypted with this class with the set key back to the
plain text version.

- If an error occured, such as non-matching keys between encryption and decryption,
+ If an error occurred, such as non-matching keys between encryption and decryption,
an empty string or a string containing nonsense may be returned.
*/
QByteArray decryptToByteArray(const QByteArray &cypher);
diff --git a/resources/tomboynotes/o2/o2.cpp b/resources/tomboynotes/o2/o2.cpp
index c4eb43183..c372c04fc 100644
--- a/resources/tomboynotes/o2/o2.cpp
+++ b/resources/tomboynotes/o2/o2.cpp
@@ -177,7 +177,7 @@ void O2::link()
// Save redirect URI, as we have to reuse it when requesting the access token
redirectUri_ = localhostPolicy_.arg(replyServer_->serverPort());

- // Assemble intial authentication URL
+ // Assemble initial authentication URL
QList<QPair<QString, QString> > parameters;
parameters.append(qMakePair(QString(O2_OAUTH2_RESPONSE_TYPE), (grantFlow_ == GrantFlowAuthorizationCode) ? QString(O2_OAUTH2_GRANT_TYPE_CODE) : QString(O2_OAUTH2_GRANT_TYPE_TOKEN)));
parameters.append(qMakePair(QString(O2_OAUTH2_CLIENT_ID), clientId_));
diff --git a/resources/tomboynotes/tomboycollectionsdownloadjob.cpp b/resources/tomboynotes/tomboycollectionsdownloadjob.cpp
index dbe91dd44..a917e0d96 100644
--- a/resources/tomboynotes/tomboycollectionsdownloadjob.cpp
+++ b/resources/tomboynotes/tomboycollectionsdownloadjob.cpp
@@ -39,7 +39,7 @@ Akonadi::Collection::List TomboyCollectionsDownloadJob::collections() const

void TomboyCollectionsDownloadJob::start()
{
- // Get user informations
+ // Get user information
QNetworkRequest request = QNetworkRequest(QUrl(mContentURL));
mReply = mRequestor->get(request, QList<O0RequestParameter>());

diff --git a/resources/tomboynotes/tomboyitemdownloadjob.cpp b/resources/tomboynotes/tomboyitemdownloadjob.cpp
index 9377e5be9..b5f554eee 100644
--- a/resources/tomboynotes/tomboyitemdownloadjob.cpp
+++ b/resources/tomboynotes/tomboyitemdownloadjob.cpp
@@ -53,7 +53,7 @@ void TomboyItemDownloadJob::onRequestFinished()
emitResult();
return;
}
- qCDebug(TOMBOYNOTESRESOURCE_LOG) << "TomboyItemDownloadJob: Network request finished. No error occured";
+ qCDebug(TOMBOYNOTESRESOURCE_LOG) << "TomboyItemDownloadJob: Network request finished. No error occurred";

// Parse received data as JSON
const QJsonDocument document = QJsonDocument::fromJson(mReply->readAll(), nullptr);
diff --git a/resources/tomboynotes/tomboyitemuploadjob.cpp b/resources/tomboynotes/tomboyitemuploadjob.cpp
index 29f0bffd2..459fc4157 100644
--- a/resources/tomboynotes/tomboyitemuploadjob.cpp
+++ b/resources/tomboynotes/tomboyitemuploadjob.cpp
@@ -99,7 +99,7 @@ void TomboyItemUploadJob::onRequestFinished()
emitResult();
return;
}
- qCDebug(TOMBOYNOTESRESOURCE_LOG) << "TomboyItemUploadJob: Network request finished. No error occured";
+ qCDebug(TOMBOYNOTESRESOURCE_LOG) << "TomboyItemUploadJob: Network request finished. No error occurred";

// Parse received data as JSON
const QJsonDocument document = QJsonDocument::fromJson(mReply->readAll(), nullptr);

[Yuri Chornoivan]

Git commit 4c733239573bb6cab0f9907911e6e59e0413d31b by Yuri Chornoivan.
Committed on 19/08/2018 at 18:14.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +7 -9 kioslaves/videodvd/videodvd.cpp
M +4 -1 kioslaves/videodvd/videodvd.h
M +1 -1 kioslaves/videodvd/videodvd_i18n.h
M +5 -6 libk3b/core/k3bcore.cpp
M +2 -2 libk3b/core/k3bcore.h
M +6 -6 libk3b/core/k3bdefaultexternalprograms.cpp
M +6 -6 libk3b/core/k3bexternalbinmanager.cpp
M +5 -5 libk3b/core/k3bexternalbinmanager.h
M +6 -6 libk3b/core/k3bglobals.cpp
M +4 -4 libk3b/core/k3bglobals.h
M +1 -1 libk3b/core/k3bglobalsettings.cpp
M +1 -1 libk3b/core/k3bglobalsettings.h
M +3 -3 libk3b/core/k3bjob.cpp
M +2 -2 libk3b/core/k3bjob.h
M +1 -1 libk3b/core/k3bkjobbridge.h
M +2 -2 libk3b/core/k3bprogressinfoevent.h
M +1 -1 libk3b/core/k3bsimplejobhandler.h
M +3 -3 libk3b/core/k3bthread.cpp
M +1 -1 libk3b/core/k3bthread.h
M +4 -4 libk3b/core/k3bthreadjob.cpp
M +1 -1 libk3b/core/k3bthreadjobcommunicationevent.cpp
M +3 -3 libk3b/core/k3bthreadjobcommunicationevent.h
M +3 -3 libk3b/core/k3bversion.cpp
M +2 -2 libk3b/core/k3bversion.h
M +1 -1 libk3b/jobs/k3baudiocuefilewritingjob.cpp
M +1 -1 libk3b/jobs/k3baudiosessionreadingjob.cpp
M +1 -1 libk3b/jobs/k3baudiosessionreadingjob.h
M +3 -3 libk3b/jobs/k3bbinimagewritingjob.cpp
M +2 -2 libk3b/jobs/k3bblankingjob.cpp
M +10 -10 libk3b/jobs/k3bcdcopyjob.cpp
M +3 -3 libk3b/jobs/k3bcdda2wavreader.cpp
M +1 -1 libk3b/jobs/k3bcdda2wavreader.h
M +3 -3 libk3b/jobs/k3bclonejob.cpp
M +1 -1 libk3b/jobs/k3bclonejob.h
M +4 -4 libk3b/jobs/k3bclonetocreader.cpp
M +2 -2 libk3b/jobs/k3bdatatrackreader.cpp
M +2 -2 libk3b/jobs/k3bdvdbooktypejob.cpp
M +1 -1 libk3b/jobs/k3bdvdbooktypejob.h
M +4 -4 libk3b/jobs/k3bdvdcopyjob.cpp
M +1 -1 libk3b/jobs/k3bdvdcopyjob.h
M +2 -2 libk3b/jobs/k3bdvdformattingjob.cpp
M +1 -1 libk3b/jobs/k3bdvdformattingjob.h
M +3 -3 libk3b/jobs/k3biso9660imagewritingjob.cpp
M +1 -1 libk3b/jobs/k3bmetawriter.cpp
M +5 -5 libk3b/jobs/k3breadcdreader.cpp
M +1 -1 libk3b/jobs/k3breadcdreader.h
M +2 -2 libk3b/jobs/k3bverificationjob.cpp
M +1 -1 libk3b/jobs/k3bverificationjob.h
M +1 -1 libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
M +1 -1 libk3b/jobs/k3bvideodvdtitledetectclippingjob.h
M +4 -4 libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
M +1 -1 libk3b/jobs/k3bvideodvdtitletranscodingjob.h
M +1 -1 libk3b/k3b_i18n.h
M +1 -1 libk3b/k3bimage.xsd
M +4 -4 libk3b/plugin/k3baudiodecoder.cpp
M +2 -2 libk3b/plugin/k3baudiodecoder.h
M +2 -2 libk3b/plugin/k3baudioencoder.cpp
M +1 -1 libk3b/plugin/k3baudioencoder.h
M +1 -1 libk3b/plugin/k3bplugin.h
M +9 -9 libk3b/plugin/k3bpluginmanager.cpp
M +3 -3 libk3b/plugin/k3bpluginmanager.h
M +2 -2 libk3b/plugin/k3bprojectplugin.h
M +2 -2 libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiocdtrackreader.cpp
M +2 -2 libk3b/projects/audiocd/k3baudiocdtrackreader.h
M +1 -1 libk3b/projects/audiocd/k3baudiocdtracksource.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiocdtracksource.h
M +3 -3 libk3b/projects/audiocd/k3baudiodatasource.h
M +8 -8 libk3b/projects/audiocd/k3baudiodoc.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiodoc.h
M +3 -3 libk3b/projects/audiocd/k3baudiodocreader.cpp
M +2 -2 libk3b/projects/audiocd/k3baudiodocreader.h
M +1 -1 libk3b/projects/audiocd/k3baudiofile.h
M +2 -2 libk3b/projects/audiocd/k3baudiofilereader.h
M +3 -3 libk3b/projects/audiocd/k3baudioimager.cpp
M +2 -2 libk3b/projects/audiocd/k3baudiojob.cpp
M +2 -2 libk3b/projects/audiocd/k3baudiojobtempdata.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiojobtempdata.h
M +4 -4 libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp
M +1 -1 libk3b/projects/audiocd/k3baudionormalizejob.cpp
M +2 -2 libk3b/projects/audiocd/k3baudionormalizejob.h
M +2 -2 libk3b/projects/audiocd/k3baudiotrack.cpp
M +3 -3 libk3b/projects/audiocd/k3baudiotrack.h
M +3 -3 libk3b/projects/audiocd/k3baudiotrackreader.cpp
M +2 -2 libk3b/projects/audiocd/k3baudiotrackreader.h
M +2 -2 libk3b/projects/audiocd/k3baudiozerodatareader.h
M +1 -1 libk3b/projects/audiocd/k3brawaudiodatareader.cpp
M +2 -2 libk3b/projects/audiocd/k3brawaudiodatareader.h
M +1 -1 libk3b/projects/audiocd/k3brawaudiodatasource.cpp
M +8 -8 libk3b/projects/datacd/k3bdatadoc.cpp
M +1 -1 libk3b/projects/datacd/k3bdatadoc.h
M +1 -1 libk3b/projects/datacd/k3bdataitem.cpp
M +2 -2 libk3b/projects/datacd/k3bdataitem.h
M +7 -7 libk3b/projects/datacd/k3bdatajob.cpp
M +1 -1 libk3b/projects/datacd/k3bdatajob.h
M +3 -3 libk3b/projects/datacd/k3bdatapreparationjob.cpp
M +3 -3 libk3b/projects/datacd/k3bdiritem.cpp
M +2 -2 libk3b/projects/datacd/k3bdiritem.h
M +5 -5 libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
M +8 -8 libk3b/projects/datacd/k3bfileitem.cpp
M +1 -1 libk3b/projects/datacd/k3bfileitem.h
M +7 -7 libk3b/projects/datacd/k3bisoimager.cpp
M +1 -1 libk3b/projects/datacd/k3bisoimager.h
M +1 -1 libk3b/projects/datacd/k3bisooptions.cpp
M +1 -1 libk3b/projects/datacd/k3bisooptions.h
M +1 -1 libk3b/projects/datacd/k3bmkisofshandler.cpp
M +1 -1 libk3b/projects/datacd/k3bmkisofshandler.h
M +2 -2 libk3b/projects/datacd/k3bmsinfofetcher.cpp
M +1 -1 libk3b/projects/k3babstractwriter.h
M +9 -9 libk3b/projects/k3bcdrdaowriter.cpp
M +1 -1 libk3b/projects/k3bcdrdaowriter.h
M +6 -6 libk3b/projects/k3bcdrecordwriter.cpp
M +2 -2 libk3b/projects/k3bcdrecordwriter.h
M +5 -5 libk3b/projects/k3bcuefileparser.cpp
M +4 -4 libk3b/projects/k3bdoc.cpp
M +3 -3 libk3b/projects/k3bdoc.h
M +3 -3 libk3b/projects/k3bgrowisofshandler.cpp
M +1 -1 libk3b/projects/k3bgrowisofshandler.h
M +3 -3 libk3b/projects/k3bgrowisofswriter.cpp
M +1 -1 libk3b/projects/k3bgrowisofswriter.h
M +2 -2 libk3b/projects/k3bimagefilereader.cpp
M +1 -1 libk3b/projects/k3bimagefilereader.h
M +2 -2 libk3b/projects/k3binffilewriter.cpp
M +2 -2 libk3b/projects/k3btocfilewriter.cpp
M +2 -2 libk3b/projects/k3btocfilewriter.h
M +2 -2 libk3b/projects/mixedcd/k3bmixeddoc.cpp
M +4 -4 libk3b/projects/mixedcd/k3bmixedjob.cpp
M +4 -4 libk3b/projects/movixcd/k3bmovixdoc.cpp
M +1 -1 libk3b/projects/movixcd/k3bmovixdoc.h
M +5 -5 libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
M +1 -1 libk3b/projects/movixcd/k3bmovixjob.cpp
M +4 -4 libk3b/projects/movixcd/k3bmovixprogram.cpp
M +7 -7 libk3b/projects/videocd/k3bvcddoc.cpp
M +2 -2 libk3b/projects/videocd/k3bvcddoc.h
M +9 -9 libk3b/projects/videocd/k3bvcdjob.cpp
M +1 -1 libk3b/projects/videocd/k3bvcdjob.h
M +3 -3 libk3b/projects/videocd/k3bvcdoptions.cpp
M +1 -1 libk3b/projects/videocd/k3bvcdoptions.h
M +3 -3 libk3b/projects/videocd/k3bvcdtrack.cpp
M +3 -3 libk3b/projects/videocd/k3bvcdtrack.h
M +6 -6 libk3b/projects/videocd/k3bvcdxmlview.cpp
M +1 -1 libk3b/projects/videocd/k3bvcdxmlview.h
M +1 -1 libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
M +6 -6 libk3b/projects/videodvd/k3bvideodvdimager.cpp
M +1 -1 libk3b/projects/videodvd/k3bvideodvdimager.h
M +3 -3 libk3b/tools/k3bactivepipe.cpp
M +1 -1 libk3b/tools/k3bactivepipe.h
M +3 -3 libk3b/tools/k3bbusywidget.cpp
M +1 -1 libk3b/tools/k3bbusywidget.h
M +6 -6 libk3b/tools/k3bcddb.cpp
M +6 -6 libk3b/tools/k3bcdparanoialib.cpp
M +1 -1 libk3b/tools/k3bcdparanoialib.h
M +2 -2 libk3b/tools/k3bchecksumpipe.cpp
M +8 -8 libk3b/tools/k3bcutcombobox.cpp
M +2 -2 libk3b/tools/k3bcutcombobox.h
M +1 -1 libk3b/tools/k3bdevicecombobox.cpp
M +1 -1 libk3b/tools/k3bdevicecombobox.h
M +1 -1 libk3b/tools/k3bdevicemodel.h
M +6 -6 libk3b/tools/k3bdeviceselectiondialog.cpp
M +2 -2 libk3b/tools/k3bdeviceselectiondialog.h
M +3 -3 libk3b/tools/k3bdirsizejob.cpp
M +1 -1 libk3b/tools/k3bdirsizejob.h
M +3 -3 libk3b/tools/k3bfilesplitter.cpp
M +4 -4 libk3b/tools/k3bfilesplitter.h
M +4 -4 libk3b/tools/k3bfilesysteminfo.cpp
M +1 -1 libk3b/tools/k3bfilesysteminfo.h
M +3 -3 libk3b/tools/k3bintmapcombobox.cpp
M +1 -1 libk3b/tools/k3bintmapcombobox.h
M +3 -3 libk3b/tools/k3bintvalidator.cpp
M +2 -2 libk3b/tools/k3bintvalidator.h
M +3 -3 libk3b/tools/k3biso9660.cpp
M +4 -4 libk3b/tools/k3biso9660.h
M +1 -1 libk3b/tools/k3biso9660backend.cpp
M +1 -1 libk3b/tools/k3biso9660backend.h
M +4 -4 libk3b/tools/k3blibdvdcss.cpp
M +4 -4 libk3b/tools/k3bmd5job.cpp
M +2 -2 libk3b/tools/k3bmd5job.h
M +4 -4 libk3b/tools/k3bmediacache.cpp
M +3 -3 libk3b/tools/k3bmediacache.h
M +3 -3 libk3b/tools/k3bmedium.cpp
M +3 -3 libk3b/tools/k3bmedium.h
M +2 -2 libk3b/tools/k3bmedium_p.h
M +6 -6 libk3b/tools/k3bmsfedit.cpp
M +1 -1 libk3b/tools/k3bmsfedit.h
M +8 -8 libk3b/tools/k3bmultichoicedialog.cpp
M +2 -2 libk3b/tools/k3bmultichoicedialog.h
M +3 -3 libk3b/tools/k3bprocess.cpp
M +1 -1 libk3b/tools/k3bprocess.h
M +1 -1 libk3b/tools/k3bsignalwaiter.cpp
M +1 -1 libk3b/tools/k3bsignalwaiter.h
M +5 -5 libk3b/tools/k3bstdguiitems.cpp
M +4 -4 libk3b/tools/k3bthreadwidget.cpp
M +2 -2 libk3b/tools/k3bthreadwidget.h
M +2 -2 libk3b/tools/k3bthroughputestimator.cpp
M +1 -1 libk3b/tools/k3bthroughputestimator.h
M +8 -8 libk3b/tools/k3btitlelabel.cpp
M +2 -2 libk3b/tools/k3btitlelabel.h
M +1 -1 libk3b/tools/k3bvalidators.h
M +1 -1 libk3b/tools/k3bwavefilewriter.cpp
M +3 -3 libk3b/tools/k3bwavefilewriter.h
M +2 -2 libk3b/tools/qprocess/k3bkprocess.cpp
M +4 -4 libk3b/tools/qprocess/k3bqprocess.cpp
M +3 -3 libk3b/tools/qprocess/k3bqprocess.h
M +1 -1 libk3b/tools/qprocess/k3bqprocess_p.h
M +8 -8 libk3b/tools/qprocess/k3bqprocess_unix.cpp
M +7 -7 libk3b/tools/qprocess/k3bqprocess_win.cpp
M +1 -1 libk3b/tools/qprocess/private/qfsfileengine.h
M +2 -2 libk3b/tools/qprocess/private/qfsfileengine_iterator_win.cpp
M +1 -1 libk3b/tools/qprocess/private/qfsfileengine_p.h
M +4 -4 libk3b/tools/qprocess/private/qwindowspipewriter_p.h
M +2 -2 libk3b/tools/qprocess/qringbuffer_p.h
M +1 -1 libk3b/videodvd/k3bvideodvd.cpp
M +2 -2 libk3b/videodvd/k3bvideodvd.h
M +1 -1 libk3b/videodvd/k3bvideodvdaudiostream.h
M +1 -1 libk3b/videodvd/k3bvideodvdsubpicturestream.h
M +1 -1 libk3b/videodvd/k3bvideodvdtime.h
M +1 -1 libk3b/videodvd/k3bvideodvdtitle.h
M +3 -3 libk3bdevice/k3bcdtext.cpp
M +2 -2 libk3bdevice/k3bcdtext.h
M +1 -1 libk3bdevice/k3bcrc.cpp
M +6 -6 libk3bdevice/k3bdevice.cpp
M +2 -2 libk3bdevice/k3bdevice.h
M +1 -1 libk3bdevice/k3bdevice_i18n.h
M +1 -1 libk3bdevice/k3bdevice_mmc.cpp
M +2 -2 libk3bdevice/k3bdeviceglobals.cpp
M +1 -1 libk3bdevice/k3bdeviceglobals.h
M +7 -7 libk3bdevice/k3bdevicemanager.cpp
M +3 -3 libk3bdevice/k3bdevicemanager.h
M +1 -1 libk3bdevice/k3bdevicetypes.h
M +2 -2 libk3bdevice/k3bdiskinfo.cpp
M +1 -1 libk3bdevice/k3bdiskinfo.h
M +2 -2 libk3bdevice/k3bdiskinfo_p.h
M +3 -3 libk3bdevice/k3bhalconnection.cpp
M +3 -3 libk3bdevice/k3bhalconnection.h
M +3 -3 libk3bdevice/k3bmsf.cpp
M +2 -2 libk3bdevice/k3bmsf.h
M +1 -1 libk3bdevice/k3bscsicommand.cpp
M +1 -1 libk3bdevice/k3bscsicommand.h
M +1 -1 libk3bdevice/k3bscsicommand_bsd.cpp
M +1 -1 libk3bdevice/k3bscsicommand_linux.cpp
M +1 -1 libk3bdevice/k3bscsicommand_netbsd.cpp
M +2 -2 libk3bdevice/k3btoc.cpp
M +1 -1 libk3bdevice/k3btoc.h
M +1 -1 libk3bdevice/k3btrack.cpp
M +1 -1 libk3bdevice/k3btrack.h
M +1 -1 plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
M +4 -4 plugins/decoder/flac/k3bflacdecoder.cpp
M +3 -3 plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
M +2 -2 plugins/decoder/mp3/k3bmad.cpp
M +1 -1 plugins/decoder/mp3/k3bmad.h
M +4 -4 plugins/decoder/mp3/k3bmaddecoder.cpp
M +2 -2 plugins/decoder/musepack/k3bmpcwrapper.cpp
M +1 -1 plugins/decoder/musepack/k3bmpcwrapper.h
M +3 -3 plugins/decoder/ogg/k3boggvorbisdecoder.cpp
M +2 -2 plugins/decoder/wave/k3bwavedecoder.cpp
M +1 -1 plugins/decoder/wave/k3bwavedecoder.h
M +5 -5 plugins/encoder/external/k3bexternalencoder.cpp
M +2 -2 plugins/encoder/external/k3bexternalencodercommand.cpp
M +2 -2 plugins/encoder/external/k3bexternalencodercommand.h
M +4 -4 plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
M +2 -2 plugins/encoder/external/k3bexternalencoderconfigwidget.h
M +2 -2 plugins/encoder/lame/k3blameencoder.cpp
M +8 -8 plugins/encoder/lame/k3blameencoderconfigwidget.cpp
M +1 -1 plugins/encoder/lame/k3blameencoderdefaults.h
M +1 -1 plugins/encoder/lame/k3blamemanualsettingsdialog.h
M +1 -1 plugins/encoder/ogg/k3boggvorbisencoder.cpp
M +8 -8 plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.cpp
M +1 -1 plugins/encoder/skeleton.cpp
M +3 -3 plugins/encoder/sox/k3bsoxencoder.cpp
M +1 -1 plugins/k3bplugin_i18n.h
M +19 -19 plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
M +1 -1 plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h
M +3 -3 plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
M +2 -2 plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h
M +4 -4 src/helper/k3bhelper.cpp
M +1 -1 src/helper/k3bhelper.h
M +1 -1 src/helper/k3bhelperprogramitem.cpp
M +2 -2 src/helper/k3bhelperprogramitem.h
M +19 -19 src/k3b.cpp
M +2 -2 src/k3b.h
M +3 -3 src/k3baction.h
M +3 -3 src/k3bappdevicemanager.cpp
M +3 -3 src/k3bapplication.cpp
M +3 -3 src/k3bapplication.h
M +5 -5 src/k3bburnprogressdialog.cpp
M +2 -2 src/k3bcontentsview.cpp
M +1 -1 src/k3bcontentsview.h
M +2 -2 src/k3bdatamodewidget.cpp
M +1 -1 src/k3bdatamodewidget.h
M +1 -1 src/k3bdataprojectinterface.cpp
M +1 -1 src/k3bdataprojectinterface.h
M +1 -1 src/k3bdebuggingoutputcache.cpp
M +2 -2 src/k3bdebuggingoutputcache.h
M +12 -12 src/k3bdebuggingoutputdialog.cpp
M +2 -2 src/k3bdebuggingoutputdialog.h
M +3 -3 src/k3bdebuggingoutputfile.cpp
M +2 -2 src/k3bdebuggingoutputfile.h
M +3 -3 src/k3bdevicedelegate.cpp
M +3 -3 src/k3bdevicemenu.cpp
M +1 -1 src/k3bdevicemenu.h
M +4 -4 src/k3bdiroperator.cpp
M +1 -1 src/k3bdiroperator.h
M +7 -7 src/k3bdirview.cpp
M +1 -1 src/k3bdirview.h
M +12 -12 src/k3bdiskinfoview.cpp
M +13 -13 src/k3bemptydiscwaiter.cpp
M +2 -2 src/k3bemptydiscwaiter.h
M +3 -3 src/k3bfiletreeview.cpp
M +2 -2 src/k3bfiletreeview.h
M +13 -13 src/k3bfileview.cpp
M +7 -7 src/k3bflatbutton.cpp
M +2 -2 src/k3bflatbutton.h
M +19 -19 src/k3binteractiondialog.cpp
M +4 -4 src/k3binteractiondialog.h
M +3 -3 src/k3binterface.cpp
M +3 -3 src/k3binterface.h
M +2 -2 src/k3bjobinterface.cpp
M +1 -1 src/k3bjobinterface.h
M +18 -18 src/k3bjobprogressdialog.cpp
M +2 -2 src/k3bjobprogressdialog.h
M +3 -3 src/k3blsofwrapper.cpp
M +2 -2 src/k3blsofwrapper.h
M +7 -7 src/k3blsofwrapperdialog.cpp
M +1 -1 src/k3blsofwrapperdialog.h
M +2 -2 src/k3bmediacontentsview.cpp
M +7 -7 src/k3bmediaselectioncombobox.cpp
M +1 -1 src/k3bmediaselectioncombobox.h
M +5 -5 src/k3bmediaselectiondialog.cpp
M +1 -1 src/k3bmediaselectiondialog.h
M +5 -5 src/k3bmediumdelegate.cpp
M +1 -1 src/k3bmediumdelegate.h
M +4 -4 src/k3bmetaitemmodel.cpp
M +2 -2 src/k3bmetaitemmodel.h
M +1 -1 src/k3bmodelutils.cpp
M +1 -1 src/k3bmodelutils.h
M +2 -2 src/k3bmusicbrainz.cpp
M +2 -2 src/k3bmusicbrainz.h
M +1 -1 src/k3bplacesmodel.cpp
M +1 -1 src/k3bplacesmodel.h
M +2 -2 src/k3bprojectinterface.cpp
M +3 -3 src/k3bprojectinterface.h
M +14 -14 src/k3bprojectmanager.cpp
M +2 -2 src/k3bprojectmanager.h
M +12 -12 src/k3bprojecttabwidget.cpp
M +1 -1 src/k3bprojecttabwidget.h
M +9 -9 src/k3bsplash.cpp
M +1 -1 src/k3bsplash.h
M +9 -9 src/k3bstatusbarmanager.cpp
M +1 -1 src/k3bstatusbarmanager.h
M +11 -11 src/k3bsystemproblemdialog.cpp
M +3 -3 src/k3bsystemproblemdialog.h
M +7 -7 src/k3btempdirselectionwidget.cpp
M +2 -2 src/k3btempdirselectionwidget.h
M +3 -3 src/k3bthemedheader.cpp
M +1 -1 src/k3bthemedheader.h
M +7 -7 src/k3bthememanager.cpp
M +5 -5 src/k3bthememanager.h
M +4 -4 src/k3btimeoutwidget.cpp
M +1 -1 src/k3btimeoutwidget.h
M +2 -2 src/k3btrm.cpp
M +1 -1 src/k3btrm.h
M +1 -1 src/k3burlnavigator.cpp
M +1 -1 src/k3burlnavigator.h
M +8 -8 src/k3bviewcolumnadjuster.cpp
M +2 -2 src/k3bviewcolumnadjuster.h
M +15 -15 src/k3bwelcomewidget.cpp
M +5 -5 src/k3bwelcomewidget.h
M +3 -3 src/k3bwidgetshoweffect.cpp
M +2 -2 src/k3bwidgetshoweffect.h
M +10 -10 src/k3bwriterselectionwidget.cpp
M +2 -2 src/k3bwriterselectionwidget.h
M +2 -2 src/k3bwritingmodewidget.cpp
M +2 -2 src/main.cpp
M +28 -28 src/misc/k3bimagewritingdialog.cpp
M +17 -17 src/misc/k3bmediacopydialog.cpp
M +8 -8 src/misc/k3bmediaformattingdialog.cpp
M +12 -12 src/option/k3badvancedoptiontab.cpp
M +1 -1 src/option/k3badvancedoptiontab.h
M +3 -3 src/option/k3bcddboptiontab.cpp
M +1 -1 src/option/k3bcddboptiontab.h
M +4 -4 src/option/k3bdeviceoptiontab.cpp
M +1 -1 src/option/k3bdeviceoptiontab.h
M +17 -17 src/option/k3bdevicewidget.cpp
M +1 -1 src/option/k3bdevicewidget.h
M +6 -6 src/option/k3bexternalbinmodel.cpp
M +1 -1 src/option/k3bexternalbinmodel.h
M +4 -4 src/option/k3bexternalbinoptiontab.cpp
M +1 -1 src/option/k3bexternalbinoptiontab.h
M +5 -5 src/option/k3bexternalbinparamsmodel.cpp
M +1 -1 src/option/k3bexternalbinparamsmodel.h
M +6 -6 src/option/k3bexternalbinpermissionmodel.cpp
M +3 -3 src/option/k3bexternalbinpermissionmodel.h
M +16 -16 src/option/k3bexternalbinwidget.cpp
M +1 -1 src/option/k3bexternalbinwidget.h
M +5 -5 src/option/k3bmiscoptiontab.cpp
M +2 -2 src/option/k3bnotifyoptiontab.cpp
M +1 -1 src/option/k3bnotifyoptiontab.h
M +10 -10 src/option/k3boptiondialog.cpp
M +1 -1 src/option/k3boptiondialog.h
M +6 -6 src/option/k3bpluginoptiontab.cpp
M +3 -3 src/option/k3bthememodel.cpp
M +1 -1 src/option/k3bthememodel.h
M +8 -8 src/option/k3bthemeoptiontab.cpp
M +18 -18 src/projects/k3baudioburndialog.cpp
M +4 -4 src/projects/k3baudioburndialog.h
M +8 -8 src/projects/k3baudiocdtextwidget.cpp
M +5 -5 src/projects/k3baudiodatasourceeditwidget.cpp
M +1 -1 src/projects/k3baudiodatasourceeditwidget.h
M +12 -12 src/projects/k3baudioeditorwidget.cpp
M +3 -3 src/projects/k3baudioeditorwidget.h
M +3 -3 src/projects/k3baudioprojectdelegate.cpp
M +1 -1 src/projects/k3baudioprojectdelegate.h
M +4 -4 src/projects/k3baudioprojectmodel.cpp
M +1 -1 src/projects/k3baudioprojectmodel.h
M +9 -9 src/projects/k3baudiotrackaddingdialog.cpp
M +3 -3 src/projects/k3baudiotrackaddingdialog.h
M +7 -7 src/projects/k3baudiotrackdialog.cpp
M +2 -2 src/projects/k3baudiotrackdialog.h
M +8 -8 src/projects/k3baudiotrackplayer.cpp
M +2 -2 src/projects/k3baudiotrackplayer.h
M +10 -10 src/projects/k3baudiotracksplitdialog.cpp
M +2 -2 src/projects/k3baudiotracksplitdialog.h
M +10 -10 src/projects/k3baudiotracktrmlookupdialog.cpp
M +3 -3 src/projects/k3baudiotracktrmlookupdialog.h
M +6 -6 src/projects/k3baudiotrackwidget.cpp
M +1 -1 src/projects/k3baudiotrackwidget.h
M +7 -7 src/projects/k3baudioview.cpp
M +1 -1 src/projects/k3baudioview.h
M +7 -7 src/projects/k3baudioviewimpl.cpp
M +4 -4 src/projects/k3baudioviewimpl.h
M +9 -9 src/projects/k3bbootimagedialog.cpp
M +1 -1 src/projects/k3bbootimagemodel.cpp
M +1 -1 src/projects/k3bbootimagemodel.h
M +5 -5 src/projects/k3bdataadvancedimagesettingsdialog.cpp
M +17 -17 src/projects/k3bdataburndialog.cpp
M +4 -4 src/projects/k3bdatadirtreeview.cpp
M +2 -2 src/projects/k3bdatadirtreeview.h
M +8 -8 src/projects/k3bdataimagesettingswidget.cpp
M +1 -1 src/projects/k3bdataimagesettingswidget.h
M +2 -2 src/projects/k3bdatamultisessioncombobox.cpp
M +1 -1 src/projects/k3bdatamultisessioncombobox.h
M +10 -10 src/projects/k3bdatamultisessionimportdialog.cpp
M +1 -1 src/projects/k3bdatamultisessionimportdialog.h
M +3 -3 src/projects/k3bdataprojectdelegate.cpp
M +2 -2 src/projects/k3bdataprojectdelegate.h
M +4 -4 src/projects/k3bdataprojectmodel.cpp
M +2 -2 src/projects/k3bdataprojectmodel.h
M +1 -1 src/projects/k3bdataprojectsortproxymodel.h
M +12 -12 src/projects/k3bdatapropertiesdialog.cpp
M +2 -2 src/projects/k3bdatapropertiesdialog.h
M +11 -11 src/projects/k3bdataurladdingdialog.cpp
M +8 -8 src/projects/k3bdataurladdingdialog.h
M +7 -7 src/projects/k3bdataview.cpp
M +8 -8 src/projects/k3bdataviewimpl.cpp
M +3 -3 src/projects/k3bdataviewimpl.h
M +6 -6 src/projects/k3bdatavolumedescdialog.cpp
M +1 -1 src/projects/k3bdirproxymodel.h
M +1 -1 src/projects/k3bencodingconverter.cpp
M +1 -1 src/projects/k3bencodingconverter.h
M +24 -24 src/projects/k3bfillstatusdisplay.cpp
M +3 -3 src/projects/k3bfillstatusdisplay.h
M +14 -14 src/projects/k3bmixedburndialog.cpp
M +6 -6 src/projects/k3bmixedview.cpp
M +1 -1 src/projects/k3bmixedview.h
M +7 -7 src/projects/k3bmovixburndialog.cpp
M +9 -9 src/projects/k3bmovixoptionswidget.cpp
M +5 -5 src/projects/k3bmovixprojectmodel.cpp
M +1 -1 src/projects/k3bmovixprojectmodel.h
M +9 -9 src/projects/k3bmovixview.cpp
M +2 -2 src/projects/k3bmusicbrainzjob.cpp
M +1 -1 src/projects/k3bmusicbrainztrackloopupjob.cpp
M +15 -15 src/projects/k3bprojectburndialog.cpp
M +1 -1 src/projects/k3bprojectburndialog.h
M +1 -1 src/projects/k3bprojectplugindialog.cpp
M +18 -18 src/projects/k3bvcdburndialog.cpp
M +4 -4 src/projects/k3bvcdprojectmodel.cpp
M +1 -1 src/projects/k3bvcdprojectmodel.h
M +20 -20 src/projects/k3bvcdtrackdialog.cpp
M +2 -2 src/projects/k3bvcdtrackdialog.h
M +1 -1 src/projects/k3bvcdtrackkeysdelegate.cpp
M +2 -2 src/projects/k3bvcdtrackkeysdelegate.h
M +2 -2 src/projects/k3bvcdtrackkeysmodel.cpp
M +2 -2 src/projects/k3bvcdtrackkeysmodel.h
M +8 -8 src/projects/k3bvcdview.cpp
M +1 -1 src/projects/k3bvcdview.h
M +6 -6 src/projects/k3bvideodvdburndialog.cpp
M +2 -2 src/projects/k3bvideodvdview.cpp
M +5 -5 src/projects/k3bview.cpp
M +4 -4 src/projects/k3bview.h
M +4 -4 src/projects/k3bvolumenamewidget.cpp
M +1 -1 src/projects/k3bvolumenamewidget.h
M +10 -10 src/projects/kostore/KoStore.cpp
M +4 -4 src/projects/kostore/KoStore.h
M +1 -1 src/projects/kostore/KoStoreBase.h
M +4 -4 src/projects/kostore/KoZipStore.cpp
M +1 -1 src/rip/categories.cpp
M +2 -2 src/rip/categories.h
M +16 -16 src/rip/k3baudiocdview.cpp
M +8 -8 src/rip/k3baudioconvertingoptionwidget.cpp
M +1 -1 src/rip/k3baudioconvertingoptionwidget.h
M +11 -11 src/rip/k3baudioprojectconvertingdialog.cpp
M +1 -1 src/rip/k3baudioprojectconvertingdialog.h
M +1 -1 src/rip/k3baudioprojectconvertingjob.cpp
M +1 -1 src/rip/k3baudioprojectconvertingjob.h
M +1 -1 src/rip/k3baudioripjob.cpp
M +1 -1 src/rip/k3baudioripjob.h
M +23 -23 src/rip/k3baudiorippingdialog.cpp
M +2 -2 src/rip/k3baudiorippingdialog.h
M +3 -3 src/rip/k3baudiotrackmodel.cpp
M +1 -1 src/rip/k3baudiotrackmodel.h
M +8 -8 src/rip/k3bcddbpatternwidget.cpp
M +2 -2 src/rip/k3bcuefilewriter.cpp
M +1 -1 src/rip/k3bcuefilewriter.h
M +6 -6 src/rip/k3bmassaudioencodingjob.cpp
M +5 -5 src/rip/k3bmassaudioencodingjob.h
M +5 -5 src/rip/k3bpatternparser.cpp
M +1 -1 src/rip/k3bpatternparser.h
M +4 -4 src/rip/k3bvideocdinfo.cpp
M +4 -4 src/rip/k3bvideocdinfo.h
M +12 -12 src/rip/k3bvideocdrip.cpp
M +1 -1 src/rip/k3bvideocdrip.h
M +13 -13 src/rip/k3bvideocdrippingdialog.cpp
M +2 -2 src/rip/k3bvideocdrippingoptions.h
M +15 -15 src/rip/k3bvideocdview.cpp
M +4 -4 src/rip/videodvd/k3bvideodvdaudiomodel.cpp
M +2 -2 src/rip/videodvd/k3bvideodvdaudiomodel.h
M +12 -12 src/rip/videodvd/k3bvideodvdrippingdialog.cpp
M +2 -2 src/rip/videodvd/k3bvideodvdrippingjob.cpp
M +1 -1 src/rip/videodvd/k3bvideodvdrippingjob.h
M +3 -3 src/rip/videodvd/k3bvideodvdrippingpreview.cpp
M +4 -4 src/rip/videodvd/k3bvideodvdrippingpreview.h
M +13 -13 src/rip/videodvd/k3bvideodvdrippingview.cpp
M +11 -11 src/rip/videodvd/k3bvideodvdrippingwidget.cpp
M +7 -7 src/rip/videodvd/k3bvideodvdtitledelegate.cpp
M +1 -1 src/rip/videodvd/k3bvideodvdtitledelegate.h
M +8 -8 src/rip/videodvd/k3bvideodvdtitlemodel.cpp
M +1 -1 src/rip/videodvd/k3bvideodvdtitlemodel.h
M +2 -2 tests/k3bdataprojectmodeltest.h
M +1 -1 tests/k3bdeviceglobalstest.h
M +1 -1 tests/k3bglobalstest.h
M +5 -5 tests/k3bmetaitemmodeltest.cpp
M +2 -2 tests/k3bmetaitemmodeltest.h
M +1 -1 tests/k3bmodelutilstest.cpp
M +1 -1 tests/k3bmodelutilstest.h
M +1 -1 tests/k3btestutils.cpp

https://commits.kde.org/k3b/4c733239573bb6cab0f9907911e6e59e0413d31b

[Yuri Chornoivan]

Git commit b2348889155a61a5ff40e119f06e42e1c6ce422d by Yuri Chornoivan.
Committed on 20/08/2018 at 05:37.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +0 -1 libk3b/projects/datacd/k3bdatajob.cpp
M +1 -1 libk3b/projects/k3bcdrskinwriter.cpp
M +1 -1 libk3b/projects/videodvd/k3bvideodvdimager.cpp
M +1 -1 src/helper/k3bhelper.cpp
M +1 -1 src/k3bjobprogressdialog.cpp
M +2 -2 tests/k3bdataprojectmodeltest.cpp
M +1 -1 tests/k3bdeviceglobalstest.cpp
M +1 -1 tests/k3bexternalbinmanagertest.cpp
M +1 -1 tests/k3bglobalstest.cpp
M +1 -1 tests/k3bmodelutilstest.cpp
M +1 -1 tests/k3btestutils.cpp
M +1 -1 tests/k3btestutils.h

https://commits.kde.org/k3b/b2348889155a61a5ff40e119f06e42e1c6ce422d

diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index c869ae0a3..df213960f 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -25,7 +25,6 @@
#include "k3bdevicehandler.h"
#include "k3btoc.h"
#include "k3btrack.h"
-#include "k3bdevicehandler.h"
#include "k3bexternalbinmanager.h"
#include "k3bcdrecordwriter.h"
#include "k3bcdrdaowriter.h"
diff --git a/libk3b/projects/k3bcdrskinwriter.cpp b/libk3b/projects/k3bcdrskinwriter.cpp
index 8bdd91c37..b11212059 100644
--- a/libk3b/projects/k3bcdrskinwriter.cpp
+++ b/libk3b/projects/k3bcdrskinwriter.cpp
@@ -263,7 +263,7 @@ bool K3b::CdrskinWriter::prepareProcess()
d->process << "-tao";
#ifdef K3B_DEBUG
qDebug() << "DEBUG:" << __PRETTY_FUNCTION__ << "K3B user get *NO* "
- "opportunity via UI to explicitely choose SAO/DAO" <<
+ "opportunity via UI to explicitly choose SAO/DAO" <<
"let libburn choose the write type according to other parameters "
"and the medium state.";
#endif
diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
index d2c50b243..47c205a6f 100644
--- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
@@ -129,7 +129,7 @@ int K3b::VideoDvdImager::writePathSpec()

// convert to upper case names
if (::symlink(QFile::encodeName(item->localPath()),
- QFile::encodeName(videoDir + "/" + item->k3bName().toUpper())) == -1) {
+ QFile::encodeName(videoDir + '/' + item->k3bName().toUpper())) == -1) {
emit infoMessage(xi18n("Unable to link temporary file in folder <filename>%1</filename>.",
d->tempDir->path()), MessageError);
return -1;
diff --git a/src/helper/k3bhelper.cpp b/src/helper/k3bhelper.cpp
index a61877183..94aea19a6 100644
--- a/src/helper/k3bhelper.cpp
+++ b/src/helper/k3bhelper.cpp
@@ -146,7 +146,7 @@ KAuth::ActionReply Helper::addtogroup( QVariantMap args )
} else {
reply = KAuth::ActionReply::HelperErrorReply();
reply.setErrorCode( (KAuth::ActionReply::Error) errorCode );
- reply.setErrorDescription( QString( "gpasswd --add " + userName + " " + groupName + " : " + QString::fromLocal8Bit( gpasswd.readAllStandardError().data() ) ) );
+ reply.setErrorDescription( QString( "gpasswd --add " + userName + ' ' + groupName + " : " + QString::fromLocal8Bit( gpasswd.readAllStandardError().data() ) ) );
}

return reply;
diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp
index 21414d26c..00aae0f19 100644
--- a/src/k3bjobprogressdialog.cpp
+++ b/src/k3bjobprogressdialog.cpp
@@ -543,7 +543,7 @@ void K3b::JobProgressDialog::slotProgress( int percent )
{
if (percent > d->lastProgress) {
d->lastProgress = percent;
- m_plainCaption.replace(QRegularExpression("\\(.+?\\) "), "");
+ m_plainCaption.remove(QRegularExpression("\\(.+?\\) "));
k3bappcore->k3bMainWindow()->setPlainCaption(QString("(%1%) %2").arg(percent).arg(m_plainCaption));

setWindowTitle(QString("(%1%) %2").arg(percent).arg(m_job->jobDescription()));
diff --git a/tests/k3bdataprojectmodeltest.cpp b/tests/k3bdataprojectmodeltest.cpp
index 6e00658db..155e50ac1 100644
--- a/tests/k3bdataprojectmodeltest.cpp
+++ b/tests/k3bdataprojectmodeltest.cpp
@@ -20,8 +20,8 @@
#include "k3bspecialdataitem.h"
#include "k3btestutils.h"

-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QSignalSpy>
+#include <QTest>

QTEST_GUILESS_MAIN( DataProjectModelTest )

diff --git a/tests/k3bdeviceglobalstest.cpp b/tests/k3bdeviceglobalstest.cpp
index b430917c6..9331e5db5 100644
--- a/tests/k3bdeviceglobalstest.cpp
+++ b/tests/k3bdeviceglobalstest.cpp
@@ -13,7 +13,7 @@
#include "k3bdeviceglobalstest.h"
#include "k3bdeviceglobals.h"

-#include <QtTest/QTest>
+#include <QTest>

QTEST_GUILESS_MAIN(DeviceGlobalsTest)

diff --git a/tests/k3bexternalbinmanagertest.cpp b/tests/k3bexternalbinmanagertest.cpp
index 88b00ae18..09f596d85 100644
--- a/tests/k3bexternalbinmanagertest.cpp
+++ b/tests/k3bexternalbinmanagertest.cpp
@@ -10,7 +10,7 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#include <QtTest/QTest>
+#include <QTest>

#include "k3bexternalbinmanagertest.h"
#include "k3bcore.h"
diff --git a/tests/k3bglobalstest.cpp b/tests/k3bglobalstest.cpp
index 007b9db21..f67b8f3e6 100644
--- a/tests/k3bglobalstest.cpp
+++ b/tests/k3bglobalstest.cpp
@@ -15,7 +15,7 @@
#include "k3bglobalstest.h"
#include "k3bglobals.h"

-#include <QtTest/QTest>
+#include <QTest>

QTEST_GUILESS_MAIN( GlobalsTest )

diff --git a/tests/k3bmodelutilstest.cpp b/tests/k3bmodelutilstest.cpp
index 6a48f0e65..a97dca821 100644
--- a/tests/k3bmodelutilstest.cpp
+++ b/tests/k3bmodelutilstest.cpp
@@ -16,7 +16,7 @@
#include "k3bmodelutils.h"

#include <QStandardItemModel>
-#include <QtTest/QTest>
+#include <QTest>

QTEST_GUILESS_MAIN( ModelUtilsTest )

diff --git a/tests/k3btestutils.cpp b/tests/k3btestutils.cpp
index e89ff5a11..0af605555 100644
--- a/tests/k3btestutils.cpp
+++ b/tests/k3btestutils.cpp
@@ -2,7 +2,7 @@
#include "k3btestutils.h"

#include <QModelIndex>
-#include <QtTest/QTest>
+#include <QTest>

Q_DECLARE_METATYPE( QModelIndex )

diff --git a/tests/k3btestutils.h b/tests/k3btestutils.h
index eba834f06..3a4bcede1 100644
--- a/tests/k3btestutils.h
+++ b/tests/k3btestutils.h
@@ -15,7 +15,7 @@
#ifndef K3B_TEST_UTILS_H
#define K3B_TEST_UTILS_H

-#include <QtTest/QSignalSpy>
+#include <QSignalSpy>

class QModelIndex;

[Yuri Chornoivan]

Git commit 74b41b82e20a08cb5228e41f6d5474eb9804065f by Yuri Chornoivan.
Committed on 20/08/2018 at 16:44.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 ffmpegthumbnailer.cpp
M +0 -1 ffmpegthumbnailer/filmstrip.h
M +1 -1 ffmpegthumbnailer/filmstripfilter.cpp
M +2 -2 ffmpegthumbnailer/moviedecoder.cpp
M +1 -1 ffmpegthumbnailer/moviedecoder.h

https://commits.kde.org/ffmpegthumbs/74b41b82e20a08cb5228e41f6d5474eb9804065f

diff --git a/ffmpegthumbnailer.cpp b/ffmpegthumbnailer.cpp
index 8600d80..ddbccd5 100644
--- a/ffmpegthumbnailer.cpp
+++ b/ffmpegthumbnailer.cpp
@@ -42,7 +42,7 @@ FFMpegThumbnailer::~FFMpegThumbnailer()
{
}

-bool FFMpegThumbnailer::create(const QString& path, int width, int /*heigth*/, QImage& img)
+bool FFMpegThumbnailer::create(const QString& path, int width, int /*height*/, QImage& img)
{
m_Thumbnailer.setThumbnailSize(width);
// 20% seek inside the video to generate the preview
diff --git a/ffmpegthumbnailer/filmstrip.h b/ffmpegthumbnailer/filmstrip.h
index 12c6050..c7ec500 100644
--- a/ffmpegthumbnailer/filmstrip.h
+++ b/ffmpegthumbnailer/filmstrip.h
@@ -572,4 +572,3 @@ static const quint8 filmStrip64[64 * 64 * 3] = {
};

#endif
-
\ No newline at end of file
diff --git a/ffmpegthumbnailer/filmstripfilter.cpp b/ffmpegthumbnailer/filmstripfilter.cpp
index 377ead0..10c19eb 100644
--- a/ffmpegthumbnailer/filmstripfilter.cpp
+++ b/ffmpegthumbnailer/filmstripfilter.cpp
@@ -14,8 +14,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

-#include "filmstrip.h"
#include "filmstripfilter.h"
+#include "filmstrip.h"

namespace ffmpegthumbnailer
{
diff --git a/ffmpegthumbnailer/moviedecoder.cpp b/ffmpegthumbnailer/moviedecoder.cpp
index b2e7551..835e872 100644
--- a/ffmpegthumbnailer/moviedecoder.cpp
+++ b/ffmpegthumbnailer/moviedecoder.cpp
@@ -308,8 +308,8 @@ bool MovieDecoder::initFilterGraph(enum AVPixelFormat pixfmt, int width, int hei
m_filterGraph = avfilter_graph_alloc();

QByteArray arguments("buffer=");
- arguments += "video_size=" + QByteArray::number(width) + "x" + QByteArray::number(height) + ":";
- arguments += "pix_fmt=" + QByteArray::number(pixfmt) + ":";
+ arguments += "video_size=" + QByteArray::number(width) + 'x' + QByteArray::number(height) + ':';
+ arguments += "pix_fmt=" + QByteArray::number(pixfmt) + ':';
arguments += "time_base=1/1:pixel_aspect=0/1[in];";
arguments += "[in]yadif[out];";
arguments += "[out]buffersink";
diff --git a/ffmpegthumbnailer/moviedecoder.h b/ffmpegthumbnailer/moviedecoder.h
index 788ce43..16de467 100644
--- a/ffmpegthumbnailer/moviedecoder.h
+++ b/ffmpegthumbnailer/moviedecoder.h
@@ -34,7 +34,7 @@ namespace ffmpegthumbnailer
class MovieDecoder
{
public:
- MovieDecoder(const QString& filename, AVFormatContext* pavContext = NULL);
+ explicit MovieDecoder(const QString& filename, AVFormatContext* pavContext = NULL);
~MovieDecoder();

QString getCodec();

[Yuri Chornoivan]

Git commit 637b94f5c48cccdf460c9e176cfe749122d025bc by Yuri Chornoivan.
Committed on 20/08/2018 at 17:04.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -2 core/mixertoolbox.cpp
M +1 -1 gui/viewdockareapopup.cpp
M +2 -2 gui/volumeslider.cpp

https://commits.kde.org/kmix/637b94f5c48cccdf460c9e176cfe749122d025bc

diff --git a/core/mixertoolbox.cpp b/core/mixertoolbox.cpp
index 0dc18fd..3e3b47c 100644
--- a/core/mixertoolbox.cpp
+++ b/core/mixertoolbox.cpp
@@ -19,6 +19,7 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

+#include "core/mixertoolbox.h"
#include "core/mixer.h"

#include <QDir>
@@ -31,8 +32,6 @@
#include "core/kmixdevicemanager.h"
#include "core/mixdevice.h"

-#include "core/mixertoolbox.h"
-

MixerToolBox* MixerToolBox::s_instance = 0;
QRegExp MixerToolBox::s_ignoreMixerExpression( QStringLiteral( "Modem" ));
diff --git a/gui/viewdockareapopup.cpp b/gui/viewdockareapopup.cpp
index 051a545..1fb6a17 100644
--- a/gui/viewdockareapopup.cpp
+++ b/gui/viewdockareapopup.cpp
@@ -402,7 +402,7 @@ QPushButton* ViewDockAreaPopup::createRestoreVolumeButton ( int storageSlot )
{
QString buttonText = QString("%1").arg(storageSlot);
QPushButton* profileButton = new QPushButton(restoreVolumeIcon, buttonText, this);
- profileButton->setToolTip(i18n("Load volume profile %1").arg(storageSlot));
+ profileButton->setToolTip(i18n("Load volume profile %1", storageSlot));
profileButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
return profileButton;
}
diff --git a/gui/volumeslider.cpp b/gui/volumeslider.cpp
index 7db1a07..bc57ee0 100644
--- a/gui/volumeslider.cpp
+++ b/gui/volumeslider.cpp
@@ -19,11 +19,11 @@
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include "volumeslider.h"
+
#include <QStyleOption>
#include <QFontMetrics>

-#include "volumeslider.h"
-
VolumeSlider::VolumeSlider(Qt::Orientation orientation, QWidget* parent) : QSlider(orientation, parent)
,m_orientation(orientation),m_tooltip(new QLabel(parent,Qt::ToolTip))
{

[Yuri Chornoivan]

Git commit 66a66e526c78dcff4e1714e1927ecf7a3d113977 by Yuri Chornoivan.
Committed on 21/08/2018 at 17:37.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/konqviewmgrtest.cpp
M +1 -1 plugins/validators/plugin_validators.cpp
M +1 -1 settings/konqhtml/jsopts.cpp
M +1 -1 src/konqmainwindow.cpp
M +0 -1 src/konqview.cpp
M +1 -1 src/konqviewmanager.h
M +1 -1 webenginepart/src/settings/webenginesettings.cpp
M +1 -2 webenginepart/src/webenginepart.cpp
M +0 -1 webenginepart/src/webenginepart_ext.cpp
M +1 -1 webenginepart/src/webenginepartcookiejar.h
M +1 -1 webenginepart/src/webengineparthtmlembedder.h
M +0 -1 webenginepart/tests/webenginepart_tester.cpp

https://commits.kde.org/konqueror/66a66e526c78dcff4e1714e1927ecf7a3d113977

diff --git a/autotests/konqviewmgrtest.cpp b/autotests/konqviewmgrtest.cpp
index 35325ebbc..f42635322 100644
--- a/autotests/konqviewmgrtest.cpp
+++ b/autotests/konqviewmgrtest.cpp
@@ -835,7 +835,7 @@ void ViewMgrTest::testCloseOtherTabs()
// Switching to an empty tab -> focus goes to location bar (#84867)
QCOMPARE(mainWindow.focusWidget()->metaObject()->className(), "KonqCombo");

- // Check that removeOtherTabs deals with splitted views correctly
+ // Check that removeOtherTabs deals with split views correctly
mainWindow.viewManager()->removeOtherTabs(2);
QCOMPARE(DebugFrameVisitor::inspect(&mainWindow), QString("MT[C(FF)].")); // mainWindow, tab widget, first tab = splitter with two frames
}
diff --git a/plugins/validators/plugin_validators.cpp b/plugins/validators/plugin_validators.cpp
index 621765e32..f35bf8f9b 100644
--- a/plugins/validators/plugin_validators.cpp
+++ b/plugins/validators/plugin_validators.cpp
@@ -539,7 +539,7 @@ bool PluginValidators::doExternalValidationChecks()

void PluginValidators::addStatusBarIcon()
{
- // alread an icon placed
+ // already an icon placed
if (m_icon) {
return;
}
diff --git a/settings/konqhtml/jsopts.cpp b/settings/konqhtml/jsopts.cpp
index 5c98fe073..527326139 100644
--- a/settings/konqhtml/jsopts.cpp
+++ b/settings/konqhtml/jsopts.cpp
@@ -12,7 +12,7 @@
* New configuration scheme for JavaScript
*
* Copyright (c) Daniel Molkentin 2000
- * Major cleanup & Java/JS settings splitted
+ * Major cleanup & Java/JS settings split
*
* Copyright (c) Leo Savernik 2002-2003
* Big changes to accommodate per-domain settings
diff --git a/src/konqmainwindow.cpp b/src/konqmainwindow.cpp
index f84e0a65a..57573c1bf 100644
--- a/src/konqmainwindow.cpp
+++ b/src/konqmainwindow.cpp
@@ -1282,7 +1282,7 @@ void KonqMainWindow::slotCreateNewWindow(const QUrl &url,

// Make the window open properties configurable. This is equivalent to
// Firefox's "dom.disable_window_open_feature.*" properties. For now
- // only LocationBar visiblity is configurable.
+ // only LocationBar visibility is configurable.
KSharedConfig::Ptr config = KSharedConfig::openConfig();
KConfigGroup cfg(config, "DisableWindowOpenFeatures");

diff --git a/src/konqview.cpp b/src/konqview.cpp
index 4d44ec766..bef291cac 100644
--- a/src/konqview.cpp
+++ b/src/konqview.cpp
@@ -63,7 +63,6 @@
#include <KParts/OpenUrlArguments>
#include <KParts/BrowserExtension>
#include <KParts/WindowArgs>
-#include <KComponentData>

//#define DEBUG_HISTORY

diff --git a/src/konqviewmanager.h b/src/konqviewmanager.h
index de30ad639..8b81c432e 100644
--- a/src/konqviewmanager.h
+++ b/src/konqviewmanager.h
@@ -173,7 +173,7 @@ public:

/**
* Brings the tab specified by @p view to the front of the stack
- * Deprecated, used the other one; this one breaks too easily with splitted views
+ * Deprecated, used the other one; this one breaks too easily with split views
* (if passing the current view to @p view)
*/
void showTab(KonqView *view);
diff --git a/webenginepart/src/settings/webenginesettings.cpp b/webenginepart/src/settings/webenginesettings.cpp
index 9f2fb2536..a0e34158e 100644
--- a/webenginepart/src/settings/webenginesettings.cpp
+++ b/webenginepart/src/settings/webenginesettings.cpp
@@ -708,7 +708,7 @@ void WebEngineSettings::init( KConfig * config, bool reset )
QWebEngineSettings::globalSettings()->setFontFamily(QWebEngineSettings::CursiveFont, cursiveFontName());
QWebEngineSettings::globalSettings()->setFontFamily(QWebEngineSettings::FantasyFont, fantasyFontName());

- // TODO: Create a webengine config module that gets embeded into Konqueror's kcm.
+ // TODO: Create a webengine config module that gets embedded into Konqueror's kcm.
// Turn on WebGL support
// QWebEngineSettings::globalSettings()->setAttribute(QWebEngineSettings::WebGLEnabled, d->m_enableWebGL);
// Turn on HTML 5 local and offline storage capabilities...
diff --git a/webenginepart/src/webenginepart.cpp b/webenginepart/src/webenginepart.cpp
index e5a5c317c..0655a2dd0 100644
--- a/webenginepart/src/webenginepart.cpp
+++ b/webenginepart/src/webenginepart.cpp
@@ -75,7 +75,6 @@
#include <QMenu>
#include <QStatusBar>
#include "utils.h"
-#include <QWebEngineProfile>

WebEnginePart::WebEnginePart(QWidget *parentWidget, QObject *parent,
const QByteArray& cachedHistory, const QStringList& /*args*/)
@@ -158,7 +157,7 @@ WebEnginePart::WebEnginePart(QWidget *parentWidget, QObject *parent,
// Set the part's widget
setWidget(mainWidget);

- // Set the web view as the the focus object
+ // Set the web view as the focus object
mainWidget->setFocusProxy(m_webView);

// Connect the signals from the webview
diff --git a/webenginepart/src/webenginepart_ext.cpp b/webenginepart/src/webenginepart_ext.cpp
index 9ea3c7869..44bd3f9ea 100644
--- a/webenginepart/src/webenginepart_ext.cpp
+++ b/webenginepart/src/webenginepart_ext.cpp
@@ -48,7 +48,6 @@
#include <QPrinter>
#include <QPrintDialog>
#include <QPrintPreviewDialog>
-#include <QInputDialog>
#include <QWebEngineHistory>
#include <QMimeData>
#define QL1S(x) QLatin1String(x)
diff --git a/webenginepart/src/webenginepartcookiejar.h b/webenginepart/src/webenginepartcookiejar.h
index 40a76e721..cc484afc5 100644
--- a/webenginepart/src/webenginepartcookiejar.h
+++ b/webenginepart/src/webenginepartcookiejar.h
@@ -257,7 +257,7 @@ private:
* @brief Adds a dot in front of a domain if it's not already there
*
* @param dom the domain
- * @return `dom` if it already starts with a dot and `dom` preceeded by a dot otherwise
+ * @return `dom` if it already starts with a dot and `dom` preceded by a dot otherwise
*
* @internal
* This function is needed because KCookieJar prepends a dot to all domains not starting with one (according
diff --git a/webenginepart/src/webengineparthtmlembedder.h b/webenginepart/src/webengineparthtmlembedder.h
index a607d08d6..bd6aa48dc 100644
--- a/webenginepart/src/webengineparthtmlembedder.h
+++ b/webenginepart/src/webengineparthtmlembedder.h
@@ -53,7 +53,7 @@ class QWebEngineProfile;
* startReplacingUrls() -> urlsReplaced() -> startRetrievingHtml() -> htmlRetrieved() -> sendReply()
*
* A problem can arise if the (X)HTML code contains a `<meta>` element with attribute `http-equiv="refresh"`.
- * Since QWebEnginePage is not just a parser, it honours this refresh request and, after emitting the `loadFinished`
+ * Since QWebEnginePage is not just a parser, it honors this refresh request and, after emitting the `loadFinished`
* signal, it refreshes the page, which means that `loadFinished` is emitted again and again. To avoid
* doing the embeddding every time, the `loadFinished` signal is disconnected after the first time it's
* emitted and the connection is remade the next time startEmbedding() is called.
diff --git a/webenginepart/tests/webenginepart_tester.cpp b/webenginepart/tests/webenginepart_tester.cpp
index 3878bb3ae..837d7bc2d 100644
--- a/webenginepart/tests/webenginepart_tester.cpp
+++ b/webenginepart/tests/webenginepart_tester.cpp
@@ -68,7 +68,6 @@
#include <QVector>
#include <QTextStream>
#include <QApplication>
-#include <KAboutData>
#include <KLocalizedString>
#include <QCommandLineParser>

[Yuri Chornoivan]

Git commit 49354dc624ac829cc92611cd925bdce8e91a3d76 by Yuri Chornoivan.
Committed on 22/08/2018 at 15:54.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 cmake/FindPthread.cmake
M +1 -1 kimgio-apng/libpng-apng/png.c
M +4 -4 kimgio-apng/libpng-apng/png.h
M +1 -1 kimgio-apng/libpng-apng/pngconf.h
M +1 -1 kimgio-apng/libpng-apng/pngrtran.c
M +1 -1 kimgio-apng/libpng-apng/pngrutil.c
M +1 -1 kimgio-apng/libpng-apng/pngstruct.h
M +9 -9 scim-panel/main.cpp
M +1 -1 themer_fcitx.cpp
M +1 -1 thumbnailer/fskincreator.cpp

https://commits.kde.org/kimtoy/49354dc624ac829cc92611cd925bdce8e91a3d76

diff --git a/cmake/FindPthread.cmake b/cmake/FindPthread.cmake
index e24f7f6..89c4d01 100644
--- a/cmake/FindPthread.cmake
+++ b/cmake/FindPthread.cmake
@@ -43,4 +43,4 @@ endif(PTHREAD_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Pthread DEFAULT_MSG PTHREAD_INCLUDE_DIR PTHREAD_LIB_FOUND)

-mark_as_advanced(PTHREAD_INCLUDE_DIR PTHREAD_LIBRARIES PTHREAD_LIBC_HAS_PTHREAD_CREATE PTHREAD_LIB_FOUND)
\ No newline at end of file
+mark_as_advanced(PTHREAD_INCLUDE_DIR PTHREAD_LIBRARIES PTHREAD_LIBC_HAS_PTHREAD_CREATE PTHREAD_LIB_FOUND)
diff --git a/kimgio-apng/libpng-apng/png.c b/kimgio-apng/libpng-apng/png.c
index 6847173..b4ab8b6 100644
--- a/kimgio-apng/libpng-apng/png.c
+++ b/kimgio-apng/libpng-apng/png.c
@@ -1984,7 +1984,7 @@ __kimtoy__png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colo
*/

/* Data checks (could be skipped). These checks must be independent of the
- * version number; however, the version number doesn't accomodate changes in
+ * version number; however, the version number doesn't accommodate changes in
* the header fields (just the known tags and the interpretation of the
* data.)
*/
diff --git a/kimgio-apng/libpng-apng/png.h b/kimgio-apng/libpng-apng/png.h
index 5f47f58..7c79efe 100644
--- a/kimgio-apng/libpng-apng/png.h
+++ b/kimgio-apng/libpng-apng/png.h
@@ -1327,7 +1327,7 @@ PNG_FIXED_EXPORT(228, void, __kimtoy__png_set_alpha_mode_fixed, (png_structrp pn
*
* __kimtoy__png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
* In this case the output is assumed to be something like an sRGB conformant
- * display preceeded by a power-law lookup table of power 1.45. This is how
+ * display preceded by a power-law lookup table of power 1.45. This is how
* early Mac systems behaved.
*
* __kimtoy__png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
@@ -1374,7 +1374,7 @@ PNG_FIXED_EXPORT(228, void, __kimtoy__png_set_alpha_mode_fixed, (png_structrp pn
*
* When the default gamma of PNG files doesn't match the output gamma.
* If you have PNG files with no gamma information __kimtoy__png_set_alpha_mode allows
- * you to provide a default gamma, but it also sets the ouput gamma to the
+ * you to provide a default gamma, but it also sets the output gamma to the
* matching value. If you know your PNG files have a gamma that doesn't
* match the output you can take advantage of the fact that
* __kimtoy__png_set_alpha_mode always sets the output gamma but only sets the PNG
@@ -2799,7 +2799,7 @@ PNG_EXPORT(207, void, __kimtoy__png_save_uint_16, (png_bytep buf, unsigned int i
* The simplified API hides the details of both libpng and the PNG file format
* itself. It allows PNG files to be read into a very limited number of
* in-memory bitmap formats or to be written from the same formats. If these
- * formats do not accomodate your needs then you can, and should, use the more
+ * formats do not accommodate your needs then you can, and should, use the more
* sophisticated APIs above - these support a wide variety of in-memory formats
* and a wide variety of sophisticated transformations to those formats as well
* as a wide variety of APIs to manipulate ancillary information.
@@ -3261,7 +3261,7 @@ PNG_EXPORT(243, int, __kimtoy__png_get_palette_max, (png_const_structp png_ptr,
* option and 'onoff' is 0 (off) or non-0 (on). The value returned is given
* by the PNG_OPTION_ defines below.
*
- * HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
+ * HARDWARE: normally hardware capabilities, such as the Intel SSE instructions,
* are detected at run time, however sometimes it may be impossible
* to do this in user mode, in which case it is necessary to discover
* the capabilities in an OS specific way. Such capabilities are
diff --git a/kimgio-apng/libpng-apng/pngconf.h b/kimgio-apng/libpng-apng/pngconf.h
index 74a6292..524ab56 100644
--- a/kimgio-apng/libpng-apng/pngconf.h
+++ b/kimgio-apng/libpng-apng/pngconf.h
@@ -127,7 +127,7 @@
*
* These cases only differ if the operating system does not use the C
* calling convention, at present this just means the above cases
- * (x86 DOS/Windows sytems) and, even then, this does not apply to
+ * (x86 DOS/Windows systems) and, even then, this does not apply to
* Cygwin running on those systems.
*
* Note that the value must be defined in pnglibconf.h so that what
diff --git a/kimgio-apng/libpng-apng/pngrtran.c b/kimgio-apng/libpng-apng/pngrtran.c
index a515445..4c13e6b 100644
--- a/kimgio-apng/libpng-apng/pngrtran.c
+++ b/kimgio-apng/libpng-apng/pngrtran.c
@@ -1312,7 +1312,7 @@ __kimtoy__png_init_read_transformations(png_structrp png_ptr)

else if (png_ptr->screen_gamma != 0)
/* The converse - assume the file matches the screen, note that this
- * perhaps undesireable default can (from 1.5.4) be changed by calling
+ * perhaps undesirable default can (from 1.5.4) be changed by calling
* __kimtoy__png_set_alpha_mode (even if the alpha handling mode isn't required
* or isn't changed from the default.)
*/
diff --git a/kimgio-apng/libpng-apng/pngrutil.c b/kimgio-apng/libpng-apng/pngrutil.c
index 8a8f62c..223e7e7 100644
--- a/kimgio-apng/libpng-apng/pngrutil.c
+++ b/kimgio-apng/libpng-apng/pngrutil.c
@@ -96,7 +96,7 @@ __kimtoy__png_get_int_32)(png_const_bytep buf)
png_uint_16 (PNGAPI
__kimtoy__png_get_uint_16)(png_const_bytep buf)
{
- /* ANSI-C requires an int value to accomodate at least 16 bits so this
+ /* ANSI-C requires an int value to accommodate at least 16 bits so this
* works and allows the compiler not to worry about possible narrowing
* on 32 bit systems. (Pre-ANSI systems did not make integers smaller
* than 16 bits either.)
diff --git a/kimgio-apng/libpng-apng/pngstruct.h b/kimgio-apng/libpng-apng/pngstruct.h
index d0300e1..9b0a74f 100644
--- a/kimgio-apng/libpng-apng/pngstruct.h
+++ b/kimgio-apng/libpng-apng/pngstruct.h
@@ -47,7 +47,7 @@
/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
* can handle at once. This type need be no larger than 16 bits (so maximum of
* 65535), this define allows us to discover how big it is, but limited by the
- * maximuum for png_size_t. The value can be overriden in a library build
+ * maximuum for png_size_t. The value can be overridden in a library build
* (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
* lower value (e.g. 255 works). A lower value may help memory usage (slightly)
* and may even improve performance on some systems (and degrade it on others.)
diff --git a/scim-panel/main.cpp b/scim-panel/main.cpp
index 2dcd03f..badb9f4 100644
--- a/scim-panel/main.cpp
+++ b/scim-panel/main.cpp
@@ -37,15 +37,15 @@
#include <stdlib.h>
#include <list>

-#include <QtCore/QObject>
-#include <QtCore/QProcess>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QThread>
-#include <QtCore/QMutex>
-#include <QtCore/QCoreApplication>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusConnection>
+#include <QObject>
+#include <QProcess>
+#include <QString>
+#include <QStringList>
+#include <QThread>
+#include <QMutex>
+#include <QCoreApplication>
+#include <QDBusMessage>
+#include <QDBusConnection>

#define Uses_C_STDIO
#define Uses_C_STDLIB
diff --git a/themer_fcitx.cpp b/themer_fcitx.cpp
index 145d9c4..ddac6f9 100644
--- a/themer_fcitx.cpp
+++ b/themer_fcitx.cpp
@@ -346,7 +346,7 @@ bool ThemerFcitx::loadTheme()
m_labelFontHeight = QFontMetrics(m_labelFont).height();
m_candidateFontHeight = QFontMetrics(m_candidateFont).height();

- // compability with newer skin scheme
+ // compatibility with newer skin scheme
if (ych < yen + m_preEditFontHeight) {
yen += m_preEditFontHeight;
ych += yen + m_candidateFontHeight;
diff --git a/thumbnailer/fskincreator.cpp b/thumbnailer/fskincreator.cpp
index 7a91a7c..c7e91a4 100644
--- a/thumbnailer/fskincreator.cpp
+++ b/thumbnailer/fskincreator.cpp
@@ -233,7 +233,7 @@ bool FskinCreator::create(const QString& path, int width, int height, QImage& im
int pinyinw = QFontMetrics(font).width("ABC pinyin");
int zhongwenw = QFontMetrics(font).width("1candidate");

- // compability with newer skin scheme
+ // compatibility with newer skin scheme
if (ych < yen + fontHeight) {
yen += fontHeight;
ych += yen + fontHeight;

[Yuri Chornoivan]

Git commit f220096fb5ae8c87f2d1a3363719c2e314861c35 by Yuri Chornoivan.
Committed on 22/08/2018 at 16:05.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 src/breakbase.h
M +1 -1 src/grayeffect.h
M +1 -1 src/plasmaeffect.h
M +1 -1 src/popupeffect.h
M +1 -1 src/rsidock.h
M +2 -2 src/rsitimercounter.cpp
M +1 -1 src/setupgeneral.h
M +1 -2 src/setupmaximized.cpp
M +1 -1 src/setupmaximized.h
M +1 -1 src/setupnotifications.h
M +1 -1 src/setuptiming.h
M +1 -1 src/slideshoweffect.h
M +1 -1 test/rsitimer_test.h
M +1 -1 test/rsitimercounter_test.h

https://commits.kde.org/rsibreak/f220096fb5ae8c87f2d1a3363719c2e314861c35

diff --git a/src/breakbase.h b/src/breakbase.h
index 7dc2303..7190956 100644
--- a/src/breakbase.h
+++ b/src/breakbase.h
@@ -33,7 +33,7 @@ class BreakBase : public QObject
Q_OBJECT

public:
- BreakBase( QObject* parent );
+ explicit BreakBase( QObject* parent );
~BreakBase();
virtual void activate();
virtual void deactivate();
diff --git a/src/grayeffect.h b/src/grayeffect.h
index f81d3d6..4fea943 100644
--- a/src/grayeffect.h
+++ b/src/grayeffect.h
@@ -30,7 +30,7 @@ class GrayEffect : public BreakBase
Q_OBJECT

public:
- GrayEffect( QObject *parent );
+ explicit GrayEffect( QObject *parent );
~GrayEffect();
void activate() override;
void deactivate() override;
diff --git a/src/plasmaeffect.h b/src/plasmaeffect.h
index 1ff3bc4..0cee351 100644
--- a/src/plasmaeffect.h
+++ b/src/plasmaeffect.h
@@ -28,7 +28,7 @@ class PlasmaEffect : public BreakBase
Q_OBJECT

public:
- PlasmaEffect( QObject* );
+ explicit PlasmaEffect( QObject* );

public slots:
void activate() override;
diff --git a/src/popupeffect.h b/src/popupeffect.h
index a5c0a7a..8ecfe77 100644
--- a/src/popupeffect.h
+++ b/src/popupeffect.h
@@ -31,7 +31,7 @@ class PopupEffect : public BreakBase
Q_OBJECT

public:
- PopupEffect( QObject* );
+ explicit PopupEffect( QObject* );
~PopupEffect();
void setLabel( const QString& ) override;

diff --git a/src/rsidock.h b/src/rsidock.h
index 2077473..bf19286 100644
--- a/src/rsidock.h
+++ b/src/rsidock.h
@@ -47,7 +47,7 @@ class RSIDock : public KStatusNotifierItem
Q_OBJECT

public:
- RSIDock( QObject *parent );
+ explicit RSIDock( QObject *parent );

/**
* Destructor
diff --git a/src/rsitimercounter.cpp b/src/rsitimercounter.cpp
index ce7a92b..579a3ae 100644
--- a/src/rsitimercounter.cpp
+++ b/src/rsitimercounter.cpp
@@ -14,10 +14,10 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#include <algorithm>
-
#include "rsitimercounter.h"

+#include <algorithm>
+

int RSITimerCounter::tick( const int idleTime )
{
diff --git a/src/setupgeneral.h b/src/setupgeneral.h
index b27cc19..1580811 100644
--- a/src/setupgeneral.h
+++ b/src/setupgeneral.h
@@ -41,7 +41,7 @@ public:
* Constructor
* @param parent Parent Widget
*/
- SetupGeneral( QWidget* parent = 0 );
+ explicit SetupGeneral( QWidget* parent = 0 );

/**
* Destructor
diff --git a/src/setupmaximized.cpp b/src/setupmaximized.cpp
index 4a1c5e7..fb49712 100644
--- a/src/setupmaximized.cpp
+++ b/src/setupmaximized.cpp
@@ -31,16 +31,15 @@
#include <QLabel>
#include <QLineEdit>
#include <QSlider>
+#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QGroupBox>

// KDE includes.
#include <KLocalizedString>
-#include <QVBoxLayout>
#include <KConfigGroup>
#include <KSharedConfig>
#include <KWindowSystem>
-#include <QHBoxLayout>
#include <KPluralHandlingSpinBox>

class SetupMaximizedPriv
diff --git a/src/setupmaximized.h b/src/setupmaximized.h
index 6ec6075..f12118f 100644
--- a/src/setupmaximized.h
+++ b/src/setupmaximized.h
@@ -42,7 +42,7 @@ public:
* Constructor
* @param parent Parent Widget
*/
- SetupMaximized( QWidget* parent = 0 );
+ explicit SetupMaximized( QWidget* parent = 0 );

/**
* Destructor
diff --git a/src/setupnotifications.h b/src/setupnotifications.h
index 4816eeb..b8435e9 100644
--- a/src/setupnotifications.h
+++ b/src/setupnotifications.h
@@ -41,7 +41,7 @@ public:
* Constructor
* @param parent Parent Widget
*/
- SetupNotifications( QWidget* parent = 0 );
+ explicit SetupNotifications( QWidget* parent = 0 );

/**
* Destructor
diff --git a/src/setuptiming.h b/src/setuptiming.h
index f8f9a97..2d82a88 100644
--- a/src/setuptiming.h
+++ b/src/setuptiming.h
@@ -41,7 +41,7 @@ public:
* Constructor
* @param parent Parent Widget
*/
- SetupTiming( QWidget* parent = 0 );
+ explicit SetupTiming( QWidget* parent = 0 );

/**
* Destructor
diff --git a/src/slideshoweffect.h b/src/slideshoweffect.h
index 135f612..ee503c9 100644
--- a/src/slideshoweffect.h
+++ b/src/slideshoweffect.h
@@ -32,7 +32,7 @@ class SlideEffect : public BreakBase
Q_OBJECT

public:
- SlideEffect( QObject *parent );
+ explicit SlideEffect( QObject *parent );
~SlideEffect();
void reset( const QString& path, bool recursive, bool showSmallImages, bool expandImageToFullScreen, int interval );
void activate() override;
diff --git a/test/rsitimer_test.h b/test/rsitimer_test.h
index 9f484f7..be061f8 100644
--- a/test/rsitimer_test.h
+++ b/test/rsitimer_test.h
@@ -17,7 +17,7 @@
#ifndef RSIBREAK_RSITIMER_TEST_H
#define RSIBREAK_RSITIMER_TEST_H

-#include <QtTest/QtTest>
+#include <QtTest>

class RSITimerTest: public QObject
{
diff --git a/test/rsitimercounter_test.h b/test/rsitimercounter_test.h
index ef0ee37..c944d07 100644
--- a/test/rsitimercounter_test.h
+++ b/test/rsitimercounter_test.h
@@ -17,7 +17,7 @@
#ifndef RSIBREAK_RSITIMERCOUNTER_TEST_H
#define RSIBREAK_RSITIMERCOUNTER_TEST_H

-#include <QtTest/QtTest>
+#include <QtTest>

class RSITimerCounterTest: public QObject
{

[Yuri Chornoivan]

Git commit 864a326075b7f4c832c996ea4e119026d5ccc593 by Yuri Chornoivan.
Committed on 22/08/2018 at 17:09.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -3 app/charttab.cpp
M +2 -2 app/configdialog.cpp
M +1 -1 app/configdialog.h
M +1 -1 app/mainwindow.h
M +3 -3 massifdata/filedata.h
M +1 -1 massifdata/parser.cpp
M +2 -2 massifdata/parserprivate.cpp
M +3 -3 massifdata/parserprivate.h
M +3 -3 massifdata/parseworker.h
M +3 -3 massifdata/treeleafitem.h
M +3 -3 test/datamodeltest.cpp
M +1 -1 test/datamodeltest.h
M +4 -4 test/modeltest.h
M +1 -1 visualizer/datatreemodel.cpp
M +2 -2 visualizer/datatreemodel.h
M +5 -5 visualizer/detailedcostmodel.cpp
M +3 -3 visualizer/detailedcostmodel.h
M +1 -1 visualizer/totalcostmodel.cpp
M +2 -2 visualizer/totalcostmodel.h

https://commits.kde.org/massif-visualizer/864a326075b7f4c832c996ea4e119026d5ccc593

diff --git a/app/charttab.cpp b/app/charttab.cpp
index 0664bbe..b77747c 100644
--- a/app/charttab.cpp
+++ b/app/charttab.cpp
@@ -487,9 +487,7 @@ void ChartTab::saveCurrentDocument()
// Other format
else if (!QPixmap::grabWidget(m_chart).save(saveFilename)) {

- KMessageBox::sorry(this, QString(
- i18n("Error, failed to save the image to %1.")
- ).arg(saveFilename));
+ KMessageBox::sorry(this, i18n("Error, failed to save the image to %1.", saveFilename));
}
}
}
diff --git a/app/configdialog.cpp b/app/configdialog.cpp
index a7ee9eb..b396dfd 100644
--- a/app/configdialog.cpp
+++ b/app/configdialog.cpp
@@ -20,10 +20,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#include <KLocalizedString>
-
#include "configdialog.h"

+#include <KLocalizedString>
+
#include "massif-visualizer-settings.h"
#include "ui_config.h"

diff --git a/app/configdialog.h b/app/configdialog.h
index 949bd33..65ddc39 100644
--- a/app/configdialog.h
+++ b/app/configdialog.h
@@ -39,7 +39,7 @@ class ConfigDialog : public KConfigDialog
Q_OBJECT

public:
- ConfigDialog(QWidget* parent);
+ explicit ConfigDialog(QWidget* parent);
virtual ~ConfigDialog();

static bool isShown();
diff --git a/app/mainwindow.h b/app/mainwindow.h
index 5cc021f..7530ecf 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -64,7 +64,7 @@ class MainWindow : public KParts::MainWindow
Q_OBJECT

public:
- MainWindow(QWidget* parent = 0, Qt::WindowFlags f = 0);
+ explicit MainWindow(QWidget* parent = 0, Qt::WindowFlags f = 0);
virtual ~MainWindow();

void setupActions();
diff --git a/massifdata/filedata.h b/massifdata/filedata.h
index e852534..c2e10f3 100644
--- a/massifdata/filedata.h
+++ b/massifdata/filedata.h
@@ -23,8 +23,8 @@
#ifndef MASSIF_FILEDATA_H
#define MASSIF_FILEDATA_H

-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QObject>
+#include <QVector>

namespace Massif {

@@ -37,7 +37,7 @@ class FileData : public QObject
{
Q_OBJECT
public:
- FileData(QObject* parent = 0);
+ explicit FileData(QObject* parent = 0);
virtual ~FileData();

/**
diff --git a/massifdata/parser.cpp b/massifdata/parser.cpp
index 96622a2..be6ee22 100644
--- a/massifdata/parser.cpp
+++ b/massifdata/parser.cpp
@@ -26,7 +26,7 @@
#include "parserprivate.h"
#include "snapshotitem.h"

-#include <QtCore/QIODevice>
+#include <QIODevice>

using namespace Massif;

diff --git a/massifdata/parserprivate.cpp b/massifdata/parserprivate.cpp
index 882cfa0..a770667 100644
--- a/massifdata/parserprivate.cpp
+++ b/massifdata/parserprivate.cpp
@@ -28,9 +28,9 @@
#include "util.h"
#include "parser.h"

-#include <QtCore/QIODevice>
+#include <QIODevice>

-#include <QtCore/QDebug>
+#include <QDebug>

using namespace Massif;

diff --git a/massifdata/parserprivate.h b/massifdata/parserprivate.h
index b15f43d..6732f2b 100644
--- a/massifdata/parserprivate.h
+++ b/massifdata/parserprivate.h
@@ -23,9 +23,9 @@
#ifndef MASSIF_PARSERPRIVATE_H
#define MASSIF_PARSERPRIVATE_H

-#include <QtCore/QByteArray>
-#include <QtCore/QStringList>
-#include <QtCore/QSet>
+#include <QByteArray>
+#include <QStringList>
+#include <QSet>
#include <QVector>

class QIODevice;
diff --git a/massifdata/parseworker.h b/massifdata/parseworker.h
index e2ada33..e2db7f7 100644
--- a/massifdata/parseworker.h
+++ b/massifdata/parseworker.h
@@ -20,8 +20,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef MASSIFDATA_PARSETHREAD_H
-#define MASSIFDATA_PARSETHREAD_H
+#ifndef MASSIFDATA_PARSEWORKER_H
+#define MASSIFDATA_PARSEWORKER_H

#include <QThread>
#include <QStringList>
@@ -64,4 +64,4 @@ private:

}

-#endif // MASSIFDATA_PARSETHREAD_H
+#endif // MASSIFDATA_PARSEWORKER_H
diff --git a/massifdata/treeleafitem.h b/massifdata/treeleafitem.h
index f3b7b0b..76c63e4 100644
--- a/massifdata/treeleafitem.h
+++ b/massifdata/treeleafitem.h
@@ -23,9 +23,9 @@
#ifndef TREELEAFITEM_H
#define TREELEAFITEM_H

-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QMetaType>
+#include <QString>
+#include <QVector>
+#include <QMetaType>

namespace Massif {

diff --git a/test/datamodeltest.cpp b/test/datamodeltest.cpp
index 4203e5d..3b8fb16 100644
--- a/test/datamodeltest.cpp
+++ b/test/datamodeltest.cpp
@@ -34,9 +34,9 @@
#include "visualizer/detailedcostmodel.h"
#include "visualizer/datatreemodel.h"

-#include <QtCore/QFile>
-#include <QtTest/QTest>
-#include <QtCore/QDebug>
+#include <QFile>
+#include <QTest>
+#include <QDebug>

#include <KConfigGroup>
#include <KSharedConfig>
diff --git a/test/datamodeltest.h b/test/datamodeltest.h
index b14db58..0021efa 100644
--- a/test/datamodeltest.h
+++ b/test/datamodeltest.h
@@ -23,7 +23,7 @@
#ifndef DATAMODELTEST_H
#define DATAMODELTEST_H

-#include <QtCore/QObject>
+#include <QObject>

namespace Massif {
class DataModel;
diff --git a/test/modeltest.h b/test/modeltest.h
index 244adbe..452f421 100644
--- a/test/modeltest.h
+++ b/test/modeltest.h
@@ -43,16 +43,16 @@
#ifndef MODELTEST_H
#define MODELTEST_H

-#include <QtCore/QObject>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QStack>
+#include <QObject>
+#include <QAbstractItemModel>
+#include <QStack>

class ModelTest : public QObject
{
Q_OBJECT

public:
- ModelTest( QAbstractItemModel *model, QObject *parent = 0 );
+ explicit ModelTest( QAbstractItemModel *model, QObject *parent = 0 );

private Q_SLOTS:
void nonDestructiveBasicTest();
diff --git a/visualizer/datatreemodel.cpp b/visualizer/datatreemodel.cpp
index 498f8b4..3a025aa 100644
--- a/visualizer/datatreemodel.cpp
+++ b/visualizer/datatreemodel.cpp
@@ -29,7 +29,7 @@

#include <KLocalizedString>

-#include <QtGui/QBrush>
+#include <QBrush>

using namespace Massif;

diff --git a/visualizer/datatreemodel.h b/visualizer/datatreemodel.h
index 4def31a..f89df7d 100644
--- a/visualizer/datatreemodel.h
+++ b/visualizer/datatreemodel.h
@@ -23,7 +23,7 @@
#ifndef MASSIF_DATATREEMODEL_H
#define MASSIF_DATATREEMODEL_H

-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>

#include "modelitem.h"

@@ -39,7 +39,7 @@ class SnapshotItem;
class DataTreeModel : public QAbstractItemModel
{
public:
- DataTreeModel(QObject* parent = 0);
+ explicit DataTreeModel(QObject* parent = 0);
virtual ~DataTreeModel();

/**
diff --git a/visualizer/detailedcostmodel.cpp b/visualizer/detailedcostmodel.cpp
index 3ce91fa..05a9d3b 100644
--- a/visualizer/detailedcostmodel.cpp
+++ b/visualizer/detailedcostmodel.cpp
@@ -31,12 +31,12 @@
#include "KChartDataValueAttributes"
#include "KChartLineAttributes"

-#include <QtGui/QColor>
-#include <QtGui/QPen>
-#include <QtGui/QBrush>
+#include <QColor>
+#include <QPen>
+#include <QBrush>

-#include <QtCore/QMultiMap>
-#include <QtCore/qalgorithms.h>
+#include <QMultiMap>
+#include <qalgorithms.h>

#include <KLocalizedString>

diff --git a/visualizer/detailedcostmodel.h b/visualizer/detailedcostmodel.h
index 55a0d66..49c70fb 100644
--- a/visualizer/detailedcostmodel.h
+++ b/visualizer/detailedcostmodel.h
@@ -23,8 +23,8 @@
#ifndef MASSIF_DETAILEDCOSTMODEL_H
#define MASSIF_DETAILEDCOSTMODEL_H

-#include <QtCore/QAbstractTableModel>
-#include <QtCore/QVector>
+#include <QAbstractTableModel>
+#include <QVector>

#include "modelitem.h"

@@ -40,7 +40,7 @@ class TreeLeafItem;
class DetailedCostModel : public QAbstractTableModel
{
public:
- DetailedCostModel(QObject* parent = 0);
+ explicit DetailedCostModel(QObject* parent = 0);
virtual ~DetailedCostModel();

/**
diff --git a/visualizer/totalcostmodel.cpp b/visualizer/totalcostmodel.cpp
index 658e7c1..9cae700 100644
--- a/visualizer/totalcostmodel.cpp
+++ b/visualizer/totalcostmodel.cpp
@@ -30,7 +30,7 @@
#include "KChartGlobal"
#include "KChartLineAttributes"

-#include <QtGui/QPen>
+#include <QPen>

#include <KLocalizedString>

diff --git a/visualizer/totalcostmodel.h b/visualizer/totalcostmodel.h
index 3cbc9c2..23c969c 100644
--- a/visualizer/totalcostmodel.h
+++ b/visualizer/totalcostmodel.h
@@ -23,7 +23,7 @@
#ifndef MASSIF_TOTALCOSTMODEL_H
#define MASSIF_TOTALCOSTMODEL_H

-#include <QtCore/QAbstractTableModel>
+#include <QAbstractTableModel>

#include "modelitem.h"

@@ -39,7 +39,7 @@ class SnapshotItem;
class TotalCostModel : public QAbstractTableModel
{
public:
- TotalCostModel(QObject* parent = 0);
+ explicit TotalCostModel(QObject* parent = 0);
virtual ~TotalCostModel();

/**

[Yuri Chornoivan]

Git commit 9d0b5f5d4e42dd3a6045c9f36de70a76871cddbd by Yuri Chornoivan.
Committed on 23/08/2018 at 17:09.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 Release How To.txt
M +2 -2 libk3b/core/k3bdefaultexternalprograms.h
M +2 -2 libk3b/jobs/k3bclonetocreader.h
M +0 -1 libk3b/projects/datacd/k3bisoimager.cpp
M +6 -6 libk3b/projects/k3bcdrskinwriter.cpp
M +2 -2 libk3b/projects/k3bcdrskinwriter.h
M +2 -2 libk3b/videodvd/k3bvideodvd.h
M +2 -2 plugins/decoder/libsndfile/k3blibsndfiledecoder.h
M +2 -2 plugins/decoder/mp3/k3bmaddecoder.h
M +2 -2 plugins/encoder/lame/k3blametyes.h
M +2 -2 src/k3bdebuggingoutputcache.h
M +2 -2 src/k3bmediacontentsview.h
M +2 -2 src/k3bsystemproblemdialog.h
M +1 -1 src/projects/k3baudiotrackplayer.h
M +1 -1 src/projects/k3baudioview.cpp
M +2 -2 src/projects/k3bbootimagedialog.h
M +2 -2 src/projects/k3bmusicbrainztrackloopupjob.h
M +1 -1 src/projects/k3bvcdview.cpp
M +2 -2 src/rip/k3baudioripjob.h
M +2 -2 src/rip/k3bmassaudioencodingjob.h
M +2 -2 src/rip/k3bvideocdrippingoptions.h

https://commits.kde.org/k3b/9d0b5f5d4e42dd3a6045c9f36de70a76871cddbd

diff --git a/Release How To.txt b/Release How To.txt
index 3c12991ed..ef54fa723 100644
--- a/Release How To.txt
+++ b/Release How To.txt
@@ -20,13 +20,13 @@ How To Create a K3b Release

6. Upload the tarball to the server (http://sourceforge.net/projects/k3b).

-7. Add new version] to the bug tracker (https://bugs.kde.org/editversions.cgi?product=k3b).</li>
+7. Add new version to the bug tracker (https://bugs.kde.org/editversions.cgi?product=k3b).

8. Write release announcement and publish it on k3b.org]. Update download page.

9. Send an announcement email to:
* ***@kde.org
- * kde-extra-***@kde.org</li>
+ * kde-extra-***@kde.org

10. Update K3b status on software sites. Following sites needs an update:
* Sourceforge (http://sourceforge.net/projects/k3b)
diff --git a/libk3b/core/k3bdefaultexternalprograms.h b/libk3b/core/k3bdefaultexternalprograms.h
index 2c0d17274..1ee746a43 100644
--- a/libk3b/core/k3bdefaultexternalprograms.h
+++ b/libk3b/core/k3bdefaultexternalprograms.h
@@ -15,8 +15,8 @@



-#ifndef _K3B_DEFAULT_EXTERNAL_BIN_PROGRAMS_H_
-#define _K3B_DEFAULT_EXTERNAL_BIN_PROGRAMS_H_
+#ifndef _K3B_DEFAULT_EXTERNAL_PROGRAMS_H_
+#define _K3B_DEFAULT_EXTERNAL_PROGRAMS_H_

#include "k3bexternalbinmanager.h"
#include "k3b_export.h"
diff --git a/libk3b/jobs/k3bclonetocreader.h b/libk3b/jobs/k3bclonetocreader.h
index 25cfb31f2..b42670e82 100644
--- a/libk3b/jobs/k3bclonetocreader.h
+++ b/libk3b/jobs/k3bclonetocreader.h
@@ -12,8 +12,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef _K3B_CLONETOC_FILE_PARSER_H_
-#define _K3B_CLONETOC_FILE_PARSER_H_
+#ifndef _K3B_CLONETOC_READER_H_
+#define _K3B_CLONETOC_READER_H_

#include "k3bimagefilereader.h"

diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index 31a83d090..6773b4d3d 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -25,7 +25,6 @@
#include "k3bprocess.h"
#include "k3bcore.h"
#include "k3bversion.h"
-#include "k3bglobals.h"
#include "k3bfilesplitter.h"
#include "k3bisooptions.h"
#include "k3b_i18n.h"
diff --git a/libk3b/projects/k3bcdrskinwriter.cpp b/libk3b/projects/k3bcdrskinwriter.cpp
index b11212059..ac24a1c78 100644
--- a/libk3b/projects/k3bcdrskinwriter.cpp
+++ b/libk3b/projects/k3bcdrskinwriter.cpp
@@ -27,14 +27,14 @@
#include "k3bthroughputestimator.h"
#include "k3bglobalsettings.h"

-#include <QtCore/QDebug>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QRegExp>
-#include <QtCore/QFile>
+#include <QDebug>
+#include <QString>
+#include <QStringList>
+#include <QRegExp>
+#include <QFile>
#include "k3b_i18n.h"

-#include <QtCore/QTemporaryFile>
+#include <QTemporaryFile>


Q_DECLARE_METATYPE( QProcess::ExitStatus )
diff --git a/libk3b/projects/k3bcdrskinwriter.h b/libk3b/projects/k3bcdrskinwriter.h
index 61f899e10..2d2e409f0 100644
--- a/libk3b/projects/k3bcdrskinwriter.h
+++ b/libk3b/projects/k3bcdrskinwriter.h
@@ -19,8 +19,8 @@

#include "k3babstractwriter.h"

-#include <QtCore/QProcess>
-#include <QtCore/QStringList>
+#include <QProcess>
+#include <QStringList>

namespace K3b {
class ExternalBin;
diff --git a/libk3b/videodvd/k3bvideodvd.h b/libk3b/videodvd/k3bvideodvd.h
index 57eebfb7b..0e1967b51 100644
--- a/libk3b/videodvd/k3bvideodvd.h
+++ b/libk3b/videodvd/k3bvideodvd.h
@@ -12,8 +12,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef _K3B_VIDEOVD_H_
-#define _K3B_VIDEOVD_H_
+#ifndef _K3B_VIDEODVD_H_
+#define _K3B_VIDEODVD_H_

#include "k3bvideodvdtitle.h"

diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
index 3ef7f6d37..9b0f2f8cf 100644
--- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
+++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
@@ -14,8 +14,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef _K3B_AIFF_DECODER_H_
-#define _K3B_AIFF_DECODER_H_
+#ifndef _K3B_LIBSNDFILE_DECODER_H_
+#define _K3B_LIBSNDFILE_DECODER_H_

#include "k3baudiodecoder.h"

diff --git a/plugins/decoder/mp3/k3bmaddecoder.h b/plugins/decoder/mp3/k3bmaddecoder.h
index f13771915..0dd97aed8 100644
--- a/plugins/decoder/mp3/k3bmaddecoder.h
+++ b/plugins/decoder/mp3/k3bmaddecoder.h
@@ -13,8 +13,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef K3BMP3MODULE_H
-#define K3BMP3MODULE_H
+#ifndef _K3B_MAD_DECODER_H_
+#define _K3B_MAD_DECODER_H_


#include "k3baudiodecoder.h"
diff --git a/plugins/encoder/lame/k3blametyes.h b/plugins/encoder/lame/k3blametyes.h
index bd829e2b3..3db3a0414 100644
--- a/plugins/encoder/lame/k3blametyes.h
+++ b/plugins/encoder/lame/k3blametyes.h
@@ -13,8 +13,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef _K3B_LAME_TYPES_H_
-#define _K3B_LAME_TYPES_H_
+#ifndef _K3B_LAME_TYES_H_
+#define _K3B_LAME_TYES_H_

#include "k3bplugin_i18n.h"

diff --git a/src/k3bdebuggingoutputcache.h b/src/k3bdebuggingoutputcache.h
index 7f6b6683d..ebbe6a166 100644
--- a/src/k3bdebuggingoutputcache.h
+++ b/src/k3bdebuggingoutputcache.h
@@ -13,8 +13,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef _K3B_DEBUG_OUTPUT_CACHE_H_
-#define _K3B_DEBUG_OUTPUT_CACHE_H_
+#ifndef _K3B_DEBUGING_OUTPUT_CACHE_H_
+#define _K3B_DEBUGING_OUTPUT_CACHE_H_

#include <QMap>
#include <QString>
diff --git a/src/k3bmediacontentsview.h b/src/k3bmediacontentsview.h
index 135df93e1..63691f1a2 100644
--- a/src/k3bmediacontentsview.h
+++ b/src/k3bmediacontentsview.h
@@ -13,8 +13,8 @@
*/


-#ifndef _K3B_MEDIUM_CONTENTS_VIEW_H_
-#define _K3B_MEDIUM_CONTENTS_VIEW_H_
+#ifndef _K3B_MEDIA_CONTENTS_VIEW_H_
+#define _K3B_MEDIA_CONTENTS_VIEW_H_

#include "k3bcontentsview.h"
#include "k3bthememanager.h"
diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h
index 87b5f10b6..50f376721 100644
--- a/src/k3bsystemproblemdialog.h
+++ b/src/k3bsystemproblemdialog.h
@@ -13,8 +13,8 @@
*/


-#ifndef _K3B_SYSTEM_DIALOG_H_
-#define _K3B_SYSTEM_DIALOG_H_
+#ifndef _K3B_SYSTEM_PROBLEM_DIALOG_H_
+#define _K3B_SYSTEM_PROBLEM_DIALOG_H_

#include <QString>
#include <QDialog>
diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h
index ee45b4595..085725900 100644
--- a/src/projects/k3baudiotrackplayer.h
+++ b/src/projects/k3baudiotrackplayer.h
@@ -18,7 +18,7 @@

#include <QObject>
#include <QScopedPointer>
-#include <QtMultimedia/qaudio.h>
+#include <qaudio.h>

class KActionCollection;

diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp
index b6df03b76..c5a431291 100644
--- a/src/projects/k3baudioview.cpp
+++ b/src/projects/k3baudioview.cpp
@@ -16,12 +16,12 @@
*/

#include "k3baudioview.h"
+#include "k3baudioviewimpl.h"

#include "k3bapplication.h"
#include "k3baudioburndialog.h"
#include "k3baudiodoc.h"
#include "k3baudioprojectmodel.h"
-#include "k3baudioviewimpl.h"
#include "k3bfillstatusdisplay.h"
#include "k3bpluginmanager.h"

diff --git a/src/projects/k3bbootimagedialog.h b/src/projects/k3bbootimagedialog.h
index efcfa95a9..ba711c0e6 100644
--- a/src/projects/k3bbootimagedialog.h
+++ b/src/projects/k3bbootimagedialog.h
@@ -14,8 +14,8 @@
*/


-#ifndef K3B_BOOTIMAGEVIEW_H
-#define K3B_BOOTIMAGEVIEW_H
+#ifndef K3B_BOOTIMAGEDIALOG_H
+#define K3B_BOOTIMAGEDIALOG_H

#include "ui_base_k3bbootimagedialog.h"

diff --git a/src/projects/k3bmusicbrainztrackloopupjob.h b/src/projects/k3bmusicbrainztrackloopupjob.h
index e0a645e6b..ba2c857a7 100644
--- a/src/projects/k3bmusicbrainztrackloopupjob.h
+++ b/src/projects/k3bmusicbrainztrackloopupjob.h
@@ -12,8 +12,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef _K3B_MUSICBRAINZ_TRACK_LOOKUP_JOB_H_
-#define _K3B_MUSICBRAINZ_TRACK_LOOKUP_JOB_H_
+#ifndef _K3B_MUSICBRAINZ_TRACK_LOOPUP_JOB_H_
+#define _K3B_MUSICBRAINZ_TRACK_LOOPUP_JOB_H_

#include "k3bthreadjob.h"

diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp
index 6a293253c..a12a91722 100644
--- a/src/projects/k3bvcdview.cpp
+++ b/src/projects/k3bvcdview.cpp
@@ -14,8 +14,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#include "k3bvcdprojectmodel.h"
#include "k3bvcdview.h"
+#include "k3bvcdprojectmodel.h"
#include "k3bvcddoc.h"
#include "k3bvcdburndialog.h"
#include "k3bvcdtrackdialog.h"
diff --git a/src/rip/k3baudioripjob.h b/src/rip/k3baudioripjob.h
index 7febb9446..0442f868c 100644
--- a/src/rip/k3baudioripjob.h
+++ b/src/rip/k3baudioripjob.h
@@ -14,8 +14,8 @@
*/


-#ifndef K3B_AUDIO_RIP_THREAD_H
-#define K3B_AUDIO_RIP_THREAD_H
+#ifndef K3B_AUDIO_RIP_JOB_H
+#define K3B_AUDIO_RIP_JOB_H

#include "k3bmassaudioencodingjob.h"
#include <QScopedPointer>
diff --git a/src/rip/k3bmassaudioencodingjob.h b/src/rip/k3bmassaudioencodingjob.h
index d5287e17e..71dd7088b 100644
--- a/src/rip/k3bmassaudioencodingjob.h
+++ b/src/rip/k3bmassaudioencodingjob.h
@@ -12,8 +12,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef K3BMASSAUDIOENCODERJOB_H
-#define K3BMASSAUDIOENCODERJOB_H
+#ifndef K3BMASSAUDIOENCODINGJOB_H
+#define K3BMASSAUDIOENCODINGJOB_H

#include "k3bmsf.h"
#include "k3bthreadjob.h"
diff --git a/src/rip/k3bvideocdrippingoptions.h b/src/rip/k3bvideocdrippingoptions.h
index 468237b10..e2463a944 100644
--- a/src/rip/k3bvideocdrippingoptions.h
+++ b/src/rip/k3bvideocdrippingoptions.h
@@ -12,8 +12,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef _K3B_VIDEOCD_OPTIONS_H_
-#define _K3B_VIDEOCD_OPTIONS_H_
+#ifndef _K3B_VIDEOCD_RIPPING_OPTIONS_H_
+#define _K3B_VIDEOCD_RIPPING_OPTIONS_H_

#include "k3bglobals.h"

[Yuri Chornoivan]

Git commit 51a7b5956e2dfc75663cf23efffc7d26f649b5d7 by Yuri Chornoivan.
Committed on 25/08/2018 at 06:31.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 codecompletion/helpers.h
M +1 -1 codecompletion/items/importfile.h
M +1 -1 codecompletion/tests/pycompletiontest.cpp
M +1 -1 codecompletion/tests/pycompletiontest.h
M +1 -1 correction_files/matplotlib/artist.py
M +1 -1 correction_files/matplotlib/backend_bases.py
M +0 -1 docfilekcm/docfilemanagerwidget.cpp
M +2 -2 docfilekcm/kcm_docfiles.h
M +1 -1 documentation_files/_sre.py
M +1 -1 documentation_src/pyqt/xml_to_py.py
M +0 -2 duchain/declarationbuilder.cpp
M +1 -1 duchain/declarations/functiondeclaration.cpp
M +0 -3 duchain/helpers.h
M +1 -1 duchain/tests/data/testCannotOverwriteBuiltins/mod.py
M +1 -1 duchain/tests/data/testCorrectionFiles/example.py
M +1 -1 duchain/tests/data/testImportFiles/other2.py
M +1 -1 duchain/tests/data/testManyDeclarations/test.py
M +1 -1 duchain/tests/duchainbench.cpp
M +2 -2 duchain/tests/pyduchaintest.cpp
M +0 -1 duchain/types/unsuretype.h
M +1 -1 parser/astdefaultvisitor.cpp
M +1 -1 parser/parsesession.h
M +1 -1 parser/python_header.h
M +1 -1 parser/tests/pyasttest.cpp
M +1 -1 parser/tests/pycythontest.cpp
M +0 -1 pythonhighlighting.cpp
M +0 -1 pythonparsejob.cpp
M +1 -1 runtest.py

https://commits.kde.org/kdev-python/51a7b5956e2dfc75663cf23efffc7d26f649b5d7

diff --git a/codecompletion/helpers.h b/codecompletion/helpers.h
index 5cc95ff2..fc1475f3 100644
--- a/codecompletion/helpers.h
+++ b/codecompletion/helpers.h
@@ -115,7 +115,7 @@ public:
TokenListEntry weakPop() {
m_internalPtr --;
if ( m_internalPtr < 0 ) {
- return TokenListEntry(ExpressionParser::InvalidStatus, QString::null, -1);
+ return TokenListEntry(ExpressionParser::InvalidStatus, QString(), -1);
}
return at(m_internalPtr);
};
diff --git a/codecompletion/items/importfile.h b/codecompletion/items/importfile.h
index 2b6c5dec..363dfa6d 100644
--- a/codecompletion/items/importfile.h
+++ b/codecompletion/items/importfile.h
@@ -42,4 +42,4 @@ public:

}

-#endif // IMPORTFILEITEM_H
\ No newline at end of file
+#endif // IMPORTFILEITEM_H
diff --git a/codecompletion/tests/pycompletiontest.cpp b/codecompletion/tests/pycompletiontest.cpp
index 18c796c0..7566cad5 100644
--- a/codecompletion/tests/pycompletiontest.cpp
+++ b/codecompletion/tests/pycompletiontest.cpp
@@ -37,7 +37,7 @@

#include <QDebug>
#include <QStandardPaths>
-#include <QtTest/QTest>
+#include <QTest>

using namespace KDevelop;

diff --git a/codecompletion/tests/pycompletiontest.h b/codecompletion/tests/pycompletiontest.h
index 97f6acaf..f386032b 100644
--- a/codecompletion/tests/pycompletiontest.h
+++ b/codecompletion/tests/pycompletiontest.h
@@ -18,7 +18,7 @@
#ifndef PYCOMPLETIONTEST_H
#define PYCOMPLETIONTEST_H

-#include <QtCore/QObject>
+#include <QObject>

#include <language/editor/cursorinrevision.h>
#include <language/codecompletion/codecompletioncontext.h>
diff --git a/correction_files/matplotlib/artist.py b/correction_files/matplotlib/artist.py
index 45596b97..f399ccd4 100644
--- a/correction_files/matplotlib/artist.py
+++ b/correction_files/matplotlib/artist.py
@@ -2,4 +2,4 @@ import matplotlib.figure

class class_Artist():
def function_set_figure(self):
- l_fig = matplotlib.figure.Figure
\ No newline at end of file
+ l_fig = matplotlib.figure.Figure
diff --git a/correction_files/matplotlib/backend_bases.py b/correction_files/matplotlib/backend_bases.py
index e1e666b7..b48e2a2e 100644
--- a/correction_files/matplotlib/backend_bases.py
+++ b/correction_files/matplotlib/backend_bases.py
@@ -16,4 +16,4 @@ class class_NavigationToolbar2:
l_canvas = FigureCanvasBase()

def function_foo(self):
- returns = [Figure()]
\ No newline at end of file
+ returns = [Figure()]
diff --git a/docfilekcm/docfilemanagerwidget.cpp b/docfilekcm/docfilemanagerwidget.cpp
index 47e5e1a5..6017fde6 100644
--- a/docfilekcm/docfilemanagerwidget.cpp
+++ b/docfilekcm/docfilemanagerwidget.cpp
@@ -40,7 +40,6 @@
#include <QStandardPaths>
#include <QDesktopServices>
#include <QIcon>
-#include <QUrl>

#include <KMessageBox>
#include <KLocalizedString>
diff --git a/docfilekcm/kcm_docfiles.h b/docfilekcm/kcm_docfiles.h
index 3ee66feb..f50945fa 100644
--- a/docfilekcm/kcm_docfiles.h
+++ b/docfilekcm/kcm_docfiles.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. *
************************************************************************/

-#ifndef KCM_PY_DOCFILES_H
-#define KCM_PY_DOCFILES_H
+#ifndef PY_KCM_DOCFILES_H
+#define PY_KCM_DOCFILES_H

#include <interfaces/configpage.h>

diff --git a/documentation_files/_sre.py b/documentation_files/_sre.py
index 5283b432..276a86f0 100644
--- a/documentation_files/_sre.py
+++ b/documentation_files/_sre.py
@@ -264,4 +264,4 @@ class MatchObject:
string = "None"

SRE_Match = MatchObject
-SRE_Pattern = RegexObject
\ No newline at end of file
+SRE_Pattern = RegexObject
diff --git a/documentation_src/pyqt/xml_to_py.py b/documentation_src/pyqt/xml_to_py.py
index 18c6a27b..6daed0e1 100644
--- a/documentation_src/pyqt/xml_to_py.py
+++ b/documentation_src/pyqt/xml_to_py.py
@@ -96,7 +96,7 @@ def parseFunction(functionNode):
paramsStr.append('{} {}'.format(*p) if p[2] is NoDefaultValue else '{} {} = {}'.format(*p))
descr += '%s %s(%s)' % (retType, funcFullName, ', '.join(paramsStr))

- # function parameters in function defintion
+ # function parameters in function definition
paramsStr = ['self'] if functionNode.parentNode.nodeName == 'Class' else [] # add `self` first parameter for methods
hadDefault = False # there has been a default argument previously
for _, argName, defaultValue in params:
diff --git a/duchain/declarationbuilder.cpp b/duchain/declarationbuilder.cpp
index 7eab0bf1..bbf76231 100644
--- a/duchain/declarationbuilder.cpp
+++ b/duchain/declarationbuilder.cpp
@@ -38,8 +38,6 @@
#include <language/duchain/declaration.h>
#include <language/duchain/duchain.h>
#include <language/duchain/types/alltypes.h>
-#include <language/duchain/classdeclaration.h>
-#include <language/duchain/declaration.h>
#include <language/duchain/builders/abstracttypebuilder.h>
#include <language/duchain/aliasdeclaration.h>
#include <language/duchain/duchainutils.h>
diff --git a/duchain/declarations/functiondeclaration.cpp b/duchain/declarations/functiondeclaration.cpp
index 5f92891d..78a9a34f 100644
--- a/duchain/declarations/functiondeclaration.cpp
+++ b/duchain/declarations/functiondeclaration.cpp
@@ -55,4 +55,4 @@ FunctionDeclaration::~FunctionDeclaration()
{
}

-}
\ No newline at end of file
+}
diff --git a/duchain/helpers.h b/duchain/helpers.h
index b77ad77d..3d8bc68b 100644
--- a/duchain/helpers.h
+++ b/duchain/helpers.h
@@ -37,10 +37,7 @@

#include <functional>

-#include "pythonduchainexport.h"
-#include "types/unsuretype.h"
#include "declarations/functiondeclaration.h"
-#include "ast.h"

using namespace KDevelop;

diff --git a/duchain/tests/data/testCannotOverwriteBuiltins/mod.py b/duchain/tests/data/testCannotOverwriteBuiltins/mod.py
index 3cdc294b..432f48c6 100644
--- a/duchain/tests/data/testCannotOverwriteBuiltins/mod.py
+++ b/duchain/tests/data/testCannotOverwriteBuiltins/mod.py
@@ -3,4 +3,4 @@
# it should be possible to import that but it should not replace the existing
# open() function
def open():
- return 3
\ No newline at end of file
+ return 3
diff --git a/duchain/tests/data/testCorrectionFiles/example.py b/duchain/tests/data/testCorrectionFiles/example.py
index 84629b82..54c62001 100644
--- a/duchain/tests/data/testCorrectionFiles/example.py
+++ b/duchain/tests/data/testCorrectionFiles/example.py
@@ -12,4 +12,4 @@ class some_class():

def member_func2(self):
baz = None
- return baz
\ No newline at end of file
+ return baz
diff --git a/duchain/tests/data/testImportFiles/other2.py b/duchain/tests/data/testImportFiles/other2.py
index f7f69f74..f0ef99ca 100644
--- a/duchain/tests/data/testImportFiles/other2.py
+++ b/duchain/tests/data/testImportFiles/other2.py
@@ -1,4 +1,4 @@
import time

class Foo(object):
- attr = 3
\ No newline at end of file
+ attr = 3
diff --git a/duchain/tests/data/testManyDeclarations/test.py b/duchain/tests/data/testManyDeclarations/test.py
index 5954d36d..69a41e17 100644
--- a/duchain/tests/data/testManyDeclarations/test.py
+++ b/duchain/tests/data/testManyDeclarations/test.py
@@ -30,4 +30,4 @@ class Foo: pass
class Foo: pass
class Foo: pass
class Foo: pass
-class Foo: pass
\ No newline at end of file
+class Foo: pass
diff --git a/duchain/tests/duchainbench.cpp b/duchain/tests/duchainbench.cpp
index d487eba7..88fb66a8 100644
--- a/duchain/tests/duchainbench.cpp
+++ b/duchain/tests/duchainbench.cpp
@@ -31,7 +31,7 @@
#include <tests/autotestshell.h>
#include <tests/testcore.h>
#include <language/duchain/duchain.h>
-#include <QtTest/QtTest>
+#include <QtTest>
#include <language/backgroundparser/backgroundparser.h>
#include <interfaces/ilanguagecontroller.h>
#include <QStandardPaths>
diff --git a/duchain/tests/pyduchaintest.cpp b/duchain/tests/pyduchaintest.cpp
index ef078557..c07a8394 100644
--- a/duchain/tests/pyduchaintest.cpp
+++ b/duchain/tests/pyduchaintest.cpp
@@ -34,8 +34,8 @@
#include <tests/autotestshell.h>
#include <tests/testcore.h>
#include <language/duchain/duchain.h>
-#include <QtTest/QtTest>
-#include <QtWidgets/QApplication>
+#include <QtTest>
+#include <QApplication>
#include <language/duchain/types/functiontype.h>
#include <language/duchain/types/containertypes.h>
#include <language/duchain/aliasdeclaration.h>
diff --git a/duchain/types/unsuretype.h b/duchain/types/unsuretype.h
index e4030f42..6070c723 100644
--- a/duchain/types/unsuretype.h
+++ b/duchain/types/unsuretype.h
@@ -29,7 +29,6 @@
#include <language/editor/modificationrevision.h>
#include <language/duchain/topducontext.h>
#include <language/duchain/types/typesystem.h>
-#include <language/duchain/types/typesystemdata.h>
#include <language/duchain/types/typealiastype.h>
#include <language/duchain/types/unsuretype.h>
#include <language/duchain/types/indexedtype.h>
diff --git a/parser/astdefaultvisitor.cpp b/parser/astdefaultvisitor.cpp
index 59e5274c..5db1f6f1 100644
--- a/parser/astdefaultvisitor.cpp
+++ b/parser/astdefaultvisitor.cpp
@@ -35,7 +35,7 @@ void free_ast_recursive(CodeAst *node)
AstDefaultVisitor::AstDefaultVisitor() { }
AstDefaultVisitor::~AstDefaultVisitor() { }

-// The Ast "ends" here, those dont have child nodes
+// The Ast "ends" here, those don't have child nodes
// note that Identifier is not a node in this Ast
void AstDefaultVisitor::visitNameConstant(NameConstantAst* node) { Q_UNUSED(node); }
void AstDefaultVisitor::visitPass(PassAst* node) { Q_UNUSED(node); }
diff --git a/parser/parsesession.h b/parser/parsesession.h
index 0b5f46fe..8ace2930 100644
--- a/parser/parsesession.h
+++ b/parser/parsesession.h
@@ -19,7 +19,7 @@
#ifndef PYTHON_PARSESESSION_H
#define PYTHON_PARSESESSION_H

-#include <QtCore/QString>
+#include <QString>

#include "parserexport.h"
#include <language/duchain/duchainpointer.h>
diff --git a/parser/python_header.h b/parser/python_header.h
index 43a9e857..32c35c6a 100644
--- a/parser/python_header.h
+++ b/parser/python_header.h
@@ -48,4 +48,4 @@
// remove evil macros from headers which pollute the namespace (grr!)
#undef test
#undef decorators
-#undef Attribute
\ No newline at end of file
+#undef Attribute
diff --git a/parser/tests/pyasttest.cpp b/parser/tests/pyasttest.cpp
index fefbac25..1671953e 100644
--- a/parser/tests/pyasttest.cpp
+++ b/parser/tests/pyasttest.cpp
@@ -43,7 +43,7 @@
#include <ktexteditor_version.h>

#include <QDebug>
-#include <QtTest/QtTest>
+#include <QtTest>

using namespace Python;

diff --git a/parser/tests/pycythontest.cpp b/parser/tests/pycythontest.cpp
index 04be0333..4129fadc 100644
--- a/parser/tests/pycythontest.cpp
+++ b/parser/tests/pycythontest.cpp
@@ -35,7 +35,7 @@
#include <ktexteditor_version.h>

#include <QDebug>
-#include <QtTest/QtTest>
+#include <QtTest>

using namespace Python;

diff --git a/pythonhighlighting.cpp b/pythonhighlighting.cpp
index 3ccb33e3..3831f6f1 100644
--- a/pythonhighlighting.cpp
+++ b/pythonhighlighting.cpp
@@ -21,7 +21,6 @@

#include <language/duchain/declaration.h>
#include <language/duchain/types/abstracttype.h>
-#include <language/duchain/declaration.h>

using namespace KDevelop;

diff --git a/pythonparsejob.cpp b/pythonparsejob.cpp
index c4e81486..5081d530 100644
--- a/pythonparsejob.cpp
+++ b/pythonparsejob.cpp
@@ -47,7 +47,6 @@
#include <interfaces/iprojectcontroller.h>
#include <interfaces/ilanguagecontroller.h>
#include <interfaces/idocumentcontroller.h>
-#include <interfaces/iprojectcontroller.h>
#include <util/foregroundlock.h>
#include <project/projectmodel.h>
#include <util/path.h>
diff --git a/runtest.py b/runtest.py
index e9939919..c6debcb9 100755
--- a/runtest.py
+++ b/runtest.py
@@ -115,7 +115,7 @@ class TestRunner():
fatal_fail = re.match(r"(QFATAL|ASSERT)\s*", line)
if fatal_fail:
print(self.data)
- print(red("Fatal error occured, aborting"))
+ print(red("Fatal error occurred, aborting"))
return

passed, failed = len(self.passed_tests), len(self.failed_tests)

[Yuri Chornoivan]

Git commit 11cf3541d05c3dab9083b07df99a9f8221101616 by Yuri Chornoivan.
Committed on 25/08/2018 at 06:46.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -2 codegen/refactoring.cpp
M +2 -2 completion/tests/bench_completion.h
M +1 -1 docs/phpdocsplugin.cpp
M +1 -1 duchain/navigation/declarationnavigationcontext.cpp
M +1 -1 duchain/navigation/magicconstantnavigationcontext.cpp
M +2 -2 duchain/tests/benchmarks.h
M +1 -1 duchain/tests/duchain.cpp
M +1 -1 duchain/tests/expressionparser.cpp
M +1 -1 duchain/tests/uses.cpp
M +1 -1 parser/parsesession.h
M +4 -4 parser/phplexer.cpp
M +1 -1 parser/test/lexertest.cpp
M +1 -1 phplanguagesupport.h
M +2 -2 phpparsejob.cpp
M +1 -1 testprovider/phpunitprovider.cpp
M +1 -1 testprovider/testdoxdelegate.h

https://commits.kde.org/kdev-php/11cf3541d05c3dab9083b07df99a9f8221101616

diff --git a/codegen/refactoring.cpp b/codegen/refactoring.cpp
index fe35d2f..7555a1a 100644
--- a/codegen/refactoring.cpp
+++ b/codegen/refactoring.cpp
@@ -19,10 +19,9 @@
*/


-#include <QtCore/QObject>
+#include <QObject>
#include <codegen/refactoring.h>

-
namespace Php
{

diff --git a/completion/tests/bench_completion.h b/completion/tests/bench_completion.h
index ed096d5..d01cd5f 100644
--- a/completion/tests/bench_completion.h
+++ b/completion/tests/bench_completion.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef PHP_BENCHMARKCODECOMPLETION_H
-#define PHP_BENCHMARKCODECOMPLETION_H
+#ifndef PHP_BENCH_COMPLETION_H
+#define PHP_BENCH_COMPLETION_H

#include "../../duchain/tests/duchaintestbase.h"

diff --git a/docs/phpdocsplugin.cpp b/docs/phpdocsplugin.cpp
index 12901db..d49d869 100644
--- a/docs/phpdocsplugin.cpp
+++ b/docs/phpdocsplugin.cpp
@@ -40,7 +40,7 @@
#include <language/duchain/classmemberdeclaration.h>
#include <language/duchain/classfunctiondeclaration.h>

-#include <QtCore/QFile>
+#include <QFile>

#include "phpdocsdebug.h"
#include "phpdocumentation.h"
diff --git a/duchain/navigation/declarationnavigationcontext.cpp b/duchain/navigation/declarationnavigationcontext.cpp
index ed84c7c..9ef7b84 100644
--- a/duchain/navigation/declarationnavigationcontext.cpp
+++ b/duchain/navigation/declarationnavigationcontext.cpp
@@ -19,7 +19,7 @@

#include "declarationnavigationcontext.h"

-#include <QtGui/QTextDocument>
+#include <QTextDocument>

#include <klocalizedstring.h>

diff --git a/duchain/navigation/magicconstantnavigationcontext.cpp b/duchain/navigation/magicconstantnavigationcontext.cpp
index 8781236..273546e 100644
--- a/duchain/navigation/magicconstantnavigationcontext.cpp
+++ b/duchain/navigation/magicconstantnavigationcontext.cpp
@@ -18,7 +18,7 @@

#include "magicconstantnavigationcontext.h"

-#include <QtGui/QTextDocument>
+#include <QTextDocument>
#include <KLocalizedString>
#include <language/duchain/topducontext.h>
#include <language/duchain/declaration.h>
diff --git a/duchain/tests/benchmarks.h b/duchain/tests/benchmarks.h
index d541eec..85a6eed 100644
--- a/duchain/tests/benchmarks.h
+++ b/duchain/tests/benchmarks.h
@@ -18,8 +18,8 @@
#ifndef BENCHMARKS_H
#define BENCHMARKS_H

-#include <QtCore/QObject>
-#include <QtCore/QFile>
+#include <QObject>
+#include <QFile>

#include "duchaintestbase.h"

diff --git a/duchain/tests/duchain.cpp b/duchain/tests/duchain.cpp
index c72d8e6..85e522f 100644
--- a/duchain/tests/duchain.cpp
+++ b/duchain/tests/duchain.cpp
@@ -18,7 +18,7 @@

#include "duchain.h"

-#include <QtTest/QtTest>
+#include <QtTest>

#include <language/duchain/parsingenvironment.h>
#include <language/duchain/problem.h>
diff --git a/duchain/tests/expressionparser.cpp b/duchain/tests/expressionparser.cpp
index c76fc11..2fe6740 100644
--- a/duchain/tests/expressionparser.cpp
+++ b/duchain/tests/expressionparser.cpp
@@ -18,7 +18,7 @@

#include "expressionparser.h"

-#include <QtTest/QtTest>
+#include <QtTest>

#include <language/duchain/parsingenvironment.h>
#include <language/duchain/problem.h>
diff --git a/duchain/tests/uses.cpp b/duchain/tests/uses.cpp
index 2e8731f..fefc350 100644
--- a/duchain/tests/uses.cpp
+++ b/duchain/tests/uses.cpp
@@ -18,7 +18,7 @@

#include "uses.h"

-#include <QtTest/QtTest>
+#include <QtTest>

#include <language/duchain/duchain.h>
#include <language/duchain/duchainlock.h>
diff --git a/parser/parsesession.h b/parser/parsesession.h
index 1a0e630..06fe299 100644
--- a/parser/parsesession.h
+++ b/parser/parsesession.h
@@ -19,7 +19,7 @@
#ifndef PHP_PARSESESSION_H
#define PHP_PARSESESSION_H

-#include <QtCore/QString>
+#include <QString>
#include "phpparser.h"
#include "parserexport.h"

diff --git a/parser/phplexer.cpp b/parser/phplexer.cpp
index 6d5873a..04471c0 100644
--- a/parser/phplexer.cpp
+++ b/parser/phplexer.cpp
@@ -23,10 +23,10 @@
#include "phpparser.h"
#include "tokenstream.h"

-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QStringList>
+#include <QRegExp>
+#include <QDebug>

#include "parserdebug.h"

diff --git a/parser/test/lexertest.cpp b/parser/test/lexertest.cpp
index 8a9a23a..5a38c33 100644
--- a/parser/test/lexertest.cpp
+++ b/parser/test/lexertest.cpp
@@ -19,7 +19,7 @@

#include "lexertest.h"

-#include <QtTest/QtTest>
+#include <QtTest>

#include "parsesession.h"
#include "phplexer.h"
diff --git a/phplanguagesupport.h b/phplanguagesupport.h
index e129890..7b76709 100644
--- a/phplanguagesupport.h
+++ b/phplanguagesupport.h
@@ -22,7 +22,7 @@

#include <interfaces/iplugin.h>
#include <language/interfaces/ilanguagesupport.h>
-#include <QtCore/QVariant>
+#include <QVariant>

namespace KDevelop
{
diff --git a/phpparsejob.cpp b/phpparsejob.cpp
index cf740c4..ddef210 100644
--- a/phpparsejob.cpp
+++ b/phpparsejob.cpp
@@ -42,8 +42,8 @@
#include "phpducontext.h"
#include "phpdebug.h"

-#include <QtCore/QReadLocker>
-#include <QtCore/QThread>
+#include <QReadLocker>
+#include <QThread>
#include <language/duchain/duchainutils.h>

#include <mutex>
diff --git a/testprovider/phpunitprovider.cpp b/testprovider/phpunitprovider.cpp
index 9ef4b04..cd2b279 100644
--- a/testprovider/phpunitprovider.cpp
+++ b/testprovider/phpunitprovider.cpp
@@ -69,7 +69,7 @@ void PhpUnitProvider::updateReady(const IndexedString& document, const Reference

DUChainReadLocker lock;
if (!context) {
- qCDebug(TESTPROVIDER) << "Recieved null context for file: " << document;
+ qCDebug(TESTPROVIDER) << "Received null context for file: " << document;
return;
}

diff --git a/testprovider/testdoxdelegate.h b/testprovider/testdoxdelegate.h
index f5e2c14..4ef33de 100644
--- a/testprovider/testdoxdelegate.h
+++ b/testprovider/testdoxdelegate.h
@@ -21,7 +21,7 @@
#ifndef TESTDOXDELEGATE_H
#define TESTDOXDELEGATE_H

-#include <QtWidgets/QItemDelegate>
+#include <QItemDelegate>
#include <KColorScheme>

class TestDoxDelegate : public QItemDelegate

[Yuri Chornoivan]

Git commit 6d1297e8f75c37f0b2d1d05db5c45d410bee45d9 by Yuri Chornoivan.
Committed on 25/08/2018 at 19:45.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 Tests/auxiliary/testcachingdms.cpp
M +1 -1 Tests/auxiliary/testcsvparser.h
M +1 -1 Tests/auxiliary/testdms.cpp
M +1 -1 Tests/auxiliary/testfwparser.h
M +1 -1 Tests/kstars_ui/kstars_ui_tests.cpp
M +1 -1 kstars/auxiliary/QRoundProgressBar.cpp
M +1 -1 kstars/auxiliary/imageexporter.cpp
M +1 -1 kstars/auxiliary/kswizard.h
M +28 -28 kstars/auxiliary/qcustomplot.h
M +1 -1 kstars/auxiliary/xplanetimageviewer.cpp
M +1 -1 kstars/ekos/auxiliary/dome.h
M +1 -1 kstars/ekos/auxiliary/dustcap.h
M +1 -1 kstars/ekos/auxiliary/weather.h
M +1 -1 kstars/ekos/capture/capture.h
M +2 -1 kstars/ekos/capture/dslrinfodialog.cpp
M +2 -2 kstars/ekos/ekos.cpp
M +1 -1 kstars/ekos/guide/externalguide/linguider.cpp
M +1 -1 kstars/ekos/guide/externalguide/phd2.cpp
M +1 -1 kstars/ekos/guide/guide.h
M +0 -2 kstars/ekos/guide/internalguide/guider.h
M +4 -3 kstars/ekos/mount/mount.cpp
M +1 -1 kstars/ekos/mount/mount.h
M +2 -1 kstars/ekos/profilewizard.cpp
M +1 -1 kstars/ekos/scheduler/scheduler.h
M +14 -14 kstars/fitsviewer/starprofileviewer.h
M +1 -1 kstars/printing/printingwizard.cpp
M +2 -2 kstars/printing/pwizfovbrowse.cpp
M +3 -3 kstars/printing/pwizprint.cpp

https://commits.kde.org/kstars/6d1297e8f75c37f0b2d1d05db5c45d410bee45d9

diff --git a/Tests/auxiliary/testcachingdms.cpp b/Tests/auxiliary/testcachingdms.cpp
index a8f342a79..7fe459e4e 100644
--- a/Tests/auxiliary/testcachingdms.cpp
+++ b/Tests/auxiliary/testcachingdms.cpp
@@ -19,7 +19,7 @@

#include "auxiliary/cachingdms.h"

-#include <QtTest/QtTest>
+#include <QtTest>

#include <ctime>
#include <cstdlib>
diff --git a/Tests/auxiliary/testcsvparser.h b/Tests/auxiliary/testcsvparser.h
index 69e33da5d..7cd4c4201 100644
--- a/Tests/auxiliary/testcsvparser.h
+++ b/Tests/auxiliary/testcsvparser.h
@@ -19,7 +19,7 @@

#include "ksparser.h"

-#include <QtTest/QtTest>
+#include <QtTest>

class TestCSVParser : public QObject
{
diff --git a/Tests/auxiliary/testdms.cpp b/Tests/auxiliary/testdms.cpp
index 96a42eb18..0aa94bd79 100644
--- a/Tests/auxiliary/testdms.cpp
+++ b/Tests/auxiliary/testdms.cpp
@@ -11,7 +11,7 @@

#include "auxiliary/dms.h"

-#include <QtTest/QtTest>
+#include <QtTest>

TestDMS::TestDMS() : QObject()
{
diff --git a/Tests/auxiliary/testfwparser.h b/Tests/auxiliary/testfwparser.h
index ed8289170..1af4f16ae 100644
--- a/Tests/auxiliary/testfwparser.h
+++ b/Tests/auxiliary/testfwparser.h
@@ -20,7 +20,7 @@
#include "ksparser.h"

#include <QDebug>
-#include <QtTest/QtTest>
+#include <QtTest>

class TestFWParser : public QObject
{
diff --git a/Tests/kstars_ui/kstars_ui_tests.cpp b/Tests/kstars_ui/kstars_ui_tests.cpp
index f0c1d1ab2..752e5c9cf 100644
--- a/Tests/kstars_ui/kstars_ui_tests.cpp
+++ b/Tests/kstars_ui/kstars_ui_tests.cpp
@@ -23,7 +23,7 @@

#include <QFuture>
#include <QtConcurrentRun>
-#include <QtTest/QtTest>
+#include <QtTest>

#include <ctime>
#include <unistd.h>
diff --git a/kstars/auxiliary/QRoundProgressBar.cpp b/kstars/auxiliary/QRoundProgressBar.cpp
index 026f79dd2..e34616385 100644
--- a/kstars/auxiliary/QRoundProgressBar.cpp
+++ b/kstars/auxiliary/QRoundProgressBar.cpp
@@ -18,7 +18,7 @@

#include "QRoundProgressBar.h"

-#include <QtGui/QPainter>
+#include <QPainter>

QRoundProgressBar::QRoundProgressBar(QWidget *parent)
: QWidget(parent), m_min(0), m_max(100), m_value(25), m_nullPosition(PositionTop), m_barStyle(StyleDonut),
diff --git a/kstars/auxiliary/imageexporter.cpp b/kstars/auxiliary/imageexporter.cpp
index a1f906055..3ecaeb485 100644
--- a/kstars/auxiliary/imageexporter.cpp
+++ b/kstars/auxiliary/imageexporter.cpp
@@ -27,7 +27,7 @@
/* Qt Includes */
#include <QTemporaryFile>
#include <QStatusBar>
-#include <QtSvg/QSvgGenerator>
+#include <QSvgGenerator>

ImageExporter::ImageExporter(QObject *parent) : QObject(parent), m_includeLegend(false), m_Size(nullptr)
{
diff --git a/kstars/auxiliary/kswizard.h b/kstars/auxiliary/kswizard.h
index 596874dc2..68d0f98f8 100644
--- a/kstars/auxiliary/kswizard.h
+++ b/kstars/auxiliary/kswizard.h
@@ -21,7 +21,7 @@
#include <QDialogButtonBox>
#include <QProcess>
#include <QPlainTextEdit>
-#include <QtCore/qsystemdetection.h>
+#include <qsystemdetection.h>

#include <QNetworkAccessManager>
#include <QNetworkRequest>
diff --git a/kstars/auxiliary/qcustomplot.h b/kstars/auxiliary/qcustomplot.h
index 0dba2116e..82fe9637e 100644
--- a/kstars/auxiliary/qcustomplot.h
+++ b/kstars/auxiliary/qcustomplot.h
@@ -44,48 +44,48 @@
#define QCP_DEVICEPIXELRATIO_SUPPORTED
#endif

-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QTimer>
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QWheelEvent>
-#include <QtGui/QPixmap>
-#include <QtCore/QVector>
-#include <QtCore/QString>
-#include <QtCore/QDateTime>
-#include <QtCore/QMultiMap>
-#include <QtCore/QFlags>
-#include <QtCore/QDebug>
-#include <QtCore/QStack>
-#include <QtCore/QCache>
-#include <QtCore/QMargins>
+#include <QObject>
+#include <QPointer>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QMouseEvent>
+#include <QWheelEvent>
+#include <QPixmap>
+#include <QVector>
+#include <QString>
+#include <QDateTime>
+#include <QMultiMap>
+#include <QFlags>
+#include <QDebug>
+#include <QStack>
+#include <QCache>
+#include <QMargins>
#include <qmath.h>
#include <limits>
#include <algorithm>
#ifdef QCP_OPENGL_FBO
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLFramebufferObject>
+#include <QOpenGLContext>
+#include <QOpenGLFramebufferObject>
#ifdef QCP_OPENGL_OFFSCREENSURFACE
-#include <QtGui/QOffscreenSurface>
+#include <QOffscreenSurface>
#else
-#include <QtGui/QWindow>
+#include <QWindow>
#endif
#endif
#ifdef QCP_OPENGL_PBUFFER
-#include <QtOpenGL/QGLPixelBuffer>
+#include <QGLPixelBuffer>
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <qnumeric.h>
-#include <QtGui/QWidget>
-#include <QtGui/QPrinter>
-#include <QtGui/QPrintEngine>
+#include <QWidget>
+#include <QPrinter>
+#include <QPrintEngine>
#else
#include <QtNumeric>
-#include <QtWidgets/QWidget>
-#include <QtPrintSupport/QtPrintSupport>
+#include <QWidget>
+#include <QtPrintSupport>
#endif

class QCPPainter;
diff --git a/kstars/auxiliary/xplanetimageviewer.cpp b/kstars/auxiliary/xplanetimageviewer.cpp
index 4767fc130..b196e83ea 100644
--- a/kstars/auxiliary/xplanetimageviewer.cpp
+++ b/kstars/auxiliary/xplanetimageviewer.cpp
@@ -38,7 +38,7 @@
#include <QVBoxLayout>
#include <QPushButton>
#include <QApplication>
-#include <QtWidgets/QSlider>
+#include <QSlider>
#include "skymap.h"
#include "kspaths.h"
#include "fov.h"
diff --git a/kstars/ekos/auxiliary/dome.h b/kstars/ekos/auxiliary/dome.h
index aa2031de5..404560c23 100644
--- a/kstars/ekos/auxiliary/dome.h
+++ b/kstars/ekos/auxiliary/dome.h
@@ -12,7 +12,7 @@
#include "indi/indistd.h"
#include "indi/indidome.h"

-#include <QtDBus/QtDBus>
+#include <QtDBus>

namespace Ekos
{
diff --git a/kstars/ekos/auxiliary/dustcap.h b/kstars/ekos/auxiliary/dustcap.h
index e9820f209..7b59affd7 100644
--- a/kstars/ekos/auxiliary/dustcap.h
+++ b/kstars/ekos/auxiliary/dustcap.h
@@ -12,7 +12,7 @@
#include "indi/indistd.h"
#include "indi/indicap.h"

-#include <QtDBus/QtDBus>
+#include <QtDBus>

namespace Ekos
{
diff --git a/kstars/ekos/auxiliary/weather.h b/kstars/ekos/auxiliary/weather.h
index caa7d077d..ca76a0d16 100644
--- a/kstars/ekos/auxiliary/weather.h
+++ b/kstars/ekos/auxiliary/weather.h
@@ -12,7 +12,7 @@
#include "indi/indistd.h"
#include "indi/indiweather.h"

-#include <QtDBus/QtDBus>
+#include <QtDBus>

namespace Ekos
{
diff --git a/kstars/ekos/capture/capture.h b/kstars/ekos/capture/capture.h
index b4d8e88b1..d93f1f64d 100644
--- a/kstars/ekos/capture/capture.h
+++ b/kstars/ekos/capture/capture.h
@@ -23,7 +23,7 @@

#include <QTimer>
#include <QUrl>
-#include <QtDBus/QtDBus>
+#include <QtDBus>

#include <memory>

diff --git a/kstars/ekos/capture/dslrinfodialog.cpp b/kstars/ekos/capture/dslrinfodialog.cpp
index 160500749..bdfd1840d 100644
--- a/kstars/ekos/capture/dslrinfodialog.cpp
+++ b/kstars/ekos/capture/dslrinfodialog.cpp
@@ -8,10 +8,11 @@

*/

+#include "dslrinfodialog.h"
+
#include <KMessageBox>
#include <KLocalizedString>

-#include "dslrinfodialog.h"
#include "Options.h"

DSLRInfo::DSLRInfo(QWidget *parent, ISD::CCD *ccd) : QDialog(parent)
diff --git a/kstars/ekos/ekos.cpp b/kstars/ekos/ekos.cpp
index b3aa60d23..bbe80ee6f 100644
--- a/kstars/ekos/ekos.cpp
+++ b/kstars/ekos/ekos.cpp
@@ -7,6 +7,8 @@
version 2 of the License, or (at your option) any later version.
*/

+#include "ekos.h"
+
#include <gsl/gsl_fit.h>
#include <gsl/gsl_vector.h>
#include <gsl/gsl_matrix.h>
@@ -14,8 +16,6 @@

#include <QDebug>

-#include "ekos.h"
-
namespace Ekos
{
const QString &getGuideStatusString(GuideState state)
diff --git a/kstars/ekos/guide/externalguide/linguider.cpp b/kstars/ekos/guide/externalguide/linguider.cpp
index 9d4e60578..e01b2fa76 100644
--- a/kstars/ekos/guide/externalguide/linguider.cpp
+++ b/kstars/ekos/guide/externalguide/linguider.cpp
@@ -14,7 +14,7 @@
#include <KLocalizedString>
#include <KMessageBox>

-#include <QtNetwork/QNetworkReply>
+#include <QNetworkReply>

namespace Ekos
{
diff --git a/kstars/ekos/guide/externalguide/phd2.cpp b/kstars/ekos/guide/externalguide/phd2.cpp
index 98c16b045..6d5b96ea5 100644
--- a/kstars/ekos/guide/externalguide/phd2.cpp
+++ b/kstars/ekos/guide/externalguide/phd2.cpp
@@ -22,7 +22,7 @@
#include <QImage>

#include <QJsonDocument>
-#include <QtNetwork/QNetworkReply>
+#include <QNetworkReply>

#include <ekos_guide_debug.h>

diff --git a/kstars/ekos/guide/guide.h b/kstars/ekos/guide/guide.h
index 864113dd3..6eae128cd 100644
--- a/kstars/ekos/guide/guide.h
+++ b/kstars/ekos/guide/guide.h
@@ -16,7 +16,7 @@

#include <QTime>
#include <QTimer>
-#include <QtDBus/QtDBus>
+#include <QtDBus>

class QProgressIndicator;
class QTabWidget;
diff --git a/kstars/ekos/guide/internalguide/guider.h b/kstars/ekos/guide/internalguide/guider.h
index a693341ee..a956fb97d 100644
--- a/kstars/ekos/guide/internalguide/guider.h
+++ b/kstars/ekos/guide/internalguide/guider.h
@@ -17,8 +17,6 @@
#include "gmath.h"
#include "../guide.h"

-#include <QtGui>
-
class internalGuider : public QWidget
{
Q_OBJECT
diff --git a/kstars/ekos/mount/mount.cpp b/kstars/ekos/mount/mount.cpp
index 44e0613b4..a0585616f 100644
--- a/kstars/ekos/mount/mount.cpp
+++ b/kstars/ekos/mount/mount.cpp
@@ -7,14 +7,15 @@
version 2 of the License, or (at your option) any later version.
*/

-#include <QtQuick/QQuickView>
-#include <QtQuick/QQuickItem>
+#include "mount.h"
+
+#include <QQuickView>
+#include <QQuickItem>

#include <KNotifications/KNotification>
#include <KLocalizedContext>
#include <KActionCollection>

-#include "mount.h"
#include "Options.h"

#include "indi/driverinfo.h"
diff --git a/kstars/ekos/mount/mount.h b/kstars/ekos/mount/mount.h
index 2ce147a22..e6edc0088 100644
--- a/kstars/ekos/mount/mount.h
+++ b/kstars/ekos/mount/mount.h
@@ -11,7 +11,7 @@
#define MOUNT_H

#include <QQmlContext>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
#include "ui_mount.h"

#include "indi/indistd.h"
diff --git a/kstars/ekos/profilewizard.cpp b/kstars/ekos/profilewizard.cpp
index 43852a081..b6c7396da 100644
--- a/kstars/ekos/profilewizard.cpp
+++ b/kstars/ekos/profilewizard.cpp
@@ -8,12 +8,13 @@
version 2 of the License, or (at your option) any later version.
*/

+#include "profilewizard.h"
+
#include <QDesktopServices>
#include <QUrl>
#include <QTcpSocket>
#include <QTimer>

-#include "profilewizard.h"
#include "kstars.h"
#include "auxiliary/kspaths.h"
#include "ksnotification.h"
diff --git a/kstars/ekos/scheduler/scheduler.h b/kstars/ekos/scheduler/scheduler.h
index 45fca0791..9053fd6c5 100644
--- a/kstars/ekos/scheduler/scheduler.h
+++ b/kstars/ekos/scheduler/scheduler.h
@@ -20,7 +20,7 @@
#include <QTime>
#include <QTimer>
#include <QUrl>
-#include <QtDBus/QtDBus>
+#include <QtDBus>

#include <cstdint>

diff --git a/kstars/fitsviewer/starprofileviewer.h b/kstars/fitsviewer/starprofileviewer.h
index 7dc5a2b7a..f611bdd5b 100644
--- a/kstars/fitsviewer/starprofileviewer.h
+++ b/kstars/fitsviewer/starprofileviewer.h
@@ -18,26 +18,26 @@
#include <QtDataVisualization/qbardataproxy.h>
#include <QtDataVisualization/q3dbars.h>
#include <QtDataVisualization/QCustom3DLabel>
-#include <QtWidgets/QSlider>
+#include <QSlider>
#include <QDialog>

-#include <QtWidgets/QWidget>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QMessageBox>
-#include <QtGui/QPainter>
-#include <QtGui/QScreen>
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QGroupBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QMessageBox>
+#include <QPainter>
+#include <QScreen>

#include <QtDataVisualization/QValue3DAxis>
#include <QtDataVisualization/Q3DTheme>
#include <QtDataVisualization/qabstract3dseries.h>
-#include <QtGui/QImage>
-#include <QtCore/qmath.h>
+#include <QImage>
+#include <qmath.h>
#include <QMessageBox>

using namespace QtDataVisualization;
diff --git a/kstars/printing/printingwizard.cpp b/kstars/printing/printingwizard.cpp
index 7902d67f7..ebefc86ba 100644
--- a/kstars/printing/printingwizard.cpp
+++ b/kstars/printing/printingwizard.cpp
@@ -18,7 +18,7 @@
#include "printingwizard.h"

#include <QStackedWidget>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
#include <QStandardPaths>

#include "finderchart.h"
diff --git a/kstars/printing/pwizfovbrowse.cpp b/kstars/printing/pwizfovbrowse.cpp
index 2e4f3ab88..8ad3de4ea 100644
--- a/kstars/printing/pwizfovbrowse.cpp
+++ b/kstars/printing/pwizfovbrowse.cpp
@@ -15,9 +15,9 @@
* *
***************************************************************************/

-#include <QPointer>
-
#include "pwizfovbrowse.h"
+
+#include <QPointer>
#include "foveditordialog.h"

PWizFovBrowseUI::PWizFovBrowseUI(PrintingWizard *wizard, QWidget *parent) : QFrame(parent), m_ParentWizard(wizard)
diff --git a/kstars/printing/pwizprint.cpp b/kstars/printing/pwizprint.cpp
index 3c1bb4411..c929e7b7e 100644
--- a/kstars/printing/pwizprint.cpp
+++ b/kstars/printing/pwizprint.cpp
@@ -26,9 +26,9 @@

#include <QFileDialog>
#include <QTemporaryFile>
-#include <QtPrintSupport/QPrintPreviewDialog>
-#include <QtPrintSupport/QPrinter>
-#include <QtPrintSupport/QPrintDialog>
+#include <QPrintPreviewDialog>
+#include <QPrinter>
+#include <QPrintDialog>
#include <QPointer>

PWizPrintUI::PWizPrintUI(PrintingWizard *wizard, QWidget *parent) : QFrame(parent), m_ParentWizard(wizard)

[Yuri Chornoivan]

Git commit ec8f5c780dba6a06e644d80588d7ea037d1c5009 by Yuri Chornoivan.
Committed on 26/08/2018 at 09:02.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 src/backend/cantorWorksheet/CantorWorksheet.h
M +1 -1 src/backend/core/Workbook.h
M +1 -1 src/backend/datapicker/DatapickerImage.h
M +1 -1 src/backend/datasources/AbstractDataSource.h
M +1 -1 src/backend/datasources/LiveDataSource.h
M +1 -1 src/backend/datasources/MQTTSubscription.h
M +1 -1 src/backend/datasources/filters/JsonFilterPrivate.h
M +1 -1 src/backend/datasources/filters/QJsonModel.h
M +1 -1 src/backend/datasources/filters/ROOTFilterPrivate.h
M +1 -1 src/backend/matrix/Matrix.h
M +1 -1 src/backend/spreadsheet/Spreadsheet.h
M +1 -1 src/backend/worksheet/Worksheet.h
M +1 -1 src/commonfrontend/worksheet/WorksheetView.h
M +2 -2 src/kdefrontend/datasources/MQTTConnectionManagerWidget.cpp
M +1 -1 src/kdefrontend/datasources/MQTTErrorWidget.h
M +0 -1 src/kdefrontend/dockwidgets/BarChartPlotDock.cpp
M +0 -1 src/kdefrontend/dockwidgets/BarChartPlotDock.h
M +1 -1 src/kdefrontend/dockwidgets/LiveDataDock.cpp
M +1 -1 tests/analysis/fit/FitTest.h
M +1 -1 tests/import_export/ASCII/AsciiFilterTest.h
M +1 -1 tests/import_export/JSON/data/array.json
M +1 -1 tests/import_export/JSON/data/object.json

https://commits.kde.org/labplot/ec8f5c780dba6a06e644d80588d7ea037d1c5009

diff --git a/src/backend/cantorWorksheet/CantorWorksheet.h b/src/backend/cantorWorksheet/CantorWorksheet.h
index 8dc40104..2d21cf6b 100644
--- a/src/backend/cantorWorksheet/CantorWorksheet.h
+++ b/src/backend/cantorWorksheet/CantorWorksheet.h
@@ -49,7 +49,7 @@ class CantorWorksheet : public AbstractPart {
Q_OBJECT

public:
- CantorWorksheet(const QString& name, bool loading = false);
+ explicit CantorWorksheet(const QString& name, bool loading = false);

QWidget* view() const override;
QMenu* createContextMenu() override;
diff --git a/src/backend/core/Workbook.h b/src/backend/core/Workbook.h
index e6769964..84549eff 100644
--- a/src/backend/core/Workbook.h
+++ b/src/backend/core/Workbook.h
@@ -41,7 +41,7 @@ class Workbook : public AbstractPart {
Q_OBJECT

public:
- Workbook(const QString& name);
+ explicit Workbook(const QString& name);

QIcon icon() const override;
QMenu* createContextMenu() override;
diff --git a/src/backend/datapicker/DatapickerImage.h b/src/backend/datapicker/DatapickerImage.h
index a804df1f..e742512a 100644
--- a/src/backend/datapicker/DatapickerImage.h
+++ b/src/backend/datapicker/DatapickerImage.h
@@ -50,7 +50,7 @@ class DatapickerImage : public AbstractPart {
Q_OBJECT

public:
- DatapickerImage(const QString& name, bool loading = false);
+ explicit DatapickerImage(const QString& name, bool loading = false);
~DatapickerImage() override;

enum GraphType { Cartesian, PolarInDegree, PolarInRadians, LogarithmicX, LogarithmicY, Ternary};
diff --git a/src/backend/datasources/AbstractDataSource.h b/src/backend/datasources/AbstractDataSource.h
index be971a71..8d4129b3 100644
--- a/src/backend/datasources/AbstractDataSource.h
+++ b/src/backend/datasources/AbstractDataSource.h
@@ -39,7 +39,7 @@ class AbstractDataSource : public AbstractPart {
Q_OBJECT

public:
- AbstractDataSource(const QString& name);
+ explicit AbstractDataSource(const QString& name);
~AbstractDataSource() override {}

void clear();
diff --git a/src/backend/datasources/LiveDataSource.h b/src/backend/datasources/LiveDataSource.h
index 6df2d8b0..a9d6ac13 100644
--- a/src/backend/datasources/LiveDataSource.h
+++ b/src/backend/datasources/LiveDataSource.h
@@ -76,7 +76,7 @@ public:
WholeFile // reread whole file
};

- LiveDataSource(const QString& name, bool loading = false);
+ explicit LiveDataSource(const QString& name, bool loading = false);
~LiveDataSource() override;

void ready();
diff --git a/src/backend/datasources/MQTTSubscription.h b/src/backend/datasources/MQTTSubscription.h
index d0bd8bb6..f454a0cf 100644
--- a/src/backend/datasources/MQTTSubscription.h
+++ b/src/backend/datasources/MQTTSubscription.h
@@ -43,7 +43,7 @@ class MQTTSubscription : public Folder{
Q_OBJECT

public:
- MQTTSubscription(const QString& name);
+ explicit MQTTSubscription(const QString& name);
~MQTTSubscription() override;

void setMQTTClient(MQTTClient *client);
diff --git a/src/backend/datasources/filters/JsonFilterPrivate.h b/src/backend/datasources/filters/JsonFilterPrivate.h
index 62f753ff..7070c079 100644
--- a/src/backend/datasources/filters/JsonFilterPrivate.h
+++ b/src/backend/datasources/filters/JsonFilterPrivate.h
@@ -39,7 +39,7 @@ class AbstractColumn;
class JsonFilterPrivate {

public:
- JsonFilterPrivate (JsonFilter* owner);
+ explicit JsonFilterPrivate (JsonFilter* owner);

int checkRow(QJsonValueRef value, int &countCols);
int parseColumnModes(QJsonValue row, QString rowName = "");
diff --git a/src/backend/datasources/filters/QJsonModel.h b/src/backend/datasources/filters/QJsonModel.h
index 111cc9bf..7792a54c 100644
--- a/src/backend/datasources/filters/QJsonModel.h
+++ b/src/backend/datasources/filters/QJsonModel.h
@@ -37,7 +37,7 @@ class QJsonItem;

class QJsonTreeItem {
public:
- QJsonTreeItem(QJsonTreeItem* parent = nullptr);
+ explicit QJsonTreeItem(QJsonTreeItem* parent = nullptr);
~QJsonTreeItem();
void appendChild(QJsonTreeItem*);
QJsonTreeItem* child(int row);
diff --git a/src/backend/datasources/filters/ROOTFilterPrivate.h b/src/backend/datasources/filters/ROOTFilterPrivate.h
index 50d89db8..88bc1f17 100644
--- a/src/backend/datasources/filters/ROOTFilterPrivate.h
+++ b/src/backend/datasources/filters/ROOTFilterPrivate.h
@@ -56,7 +56,7 @@ public:
*
* @param[in] filename ROOT file to be read
*/
- ROOTHist(const std::string& filename);
+ explicit ROOTHist(const std::string& filename);

struct BinPars {
double content;
diff --git a/src/backend/matrix/Matrix.h b/src/backend/matrix/Matrix.h
index 425487cc..1997d238 100644
--- a/src/backend/matrix/Matrix.h
+++ b/src/backend/matrix/Matrix.h
@@ -45,7 +45,7 @@ class Matrix : public AbstractDataSource {
public:
enum HeaderFormat {HeaderRowsColumns, HeaderValues, HeaderRowsColumnsValues};

- Matrix(const QString& name, bool loading = false,
+ explicit Matrix(const QString& name, bool loading = false,
const AbstractColumn::ColumnMode = AbstractColumn::Numeric);
Matrix(int rows, int cols, const QString& name,
const AbstractColumn::ColumnMode = AbstractColumn::Numeric);
diff --git a/src/backend/spreadsheet/Spreadsheet.h b/src/backend/spreadsheet/Spreadsheet.h
index 9a5c38ef..847fca15 100644
--- a/src/backend/spreadsheet/Spreadsheet.h
+++ b/src/backend/spreadsheet/Spreadsheet.h
@@ -40,7 +40,7 @@ class Spreadsheet : public AbstractDataSource {
Q_OBJECT

public:
- Spreadsheet(const QString& name, bool loading = false);
+ explicit Spreadsheet(const QString& name, bool loading = false);

QIcon icon() const override;
QMenu* createContextMenu() override;
diff --git a/src/backend/worksheet/Worksheet.h b/src/backend/worksheet/Worksheet.h
index 3d1ae2af..6b24a53a 100644
--- a/src/backend/worksheet/Worksheet.h
+++ b/src/backend/worksheet/Worksheet.h
@@ -43,7 +43,7 @@ class Worksheet : public AbstractPart {
Q_OBJECT

public:
- Worksheet(const QString& name, bool loading = false);
+ explicit Worksheet(const QString& name, bool loading = false);
~Worksheet() override;

enum Unit {Millimeter, Centimeter, Inch, Point};
diff --git a/src/commonfrontend/worksheet/WorksheetView.h b/src/commonfrontend/worksheet/WorksheetView.h
index b5762ec6..085ef28e 100644
--- a/src/commonfrontend/worksheet/WorksheetView.h
+++ b/src/commonfrontend/worksheet/WorksheetView.h
@@ -33,7 +33,7 @@
#include <QGraphicsView>
#include "backend/worksheet/Worksheet.h"
#include "backend/worksheet/plots/cartesian/CartesianPlot.h"
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>

class QMenu;
class QToolBar;
diff --git a/src/kdefrontend/datasources/MQTTConnectionManagerWidget.cpp b/src/kdefrontend/datasources/MQTTConnectionManagerWidget.cpp
index 064cb1fe..d7744cf2 100644
--- a/src/kdefrontend/datasources/MQTTConnectionManagerWidget.cpp
+++ b/src/kdefrontend/datasources/MQTTConnectionManagerWidget.cpp
@@ -648,7 +648,7 @@ void MQTTConnectionManagerWidget::testConnection() {
}

/*!
- * \brief Called when the client connects to the host, this means the test was succesful
+ * \brief Called when the client connects to the host, this means the test was successful
*/
void MQTTConnectionManagerWidget::onConnect() {
RESET_CURSOR;
@@ -661,7 +661,7 @@ void MQTTConnectionManagerWidget::onConnect() {
}

/*!
- * \brief Called when testTimer times out, this means that the test wasn't succesful
+ * \brief Called when testTimer times out, this means that the test wasn't successful
*/
void MQTTConnectionManagerWidget::testTimeout() {
RESET_CURSOR;
diff --git a/src/kdefrontend/datasources/MQTTErrorWidget.h b/src/kdefrontend/datasources/MQTTErrorWidget.h
index f417ca6c..2422adb4 100644
--- a/src/kdefrontend/datasources/MQTTErrorWidget.h
+++ b/src/kdefrontend/datasources/MQTTErrorWidget.h
@@ -46,7 +46,7 @@ class MQTTErrorWidget : public QWidget {
Q_OBJECT

public:
- MQTTErrorWidget(QMqttClient::ClientError error = QMqttClient::NoError, MQTTClient* client = 0, QWidget* parent = 0);
+ explicit MQTTErrorWidget(QMqttClient::ClientError error = QMqttClient::NoError, MQTTClient* client = 0, QWidget* parent = 0);

private:
Ui::MQTTErrorWidget ui;
diff --git a/src/kdefrontend/dockwidgets/BarChartPlotDock.cpp b/src/kdefrontend/dockwidgets/BarChartPlotDock.cpp
index 8b2af315..e256da1a 100644
--- a/src/kdefrontend/dockwidgets/BarChartPlotDock.cpp
+++ b/src/kdefrontend/dockwidgets/BarChartPlotDock.cpp
@@ -24,4 +24,3 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
-
\ No newline at end of file
diff --git a/src/kdefrontend/dockwidgets/BarChartPlotDock.h b/src/kdefrontend/dockwidgets/BarChartPlotDock.h
index 8b2af315..e256da1a 100644
--- a/src/kdefrontend/dockwidgets/BarChartPlotDock.h
+++ b/src/kdefrontend/dockwidgets/BarChartPlotDock.h
@@ -24,4 +24,3 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
-
\ No newline at end of file
diff --git a/src/kdefrontend/dockwidgets/LiveDataDock.cpp b/src/kdefrontend/dockwidgets/LiveDataDock.cpp
index f8fe6d2f..d067899d 100644
--- a/src/kdefrontend/dockwidgets/LiveDataDock.cpp
+++ b/src/kdefrontend/dockwidgets/LiveDataDock.cpp
@@ -879,7 +879,7 @@ void LiveDataDock::addSubscription() {
if(checkTopicContains(ui.twSubscriptions->topLevelItem(i)->text(0), name)
&& name != ui.twSubscriptions->topLevelItem(i)->text(0)) {
foundSuperior = true;
- qDebug()<<"Can't add "<<name<<" because found usperior: "<< ui.twSubscriptions->topLevelItem(i)->text(0);
+ qDebug()<<"Can't add "<<name<<" because found superior: "<< ui.twSubscriptions->topLevelItem(i)->text(0);
break;
}
}
diff --git a/tests/analysis/fit/FitTest.h b/tests/analysis/fit/FitTest.h
index a15f40de..957d3829 100644
--- a/tests/analysis/fit/FitTest.h
+++ b/tests/analysis/fit/FitTest.h
@@ -25,7 +25,7 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
-#include <QtTest/QtTest>
+#include <QtTest>
#include <backend/lib/macros.h> // DEBUG()

extern "C" {
diff --git a/tests/import_export/ASCII/AsciiFilterTest.h b/tests/import_export/ASCII/AsciiFilterTest.h
index 4b28d701..bc19acf0 100644
--- a/tests/import_export/ASCII/AsciiFilterTest.h
+++ b/tests/import_export/ASCII/AsciiFilterTest.h
@@ -24,7 +24,7 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
-#include <QtTest/QtTest>
+#include <QtTest>

class AsciiFilterTest : public QObject {
Q_OBJECT
diff --git a/tests/import_export/JSON/data/array.json b/tests/import_export/JSON/data/array.json
index 5a15d0d4..dde5235b 100644
--- a/tests/import_export/JSON/data/array.json
+++ b/tests/import_export/JSON/data/array.json
@@ -11,4 +11,4 @@
"2018-06-03",
0.03
]
-]
\ No newline at end of file
+]
diff --git a/tests/import_export/JSON/data/object.json b/tests/import_export/JSON/data/object.json
index d71fe8ec..8cd32400 100644
--- a/tests/import_export/JSON/data/object.json
+++ b/tests/import_export/JSON/data/object.json
@@ -17,4 +17,4 @@
"3": "0.003",
"4": "field3"
}
-}
\ No newline at end of file
+}

[Yuri Chornoivan]

Git commit a2b45d199fd02b5a0f91236ea19d3e63d2ef86b2 by Yuri Chornoivan.
Committed on 26/08/2018 at 14:12.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 libk3b/core/k3bcore.h
M +2 -2 libk3b/core/k3bdefaultexternalprograms.h
M +3 -3 libk3b/core/k3bexternalbinmanager.h
M +1 -1 libk3b/core/k3bjob.h
M +1 -1 libk3b/core/k3bsimplejobhandler.h
M +1 -1 libk3b/core/k3bthread.h
M +1 -1 libk3b/core/k3bthreadjobcommunicationevent.h
M +1 -1 libk3b/jobs/k3baudiocuefilewritingjob.h
M +1 -1 libk3b/jobs/k3baudiosessionreadingjob.h
M +1 -1 libk3b/jobs/k3bbinimagewritingjob.h
M +1 -1 libk3b/jobs/k3bblankingjob.h
M +1 -1 libk3b/jobs/k3bcdcopyjob.h
M +1 -1 libk3b/jobs/k3bcdda2wavreader.h
M +1 -1 libk3b/jobs/k3bclonejob.h
M +1 -1 libk3b/jobs/k3bclonetocreader.h
M +1 -1 libk3b/jobs/k3bdatatrackreader.h
M +1 -1 libk3b/jobs/k3bdvdbooktypejob.h
M +1 -1 libk3b/jobs/k3bdvdcopyjob.h
M +1 -1 libk3b/jobs/k3bdvdformattingjob.h
M +1 -1 libk3b/jobs/k3biso9660imagewritingjob.h
M +1 -1 libk3b/jobs/k3breadcdreader.h
M +1 -1 libk3b/jobs/k3bverificationjob.h
M +2 -2 libk3b/plugin/k3baudiodecoder.h
M +1 -1 libk3b/plugin/k3baudioencoder.h
M +1 -1 libk3b/plugin/k3bplugin.h
M +1 -1 libk3b/plugin/k3bpluginconfigwidget.h
M +1 -1 libk3b/plugin/k3bpluginmanager.h
M +1 -1 libk3b/plugin/k3bprojectplugin.h
M +1 -1 libk3b/projects/audiocd/k3baudiocdtrackreader.h
M +1 -1 libk3b/projects/audiocd/k3baudiodoc.h
M +1 -1 libk3b/projects/audiocd/k3baudiodocreader.h
M +1 -1 libk3b/projects/audiocd/k3baudiofilereader.h
M +1 -1 libk3b/projects/audiocd/k3baudiojobtempdata.h
M +1 -1 libk3b/projects/audiocd/k3baudionormalizejob.h
M +1 -1 libk3b/projects/audiocd/k3baudiotrack.h
M +1 -1 libk3b/projects/audiocd/k3baudiozerodata.h
M +1 -1 libk3b/projects/audiocd/k3brawaudiodatareader.h
M +1 -1 libk3b/projects/audiocd/k3brawaudiodatasource.h
M +1 -1 libk3b/projects/datacd/k3bdatadoc.h
M +2 -2 libk3b/projects/datacd/k3bdiritem.h
M +1 -1 libk3b/projects/datacd/k3bmsinfofetcher.h
M +1 -1 libk3b/projects/datacd/k3bspecialdataitem.h
M +1 -1 libk3b/projects/k3bcuefileparser.h
M +1 -1 libk3b/projects/k3bdoc.h
M +1 -1 libk3b/projects/k3bgrowisofshandler.h
M +1 -1 libk3b/projects/mixedcd/k3bmixeddoc.h
M +1 -1 libk3b/projects/movixcd/k3bmovixdoc.h
M +1 -1 libk3b/projects/videocd/k3bvcddoc.h
M +1 -1 libk3b/projects/videocd/k3bvcdxmlview.h
M +1 -1 libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
M +1 -1 libk3b/projects/videodvd/k3bvideodvddoc.h
M +1 -1 libk3b/tools/k3bbusywidget.h
M +1 -1 libk3b/tools/k3bcddb.h
M +1 -1 libk3b/tools/k3bcdtextvalidator.h
M +2 -2 libk3b/tools/k3bcutcombobox.h
M +1 -1 libk3b/tools/k3bdevicecombobox.h
M +1 -1 libk3b/tools/k3bdevicemodel.h
M +1 -1 libk3b/tools/k3bdeviceselectiondialog.h
M +1 -1 libk3b/tools/k3bdirsizejob.h
M +1 -1 libk3b/tools/k3bfilesplitter.h
M +1 -1 libk3b/tools/k3bfilesysteminfo.h
M +1 -1 libk3b/tools/k3bintmapcombobox.h
M +3 -3 libk3b/tools/k3biso9660.h
M +4 -4 libk3b/tools/k3biso9660backend.h
M +1 -1 libk3b/tools/k3bmd5job.h
M +1 -1 libk3b/tools/k3bmediacache.h
M +1 -1 libk3b/tools/k3bmsfedit.h
M +1 -1 libk3b/tools/k3bprocess.h
M +1 -1 libk3b/tools/k3bthroughputestimator.h
M +1 -1 libk3b/tools/k3btitlelabel.h
M +4 -4 libk3b/tools/k3bvalidators.h
M +1 -1 libk3bdevice/k3bdevicemanager.h
M +1 -1 libk3bdevice/k3bhalconnection.h
M +1 -1 libk3bdevice/k3bscsicommand.h
M +1 -1 plugins/decoder/ffmpeg/k3bffmpegdecoder.h
M +1 -1 plugins/decoder/ffmpeg/k3bffmpegwrapper.h
M +1 -1 plugins/decoder/flac/k3bflacdecoder.h
M +1 -1 plugins/decoder/libsndfile/k3blibsndfiledecoder.h
M +1 -1 plugins/decoder/musepack/k3bmpcdecoder.h
M +1 -1 plugins/decoder/ogg/k3boggvorbisdecoder.h
M +1 -1 plugins/decoder/wave/k3bwavedecoder.h
M +1 -1 plugins/encoder/external/k3bexternalencoderconfigwidget.h
M +1 -1 plugins/encoder/lame/k3blamemanualsettingsdialog.h
M +2 -2 plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.h
M +1 -1 plugins/encoder/skeleton.h
M +1 -1 plugins/encoder/sox/k3bsoxencoderconfigwidget.h
M +1 -1 plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h
M +1 -1 src/k3bappdevicemanager.h
M +1 -1 src/k3baudioprojectinterface.h
M +1 -1 src/k3bburnprogressdialog.h
M +1 -1 src/k3bdatamodewidget.h
M +1 -1 src/k3bdataprojectinterface.h
M +2 -2 src/k3bdebuggingoutputcache.h
M +1 -1 src/k3bdebuggingoutputdialog.h
M +1 -1 src/k3bdevicedelegate.h
M +1 -1 src/k3bdevicemenu.h
M +1 -1 src/k3bdiroperator.h
M +1 -1 src/k3bdirview.h
M +1 -1 src/k3bdiskinfoview.h
M +1 -1 src/k3bfiletreeview.h
M +1 -1 src/k3bfileview.h
M +3 -3 src/k3bflatbutton.h
M +1 -1 src/k3binteractiondialog.h
M +1 -1 src/k3bjobinterface.h
M +1 -1 src/k3bjobprogressdialog.h
M +1 -1 src/k3blsofwrapperdialog.h
M +1 -1 src/k3bmediaselectioncombobox.h
M +1 -1 src/k3bmediaselectiondialog.h
M +1 -1 src/k3bmediumdelegate.h
M +1 -1 src/k3bmetaitemmodel.h
M +1 -1 src/k3bplacesmodel.h
M +1 -1 src/k3bprojectinterface.h
M +1 -1 src/k3bprojectmanager.h
M +1 -1 src/k3bprojecttabwidget.h
M +1 -1 src/k3bsplash.h
M +1 -1 src/k3bstatusbarmanager.h
M +1 -1 src/k3bsystemproblemdialog.h
M +1 -1 src/k3btempdirselectionwidget.h
M +1 -1 src/k3bthemedheader.h
M +3 -3 src/k3bthemedlabel.h
M +2 -2 src/k3bthememanager.h
M +1 -1 src/k3btimeoutwidget.h
M +1 -1 src/k3burlnavigator.h
M +2 -2 src/k3bviewcolumnadjuster.h
M +1 -1 src/k3bwelcomewidget.h
M +1 -1 src/k3bwidgetshoweffect.h
M +1 -1 src/k3bwriterselectionwidget.h
M +2 -2 src/k3bwritingmodewidget.h
M +1 -1 src/misc/k3bimagewritingdialog.h
M +1 -1 src/misc/k3bmediacopydialog.h
M +1 -1 src/misc/k3bmediaformattingdialog.h
M +1 -1 src/option/k3badvancedoptiontab.h
M +1 -1 src/option/k3bcddboptiontab.h
M +1 -1 src/option/k3bdeviceoptiontab.h
M +1 -1 src/option/k3bdevicewidget.h
M +1 -1 src/option/k3bexternalbinmodel.h
M +1 -1 src/option/k3bexternalbinoptiontab.h
M +1 -1 src/option/k3bexternalbinparamsmodel.h
M +1 -1 src/option/k3bexternalbinpermissionmodel.h
M +1 -1 src/option/k3bexternalbinwidget.h
M +1 -1 src/option/k3bmiscoptiontab.h
M +1 -1 src/option/k3bnotifyoptiontab.h
M +1 -1 src/option/k3boptiondialog.h
M +1 -1 src/option/k3bpluginoptiontab.h
M +1 -1 src/option/k3bthememodel.h
M +1 -1 src/option/k3bthemeoptiontab.h
M +1 -1 src/projects/k3baudioburndialog.h
M +1 -1 src/projects/k3baudiocdtextwidget.h
M +1 -1 src/projects/k3baudiodatasourceeditwidget.h
M +1 -1 src/projects/k3baudioeditorwidget.h
M +1 -1 src/projects/k3baudioprojectdelegate.h
M +1 -1 src/projects/k3baudiotrackdialog.h
M +1 -1 src/projects/k3baudiotracksplitdialog.h
M +1 -1 src/projects/k3baudiotracktrmlookupdialog.h
M +1 -1 src/projects/k3baudiotrackwidget.h
M +1 -1 src/projects/k3bbootimagedialog.h
M +1 -1 src/projects/k3bbootimagemodel.h
M +1 -1 src/projects/k3bdataadvancedimagesettingsdialog.h
M +1 -1 src/projects/k3bdataburndialog.h
M +1 -1 src/projects/k3bdataimagesettingswidget.h
M +1 -1 src/projects/k3bdatamultisessioncombobox.h
M +1 -1 src/projects/k3bdatamultisessionimportdialog.h
M +1 -1 src/projects/k3bdataprojectmodel.h
M +1 -1 src/projects/k3bdataprojectsortproxymodel.h
M +1 -1 src/projects/k3bdatapropertiesdialog.h
M +1 -1 src/projects/k3bdataview.h
M +1 -1 src/projects/k3bdatavolumedescdialog.h
M +1 -1 src/projects/k3bdirproxymodel.h
M +1 -1 src/projects/k3bfillstatusdisplay.h
M +1 -1 src/projects/k3bmixedburndialog.h
M +1 -1 src/projects/k3bmixedview.h
M +1 -1 src/projects/k3bmovixburndialog.h
M +1 -1 src/projects/k3bmovixoptionswidget.h
M +1 -1 src/projects/k3bmovixview.h
M +1 -1 src/projects/k3bmusicbrainzjob.h
M +1 -1 src/projects/k3bprojectburndialog.h
M +1 -1 src/projects/k3bvcdburndialog.h
M +1 -1 src/projects/k3bvcdprojectmodel.h
M +1 -1 src/projects/k3bvcdtrackkeysdelegate.h
M +1 -1 src/projects/k3bvcdtrackkeysmodel.h
M +1 -1 src/projects/k3bvideodvdburndialog.h
M +1 -1 src/projects/k3bvideodvdview.h
M +1 -1 src/projects/k3bvolumenamewidget.h
M +1 -1 src/rip/k3baudiocdview.h
M +1 -1 src/rip/k3baudioconvertingoptionwidget.h
M +1 -1 src/rip/k3baudioprojectconvertingdialog.h
M +1 -1 src/rip/k3baudiotrackmodel.h
M +1 -1 src/rip/k3bcddbpatternwidget.h
M +1 -1 src/rip/k3bvideocdinfo.h
M +1 -1 src/rip/k3bvideocdrippingdialog.h
M +1 -1 src/rip/k3bvideocdview.h
M +1 -1 src/rip/videodvd/k3bvideodvdrippingjob.h
M +1 -1 src/rip/videodvd/k3bvideodvdrippingpreview.h
M +1 -1 src/rip/videodvd/k3bvideodvdrippingview.h
M +1 -1 src/rip/videodvd/k3bvideodvdrippingwidget.h
M +1 -1 src/rip/videodvd/k3bvideodvdtitledelegate.h
M +1 -1 src/rip/videodvd/k3bvideodvdtitlemodel.h

https://commits.kde.org/k3b/a2b45d199fd02b5a0f91236ea19d3e63d2ef86b2

diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h
index 86618e57b..f39c0dfec 100644
--- a/libk3b/core/k3bcore.h
+++ b/libk3b/core/k3bcore.h
@@ -62,7 +62,7 @@ namespace K3b {
* Although Core is a singlelton it's constructor is not private to make inheritance
* possible. Just make sure to only create one instance.
*/
- Core( QObject* parent = 0 );
+ explicit Core( QObject* parent = 0 );
virtual ~Core();

QList<Job*> runningJobs() const;
diff --git a/libk3b/core/k3bdefaultexternalprograms.h b/libk3b/core/k3bdefaultexternalprograms.h
index 1ee746a43..22df316c6 100644
--- a/libk3b/core/k3bdefaultexternalprograms.h
+++ b/libk3b/core/k3bdefaultexternalprograms.h
@@ -98,7 +98,7 @@ namespace K3b {
class LIBK3B_EXPORT TranscodeProgram : public SimpleExternalProgram
{
public:
- TranscodeProgram( const QString& transcodeProgram );
+ explicit TranscodeProgram( const QString& transcodeProgram );

// no user parameters (yet)
virtual bool supportsUserParameters() const { return false; }
@@ -112,7 +112,7 @@ namespace K3b {
class LIBK3B_EXPORT VcdbuilderProgram : public SimpleExternalProgram
{
public:
- VcdbuilderProgram( const QString& );
+ explicit VcdbuilderProgram( const QString& );

protected:
virtual QString versionIdentifier( const ExternalBin& bin ) const;
diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h
index 8bfdfa326..bdb4336a2 100644
--- a/libk3b/core/k3bexternalbinmanager.h
+++ b/libk3b/core/k3bexternalbinmanager.h
@@ -77,7 +77,7 @@ namespace K3b {
class LIBK3B_EXPORT ExternalProgram
{
public:
- ExternalProgram( const QString& name );
+ explicit ExternalProgram( const QString& name );
virtual ~ExternalProgram();

const ExternalBin* defaultBin() const;
@@ -128,7 +128,7 @@ namespace K3b {
class LIBK3B_EXPORT SimpleExternalProgram : public ExternalProgram
{
public:
- SimpleExternalProgram( const QString& name );
+ explicit SimpleExternalProgram( const QString& name );
virtual ~SimpleExternalProgram();

virtual bool scan( const QString& path );
@@ -195,7 +195,7 @@ namespace K3b {
Q_OBJECT

public:
- ExternalBinManager( QObject* parent = 0 );
+ explicit ExternalBinManager( QObject* parent = 0 );
~ExternalBinManager();

void search();
diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h
index 789a04509..3980376e6 100644
--- a/libk3b/core/k3bjob.h
+++ b/libk3b/core/k3bjob.h
@@ -276,7 +276,7 @@ namespace K3b {
Q_OBJECT

public:
- BurnJob( JobHandler* hdl, QObject* parent = 0 );
+ explicit BurnJob( JobHandler* hdl, QObject* parent = 0 );
virtual ~BurnJob();

/**
diff --git a/libk3b/core/k3bsimplejobhandler.h b/libk3b/core/k3bsimplejobhandler.h
index 1f90e7cff..b8c65527b 100644
--- a/libk3b/core/k3bsimplejobhandler.h
+++ b/libk3b/core/k3bsimplejobhandler.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- SimpleJobHandler( QObject* parent = 0 );
+ explicit SimpleJobHandler( QObject* parent = 0 );
~SimpleJobHandler();

/*
diff --git a/libk3b/core/k3bthread.h b/libk3b/core/k3bthread.h
index f94b09695..8f91f7931 100644
--- a/libk3b/core/k3bthread.h
+++ b/libk3b/core/k3bthread.h
@@ -37,7 +37,7 @@ namespace K3b {
Q_OBJECT

public:
- Thread( ThreadJob* parent = 0 );
+ explicit Thread( ThreadJob* parent = 0 );
~Thread();

void ensureDone();
diff --git a/libk3b/core/k3bthreadjobcommunicationevent.h b/libk3b/core/k3bthreadjobcommunicationevent.h
index ff99d8f25..906fda263 100644
--- a/libk3b/core/k3bthreadjobcommunicationevent.h
+++ b/libk3b/core/k3bthreadjobcommunicationevent.h
@@ -108,7 +108,7 @@ namespace K3b {
const QString& caption );

private:
- ThreadJobCommunicationEvent( int type );
+ explicit ThreadJobCommunicationEvent( int type );

int m_type;
Data* m_data;
diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.h b/libk3b/jobs/k3baudiocuefilewritingjob.h
index 3b02493a1..681fe60cc 100644
--- a/libk3b/jobs/k3baudiocuefilewritingjob.h
+++ b/libk3b/jobs/k3baudiocuefilewritingjob.h
@@ -32,7 +32,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioCueFileWritingJob( JobHandler*, QObject* parent = 0 );
+ explicit AudioCueFileWritingJob( JobHandler*, QObject* parent = 0 );
~AudioCueFileWritingJob();

virtual Device::Device* writer() const;
diff --git a/libk3b/jobs/k3baudiosessionreadingjob.h b/libk3b/jobs/k3baudiosessionreadingjob.h
index 6101f26c6..c3cfb711e 100644
--- a/libk3b/jobs/k3baudiosessionreadingjob.h
+++ b/libk3b/jobs/k3baudiosessionreadingjob.h
@@ -32,7 +32,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioSessionReadingJob( JobHandler*, QObject* parent = 0 );
+ explicit AudioSessionReadingJob( JobHandler*, QObject* parent = 0 );
~AudioSessionReadingJob();

/**
diff --git a/libk3b/jobs/k3bbinimagewritingjob.h b/libk3b/jobs/k3bbinimagewritingjob.h
index 365de0d02..26161c26e 100644
--- a/libk3b/jobs/k3bbinimagewritingjob.h
+++ b/libk3b/jobs/k3bbinimagewritingjob.h
@@ -36,7 +36,7 @@ namespace K3b {
Q_OBJECT

public:
- BinImageWritingJob( JobHandler*, QObject* parent = 0 );
+ explicit BinImageWritingJob( JobHandler*, QObject* parent = 0 );
~BinImageWritingJob();

virtual Device::Device* writer() const { return m_device; };
diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h
index a42da4996..ab482957b 100644
--- a/libk3b/jobs/k3bblankingjob.h
+++ b/libk3b/jobs/k3bblankingjob.h
@@ -28,7 +28,7 @@ namespace K3b {
Q_OBJECT

public:
- BlankingJob( JobHandler*, QObject* parent = 0 );
+ explicit BlankingJob( JobHandler*, QObject* parent = 0 );
~BlankingJob();

QString jobDescription() const;
diff --git a/libk3b/jobs/k3bcdcopyjob.h b/libk3b/jobs/k3bcdcopyjob.h
index 63bfe70f8..2f14df227 100644
--- a/libk3b/jobs/k3bcdcopyjob.h
+++ b/libk3b/jobs/k3bcdcopyjob.h
@@ -38,7 +38,7 @@ namespace K3b {
Q_OBJECT

public:
- CdCopyJob( JobHandler* hdl, QObject* parent = 0 );
+ explicit CdCopyJob( JobHandler* hdl, QObject* parent = 0 );
~CdCopyJob();

virtual Device::Device* writer() const { return m_onlyCreateImages ? 0 : m_writerDevice; }
diff --git a/libk3b/jobs/k3bcdda2wavreader.h b/libk3b/jobs/k3bcdda2wavreader.h
index a29e49e7b..af19ac5a7 100644
--- a/libk3b/jobs/k3bcdda2wavreader.h
+++ b/libk3b/jobs/k3bcdda2wavreader.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_OBJECT

public:
- Cdda2wavReader( QObject* parent = 0 );
+ explicit Cdda2wavReader( QObject* parent = 0 );
~Cdda2wavReader();

bool active() const;
diff --git a/libk3b/jobs/k3bclonejob.h b/libk3b/jobs/k3bclonejob.h
index 74dbaf1e8..93ba983c7 100644
--- a/libk3b/jobs/k3bclonejob.h
+++ b/libk3b/jobs/k3bclonejob.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- CloneJob( JobHandler*, QObject* parent = 0 );
+ explicit CloneJob( JobHandler*, QObject* parent = 0 );
~CloneJob();

virtual Device::Device* writer() const { return m_writerDevice; }
diff --git a/libk3b/jobs/k3bclonetocreader.h b/libk3b/jobs/k3bclonetocreader.h
index b42670e82..bbcc5cd7e 100644
--- a/libk3b/jobs/k3bclonetocreader.h
+++ b/libk3b/jobs/k3bclonetocreader.h
@@ -29,7 +29,7 @@ namespace K3b {
class LIBK3B_EXPORT CloneTocReader : public ImageFileReader
{
public:
- CloneTocReader( const QString& filename = QString() );
+ explicit CloneTocReader( const QString& filename = QString() );
~CloneTocReader();

Msf imageSize() const;
diff --git a/libk3b/jobs/k3bdatatrackreader.h b/libk3b/jobs/k3bdatatrackreader.h
index 5e59a868e..28eba06e5 100644
--- a/libk3b/jobs/k3bdatatrackreader.h
+++ b/libk3b/jobs/k3bdatatrackreader.h
@@ -44,7 +44,7 @@ namespace K3b {
Q_OBJECT

public:
- DataTrackReader( JobHandler*, QObject* parent = 0 );
+ explicit DataTrackReader( JobHandler*, QObject* parent = 0 );
~DataTrackReader();

enum ReadSectorSize {
diff --git a/libk3b/jobs/k3bdvdbooktypejob.h b/libk3b/jobs/k3bdvdbooktypejob.h
index 615a5f48a..d4ad6a9e7 100644
--- a/libk3b/jobs/k3bdvdbooktypejob.h
+++ b/libk3b/jobs/k3bdvdbooktypejob.h
@@ -36,7 +36,7 @@ namespace K3b {
Q_OBJECT

public:
- DvdBooktypeJob( JobHandler*, QObject* parent = 0 );
+ explicit DvdBooktypeJob( JobHandler*, QObject* parent = 0 );
~DvdBooktypeJob();

QString jobDescription() const;
diff --git a/libk3b/jobs/k3bdvdcopyjob.h b/libk3b/jobs/k3bdvdcopyjob.h
index 34cbe50aa..061e9cff5 100644
--- a/libk3b/jobs/k3bdvdcopyjob.h
+++ b/libk3b/jobs/k3bdvdcopyjob.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- DvdCopyJob( JobHandler* hdl, QObject* parent = 0 );
+ explicit DvdCopyJob( JobHandler* hdl, QObject* parent = 0 );
~DvdCopyJob();

virtual Device::Device* writer() const { return m_onlyCreateImage ? 0 : m_writerDevice; }
diff --git a/libk3b/jobs/k3bdvdformattingjob.h b/libk3b/jobs/k3bdvdformattingjob.h
index 1db3b4a9b..ec66d82c0 100644
--- a/libk3b/jobs/k3bdvdformattingjob.h
+++ b/libk3b/jobs/k3bdvdformattingjob.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- DvdFormattingJob( JobHandler*, QObject* parent = 0 );
+ explicit DvdFormattingJob( JobHandler*, QObject* parent = 0 );
~DvdFormattingJob();

QString jobDescription() const;
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.h b/libk3b/jobs/k3biso9660imagewritingjob.h
index 23c925cbc..48ad449cb 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.h
+++ b/libk3b/jobs/k3biso9660imagewritingjob.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- Iso9660ImageWritingJob( JobHandler* );
+ explicit Iso9660ImageWritingJob( JobHandler* );
~Iso9660ImageWritingJob();

Device::Device* writer() const { return m_device; }
diff --git a/libk3b/jobs/k3breadcdreader.h b/libk3b/jobs/k3breadcdreader.h
index 85923fc9c..e495d180f 100644
--- a/libk3b/jobs/k3breadcdreader.h
+++ b/libk3b/jobs/k3breadcdreader.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- ReadcdReader( JobHandler*, QObject* parent = 0 );
+ explicit ReadcdReader( JobHandler*, QObject* parent = 0 );
~ReadcdReader();

bool active() const;
diff --git a/libk3b/jobs/k3bverificationjob.h b/libk3b/jobs/k3bverificationjob.h
index 6eba1c43c..c61daa335 100644
--- a/libk3b/jobs/k3bverificationjob.h
+++ b/libk3b/jobs/k3bverificationjob.h
@@ -49,7 +49,7 @@ namespace K3b {
Q_OBJECT

public:
- VerificationJob( JobHandler*, QObject* parent = 0 );
+ explicit VerificationJob( JobHandler*, QObject* parent = 0 );
~VerificationJob();

public Q_SLOTS:
diff --git a/libk3b/plugin/k3baudiodecoder.h b/libk3b/plugin/k3baudiodecoder.h
index 48161c7b6..1a17ea531 100644
--- a/libk3b/plugin/k3baudiodecoder.h
+++ b/libk3b/plugin/k3baudiodecoder.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioDecoder( QObject* parent = 0 );
+ explicit AudioDecoder( QObject* parent = 0 );
virtual ~AudioDecoder();

/**
@@ -209,7 +209,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioDecoderFactory( QObject* parent = 0 )
+ explicit AudioDecoderFactory( QObject* parent = 0 )
: Plugin( parent ) {
}

diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h
index b7e7be0d8..6c851c761 100644
--- a/libk3b/plugin/k3baudioencoder.h
+++ b/libk3b/plugin/k3baudioencoder.h
@@ -38,7 +38,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioEncoder( QObject* parent = 0 );
+ explicit AudioEncoder( QObject* parent = 0 );
virtual ~AudioEncoder();

// TODO: if the following methods are to be activated the config methods in
diff --git a/libk3b/plugin/k3bplugin.h b/libk3b/plugin/k3bplugin.h
index 5b61aab07..d89c7783a 100644
--- a/libk3b/plugin/k3bplugin.h
+++ b/libk3b/plugin/k3bplugin.h
@@ -38,7 +38,7 @@ namespace K3b {
friend class PluginManager;

public:
- Plugin( QObject* parent = 0 );
+ explicit Plugin( QObject* parent = 0 );
virtual ~Plugin();

KPluginInfo pluginInfo() const { return m_pluginInfo; }
diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h
index 6f55951eb..1b548a10f 100644
--- a/libk3b/plugin/k3bpluginconfigwidget.h
+++ b/libk3b/plugin/k3bpluginconfigwidget.h
@@ -53,7 +53,7 @@ namespace K3b {
Q_OBJECT

public:
- PluginConfigWidget( QWidget* parent = 0, const QVariantList& args = QVariantList() );
+ explicit PluginConfigWidget( QWidget* parent = 0, const QVariantList& args = QVariantList() );
virtual ~PluginConfigWidget();

// TODO: find a nice way to get the plugin name for the config groups
diff --git a/libk3b/plugin/k3bpluginmanager.h b/libk3b/plugin/k3bpluginmanager.h
index 50bf1e2ab..68ded6107 100644
--- a/libk3b/plugin/k3bpluginmanager.h
+++ b/libk3b/plugin/k3bpluginmanager.h
@@ -39,7 +39,7 @@ namespace K3b {
Q_OBJECT

public:
- PluginManager( QObject* parent = 0 );
+ explicit PluginManager( QObject* parent = 0 );
~PluginManager();

/**
diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h
index 777c17bf3..460d710fa 100644
--- a/libk3b/plugin/k3bprojectplugin.h
+++ b/libk3b/plugin/k3bprojectplugin.h
@@ -82,7 +82,7 @@ namespace K3b {
* @p activate() will not be used. A plugin has a GUI if it's functionality is started
* by some user input.
*/
- ProjectPlugin( Type type, bool gui = false, QObject* parent = 0 );
+ explicit ProjectPlugin( Type type, bool gui = false, QObject* parent = 0 );

virtual ~ProjectPlugin() {
}
diff --git a/libk3b/projects/audiocd/k3baudiocdtrackreader.h b/libk3b/projects/audiocd/k3baudiocdtrackreader.h
index 56925aa1b..ac240db96 100644
--- a/libk3b/projects/audiocd/k3baudiocdtrackreader.h
+++ b/libk3b/projects/audiocd/k3baudiocdtrackreader.h
@@ -27,7 +27,7 @@ namespace K3b {
class LIBK3B_EXPORT AudioCdTrackReader : public QIODevice
{
public:
- AudioCdTrackReader( AudioCdTrackSource& source, QObject* parent = 0 );
+ explicit AudioCdTrackReader( AudioCdTrackSource& source, QObject* parent = 0 );
~AudioCdTrackReader();

virtual bool open( OpenMode mode );
diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h
index 54828c306..8cf451e61 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.h
+++ b/libk3b/projects/audiocd/k3baudiodoc.h
@@ -45,7 +45,7 @@ namespace K3b {
friend class AudioFile;

public:
- AudioDoc( QObject* );
+ explicit AudioDoc( QObject* );
~AudioDoc();

virtual Type type() const { return AudioProject; }
diff --git a/libk3b/projects/audiocd/k3baudiodocreader.h b/libk3b/projects/audiocd/k3baudiodocreader.h
index bdfe90b35..86059054e 100644
--- a/libk3b/projects/audiocd/k3baudiodocreader.h
+++ b/libk3b/projects/audiocd/k3baudiodocreader.h
@@ -32,7 +32,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioDocReader( AudioDoc& doc, QObject* parent = 0 );
+ explicit AudioDocReader( AudioDoc& doc, QObject* parent = 0 );
~AudioDocReader();

AudioTrackReader* currentTrackReader() const;
diff --git a/libk3b/projects/audiocd/k3baudiofilereader.h b/libk3b/projects/audiocd/k3baudiofilereader.h
index a27eb28f9..2a20914ce 100644
--- a/libk3b/projects/audiocd/k3baudiofilereader.h
+++ b/libk3b/projects/audiocd/k3baudiofilereader.h
@@ -27,7 +27,7 @@ namespace K3b {
class LIBK3B_EXPORT AudioFileReader : public QIODevice
{
public:
- AudioFileReader( AudioFile& source, QObject* parent = 0 );
+ explicit AudioFileReader( AudioFile& source, QObject* parent = 0 );
~AudioFileReader();

virtual bool open( OpenMode mode );
diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.h b/libk3b/projects/audiocd/k3baudiojobtempdata.h
index a2ca8ff08..8fad858e1 100644
--- a/libk3b/projects/audiocd/k3baudiojobtempdata.h
+++ b/libk3b/projects/audiocd/k3baudiojobtempdata.h
@@ -28,7 +28,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioJobTempData( AudioDoc* doc, QObject* parent = 0 );
+ explicit AudioJobTempData( AudioDoc* doc, QObject* parent = 0 );
~AudioJobTempData();

QString bufferFileName( int track );
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h
index 3ec0f6ff8..3e607d02e 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.h
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioNormalizeJob( JobHandler*, QObject* parent = 0 );
+ explicit AudioNormalizeJob( JobHandler*, QObject* parent = 0 );
~AudioNormalizeJob();

public Q_SLOTS:
diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h
index 4adfed128..cec81a5eb 100644
--- a/libk3b/projects/audiocd/k3baudiotrack.h
+++ b/libk3b/projects/audiocd/k3baudiotrack.h
@@ -44,7 +44,7 @@ namespace K3b {

public:
AudioTrack();
- AudioTrack( AudioDoc* parent );
+ explicit AudioTrack( AudioDoc* parent );
~AudioTrack();

AudioDoc* doc() const;
diff --git a/libk3b/projects/audiocd/k3baudiozerodata.h b/libk3b/projects/audiocd/k3baudiozerodata.h
index e3e403f31..69bf99334 100644
--- a/libk3b/projects/audiocd/k3baudiozerodata.h
+++ b/libk3b/projects/audiocd/k3baudiozerodata.h
@@ -22,7 +22,7 @@ namespace K3b {
class LIBK3B_EXPORT AudioZeroData : public AudioDataSource
{
public:
- AudioZeroData( const Msf& msf = 150 );
+ explicit AudioZeroData( const Msf& msf = 150 );
AudioZeroData( const AudioZeroData& );
~AudioZeroData();

diff --git a/libk3b/projects/audiocd/k3brawaudiodatareader.h b/libk3b/projects/audiocd/k3brawaudiodatareader.h
index 2b54c3863..b70e239b9 100644
--- a/libk3b/projects/audiocd/k3brawaudiodatareader.h
+++ b/libk3b/projects/audiocd/k3brawaudiodatareader.h
@@ -27,7 +27,7 @@ namespace K3b {
class LIBK3B_EXPORT RawAudioDataReader : public QIODevice
{
public:
- RawAudioDataReader( RawAudioDataSource& source, QObject* parent = 0 );
+ explicit RawAudioDataReader( RawAudioDataSource& source, QObject* parent = 0 );
~RawAudioDataReader();

virtual bool open( OpenMode mode );
diff --git a/libk3b/projects/audiocd/k3brawaudiodatasource.h b/libk3b/projects/audiocd/k3brawaudiodatasource.h
index 55071304c..a933f6a86 100644
--- a/libk3b/projects/audiocd/k3brawaudiodatasource.h
+++ b/libk3b/projects/audiocd/k3brawaudiodatasource.h
@@ -29,7 +29,7 @@ namespace K3b {
{
public:
RawAudioDataSource();
- RawAudioDataSource( const QString& path );
+ explicit RawAudioDataSource( const QString& path );
RawAudioDataSource( const RawAudioDataSource& );
~RawAudioDataSource();

diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h
index 3ed11ef06..4b8c73637 100644
--- a/libk3b/projects/datacd/k3bdatadoc.h
+++ b/libk3b/projects/datacd/k3bdatadoc.h
@@ -49,7 +49,7 @@ namespace K3b {
Q_OBJECT

public:
- DataDoc( QObject* parent = 0 );
+ explicit DataDoc( QObject* parent = 0 );
virtual ~DataDoc();

virtual Type type() const { return DataProject; }
diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h
index a0e30e853..2b5f6b490 100644
--- a/libk3b/projects/datacd/k3bdiritem.h
+++ b/libk3b/projects/datacd/k3bdiritem.h
@@ -34,7 +34,7 @@ namespace K3b {
typedef QList<DataItem*> Children;

public:
- DirItem( const QString& name, const ItemFlags& flags = ItemFlags() );
+ explicit DirItem( const QString& name, const ItemFlags& flags = ItemFlags() );

/**
* Default copy constructor. Copies the dir including all children. However, none of the
@@ -149,7 +149,7 @@ namespace K3b {
class RootItem : public DirItem
{
public:
- RootItem( DataDoc& doc );
+ explicit RootItem( DataDoc& doc );
~RootItem();

virtual DataDoc* getDoc() const;
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h
index 11a0fdc2a..8bf9ca389 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.h
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- MsInfoFetcher( JobHandler*, QObject* parent = 0 );
+ explicit MsInfoFetcher( JobHandler*, QObject* parent = 0 );
~MsInfoFetcher();

QString msInfo() const { return m_msInfo; }
diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h
index 15d965615..3dd7089ad 100644
--- a/libk3b/projects/datacd/k3bspecialdataitem.h
+++ b/libk3b/projects/datacd/k3bspecialdataitem.h
@@ -29,7 +29,7 @@ namespace K3b {
class SpecialDataItem : public DataItem
{
public:
- SpecialDataItem( KIO::filesize_t size, const QString& k3bName = QString(), const ItemFlags& flags = ItemFlags() )
+ explicit SpecialDataItem( KIO::filesize_t size, const QString& k3bName = QString(), const ItemFlags& flags = ItemFlags() )
: DataItem( flags | SPECIALFILE ),
m_size( size ) {
setK3bName( k3bName );
diff --git a/libk3b/projects/k3bcuefileparser.h b/libk3b/projects/k3bcuefileparser.h
index 0382be25b..f39219a9b 100644
--- a/libk3b/projects/k3bcuefileparser.h
+++ b/libk3b/projects/k3bcuefileparser.h
@@ -30,7 +30,7 @@ namespace K3b {
class LIBK3B_EXPORT CueFileParser : public ImageFileReader
{
public:
- CueFileParser( const QString& filename = QString() );
+ explicit CueFileParser( const QString& filename = QString() );
~CueFileParser();

/**
diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h
index e5f7a58c6..d58771dc3 100644
--- a/libk3b/projects/k3bdoc.h
+++ b/libk3b/projects/k3bdoc.h
@@ -45,7 +45,7 @@ namespace K3b {
Q_OBJECT

public:
- Doc( QObject* = 0 );
+ explicit Doc( QObject* = 0 );
virtual ~Doc();

enum Type {
diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h
index 26a6051aa..a1b9f4f09 100644
--- a/libk3b/projects/k3bgrowisofshandler.h
+++ b/libk3b/projects/k3bgrowisofshandler.h
@@ -36,7 +36,7 @@ namespace K3b {
Q_OBJECT

public:
- GrowisofsHandler( QObject* parent = 0 );
+ explicit GrowisofsHandler( QObject* parent = 0 );
~GrowisofsHandler();

enum ErrorType {
diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h
index 9068d2fa2..0b6519b1f 100644
--- a/libk3b/projects/mixedcd/k3bmixeddoc.h
+++ b/libk3b/projects/mixedcd/k3bmixeddoc.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- MixedDoc( QObject* parent = 0 );
+ explicit MixedDoc( QObject* parent = 0 );
~MixedDoc();

virtual Type type() const { return MixedProject; }
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h
index 38d9e4432..e7c187f79 100644
--- a/libk3b/projects/movixcd/k3bmovixdoc.h
+++ b/libk3b/projects/movixcd/k3bmovixdoc.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_OBJECT

public:
- MovixDoc( QObject* parent = 0 );
+ explicit MovixDoc( QObject* parent = 0 );
virtual ~MovixDoc();

virtual Type type() const { return MovixProject; }
diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h
index 88aa56068..94a49b502 100644
--- a/libk3b/projects/videocd/k3bvcddoc.h
+++ b/libk3b/projects/videocd/k3bvcddoc.h
@@ -37,7 +37,7 @@ namespace K3b {
Q_OBJECT

public:
- VcdDoc( QObject* );
+ explicit VcdDoc( QObject* );
~VcdDoc();

virtual Type type() const { return VcdProject; }
diff --git a/libk3b/projects/videocd/k3bvcdxmlview.h b/libk3b/projects/videocd/k3bvcdxmlview.h
index f42d88148..0d7b48922 100644
--- a/libk3b/projects/videocd/k3bvcdxmlview.h
+++ b/libk3b/projects/videocd/k3bvcdxmlview.h
@@ -29,7 +29,7 @@ namespace K3b {
{

public:
- VcdXmlView( VcdDoc* doc );
+ explicit VcdXmlView( VcdDoc* doc );
~VcdXmlView();

void write( QFile& file );
diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
index 45ee16065..d5aec5f27 100644
--- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
+++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
@@ -120,7 +120,7 @@ namespace K3b {
class MpegInfo
{
public:
- MpegInfo( const char* filename );
+ explicit MpegInfo( const char* filename );
~MpegInfo();
enum mpeg_version { MPEG_VERS_INVALID = 0, MPEG_VERS_MPEG1 = 1, MPEG_VERS_MPEG2 = 2 };
enum mode { MPEG_STEREO = 1, MPEG_JOINT_STEREO, MPEG_DUAL_CHANNEL, MPEG_SINGLE_CHANNEL };
diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.h b/libk3b/projects/videodvd/k3bvideodvddoc.h
index abc0937f2..786adf1a9 100644
--- a/libk3b/projects/videodvd/k3bvideodvddoc.h
+++ b/libk3b/projects/videodvd/k3bvideodvddoc.h
@@ -22,7 +22,7 @@ namespace K3b {
class LIBK3B_EXPORT VideoDvdDoc : public DataDoc
{
public:
- VideoDvdDoc( QObject* parent = 0 );
+ explicit VideoDvdDoc( QObject* parent = 0 );
virtual ~VideoDvdDoc();

virtual Type type() const { return VideoDvdProject; }
diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h
index aa8954e04..270bf5349 100644
--- a/libk3b/tools/k3bbusywidget.h
+++ b/libk3b/tools/k3bbusywidget.h
@@ -28,7 +28,7 @@ namespace K3b {
Q_OBJECT

public:
- BusyWidget( QWidget* parent = 0 );
+ explicit BusyWidget( QWidget* parent = 0 );
~BusyWidget();

void showBusy( bool b );
diff --git a/libk3b/tools/k3bcddb.h b/libk3b/tools/k3bcddb.h
index 25d264253..bb5181ab3 100644
--- a/libk3b/tools/k3bcddb.h
+++ b/libk3b/tools/k3bcddb.h
@@ -42,7 +42,7 @@ namespace K3b {
Q_OBJECT

public:
- CDDBJob( QObject* parent = 0 );
+ explicit CDDBJob( QObject* parent = 0 );
~CDDBJob();

/**
diff --git a/libk3b/tools/k3bcdtextvalidator.h b/libk3b/tools/k3bcdtextvalidator.h
index 19229245e..b2608c881 100644
--- a/libk3b/tools/k3bcdtextvalidator.h
+++ b/libk3b/tools/k3bcdtextvalidator.h
@@ -24,7 +24,7 @@ namespace K3b {
class LIBK3B_EXPORT CdTextValidator : public Latin1Validator
{
public:
- CdTextValidator(QObject *parent = 0);
+ explicit CdTextValidator(QObject *parent = 0);
~CdTextValidator();

State validate( QString& input, int& pos ) const;
diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h
index 53ecdf851..83f3347ce 100644
--- a/libk3b/tools/k3bcutcombobox.h
+++ b/libk3b/tools/k3bcutcombobox.h
@@ -39,8 +39,8 @@ namespace K3b {
Q_OBJECT

public:
- CutComboBox( QWidget* parent = 0 );
- CutComboBox( int method, QWidget* parent = 0 );
+ explicit CutComboBox( QWidget* parent = 0 );
+ explicit CutComboBox( int method, QWidget* parent = 0 );
virtual ~CutComboBox();

enum Method {
diff --git a/libk3b/tools/k3bdevicecombobox.h b/libk3b/tools/k3bdevicecombobox.h
index 52a935433..4e8d4c0c5 100644
--- a/libk3b/tools/k3bdevicecombobox.h
+++ b/libk3b/tools/k3bdevicecombobox.h
@@ -36,7 +36,7 @@ namespace K3b {
Q_OBJECT

public:
- DeviceComboBox( QWidget* parent = 0 );
+ explicit DeviceComboBox( QWidget* parent = 0 );
~DeviceComboBox();

Device::Device* selectedDevice() const;
diff --git a/libk3b/tools/k3bdevicemodel.h b/libk3b/tools/k3bdevicemodel.h
index e1be46dfe..37eb10027 100644
--- a/libk3b/tools/k3bdevicemodel.h
+++ b/libk3b/tools/k3bdevicemodel.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- DeviceModel( QObject* parent = 0 );
+ explicit DeviceModel( QObject* parent = 0 );
~DeviceModel();

QList<Device::Device*> devices() const;
diff --git a/libk3b/tools/k3bdeviceselectiondialog.h b/libk3b/tools/k3bdeviceselectiondialog.h
index efe90e829..12e6740b9 100644
--- a/libk3b/tools/k3bdeviceselectiondialog.h
+++ b/libk3b/tools/k3bdeviceselectiondialog.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- DeviceSelectionDialog( QWidget* parent = 0,
+ explicit DeviceSelectionDialog( QWidget* parent = 0,
const QString& text = QString() );
~DeviceSelectionDialog();

diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h
index db0ca076d..a23f3b2e7 100644
--- a/libk3b/tools/k3bdirsizejob.h
+++ b/libk3b/tools/k3bdirsizejob.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_OBJECT

public:
- DirSizeJob( QObject* parent = 0 );
+ explicit DirSizeJob( QObject* parent = 0 );
~DirSizeJob();

KIO::filesize_t totalSize() const;
diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h
index 459cfa448..0d1bc7849 100644
--- a/libk3b/tools/k3bfilesplitter.h
+++ b/libk3b/tools/k3bfilesplitter.h
@@ -43,7 +43,7 @@ namespace K3b {

public:
FileSplitter();
- FileSplitter( const QString& filename );
+ explicit FileSplitter( const QString& filename );
~FileSplitter();

/**
diff --git a/libk3b/tools/k3bfilesysteminfo.h b/libk3b/tools/k3bfilesysteminfo.h
index e25fb3eba..f47a68152 100644
--- a/libk3b/tools/k3bfilesysteminfo.h
+++ b/libk3b/tools/k3bfilesysteminfo.h
@@ -24,7 +24,7 @@ namespace K3b {
{
public:
FileSystemInfo();
- FileSystemInfo( const QString& path );
+ explicit FileSystemInfo( const QString& path );
FileSystemInfo( const FileSystemInfo& );
~FileSystemInfo();

diff --git a/libk3b/tools/k3bintmapcombobox.h b/libk3b/tools/k3bintmapcombobox.h
index 218625051..f3c9f4795 100644
--- a/libk3b/tools/k3bintmapcombobox.h
+++ b/libk3b/tools/k3bintmapcombobox.h
@@ -32,7 +32,7 @@ namespace K3b {
Q_OBJECT

public:
- IntMapComboBox( QWidget* parent = 0 );
+ explicit IntMapComboBox( QWidget* parent = 0 );
~IntMapComboBox();

int selectedValue() const;
diff --git a/libk3b/tools/k3biso9660.h b/libk3b/tools/k3biso9660.h
index 877209281..1b784d4d0 100644
--- a/libk3b/tools/k3biso9660.h
+++ b/libk3b/tools/k3biso9660.h
@@ -343,7 +343,7 @@ namespace K3b {
*
* @param filename is a local path (e.g. "/home/weis/myfile.tgz")
*/
- Iso9660( const QString& filename );
+ explicit Iso9660( const QString& filename );

/**
* Special case which always reads the TOC from the specified sector
@@ -354,13 +354,13 @@ namespace K3b {
/**
* @param fd open file descriptor
*/
- Iso9660( int fd );
+ explicit Iso9660( int fd );

/**
* Directly specify the backend to read from.
* Iso9660 will take ownership of the backend and delete it.
*/
- Iso9660( Iso9660Backend* );
+ explicit Iso9660( Iso9660Backend* );

/**
* If the .iso is still opened, then it will be
diff --git a/libk3b/tools/k3biso9660backend.h b/libk3b/tools/k3biso9660backend.h
index f3fe6dbf6..dddeb752a 100644
--- a/libk3b/tools/k3biso9660backend.h
+++ b/libk3b/tools/k3biso9660backend.h
@@ -41,7 +41,7 @@ namespace K3b {
class LIBK3B_EXPORT Iso9660DeviceBackend : public Iso9660Backend
{
public:
- Iso9660DeviceBackend( Device::Device* dev );
+ explicit Iso9660DeviceBackend( Device::Device* dev );
~Iso9660DeviceBackend();

bool open();
@@ -57,8 +57,8 @@ namespace K3b {
class LIBK3B_EXPORT Iso9660FileBackend : public Iso9660Backend
{
public:
- Iso9660FileBackend( const QString& filename );
- Iso9660FileBackend( int fd );
+ explicit Iso9660FileBackend( const QString& filename );
+ explicit Iso9660FileBackend( int fd );
~Iso9660FileBackend();

bool open();
@@ -75,7 +75,7 @@ namespace K3b {
class LIBK3B_EXPORT Iso9660LibDvdCssBackend : public Iso9660Backend
{
public:
- Iso9660LibDvdCssBackend( Device::Device* );
+ explicit Iso9660LibDvdCssBackend( Device::Device* );
~Iso9660LibDvdCssBackend();

bool open();
diff --git a/libk3b/tools/k3bmd5job.h b/libk3b/tools/k3bmd5job.h
index 60d8d0da6..d1d706d77 100644
--- a/libk3b/tools/k3bmd5job.h
+++ b/libk3b/tools/k3bmd5job.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_OBJECT

public:
- Md5Job( JobHandler* jh , QObject* parent = 0 );
+ explicit Md5Job( JobHandler* jh , QObject* parent = 0 );
~Md5Job();

QByteArray hexDigest();
diff --git a/libk3b/tools/k3bmediacache.h b/libk3b/tools/k3bmediacache.h
index 9c7ab25b6..c7647ba85 100644
--- a/libk3b/tools/k3bmediacache.h
+++ b/libk3b/tools/k3bmediacache.h
@@ -53,7 +53,7 @@ namespace K3b {
Q_OBJECT

public:
- MediaCache( QObject* parent = 0 );
+ explicit MediaCache( QObject* parent = 0 );
~MediaCache();

/**
diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h
index 69005abf5..9fdd1afd8 100644
--- a/libk3b/tools/k3bmsfedit.h
+++ b/libk3b/tools/k3bmsfedit.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- MsfEdit( QWidget* parent = 0 );
+ explicit MsfEdit( QWidget* parent = 0 );
~MsfEdit();

Msf minimum() const;
diff --git a/libk3b/tools/k3bprocess.h b/libk3b/tools/k3bprocess.h
index 70a19e2ac..cd751fcb1 100644
--- a/libk3b/tools/k3bprocess.h
+++ b/libk3b/tools/k3bprocess.h
@@ -40,7 +40,7 @@ namespace K3b {
Q_OBJECT

public:
- Process( QObject* parent = 0 );
+ explicit Process( QObject* parent = 0 );
~Process();

/**
diff --git a/libk3b/tools/k3bthroughputestimator.h b/libk3b/tools/k3bthroughputestimator.h
index 7da34eded..15a1363b5 100644
--- a/libk3b/tools/k3bthroughputestimator.h
+++ b/libk3b/tools/k3bthroughputestimator.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- ThroughputEstimator( QObject* parent = 0 );
+ explicit ThroughputEstimator( QObject* parent = 0 );
~ThroughputEstimator();

int average() const;
diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h
index 23b75e13e..b04281557 100644
--- a/libk3b/tools/k3btitlelabel.h
+++ b/libk3b/tools/k3btitlelabel.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- TitleLabel( QWidget* parent = 0 );
+ explicit TitleLabel( QWidget* parent = 0 );
~TitleLabel();

QSize sizeHint() const;
diff --git a/libk3b/tools/k3bvalidators.h b/libk3b/tools/k3bvalidators.h
index ab47c1ad6..6e1fa69a2 100644
--- a/libk3b/tools/k3bvalidators.h
+++ b/libk3b/tools/k3bvalidators.h
@@ -26,7 +26,7 @@ namespace K3b {
class LIBK3B_EXPORT CharValidator : public QValidator
{
public:
- CharValidator( QObject* parent = 0 );
+ explicit CharValidator( QObject* parent = 0 );

virtual State validateChar( const QChar& ) const = 0;

@@ -50,7 +50,7 @@ namespace K3b {
class LIBK3B_EXPORT Latin1Validator : public CharValidator
{
public:
- Latin1Validator( QObject* parent = 0 );
+ explicit Latin1Validator( QObject* parent = 0 );

virtual State validateChar( const QChar& ) const;
};
@@ -59,7 +59,7 @@ namespace K3b {
class LIBK3B_EXPORT AsciiValidator : public Latin1Validator
{
public:
- AsciiValidator( QObject* parent = 0 );
+ explicit AsciiValidator( QObject* parent = 0 );

virtual State validateChar( const QChar& ) const;
};
@@ -74,7 +74,7 @@ namespace K3b {
class LIBK3B_EXPORT Validator : public QRegExpValidator
{
public:
- Validator( QObject* parent );
+ explicit Validator( QObject* parent );
Validator( const QRegExp& rx, QObject* parent );

void setReplaceChar( const QChar& s ) { m_replaceChar = s; }
diff --git a/libk3bdevice/k3bdevicemanager.h b/libk3bdevice/k3bdevicemanager.h
index 2c8450ec3..714104f25 100644
--- a/libk3bdevice/k3bdevicemanager.h
+++ b/libk3bdevice/k3bdevicemanager.h
@@ -53,7 +53,7 @@ namespace K3b {
/**
* Creates a new DeviceManager
*/
- DeviceManager( QObject* parent = 0 );
+ explicit DeviceManager( QObject* parent = 0 );
virtual ~DeviceManager();

/**
diff --git a/libk3bdevice/k3bhalconnection.h b/libk3bdevice/k3bhalconnection.h
index 77dfa0c5a..9b23ea537 100644
--- a/libk3bdevice/k3bhalconnection.h
+++ b/libk3bdevice/k3bhalconnection.h
@@ -42,7 +42,7 @@ namespace K3b {
/**
* Use instance() to get the single global object
*/
- HalConnection( QObject* = 0 );
+ explicit HalConnection( QObject* = 0 );
~HalConnection();

/**
diff --git a/libk3bdevice/k3bscsicommand.h b/libk3bdevice/k3bscsicommand.h
index 8e5b95b7d..81b957f7b 100644
--- a/libk3bdevice/k3bscsicommand.h
+++ b/libk3bdevice/k3bscsicommand.h
@@ -88,7 +88,7 @@ namespace K3b {
class ScsiCommand
{
public:
- ScsiCommand( const Device* );
+ explicit ScsiCommand( const Device* );
~ScsiCommand();

/**
diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h
index 286c926fb..bcf64ca16 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h
+++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h
@@ -44,7 +44,7 @@ class K3bFFMpegDecoder : public K3b::AudioDecoder
Q_OBJECT

public:
- K3bFFMpegDecoder( QObject* parent = 0 );
+ explicit K3bFFMpegDecoder( QObject* parent = 0 );
~K3bFFMpegDecoder();

QString fileType() const;
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h
index d1671c87f..34dcfcff3 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h
+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h
@@ -51,7 +51,7 @@ class K3bFFMpegFile
bool seek( const K3b::Msf& );

private:
- K3bFFMpegFile( const QString& filename );
+ explicit K3bFFMpegFile( const QString& filename );
int readPacket();
int fillOutputBuffer();

diff --git a/plugins/decoder/flac/k3bflacdecoder.h b/plugins/decoder/flac/k3bflacdecoder.h
index 30d648097..2e4ff5449 100644
--- a/plugins/decoder/flac/k3bflacdecoder.h
+++ b/plugins/decoder/flac/k3bflacdecoder.h
@@ -39,7 +39,7 @@ class K3bFLACDecoder : public K3b::AudioDecoder
Q_OBJECT

public:
- K3bFLACDecoder( QObject* parent = 0 );
+ explicit K3bFLACDecoder( QObject* parent = 0 );
~K3bFLACDecoder();

void cleanup();
diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
index 9b0f2f8cf..1bb0b4d38 100644
--- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
+++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
@@ -42,7 +42,7 @@ class K3bLibsndfileDecoder : public K3b::AudioDecoder
Q_OBJECT

public:
- K3bLibsndfileDecoder( QObject* parent = 0 );
+ explicit K3bLibsndfileDecoder( QObject* parent = 0 );
~K3bLibsndfileDecoder();
void cleanup();
QString fileType() const;
diff --git a/plugins/decoder/musepack/k3bmpcdecoder.h b/plugins/decoder/musepack/k3bmpcdecoder.h
index 417cd521e..4d99ceeb0 100644
--- a/plugins/decoder/musepack/k3bmpcdecoder.h
+++ b/plugins/decoder/musepack/k3bmpcdecoder.h
@@ -42,7 +42,7 @@ class K3bMpcDecoder : public K3b::AudioDecoder
Q_OBJECT

public:
- K3bMpcDecoder( QObject* parent = 0 );
+ explicit K3bMpcDecoder( QObject* parent = 0 );
~K3bMpcDecoder();

QString fileType() const;
diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.h b/plugins/decoder/ogg/k3boggvorbisdecoder.h
index 15e9305e7..442415a5f 100644
--- a/plugins/decoder/ogg/k3boggvorbisdecoder.h
+++ b/plugins/decoder/ogg/k3boggvorbisdecoder.h
@@ -44,7 +44,7 @@ class K3bOggVorbisDecoder : public K3b::AudioDecoder
Q_OBJECT

public:
- K3bOggVorbisDecoder( QObject* parent = 0 );
+ explicit K3bOggVorbisDecoder( QObject* parent = 0 );
~K3bOggVorbisDecoder();

void cleanup();
diff --git a/plugins/decoder/wave/k3bwavedecoder.h b/plugins/decoder/wave/k3bwavedecoder.h
index 5c99affa5..b111d34d4 100644
--- a/plugins/decoder/wave/k3bwavedecoder.h
+++ b/plugins/decoder/wave/k3bwavedecoder.h
@@ -40,7 +40,7 @@ class K3bWaveDecoder : public K3b::AudioDecoder
Q_OBJECT

public:
- K3bWaveDecoder( QObject* parent = 0 );
+ explicit K3bWaveDecoder( QObject* parent = 0 );
~K3bWaveDecoder();

void cleanup();
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.h b/plugins/encoder/external/k3bexternalencoderconfigwidget.h
index 24f2a384a..299630457 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.h
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.h
@@ -31,7 +31,7 @@ class K3bExternalEncoderEditDialog : public QDialog, public Ui::base_K3bExternal
Q_OBJECT

public:
- K3bExternalEncoderEditDialog( QWidget* parent );
+ explicit K3bExternalEncoderEditDialog( QWidget* parent );
~K3bExternalEncoderEditDialog();

K3bExternalEncoderCommand currentCommand() const;
diff --git a/plugins/encoder/lame/k3blamemanualsettingsdialog.h b/plugins/encoder/lame/k3blamemanualsettingsdialog.h
index 872ec6557..bbf63b988 100644
--- a/plugins/encoder/lame/k3blamemanualsettingsdialog.h
+++ b/plugins/encoder/lame/k3blamemanualsettingsdialog.h
@@ -23,7 +23,7 @@
class K3bLameManualSettingsDialog : public QDialog, public Ui::K3bManualBitrateSettingsDialog
{
public:
- K3bLameManualSettingsDialog( QWidget* parent = 0 );
+ explicit K3bLameManualSettingsDialog( QWidget* parent = 0 );
~K3bLameManualSettingsDialog();
};

diff --git a/plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.h b/plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.h
index 69ce16ae4..0539a64d7 100644
--- a/plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.h
+++ b/plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.h
@@ -22,7 +22,7 @@
class base_K3bOggVorbisEncoderSettingsWidget : public QWidget, public Ui::base_K3bOggVorbisEncoderSettingsWidget
{
public:
- base_K3bOggVorbisEncoderSettingsWidget( QWidget *parent ) : QWidget( parent ) {
+ explicit base_K3bOggVorbisEncoderSettingsWidget( QWidget *parent ) : QWidget( parent ) {
setupUi( this );
}
};
@@ -32,7 +32,7 @@ class K3bOggVorbisEncoderSettingsWidget : public K3b::PluginConfigWidget
Q_OBJECT

public:
- K3bOggVorbisEncoderSettingsWidget( QWidget* parent = 0, const QVariantList& = QVariantList() );
+ explicit K3bOggVorbisEncoderSettingsWidget( QWidget* parent = 0, const QVariantList& = QVariantList() );
~K3bOggVorbisEncoderSettingsWidget();

public Q_SLOTS:
diff --git a/plugins/encoder/skeleton.h b/plugins/encoder/skeleton.h
index 0f348c16a..4bdfab671 100644
--- a/plugins/encoder/skeleton.h
+++ b/plugins/encoder/skeleton.h
@@ -49,7 +49,7 @@ class K3b<name>EncoderConfigWidget : public K3b::PluginConfigWidget
Q_OBJECT

public:
- K3b<name>EncoderConfigWidget( QWidget* parent = 0 );
+ explicit K3b<name>EncoderConfigWidget( QWidget* parent = 0 );
~K3b<name>EncoderConfigWidget();

public Q_SLOTS:
diff --git a/plugins/encoder/sox/k3bsoxencoderconfigwidget.h b/plugins/encoder/sox/k3bsoxencoderconfigwidget.h
index 1b57524f0..f3ce404eb 100644
--- a/plugins/encoder/sox/k3bsoxencoderconfigwidget.h
+++ b/plugins/encoder/sox/k3bsoxencoderconfigwidget.h
@@ -25,7 +25,7 @@ class K3bSoxEncoderConfigWidget : public K3b::PluginConfigWidget, Ui::base_K3bSo
Q_OBJECT

public:
- K3bSoxEncoderConfigWidget( QWidget* parent = 0, const QVariantList& args = QVariantList() );
+ explicit K3bSoxEncoderConfigWidget( QWidget* parent = 0, const QVariantList& args = QVariantList() );
~K3bSoxEncoderConfigWidget();

public Q_SLOTS:
diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h
index b0e173aac..9608ced3b 100644
--- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h
+++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h
@@ -32,7 +32,7 @@ class K3bAudioMetainfoRenamerPluginWidget : public QWidget, public K3b::ProjectP
Q_OBJECT

public:
- K3bAudioMetainfoRenamerPluginWidget( K3b::DataDoc* doc, QWidget* parent = 0 );
+ explicit K3bAudioMetainfoRenamerPluginWidget( K3b::DataDoc* doc, QWidget* parent = 0 );
~K3bAudioMetainfoRenamerPluginWidget();

QWidget* qWidget() { return this; }
diff --git a/src/k3bappdevicemanager.h b/src/k3bappdevicemanager.h
index 4e8a689d2..ed3c81272 100644
--- a/src/k3bappdevicemanager.h
+++ b/src/k3bappdevicemanager.h
@@ -39,7 +39,7 @@ namespace K3b {
Q_OBJECT

public:
- AppDeviceManager( QObject* parent = 0 );
+ explicit AppDeviceManager( QObject* parent = 0 );
~AppDeviceManager();

Device::Device* currentDevice() const;
diff --git a/src/k3baudioprojectinterface.h b/src/k3baudioprojectinterface.h
index ba98b8833..7aa13b3b0 100644
--- a/src/k3baudioprojectinterface.h
+++ b/src/k3baudioprojectinterface.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_CLASSINFO( "D-Bus Interface", "org.k3b.AudioProject" )

public:
- AudioProjectInterface( AudioDoc* doc, const QString& dbusPath = QString() );
+ explicit AudioProjectInterface( AudioDoc* doc, const QString& dbusPath = QString() );

public Q_SLOTS:
int trackCount() const;
diff --git a/src/k3bburnprogressdialog.h b/src/k3bburnprogressdialog.h
index 1568380b4..e1165d558 100644
--- a/src/k3bburnprogressdialog.h
+++ b/src/k3bburnprogressdialog.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_OBJECT

public:
- BurnProgressDialog( QWidget* parent = 0, bool showSubProgress = true );
+ explicit BurnProgressDialog( QWidget* parent = 0, bool showSubProgress = true );
~BurnProgressDialog();

void setJob( Job* );
diff --git a/src/k3bdatamodewidget.h b/src/k3bdatamodewidget.h
index 9ba032643..00ed4eb52 100644
--- a/src/k3bdatamodewidget.h
+++ b/src/k3bdatamodewidget.h
@@ -27,7 +27,7 @@ class DataModeWidget : public QComboBox
Q_OBJECT

public:
- DataModeWidget( QWidget* parent = 0 );
+ explicit DataModeWidget( QWidget* parent = 0 );
~DataModeWidget();

/**
diff --git a/src/k3bdataprojectinterface.h b/src/k3bdataprojectinterface.h
index ee1b741dd..b064a48b7 100644
--- a/src/k3bdataprojectinterface.h
+++ b/src/k3bdataprojectinterface.h
@@ -31,7 +31,7 @@ namespace K3b {
Q_CLASSINFO( "D-Bus Interface", "org.k3b.DataProject" )

public:
- DataProjectInterface( DataDoc* doc, const QString& dbusPath = QString() );
+ explicit DataProjectInterface( DataDoc* doc, const QString& dbusPath = QString() );

public Q_SLOTS:
/**
diff --git a/src/k3bdebuggingoutputcache.h b/src/k3bdebuggingoutputcache.h
index ebbe6a166..5b4092df3 100644
--- a/src/k3bdebuggingoutputcache.h
+++ b/src/k3bdebuggingoutputcache.h
@@ -13,8 +13,8 @@
* See the file "COPYING" for the exact licensing terms.
*/

-#ifndef _K3B_DEBUGING_OUTPUT_CACHE_H_
-#define _K3B_DEBUGING_OUTPUT_CACHE_H_
+#ifndef _K3B_DEBUGGING_OUTPUT_CACHE_H_
+#define _K3B_DEBUGGING_OUTPUT_CACHE_H_

#include <QMap>
#include <QString>
diff --git a/src/k3bdebuggingoutputdialog.h b/src/k3bdebuggingoutputdialog.h
index edbfb6918..09d0d3cae 100644
--- a/src/k3bdebuggingoutputdialog.h
+++ b/src/k3bdebuggingoutputdialog.h
@@ -26,7 +26,7 @@ class DebuggingOutputDialog : public QDialog
Q_OBJECT

public:
- DebuggingOutputDialog( QWidget* parent );
+ explicit DebuggingOutputDialog( QWidget* parent );

public Q_SLOTS:
void setOutput( const QString& );
diff --git a/src/k3bdevicedelegate.h b/src/k3bdevicedelegate.h
index e67858bfa..8dabb7a89 100644
--- a/src/k3bdevicedelegate.h
+++ b/src/k3bdevicedelegate.h
@@ -23,7 +23,7 @@ namespace K3b {
Q_OBJECT

public:
- DeviceDelegate( QObject* parent );
+ explicit DeviceDelegate( QObject* parent );
~DeviceDelegate();

QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
diff --git a/src/k3bdevicemenu.h b/src/k3bdevicemenu.h
index 07ca4429c..cdf12ad1d 100644
--- a/src/k3bdevicemenu.h
+++ b/src/k3bdevicemenu.h
@@ -35,7 +35,7 @@ namespace K3b {
Q_OBJECT

public:
- DeviceMenu( QWidget* parent = 0 );
+ explicit DeviceMenu( QWidget* parent = 0 );
~DeviceMenu();

private:
diff --git a/src/k3bdiroperator.h b/src/k3bdiroperator.h
index fc681e16f..cf9d6e5bd 100644
--- a/src/k3bdiroperator.h
+++ b/src/k3bdiroperator.h
@@ -33,7 +33,7 @@ class DirOperator : public KDirOperator, public KBookmarkOwner
Q_OBJECT

public:
- DirOperator( const QUrl& urlName = QUrl(), QWidget* parent = 0 );
+ explicit DirOperator( const QUrl& urlName = QUrl(), QWidget* parent = 0 );
~DirOperator();

/**
diff --git a/src/k3bdirview.h b/src/k3bdirview.h
index e4b201a73..f376c48a3 100644
--- a/src/k3bdirview.h
+++ b/src/k3bdirview.h
@@ -35,7 +35,7 @@ namespace K3b {
Q_OBJECT

public:
- DirView(FileTreeView* tree, QWidget *parent=0);
+ explicit DirView(FileTreeView* tree, QWidget *parent=0);
~DirView();

public Q_SLOTS:
diff --git a/src/k3bdiskinfoview.h b/src/k3bdiskinfoview.h
index 17d801bfb..20d6350af 100644
--- a/src/k3bdiskinfoview.h
+++ b/src/k3bdiskinfoview.h
@@ -31,7 +31,7 @@ class DiskInfoView : public MediaContentsView
Q_OBJECT

public:
- DiskInfoView( QWidget* parent = 0 );
+ explicit DiskInfoView( QWidget* parent = 0 );
~DiskInfoView();

private:
diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h
index 28327769f..9cd844dac 100644
--- a/src/k3bfiletreeview.h
+++ b/src/k3bfiletreeview.h
@@ -32,7 +32,7 @@ namespace K3b {
Q_OBJECT

public:
- FileTreeView( QWidget *parent = 0 );
+ explicit FileTreeView( QWidget *parent = 0 );
~FileTreeView();

/**
diff --git a/src/k3bfileview.h b/src/k3bfileview.h
index bf8d48ae4..a7020acff 100644
--- a/src/k3bfileview.h
+++ b/src/k3bfileview.h
@@ -33,7 +33,7 @@ class FileView : public ContentsView
Q_OBJECT

public:
- FileView(QWidget *parent=0);
+ explicit FileView(QWidget *parent=0);
~FileView();

void setUrl( const QUrl &url, bool forward = true );
diff --git a/src/k3bflatbutton.h b/src/k3bflatbutton.h
index 51c40fa49..5d0110798 100644
--- a/src/k3bflatbutton.h
+++ b/src/k3bflatbutton.h
@@ -32,9 +32,9 @@ namespace K3b {
Q_OBJECT

public:
- FlatButton( QWidget* parent = 0 );
- FlatButton( const QString& text, QWidget* parent = 0 );
- FlatButton( QAction* action, QWidget* parent = 0 );
+ explicit FlatButton( QWidget* parent = 0 );
+ explicit FlatButton( const QString& text, QWidget* parent = 0 );
+ explicit FlatButton( QAction* action, QWidget* parent = 0 );

~FlatButton();

diff --git a/src/k3binteractiondialog.h b/src/k3binteractiondialog.h
index 63dcc42a0..86e3d4c16 100644
--- a/src/k3binteractiondialog.h
+++ b/src/k3binteractiondialog.h
@@ -55,7 +55,7 @@ namespace K3b {
* @param defaultButton may also be null to deactivate the feature
* @param configgroup The config group used for the loadSettings and saveSettings methods
*/
- InteractionDialog( QWidget* parent = 0,
+ explicit InteractionDialog( QWidget* parent = 0,
const QString& title = QString(),
const QString& subTitle = QString(),
int buttonMask = START_BUTTON|CANCEL_BUTTON,
diff --git a/src/k3bjobinterface.h b/src/k3bjobinterface.h
index 099208b2b..a0fee9537 100644
--- a/src/k3bjobinterface.h
+++ b/src/k3bjobinterface.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_CLASSINFO( "D-Bus Interface", "org.k3b.Job" )

public:
- JobInterface( Job* job );
+ explicit JobInterface( Job* job );
~JobInterface();

public Q_SLOTS:
diff --git a/src/k3bjobprogressdialog.h b/src/k3bjobprogressdialog.h
index 3e091f6e2..2f74e1f73 100644
--- a/src/k3bjobprogressdialog.h
+++ b/src/k3bjobprogressdialog.h
@@ -43,7 +43,7 @@ namespace K3b {
Q_OBJECT

public:
- JobProgressDialog( QWidget* parent = 0,
+ explicit JobProgressDialog( QWidget* parent = 0,
bool showSubProgress = true );
~JobProgressDialog();

diff --git a/src/k3blsofwrapperdialog.h b/src/k3blsofwrapperdialog.h
index 45d9829dc..88c6e5fa8 100644
--- a/src/k3blsofwrapperdialog.h
+++ b/src/k3blsofwrapperdialog.h
@@ -46,7 +46,7 @@ namespace K3b {
void slotQuitOtherApps();

private:
- LsofWrapperDialog( QWidget* parent );
+ explicit LsofWrapperDialog( QWidget* parent );

Device::Device* m_device;
QLabel* m_label;
diff --git a/src/k3bmediaselectioncombobox.h b/src/k3bmediaselectioncombobox.h
index dc1ade4fa..2635f7e9a 100644
--- a/src/k3bmediaselectioncombobox.h
+++ b/src/k3bmediaselectioncombobox.h
@@ -37,7 +37,7 @@ namespace K3b {
Q_OBJECT

public:
- MediaSelectionComboBox( QWidget* parent );
+ explicit MediaSelectionComboBox( QWidget* parent );
virtual ~MediaSelectionComboBox();

/**
diff --git a/src/k3bmediaselectiondialog.h b/src/k3bmediaselectiondialog.h
index 1d01d86f7..4f27aa512 100644
--- a/src/k3bmediaselectiondialog.h
+++ b/src/k3bmediaselectiondialog.h
@@ -35,7 +35,7 @@ namespace K3b {
/**
* Do not use the constructor. Use the static method instead.
*/
- MediaSelectionDialog( QWidget* parent = 0,
+ explicit MediaSelectionDialog( QWidget* parent = 0,
const QString& title = QString(),
const QString& text = QString(),
bool modal = false );
diff --git a/src/k3bmediumdelegate.h b/src/k3bmediumdelegate.h
index 875b673c2..cebec21e0 100644
--- a/src/k3bmediumdelegate.h
+++ b/src/k3bmediumdelegate.h
@@ -23,7 +23,7 @@ namespace K3b {
Q_OBJECT

public:
- MediumDelegate( QObject* parent );
+ explicit MediumDelegate( QObject* parent );
~MediumDelegate();

// FIXME: move this elsewhere
diff --git a/src/k3bmetaitemmodel.h b/src/k3bmetaitemmodel.h
index c17bfa0f5..685ab1819 100644
--- a/src/k3bmetaitemmodel.h
+++ b/src/k3bmetaitemmodel.h
@@ -36,7 +36,7 @@ namespace K3b {
Q_OBJECT

public:
- MetaItemModel( QObject* parent = 0 );
+ explicit MetaItemModel( QObject* parent = 0 );
~MetaItemModel();

QModelIndex indexForSubModel( QAbstractItemModel* model ) const;
diff --git a/src/k3bplacesmodel.h b/src/k3bplacesmodel.h
index 9ae9ebcfa..c4db66063 100644
--- a/src/k3bplacesmodel.h
+++ b/src/k3bplacesmodel.h
@@ -35,7 +35,7 @@ namespace K3b {
Q_OBJECT

public:
- PlacesModel( QObject* parent = 0 );
+ explicit PlacesModel( QObject* parent = 0 );
~PlacesModel();

/**
diff --git a/src/k3bprojectinterface.h b/src/k3bprojectinterface.h
index af508ca49..16af6e31d 100644
--- a/src/k3bprojectinterface.h
+++ b/src/k3bprojectinterface.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_CLASSINFO( "D-Bus Interface", "org.k3b.Project" )

public:
- ProjectInterface( Doc* doc, const QString& dbusPath = QString() );
+ explicit ProjectInterface( Doc* doc, const QString& dbusPath = QString() );
~ProjectInterface();

QString dbusPath() const;
diff --git a/src/k3bprojectmanager.h b/src/k3bprojectmanager.h
index 21b7947d4..93e92a791 100644
--- a/src/k3bprojectmanager.h
+++ b/src/k3bprojectmanager.h
@@ -31,7 +31,7 @@ namespace K3b {
Q_OBJECT

public:
- ProjectManager( QObject* parent = 0 );
+ explicit ProjectManager( QObject* parent = 0 );
virtual ~ProjectManager();

QList<Doc*> projects() const;
diff --git a/src/k3bprojecttabwidget.h b/src/k3bprojecttabwidget.h
index ea9608a7e..2b4110a92 100644
--- a/src/k3bprojecttabwidget.h
+++ b/src/k3bprojecttabwidget.h
@@ -37,7 +37,7 @@ namespace K3b {
Q_OBJECT

public:
- ProjectTabWidget( QWidget *parent = 0 );
+ explicit ProjectTabWidget( QWidget *parent = 0 );
~ProjectTabWidget();

void addTab( Doc* doc );
diff --git a/src/k3bsplash.h b/src/k3bsplash.h
index cdd3c5f4e..6e998b0a9 100644
--- a/src/k3bsplash.h
+++ b/src/k3bsplash.h
@@ -30,7 +30,7 @@ class Splash : public QWidget
Q_OBJECT

public:
- Splash( QWidget* parent = 0 );
+ explicit Splash( QWidget* parent = 0 );
~Splash();

public Q_SLOTS:
diff --git a/src/k3bstatusbarmanager.h b/src/k3bstatusbarmanager.h
index 4b08ab398..ac3318bb7 100644
--- a/src/k3bstatusbarmanager.h
+++ b/src/k3bstatusbarmanager.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_OBJECT

public:
- StatusBarManager( MainWindow* parent );
+ explicit StatusBarManager( MainWindow* parent );
~StatusBarManager();

public Q_SLOTS:
diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h
index 50f376721..bcd1d961b 100644
--- a/src/k3bsystemproblemdialog.h
+++ b/src/k3bsystemproblemdialog.h
@@ -37,7 +37,7 @@ namespace K3b {
WARNING
};

- SystemProblem( Type type = NON_CRITICAL,
+ explicit SystemProblem( Type type = NON_CRITICAL,
const QString& problem = QString(),
const QString& details = QString(),
const QString& solution = QString() );
diff --git a/src/k3btempdirselectionwidget.h b/src/k3btempdirselectionwidget.h
index 57d4f401e..ec939efd7 100644
--- a/src/k3btempdirselectionwidget.h
+++ b/src/k3btempdirselectionwidget.h
@@ -34,7 +34,7 @@ class TempDirSelectionWidget : public QGroupBox
Q_OBJECT

public:
- TempDirSelectionWidget( QWidget *parent = 0 );
+ explicit TempDirSelectionWidget( QWidget *parent = 0 );
~TempDirSelectionWidget();

/** determines if the selection dialog should ask for a dir or a file */
diff --git a/src/k3bthemedheader.h b/src/k3bthemedheader.h
index a1e371716..886b95528 100644
--- a/src/k3bthemedheader.h
+++ b/src/k3bthemedheader.h
@@ -30,7 +30,7 @@ class ThemedHeader : public QFrame
Q_OBJECT

public:
- ThemedHeader( QWidget* parent = 0 );
+ explicit ThemedHeader( QWidget* parent = 0 );
ThemedHeader( const QString& title, const QString& subtitle, QWidget* parent = 0 );
~ThemedHeader();

diff --git a/src/k3bthemedlabel.h b/src/k3bthemedlabel.h
index 34f2e39ee..a45fba335 100644
--- a/src/k3bthemedlabel.h
+++ b/src/k3bthemedlabel.h
@@ -26,9 +26,9 @@ class ThemedLabel : public KSqueezedTextLabel
Q_OBJECT

public:
- ThemedLabel( QWidget* parent = 0 );
- ThemedLabel( const QString& text, QWidget* parent = 0 );
- ThemedLabel( Theme::PixmapType, QWidget* parent = 0 );
+ explicit ThemedLabel( QWidget* parent = 0 );
+ explicit ThemedLabel( const QString& text, QWidget* parent = 0 );
+ explicit ThemedLabel( Theme::PixmapType, QWidget* parent = 0 );

protected:
bool event( QEvent* event ) override;
diff --git a/src/k3bthememanager.h b/src/k3bthememanager.h
index c744bfa11..c97ea821e 100644
--- a/src/k3bthememanager.h
+++ b/src/k3bthememanager.h
@@ -29,7 +29,7 @@ namespace K3b {
{
public:
Theme();
- Theme( QString name );
+ explicit Theme( QString name );

QColor backgroundColor() const;
QColor foregroundColor() const;
@@ -113,7 +113,7 @@ namespace K3b {
Q_OBJECT

public:
- ThemeManager( QObject* parent = 0 );
+ explicit ThemeManager( QObject* parent = 0 );
~ThemeManager();

QList<Theme*> themes() const;
diff --git a/src/k3btimeoutwidget.h b/src/k3btimeoutwidget.h
index c2cd6a811..589e770a6 100644
--- a/src/k3btimeoutwidget.h
+++ b/src/k3btimeoutwidget.h
@@ -27,7 +27,7 @@ class TimeoutWidget : public QWidget
Q_OBJECT

public:
- TimeoutWidget( QWidget* parent );
+ explicit TimeoutWidget( QWidget* parent );
~TimeoutWidget();

QSize sizeHint() const;
diff --git a/src/k3burlnavigator.h b/src/k3burlnavigator.h
index aa4cfd363..4f2f21b5f 100644
--- a/src/k3burlnavigator.h
+++ b/src/k3burlnavigator.h
@@ -28,7 +28,7 @@ namespace K3b {
Q_OBJECT

public:
- UrlNavigator( KFilePlacesModel* model, QWidget* parent = 0 );
+ explicit UrlNavigator( KFilePlacesModel* model, QWidget* parent = 0 );
~UrlNavigator();

public Q_SLOTS:
diff --git a/src/k3bviewcolumnadjuster.h b/src/k3bviewcolumnadjuster.h
index 78ce48699..842b9c942 100644
--- a/src/k3bviewcolumnadjuster.h
+++ b/src/k3bviewcolumnadjuster.h
@@ -28,8 +28,8 @@ namespace K3b {
Q_OBJECT

public:
- ViewColumnAdjuster( QObject* parent = 0 );
- ViewColumnAdjuster( QTreeView* parent );
+ explicit ViewColumnAdjuster( QObject* parent = 0 );
+ explicit ViewColumnAdjuster( QTreeView* parent );
~ViewColumnAdjuster();

/**
diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h
index 259d99c3a..3b574851a 100644
--- a/src/k3bwelcomewidget.h
+++ b/src/k3bwelcomewidget.h
@@ -42,7 +42,7 @@ namespace K3b {
Q_OBJECT

public:
- WelcomeWidget( MainWindow* mainWindow, QWidget* parent = 0 );
+ explicit WelcomeWidget( MainWindow* mainWindow, QWidget* parent = 0 );
~WelcomeWidget();

void loadConfig( const KConfigGroup& c );
diff --git a/src/k3bwidgetshoweffect.h b/src/k3bwidgetshoweffect.h
index a2f5821eb..f82ab4591 100644
--- a/src/k3bwidgetshoweffect.h
+++ b/src/k3bwidgetshoweffect.h
@@ -42,7 +42,7 @@ public:
Slide
};

- WidgetShowEffect( QWidget* widget, Effect e = Slide );
+ explicit WidgetShowEffect( QWidget* widget, Effect e = Slide );
~WidgetShowEffect();

void setEffect( Effect e ) { m_effect = e; }
diff --git a/src/k3bwriterselectionwidget.h b/src/k3bwriterselectionwidget.h
index 38752a763..038c692d1 100644
--- a/src/k3bwriterselectionwidget.h
+++ b/src/k3bwriterselectionwidget.h
@@ -43,7 +43,7 @@ namespace K3b {
/**
* Creates a writerselectionwidget
*/
- WriterSelectionWidget( QWidget* parent = 0 );
+ explicit WriterSelectionWidget( QWidget* parent = 0 );
~WriterSelectionWidget();

int writerSpeed() const;
diff --git a/src/k3bwritingmodewidget.h b/src/k3bwritingmodewidget.h
index 40c4d2e80..48ab06d50 100644
--- a/src/k3bwritingmodewidget.h
+++ b/src/k3bwritingmodewidget.h
@@ -32,8 +32,8 @@ namespace K3b {
Q_OBJECT

public:
- WritingModeWidget( QWidget* parent = 0 );
- WritingModeWidget( WritingModes modes, QWidget* parent = 0 );
+ explicit WritingModeWidget( QWidget* parent = 0 );
+ explicit WritingModeWidget( WritingModes modes, QWidget* parent = 0 );
~WritingModeWidget();

WritingMode writingMode() const;
diff --git a/src/misc/k3bimagewritingdialog.h b/src/misc/k3bimagewritingdialog.h
index fdaa5de40..eb6ac9abe 100644
--- a/src/misc/k3bimagewritingdialog.h
+++ b/src/misc/k3bimagewritingdialog.h
@@ -37,7 +37,7 @@ namespace K3b {
Q_OBJECT

public:
- ImageWritingDialog( QWidget* = 0 );
+ explicit ImageWritingDialog( QWidget* = 0 );
~ImageWritingDialog();

void setImage( const QUrl& url );
diff --git a/src/misc/k3bmediacopydialog.h b/src/misc/k3bmediacopydialog.h
index 428a05ec2..3783aad1a 100644
--- a/src/misc/k3bmediacopydialog.h
+++ b/src/misc/k3bmediacopydialog.h
@@ -38,7 +38,7 @@ namespace K3b {
Q_OBJECT

public:
- MediaCopyDialog( QWidget *parent = 0 );
+ explicit MediaCopyDialog( QWidget *parent = 0 );
~MediaCopyDialog();

void setReadingDevice( Device::Device* );
diff --git a/src/misc/k3bmediaformattingdialog.h b/src/misc/k3bmediaformattingdialog.h
index 63c7e8f58..393bbb3d9 100644
--- a/src/misc/k3bmediaformattingdialog.h
+++ b/src/misc/k3bmediaformattingdialog.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- MediaFormattingDialog( QWidget* = 0 );
+ explicit MediaFormattingDialog( QWidget* = 0 );
~MediaFormattingDialog();

public Q_SLOTS:
diff --git a/src/option/k3badvancedoptiontab.h b/src/option/k3badvancedoptiontab.h
index dc0debaf8..1a70214fc 100644
--- a/src/option/k3badvancedoptiontab.h
+++ b/src/option/k3badvancedoptiontab.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- AdvancedOptionTab( QWidget* parent = 0 );
+ explicit AdvancedOptionTab( QWidget* parent = 0 );
~AdvancedOptionTab();

void saveSettings();
diff --git a/src/option/k3bcddboptiontab.h b/src/option/k3bcddboptiontab.h
index 40f961ef2..b6d2a2608 100644
--- a/src/option/k3bcddboptiontab.h
+++ b/src/option/k3bcddboptiontab.h
@@ -26,7 +26,7 @@ class CddbOptionTab : public QWidget
Q_OBJECT

public:
- CddbOptionTab( QWidget* parent = 0 );
+ explicit CddbOptionTab( QWidget* parent = 0 );
~CddbOptionTab();

public Q_SLOTS:
diff --git a/src/option/k3bdeviceoptiontab.h b/src/option/k3bdeviceoptiontab.h
index 58729bf2c..e2fb0ca0e 100644
--- a/src/option/k3bdeviceoptiontab.h
+++ b/src/option/k3bdeviceoptiontab.h
@@ -27,7 +27,7 @@ namespace K3b {
Q_OBJECT

public:
- DeviceOptionTab( QWidget* = 0 );
+ explicit DeviceOptionTab( QWidget* = 0 );
~DeviceOptionTab();

void readDevices();
diff --git a/src/option/k3bdevicewidget.h b/src/option/k3bdevicewidget.h
index ead49bd82..2280f845e 100644
--- a/src/option/k3bdevicewidget.h
+++ b/src/option/k3bdevicewidget.h
@@ -36,7 +36,7 @@ namespace K3b {
Q_OBJECT

public:
- DeviceWidget( Device::DeviceManager*, QWidget *parent = 0 );
+ explicit DeviceWidget( Device::DeviceManager*, QWidget *parent = 0 );
~DeviceWidget();

public Q_SLOTS:
diff --git a/src/option/k3bexternalbinmodel.h b/src/option/k3bexternalbinmodel.h
index d1128ccd3..a4ae2b323 100644
--- a/src/option/k3bexternalbinmodel.h
+++ b/src/option/k3bexternalbinmodel.h
@@ -37,7 +37,7 @@ namespace K3b {
};

public:
- ExternalBinModel( ExternalBinManager* manager, QObject* parent = 0 );
+ explicit ExternalBinModel( ExternalBinManager* manager, QObject* parent = 0 );
~ExternalBinModel();

/**
diff --git a/src/option/k3bexternalbinoptiontab.h b/src/option/k3bexternalbinoptiontab.h
index 599d436c7..281e98e10 100644
--- a/src/option/k3bexternalbinoptiontab.h
+++ b/src/option/k3bexternalbinoptiontab.h
@@ -29,7 +29,7 @@ class ExternalBinOptionTab : public QWidget
Q_OBJECT

public:
- ExternalBinOptionTab( ExternalBinManager* manager, QWidget* = 0 );
+ explicit ExternalBinOptionTab( ExternalBinManager* manager, QWidget* = 0 );
~ExternalBinOptionTab();

void readSettings();
diff --git a/src/option/k3bexternalbinparamsmodel.h b/src/option/k3bexternalbinparamsmodel.h
index 4a9520d8d..0f6645b76 100644
--- a/src/option/k3bexternalbinparamsmodel.h
+++ b/src/option/k3bexternalbinparamsmodel.h
@@ -35,7 +35,7 @@ namespace K3b {
};

public:
- ExternalBinParamsModel( ExternalBinManager* manager, QObject* parent = 0 );
+ explicit ExternalBinParamsModel( ExternalBinManager* manager, QObject* parent = 0 );
~ExternalBinParamsModel();

/**
diff --git a/src/option/k3bexternalbinpermissionmodel.h b/src/option/k3bexternalbinpermissionmodel.h
index 1e725998f..9edeb40f0 100644
--- a/src/option/k3bexternalbinpermissionmodel.h
+++ b/src/option/k3bexternalbinpermissionmodel.h
@@ -41,7 +41,7 @@ namespace K3b {
};

public:
- ExternalBinPermissionModel(ExternalBinManager const& externalBinManager, QObject* parent = 0);
+ explicit ExternalBinPermissionModel(ExternalBinManager const& externalBinManager, QObject* parent = 0);
~ExternalBinPermissionModel();

QList<HelperProgramItem> selectedPrograms() const;
diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h
index 17f23ea5b..ed93ece39 100644
--- a/src/option/k3bexternalbinwidget.h
+++ b/src/option/k3bexternalbinwidget.h
@@ -41,7 +41,7 @@ namespace K3b {
Q_OBJECT

public:
- ExternalBinWidget( ExternalBinManager* manager, QWidget* parent = 0 );
+ explicit ExternalBinWidget( ExternalBinManager* manager, QWidget* parent = 0 );
~ExternalBinWidget();

public Q_SLOTS:
diff --git a/src/option/k3bmiscoptiontab.h b/src/option/k3bmiscoptiontab.h
index a4e4564eb..27b0f165d 100644
--- a/src/option/k3bmiscoptiontab.h
+++ b/src/option/k3bmiscoptiontab.h
@@ -25,7 +25,7 @@ namespace K3b {
Q_OBJECT

public:
- MiscOptionTab(QWidget *parent=0);
+ explicit MiscOptionTab(QWidget *parent=0);
~MiscOptionTab();

void readSettings();
diff --git a/src/option/k3bnotifyoptiontab.h b/src/option/k3bnotifyoptiontab.h
index db33f6a16..63a920492 100644
--- a/src/option/k3bnotifyoptiontab.h
+++ b/src/option/k3bnotifyoptiontab.h
@@ -27,7 +27,7 @@ class NotifyOptionTab : public QWidget
Q_OBJECT

public:
- NotifyOptionTab( QWidget* parent = 0 );
+ explicit NotifyOptionTab( QWidget* parent = 0 );
~NotifyOptionTab();

void readSettings();
diff --git a/src/option/k3boptiondialog.h b/src/option/k3boptiondialog.h
index cde13034d..1b30b8e4c 100644
--- a/src/option/k3boptiondialog.h
+++ b/src/option/k3boptiondialog.h
@@ -54,7 +54,7 @@ class OptionDialog : public KPageDialog
Q_OBJECT

public:
- OptionDialog( QWidget* parent = 0 );
+ explicit OptionDialog( QWidget* parent = 0 );
~OptionDialog();

enum ConfigPage {
diff --git a/src/option/k3bpluginoptiontab.h b/src/option/k3bpluginoptiontab.h
index 4fd0dd233..0809b1b8e 100644
--- a/src/option/k3bpluginoptiontab.h
+++ b/src/option/k3bpluginoptiontab.h
@@ -24,7 +24,7 @@ namespace K3b {
Q_OBJECT

public:
- PluginOptionTab( QWidget* parent = 0 );
+ explicit PluginOptionTab( QWidget* parent = 0 );
~PluginOptionTab();
};
}
diff --git a/src/option/k3bthememodel.h b/src/option/k3bthememodel.h
index 8db972c09..765636971 100644
--- a/src/option/k3bthememodel.h
+++ b/src/option/k3bthememodel.h
@@ -38,7 +38,7 @@ namespace K3b {
};

public:
- ThemeModel( ThemeManager* themeManager, QObject* parent = 0 );
+ explicit ThemeModel( ThemeManager* themeManager, QObject* parent = 0 );
~ThemeModel();

/**
diff --git a/src/option/k3bthemeoptiontab.h b/src/option/k3bthemeoptiontab.h
index 6274ea9ff..52d69bd72 100644
--- a/src/option/k3bthemeoptiontab.h
+++ b/src/option/k3bthemeoptiontab.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- ThemeOptionTab( QWidget* parent = 0 );
+ explicit ThemeOptionTab( QWidget* parent = 0 );
~ThemeOptionTab();

void readSettings();
diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h
index 9e2e378f6..66f6ad9f8 100644
--- a/src/projects/k3baudioburndialog.h
+++ b/src/projects/k3baudioburndialog.h
@@ -43,7 +43,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioBurnDialog(AudioDoc* doc, QWidget *parent=0 );
+ explicit AudioBurnDialog(AudioDoc* doc, QWidget *parent=0 );
~AudioBurnDialog();

protected:
diff --git a/src/projects/k3baudiocdtextwidget.h b/src/projects/k3baudiocdtextwidget.h
index 7bdc99387..4c537d7fa 100644
--- a/src/projects/k3baudiocdtextwidget.h
+++ b/src/projects/k3baudiocdtextwidget.h
@@ -25,7 +25,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioCdTextWidget( QWidget* parent = 0 );
+ explicit AudioCdTextWidget( QWidget* parent = 0 );
~AudioCdTextWidget();

bool isChecked() const;
diff --git a/src/projects/k3baudiodatasourceeditwidget.h b/src/projects/k3baudiodatasourceeditwidget.h
index 0ec375a49..ae2982a69 100644
--- a/src/projects/k3baudiodatasourceeditwidget.h
+++ b/src/projects/k3baudiodatasourceeditwidget.h
@@ -39,7 +39,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioDataSourceEditWidget( QWidget* parent = 0 );
+ explicit AudioDataSourceEditWidget( QWidget* parent = 0 );
~AudioDataSourceEditWidget();

K3b::Msf startOffset() const;
diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h
index 818bd4a04..1066698b0 100644
--- a/src/projects/k3baudioeditorwidget.h
+++ b/src/projects/k3baudioeditorwidget.h
@@ -32,7 +32,7 @@ class AudioEditorWidget : public QFrame
Q_OBJECT

public:
- AudioEditorWidget( QWidget* parent = 0 );
+ explicit AudioEditorWidget( QWidget* parent = 0 );
~AudioEditorWidget();

virtual QSize sizeHint() const;
diff --git a/src/projects/k3baudioprojectdelegate.h b/src/projects/k3baudioprojectdelegate.h
index b3f0a7085..b658ff446 100644
--- a/src/projects/k3baudioprojectdelegate.h
+++ b/src/projects/k3baudioprojectdelegate.h
@@ -26,7 +26,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioProjectDelegate( QAbstractItemView& view, QObject* parent = 0 );
+ explicit AudioProjectDelegate( QAbstractItemView& view, QObject* parent = 0 );
~AudioProjectDelegate();

virtual QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
diff --git a/src/projects/k3baudiotrackdialog.h b/src/projects/k3baudiotrackdialog.h
index a0350d71a..6773345e3 100644
--- a/src/projects/k3baudiotrackdialog.h
+++ b/src/projects/k3baudiotrackdialog.h
@@ -32,7 +32,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioTrackDialog( const QList<AudioTrack*>&, QWidget *parent=0);
+ explicit AudioTrackDialog( const QList<AudioTrack*>&, QWidget *parent=0);
~AudioTrackDialog();

protected Q_SLOTS:
diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h
index 57ba59fde..930c86ab2 100644
--- a/src/projects/k3baudiotracksplitdialog.h
+++ b/src/projects/k3baudiotracksplitdialog.h
@@ -36,7 +36,7 @@ class AudioTrackSplitDialog : public QDialog
Q_OBJECT

public:
- AudioTrackSplitDialog( AudioTrack*, QWidget* parent = 0 );
+ explicit AudioTrackSplitDialog( AudioTrack*, QWidget* parent = 0 );
~AudioTrackSplitDialog();

bool eventFilter( QObject* o, QEvent* e ) override;
diff --git a/src/projects/k3baudiotracktrmlookupdialog.h b/src/projects/k3baudiotracktrmlookupdialog.h
index 65fba161f..28aad959a 100644
--- a/src/projects/k3baudiotracktrmlookupdialog.h
+++ b/src/projects/k3baudiotracktrmlookupdialog.h
@@ -39,7 +39,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioTrackTRMLookupDialog( QWidget* parent = 0 );
+ explicit AudioTrackTRMLookupDialog( QWidget* parent = 0 );
~AudioTrackTRMLookupDialog();

/**
diff --git a/src/projects/k3baudiotrackwidget.h b/src/projects/k3baudiotrackwidget.h
index 7a41b627b..969b733df 100644
--- a/src/projects/k3baudiotrackwidget.h
+++ b/src/projects/k3baudiotrackwidget.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioTrackWidget( const QList<AudioTrack*>& tracks,
+ explicit AudioTrackWidget( const QList<AudioTrack*>& tracks,
QWidget* parent = 0 );
~AudioTrackWidget();

diff --git a/src/projects/k3bbootimagedialog.h b/src/projects/k3bbootimagedialog.h
index ba711c0e6..4ca5f9c7e 100644
--- a/src/projects/k3bbootimagedialog.h
+++ b/src/projects/k3bbootimagedialog.h
@@ -32,7 +32,7 @@ namespace K3b {
Q_OBJECT

public:
- BootImageDialog( DataDoc* doc, QWidget* parent = 0 );
+ explicit BootImageDialog( DataDoc* doc, QWidget* parent = 0 );
~BootImageDialog();

private Q_SLOTS:
diff --git a/src/projects/k3bbootimagemodel.h b/src/projects/k3bbootimagemodel.h
index 58fddc126..cbae70d53 100644
--- a/src/projects/k3bbootimagemodel.h
+++ b/src/projects/k3bbootimagemodel.h
@@ -36,7 +36,7 @@ namespace K3b {
};

public:
- BootImageModel( DataDoc* doc, QObject* parent = 0 );
+ explicit BootImageModel( DataDoc* doc, QObject* parent = 0 );
~BootImageModel();

BootItem* bootItemForIndex( const QModelIndex& index ) const;
diff --git a/src/projects/k3bdataadvancedimagesettingsdialog.h b/src/projects/k3bdataadvancedimagesettingsdialog.h
index 359ea3ff4..99b42c09b 100644
--- a/src/projects/k3bdataadvancedimagesettingsdialog.h
+++ b/src/projects/k3bdataadvancedimagesettingsdialog.h
@@ -26,7 +26,7 @@ namespace K3b {
Q_OBJECT

public:
- DataAdvancedImageSettingsDialog( QWidget* parent = 0 );
+ explicit DataAdvancedImageSettingsDialog( QWidget* parent = 0 );
~DataAdvancedImageSettingsDialog();

void load( const IsoOptions& options );
diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h
index a83e88937..dd1459c80 100644
--- a/src/projects/k3bdataburndialog.h
+++ b/src/projects/k3bdataburndialog.h
@@ -36,7 +36,7 @@ namespace K3b {
Q_OBJECT

public:
- DataBurnDialog(DataDoc*, QWidget *parent=0 );
+ explicit DataBurnDialog(DataDoc*, QWidget *parent=0 );
~DataBurnDialog();

protected:
diff --git a/src/projects/k3bdataimagesettingswidget.h b/src/projects/k3bdataimagesettingswidget.h
index db287df71..91a0d4f3f 100644
--- a/src/projects/k3bdataimagesettingswidget.h
+++ b/src/projects/k3bdataimagesettingswidget.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- DataImageSettingsWidget( QWidget* parent = 0 );
+ explicit DataImageSettingsWidget( QWidget* parent = 0 );
~DataImageSettingsWidget();

void load( const IsoOptions& );
diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h
index 7fda53e2b..51fba4945 100644
--- a/src/projects/k3bdatamultisessioncombobox.h
+++ b/src/projects/k3bdatamultisessioncombobox.h
@@ -27,7 +27,7 @@ namespace K3b {
Q_OBJECT

public:
- DataMultiSessionCombobox( QWidget* parent = 0 );
+ explicit DataMultiSessionCombobox( QWidget* parent = 0 );
~DataMultiSessionCombobox();

/**
diff --git a/src/projects/k3bdatamultisessionimportdialog.h b/src/projects/k3bdatamultisessionimportdialog.h
index 6672baa0e..90ae5c869 100644
--- a/src/projects/k3bdatamultisessionimportdialog.h
+++ b/src/projects/k3bdatamultisessionimportdialog.h
@@ -47,7 +47,7 @@ namespace K3b {
void addMedium( const K3b::Medium& medium );

private:
- DataMultisessionImportDialog( QWidget* parent );
+ explicit DataMultisessionImportDialog( QWidget* parent );
~DataMultisessionImportDialog();

class Private;
diff --git a/src/projects/k3bdataprojectmodel.h b/src/projects/k3bdataprojectmodel.h
index 3d82e1e56..9db2b7482 100644
--- a/src/projects/k3bdataprojectmodel.h
+++ b/src/projects/k3bdataprojectmodel.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- DataProjectModel( DataDoc* doc, QObject* parent = 0 );
+ explicit DataProjectModel( DataDoc* doc, QObject* parent = 0 );
~DataProjectModel();

enum Columns {
diff --git a/src/projects/k3bdataprojectsortproxymodel.h b/src/projects/k3bdataprojectsortproxymodel.h
index 03e95d01a..e154dade5 100644
--- a/src/projects/k3bdataprojectsortproxymodel.h
+++ b/src/projects/k3bdataprojectsortproxymodel.h
@@ -28,7 +28,7 @@ namespace K3b {
class DataProjectSortProxyModel : public QSortFilterProxyModel
{
public:
- DataProjectSortProxyModel( QObject* parent = 0 );
+ explicit DataProjectSortProxyModel( QObject* parent = 0 );

protected:
virtual bool lessThan(const QModelIndex& left, const QModelIndex& right) const;
diff --git a/src/projects/k3bdatapropertiesdialog.h b/src/projects/k3bdatapropertiesdialog.h
index 2acce3296..595e5b8d7 100644
--- a/src/projects/k3bdatapropertiesdialog.h
+++ b/src/projects/k3bdatapropertiesdialog.h
@@ -37,7 +37,7 @@ namespace K3b {
Q_OBJECT

public:
- DataPropertiesDialog( const QList<DataItem*>&, QWidget* parent = 0 );
+ explicit DataPropertiesDialog( const QList<DataItem*>&, QWidget* parent = 0 );
~DataPropertiesDialog();

protected Q_SLOTS:
diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h
index 2587a4b04..e935db3b7 100644
--- a/src/projects/k3bdataview.h
+++ b/src/projects/k3bdataview.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- DataView( DataDoc* doc, QWidget* parent = 0 );
+ explicit DataView( DataDoc* doc, QWidget* parent = 0 );
virtual ~DataView();

public Q_SLOTS:
diff --git a/src/projects/k3bdatavolumedescdialog.h b/src/projects/k3bdatavolumedescdialog.h
index 35061a3f7..8248c4584 100644
--- a/src/projects/k3bdatavolumedescdialog.h
+++ b/src/projects/k3bdatavolumedescdialog.h
@@ -25,7 +25,7 @@ namespace K3b {
Q_OBJECT

public:
- DataVolumeDescDialog( QWidget* parent = 0 );
+ explicit DataVolumeDescDialog( QWidget* parent = 0 );
~DataVolumeDescDialog();

void load( const IsoOptions& );
diff --git a/src/projects/k3bdirproxymodel.h b/src/projects/k3bdirproxymodel.h
index 7734ca829..0fbb72f13 100644
--- a/src/projects/k3bdirproxymodel.h
+++ b/src/projects/k3bdirproxymodel.h
@@ -30,7 +30,7 @@ class DirProxyModel : public QSortFilterProxyModel
Q_OBJECT

public:
- DirProxyModel( QObject *parent = 0 );
+ explicit DirProxyModel( QObject *parent = 0 );
~DirProxyModel();

protected:
diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h
index eef88075f..b47b57b71 100644
--- a/src/projects/k3bfillstatusdisplay.h
+++ b/src/projects/k3bfillstatusdisplay.h
@@ -66,7 +66,7 @@ namespace K3b {
Q_OBJECT

public:
- FillStatusDisplay(Doc* doc, QWidget *parent=0);
+ explicit FillStatusDisplay(Doc* doc, QWidget *parent=0);
~FillStatusDisplay();

public Q_SLOTS:
diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h
index e61181f93..f4032cb8b 100644
--- a/src/projects/k3bmixedburndialog.h
+++ b/src/projects/k3bmixedburndialog.h
@@ -36,7 +36,7 @@ namespace K3b {
Q_OBJECT

public:
- MixedBurnDialog( MixedDoc*, QWidget *parent=0 );
+ explicit MixedBurnDialog( MixedDoc*, QWidget *parent=0 );

protected:
void loadSettings( const KConfigGroup& );
diff --git a/src/projects/k3bmixedview.h b/src/projects/k3bmixedview.h
index 827b9391f..e0bd76b3c 100644
--- a/src/projects/k3bmixedview.h
+++ b/src/projects/k3bmixedview.h
@@ -41,7 +41,7 @@ namespace K3b {
Q_OBJECT

public:
- MixedView( MixedDoc* doc, QWidget* parent = 0 );
+ explicit MixedView( MixedDoc* doc, QWidget* parent = 0 );
~MixedView();

public Q_SLOTS:
diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h
index 7bd4c5c61..85b5e6cf6 100644
--- a/src/projects/k3bmovixburndialog.h
+++ b/src/projects/k3bmovixburndialog.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- MovixBurnDialog( MovixDoc* doc, QWidget* parent = 0 );
+ explicit MovixBurnDialog( MovixDoc* doc, QWidget* parent = 0 );
~MovixBurnDialog();

protected Q_SLOTS:
diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h
index e25a1590a..271fc0282 100644
--- a/src/projects/k3bmovixoptionswidget.h
+++ b/src/projects/k3bmovixoptionswidget.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- MovixOptionsWidget( QWidget* parent = 0 );
+ explicit MovixOptionsWidget( QWidget* parent = 0 );
~MovixOptionsWidget();

public Q_SLOTS:
diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h
index d6a3b0d38..713659127 100644
--- a/src/projects/k3bmovixview.h
+++ b/src/projects/k3bmovixview.h
@@ -35,7 +35,7 @@ namespace K3b {
Q_OBJECT

public:
- MovixView( MovixDoc* doc, QWidget* parent = 0 );
+ explicit MovixView( MovixDoc* doc, QWidget* parent = 0 );
virtual ~MovixView();

private Q_SLOTS:
diff --git a/src/projects/k3bmusicbrainzjob.h b/src/projects/k3bmusicbrainzjob.h
index f31c6172e..c4731d6e2 100644
--- a/src/projects/k3bmusicbrainzjob.h
+++ b/src/projects/k3bmusicbrainzjob.h
@@ -38,7 +38,7 @@ namespace K3b {
* \param parent since we do not use this job with a normal progressdialog we need a widget
* as parent
*/
- MusicBrainzJob( QWidget* parent = 0 );
+ explicit MusicBrainzJob( QWidget* parent = 0 );
~MusicBrainzJob();

bool hasBeenCanceled() const;
diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h
index 239717f9b..5d13110cf 100644
--- a/src/projects/k3bprojectburndialog.h
+++ b/src/projects/k3bprojectburndialog.h
@@ -43,7 +43,7 @@ namespace K3b {
Q_OBJECT

public:
- ProjectBurnDialog( Doc* doc, QWidget *parent=0 );
+ explicit ProjectBurnDialog( Doc* doc, QWidget *parent=0 );
~ProjectBurnDialog();

enum resultCode { Canceled = 0, Saved = 1, Burn = 2 };
diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h
index f9e183a89..3e2fdfa4a 100644
--- a/src/projects/k3bvcdburndialog.h
+++ b/src/projects/k3bvcdburndialog.h
@@ -37,7 +37,7 @@ namespace K3b {
Q_OBJECT

public:
- VcdBurnDialog( VcdDoc* doc, QWidget *parent = 0 );
+ explicit VcdBurnDialog( VcdDoc* doc, QWidget *parent = 0 );
~VcdBurnDialog();

VcdDoc* vcdDoc() const
diff --git a/src/projects/k3bvcdprojectmodel.h b/src/projects/k3bvcdprojectmodel.h
index cba34bbe8..bd7a5e2dd 100644
--- a/src/projects/k3bvcdprojectmodel.h
+++ b/src/projects/k3bvcdprojectmodel.h
@@ -27,7 +27,7 @@ namespace K3b {
Q_OBJECT

public:
- VcdProjectModel( VcdDoc* doc, QObject* parent = 0 );
+ explicit VcdProjectModel( VcdDoc* doc, QObject* parent = 0 );
~VcdProjectModel();

enum Columns {
diff --git a/src/projects/k3bvcdtrackkeysdelegate.h b/src/projects/k3bvcdtrackkeysdelegate.h
index 74b8631d0..df5fa73c0 100644
--- a/src/projects/k3bvcdtrackkeysdelegate.h
+++ b/src/projects/k3bvcdtrackkeysdelegate.h
@@ -26,7 +26,7 @@ class VcdTrack;
class VcdTrackKeysDelegate : public QStyledItemDelegate
{
public:
- VcdTrackKeysDelegate( QList<VcdTrack*>& tracks, QObject* parent = 0 );
+ explicit VcdTrackKeysDelegate( QList<VcdTrack*>& tracks, QObject* parent = 0 );
~VcdTrackKeysDelegate();

virtual QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
diff --git a/src/projects/k3bvcdtrackkeysmodel.h b/src/projects/k3bvcdtrackkeysmodel.h
index 03d970d31..f71822c61 100644
--- a/src/projects/k3bvcdtrackkeysmodel.h
+++ b/src/projects/k3bvcdtrackkeysmodel.h
@@ -39,7 +39,7 @@ public:
typedef QMap<int, VcdTrack*> Key2Track;

public:
- VcdTrackKeysModel( int keyCount, QObject* parent = 0 );
+ explicit VcdTrackKeysModel( int keyCount, QObject* parent = 0 );
~VcdTrackKeysModel();

int keyCount() const;
diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h
index 6a4f38c8a..009fd1210 100644
--- a/src/projects/k3bvideodvdburndialog.h
+++ b/src/projects/k3bvideodvdburndialog.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- VideoDvdBurnDialog( VideoDvdDoc*, QWidget *parent = 0 );
+ explicit VideoDvdBurnDialog( VideoDvdDoc*, QWidget *parent = 0 );
~VideoDvdBurnDialog();

protected Q_SLOTS:
diff --git a/src/projects/k3bvideodvdview.h b/src/projects/k3bvideodvdview.h
index 284a8c99b..5c0453657 100644
--- a/src/projects/k3bvideodvdview.h
+++ b/src/projects/k3bvideodvdview.h
@@ -28,7 +28,7 @@ namespace K3b {
Q_OBJECT

public:
- VideoDvdView( VideoDvdDoc* doc, QWidget *parent = 0 );
+ explicit VideoDvdView( VideoDvdDoc* doc, QWidget *parent = 0 );
~VideoDvdView();

protected:
diff --git a/src/projects/k3bvolumenamewidget.h b/src/projects/k3bvolumenamewidget.h
index 570a2198c..ed804cdba 100644
--- a/src/projects/k3bvolumenamewidget.h
+++ b/src/projects/k3bvolumenamewidget.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- VolumeNameWidget( DataDoc* doc, QWidget* parent = 0 );
+ explicit VolumeNameWidget( DataDoc* doc, QWidget* parent = 0 );
~VolumeNameWidget();

protected:
diff --git a/src/rip/k3baudiocdview.h b/src/rip/k3baudiocdview.h
index 8b9ac9fb9..2c2e30ce4 100644
--- a/src/rip/k3baudiocdview.h
+++ b/src/rip/k3baudiocdview.h
@@ -29,7 +29,7 @@ class AudioCdView : public MediaContentsView
Q_OBJECT

public:
- AudioCdView( QWidget* parent = 0 );
+ explicit AudioCdView( QWidget* parent = 0 );
~AudioCdView();

KActionCollection* actionCollection() const;
diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h
index 70dce37fc..36e12135d 100644
--- a/src/rip/k3baudioconvertingoptionwidget.h
+++ b/src/rip/k3baudioconvertingoptionwidget.h
@@ -34,7 +34,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioConvertingOptionWidget( QWidget* parent );
+ explicit AudioConvertingOptionWidget( QWidget* parent );
~AudioConvertingOptionWidget();

void setBaseDir( const QString& path );
diff --git a/src/rip/k3baudioprojectconvertingdialog.h b/src/rip/k3baudioprojectconvertingdialog.h
index 92a78f154..e647b7419 100644
--- a/src/rip/k3baudioprojectconvertingdialog.h
+++ b/src/rip/k3baudioprojectconvertingdialog.h
@@ -35,7 +35,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioProjectConvertingDialog( AudioDoc*, QWidget *parent = 0);
+ explicit AudioProjectConvertingDialog( AudioDoc*, QWidget *parent = 0);
~AudioProjectConvertingDialog();

void setBaseDir( const QString& path );
diff --git a/src/rip/k3baudiotrackmodel.h b/src/rip/k3baudiotrackmodel.h
index 1bbebc768..0ed332958 100644
--- a/src/rip/k3baudiotrackmodel.h
+++ b/src/rip/k3baudiotrackmodel.h
@@ -30,7 +30,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioTrackModel( QObject* parent = 0 );
+ explicit AudioTrackModel( QObject* parent = 0 );
~AudioTrackModel();

enum Columns {
diff --git a/src/rip/k3bcddbpatternwidget.h b/src/rip/k3bcddbpatternwidget.h
index af2788a10..1044cc5f8 100644
--- a/src/rip/k3bcddbpatternwidget.h
+++ b/src/rip/k3bcddbpatternwidget.h
@@ -25,7 +25,7 @@ namespace K3b {
Q_OBJECT

public:
- CddbPatternWidget( QWidget* parent = 0 );
+ explicit CddbPatternWidget( QWidget* parent = 0 );
~CddbPatternWidget();

QString filenamePattern() const;
diff --git a/src/rip/k3bvideocdinfo.h b/src/rip/k3bvideocdinfo.h
index 7d0f44cff..8830543ff 100644
--- a/src/rip/k3bvideocdinfo.h
+++ b/src/rip/k3bvideocdinfo.h
@@ -73,7 +73,7 @@ class VideoCdInfo : public QObject
Q_OBJECT

public:
- VideoCdInfo( QObject* parent = 0 );
+ explicit VideoCdInfo( QObject* parent = 0 );
~VideoCdInfo();

/**
diff --git a/src/rip/k3bvideocdrippingdialog.h b/src/rip/k3bvideocdrippingdialog.h
index 3ed6286ca..660e0db2c 100644
--- a/src/rip/k3bvideocdrippingdialog.h
+++ b/src/rip/k3bvideocdrippingdialog.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- VideoCdRippingDialog( VideoCdRippingOptions* options, QWidget* parent = 0 );
+ explicit VideoCdRippingDialog( VideoCdRippingOptions* options, QWidget* parent = 0 );
~VideoCdRippingDialog();

private:
diff --git a/src/rip/k3bvideocdview.h b/src/rip/k3bvideocdview.h
index dd41d1620..1581de1fd 100644
--- a/src/rip/k3bvideocdview.h
+++ b/src/rip/k3bvideocdview.h
@@ -29,7 +29,7 @@ class VideoCdView : public MediaContentsView
Q_OBJECT

public:
- VideoCdView( QWidget* parent = 0 );
+ explicit VideoCdView( QWidget* parent = 0 );
~VideoCdView();

KActionCollection* actionCollection() const;
diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.h b/src/rip/videodvd/k3bvideodvdrippingjob.h
index a53cc4857..e7a9c7734 100644
--- a/src/rip/videodvd/k3bvideodvdrippingjob.h
+++ b/src/rip/videodvd/k3bvideodvdrippingjob.h
@@ -39,7 +39,7 @@ namespace K3b {
class TitleRipInfo {
public:
TitleRipInfo();
- TitleRipInfo( int title,
+ explicit TitleRipInfo( int title,
int audioStream = 0,
const QString& fn = QString(),
int width = 0, // 0 -> no resize
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h
index 08601268f..1e54c2316 100644
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.h
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h
@@ -33,7 +33,7 @@ namespace K3b {
Q_OBJECT

public:
- VideoDVDRippingPreview( QObject* parent = 0 );
+ explicit VideoDVDRippingPreview( QObject* parent = 0 );
~VideoDVDRippingPreview();

QImage preview() const { return m_preview; }
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.h b/src/rip/videodvd/k3bvideodvdrippingview.h
index f58d0dfd1..688d15c73 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.h
+++ b/src/rip/videodvd/k3bvideodvdrippingview.h
@@ -27,7 +27,7 @@ namespace K3b {
Q_OBJECT

public:
- VideoDVDRippingView( QWidget* parent = 0 );
+ explicit VideoDVDRippingView( QWidget* parent = 0 );
~VideoDVDRippingView();

KActionCollection* actionCollection() const;
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h
index 2f1f22a64..b1eb36105 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.h
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- VideoDVDRippingWidget( QWidget* parent );
+ explicit VideoDVDRippingWidget( QWidget* parent );
~VideoDVDRippingWidget();

VideoDVDTitleTranscodingJob::VideoCodec selectedVideoCodec() const;
diff --git a/src/rip/videodvd/k3bvideodvdtitledelegate.h b/src/rip/videodvd/k3bvideodvdtitledelegate.h
index 308dfa17f..217ba5914 100644
--- a/src/rip/videodvd/k3bvideodvdtitledelegate.h
+++ b/src/rip/videodvd/k3bvideodvdtitledelegate.h
@@ -24,7 +24,7 @@ namespace K3b {
Q_OBJECT

public:
- VideoDVDTitleDelegate( QObject* parent = 0 );
+ explicit VideoDVDTitleDelegate( QObject* parent = 0 );
~VideoDVDTitleDelegate();
virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
diff --git a/src/rip/videodvd/k3bvideodvdtitlemodel.h b/src/rip/videodvd/k3bvideodvdtitlemodel.h
index 6059b638f..e4c2e9006 100644
--- a/src/rip/videodvd/k3bvideodvdtitlemodel.h
+++ b/src/rip/videodvd/k3bvideodvdtitlemodel.h
@@ -27,7 +27,7 @@ class VideoDVDTitleModel : public QAbstractTableModel
Q_OBJECT

public:
- VideoDVDTitleModel( QObject* parent = 0 );
+ explicit VideoDVDTitleModel( QObject* parent = 0 );
~VideoDVDTitleModel();

enum Columns {

[Yuri Chornoivan]

Git commit ea415539fc6256494d5c12296a6216e522e12b0a by Yuri Chornoivan.
Committed on 27/08/2018 at 06:34.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 applets/appmenu/lib/appmenuapplet.cpp
M +4 -0 applets/appmenu/plugin/appmenumodel.h
M +1 -1 applets/calendar/package/contents/ui/configAgenda.qml
M +1 -1 applets/devicenotifier/package/contents/ui/DeviceItem.qml
M +1 -1 applets/digital-clock/CMakeLists.txt
M +1 -1 applets/digital-clock/package/contents/ui/MonthMenu.qml
M +3 -3 applets/digital-clock/plugin/digitalclockplugin.h
M +1 -1 applets/notifications/package/contents/ui/ThumbnailStrip.qml
M +1 -1 applets/notifications/plugin/thumbnailer.cpp
M +1 -1 applets/systemmonitor/diskusage/contents/ui/diskusage.qml
M +2 -2 applets/systemtray/systemtray.cpp
M +3 -3 appmenu/kdbusimporter.h
M +2 -2 components/shellprivate/shellprivateplugin.h
M +2 -2 containmentactions/applauncher/launch.h
M +1 -1 containmentactions/contextmenu/menu.cpp
M +3 -3 dataengines/apps/appjob.h
M +2 -2 dataengines/apps/appsengine.h
M +3 -3 dataengines/apps/appservice.h
M +3 -3 dataengines/apps/appsource.h
M +1 -1 dataengines/notifications/notificationsanitizer.cpp
M +5 -0 dataengines/notifications/notificationsanitizer.h
M +1 -1 dataengines/packagekit/packagekitengine.cpp
M +1 -1 dataengines/share/shareprovider.cpp
M +1 -1 dataengines/systemmonitor/systemmonitor.cpp
M +1 -1 gmenu-dbusmenu-proxy/menu.cpp
M +1 -1 gmenu-dbusmenu-proxy/window.cpp
M +3 -3 klipper/autotests/modeltest.h
M +0 -1 krunner/view.cpp
M +1 -2 ksmserver/logout-greeter/shutdowndlg.cpp
M +3 -3 kuiserver/tests/kuiservertest.h
M +5 -5 libcolorcorrect/compositorcoloradaptor.h
M +0 -1 libdbusmenuqt/dbusmenuimporter.cpp
M +1 -1 libkworkspace/config-libkworkspace.h.cmake
M +2 -2 libtaskmanager/abstracttasksmodeliface.h
M +2 -2 libtaskmanager/abstracttasksproxymodeliface.h
M +0 -3 libtaskmanager/tasktools.cpp
M +1 -1 libtaskmanager/tasktools.h
M +2 -2 libtaskmanager/xwindowsystemeventbatcher.h
M +1 -1 lookandfeel/contents/lockscreen/MainBlock.qml
M +1 -1 phonon/platform_kde/kdeplatformplugin.cpp
M +2 -2 runners/appstream/appstreamrunner.h
M +0 -1 runners/baloo/baloosearchrunner.cpp
M +1 -1 runners/bookmarks/bookmarksrunner_defs.h
M +0 -1 runners/bookmarks/browsers/chrome.cpp
M +3 -3 runners/bookmarks/faviconfromblob.h
M +1 -1 runners/services/autotests/servicerunnertest.cpp
M +1 -1 runners/solid/devicewrapper.h
M +1 -1 runners/windows/config-windowsrunner.h.cmake
M +1 -1 sddm-theme/Login.qml
M +2 -2 shell/alternativeshelper.h
M +3 -3 shell/desktopview.h
M +2 -2 shell/packageplugins/layouttemplate/layouttemplate.h
M +2 -2 shell/packageplugins/wallpaperimages/wallpaperpackage.h
M +2 -2 shell/panelshadows_p.h
M +1 -1 shell/panelview.h
M +5 -0 shell/softwarerendernotifier.h
M +2 -2 shell/standaloneappcorona.h
M +1 -1 startkde/kcminit/config-xcb.h.cmake
M +1 -1 wallpapers/image/autotests/testfindpreferredimage.cpp
M +1 -1 wallpapers/image/image.cpp
M +1 -1 xembed-sni-proxy/Readme.md
M +1 -1 xembed-sni-proxy/fdoselectionmanager.cpp
M +1 -1 xembed-sni-proxy/snidbus.cpp
M +1 -1 xembed-sni-proxy/sniproxy.cpp

https://commits.kde.org/plasma-workspace/ea415539fc6256494d5c12296a6216e522e12b0a

diff --git a/applets/appmenu/lib/appmenuapplet.cpp b/applets/appmenu/lib/appmenuapplet.cpp
index 495e0414..fd7b660d 100644
--- a/applets/appmenu/lib/appmenuapplet.cpp
+++ b/applets/appmenu/lib/appmenuapplet.cpp
@@ -174,7 +174,7 @@ void AppMenuApplet::trigger(QQuickItem *ctx, int idx)
QMenu *actionMenu = createMenu(idx);
if (actionMenu) {

- //this is a workaround where Qt will fail to realise a mouse has been released
+ //this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
// https://bugreports.qt.io/browse/QTBUG-59044
@@ -218,7 +218,7 @@ void AppMenuApplet::trigger(QQuickItem *ctx, int idx)
QMenu *oldMenu = m_currentMenu;
m_currentMenu = actionMenu;
if (oldMenu && oldMenu != actionMenu) {
- //dont initialize the currentIndex when another menu is already shown
+ //don't initialize the currentIndex when another menu is already shown
disconnect(oldMenu, &QMenu::aboutToHide, this, &AppMenuApplet::onMenuAboutToHide);
oldMenu->hide();
}
diff --git a/applets/appmenu/plugin/appmenumodel.h b/applets/appmenu/plugin/appmenumodel.h
index 7bd35fca..32fba6a5 100644
--- a/applets/appmenu/plugin/appmenumodel.h
+++ b/applets/appmenu/plugin/appmenumodel.h
@@ -19,6 +19,9 @@
*
******************************************************************/

+#ifndef APPMENUMODEL_H
+#define APPMENUMODEL_H
+
#include <QAbstractListModel>
#include <QAbstractNativeEventFilter>
#include <QStringList>
@@ -84,3 +87,4 @@ private:
QPointer<KDBusMenuImporter> m_importer;
};

+#endif
diff --git a/applets/calendar/package/contents/ui/configAgenda.qml b/applets/calendar/package/contents/ui/configAgenda.qml
index c6fbf460..ff33ddde 100644
--- a/applets/calendar/package/contents/ui/configAgenda.qml
+++ b/applets/calendar/package/contents/ui/configAgenda.qml
@@ -51,4 +51,4 @@ Item {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/applets/devicenotifier/package/contents/ui/DeviceItem.qml b/applets/devicenotifier/package/contents/ui/DeviceItem.qml
index bd7c3584..a3828284 100644
--- a/applets/devicenotifier/package/contents/ui/DeviceItem.qml
+++ b/applets/devicenotifier/package/contents/ui/DeviceItem.qml
@@ -251,7 +251,7 @@ MouseArea {
} else if (deviceItem.state == 1) {
return i18nc("Accessing is a less technical word for Mounting; translation should be short and mean \'Currently mounting this device\'", "Accessing...")
} else {
- return i18nc("Removing is a less technical word for Unmounting; translation shoud be short and mean \'Currently unmounting this device\'", "Removing...")
+ return i18nc("Removing is a less technical word for Unmounting; translation should be short and mean \'Currently unmounting this device\'", "Removing...")
}
}
}
diff --git a/applets/digital-clock/CMakeLists.txt b/applets/digital-clock/CMakeLists.txt
index 3114564a..7eed012f 100644
--- a/applets/digital-clock/CMakeLists.txt
+++ b/applets/digital-clock/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory(plugin)

-plasma_install_package(package org.kde.plasma.digitalclock)
\ No newline at end of file
+plasma_install_package(package org.kde.plasma.digitalclock)
diff --git a/applets/digital-clock/package/contents/ui/MonthMenu.qml b/applets/digital-clock/package/contents/ui/MonthMenu.qml
index 170ce62d..6bff1205 100644
--- a/applets/digital-clock/package/contents/ui/MonthMenu.qml
+++ b/applets/digital-clock/package/contents/ui/MonthMenu.qml
@@ -17,4 +17,4 @@
import QtQuick 2.0
import org.kde.plasma.calendar 2.0 as PlasmaCalendar

-PlasmaCalendar.MonthMenu { }
\ No newline at end of file
+PlasmaCalendar.MonthMenu { }
diff --git a/applets/digital-clock/plugin/digitalclockplugin.h b/applets/digital-clock/plugin/digitalclockplugin.h
index 1d5d678d..d80e0516 100644
--- a/applets/digital-clock/plugin/digitalclockplugin.h
+++ b/applets/digital-clock/plugin/digitalclockplugin.h
@@ -17,8 +17,8 @@
*/


-#ifndef NOTIFICATIONSHELPERPLUGIN_H
-#define NOTIFICATIONSHELPERPLUGIN_H
+#ifndef DIGITALCLOCKPLUGIN_H
+#define DIGITALCLOCKPLUGIN_H

#include <QQmlExtensionPlugin>

@@ -31,4 +31,4 @@ public:
void registerTypes(const char *uri) override;
};

-#endif // NOTIFICATIONSHELPERPLUGIN_H
+#endif // DIGITALCLOCKPLUGIN_H
diff --git a/applets/notifications/package/contents/ui/ThumbnailStrip.qml b/applets/notifications/package/contents/ui/ThumbnailStrip.qml
index ea561e1b..3cf589aa 100644
--- a/applets/notifications/package/contents/ui/ThumbnailStrip.qml
+++ b/applets/notifications/package/contents/ui/ThumbnailStrip.qml
@@ -151,7 +151,7 @@ ListView {
}
}

- // first item determins the ListView height
+ // first item determines the ListView height
Binding {
target: previewList
property: "implicitHeight"
diff --git a/applets/notifications/plugin/thumbnailer.cpp b/applets/notifications/plugin/thumbnailer.cpp
index 6b9c4e75..bfb80827 100644
--- a/applets/notifications/plugin/thumbnailer.cpp
+++ b/applets/notifications/plugin/thumbnailer.cpp
@@ -164,7 +164,7 @@ void Thumbnailer::showContextMenu(int x, int y, const QString &path, QQuickItem
dialog->show();
});

- //this is a workaround where Qt will fail to realise a mouse has been released
+ //this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
// https://bugreports.qt.io/browse/QTBUG-59044
diff --git a/applets/systemmonitor/diskusage/contents/ui/diskusage.qml b/applets/systemmonitor/diskusage/contents/ui/diskusage.qml
index 52d10360..9cde32a6 100644
--- a/applets/systemmonitor/diskusage/contents/ui/diskusage.qml
+++ b/applets/systemmonitor/diskusage/contents/ui/diskusage.qml
@@ -85,4 +85,4 @@ Applet {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
index 76bcf876..42d13126 100644
--- a/applets/systemtray/systemtray.cpp
+++ b/applets/systemtray/systemtray.cpp
@@ -163,7 +163,7 @@ void SystemTray::showPlasmoidMenu(QQuickItem *appletInterface, int x, int y)
connect(this, &QObject::destroyed, desktopMenu, &QMenu::close);
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);

- //this is a workaround where Qt will fail to realise a mouse has been released
+ //this is a workaround where Qt will fail to realize a mouse has been released

// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
@@ -413,7 +413,7 @@ void SystemTray::restorePlasmoids()
}
}

- // insertMulti becase it is possible (though poor form) to have multiple applets
+ // insertMulti because it is possible (though poor form) to have multiple applets
// with the same visible name but different plugins
sortedApplets.insertMulti(info.name(), info);
}
diff --git a/appmenu/kdbusimporter.h b/appmenu/kdbusimporter.h
index ead7d65f..0e196ba2 100644
--- a/appmenu/kdbusimporter.h
+++ b/appmenu/kdbusimporter.h
@@ -23,8 +23,8 @@
DEALINGS IN THE SOFTWARE.
*/

-#ifndef KDBUSMENUIMPORTER_H
-#define KDBUSMENUIMPORTER_H
+#ifndef KDBUSIMPORTER_H
+#define KDBUSIMPORTER_H

#include <dbusmenuimporter.h>

@@ -51,4 +51,4 @@ protected:
}
};

-#endif //KDBUSMENUIMPORTER_H
+#endif //KDBUSIMPORTER_H
diff --git a/components/shellprivate/shellprivateplugin.h b/components/shellprivate/shellprivateplugin.h
index a00dac92..9f30d48e 100644
--- a/components/shellprivate/shellprivateplugin.h
+++ b/components/shellprivate/shellprivateplugin.h
@@ -20,8 +20,8 @@
THE SOFTWARE.
*/

-#ifndef WIDGETEXPLORERPLUGIN_H
-#define WIDGETEXPLORERPLUGIN_H
+#ifndef SHELLPRIVATEPLUGIN_H
+#define SHELLPRIVATEPLUGIN_H

#include <QQmlExtensionPlugin>

diff --git a/containmentactions/applauncher/launch.h b/containmentactions/applauncher/launch.h
index 95b5123e..8d954f5d 100644
--- a/containmentactions/applauncher/launch.h
+++ b/containmentactions/applauncher/launch.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef SWITCHWINDOW_HEADER
-#define SWITCHWINDOW_HEADER
+#ifndef LAUNCH_H
+#define LAUNCH_H

#include <QMenu>

diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
index b2bd484e..a8480a68 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -224,7 +224,7 @@ void ContextMenu::lockScreen()
void ContextMenu::startLogout()
{
// this short delay is due to two issues:
- // a) KWorkSpace's DBus alls are all syncronous
+ // a) KWorkSpace's DBus alls are all synchronous
// b) the destrution of the menu that this action is in is delayed
//
// (a) leads to the menu hanging out where everyone can see it because
diff --git a/dataengines/apps/appjob.h b/dataengines/apps/appjob.h
index f2947ca1..b5c47923 100644
--- a/dataengines/apps/appjob.h
+++ b/dataengines/apps/appjob.h
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef TASKJOB_H
-#define TASKJOB_H
+#ifndef APPJOB_H
+#define APPJOB_H

// plasma
#include <Plasma/ServiceJob>
@@ -42,4 +42,4 @@ class AppJob : public Plasma::ServiceJob

};

-#endif // TASKJOB_H
+#endif // APPJOB_H
diff --git a/dataengines/apps/appsengine.h b/dataengines/apps/appsengine.h
index 518c31c3..ed80de0f 100644
--- a/dataengines/apps/appsengine.h
+++ b/dataengines/apps/appsengine.h
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef TASKSENGINE_H
-#define TASKSENGINE_H
+#ifndef APPSENGINE_H
+#define APPSENGINE_H

// plasma
#include <Plasma/DataEngine>
diff --git a/dataengines/apps/appservice.h b/dataengines/apps/appservice.h
index 03a3be96..59f2351b 100644
--- a/dataengines/apps/appservice.h
+++ b/dataengines/apps/appservice.h
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef TASKSERVICE_H
-#define TASKSERVICE_H
+#ifndef APPSERVICE_H
+#define APPSERVICE_H

// plasma
#include <Plasma/Service>
@@ -45,4 +45,4 @@ class AppService : public Plasma::Service
AppSource *m_source;
};

-#endif // TASKSERVICE_H
+#endif // APPSERVICE_H
diff --git a/dataengines/apps/appsource.h b/dataengines/apps/appsource.h
index a90b3135..e713298d 100644
--- a/dataengines/apps/appsource.h
+++ b/dataengines/apps/appsource.h
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef TASKSOURCE_H
-#define TASKSOURCE_H
+#ifndef APPSOURCE_H
+#define APPSOURCE_H

// plasma
#include <Plasma/DataContainer>
@@ -56,4 +56,4 @@ class AppSource : public Plasma::DataContainer

};

-#endif // TASKSOURCE_H
+#endif // APPSOURCE_H
diff --git a/dataengines/notifications/notificationsanitizer.cpp b/dataengines/notifications/notificationsanitizer.cpp
index 0d2452c2..9855f73b 100644
--- a/dataengines/notifications/notificationsanitizer.cpp
+++ b/dataengines/notifications/notificationsanitizer.cpp
@@ -38,7 +38,7 @@ QString NotificationSanitizer::parse(const QString &text)
// can happen for example when "\n \n" is sent, this replaces
// all <br/>s in succsession with just one
t.replace(QRegularExpression(QStringLiteral("<br/>\\s*<br/>(\\s|<br/>)*")), QLatin1String("<br/>"));
- // This fancy RegExp escapes every occurence of & since QtQuick Text will blatantly cut off
+ // This fancy RegExp escapes every occurrence of & since QtQuick Text will blatantly cut off
// text where it finds a stray ampersand.
// Only &{apos, quot, gt, lt, amp}; as well as &#123 character references will be allowed
t.replace(QRegularExpression(QStringLiteral("&(?!(?:apos|quot|[gl]t|amp);|#)")), QLatin1String("&amp;"));
diff --git a/dataengines/notifications/notificationsanitizer.h b/dataengines/notifications/notificationsanitizer.h
index 173cc396..0b5cde18 100644
--- a/dataengines/notifications/notificationsanitizer.h
+++ b/dataengines/notifications/notificationsanitizer.h
@@ -17,6 +17,9 @@
* Boston, MA 02110-1301, USA.
*/

+#ifndef NOTIFICATIONSANITIZER_H
+#define NOTIFICATIONSANITIZER_H
+
#include <QString>

namespace NotificationSanitizer
@@ -35,3 +38,5 @@ namespace NotificationSanitizer
*/
QString parse(const QString &in);
}
+
+#endif
diff --git a/dataengines/packagekit/packagekitengine.cpp b/dataengines/packagekit/packagekitengine.cpp
index 3e372044..137781be 100644
--- a/dataengines/packagekit/packagekitengine.cpp
+++ b/dataengines/packagekit/packagekitengine.cpp
@@ -63,4 +63,4 @@ Plasma::Service* PackagekitEngine::serviceForSource(const QString& source)
K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(packagekit, PackagekitEngine, "plasma-dataengine-packagekit.json")


-#include "packagekitengine.moc"
\ No newline at end of file
+#include "packagekitengine.moc"
diff --git a/dataengines/share/shareprovider.cpp b/dataengines/share/shareprovider.cpp
index 11fba096..72c1f920 100644
--- a/dataengines/share/shareprovider.cpp
+++ b/dataengines/share/shareprovider.cpp
@@ -364,7 +364,7 @@ void ShareProvider::success(const QString &url)

void ShareProvider::error(const QString &msg)
{
- // notify the service that it didnt work and the error msg
+ // notify the service that it didn't work and the error msg
emit finishedError(msg);
}

diff --git a/dataengines/systemmonitor/systemmonitor.cpp b/dataengines/systemmonitor/systemmonitor.cpp
index f0bfa218..80b90642 100644
--- a/dataengines/systemmonitor/systemmonitor.cpp
+++ b/dataengines/systemmonitor/systemmonitor.cpp
@@ -141,7 +141,7 @@ void SystemMonitorEngine::answerReceived(int id, const QList<QByteArray> &answer
sensors.insert(newSensor);
m_sensors.append(newSensor);
{
- // HACK: for backwards compability
+ // HACK: for backwards compatibility
// in case this source was created in sourceRequestEvent, stop it being
// automagically removed when disconnected from
Plasma::DataContainer *s = containerForSource( newSensor );
diff --git a/gmenu-dbusmenu-proxy/menu.cpp b/gmenu-dbusmenu-proxy/menu.cpp
index 4e5ba6d9..b4566150 100644
--- a/gmenu-dbusmenu-proxy/menu.cpp
+++ b/gmenu-dbusmenu-proxy/menu.cpp
@@ -94,7 +94,7 @@ void Menu::start(uint id)
m_menus[menu.id].append(menus);
}

- // LibreOffice on startup fails to give us some menus right away, we'll also subscribe in onMenuChanged() if neccessary
+ // LibreOffice on startup fails to give us some menus right away, we'll also subscribe in onMenuChanged() if necessary
if (menus.isEmpty()) {
qCWarning(DBUSMENUPROXY) << "Got an empty menu for" << id << "on" << m_serviceName << "at" << m_objectPath;
return;
diff --git a/gmenu-dbusmenu-proxy/window.cpp b/gmenu-dbusmenu-proxy/window.cpp
index d84760ec..ba26d7ab 100644
--- a/gmenu-dbusmenu-proxy/window.cpp
+++ b/gmenu-dbusmenu-proxy/window.cpp
@@ -456,7 +456,7 @@ uint Window::GetLayout(int parentId, int recursionDepth, const QStringList &prop
return 1;
}

- // If a particular entry is requested, see what it is and resolve as neccessary
+ // If a particular entry is requested, see what it is and resolve as necessary
// for example the "File" entry on root is 0,0,1 but is a menu reference to e.g. 1,0,0
// so resolve that and return the correct menu
if (index > 0) {
diff --git a/klipper/autotests/modeltest.h b/klipper/autotests/modeltest.h
index a02f9905..4e9253d1 100644
--- a/klipper/autotests/modeltest.h
+++ b/klipper/autotests/modeltest.h
@@ -43,9 +43,9 @@
#ifndef MODELTEST_H
#define MODELTEST_H

-#include <QtCore/QObject>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QStack>
+#include <QObject>
+#include <QAbstractItemModel>
+#include <QStack>

class ModelTest : public QObject
{
diff --git a/krunner/view.cpp b/krunner/view.cpp
index 53006be2..33ee575e 100644
--- a/krunner/view.cpp
+++ b/krunner/view.cpp
@@ -31,7 +31,6 @@
#include <KAuthorized>
#include <KWindowSystem>
#include <KWindowEffects>
-#include <KAuthorized>
#include <KGlobalAccel>
#include <KLocalizedString>
#include <KDirWatch>
diff --git a/ksmserver/logout-greeter/shutdowndlg.cpp b/ksmserver/logout-greeter/shutdowndlg.cpp
index a6d13d61..ec01894c 100644
--- a/ksmserver/logout-greeter/shutdowndlg.cpp
+++ b/ksmserver/logout-greeter/shutdowndlg.cpp
@@ -41,7 +41,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <QStandardPaths>
#include <QX11Info>
#include <QScreen>
-#include <QStandardPaths>

#include <KPackage/Package>
#include <KPackage/PackageLoader>
@@ -179,7 +178,7 @@ void KSMShutdownDlg::init()
setGeometry(screen()->geometry());
});

- //decide in backgroundcontrast wether doing things darker or lighter
+ //decide in backgroundcontrast whether doing things darker or lighter
//set backgroundcontrast here, because in QEvent::PlatformSurface
//is too early and we don't have the root object yet
const QColor backgroundColor = rootObject() ? rootObject()->property("backgroundColor").value<QColor>() : QColor();
diff --git a/kuiserver/tests/kuiservertest.h b/kuiserver/tests/kuiservertest.h
index 9408c471..53946e71 100644
--- a/kuiserver/tests/kuiservertest.h
+++ b/kuiserver/tests/kuiservertest.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef __KJOBTEST_H__
-#define __KJOBTEST_H__
+#ifndef __KUISERVERTEST_H__
+#define __KUISERVERTEST_H__

#include <kjob.h>
#include <kjobuidelegate.h>
@@ -49,4 +49,4 @@ private:
int seconds, total;
};

-#endif // __KJOBTEST_H__
+#endif // __KUISERVERTEST_H__
diff --git a/libcolorcorrect/compositorcoloradaptor.h b/libcolorcorrect/compositorcoloradaptor.h
index 266409d3..9bd3c207 100644
--- a/libcolorcorrect/compositorcoloradaptor.h
+++ b/libcolorcorrect/compositorcoloradaptor.h
@@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef COLORCORRECT_COMPOSITORADAPTOR_H
-#define COLORCORRECT_COMPOSITORADAPTOR_H
+#ifndef COMPOSITORCOLORADAPTOR_H
+#define COMPOSITORCOLORADAPTOR_H

#include <QObject>
#include <QTime>
@@ -331,7 +331,7 @@ public:
* longitude values and in Timings mode the morning and evening begin, as
* well as the transition time.
*
- * Returns true, if the configuration was succesfully applied.
+ * Returns true, if the configuration was successfully applied.
*
* @return bool
* @see sendConfigurationAll
@@ -344,7 +344,7 @@ public:
* Send all currently staged values to the compositor in order
* to trigger a configuration change.
*
- * Returns true, if the configuration was succesfully applied.
+ * Returns true, if the configuration was successfully applied.
*
* @return bool
* @see sendConfiguration
@@ -476,4 +476,4 @@ private:

}

-#endif // COLORCORRECT_COMPOSITORADAPTOR_H
+#endif // COMPOSITORCOLORADAPTOR_H
diff --git a/libdbusmenuqt/dbusmenuimporter.cpp b/libdbusmenuqt/dbusmenuimporter.cpp
index 702840fd..a23ed839 100644
--- a/libdbusmenuqt/dbusmenuimporter.cpp
+++ b/libdbusmenuqt/dbusmenuimporter.cpp
@@ -46,7 +46,6 @@

//#define BENCHMARK
#ifdef BENCHMARK
-#include <QTime>
static QTime sChrono;
#endif

diff --git a/libkworkspace/config-libkworkspace.h.cmake b/libkworkspace/config-libkworkspace.h.cmake
index d3d962f5..36a826ee 100644
--- a/libkworkspace/config-libkworkspace.h.cmake
+++ b/libkworkspace/config-libkworkspace.h.cmake
@@ -1,2 +1,2 @@
/* Define if you have X11 at all */
-#define HAVE_X11 ${X11_FOUND}
\ No newline at end of file
+#define HAVE_X11 ${X11_FOUND}
diff --git a/libtaskmanager/abstracttasksmodeliface.h b/libtaskmanager/abstracttasksmodeliface.h
index 951b16b8..78811017 100644
--- a/libtaskmanager/abstracttasksmodeliface.h
+++ b/libtaskmanager/abstracttasksmodeliface.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/

-#ifndef ABSTRACTASKSMODELIFACE_H
-#define ABSTRACTASKSMODELIFACE_H
+#ifndef ABSTRACTTASKSMODELIFACE_H
+#define ABSTRACTTASKSMODELIFACE_H

#include <QObject>

diff --git a/libtaskmanager/abstracttasksproxymodeliface.h b/libtaskmanager/abstracttasksproxymodeliface.h
index bd95bbe4..84467b90 100644
--- a/libtaskmanager/abstracttasksproxymodeliface.h
+++ b/libtaskmanager/abstracttasksproxymodeliface.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/

-#ifndef ABSTRACTASKSPROXYMODELIFACE_H
-#define ABSTRACTASKSPROXYMODELIFACE_H
+#ifndef ABSTRACTTASKSPROXYMODELIFACE_H
+#define ABSTRACTTASKSPROXYMODELIFACE_H

#include <QObject>

diff --git a/libtaskmanager/tasktools.cpp b/libtaskmanager/tasktools.cpp
index ed48fb7c..6be094e2 100644
--- a/libtaskmanager/tasktools.cpp
+++ b/libtaskmanager/tasktools.cpp
@@ -21,9 +21,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
#include "tasktools.h"
#include "abstracttasksmodel.h"

-#include "tasktools.h"
-#include "abstracttasksmodel.h"
-
#include <KActivities/ResourceInstance>
#include <KConfigGroup>
#include <KDesktopFile>
diff --git a/libtaskmanager/tasktools.h b/libtaskmanager/tasktools.h
index d8b12f58..b8b8ec79 100644
--- a/libtaskmanager/tasktools.h
+++ b/libtaskmanager/tasktools.h
@@ -72,7 +72,7 @@ TASKMANAGER_EXPORT AppData appDataFromUrl(const QUrl &url, const QIcon &fallback
* the .desktop file for the application owning this window, or,
* failing that, the path to its executable.
*
- * The source for the metadata is generally the the window's appId on
+ * The source for the metadata is generally the window's appId on
* Wayland, or the window class part of the WM_CLASS window property
* on X Windows.
*
diff --git a/libtaskmanager/xwindowsystemeventbatcher.h b/libtaskmanager/xwindowsystemeventbatcher.h
index 4cd84894..c954473b 100644
--- a/libtaskmanager/xwindowsystemeventbatcher.h
+++ b/libtaskmanager/xwindowsystemeventbatcher.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/

-#ifndef XWIDOWSYSTEMEVENTBATCHER_H
-#define XWIDOWSYSTEMEVENTBATCHER_H
+#ifndef XWINDOWSYSTEMEVENTBATCHER_H
+#define XWINDOWSYSTEMEVENTBATCHER_H

#include <QObject>

diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
index 865ad643..9124c739 100644
--- a/lookandfeel/contents/lockscreen/MainBlock.qml
+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
@@ -44,7 +44,7 @@ SessionManagementScreen {
var password = passwordBox.text

//this is partly because it looks nicer
- //but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focussed
+ //but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focused
//See https://bugreports.qt.io/browse/QTBUG-55460
loginButton.forceActiveFocus();
loginRequest(password);
diff --git a/phonon/platform_kde/kdeplatformplugin.cpp b/phonon/platform_kde/kdeplatformplugin.cpp
index cee4c8ad..f30cc71f 100644
--- a/phonon/platform_kde/kdeplatformplugin.cpp
+++ b/phonon/platform_kde/kdeplatformplugin.cpp
@@ -105,7 +105,7 @@ bool KdePlatformPlugin::isMimeTypeAvailable(const QString &/*mimeType*/) const
// everything is supported.
// In particular there's two problems
// 1. mimetypes do not map well to actual formats because the majority of
- // files these days are containers that can contain arbitary content
+ // files these days are containers that can contain arbitrary content
// streams, so mimetypes are too generic to properly define supportedness.
// 2. just about every multimedia library in the world draws format support
// from a plugin based architecture which means that technically everything
diff --git a/runners/appstream/appstreamrunner.h b/runners/appstream/appstreamrunner.h
index fbac0215..004c5f36 100644
--- a/runners/appstream/appstreamrunner.h
+++ b/runners/appstream/appstreamrunner.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/

-#ifndef INSTALLERRUNNER_H
-#define INSTALLERRUNNER_H
+#ifndef APPSTREAMRUNNER_H
+#define APPSTREAMRUNNER_H

#include <KRunner/AbstractRunner>
#include <AppStreamQt/pool.h>
diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
index de70fcc0..a55912d6 100644
--- a/runners/baloo/baloosearchrunner.cpp
+++ b/runners/baloo/baloosearchrunner.cpp
@@ -32,7 +32,6 @@
#include <QMimeData>
#include <QApplication>
#include <QDBusConnection>
-#include <QTimer>

#include <Baloo/Query>
#include <Baloo/IndexerConfig>
diff --git a/runners/bookmarks/bookmarksrunner_defs.h b/runners/bookmarks/bookmarksrunner_defs.h
index 211925af..8b1b732c 100644
--- a/runners/bookmarks/bookmarksrunner_defs.h
+++ b/runners/bookmarks/bookmarksrunner_defs.h
@@ -23,4 +23,4 @@

#define kdbg_code 1207

-#endif
\ No newline at end of file
+#endif
diff --git a/runners/bookmarks/browsers/chrome.cpp b/runners/bookmarks/browsers/chrome.cpp
index 3755f274..3e49c9fc 100644
--- a/runners/bookmarks/browsers/chrome.cpp
+++ b/runners/bookmarks/browsers/chrome.cpp
@@ -28,7 +28,6 @@
#include <QFileInfo>
#include <QDebug>
#include "bookmarksrunner_defs.h"
-#include <QFileInfo>
#include <QDir>

class ProfileBookmarks {
diff --git a/runners/bookmarks/faviconfromblob.h b/runners/bookmarks/faviconfromblob.h
index 54a5d20c..2d17e8dd 100644
--- a/runners/bookmarks/faviconfromblob.h
+++ b/runners/bookmarks/faviconfromblob.h
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef CHROMEFAVICON_H
-#define CHROMEFAVICON_H
+#ifndef FAVICONFROMBLOB_H
+#define FAVICONFROMBLOB_H

#include <QIcon>
#include "favicon.h"
@@ -47,4 +47,4 @@ private:
void cleanCacheDirectory();
};

-#endif // CHROMEFAVICON_H
+#endif // FAVICONFROMBLOB_H
diff --git a/runners/services/autotests/servicerunnertest.cpp b/runners/services/autotests/servicerunnertest.cpp
index 7ae14533..f8b92256 100644
--- a/runners/services/autotests/servicerunnertest.cpp
+++ b/runners/services/autotests/servicerunnertest.cpp
@@ -134,7 +134,7 @@ void ServiceRunnerTest::testKonsoleVsYakuakeComment()
void ServiceRunnerTest::testSystemSettings()
{
// In 5.9.0 'System Settings' suddenly didn't come back as a match for 'settings' anymore.
- // Sytem Settings has a noKDE version and a KDE version, if the noKDE version is encountered
+ // System Settings has a noKDE version and a KDE version, if the noKDE version is encountered
// first it will be added to the seen cache, however disqualification of already seen items
// may then also disqualify the KDE version of system settings on account of having already
// seen it. This test makes sure we find the right version.
diff --git a/runners/solid/devicewrapper.h b/runners/solid/devicewrapper.h
index d9dbb6cd..92f53ef9 100644
--- a/runners/solid/devicewrapper.h
+++ b/runners/solid/devicewrapper.h
@@ -78,7 +78,7 @@ class DeviceWrapper : public QObject
QString m_description;
QStringList m_actionIds;
// Solid doesn't like multithreading that much
- // We cache the informations we need locally so that
+ // We cache the information we need locally so that
// 1) nothing possibly goes wrong when processing a query
// 2) performance++

diff --git a/runners/windows/config-windowsrunner.h.cmake b/runners/windows/config-windowsrunner.h.cmake
index d3d962f5..36a826ee 100644
--- a/runners/windows/config-windowsrunner.h.cmake
+++ b/runners/windows/config-windowsrunner.h.cmake
@@ -1,2 +1,2 @@
/* Define if you have X11 at all */
-#define HAVE_X11 ${X11_FOUND}
\ No newline at end of file
+#define HAVE_X11 ${X11_FOUND}
diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml
index 967fbc40..381bdba2 100644
--- a/sddm-theme/Login.qml
+++ b/sddm-theme/Login.qml
@@ -35,7 +35,7 @@ SessionManagementScreen {
var password = passwordBox.text

//this is partly because it looks nicer
- //but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focussed
+ //but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focused
//DAVE REPORT THE FRICKING THING AND PUT A LINK
loginButton.forceActiveFocus();
loginRequest(username, password);
diff --git a/shell/alternativeshelper.h b/shell/alternativeshelper.h
index 44e8f534..ae7f9c1c 100644
--- a/shell/alternativeshelper.h
+++ b/shell/alternativeshelper.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef ALTERNATIVESDIALOG_H
-#define ALTERNATIVESDIALOG_H
+#ifndef ALTERNATIVESHELPER_H
+#define ALTERNATIVESHELPER_H

#include <Plasma/Applet>

diff --git a/shell/desktopview.h b/shell/desktopview.h
index 074afafe..59fa2366 100644
--- a/shell/desktopview.h
+++ b/shell/desktopview.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef DESKTOVIEW_H
-#define DESKTOVIEW_H
+#ifndef DESKTOPVIEW_H
+#define DESKTOPVIEW_H


#include <PlasmaQuick/ContainmentView>
@@ -107,4 +107,4 @@ private:
KWayland::Client::PlasmaShellSurface *m_shellSurface;
};

-#endif // DESKTOVIEW_H
+#endif // DESKTOPVIEW_H
diff --git a/shell/packageplugins/layouttemplate/layouttemplate.h b/shell/packageplugins/layouttemplate/layouttemplate.h
index 89d6eca4..fc44fef1 100644
--- a/shell/packageplugins/layouttemplate/layouttemplate.h
+++ b/shell/packageplugins/layouttemplate/layouttemplate.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA. *
*******************************************************************************/

-#ifndef SHELLPACKAGES_H
-#define SHELLPACKAGES_H
+#ifndef LAYOUTTEMPLATE_H
+#define LAYOUTTEMPLATE_H

#include <KPackage/PackageStructure>

diff --git a/shell/packageplugins/wallpaperimages/wallpaperpackage.h b/shell/packageplugins/wallpaperimages/wallpaperpackage.h
index aebf254f..f87eafd5 100644
--- a/shell/packageplugins/wallpaperimages/wallpaperpackage.h
+++ b/shell/packageplugins/wallpaperimages/wallpaperpackage.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef WALLPAPERSTRUCTURE_H
-#define WALLPAPERSTRUCTURE_H
+#ifndef WALLPAPERPACKAGE_H
+#define WALLPAPERPACKAGE_H

#include <KPackage/PackageStructure>

diff --git a/shell/panelshadows_p.h b/shell/panelshadows_p.h
index 81298742..037d37f2 100644
--- a/shell/panelshadows_p.h
+++ b/shell/panelshadows_p.h
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef PLASMA_PANELSHADOWS_H
-#define PLASMA_PANELSHADOWS_H
+#ifndef PANELSHADOWS_P_H
+#define PANELSHADOWS_P_H

#include <QSet>

diff --git a/shell/panelview.h b/shell/panelview.h
index 3a22d2b8..d12cba43 100644
--- a/shell/panelview.h
+++ b/shell/panelview.h
@@ -91,7 +91,7 @@ class PanelView : public PlasmaQuick::ContainmentView
Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged)

/**
- * informations about the screen in which the panel is in
+ * information about the screen in which the panel is in
*/
Q_PROPERTY(QScreen *screenToFollow READ screenToFollow WRITE setScreenToFollow NOTIFY screenToFollowChanged)

diff --git a/shell/softwarerendernotifier.h b/shell/softwarerendernotifier.h
index 59ef7638..88cfbe97 100644
--- a/shell/softwarerendernotifier.h
+++ b/shell/softwarerendernotifier.h
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

+#ifndef SOFTWARERENDERNOTIFIER_H
+#define SOFTWARERENDERNOTIFIER_H
+
#include <KStatusNotifierItem>

/**
@@ -33,3 +36,5 @@ private:
SoftwareRendererNotifier(QObject *parent=nullptr);
~SoftwareRendererNotifier();
};
+
+#endif
diff --git a/shell/standaloneappcorona.h b/shell/standaloneappcorona.h
index 0d774098..ea01d31f 100644
--- a/shell/standaloneappcorona.h
+++ b/shell/standaloneappcorona.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/

-#ifndef SIMPLESHELLCORONA_H
-#define SIMPLESHELLCORONA_H
+#ifndef STANDALONEAPPCORONA_H
+#define STANDALONEAPPCORONA_H

#include <plasma/corona.h>
#include "desktopview.h"
diff --git a/startkde/kcminit/config-xcb.h.cmake b/startkde/kcminit/config-xcb.h.cmake
index d15a49a4..bff341fc 100644
--- a/startkde/kcminit/config-xcb.h.cmake
+++ b/startkde/kcminit/config-xcb.h.cmake
@@ -1,2 +1,2 @@
/* Define if you have XCB at all */
-#cmakedefine XCB_FOUND
\ No newline at end of file
+#cmakedefine XCB_FOUND
diff --git a/wallpapers/image/autotests/testfindpreferredimage.cpp b/wallpapers/image/autotests/testfindpreferredimage.cpp
index cfe4bc03..ac9b5c6a 100644
--- a/wallpapers/image/autotests/testfindpreferredimage.cpp
+++ b/wallpapers/image/autotests/testfindpreferredimage.cpp
@@ -57,7 +57,7 @@ void TestResolutions::testResolutions_data()
qDebug() << formatResolution(image);
}

- // The list of possible screen resolutions to test and the appropiate images that should be chosen
+ // The list of possible screen resolutions to test and the appropriate images that should be chosen
QTest::addColumn<QString>("resolution");
QTest::addColumn<QString>("expected");
QTest::newRow("1280x1024") << QStringLiteral("1280x1024") << QStringLiteral("1280x1024");
diff --git a/wallpapers/image/image.cpp b/wallpapers/image/image.cpp
index cf04f7a9..c3b38f3c 100644
--- a/wallpapers/image/image.cpp
+++ b/wallpapers/image/image.cpp
@@ -149,7 +149,7 @@ void Image::setRenderingMode(RenderingMode mode)
updateDirWatch(m_slidePaths);
updateDirWatch(m_slidePaths);
} else {
- // we need to reset the prefered image
+ // we need to reset the preferred image
setSingleImage();
}
}
diff --git a/xembed-sni-proxy/Readme.md b/xembed-sni-proxy/Readme.md
index 4201349a..3bfb77f5 100644
--- a/xembed-sni-proxy/Readme.md
+++ b/xembed-sni-proxy/Readme.md
@@ -11,7 +11,7 @@ This project should be portable onto all other DEs that speak SNI.
##How it works (in theory)

* We register a window as a system tray container
-* We render embeded windows composited offscreen
+* We render embedded windows composited offscreen
* We render contents into an image and send this over DBus via the SNI protocol
* XDamage events trigger a repaint
* Activate and context menu events are replyed via X send event into the embedded container as left and right clicks
diff --git a/xembed-sni-proxy/fdoselectionmanager.cpp b/xembed-sni-proxy/fdoselectionmanager.cpp
index 90703083..993d1db2 100644
--- a/xembed-sni-proxy/fdoselectionmanager.cpp
+++ b/xembed-sni-proxy/fdoselectionmanager.cpp
@@ -109,7 +109,7 @@ bool FdoSelectionManager::addDamageWatch(xcb_window_t client)
// if we would remove the event mask again, other areas will break.
const auto changeAttrCookie = xcb_change_window_attributes_checked(c, client, XCB_CW_EVENT_MASK, &events);
QScopedPointer<xcb_generic_error_t, QScopedPointerPodDeleter> changeAttrError(xcb_request_check(c, changeAttrCookie));
- // if window is gone by this point, it will be catched by eventFilter, so no need to check later errors.
+ // if window is gone by this point, it will be caught by eventFilter, so no need to check later errors.
if (changeAttrError && changeAttrError->error_code == XCB_WINDOW) {
return false;
}
diff --git a/xembed-sni-proxy/snidbus.cpp b/xembed-sni-proxy/snidbus.cpp
index 4ebb7a02..651d3b89 100644
--- a/xembed-sni-proxy/snidbus.cpp
+++ b/xembed-sni-proxy/snidbus.cpp
@@ -145,4 +145,4 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, KDbusToolTipStruc
toolTip.subTitle = subTitle;

return argument;
-}
\ No newline at end of file
+}
diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp
index c2ba4607..2949ba2f 100644
--- a/xembed-sni-proxy/sniproxy.cpp
+++ b/xembed-sni-proxy/sniproxy.cpp
@@ -101,7 +101,7 @@ SNIProxy::SNIProxy(xcb_window_t wid, QObject* parent):
m_containerWid = xcb_generate_id(c);
uint32_t values[2];
auto mask = XCB_CW_BACK_PIXEL | XCB_CW_OVERRIDE_REDIRECT;
- values[0] = screen->black_pixel; //draw a solid background so the embeded icon doesn't get garbage in it
+ values[0] = screen->black_pixel; //draw a solid background so the embedded icon doesn't get garbage in it
values[1] = true; //bypass wM
xcb_create_window (c, /* connection */
XCB_COPY_FROM_PARENT, /* depth */

[Yuri Chornoivan]

Git commit 8fd88b377ec6965caa7a5ab2a6c16c90fa34d01f by Yuri Chornoivan.
Committed on 27/08/2018 at 16:41.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +3 -3 autotests/runtimedatatest.h
M +1 -1 browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp
M +1 -1 components/CMakeLists.txt
M +1 -1 datasources/CMakeLists.txt
M +1 -1 libs/mediacenter/abstractbrowsingbackend.h
M +1 -1 libs/mediacenter/abstractdatasource.h
M +1 -1 libs/mediacenter/datasourcesloader.h
M +1 -1 libs/mediacenter/filterplaylistmodel.h
M +1 -1 libs/mediacenter/localthumbnailprovider.h
M +3 -3 libs/mediacenter/multipleplaylistmodel.h
M +2 -2 libs/mediacenter/playlistitem.h
M +5 -5 libs/mediacenter/playlistmodel.cpp
M +4 -4 libs/mediacenter/playlistmodel.h
M +1 -1 libs/mediacenter/pmccoverartprovider.cpp
M +1 -1 libs/mediacenter/pmccoverartprovider.h
M +1 -1 libs/mediacenter/pmcimagecache.cpp
M +1 -1 libs/mediacenter/pmcimagecache.h
M +1 -1 libs/mediacenter/pmcmetadatamodel.cpp
M +1 -1 libs/mediacenter/pmcmetadatamodel.h
M +2 -2 libs/mediacenter/settings.h
M +7 -7 libs/mediacenter/subtitleprovider.h
M +2 -2 onlineservices/flickr/flickrmodel.cpp
M +0 -1 onlineservices/youtube/video.h

https://commits.kde.org/plasma-mediacenter/8fd88b377ec6965caa7a5ab2a6c16c90fa34d01f

diff --git a/autotests/runtimedatatest.h b/autotests/runtimedatatest.h
index b553b841..06eaf739 100644
--- a/autotests/runtimedatatest.h
+++ b/autotests/runtimedatatest.h
@@ -20,8 +20,8 @@
*
*/

-#ifndef TESTRUNTIMEDATA_H
-#define TESTRUNTIMEDATA_H
+#ifndef RUNTIMEDATATEST_H
+#define RUNTIMEDATATEST_H

#include <QObject>

@@ -39,4 +39,4 @@ private slots:
void testVolumeAndMuteFunction();
};

-#endif // TESTRUNTIMEDATA_H
+#endif // RUNTIMEDATATEST_H
diff --git a/browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp b/browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp
index 99927bec..d955c02d 100644
--- a/browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp
+++ b/browsingbackends/metadatapicturebackend/metadatapicturemodel.cpp
@@ -22,7 +22,7 @@
#include "mediacenter/mediacenter.h"
#include "mediacenter/abstractbrowsingbackend.h"

-#include <QtGui/QIcon>
+#include <QIcon>
#include <QEvent>

MetadataPictureModel::MetadataPictureModel (QObject* parent)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index e1c41fd7..4508f406 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -3,4 +3,4 @@ install(FILES CategoriesBrowser.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasm
install(FILES MediaInfoPanel.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components)
install(FILES AutoHide.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components)
install(FILES BreezeBlock.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components)
-install(DIRECTORY common DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components)
\ No newline at end of file
+install(DIRECTORY common DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/mediacenter/components)
diff --git a/datasources/CMakeLists.txt b/datasources/CMakeLists.txt
index 554513da..61ff8e7f 100644
--- a/datasources/CMakeLists.txt
+++ b/datasources/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory(baloosearch)
add_subdirectory(filesystemsearch)
-add_subdirectory(lastfm)
\ No newline at end of file
+add_subdirectory(lastfm)
diff --git a/libs/mediacenter/abstractbrowsingbackend.h b/libs/mediacenter/abstractbrowsingbackend.h
index 1b3ff349..df521fb7 100644
--- a/libs/mediacenter/abstractbrowsingbackend.h
+++ b/libs/mediacenter/abstractbrowsingbackend.h
@@ -249,7 +249,7 @@ protected:
* Subclasses can call this method to set the button strings that are used
* for the buttons property
*
- * @param buttons list of strings for the buton labels
+ * @param buttons list of strings for the button labels
*/
void setButtons(const QStringList &buttons);

diff --git a/libs/mediacenter/abstractdatasource.h b/libs/mediacenter/abstractdatasource.h
index dde872ef..88a3ddb4 100644
--- a/libs/mediacenter/abstractdatasource.h
+++ b/libs/mediacenter/abstractdatasource.h
@@ -20,7 +20,7 @@
#ifndef ABSTRACTDATASOURCE_H
#define ABSTRACTDATASOURCE_H

-#include <QtCore/QThread>
+#include <QThread>
#include <KPluginInfo>

#include "mediacenter_export.h"
diff --git a/libs/mediacenter/datasourcesloader.h b/libs/mediacenter/datasourcesloader.h
index b0f7937d..4ab8bd18 100644
--- a/libs/mediacenter/datasourcesloader.h
+++ b/libs/mediacenter/datasourcesloader.h
@@ -20,7 +20,7 @@
#ifndef DATASOURCESLOADER_H
#define DATASOURCESLOADER_H

-#include <QtCore/QObject>
+#include <QObject>

#include "mediacenter_export.h"

diff --git a/libs/mediacenter/filterplaylistmodel.h b/libs/mediacenter/filterplaylistmodel.h
index 71e9baca..3d2cd19a 100644
--- a/libs/mediacenter/filterplaylistmodel.h
+++ b/libs/mediacenter/filterplaylistmodel.h
@@ -19,7 +19,7 @@
#ifndef FILTERPLAYLISTMODEL_H
#define FILTERPLAYLISTMODEL_H

-#include <QtCore/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
#include <QAbstractItemModel>
#include "mediacenter_export.h"

diff --git a/libs/mediacenter/localthumbnailprovider.h b/libs/mediacenter/localthumbnailprovider.h
index d248ae04..3a22b309 100644
--- a/libs/mediacenter/localthumbnailprovider.h
+++ b/libs/mediacenter/localthumbnailprovider.h
@@ -21,7 +21,7 @@
#define THUMBNAILPROVIDER_H

#include "mediacenter_export.h"
-#include <QtQuick/QQuickImageProvider>
+#include <QQuickImageProvider>

#include <QUrl>

diff --git a/libs/mediacenter/multipleplaylistmodel.h b/libs/mediacenter/multipleplaylistmodel.h
index be65942f..4a56236d 100644
--- a/libs/mediacenter/multipleplaylistmodel.h
+++ b/libs/mediacenter/multipleplaylistmodel.h
@@ -18,9 +18,9 @@
#ifndef MULTIPLEPLAYLISTMODEL_H
#define MULTIPLEPLAYLISTMODEL_H

-#include <QtCore/QAbstractListModel>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QAbstractListModel>
+#include <QString>
+#include <QStringList>

#include "mediacenter_export.h"
#include "mediacenter.h"
diff --git a/libs/mediacenter/playlistitem.h b/libs/mediacenter/playlistitem.h
index 3f0b8238..92111e6f 100644
--- a/libs/mediacenter/playlistitem.h
+++ b/libs/mediacenter/playlistitem.h
@@ -19,8 +19,8 @@
#ifndef PLAYLISTITEM_H
#define PLAYLISTITEM_H

-#include <QtCore/QObject>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QTimer>
#include <QSharedPointer>

class PmcMedia;
diff --git a/libs/mediacenter/playlistmodel.cpp b/libs/mediacenter/playlistmodel.cpp
index dcf845e9..0eae5ae9 100644
--- a/libs/mediacenter/playlistmodel.cpp
+++ b/libs/mediacenter/playlistmodel.cpp
@@ -23,11 +23,11 @@

#include <QDebug>

-#include <QtCore/QDir>
-#include <QtCore/QStringList>
-#include <QtCore/QDateTime>
-#include <QtCore/QCoreApplication>
-#include <QtXml/QDomDocument>
+#include <QDir>
+#include <QStringList>
+#include <QDateTime>
+#include <QCoreApplication>
+#include <QDomDocument>

namespace
{
diff --git a/libs/mediacenter/playlistmodel.h b/libs/mediacenter/playlistmodel.h
index 0fc1d4ad..fd40296f 100644
--- a/libs/mediacenter/playlistmodel.h
+++ b/libs/mediacenter/playlistmodel.h
@@ -18,10 +18,10 @@
#ifndef PLAYLISTMODEL_H
#define PLAYLISTMODEL_H

-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QString>
-#include <QtCore/QList>
-#include <QtCore/QFile>
+#include <QAbstractItemModel>
+#include <QString>
+#include <QList>
+#include <QFile>

#include "mediacenter_export.h"
#include "mediacenter.h"
diff --git a/libs/mediacenter/pmccoverartprovider.cpp b/libs/mediacenter/pmccoverartprovider.cpp
index 21564d4f..735bfb6a 100644
--- a/libs/mediacenter/pmccoverartprovider.cpp
+++ b/libs/mediacenter/pmccoverartprovider.cpp
@@ -29,7 +29,7 @@
#include <mpegfile.h>
#include <attachedpictureframe.h>

-#include <QtCore/QUrl>
+#include <QUrl>

const char *PmcCoverArtProvider::identificationString = "coverart";

diff --git a/libs/mediacenter/pmccoverartprovider.h b/libs/mediacenter/pmccoverartprovider.h
index c69ddffa..761b47ef 100644
--- a/libs/mediacenter/pmccoverartprovider.h
+++ b/libs/mediacenter/pmccoverartprovider.h
@@ -19,7 +19,7 @@
#ifndef PMCCOVERARTPROVIDER_H
#define PMCCOVERARTPROVIDER_H

-#include <QtQuick/QQuickImageProvider>
+#include <QQuickImageProvider>

#include "mediacenter_export.h"

diff --git a/libs/mediacenter/pmcimagecache.cpp b/libs/mediacenter/pmcimagecache.cpp
index fcfe2a83..4d234622 100644
--- a/libs/mediacenter/pmcimagecache.cpp
+++ b/libs/mediacenter/pmcimagecache.cpp
@@ -18,7 +18,7 @@

#include "pmcimagecache.h"

-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>

const char *PmcImageCache::fileIdentification = "mediafile:";
const char *PmcImageCache::albumIdentification = "album:";
diff --git a/libs/mediacenter/pmcimagecache.h b/libs/mediacenter/pmcimagecache.h
index 63994616..52bfc6fe 100644
--- a/libs/mediacenter/pmcimagecache.h
+++ b/libs/mediacenter/pmcimagecache.h
@@ -19,7 +19,7 @@
#ifndef PMCIMAGECACHE_H
#define PMCIMAGECACHE_H

-#include <QtCore/QHash>
+#include <QHash>

#include <KImageCache>

diff --git a/libs/mediacenter/pmcmetadatamodel.cpp b/libs/mediacenter/pmcmetadatamodel.cpp
index 83b9e93c..1719a343 100644
--- a/libs/mediacenter/pmcmetadatamodel.cpp
+++ b/libs/mediacenter/pmcmetadatamodel.cpp
@@ -30,7 +30,7 @@
#include <KIO/PreviewJob>
#include <QDebug>

-#include <QtCore/QTimer>
+#include <QTimer>
#include <QSharedPointer>

class PmcMetadataModel::Private
diff --git a/libs/mediacenter/pmcmetadatamodel.h b/libs/mediacenter/pmcmetadatamodel.h
index 602c4ef6..427d3100 100644
--- a/libs/mediacenter/pmcmetadatamodel.h
+++ b/libs/mediacenter/pmcmetadatamodel.h
@@ -23,7 +23,7 @@
#include "mediacenter_export.h"
#include "mediacenter.h"

-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
#include <QSharedPointer>
#include <QList>

diff --git a/libs/mediacenter/settings.h b/libs/mediacenter/settings.h
index 79b0d961..a575574f 100644
--- a/libs/mediacenter/settings.h
+++ b/libs/mediacenter/settings.h
@@ -23,8 +23,8 @@
#include "mediacenter_export.h"
#include <KConfigGroup>

-#include <QtCore/QObject>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QVariant>

class MEDIACENTER_EXPORT Settings : public QObject
{
diff --git a/libs/mediacenter/subtitleprovider.h b/libs/mediacenter/subtitleprovider.h
index 7232212b..d7e26020 100644
--- a/libs/mediacenter/subtitleprovider.h
+++ b/libs/mediacenter/subtitleprovider.h
@@ -20,13 +20,13 @@
#ifndef SUBTITLEPROVIDER_H
#define SUBTITLEPROVIDER_H

-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
-#include <QtCore/QList>
-#include <QtCore/QStringList>
-#include <QtCore/QUrl>
+#include <QFile>
+#include <QTextStream>
+#include <QRegExp>
+#include <QDebug>
+#include <QList>
+#include <QStringList>
+#include <QUrl>

#include "mediacenter_export.h"

diff --git a/onlineservices/flickr/flickrmodel.cpp b/onlineservices/flickr/flickrmodel.cpp
index 67aeb011..b91d8fc8 100644
--- a/onlineservices/flickr/flickrmodel.cpp
+++ b/onlineservices/flickr/flickrmodel.cpp
@@ -27,8 +27,8 @@
#include <KIO/Job>
#include <KJob>

-#include <QtXml/QDomDocument>
-#include <QtXml/QDomNodeList>
+#include <QDomDocument>
+#include <QDomNodeList>

#include <QDebug>

diff --git a/onlineservices/youtube/video.h b/onlineservices/youtube/video.h
index 1d6596af..111c1182 100644
--- a/onlineservices/youtube/video.h
+++ b/onlineservices/youtube/video.h
@@ -19,7 +19,6 @@
#define VIDEO_H

#include <QUrl>
-#include <QtGui>
#include <QString>
#include <QPointer>
#include <QDateTime>

[Yuri Chornoivan]

Git commit 89ff12d266d3c5fd16d6208ce2ecefe4bfaed978 by Yuri Chornoivan.
Committed on 27/08/2018 at 17:41.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +5 -0 applets/kicker/plugin/actionlist.h
M +1 -1 applets/kickoff/package/contents/ui/FullRepresentation.qml
M +1 -1 applets/kickoff/package/contents/ui/KickoffHighlight.qml
M +2 -2 applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.h
M +1 -1 applets/taskmanager/package/contents/ui/ToolTipInstance.qml
M +1 -1 applets/taskmanager/plugin/backend.cpp
M +1 -1 applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp
M +0 -1 attica-kde/kdeplugin/kdeplatformdependent.cpp
M +1 -1 config-X11.h.cmake
M +1 -1 containments/desktop/package/contents/ui/FolderView.qml
M +0 -2 containments/desktop/plugins/folder/autotests/positionertest.cpp
M +2 -2 containments/panel/contents/ui/main.qml
M +1 -1 desktoppackage/contents/configuration/AppletConfiguration.qml
M +3 -3 imports/activitymanager/sortedactivitiesmodel.h
M +3 -3 kcms/activities/ExtraActivitiesInterface.h
M +3 -3 kcms/activities/utils/optional_view.h
M +1 -1 kcms/baloo/folderselectionwidget.cpp
M +2 -2 kcms/colors/previewwidget.h
M +2 -2 kcms/colors/setpreviewwidget.h
M +1 -1 kcms/cursortheme/kcmcursortheme.h
M +0 -1 kcms/emoticons/emoticonslist.cpp
M +5 -0 kcms/formats/writeexports.h
M +2 -2 kcms/keys/globalshortcuts.h
M +1 -1 kcms/kfontinst/kcmfontinst/GroupList.cpp
M +0 -1 kcms/kfontinst/viewpart/CharTip.cpp
M +4 -0 kcms/migrationlib/kdelibs4config.h
M +2 -2 kcms/mouse/kcm/libinput/libinput_config.cpp
M +2 -2 kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp
M +1 -1 solid-device-automounter/kcm/LayoutSettings.kcfg
M +1 -1 toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml

https://commits.kde.org/plasma-desktop/89ff12d266d3c5fd16d6208ce2ecefe4bfaed978

diff --git a/applets/kicker/plugin/actionlist.h b/applets/kicker/plugin/actionlist.h
index 780505b2..db706d92 100644
--- a/applets/kicker/plugin/actionlist.h
+++ b/applets/kicker/plugin/actionlist.h
@@ -18,6 +18,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/

+#ifndef ACTIONLIST_H
+#define ACTIONLIST_H
+
#include <QVariant>

#include <KService>
@@ -68,3 +71,5 @@ bool handleAppstreamActions(const QString &actionId, const QVariant &argument);
QString resolvedServiceEntryPath(const KService::Ptr &service);

}
+
+#endif
diff --git a/applets/kickoff/package/contents/ui/FullRepresentation.qml b/applets/kickoff/package/contents/ui/FullRepresentation.qml
index 7468153f..1c22414e 100644
--- a/applets/kickoff/package/contents/ui/FullRepresentation.qml
+++ b/applets/kickoff/package/contents/ui/FullRepresentation.qml
@@ -613,7 +613,7 @@ Item {
target: tabBar
//Set the opacity and NOT the visibility, as visibility is recursive
//and this binding would be executed also on popup show/hide
- //as recomended by the docs: http://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop
+ //as recommended by the docs: http://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop
//plus, it triggers https://bugreports.qt.io/browse/QTBUG-66907
//in which a mousearea may think it's under the mouse while it isn't
opacity: tabBar.count > 1 ? 1 : 0
diff --git a/applets/kickoff/package/contents/ui/KickoffHighlight.qml b/applets/kickoff/package/contents/ui/KickoffHighlight.qml
index cd97d2b7..6331d7ae 100644
--- a/applets/kickoff/package/contents/ui/KickoffHighlight.qml
+++ b/applets/kickoff/package/contents/ui/KickoffHighlight.qml
@@ -27,4 +27,4 @@ Item {
rightMargin: units.gridUnit
}
}
-}
\ No newline at end of file
+}
diff --git a/applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.h b/applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.h
index 8d179502..69f6bc1f 100644
--- a/applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.h
+++ b/applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.h
@@ -15,8 +15,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GDKACCELPARSE_P_H
-#define GDKACCELPARSE_P_H
+#ifndef GTKACCELPARSE_P_H
+#define GTKACCELPARSE_P_H

#include <glib.h>

diff --git a/applets/taskmanager/package/contents/ui/ToolTipInstance.qml b/applets/taskmanager/package/contents/ui/ToolTipInstance.qml
index 1a6ab830..d776f019 100644
--- a/applets/taskmanager/package/contents/ui/ToolTipInstance.qml
+++ b/applets/taskmanager/package/contents/ui/ToolTipInstance.qml
@@ -419,7 +419,7 @@ Column {
}
}

- // In case the window title had only redundant informations (i.e. appName), text is now empty.
+ // In case the window title had only redundant information (i.e. appName), text is now empty.
// Add a hyphen to indicate that and avoid empty space.
if (text == "") {
text = "—";
diff --git a/applets/taskmanager/plugin/backend.cpp b/applets/taskmanager/plugin/backend.cpp
index 881dc563..ebfe99f6 100644
--- a/applets/taskmanager/plugin/backend.cpp
+++ b/applets/taskmanager/plugin/backend.cpp
@@ -439,7 +439,7 @@ QRect Backend::globalRect(QQuickItem *item) const

void Backend::ungrabMouse(QQuickItem *item) const
{
- //this is a workaround where Qt will fail to realise a mouse has been released
+ //this is a workaround where Qt will fail to realize a mouse has been released

// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
diff --git a/applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp b/applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp
index d06b0b1b..23d85ead 100644
--- a/applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp
+++ b/applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp
@@ -195,7 +195,7 @@ void Backend::update(const QString &uri, const QMap<QString, QVariant> &properti
updateLauncherProperty(storageId, properties, QStringLiteral("count"), &foundEntry->count, &Backend::countChanged);
updateLauncherProperty(storageId, properties, QStringLiteral("count-visible"), &foundEntry->countVisible, &Backend::countVisibleChanged);

- // the API gives us progress as 0..1 double but we'll use percent to avoid unneccessary
+ // the API gives us progress as 0..1 double but we'll use percent to avoid unnecessary
// changes when it just changed a fraction of a percent, hence not using our fancy updateLauncherProperty method
auto foundProgress = properties.constFind(QStringLiteral("progress"));
if (foundProgress != propertiesEnd) {
diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kdeplugin/kdeplatformdependent.cpp
index 36dff5c2..ab10a96e 100644
--- a/attica-kde/kdeplugin/kdeplatformdependent.cpp
+++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp
@@ -27,7 +27,6 @@
#include "attica_plugin_debug.h"

#include <KConfigGroup>
-#include "attica_plugin_debug.h"
#include <KWallet/KWallet>
#include <kcmultidialog.h>
#include <KLocalizedString>
diff --git a/config-X11.h.cmake b/config-X11.h.cmake
index ee5183a6..60286dd6 100644
--- a/config-X11.h.cmake
+++ b/config-X11.h.cmake
@@ -41,4 +41,4 @@
#cmakedefine HAS_RANDR_1_3 1

/* Define if you have X11 at all */
-#define HAVE_X11 ${X11_FOUND}
\ No newline at end of file
+#define HAVE_X11 ${X11_FOUND}
diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
index 85b2e152..ad362b97 100644
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -346,7 +346,7 @@ FocusScope {

// Moving from an item to its preview popup dialog doesn't unset hoveredItem
// even though the cursor has left it, so we need to check whether the click
- // actually occured inside the item we expect it in before going ahead. If it
+ // actually occurred inside the item we expect it in before going ahead. If it
// didn't, clean up (e.g. dismissing the dialog as a side-effect of unsetting
// hoveredItem) and abort.
if (pos.x < 0 || pos.x > hoveredItem.width || pos.y < 0 || pos.y > hoveredItem.height) {
diff --git a/containments/desktop/plugins/folder/autotests/positionertest.cpp b/containments/desktop/plugins/folder/autotests/positionertest.cpp
index db0e1d9a..f89f6f36 100644
--- a/containments/desktop/plugins/folder/autotests/positionertest.cpp
+++ b/containments/desktop/plugins/folder/autotests/positionertest.cpp
@@ -21,8 +21,6 @@

#include "positionertest.h"

-#include <QTest>
-
#include <QTest>
#include <QTemporaryDir>
#include <QSignalSpy>
diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
index a3f25766..bdf1b5b8 100644
--- a/containments/panel/contents/ui/main.qml
+++ b/containments/panel/contents/ui/main.qml
@@ -96,8 +96,8 @@ function addApplet(applet, x, y) {
// FIXME TODO: This is a real-world fix to produce a sensible initial position for
// launcher icons added by launcher menu applets. The basic approach has been used
// since Plasma 1. However, "add launcher to X" is a generic-enough concept and
- // frequent-enough occurence that we'd like to abstract it further in the future
- // and get rid of the uglyness of parties external to the containment adding applets
+ // frequent-enough occurrence that we'd like to abstract it further in the future
+ // and get rid of the ugliness of parties external to the containment adding applets
// of a specific type, and the containment caring about the applet type. In a better
// system the containment would be informed of requested launchers, and determine by
// itself what it wants to do with that information.
diff --git a/desktoppackage/contents/configuration/AppletConfiguration.qml b/desktoppackage/contents/configuration/AppletConfiguration.qml
index 5ca93a0f..9ada1121 100644
--- a/desktoppackage/contents/configuration/AppletConfiguration.qml
+++ b/desktoppackage/contents/configuration/AppletConfiguration.qml
@@ -248,7 +248,7 @@ Rectangle {
return;
}

- // when an item withing ScrollView has active focus the ScrollView,
+ // when an item within ScrollView has active focus the ScrollView,
// as FocusScope, also has it, so we only scroll in this case
if (!scroll.activeFocus) {
return;
diff --git a/imports/activitymanager/sortedactivitiesmodel.h b/imports/activitymanager/sortedactivitiesmodel.h
index b5108859..a262e564 100644
--- a/imports/activitymanager/sortedactivitiesmodel.h
+++ b/imports/activitymanager/sortedactivitiesmodel.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef SORTED_ACTIVITY_MODEL
-#define SORTED_ACTIVITY_MODEL
+#ifndef SORTED_ACTIVITIES_MODEL_H
+#define SORTED_ACTIVITIES_MODEL_H

// Qt
#include <QSortFilterProxyModel>
@@ -90,5 +90,5 @@ private:
QHash<QString, QVector<WId>> m_activitiesWindows;
};

-#endif // SORTED_ACTIVITY_MODEL
+#endif // SORTED_ACTIVITIES_MODEL_H

diff --git a/kcms/activities/ExtraActivitiesInterface.h b/kcms/activities/ExtraActivitiesInterface.h
index 92ded41b..2e3abe89 100644
--- a/kcms/activities/ExtraActivitiesInterface.h
+++ b/kcms/activities/ExtraActivitiesInterface.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef EXTRA_ACTIVITES_INTERFACE_H
-#define EXTRA_ACTIVITES_INTERFACE_H
+#ifndef EXTRA_ACTIVITIES_INTERFACE_H
+#define EXTRA_ACTIVITIES_INTERFACE_H

#include <QAbstractListModel>

@@ -47,4 +47,4 @@ private:
D_PTR;
};

-#endif // EXTRA_ACTIVITES_INTERFACE_H
+#endif // EXTRA_ACTIVITIES_INTERFACE_H
diff --git a/kcms/activities/utils/optional_view.h b/kcms/activities/utils/optional_view.h
index 72c61388..004ebb2a 100644
--- a/kcms/activities/utils/optional_view.h
+++ b/kcms/activities/utils/optional_view.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef UTILS_OPTIONAL_H
-#define UTILS_OPTIONAL_H
+#ifndef UTILS_OPTIONAL_VIEW_H
+#define UTILS_OPTIONAL_VIEW_H

namespace kamd {
namespace utils {
@@ -75,5 +75,5 @@ optional_view<T> make_optional_view(const T &value)
} // namespace kamd


-#endif // UTILS_OPTIONAL_H
+#endif // UTILS_OPTIONAL_VIEW_H

diff --git a/kcms/baloo/folderselectionwidget.cpp b/kcms/baloo/folderselectionwidget.cpp
index 76caa8b0..e8a4c5eb 100644
--- a/kcms/baloo/folderselectionwidget.cpp
+++ b/kcms/baloo/folderselectionwidget.cpp
@@ -327,7 +327,7 @@ bool FolderSelectionWidget::shouldShowMountPoint(const QString& mountPoint)
return false;

// The user's home directory is forcibly added so we can ignore /home
- // if /home actually contains the home direcory
+ // if /home actually contains the home directory
if (mountPoint.startsWith(QLatin1String("/home")) && QDir::homePath().startsWith(QLatin1String("/home")))
return false;

diff --git a/kcms/colors/previewwidget.h b/kcms/colors/previewwidget.h
index 0657c68a..473a9ed7 100644
--- a/kcms/colors/previewwidget.h
+++ b/kcms/colors/previewwidget.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef __SCHEMEPREVIEW_H__
-#define __SCHEMEPREVIEW_H__
+#ifndef __PREVIEWWIDGET_H__
+#define __PREVIEWWIDGET_H__

#include <QFrame>
#include <QPalette>
diff --git a/kcms/colors/setpreviewwidget.h b/kcms/colors/setpreviewwidget.h
index 557760bd..5e44b830 100644
--- a/kcms/colors/setpreviewwidget.h
+++ b/kcms/colors/setpreviewwidget.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef __SCHEMEPREVIEWSET_H__
-#define __SCHEMEPREVIEWSET_H__
+#ifndef __SETPREVIEWWIDGET_H__
+#define __SETPREVIEWWIDGET_H__

#include <QFrame>
#include <QPalette>
diff --git a/kcms/cursortheme/kcmcursortheme.h b/kcms/cursortheme/kcmcursortheme.h
index 3035297a..f36975ed 100644
--- a/kcms/cursortheme/kcmcursortheme.h
+++ b/kcms/cursortheme/kcmcursortheme.h
@@ -118,7 +118,7 @@ private:
// This index refers to the CursorThemeModel, not the proxy or the view
QPersistentModelIndex m_appliedIndex;

-/** Holds the last size that was choosen by the user. Example: The user chooses
+/** Holds the last size that was chosen by the user. Example: The user chooses
theme1 which provides the sizes 24 and 36. He chooses 36. preferredSize gets
set to 36. Now, he switchs to theme2 which provides the sizes 30 and 40.
preferredSize still is 36, so the UI will default to 40, which is next to 36.
diff --git a/kcms/emoticons/emoticonslist.cpp b/kcms/emoticons/emoticonslist.cpp
index 1863fb12..8b15a0da 100644
--- a/kcms/emoticons/emoticonslist.cpp
+++ b/kcms/emoticons/emoticonslist.cpp
@@ -28,7 +28,6 @@

#include <KGlobal>
#include <KMessageBox>
-#include <QIcon>
#include <KAboutData>
#include <KStandardDirs>
#include <KFileDialog>
diff --git a/kcms/formats/writeexports.h b/kcms/formats/writeexports.h
index be001e25..3faceccd 100644
--- a/kcms/formats/writeexports.h
+++ b/kcms/formats/writeexports.h
@@ -15,6 +15,9 @@
* along with this program; if not, write to the Free Software
*/

+#ifndef WRITEEXPORTS_H
+#define WRITEEXPORTS_H
+
#include <QDebug>
#include <QFile>
#include <QStandardPaths>
@@ -101,3 +104,5 @@ void writeExports()
out << script;
file.close();
}
+
+#endif
diff --git a/kcms/keys/globalshortcuts.h b/kcms/keys/globalshortcuts.h
index 3f6c5364..3880a089 100644
--- a/kcms/keys/globalshortcuts.h
+++ b/kcms/keys/globalshortcuts.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef SHORTCUTS_MODULE_H
-#define SHORTCUTS_MODULE_H
+#ifndef GLOBAL_SHORTCUTS_H
+#define GLOBAL_SHORTCUTS_H

#include <kcmodule.h>
#include <QHash>
diff --git a/kcms/kfontinst/kcmfontinst/GroupList.cpp b/kcms/kfontinst/kcmfontinst/GroupList.cpp
index 0871445e..4e34ac54 100644
--- a/kcms/kfontinst/kcmfontinst/GroupList.cpp
+++ b/kcms/kfontinst/kcmfontinst/GroupList.cpp
@@ -540,7 +540,7 @@ void CGroupList::clear()
itsGroups.append(itsSpecialGroups[CGroupListItem::PERSONAL]);
itsGroups.append(itsSpecialGroups[CGroupListItem::SYSTEM]);
}
- // Dont add 'Unclassif' until we have some user groups
+ // Don't add 'Unclassif' until we have some user groups
endResetModel();
}

diff --git a/kcms/kfontinst/viewpart/CharTip.cpp b/kcms/kfontinst/viewpart/CharTip.cpp
index 68fdf18b..90de98d3 100644
--- a/kcms/kfontinst/viewpart/CharTip.cpp
+++ b/kcms/kfontinst/viewpart/CharTip.cpp
@@ -40,7 +40,6 @@
#include <QBoxLayout>
#include <QEvent>
#include <QResizeEvent>
-#include <QApplication>
#include <QDesktopWidget>

namespace KFI
diff --git a/kcms/migrationlib/kdelibs4config.h b/kcms/migrationlib/kdelibs4config.h
index 074f5329..f28e31ff 100644
--- a/kcms/migrationlib/kdelibs4config.h
+++ b/kcms/migrationlib/kdelibs4config.h
@@ -18,6 +18,9 @@
*
*/

+#ifndef KDELIBS4CONFIG_H
+#define KDELIBS4CONFIG_H
+
#include <KSharedConfig>
#include <KConfigGroup>
#include <Kdelibs4Migration>
@@ -39,3 +42,4 @@ public:

};

+#endif
diff --git a/kcms/mouse/kcm/libinput/libinput_config.cpp b/kcms/mouse/kcm/libinput/libinput_config.cpp
index bb63f6e3..e235e447 100644
--- a/kcms/mouse/kcm/libinput/libinput_config.cpp
+++ b/kcms/mouse/kcm/libinput/libinput_config.cpp
@@ -122,7 +122,7 @@ void LibinputConfig::load()

if (!m_backend->getConfig()) {
m_errorMessage->setMessageType(KMessageWidget::Error);
- m_errorMessage->setText(i18n("Error while loading values. See logs for more informations. Please restart this configuration module."));
+ m_errorMessage->setText(i18n("Error while loading values. See logs for more information. Please restart this configuration module."));
m_errorMessage->animatedShow();
} else {
if (!m_backend->deviceCount()) {
@@ -138,7 +138,7 @@ void LibinputConfig::save()
{
if (!m_backend->applyConfig()) {
m_errorMessage->setMessageType(KMessageWidget::Error);
- m_errorMessage->setText(i18n("Not able to save all changes. See logs for more informations. Please restart this configuration module and try again."));
+ m_errorMessage->setText(i18n("Not able to save all changes. See logs for more information. Please restart this configuration module and try again."));
m_errorMessage->animatedShow();
} else {
hideErrorMessage();
diff --git a/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp b/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp
index cd20d885..a9703249 100644
--- a/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp
+++ b/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp
@@ -113,7 +113,7 @@ void TouchpadConfigLibinput::load()

if (!m_backend->getConfig()) {
m_errorMessage->setMessageType(KMessageWidget::Error);
- m_errorMessage->setText(i18n("Error while loading values. See logs for more informations. Please restart this configuration module."));
+ m_errorMessage->setText(i18n("Error while loading values. See logs for more information. Please restart this configuration module."));
m_errorMessage->animatedShow();
} else {
if (!m_backend->touchpadCount()) {
@@ -129,7 +129,7 @@ void TouchpadConfigLibinput::save()
{
if (!m_backend->applyConfig()) {
m_errorMessage->setMessageType(KMessageWidget::Error);
- m_errorMessage->setText(i18n("Not able to save all changes. See logs for more informations. Please restart this configuration module and try again."));
+ m_errorMessage->setText(i18n("Not able to save all changes. See logs for more information. Please restart this configuration module and try again."));
m_errorMessage->animatedShow();
} else {
hideErrorMessage();
diff --git a/solid-device-automounter/kcm/LayoutSettings.kcfg b/solid-device-automounter/kcm/LayoutSettings.kcfg
index bcfd2460..634913ca 100644
--- a/solid-device-automounter/kcm/LayoutSettings.kcfg
+++ b/solid-device-automounter/kcm/LayoutSettings.kcfg
@@ -13,4 +13,4 @@
<default>false</default>
</entry>
</group>
-</kcfg>
\ No newline at end of file
+</kcfg>
diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
index c3713f37..04f382ab 100644
--- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
+++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
@@ -80,7 +80,7 @@ Item {
height: backgroundFrame.height + backgroundFrame.height % 2

//x and y default to 0, so top left would be correct
- //If the position is anything else it will updated via onXChanged during intialisation
+ //If the position is anything else it will updated via onXChanged during initialization
state: "topleft"

onXChanged: stateTimer.restart()

[Yuri Chornoivan]

Git commit 5d93d78ff4f9680b02541a6ecf3161136ef4ae20 by Yuri Chornoivan.
Committed on 28/08/2018 at 10:52.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 addons/backtracebrowser/autotests/btbrowsertest.h
M +3 -3 addons/backtracebrowser/btdatabase.h
M +2 -2 addons/backtracebrowser/btfileindexer.h
M +3 -3 addons/backtracebrowser/btparser.h
M +2 -2 addons/filetree/autotests/document_dummy.h
M +2 -2 addons/kate-ctags/readtags.c
M +2 -2 addons/katesql/outputwidget.h
M +1 -1 addons/lumen/completion.cpp
M +2 -2 addons/lumen/lumen.cpp
M +2 -2 addons/project/ctags/readtags.c
M +2 -2 addons/project/kateprojectcodeanalysistool.h
M +2 -2 addons/project/kateprojectinfoviewcodeanalysis.h
M +2 -2 addons/project/kateprojectplugin.h
M +2 -2 addons/project/kateprojectpluginview.h
M +2 -2 addons/project/kateprojecttreeviewcontextmenu.h
M +3 -3 addons/replicode/replicodeconfigpage.h
M +2 -2 addons/sessionapplet/engine/katesessionsjob.h
M +1 -1 addons/sessionapplet/engine/katesessionsservice.cpp
M +2 -2 addons/sessionapplet/engine/katesessionsservice.h
M +2 -2 addons/snippets/katesnippetglobal.h
M +2 -0 kate/qtsingleapplication/qtlocalpeer.h
M +2 -0 kate/qtsingleapplication/qtsingleapplication.h

https://commits.kde.org/kate/5d93d78ff4f9680b02541a6ecf3161136ef4ae20

diff --git a/addons/backtracebrowser/autotests/btbrowsertest.h b/addons/backtracebrowser/autotests/btbrowsertest.h
index 0e942e2b4..6f5b91a2e 100644
--- a/addons/backtracebrowser/autotests/btbrowsertest.h
+++ b/addons/backtracebrowser/autotests/btbrowsertest.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef KATE_BACKTRACE_BROWSER_TEST_H
-#define KATE_BACKTRACE_BROWSER_TEST_H
+#ifndef BT_BROWSER_TEST_H
+#define BT_BROWSER_TEST_H

#include <QObject>

diff --git a/addons/backtracebrowser/btdatabase.h b/addons/backtracebrowser/btdatabase.h
index 36b6b3994..9dfe9c924 100644
--- a/addons/backtracebrowser/btdatabase.h
+++ b/addons/backtracebrowser/btdatabase.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef KATE_BACKTRACEDB_H
-#define KATE_BACKTRACEDB_H
+#ifndef BTDATABASE_H
+#define BTDATABASE_H

#include <QString>
#include <QStringList>
@@ -44,6 +44,6 @@ private:
QHash<QString, QStringList> db;
};

-#endif //KATE_BACKTRACEDB_H
+#endif //BTDATABASE_H

// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/addons/backtracebrowser/btfileindexer.h b/addons/backtracebrowser/btfileindexer.h
index a8d87961a..cae4f65d8 100644
--- a/addons/backtracebrowser/btfileindexer.h
+++ b/addons/backtracebrowser/btfileindexer.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef KATE_BACKTRACEINDEXER_H
-#define KATE_BACKTRACEINDEXER_H
+#ifndef BTFILEINDEXER_H
+#define BTFILEINDEXER_H

#include <QThread>
#include <QString>
diff --git a/addons/backtracebrowser/btparser.h b/addons/backtracebrowser/btparser.h
index f72621552..dee138e9f 100644
--- a/addons/backtracebrowser/btparser.h
+++ b/addons/backtracebrowser/btparser.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef KATE_BACKTRACEPARSER_H
-#define KATE_BACKTRACEPARSER_H
+#ifndef BTPARSER_H
+#define BTPARSER_H

#include <QList>
#include <QString>
@@ -59,6 +59,6 @@ QList<BtInfo> parseBacktrace(const QString &bt);

}

-#endif //KATE_BACKTRACEPARSER_H
+#endif //BTPARSER_H

// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/addons/filetree/autotests/document_dummy.h b/addons/filetree/autotests/document_dummy.h
index 294d62fe0..0a10e5497 100644
--- a/addons/filetree/autotests/document_dummy.h
+++ b/addons/filetree/autotests/document_dummy.h
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef TEST_DOCUMENT_H
-#define TEST_DOCUMENT_H
+#ifndef DOCUMENT_DUMMY_H
+#define DOCUMENT_DUMMY_H

#include <KTextEditor/Document>
#include <KTextEditor/ModificationInterface>
diff --git a/addons/kate-ctags/readtags.c b/addons/kate-ctags/readtags.c
index c127c3f5a..34fa2ac21 100644
--- a/addons/kate-ctags/readtags.c
+++ b/addons/kate-ctags/readtags.c
@@ -11,6 +11,8 @@
/*
* INCLUDE FILES
*/
+#include "readtags.h"
+
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
@@ -18,8 +20,6 @@
#include <errno.h>
#include <sys/types.h> /* to declare off_t */

-#include "readtags.h"
-
/*
* MACROS
*/
diff --git a/addons/katesql/outputwidget.h b/addons/katesql/outputwidget.h
index 05df1e133..79c3a3bff 100644
--- a/addons/katesql/outputwidget.h
+++ b/addons/katesql/outputwidget.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef _KATE_SQL_OUTPUT_VIEW_
-#define _KATE_SQL_OUTPUT_VIEW_
+#ifndef _OUTPUTWIDGET_H_
+#define _OUTPUTWIDGET_H_

#include <QTabWidget>

diff --git a/addons/lumen/completion.cpp b/addons/lumen/completion.cpp
index f5a3500ca..d585a74f8 100644
--- a/addons/lumen/completion.cpp
+++ b/addons/lumen/completion.cpp
@@ -19,7 +19,7 @@
**/

#include "completion.h"
-#include <QtCore/QRegularExpression>
+#include <QRegularExpression>
#include <KTextEditor/View>
#include <KTextEditor/Document>
#include <KTextEditor/CodeCompletionInterface>
diff --git a/addons/lumen/lumen.cpp b/addons/lumen/lumen.cpp
index 09609fd27..ec4e4e444 100644
--- a/addons/lumen/lumen.cpp
+++ b/addons/lumen/lumen.cpp
@@ -28,8 +28,8 @@
#include <KTextEditor/TextHintInterface>
#include <KTextEditor/MainWindow>
#include <kactioncollection.h>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QFile>
+#include <QDir>


K_PLUGIN_FACTORY_WITH_JSON(LumenPluginFactory, "ktexteditor_lumen.json", registerPlugin<LumenPlugin>();)
diff --git a/addons/project/ctags/readtags.c b/addons/project/ctags/readtags.c
index 565a54495..f6ddbabcd 100644
--- a/addons/project/ctags/readtags.c
+++ b/addons/project/ctags/readtags.c
@@ -11,6 +11,8 @@
/*
* INCLUDE FILES
*/
+#include "readtags.h"
+
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
@@ -18,8 +20,6 @@
#include <errno.h>
#include <sys/types.h> /* to declare off_t */

-#include "readtags.h"
-
/*
* MACROS
*/
diff --git a/addons/project/kateprojectcodeanalysistool.h b/addons/project/kateprojectcodeanalysistool.h
index bb966da7c..57b3f1a63 100644
--- a/addons/project/kateprojectcodeanalysistool.h
+++ b/addons/project/kateprojectcodeanalysistool.h
@@ -45,7 +45,7 @@ public:

/**
* bind to this project
- * @param project project this tool will analyse
+ * @param project project this tool will analyze
*/
virtual void setProject(KateProject *project);

@@ -57,7 +57,7 @@ public:
/**
* filter relevant files
* @param files set of files in project
- * @return relevant files that can be analysed
+ * @return relevant files that can be analyzed
*/
virtual QStringList filter(const QStringList &files) = 0;

diff --git a/addons/project/kateprojectinfoviewcodeanalysis.h b/addons/project/kateprojectinfoviewcodeanalysis.h
index f4a04d798..4a6885259 100644
--- a/addons/project/kateprojectinfoviewcodeanalysis.h
+++ b/addons/project/kateprojectinfoviewcodeanalysis.h
@@ -80,8 +80,8 @@ private Q_SLOTS:

/**
* Analysis finished
- * @param exitCode analyser process exit code
- * @param exitStatus analyser process exit status
+ * @param exitCode analyzer process exit code
+ * @param exitStatus analyzer process exit status
*/
void finished(int exitCode, QProcess::ExitStatus exitStatus);

diff --git a/addons/project/kateprojectplugin.h b/addons/project/kateprojectplugin.h
index 662e0ee50..cf5287095 100644
--- a/addons/project/kateprojectplugin.h
+++ b/addons/project/kateprojectplugin.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef _PLUGIN_KATE_PROJECT_H_
-#define _PLUGIN_KATE_PROJECT_H_
+#ifndef _KATE_PROJECT_PLUGIN_H_
+#define _KATE_PROJECT_PLUGIN_H_

#include <QFileSystemWatcher>
#include <QDir>
diff --git a/addons/project/kateprojectpluginview.h b/addons/project/kateprojectpluginview.h
index 696282493..ec9ba49b7 100644
--- a/addons/project/kateprojectpluginview.h
+++ b/addons/project/kateprojectpluginview.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef _PLUGIN_KATE_PROJECTVIEW_H_
-#define _PLUGIN_KATE_PROJECTVIEW_H_
+#ifndef _KATE_PROJECT_PLUGIN_VIEW_H_
+#define _KATE_PROJECT_PLUGIN_VIEW_H_

#include "kateprojectplugin.h"
#include "kateproject.h"
diff --git a/addons/project/kateprojecttreeviewcontextmenu.h b/addons/project/kateprojecttreeviewcontextmenu.h
index 8fca6fe26..7339cfd71 100644
--- a/addons/project/kateprojecttreeviewcontextmenu.h
+++ b/addons/project/kateprojecttreeviewcontextmenu.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef KATE_PROJECT_VIEW_TREE_CONTEXT_MENU_H
-#define KATE_PROJECT_VIEW_TREE_CONTEXT_MENU_H
+#ifndef KATE_PROJECT_TREE_VIEW_CONTEXT_MENU_H
+#define KATE_PROJECT_TREE_VIEW_CONTEXT_MENU_H

#include <QString>
#include <QPoint>
diff --git a/addons/replicode/replicodeconfigpage.h b/addons/replicode/replicodeconfigpage.h
index 5954b9245..b13d0bf66 100644
--- a/addons/replicode/replicodeconfigpage.h
+++ b/addons/replicode/replicodeconfigpage.h
@@ -16,8 +16,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#ifndef REPLICODEPLUGINCONFIGPAGE_H
-#define REPLICODEPLUGINCONFIGPAGE_H
+#ifndef REPLICODECONFIGPAGE_H
+#define REPLICODECONFIGPAGE_H
#include <KTextEditor/ConfigPage>

class KUrlRequester;
@@ -43,4 +43,4 @@ private:
ReplicodeConfig *m_config;
};

-#endif//REPLICODEPLUGINCONFIGPAGE_H
+#endif//REPLICODECONFIGPAGE_H
diff --git a/addons/sessionapplet/engine/katesessionsjob.h b/addons/sessionapplet/engine/katesessionsjob.h
index 4bf302c37..15d60acf1 100644
--- a/addons/sessionapplet/engine/katesessionsjob.h
+++ b/addons/sessionapplet/engine/katesessionsjob.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef KLIPPER_CLIPBOARDJOB_H
-#define KLIPPER_CLIPBOARDJOB_H
+#ifndef KATESESSIONSJOB_H
+#define KATESESSIONSJOB_H

#include <Plasma/ServiceJob>

diff --git a/addons/sessionapplet/engine/katesessionsservice.cpp b/addons/sessionapplet/engine/katesessionsservice.cpp
index 9d8f16a0f..d9e9e25bf 100644
--- a/addons/sessionapplet/engine/katesessionsservice.cpp
+++ b/addons/sessionapplet/engine/katesessionsservice.cpp
@@ -18,9 +18,9 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
+#include "katesessionsservice.h"
#include "katesessionsengine.h"
#include "katesessionsjob.h"
-#include "katesessionsservice.h"
#include <QDebug>

KateSessionsService::KateSessionsService(KateSessionsEngine *engine, const QString &uuid)
diff --git a/addons/sessionapplet/engine/katesessionsservice.h b/addons/sessionapplet/engine/katesessionsservice.h
index 931652d3a..c1849f6f8 100644
--- a/addons/sessionapplet/engine/katesessionsservice.h
+++ b/addons/sessionapplet/engine/katesessionsservice.h
@@ -18,8 +18,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef KLIPPER_CLIPBOARDSERVICE_H
-#define KLIPPER_CLIPBOARDSERVICE_H
+#ifndef KATESESSIONSSERVICE_H
+#define KATESESSIONSSERVICE_H

#include <Plasma/Service>

diff --git a/addons/snippets/katesnippetglobal.h b/addons/snippets/katesnippetglobal.h
index 5e253b4b4..7988b4edb 100644
--- a/addons/snippets/katesnippetglobal.h
+++ b/addons/snippets/katesnippetglobal.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef __SNIPPETPLUGIN_H__
-#define __SNIPPETPLUGIN_H__
+#ifndef __KATE_SNIPPET_GLOBAL_H__
+#define __KATE_SNIPPET_GLOBAL_H__

#include <QVariant>
#include <QPointer>
diff --git a/kate/qtsingleapplication/qtlocalpeer.h b/kate/qtsingleapplication/qtlocalpeer.h
index d0029ffcb..4fd4ff16b 100644
--- a/kate/qtsingleapplication/qtlocalpeer.h
+++ b/kate/qtsingleapplication/qtlocalpeer.h
@@ -23,6 +23,8 @@
**
****************************************************************************/

+#pragma once
+
#include <qtlockedfile.h>

#include <QLocalServer>
diff --git a/kate/qtsingleapplication/qtsingleapplication.h b/kate/qtsingleapplication/qtsingleapplication.h
index 89d2364d0..306b2232b 100644
--- a/kate/qtsingleapplication/qtsingleapplication.h
+++ b/kate/qtsingleapplication/qtsingleapplication.h
@@ -23,6 +23,8 @@
**
****************************************************************************/

+#pragma once
+
#include <QApplication>

QT_FORWARD_DECLARE_CLASS(QSharedMemory)

[Yuri Chornoivan]

Git commit bf58da3e9a6be89a3011941570018726edad99bb by Yuri Chornoivan.
Committed on 29/08/2018 at 18:02.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 CMakeLists.txt
M +3 -3 appmenu.h
M +1 -1 autotests/abstract_client.h
M +0 -1 autotests/integration/scripting/screenedge_test.cpp
M +3 -3 autotests/test_xcb_wrapper.cpp
M +3 -3 colorcorrection/colorcorrectdbusinterface.h
M +0 -1 effects/flipswitch/flipswitch.cpp
M +2 -2 geometry.cpp
M +1 -1 input.cpp
M +2 -2 kcmkwin/kwindecoration/decorationmodel.h
M +1 -1 libkwineffects/kwineffects.h
M +0 -2 libkwineffects/kwinglobals.h
M +2 -2 packageplugins/windowswitcher/windowswitcher.h
M +2 -2 plugins/platforms/drm/drm_object.cpp
M +1 -1 plugins/platforms/drm/drm_object.h
M +2 -2 plugins/platforms/hwcomposer/screens_hwcomposer.h
M +2 -2 plugins/platforms/x11/standalone/windowselector.h
M +2 -2 plugins/platforms/x11/standalone/x11_platform.h
M +2 -2 screenedge.cpp
M +0 -1 shell_client.cpp
M +1 -1 tabbox/clientmodel.h
M +3 -3 tabbox/switcheritem.h
M +0 -1 thumbnailitem.cpp
M +2 -2 virtualkeyboard.h
M +3 -3 xcbutils.h

https://commits.kde.org/kwin/bf58da3e9a6be89a3011941570018726edad99bb

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 452602b10..c37f7ea03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,7 +193,7 @@ if(Libdrm_FOUND)
endif()

find_package(gbm)
-set_package_properties(gbm PROPERTIES TYPE OPTIONAL PURPOSE "Required for egl ouput of drm backend.")
+set_package_properties(gbm PROPERTIES TYPE OPTIONAL PURPOSE "Required for egl output of drm backend.")
set(HAVE_GBM FALSE)
if(HAVE_DRM AND gbm_FOUND)
set(HAVE_GBM TRUE)
diff --git a/appmenu.h b/appmenu.h
index 3e0ec8e0c..9e6cee754 100644
--- a/appmenu.h
+++ b/appmenu.h
@@ -19,8 +19,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef KWIN_APPLICATIONMENU_H
-#define KWIN_APPLICATIONMENU_H
+#ifndef KWIN_APPMENU_H
+#define KWIN_APPMENU_H
// KWin
#include <kwinglobals.h>
// Qt
@@ -72,4 +72,4 @@ private:

}

-#endif // KWIN_APPLICATIONMENU_H
+#endif // KWIN_APPMENU_H
diff --git a/autotests/abstract_client.h b/autotests/abstract_client.h
index d5228a1e9..55829175e 100644
--- a/autotests/abstract_client.h
+++ b/autotests/abstract_client.h
@@ -1 +1 @@
-#include "mock_abstract_client.h"
\ No newline at end of file
+#include "mock_abstract_client.h"
diff --git a/autotests/integration/scripting/screenedge_test.cpp b/autotests/integration/scripting/screenedge_test.cpp
index 569304f42..1d8547401 100644
--- a/autotests/integration/scripting/screenedge_test.cpp
+++ b/autotests/integration/scripting/screenedge_test.cpp
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "workspace.h"
#include "scripting/scripting.h"
#include "effect_builtins.h"
-#include "workspace.h"

#define private public
#include "screenedge.h"
diff --git a/autotests/test_xcb_wrapper.cpp b/autotests/test_xcb_wrapper.cpp
index fe0bcbae1..32719b5d5 100644
--- a/autotests/test_xcb_wrapper.cpp
+++ b/autotests/test_xcb_wrapper.cpp
@@ -468,7 +468,7 @@ void TestXcbWrapper::testMotifEmpty()
void TestXcbWrapper::testMotif_data()
{
QTest::addColumn<quint32>("flags");
- QTest::addColumn<quint32>("funtions");
+ QTest::addColumn<quint32>("functions");
QTest::addColumn<quint32>("decorations");

QTest::addColumn<bool>("expectedHasDecoration");
@@ -503,11 +503,11 @@ void TestXcbWrapper::testMotif()
{
Atom atom(QByteArrayLiteral("_MOTIF_WM_HINTS"));
QFETCH(quint32, flags);
- QFETCH(quint32, funtions);
+ QFETCH(quint32, functions);
QFETCH(quint32, decorations);
quint32 data[] = {
flags,
- funtions,
+ functions,
decorations,
0,
0
diff --git a/colorcorrection/colorcorrectdbusinterface.h b/colorcorrection/colorcorrectdbusinterface.h
index 1cb583c46..965b01702 100644
--- a/colorcorrection/colorcorrectdbusinterface.h
+++ b/colorcorrection/colorcorrectdbusinterface.h
@@ -84,10 +84,10 @@ public Q_SLOTS:
* - EveningBeginFixed
* - TransitionTime
*
- * It returns true if the configuration change was succesful, otherwise false.
+ * It returns true if the configuration change was successful, otherwise false.
* A change request for the location or timings needs to provide all relevant fields at the same time
- * to be succesful. Otherwise the whole change request will get ignored. A change request will be ignored
- * as a whole as well, if one of the provided informations has been sent in a wrong format.
+ * to be successful. Otherwise the whole change request will get ignored. A change request will be ignored
+ * as a whole as well, if one of the provided information has been sent in a wrong format.
*
* @return bool
* @see nightColorInfo
diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp
index 533797946..c72b953e5 100644
--- a/effects/flipswitch/flipswitch.cpp
+++ b/effects/flipswitch/flipswitch.cpp
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QKeyEvent>
#include <QMatrix4x4>

-#include <QAction>
#include <KGlobalAccel>
#include <KLocalizedString>

diff --git a/geometry.cpp b/geometry.cpp
index d732ee6da..b2f3eaecf 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -177,7 +177,7 @@ void Workspace::updateClientArea(bool force)
iS ++) {
const auto geo = new_sareas[ i ][ iS ].intersected(
(*it)->adjustedClientArea(desktopArea, screens[ iS ]));
- // ignore the geometry if it results in the screen getting removed completly
+ // ignore the geometry if it results in the screen getting removed completely
if (!geo.isEmpty()) {
new_sareas[ i ][ iS ] = geo;
}
@@ -193,7 +193,7 @@ void Workspace::updateClientArea(bool force)
// qDebug() << "adjusting new_sarea: " << screens[ iS ];
const auto geo = new_sareas[(*it)->desktop()][ iS ].intersected(
(*it)->adjustedClientArea(desktopArea, screens[ iS ]));
- // ignore the geometry if it results in the screen getting removed completly
+ // ignore the geometry if it results in the screen getting removed completely
if (!geo.isEmpty()) {
new_sareas[(*it)->desktop()][ iS ] = geo;
}
diff --git a/input.cpp b/input.cpp
index de215cfef..d1b3ecbd0 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1229,7 +1229,7 @@ public:
}
bool touchDown(quint32 id, const QPointF &pos, quint32 time) override {
Q_UNUSED(time)
- // TODO: better check whether a touch sequence is in progess
+ // TODO: better check whether a touch sequence is in progress
if (m_touchInProgress || waylandServer()->seat()->isTouchSequence()) {
// cancel existing touch
ScreenEdges::self()->gestureRecognizer()->cancelSwipeGesture();
diff --git a/kcmkwin/kwindecoration/decorationmodel.h b/kcmkwin/kwindecoration/decorationmodel.h
index 55c5f5c1f..41af88d3e 100644
--- a/kcmkwin/kwindecoration/decorationmodel.h
+++ b/kcmkwin/kwindecoration/decorationmodel.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef KDECORATION_DECORATIONS_MODEL_H
-#define KDECORATION_DECORATIONS_MODEL_H
+#ifndef KDECORATION_DECORATION_MODEL_H
+#define KDECORATION_DECORATION_MODEL_H

#include <QAbstractListModel>

diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h
index 16bf5936a..a439132cc 100644
--- a/libkwineffects/kwineffects.h
+++ b/libkwineffects/kwineffects.h
@@ -546,7 +546,7 @@ public:

/**
* Reimplement this method to provide online debugging.
- * This could be as trivial as printing specific detail informations about the effect state
+ * This could be as trivial as printing specific detail information about the effect state
* but could also be used to move the effect in and out of a special debug modes, clear bogus
* data, etc.
* Notice that the functions is const by intent! Whenever you alter the state of the object
diff --git a/libkwineffects/kwinglobals.h b/libkwineffects/kwinglobals.h
index 0ca4891d7..bcedbfa38 100644
--- a/libkwineffects/kwinglobals.h
+++ b/libkwineffects/kwinglobals.h
@@ -25,8 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QImage>
#include <QPoint>
#include <QVariant>
-#include <QCoreApplication>
-#include <QVariant>

#include <kwin_export.h>

diff --git a/packageplugins/windowswitcher/windowswitcher.h b/packageplugins/windowswitcher/windowswitcher.h
index 74bbdcc8f..141fcaf4d 100644
--- a/packageplugins/windowswitcher/windowswitcher.h
+++ b/packageplugins/windowswitcher/windowswitcher.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA. *
*******************************************************************************/

-#ifndef SWITCHERPACKAGE_H
-#define SWITCHERPACKAGE_H
+#ifndef WINDOWSWITCHER_H
+#define WINDOWSWITCHER_H

#include <KPackage/PackageStructure>

diff --git a/plugins/platforms/drm/drm_object.cpp b/plugins/platforms/drm/drm_object.cpp
index e67b581b5..d2b7bb0d9 100644
--- a/plugins/platforms/drm/drm_object.cpp
+++ b/plugins/platforms/drm/drm_object.cpp
@@ -25,7 +25,7 @@ namespace KWin
{

/*
- * Defintions for class DrmObject
+ * Definitions for class DrmObject
*/

DrmObject::DrmObject(uint32_t object_id, int fd)
@@ -91,7 +91,7 @@ bool DrmObject::atomicPopulate(drmModeAtomicReq *req)
}

/*
- * Defintions for struct Prop
+ * Definitions for struct Prop
*/

DrmObject::Property::Property(drmModePropertyRes *prop, uint64_t val, QVector<QByteArray> enumNames)
diff --git a/plugins/platforms/drm/drm_object.h b/plugins/platforms/drm/drm_object.h
index 450dd491f..25b9e0262 100644
--- a/plugins/platforms/drm/drm_object.h
+++ b/plugins/platforms/drm/drm_object.h
@@ -85,7 +85,7 @@ protected:
const uint32_t m_id;
DrmOutput *m_output = nullptr;

- // for comparision with received name of DRM object
+ // for comparison with received name of DRM object
QVector<Property *> m_props;

class Property
diff --git a/plugins/platforms/hwcomposer/screens_hwcomposer.h b/plugins/platforms/hwcomposer/screens_hwcomposer.h
index b4de1cbe3..384236d9a 100644
--- a/plugins/platforms/hwcomposer/screens_hwcomposer.h
+++ b/plugins/platforms/hwcomposer/screens_hwcomposer.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef KWIN_SCREENS_FRAMEBUFFER_H
-#define KWIN_SCREENS_FRAMEBUFFER_H
+#ifndef KWIN_SCREENS_HWCOMPOSER_H
+#define KWIN_SCREENS_HWCOMPOSER_H
#include "screens.h"

namespace KWin
diff --git a/plugins/platforms/x11/standalone/windowselector.h b/plugins/platforms/x11/standalone/windowselector.h
index 5e1cbab33..710acd8aa 100644
--- a/plugins/platforms/x11/standalone/windowselector.h
+++ b/plugins/platforms/x11/standalone/windowselector.h
@@ -20,8 +20,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/

-#ifndef KWIN_KILLWINDOW_H
-#define KWIN_KILLWINDOW_H
+#ifndef KWIN_WINDOWSELECTOR_H
+#define KWIN_WINDOWSELECTOR_H

#include "x11eventfilter.h"

diff --git a/plugins/platforms/x11/standalone/x11_platform.h b/plugins/platforms/x11/standalone/x11_platform.h
index 3cfdb47df..732177537 100644
--- a/plugins/platforms/x11/standalone/x11_platform.h
+++ b/plugins/platforms/x11/standalone/x11_platform.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef KWIN_X11STANDALONE_PLATFORM_H
-#define KWIN_X11STANDALONE_PLATFORM_H
+#ifndef KWIN_X11_PLATFORM_H
+#define KWIN_X11_PLATFORM_H
#include "platform.h"

#include <kwin_export.h>
diff --git a/screenedge.cpp b/screenedge.cpp
index 4d60672aa..4d60722f3 100644
--- a/screenedge.cpp
+++ b/screenedge.cpp
@@ -274,9 +274,9 @@ void Edge::markAsTriggered(const QPoint &cursorPos, const QDateTime &triggerTime

bool Edge::canActivate(const QPoint &cursorPos, const QDateTime &triggerTime)
{
- // we check whether either the timer has explicitly been invalidated (successfull trigger) or is
+ // we check whether either the timer has explicitly been invalidated (successful trigger) or is
// bigger than the reactivation threshold (activation "aborted", usually due to moving away the cursor
- // from the corner after successfull activation)
+ // from the corner after successful activation)
// either condition means that "this is the first event in a new attempt"
if (!m_lastReset.isValid() || m_lastReset.msecsTo(triggerTime) > edges()->reActivationThreshold()) {
m_lastReset = triggerTime;
diff --git a/shell_client.cpp b/shell_client.cpp
index 51d69efbb..a3a80cd53 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "wayland_server.h"
#include "workspace.h"
#include "virtualdesktops.h"
-#include "workspace.h"
#include "screens.h"
#include "decorations/decorationbridge.h"
#include "decorations/decoratedclient.h"
diff --git a/tabbox/clientmodel.h b/tabbox/clientmodel.h
index f08295f4f..5815bc192 100644
--- a/tabbox/clientmodel.h
+++ b/tabbox/clientmodel.h
@@ -76,7 +76,7 @@ public:
/**
* Generates a new list of TabBoxClients based on the current config.
* Calling this method will reset the model. If partialReset is true
- * the top of the list is kept as a starting point. If not the the
+ * the top of the list is kept as a starting point. If not the
* current active client is used as the starting point to generate the
* list.
* @param desktop The desktop for which the list should be created
diff --git a/tabbox/switcheritem.h b/tabbox/switcheritem.h
index 4464a7f97..53c7ca829 100644
--- a/tabbox/switcheritem.h
+++ b/tabbox/switcheritem.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef KWIN_TABBOX_ITEM
-#define KWIN_TABBOX_ITEM
+#ifndef KWIN_TABBOX_SWITCHERITEM_H
+#define KWIN_TABBOX_SWITCHERITEM_H

#include <QObject>
#include <QRect>
@@ -115,4 +115,4 @@ inline QObject *SwitcherItem::item() const
} // TabBox
} // KWin

-#endif // KWIN_TABBOX_ITEM
+#endif // KWIN_TABBOX_SWITCHERITEM_H
diff --git a/thumbnailitem.cpp b/thumbnailitem.cpp
index 469d4e182..a0f3f47e8 100644
--- a/thumbnailitem.cpp
+++ b/thumbnailitem.cpp
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "composite.h"
#include "effects.h"
#include "workspace.h"
-#include "composite.h"
#include "shell_client.h"
#include "wayland_server.h"
// Qt
diff --git a/virtualkeyboard.h b/virtualkeyboard.h
index 9240e9917..1bc56c0f6 100644
--- a/virtualkeyboard.h
+++ b/virtualkeyboard.h
@@ -17,8 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef KWIN_INPUT_METHODS_H
-#define KWIN_INPUT_METHODS_H
+#ifndef KWIN_VIRTUAL_KEYBOARD_H
+#define KWIN_VIRTUAL_KEYBOARD_H

#include <QObject>

diff --git a/xcbutils.h b/xcbutils.h
index f21596aa1..011af83de 100644
--- a/xcbutils.h
+++ b/xcbutils.h
@@ -1397,7 +1397,7 @@ public:
void map();
void unmap();
void reparent(xcb_window_t parent, int x = 0, int y = 0);
- void changeProperty(xcb_atom_t property, xcb_atom_t type, uint8_t format, uint32_t lenght,
+ void changeProperty(xcb_atom_t property, xcb_atom_t type, uint8_t format, uint32_t length,
const void *data, uint8_t mode = XCB_PROP_MODE_REPLACE);
void deleteProperty(xcb_atom_t property);
void setBorderWidth(uint32_t width);
@@ -1601,12 +1601,12 @@ void Window::reparent(xcb_window_t parent, int x, int y)
}

inline
-void Window::changeProperty(xcb_atom_t property, xcb_atom_t type, uint8_t format, uint32_t lenght, const void *data, uint8_t mode)
+void Window::changeProperty(xcb_atom_t property, xcb_atom_t type, uint8_t format, uint32_t length, const void *data, uint8_t mode)
{
if (!isValid()) {
return;
}
- xcb_change_property(connection(), mode, m_window, property, type, format, lenght, data);
+ xcb_change_property(connection(), mode, m_window, property, type, format, length, data);
}

inline

[Yuri Chornoivan]

Git commit 7323068f362499f6c191acea15660728d7580da9 by Yuri Chornoivan.
Committed on 30/08/2018 at 05:47.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 app/alternativeshelper.h
M +1 -1 app/dock/dockconfigview.cpp
M +1 -1 app/dock/dockmenumanager.cpp
M +1 -1 app/dock/docksecconfigview.cpp
M +5 -5 app/dock/dockview.cpp
M +2 -2 app/dock/panelshadows_p.h
M +5 -5 app/dock/visibilitymanager.cpp
M +3 -3 app/dockcorona.cpp
M +1 -1 app/globalshortcuts.cpp
M +2 -2 app/importer.cpp
M +2 -2 app/importer.h
M +2 -2 app/layout.cpp
M +1 -1 app/layout.h
M +3 -3 app/layoutmanager.cpp
M +1 -1 app/layoutmanager.h
M +5 -0 app/layoutsDelegates/checkboxdelegate.h
M +1 -1 app/layoutsDelegates/layoutnamedelegate.cpp
M +5 -0 app/layoutsDelegates/layoutnamedelegate.h
M +0 -1 app/main.cpp
M +1 -1 app/settingsdialog.h
M +1 -1 app/sortedactivitiesmodel.cpp
M +3 -3 app/sortedactivitiesmodel.h
M +2 -2 app/universalsettings.cpp
M +3 -3 containment/package/contents/ui/applet/AppletItemWrapper.qml
M +3 -3 containment/package/contents/ui/main.qml
M +1 -1 containmentactions/contextmenu/menu.cpp
M +1 -1 liblattedock/extras.h
M +1 -1 plasmoid/package/contents/ui/ToolTipInstance.qml
M +1 -1 plasmoid/package/contents/ui/config/ConfigAppearance.qml
M +1 -1 plasmoid/package/contents/ui/config/ConfigPanel.qml
M +2 -2 plasmoid/package/contents/ui/main.qml
M +7 -7 plasmoid/package/contents/ui/task/TaskDelegate.qml
M +1 -1 plasmoid/package/contents/ui/task/animations/TaskRestoreAnimation.qml
M +1 -1 shell/package/contents/configuration/AppearanceConfig.qml

https://commits.kde.org/latte-dock/7323068f362499f6c191acea15660728d7580da9

diff --git a/app/alternativeshelper.h b/app/alternativeshelper.h
index a302bf01..0442c9d5 100644
--- a/app/alternativeshelper.h
+++ b/app/alternativeshelper.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef ALTERNATIVESDIALOG_H
-#define ALTERNATIVESDIALOG_H
+#ifndef ALTERNATIVESHELPER_H
+#define ALTERNATIVESHELPER_H

#include <Plasma/Applet>

diff --git a/app/dock/dockconfigview.cpp b/app/dock/dockconfigview.cpp
index cc86aba7..52bc6460 100644
--- a/app/dock/dockconfigview.cpp
+++ b/app/dock/dockconfigview.cpp
@@ -448,7 +448,7 @@ void DockConfigView::addPanelSpacer()
void DockConfigView::hideConfigWindow()
{
if (m_shellSurface) {
- //!NOTE: Avoid crash in wayland enviroment with qt5.9
+ //!NOTE: Avoid crash in wayland environment with qt5.9
close();
} else {
hide();
diff --git a/app/dock/dockmenumanager.cpp b/app/dock/dockmenumanager.cpp
index 6fc721f5..c58a24c5 100644
--- a/app/dock/dockmenumanager.cpp
+++ b/app/dock/dockmenumanager.cpp
@@ -192,7 +192,7 @@ bool DockMenuManager::mousePressEvent(QMouseEvent *event)
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);
m_contextMenu = desktopMenu;

- //! deprecated old code that can be removed if the following plasma approach doesnt
+ //! deprecated old code that can be removed if the following plasma approach doesn't
//! create any issues with context menu creation in Latte
/*if (m_dockView->mouseGrabberItem()) {
//workaround, this fixes for me most of the right click menu behavior
diff --git a/app/dock/docksecconfigview.cpp b/app/dock/docksecconfigview.cpp
index 62419a8e..36c4b584 100644
--- a/app/dock/docksecconfigview.cpp
+++ b/app/dock/docksecconfigview.cpp
@@ -328,7 +328,7 @@ bool DockSecConfigView::event(QEvent *e)
void DockSecConfigView::hideConfigWindow()
{
if (m_shellSurface) {
- //!NOTE: Avoid crash in wayland enviroment with qt5.9
+ //!NOTE: Avoid crash in wayland environment with qt5.9
close();
} else {
hide();
diff --git a/app/dock/dockview.cpp b/app/dock/dockview.cpp
index da326492..930900b0 100644
--- a/app/dock/dockview.cpp
+++ b/app/dock/dockview.cpp
@@ -60,7 +60,7 @@
namespace Latte {

//! both alwaysVisible and dockWinBehavior are passed through corona because
-//! during the dock window creation containment hasnt been set, but these variables
+//! during the dock window creation containment hasn't been set, but these variables
//! are needed in order for window flags to be set correctly
DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen, bool dockWindowBehavior)
: PlasmaQuick::ContainmentView(corona),
@@ -122,8 +122,8 @@ DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen, bool dockWindo
connect(&m_screenSyncTimer, &QTimer::timeout, this, &DockView::reconsiderScreen);

//! under X11 it was identified that windows many times especially under screen changes
- //! dont end up at the correct position and size. This timer will enforce repositionings
- //! and resizes every 500ms if the window hasnt end up to correct values and until this
+ //! don't end up at the correct position and size. This timer will enforce repositionings
+ //! and resizes every 500ms if the window hasn't end up to correct values and until this
//! is achieved
m_validateGeometryTimer.setSingleShot(true);
m_validateGeometryTimer.setInterval(500);
@@ -719,7 +719,7 @@ QRect DockView::maximumNormalGeometry()
}

//! this is needed in order to preserve that the top dock will be above
- //! the others in case flag bypasswindowmanagerhint hasnt be set,
+ //! the others in case flag bypasswindowmanagerhint hasn't be set,
//! such a case is the AlwaysVisible mode
if (location() == Plasma::Types::TopEdge) {
KWindowSystem::setState(winId(), NET::KeepAbove);
@@ -1552,7 +1552,7 @@ void DockView::setBlockHiding(bool block)

void DockView::updateEffects()
{
- //! Dont apply any effect before the wayland surface is created under wayland
+ //! Don't apply any effect before the wayland surface is created under wayland
//! https://bugs.kde.org/show_bug.cgi?id=392890
if (KWindowSystem::isPlatformWayland() && !m_shellSurface) {
return;
diff --git a/app/dock/panelshadows_p.h b/app/dock/panelshadows_p.h
index 96e6d14b..e3e0ff51 100644
--- a/app/dock/panelshadows_p.h
+++ b/app/dock/panelshadows_p.h
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef PLASMA_PANELSHADOWS_H
-#define PLASMA_PANELSHADOWS_H
+#ifndef PLASMA_PANELSHADOWS_P_H
+#define PLASMA_PANELSHADOWS_P_H

#include <QSet>

diff --git a/app/dock/visibilitymanager.cpp b/app/dock/visibilitymanager.cpp
index 17cda40b..36961067 100644
--- a/app/dock/visibilitymanager.cpp
+++ b/app/dock/visibilitymanager.cpp
@@ -432,7 +432,7 @@ void VisibilityManagerPrivate::dodgeActive(WindowId wid)
if (raiseTemporarily)
return;

- //!dont send false raiseDock signal when containing mouse
+ //!don't send false raiseDock signal when containing mouse
if (containsMouse) {
raiseDock(true);
return;
@@ -450,7 +450,7 @@ void VisibilityManagerPrivate::dodgeActive(WindowId wid)
winfo = wm->requestInfo(wm->activeWindow());
}

- //!dont send false raiseDock signal when containing mouse
+ //!don't send false raiseDock signal when containing mouse
if (wm->isOnCurrentDesktop(wid) && wm->isOnCurrentActivity(wid)) {
raiseDock(!intersects(winfo));
}
@@ -461,7 +461,7 @@ void VisibilityManagerPrivate::dodgeMaximized(WindowId wid)
if (raiseTemporarily)
return;

- //!dont send false raiseDock signal when containing mouse
+ //!don't send false raiseDock signal when containing mouse
if (containsMouse) {
raiseDock(true);
return;
@@ -491,7 +491,7 @@ void VisibilityManagerPrivate::dodgeMaximized(WindowId wid)
&& intersects(winfo));
};

- //!dont send false raiseDock signal when containing mouse
+ //!don't send false raiseDock signal when containing mouse
if (wm->isOnCurrentDesktop(wid) && wm->isOnCurrentActivity(wid))
raiseDock(view->formFactor() == Plasma::Types::Vertical
? !isMaxHoriz() : !isMaxVert());
@@ -505,7 +505,7 @@ void VisibilityManagerPrivate::dodgeWindows(WindowId wid)
if (windows.find(wid) == std::end(windows))
return;

- //!dont send false raiseDock signal when containing mouse
+ //!don't send false raiseDock signal when containing mouse
if (containsMouse) {
raiseDock(true);
return;
diff --git a/app/dockcorona.cpp b/app/dockcorona.cpp
index b8e3dd41..82c1722a 100644
--- a/app/dockcorona.cpp
+++ b/app/dockcorona.cpp
@@ -133,7 +133,7 @@ DockCorona::~DockCorona()
//! BEGIN: Give the time to slide-out docks when closing
m_layoutManager->hideAllDocks();

- //! Dont delay the destruction under wayland in any case
+ //! Don't delay the destruction under wayland in any case
//! because it creates a crash with kwin effects
//! https://bugs.kde.org/show_bug.cgi?id=392890
if (!KWindowSystem::isPlatformWayland()) {
@@ -430,7 +430,7 @@ QRegion DockCorona::availableScreenRegionWithCriteria(int id, QString forLayout)
int realThickness = view->normalThickness() - view->shadow();

// Usually availableScreenRect is used by the desktop,
- // but Latte dont have desktop, then here just
+ // but Latte don't have desktop, then here just
// need calculate available space for top and bottom location,
// because the left and right are those who dodge others docks
switch (view->location()) {
@@ -555,7 +555,7 @@ QRect DockCorona::availableScreenRectWithCriteria(int id, QList<Dock::Visibility
auto dockRect = view->absGeometry();

// Usually availableScreenRect is used by the desktop,
- // but Latte dont have desktop, then here just
+ // but Latte don't have desktop, then here just
// need calculate available space for top and bottom location,
// because the left and right are those who dodge others docks
switch (view->location()) {
diff --git a/app/globalshortcuts.cpp b/app/globalshortcuts.cpp
index b5218a95..62d94432 100644
--- a/app/globalshortcuts.cpp
+++ b/app/globalshortcuts.cpp
@@ -736,7 +736,7 @@ bool GlobalShortcuts::dockAtLowerScreenPriority(DockView *test, DockView *base)

}

- qDebug() << "dockAtLowerScreenPriority : shouldnt had reached here...";
+ qDebug() << "dockAtLowerScreenPriority : shouldn't had reached here...";
return false;
}

diff --git a/app/importer.cpp b/app/importer.cpp
index 2c93f715..9ea82d08 100644
--- a/app/importer.cpp
+++ b/app/importer.cpp
@@ -186,7 +186,7 @@ QString Importer::layoutCanBeImported(QString oldAppletsPath, QString newName, Q
{
QFile oldAppletsrc(oldAppletsPath);

- //! old file doesnt exist
+ //! old file doesn't exist
if (!oldAppletsrc.exists()) {
return QString();
}
@@ -225,7 +225,7 @@ QString Importer::layoutCanBeImported(QString oldAppletsPath, QString newName, Q
filter.append(QString(newName + "*.layout.latte"));
QStringList files = layoutDir.entryList(filter, QDir::Files | QDir::NoSymLinks);

- //! if the newLayout already exists provide a newName that doesnt
+ //! if the newLayout already exists provide a newName that doesn't
if (files.count() >= 1) {
int newCounter = files.count() + 1;

diff --git a/app/importer.h b/app/importer.h
index 5462266d..748449ea 100644
--- a/app/importer.h
+++ b/app/importer.h
@@ -72,7 +72,7 @@ public:
//! check if this layout exists already in the latte directory
static bool layoutExists(QString layoutName);
//! imports the specific layout and return the new layout name.
- //! if the function didnt succeed return an empty string
+ //! if the function didn't succeed return an empty string
static QString importLayoutHelper(QString fileName);

//! return the file path of a layout either existing or not
@@ -83,7 +83,7 @@ public:
static QStringList availableLayouts();
//! it checks the linked file if there are Containments in it that belong
//! to Original Layouts and moves them accordingly. This is used mainly on
- //! startup and if such state occurs, it basically means that the app didnt
+ //! startup and if such state occurs, it basically means that the app didn't
//! close correctly, e.g. there was a crash.
static QStringList checkRepairMultipleLayoutsLinkedFile();

diff --git a/app/layout.cpp b/app/layout.cpp
index c3e46660..29dbab20 100644
--- a/app/layout.cpp
+++ b/app/layout.cpp
@@ -1070,7 +1070,7 @@ void Layout::copyDock(Plasma::Containment *containment)
QString temp2File = newUniqueIdsLayoutFromFile(temp1File);


- //! Dont create DockView when the containment is created because we must update
+ //! Don't create DockView when the containment is created because we must update
//! its screen settings first
setBlockAutomaticDockViewCreation(true);
//! Finally import the configuration
@@ -1390,7 +1390,7 @@ QString Layout::newUniqueIdsLayoutFromFile(QString file)
foreach (auto contId, investigate_conts.groupList()) {
QString pluginId = investigate_conts.group(contId).readEntry("plugin", "");

- if (pluginId != "org.kde.desktopcontainment") { //!dont add ghost containments
+ if (pluginId != "org.kde.desktopcontainment") { //!don't add ghost containments
KConfigGroup newContainmentGroup = fixedNewContainmets.group(assigned[contId]);
investigate_conts.group(contId).copyTo(&newContainmentGroup);

diff --git a/app/layout.h b/app/layout.h
index 92402dd8..506ff35c 100644
--- a/app/layout.h
+++ b/app/layout.h
@@ -206,7 +206,7 @@ private:
bool m_blockAutomaticDockViewCreation{false};
bool m_disableBordersForMaximizedWindows{false};
bool m_showInMenu{false};
- //if version doesnt exist it is and old layout file
+ //if version doesn't exist it is and old layout file
int m_version{2};

QString m_background;
diff --git a/app/layoutmanager.cpp b/app/layoutmanager.cpp
index 44c02dcc..5211a40d 100644
--- a/app/layoutmanager.cpp
+++ b/app/layoutmanager.cpp
@@ -33,7 +33,7 @@
#include <QFile>
#include <QMessageBox>
#include <QQmlProperty>
-#include <QtDBus/QtDBus>
+#include <QtDBus>

#include <KActivities/Consumer>
#include <KActivities/Controller>
@@ -524,7 +524,7 @@ void LayoutManager::loadLayoutOnStartup(QString layoutName)
// if (memoryUsage() == Dock::MultipleLayouts) {
QStringList layouts = m_importer->checkRepairMultipleLayoutsLinkedFile();

- //! Latte didnt close correctly, maybe a crash
+ //! Latte didn't close correctly, maybe a crash
if (layouts.size() > 0) {
QMessageBox *msg = new QMessageBox();
msg->setAttribute(Qt::WA_DeleteOnClose);
@@ -995,7 +995,7 @@ QString LayoutManager::newLayout(QString layoutName, QString preset)
filter.append(QString(layoutName + "*.layout.latte"));
QStringList files = layoutDir.entryList(filter, QDir::Files | QDir::NoSymLinks);

- //! if the newLayout already exists provide a newName that doesnt
+ //! if the newLayout already exists provide a newName that doesn't
if (files.count() >= 1) {
int newCounter = files.count() + 1;

diff --git a/app/layoutmanager.h b/app/layoutmanager.h
index 5d134d39..e1f30cb4 100644
--- a/app/layoutmanager.h
+++ b/app/layoutmanager.h
@@ -116,7 +116,7 @@ public slots:
void hideLatteSettingsDialog();
Q_INVOKABLE void showLatteSettingsDialog(int page = Latte::Dock::LayoutPage);

- //! switch to specified layout, default previousMemoryUsage means that it didnt change
+ //! switch to specified layout, default previousMemoryUsage means that it didn't change
Q_INVOKABLE bool switchToLayout(QString layoutName, int previousMemoryUsage = -1);

Q_INVOKABLE int layoutsMemoryUsage();
diff --git a/app/layoutsDelegates/checkboxdelegate.h b/app/layoutsDelegates/checkboxdelegate.h
index 9452cff4..ba209512 100644
--- a/app/layoutsDelegates/checkboxdelegate.h
+++ b/app/layoutsDelegates/checkboxdelegate.h
@@ -17,6 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#ifndef CHECKBOXDELEGATE_H
+#define CHECKBOXDELEGATE_H
+
#include <QStyledItemDelegate>

class CheckBoxDelegate : public QStyledItemDelegate
@@ -27,3 +30,5 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);
};
+
+#endif
diff --git a/app/layoutsDelegates/layoutnamedelegate.cpp b/app/layoutsDelegates/layoutnamedelegate.cpp
index d5b184b0..217243b8 100644
--- a/app/layoutsDelegates/layoutnamedelegate.cpp
+++ b/app/layoutsDelegates/layoutnamedelegate.cpp
@@ -72,7 +72,7 @@ void LayoutNameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
myOptionE.text = s;*/
QStyledItemDelegate::paint(painter, myOptionE, model->index(index.row(), HIDDENTEXTCOLUMN));

- //! Lock Icon 2: QIcon attempt that doesnt change color
+ //! Lock Icon 2: QIcon attempt that doesn't change color
QIcon lockIcon = QIcon::fromTheme("object-locked");

if (qApp->layoutDirection() == Qt::RightToLeft) {
diff --git a/app/layoutsDelegates/layoutnamedelegate.h b/app/layoutsDelegates/layoutnamedelegate.h
index e8469f90..a47ed7c4 100644
--- a/app/layoutsDelegates/layoutnamedelegate.h
+++ b/app/layoutsDelegates/layoutnamedelegate.h
@@ -17,6 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#ifndef LAYOUTNAMEDELEGATE_H
+#define LAYOUTNAMEDELEGATE_H
+
#include <QStyledItemDelegate>

class LayoutNameDelegate : public QStyledItemDelegate
@@ -26,3 +29,5 @@ public:

void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
};
+
+#endif
diff --git a/app/main.cpp b/app/main.cpp
index b293a60c..e1f0bf83 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -31,7 +31,6 @@
#include <QQuickWindow>
#include <QCommandLineParser>
#include <QCommandLineOption>
-#include <QDebug>
#include <QDir>
#include <QLockFile>
#include <QSharedMemory>
diff --git a/app/settingsdialog.h b/app/settingsdialog.h
index 6dbad198..8d985e7c 100644
--- a/app/settingsdialog.h
+++ b/app/settingsdialog.h
@@ -85,7 +85,7 @@ private slots:
private:
void addLayoutForFile(QString file, QString layoutName = QString(), bool newTempDirectory = true, bool showNotification = true);
//! When an activity is closed for some reason the window manager hides and reshows
- //! the windows. This function prevents this because we dont want to delete the window
+ //! the windows. This function prevents this because we don't want to delete the window
//! on reject in such case.
void blockDeleteOnActivityStopped();
void loadSettings();
diff --git a/app/sortedactivitiesmodel.cpp b/app/sortedactivitiesmodel.cpp
index 4970ca29..bc986a3e 100644
--- a/app/sortedactivitiesmodel.cpp
+++ b/app/sortedactivitiesmodel.cpp
@@ -441,6 +441,6 @@ float SortedActivitiesModel::luminasFromFile(QString imageFile, int edge)
return areaLumin;
}

- //! didnt find anything
+ //! didn't find anything
return -1000;
}
diff --git a/app/sortedactivitiesmodel.h b/app/sortedactivitiesmodel.h
index f685905e..c0146419 100644
--- a/app/sortedactivitiesmodel.h
+++ b/app/sortedactivitiesmodel.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef SORTED_ACTIVITY_MODEL
-#define SORTED_ACTIVITY_MODEL
+#ifndef SORTED_ACTIVITIES_MODEL
+#define SORTED_ACTIVITIES_MODEL

// Qt
#include <QSortFilterProxyModel>
@@ -82,4 +82,4 @@ private:
QHash<QString, EdgesHash> m_luminasCache;
};

-#endif // SORTED_ACTIVITY_MODEL
+#endif // SORTED_ACTIVITIES_MODEL
diff --git a/app/universalsettings.cpp b/app/universalsettings.cpp
index 798da902..44d4a960 100644
--- a/app/universalsettings.cpp
+++ b/app/universalsettings.cpp
@@ -26,7 +26,7 @@
#include <QDir>
#include <QProcess>

-#include <QtDBus/QtDBus>
+#include <QtDBus>

#include <KDirWatch>
#include <KActivities/Consumer>
@@ -334,7 +334,7 @@ void UniversalSettings::setAutostart(bool state)
metaFile.copy(autostartFile.fileName());
//! I havent added the flag "OnlyShowIn=KDE;" into the autostart file
//! because I fall onto a Plasma 5.8 case that this flag
- //! didnt let the plasma desktop to start
+ //! didn't let the plasma desktop to start
emit autostartChanged();
}
}
diff --git a/containment/package/contents/ui/applet/AppletItemWrapper.qml b/containment/package/contents/ui/applet/AppletItemWrapper.qml
index 981bda3c..4ec6c71d 100644
--- a/containment/package/contents/ui/applet/AppletItemWrapper.qml
+++ b/containment/package/contents/ui/applet/AppletItemWrapper.qml
@@ -48,7 +48,7 @@ Item{
}

if (container.latteApplet) {
- //! commented because it was breaking the context menu available area, I dont remember where
+ //! commented because it was breaking the context menu available area, I don't remember where
//! we needed this...

// if (container.showZoomed && root.isVertical)
@@ -76,7 +76,7 @@ Item{
}

if (container.latteApplet) {
- //! commented because it was breaking the context menu available area, I dont remember where
+ //! commented because it was breaking the context menu available area, I don't remember where
//! we needed this...

//if (container.showZoomed && root.isHorizontal)
@@ -644,7 +644,7 @@ Item{
target: appletNumberLoader
property:"badgeString"
value: {
- //! dont change value on hiding/releasing
+ //! don't change value on hiding/releasing
if (!root.showMetaBadge && !root.showAppletsNumbers) {
return;
}
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 57d5fa6a..74671bf3 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -328,7 +328,7 @@ DragDrop.DropArea {
// TO BE DELETED, if not needed: property int counter:0;

///BEGIN properties provided to Latte Plasmoid
- //shadows for applets, it should be removed as the appleitems dont need it any more
+ //shadows for applets, it should be removed as the appleitems don't need it any more
property bool enableShadows: plasmoid.configuration.shadows || root.forceTransparentPanel
property bool dockIsHidden: dock ? dock.visibility.isHidden : true
property bool groupTasksByDefault: plasmoid.configuration.groupTasksByDefault
@@ -875,8 +875,8 @@ DragDrop.DropArea {
// FIXME TODO: This is a real-world fix to produce a sensible initial position for
// launcher icons added by launcher menu applets. The basic approach has been used
// since Plasma 1. However, "add launcher to X" is a generic-enough concept and
- // frequent-enough occurence that we'd like to abstract it further in the future
- // and get rid of the uglyness of parties external to the containment adding applets
+ // frequent-enough occurrence that we'd like to abstract it further in the future
+ // and get rid of the ugliness of parties external to the containment adding applets
// of a specific type, and the containment caring about the applet type. In a better
// system the containment would be informed of requested launchers, and determine by
// itself what it wants to do with that information.
diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
index 4ad17ea1..f00c4b94 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -25,7 +25,7 @@
#include <QDebug>
#include <QFont>
#include <QMenu>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
#include <QTimer>

#include <KActionCollection>
diff --git a/liblattedock/extras.h b/liblattedock/extras.h
index e4547f0b..3602dd97 100644
--- a/liblattedock/extras.h
+++ b/liblattedock/extras.h
@@ -17,7 +17,7 @@
#include <memory>
#include <cmath>

-//! There are gcc versions that dont support yet that function even though they
+//! There are gcc versions that don't support yet that function even though they
//! publish themselves as C++14 compatible. Such a case is gcc 4.8.x that openSUSE
//! LEAP 42.2-3 is using. By enabling this flag such systems can be build correctly.
#if ENABLE_MAKE_UNIQUE
diff --git a/plasmoid/package/contents/ui/ToolTipInstance.qml b/plasmoid/package/contents/ui/ToolTipInstance.qml
index dcc1b666..abc700bb 100644
--- a/plasmoid/package/contents/ui/ToolTipInstance.qml
+++ b/plasmoid/package/contents/ui/ToolTipInstance.qml
@@ -459,7 +459,7 @@ Column {
}
}

- // In case the window title had only redundant informations (i.e. appName), text is now empty.
+ // In case the window title had only redundant information (i.e. appName), text is now empty.
// Add a hyphen to indicate that and avoid empty space.
if (text === "") {
text = "—";
diff --git a/plasmoid/package/contents/ui/config/ConfigAppearance.qml b/plasmoid/package/contents/ui/config/ConfigAppearance.qml
index c52a1a60..adacac2d 100644
--- a/plasmoid/package/contents/ui/config/ConfigAppearance.qml
+++ b/plasmoid/package/contents/ui/config/ConfigAppearance.qml
@@ -271,7 +271,7 @@ Item {
}
/////
//spacer to set a minimumWidth for sliders
- //Layout.minimumWidth didnt work
+ //Layout.minimumWidth didn't work
Label{}
// Label{Layout.maximumWidth: 275}
Label{}
diff --git a/plasmoid/package/contents/ui/config/ConfigPanel.qml b/plasmoid/package/contents/ui/config/ConfigPanel.qml
index 7171e6e7..fdbe9e41 100644
--- a/plasmoid/package/contents/ui/config/ConfigPanel.qml
+++ b/plasmoid/package/contents/ui/config/ConfigPanel.qml
@@ -138,7 +138,7 @@ Item {

/////
//spacer to set a minimumWidth for sliders
- //Layout.minimumWidth didnt work
+ //Layout.minimumWidth didn't work
Label{}
Label{Layout.minimumWidth: 280}
Label{}
diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml
index 9057e931..c7e36dd5 100644
--- a/plasmoid/package/contents/ui/main.qml
+++ b/plasmoid/package/contents/ui/main.qml
@@ -89,7 +89,7 @@ Item {
property int tasksStarting: 0
property int realSize: iconSize + iconMargin

- ///Dont use Math.floor it adds one pixel in animations and creates glitches
+ ///Don't use Math.floor it adds one pixel in animations and creates glitches
property int widthMargins: root.vertical ? thickMargin : iconMargin
property int heightMargins: !root.vertical ? thickMargin : iconMargin

@@ -902,7 +902,7 @@ Item {

onTriggered: {
if(root.latteDock)
- console.log("Plasmoid, checkListHoveredTimer was called, even though it shouldnt...");
+ console.log("Plasmoid, checkListHoveredTimer was called, even though it shouldn't...");

if (!root.containsMouse()) {

diff --git a/plasmoid/package/contents/ui/task/TaskDelegate.qml b/plasmoid/package/contents/ui/task/TaskDelegate.qml
index 3f004002..8dcec943 100644
--- a/plasmoid/package/contents/ui/task/TaskDelegate.qml
+++ b/plasmoid/package/contents/ui/task/TaskDelegate.qml
@@ -123,7 +123,7 @@ MouseArea{

property bool canPublishGeometries: (isWindow || isStartup || isGroupParent) && visible && width>=root.iconSize && height>=root.iconSize
&& !mainItemContainer.delayingRemove
- && (wrapper.mScale===1 || wrapper.mScale===root.zoomFactor) //dont publish during zoomFactor
+ && (wrapper.mScale===1 || wrapper.mScale===root.zoomFactor) //don't publish during zoomFactor

property bool pressed: false
readonly property bool showAttention: isDemandingAttention && plasmoid.status === PlasmaCore.Types.RequiresAttentionStatus ?
@@ -624,7 +624,7 @@ MouseArea{
}

if(mainItemContainer.contextMenu && mainItemContainer.contextMenu.status == PlasmaComponents.DialogStatus.Open){
- ///dont check to restore zooms
+ ///don't check to restore zooms
}
else{
if(!inAnimation){
@@ -640,7 +640,7 @@ MouseArea{
}

//! mouseX-Y values are delayed to be updated onEntered events and at the same time
- //! onPositionChanged signal may be delayed. we can fix this by dont delay at all
+ //! onPositionChanged signal may be delayed. we can fix this by don't delay at all
//! when mouseX-Y is updated based on the plasmoid formFactor
function mousePosChanged(mousePos) {
if (root.editMode || mousePos<0 ||
@@ -656,7 +656,7 @@ MouseArea{
//! show previews
if(root.showPreviews && !windowsPreviewDlg.visible && windowsPreviewDlg.activeItem !== mainItemContainer){
if (hoveredTimerObj) {
- //! dont delay showing preview in normal states,
+ //! don't delay showing preview in normal states,
//! that is when the dock wasnt hidden
if (!hoveredTimerObj.running) {
hoveredTimerObj.start();
@@ -1187,14 +1187,14 @@ MouseArea{

function slotPublishGeometries() {
//! this way we make sure that layouts that are in different activities that the current layout
- //! dont publish their geometries
+ //! don't publish their geometries
if ( canPublishGeometries
&& (!latteDock
|| (latteDock && currentLayout && latteDock.universalLayoutManager &&
currentLayout.name === latteDock.universalLayoutManager.currentLayoutName))) {
var globalChoords = backend.globalRect(mainItemContainer);

- //! Magic Lamp effect doesnt like coordinates outside the screen and
+ //! Magic Lamp effect doesn't like coordinates outside the screen and
//! width,heights of zero value... So we now normalize the geometries
//! sent in order to avoid such circumstances
if (root.vertical) {
@@ -1549,7 +1549,7 @@ MouseArea{

// The best solution in order to catch when the wheel action ended is to
// track the isMinimized state, but when the user has enabled window previews
- // at all times that flag doesnt work
+ // at all times that flag doesn't work
Timer {
id: wheelActionDelayer
interval: 200
diff --git a/plasmoid/package/contents/ui/task/animations/TaskRestoreAnimation.qml b/plasmoid/package/contents/ui/task/animations/TaskRestoreAnimation.qml
index 481d36d5..87f13e8f 100644
--- a/plasmoid/package/contents/ui/task/animations/TaskRestoreAnimation.qml
+++ b/plasmoid/package/contents/ui/task/animations/TaskRestoreAnimation.qml
@@ -67,7 +67,7 @@ SequentialAnimation{

onStopped: {
//! VERY IMPORTANT CODE, fixes a bug when cycling the mouse very fast inside
- //! and outside the dock, in some rare cases the restoreAnimation didnt end!!
+ //! and outside the dock, in some rare cases the restoreAnimation didn't end!!

//if (latteDock && (!latteDock.dockContainsMouse || icList.hoveredIndex === -1)) {
// wrapper.mScale = 1;
diff --git a/shell/package/contents/configuration/AppearanceConfig.qml b/shell/package/contents/configuration/AppearanceConfig.qml
index 11796a26..14fe68ed 100644
--- a/shell/package/contents/configuration/AppearanceConfig.qml
+++ b/shell/package/contents/configuration/AppearanceConfig.qml
@@ -438,7 +438,7 @@ PlasmaComponents.Page {
LatteExtraControls.Slider {
id: transparencySlider
Layout.fillWidth: true
- //! transparency can be set when the user doesnt want solidness all the time
+ //! transparency can be set when the user doesn't want solidness all the time
//! or when the user wants solidness only for maximized windows
enabled: showBackground.checked && !blockOpacityAdjustment

[Yuri Chornoivan]

Git commit c04ca1fa96d840a67b1d683065b0512e86886e5f by Yuri Chornoivan.
Committed on 31/08/2018 at 09:23.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/addremoveannotationtest.cpp
M +1 -1 autotests/generatorstest.cpp
M +1 -1 autotests/testingutils.cpp
M +2 -2 conf/editannottooldialog.cpp
M +2 -2 conf/widgetannottools.cpp
M +3 -3 conf/widgetdrawingtools.cpp
M +2 -2 core/action.h
M +2 -2 core/annotations.cpp
M +7 -7 core/annotations.h
M +4 -4 core/annotations_p.h
M +3 -3 core/area.cpp
M +5 -5 core/area.h
M +1 -1 core/audioplayer.cpp
M +1 -1 core/audioplayer.h
M +2 -2 core/chooseenginedialog.cpp
M +1 -1 core/chooseenginedialog_p.h
M +1 -1 core/debug_p.h
M +12 -14 core/document.cpp
M +5 -5 core/document.h
M +5 -5 core/document_p.h
M +1 -1 core/documentcommands_p.h
M +7 -7 core/fileprinter.cpp
M +3 -3 core/fileprinter.h
M +4 -4 core/fontinfo.h
M +1 -1 core/form.cpp
M +1 -1 core/form.h
M +1 -1 core/form_p.h
M +2 -2 core/generator.cpp
M +7 -7 core/generator.h
M +1 -1 core/generator_p.cpp
M +3 -3 core/generator_p.h
M +1 -1 core/global.h
M +1 -1 core/misc.cpp
M +1 -1 core/movie.cpp
M +1 -1 core/movie.h
M +1 -1 core/observer.h
M +10 -10 core/page.cpp
M +1 -1 core/page.h
M +1 -1 core/pagecontroller_p.h
M +3 -3 core/pagesize.h
M +1 -1 core/rotationjob.cpp
M +2 -2 core/rotationjob_p.h
M +1 -1 core/script/executor_kjs.cpp
M +1 -1 core/script/kjs_console.cpp
M +1 -1 core/script/kjs_document.cpp
M +1 -1 core/script/kjs_field.cpp
M +1 -1 core/script/kjs_spell.cpp
M +1 -1 core/scripter.cpp
M +1 -1 core/sound.cpp
M +2 -2 core/sound.h
M +2 -2 core/sourcereference.cpp
M +10 -10 core/textdocumentgenerator.cpp
M +3 -3 core/textdocumentgenerator_p.h
M +2 -0 core/textdocumentsettings_p.h
M +1 -1 core/textpage.cpp
M +2 -2 core/textpage.h
M +4 -4 core/textpage_p.h
M +1 -1 core/tilesmanager.cpp
M +1 -1 core/utils.cpp
M +2 -2 core/view_p.h
M +2 -2 generators/chm/generator_chm.h
M +1 -1 generators/chm/lib/ebook_epub.cpp
M +3 -3 generators/comicbook/debug_comicbook.h
M +4 -4 generators/comicbook/directory.cpp
M +1 -1 generators/comicbook/directory.h
M +3 -3 generators/comicbook/document.cpp
M +1 -1 generators/comicbook/document.h
M +2 -2 generators/comicbook/generator_comicbook.cpp
M +1 -1 generators/comicbook/qnatsort.h
M +6 -6 generators/comicbook/unrar.cpp
M +3 -3 generators/comicbook/unrar.h
M +2 -2 generators/comicbook/unrarflavours.cpp
M +1 -1 generators/comicbook/unrarflavours.h
M +7 -7 generators/djvu/generator_djvu.cpp
M +10 -10 generators/djvu/kdjvu.cpp
M +1 -1 generators/dvi/TeXFontDefinition.cpp
M +1 -1 generators/dvi/TeXFontDefinition.h
M +1 -1 generators/dvi/TeXFont_PFB.cpp
M +1 -1 generators/dvi/TeXFont_TFM.cpp
M +1 -1 generators/dvi/debug_dvi.h
M +1 -1 generators/dvi/dviFile.cpp
M +1 -1 generators/dvi/dviFile.h
M +1 -1 generators/dvi/dviRenderer.h
M +1 -1 generators/dvi/dviRenderer_draw.cpp
M +1 -1 generators/dvi/dviexport.cpp
M +1 -1 generators/dvi/dviexport.h
M +1 -1 generators/dvi/fontEncoding.cpp
M +1 -1 generators/dvi/fontMap.cpp
M +9 -9 generators/dvi/generator_dvi.cpp
M +1 -1 generators/dvi/pageSize.cpp
M +1 -1 generators/dvi/psgs.cpp
M +1 -1 generators/dvi/psgs.h
M +1 -1 generators/dvi/simplePageSize.cpp
M +1 -1 generators/dvi/util.cpp
M +4 -4 generators/epub/converter.cpp
M +1 -2 generators/epub/epubdocument.h
M +3 -2 generators/fax/faxdocument.cpp
M +1 -1 generators/fax/faxdocument.h
M +3 -2 generators/fax/faxexpand.cpp
M +1 -1 generators/fax/faxexpand.h
M +2 -2 generators/fax/generator_fax.cpp
M +1 -1 generators/fax/generator_fax.h
M +8 -8 generators/fictionbook/converter.cpp
M +1 -1 generators/fictionbook/document.cpp
M +4 -4 generators/fictionbook/document.h
M +1 -1 generators/kimgio/generator_kimgio.h
M +3 -3 generators/markdown/debug_md.h
M +7 -7 generators/mobipocket/converter.cpp
M +4 -4 generators/mobipocket/mobidocument.cpp
M +10 -10 generators/ooo/converter.cpp
M +2 -2 generators/ooo/converter.h
M +3 -3 generators/ooo/document.h
M +1 -1 generators/ooo/formatproperty.cpp
M +2 -2 generators/ooo/formatproperty.h
M +4 -4 generators/ooo/manifest.h
M +1 -1 generators/ooo/styleinformation.h
M +5 -5 generators/ooo/styleparser.cpp
M +5 -5 generators/plucker/generator_plucker.cpp
M +1 -1 generators/plucker/generator_plucker.h
M +2 -2 generators/plucker/unpluck/image.cpp
M +16 -17 generators/plucker/unpluck/qunpluck.cpp
M +4 -3 generators/plucker/unpluck/qunpluck.h
M +4 -3 generators/poppler/annots.cpp
M +3 -3 generators/poppler/debug_pdf.h
M +1 -1 generators/poppler/generator_pdf.cpp
M +6 -6 generators/spectre/generator_ghostview.cpp
M +2 -2 generators/tiff/generator_tiff.cpp
M +2 -2 generators/tiff/generator_tiff.h
M +2 -2 generators/txt/converter.cpp
M +3 -3 generators/txt/debug_txt.h
M +2 -2 generators/txt/document.cpp
M +5 -1 generators/txt/document.h
M +2 -2 generators/txt/generator_txt.h
M +1 -1 generators/xps/generator_xps.h
M +1 -1 interfaces/configinterface.h
M +1 -1 interfaces/guiinterface.h
M +1 -1 interfaces/printinterface.h
M +1 -1 interfaces/saveinterface.h
M +2 -2 interfaces/viewerinterface.h
M +1 -1 mobile/app/package/contents/ui/Bookmarks.qml
M +1 -1 mobile/components/test.qml
M +1 -1 mobile/components/testDocumentView.qml
M +4 -3 part.cpp
M +1 -1 shell/main.cpp
M +2 -2 shell/okular_main.cpp
M +5 -0 shell/okular_main.h
M +1 -1 shell/shell.h
M +1 -1 shell/shellutils.cpp
M +13 -13 ui/ktreeviewsearchline.cpp
M +1 -1 ui/latexrenderer.cpp
M +2 -2 ui/pageview.cpp
M +3 -3 ui/presentationwidget.cpp
M +1 -1 ui/snapshottaker.h

https://commits.kde.org/okular/c04ca1fa96d840a67b1d683065b0512e86886e5f

diff --git a/autotests/addremoveannotationtest.cpp b/autotests/addremoveannotationtest.cpp
index 10ce2b766..71931237a 100644
--- a/autotests/addremoveannotationtest.cpp
+++ b/autotests/addremoveannotationtest.cpp
@@ -182,7 +182,7 @@ void AddRemoveAnnotationTest::testRemoveAnnotations()
QString annot1Name = annot1->uniqueName();
annot1->setDisposeDataFunction( TestingUtils::AnnotationDisposeWatcher::disposeAnnotation );
TestingUtils::AnnotationDisposeWatcher::resetDisposedAnnotationName();
- QVERIFY( TestingUtils::AnnotationDisposeWatcher::disposedAnnotationName() == QString() );
+ QVERIFY( TestingUtils::AnnotationDisposeWatcher::disposedAnnotationName().isEmpty() );
m_document->closeDocument();
QVERIFY( TestingUtils::AnnotationDisposeWatcher::disposedAnnotationName() == annot1Name );
}
diff --git a/autotests/generatorstest.cpp b/autotests/generatorstest.cpp
index e8e196211..a8209dc99 100644
--- a/autotests/generatorstest.cpp
+++ b/autotests/generatorstest.cpp
@@ -7,7 +7,7 @@
* (at your option) any later version. *
***************************************************************************/

-#include <QtTest/QTest>
+#include <QTest>
#include <QDirIterator>
#include <QDebug>
#include <QStringList>
diff --git a/autotests/testingutils.cpp b/autotests/testingutils.cpp
index 49ab04b31..59fc3a83b 100644
--- a/autotests/testingutils.cpp
+++ b/autotests/testingutils.cpp
@@ -36,7 +36,7 @@ namespace TestingUtils
return !it1.hasNext() && !it2.hasNext();
}

- QString AnnotationDisposeWatcher::m_disposedAnnotationName = QString();
+ QString AnnotationDisposeWatcher::m_disposedAnnotationName = QString(); //krazy:exclude=nullstrassign

QString AnnotationDisposeWatcher::disposedAnnotationName() {
return m_disposedAnnotationName;
diff --git a/conf/editannottooldialog.cpp b/conf/editannottooldialog.cpp
index 18b81e1e5..cf79d83c9 100644
--- a/conf/editannottooldialog.cpp
+++ b/conf/editannottooldialog.cpp
@@ -15,8 +15,8 @@
#include <QListWidgetItem>
#include <QPushButton>
#include <QStackedWidget>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QDomDocument>
+#include <QDomElement>
#include <KConfigGroup>
#include <QDialogButtonBox>

diff --git a/conf/widgetannottools.cpp b/conf/widgetannottools.cpp
index cbc32064b..f94278a8e 100644
--- a/conf/widgetannottools.cpp
+++ b/conf/widgetannottools.cpp
@@ -18,8 +18,8 @@
#include <QHBoxLayout>
#include <QListWidget>
#include <QListWidgetItem>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QDomDocument>
+#include <QDomElement>
#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
diff --git a/conf/widgetdrawingtools.cpp b/conf/widgetdrawingtools.cpp
index 0fa0e9b6a..79f1e3f15 100644
--- a/conf/widgetdrawingtools.cpp
+++ b/conf/widgetdrawingtools.cpp
@@ -12,11 +12,11 @@
#include "editdrawingtooldialog.h"

#include <KLocalizedString>
+#include <KMessageBox>

#include <QDebug>
#include <QDomElement>
#include <QListWidgetItem>
-#include <QMessageBox>
#include <QPainter>

// Used to store tools' XML description in m_list's items
@@ -145,7 +145,7 @@ void WidgetDrawingTools::slotAdd()
{
QListWidgetItem * listEntry = m_list->item( i );
if (itemText == listEntry->text()) {
- QMessageBox::information( this, i18n("Duplicated Name"), i18n("There's already a tool with that name. Using a default one") );
+ KMessageBox::information( this, i18n("There's already a tool with that name. Using a default one"), i18n("Duplicated Name") );
itemText = defaultName();
break;
}
@@ -189,7 +189,7 @@ void WidgetDrawingTools::slotEdit()
{
QListWidgetItem * auxListEntry = m_list->item( i );
if (itemText == auxListEntry->text() && auxListEntry != listEntry) {
- QMessageBox::information( this, i18n("Duplicated Name"), i18n("There's already a tool with that name. Using a default one") );
+ KMessageBox::information( this, i18n("There's already a tool with that name. Using a default one"), i18n("Duplicated Name") );
itemText = defaultName();
break;
}
diff --git a/core/action.h b/core/action.h
index b3bb770d9..0b3ad370d 100644
--- a/core/action.h
+++ b/core/action.h
@@ -13,8 +13,8 @@
#include "global.h"
#include "okularcore_export.h"

-#include <QtCore/QString>
-#include <QtCore/QVariant>
+#include <QString>
+#include <QVariant>

namespace Okular {

diff --git a/core/annotations.cpp b/core/annotations.cpp
index d9f3fd439..3ac567063 100644
--- a/core/annotations.cpp
+++ b/core/annotations.cpp
@@ -11,8 +11,8 @@
#include "annotations_p.h"

// qt/kde includes
-#include <QtWidgets/QApplication>
-#include <QtGui/QColor>
+#include <QApplication>
+#include <QColor>

// DBL_MAX
#include <float.h>
diff --git a/core/annotations.h b/core/annotations.h
index d5771c8cc..5c9397cb1 100644
--- a/core/annotations.h
+++ b/core/annotations.h
@@ -10,13 +10,13 @@
#ifndef _OKULAR_ANNOTATIONS_H_
#define _OKULAR_ANNOTATIONS_H_

-#include <QtCore/QString>
-#include <QtCore/QDateTime>
-#include <QtCore/QLinkedList>
-#include <QtCore/QRect>
-#include <QtGui/QFont>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QString>
+#include <QDateTime>
+#include <QLinkedList>
+#include <QRect>
+#include <QFont>
+#include <QDomDocument>
+#include <QDomElement>

#include "okularcore_export.h"
#include "area.h"
diff --git a/core/annotations_p.h b/core/annotations_p.h
index bb6492de7..25dee11be 100644
--- a/core/annotations_p.h
+++ b/core/annotations_p.h
@@ -14,10 +14,10 @@
#include "annotations.h"

// qt/kde includes
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtGui/QColor>
+#include <QDateTime>
+#include <QString>
+#include <QVariant>
+#include <QColor>

class QTransform;

diff --git a/core/area.cpp b/core/area.cpp
index 327d43099..2a97b6d72 100644
--- a/core/area.cpp
+++ b/core/area.cpp
@@ -9,9 +9,9 @@

#include "area.h"

-#include <QtCore/QRect>
-#include <QtGui/QPolygonF>
-#include <QtCore/QDebug>
+#include <QRect>
+#include <QPolygonF>
+#include <QDebug>

#include <math.h>

diff --git a/core/area.h b/core/area.h
index 4299b003c..964f9da65 100644
--- a/core/area.h
+++ b/core/area.h
@@ -12,11 +12,11 @@

#include <math.h>

-#include <QtCore/QList>
-#include <QtGui/QColor>
-#include <QtGui/QPainterPath>
-#include <QtGui/QTransform>
-#include <QtCore/QDebug>
+#include <QList>
+#include <QColor>
+#include <QPainterPath>
+#include <QTransform>
+#include <QDebug>

#include "global.h"
#include "okularcore_export.h"
diff --git a/core/audioplayer.cpp b/core/audioplayer.cpp
index f66132384..8a8975384 100644
--- a/core/audioplayer.cpp
+++ b/core/audioplayer.cpp
@@ -13,7 +13,7 @@
// qt/kde includes
#include <qbuffer.h>
#include <qdir.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <krandom.h>
#include <phonon/path.h>
#include <phonon/audiooutput.h>
diff --git a/core/audioplayer.h b/core/audioplayer.h
index a221b031b..9b28be260 100644
--- a/core/audioplayer.h
+++ b/core/audioplayer.h
@@ -12,7 +12,7 @@

#include "okularcore_export.h"

-#include <QtCore/QObject>
+#include <QObject>

namespace Okular {

diff --git a/core/chooseenginedialog.cpp b/core/chooseenginedialog.cpp
index 2800d989c..06f44db3c 100644
--- a/core/chooseenginedialog.cpp
+++ b/core/chooseenginedialog.cpp
@@ -9,8 +9,8 @@

#include "chooseenginedialog_p.h"

-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QLabel>
+#include <QComboBox>
+#include <QLabel>

#include <KLocalizedString>
#include <QDialogButtonBox>
diff --git a/core/chooseenginedialog_p.h b/core/chooseenginedialog_p.h
index 9477ceb0f..f15cacee8 100644
--- a/core/chooseenginedialog_p.h
+++ b/core/chooseenginedialog_p.h
@@ -10,7 +10,7 @@
#ifndef _CHOOSEENGINEDIALOG_H
#define _CHOOSEENGINEDIALOG_H

-#include <QtCore/QStringList>
+#include <QStringList>

#include <QDialog>
#include <QMimeType>
diff --git a/core/debug_p.h b/core/debug_p.h
index ff302e4e8..e62f8f3a4 100644
--- a/core/debug_p.h
+++ b/core/debug_p.h
@@ -11,7 +11,7 @@
#ifndef OKULAR_DEBUG_P_H
#define OKULAR_DEBUG_P_H

-#include <QtCore/qloggingcategory.h>
+#include <qloggingcategory.h>

Q_DECLARE_LOGGING_CATEGORY(OkularCoreDebug)

diff --git a/core/document.cpp b/core/document.cpp
index 5e3c169fc..bffbcf86c 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -27,18 +27,18 @@
#endif

// qt/kde/system includes
-#include <QtCore/QtAlgorithms>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QMap>
-#include <QtCore/qtemporaryfile.h>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QLabel>
-#include <QtPrintSupport/QPrinter>
-#include <QtPrintSupport/QPrintDialog>
+#include <QtAlgorithms>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QMap>
+#include <qtemporaryfile.h>
+#include <QTextStream>
+#include <QTimer>
+#include <QApplication>
+#include <QLabel>
+#include <QPrinter>
+#include <QPrintDialog>
#include <QStack>
#include <QUndoCommand>
#include <QMimeDatabase>
@@ -94,8 +94,6 @@
#include "form.h"
#include "utils.h"

-#include <memory>
-
#include <config-okular.h>

#if HAVE_MALLOC_TRIM
diff --git a/core/document.h b/core/document.h
index 3354e55ae..7651291b5 100644
--- a/core/document.h
+++ b/core/document.h
@@ -19,11 +19,11 @@
#include "global.h"
#include "pagesize.h"

-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtPrintSupport/QPrinter>
-#include <QtXml/QDomDocument>
+#include <QObject>
+#include <QStringList>
+#include <QVector>
+#include <QPrinter>
+#include <QDomDocument>

#include <QMimeType>
#include <QUrl>
diff --git a/core/document_p.h b/core/document_p.h
index 631b86fe8..c47229118 100644
--- a/core/document_p.h
+++ b/core/document_p.h
@@ -16,11 +16,11 @@
#include "synctex/synctex_parser.h"

// qt/kde/system includes
-#include <QtCore/QHash>
-#include <QtCore/QLinkedList>
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
-#include <QtCore/QPointer>
+#include <QHash>
+#include <QLinkedList>
+#include <QMap>
+#include <QMutex>
+#include <QPointer>
#include <QUrl>
#include <KPluginMetaData>

diff --git a/core/documentcommands_p.h b/core/documentcommands_p.h
index 2f4cc2d7a..b17abdc93 100644
--- a/core/documentcommands_p.h
+++ b/core/documentcommands_p.h
@@ -13,7 +13,7 @@
#ifndef _OKULAR_DOCUMENT_COMMANDS_P_H_
#define _OKULAR_DOCUMENT_COMMANDS_P_H_

-#include <QtWidgets/QUndoCommand>
+#include <QUndoCommand>
#include <QDomNode>

#include "area.h"
diff --git a/core/fileprinter.cpp b/core/fileprinter.cpp
index c4d8fb415..cc476a2f2 100644
--- a/core/fileprinter.cpp
+++ b/core/fileprinter.cpp
@@ -12,19 +12,19 @@

#include "fileprinter.h"

-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
#include <QPrintEngine>
#include <QStringList>
#include <QSize>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QLabel>
-#include <QtGui/QShowEvent>
-#include <QtNetwork/QTcpSocket>
+#include <QFile>
+#include <QFileInfo>
+#include <QLabel>
+#include <QShowEvent>
+#include <QTcpSocket>

#include <KProcess>
#include <KShell>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QStandardPaths>

#include "debug_p.h"
diff --git a/core/fileprinter.h b/core/fileprinter.h
index a60c2c0f5..8e687bad7 100644
--- a/core/fileprinter.h
+++ b/core/fileprinter.h
@@ -14,9 +14,9 @@
#ifndef FILEPRINTER_H
#define FILEPRINTER_H

-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtPrintSupport/QPrinter>
+#include <QList>
+#include <QString>
+#include <QPrinter>

#include "okularcore_export.h"
#include "generator.h"
diff --git a/core/fontinfo.h b/core/fontinfo.h
index 42cfa56f3..b0f7fdb72 100644
--- a/core/fontinfo.h
+++ b/core/fontinfo.h
@@ -10,10 +10,10 @@
#ifndef _OKULAR_FONTINFO_H_
#define _OKULAR_FONTINFO_H_

-#include <QtCore/QList>
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
+#include <QList>
+#include <QMetaType>
+#include <QSharedDataPointer>
+#include <QString>

#include "okularcore_export.h"

diff --git a/core/form.cpp b/core/form.cpp
index 2071da0f2..3adceae27 100644
--- a/core/form.cpp
+++ b/core/form.cpp
@@ -11,7 +11,7 @@
#include "form_p.h"

// qt includes
-#include <QtCore/QVariant>
+#include <QVariant>

#include "action.h"

diff --git a/core/form.h b/core/form.h
index bcc41de43..16acb8ffd 100644
--- a/core/form.h
+++ b/core/form.h
@@ -14,7 +14,7 @@
#include "area.h"
#include "annotations.h"

-#include <QtCore/QStringList>
+#include <QStringList>

namespace Okular {

diff --git a/core/form_p.h b/core/form_p.h
index ff4e1211e..7e8389bf2 100644
--- a/core/form_p.h
+++ b/core/form_p.h
@@ -12,7 +12,7 @@

#include "form.h"

-#include <QtCore/QString>
+#include <QString>

namespace Okular {

diff --git a/core/generator.cpp b/core/generator.cpp
index 4c05620d6..f2af4612f 100644
--- a/core/generator.cpp
+++ b/core/generator.cpp
@@ -17,9 +17,9 @@

#include <QApplication>
#include <qeventloop.h>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QIcon>
#include <QMimeDatabase>
#include <QTimer>
diff --git a/core/generator.h b/core/generator.h
index 3146b6b07..ceaa43ced 100644
--- a/core/generator.h
+++ b/core/generator.h
@@ -21,13 +21,13 @@
#include "global.h"
#include "pagesize.h"

-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QSizeF>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
+#include <QList>
+#include <QObject>
+#include <QSharedDataPointer>
+#include <QSizeF>
+#include <QString>
+#include <QVariant>
+#include <QVector>

#include <QMimeType>
#include <kpluginfactory.h>
diff --git a/core/generator_p.cpp b/core/generator_p.cpp
index f884bf34e..57945c08d 100644
--- a/core/generator_p.cpp
+++ b/core/generator_p.cpp
@@ -9,7 +9,7 @@

#include "generator_p.h"

-#include <QtCore/QDebug>
+#include <QDebug>

#include "fontinfo.h"
#include "generator.h"
diff --git a/core/generator_p.h b/core/generator_p.h
index 8e1f05e47..62858a9eb 100644
--- a/core/generator_p.h
+++ b/core/generator_p.h
@@ -15,9 +15,9 @@

#include "area.h"

-#include <QtCore/QSet>
-#include <QtCore/QThread>
-#include <QtGui/QImage>
+#include <QSet>
+#include <QThread>
+#include <QImage>

class QEventLoop;
class QMutex;
diff --git a/core/global.h b/core/global.h
index 24cef77b4..93d76fe2f 100644
--- a/core/global.h
+++ b/core/global.h
@@ -10,7 +10,7 @@
#ifndef OKULAR_GLOBAL_H
#define OKULAR_GLOBAL_H

-#include <QtCore/QGlobalStatic>
+#include <QGlobalStatic>

namespace Okular {

diff --git a/core/misc.cpp b/core/misc.cpp
index 36b99e28a..17bdb7966 100644
--- a/core/misc.cpp
+++ b/core/misc.cpp
@@ -9,7 +9,7 @@

#include "core/misc.h"

-#include <QtCore/QDebug>
+#include <QDebug>

#include "debug_p.h"

diff --git a/core/movie.cpp b/core/movie.cpp
index 55de744b7..bf792b15f 100644
--- a/core/movie.cpp
+++ b/core/movie.cpp
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qtemporaryfile.h>

-#include <QtCore/QDebug>
+#include <QDebug>

#include "debug_p.h"

diff --git a/core/movie.h b/core/movie.h
index eecf0f573..1779347ec 100644
--- a/core/movie.h
+++ b/core/movie.h
@@ -14,7 +14,7 @@
#include "global.h"
#include "okularcore_export.h"

-#include <QtCore/QSize>
+#include <QSize>

class QImage;

diff --git a/core/observer.h b/core/observer.h
index 9e01c8707..9474b5192 100644
--- a/core/observer.h
+++ b/core/observer.h
@@ -14,7 +14,7 @@
#ifndef _OKULAR_DOCUMENTOBSERVER_H_
#define _OKULAR_DOCUMENTOBSERVER_H_

-#include <QtCore/QVector>
+#include <QVector>

#include "okularcore_export.h"

diff --git a/core/page.cpp b/core/page.cpp
index 7994cfe9f..c1410a597 100644
--- a/core/page.cpp
+++ b/core/page.cpp
@@ -14,16 +14,16 @@
#include "page_p.h"

// qt/kde includes
-#include <QtCore/QHash>
-#include <QtCore/QSet>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QUuid>
-#include <QtGui/QPixmap>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QHash>
+#include <QSet>
+#include <QString>
+#include <QVariant>
+#include <QUuid>
+#include <QPixmap>
+#include <QDomDocument>
+#include <QDomElement>

-#include <QtCore/QDebug>
+#include <QDebug>

// local includes
#include "action.h"
@@ -49,7 +49,7 @@
#include <limits>

#ifdef PAGE_PROFILE
-#include <QtCore/QTime>
+#include <QTime>
#endif

using namespace Okular;
diff --git a/core/page.h b/core/page.h
index 7324b2be4..b33f0e039 100644
--- a/core/page.h
+++ b/core/page.h
@@ -13,7 +13,7 @@
#ifndef _OKULAR_PAGE_H_
#define _OKULAR_PAGE_H_

-#include <QtCore/QLinkedList>
+#include <QLinkedList>

#include "okularcore_export.h"
#include "area.h"
diff --git a/core/pagecontroller_p.h b/core/pagecontroller_p.h
index 84beb5a05..fa1253beb 100644
--- a/core/pagecontroller_p.h
+++ b/core/pagecontroller_p.h
@@ -10,7 +10,7 @@
#ifndef _OKULAR_PAGECONTROLLER_P_H_
#define _OKULAR_PAGECONTROLLER_P_H_

-#include <QtCore/QObject>
+#include <QObject>

#include <threadweaver/queue.h>

diff --git a/core/pagesize.h b/core/pagesize.h
index 96bebeaa8..1ad479f93 100644
--- a/core/pagesize.h
+++ b/core/pagesize.h
@@ -10,9 +10,9 @@
#ifndef _OKULAR_PAGESIZE_H_
#define _OKULAR_PAGESIZE_H_

-#include <QtCore/QList>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
+#include <QList>
+#include <QSharedDataPointer>
+#include <QString>

#include "okularcore_export.h"

diff --git a/core/rotationjob.cpp b/core/rotationjob.cpp
index d34862446..e75942b06 100644
--- a/core/rotationjob.cpp
+++ b/core/rotationjob.cpp
@@ -9,7 +9,7 @@

#include "rotationjob_p.h"

-#include <QtGui/QTransform>
+#include <QTransform>

using namespace Okular;

diff --git a/core/rotationjob_p.h b/core/rotationjob_p.h
index b0662f549..d33ab0cef 100644
--- a/core/rotationjob_p.h
+++ b/core/rotationjob_p.h
@@ -10,8 +10,8 @@
#ifndef _OKULAR_ROTATIONJOB_P_H_
#define _OKULAR_ROTATIONJOB_P_H_

-#include <QtGui/QImage>
-#include <QtGui/QTransform>
+#include <QImage>
+#include <QTransform>

#include <threadweaver/qobjectdecorator.h>
#include <threadweaver/job.h>
diff --git a/core/script/executor_kjs.cpp b/core/script/executor_kjs.cpp
index b60e85170..8aab42b93 100644
--- a/core/script/executor_kjs.cpp
+++ b/core/script/executor_kjs.cpp
@@ -15,7 +15,7 @@
#include <kjs/kjsprototype.h>
#include <kjs/kjsarguments.h>

-#include <QtCore/QDebug>
+#include <QDebug>

#include "../debug_p.h"
#include "../document_p.h"
diff --git a/core/script/kjs_console.cpp b/core/script/kjs_console.cpp
index 55d1eb7f2..8412bcadc 100644
--- a/core/script/kjs_console.cpp
+++ b/core/script/kjs_console.cpp
@@ -14,7 +14,7 @@
#include <kjs/kjsprototype.h>
#include <kjs/kjsarguments.h>

-#include <QtCore/QDebug>
+#include <QDebug>

#include "../debug_p.h"

diff --git a/core/script/kjs_document.cpp b/core/script/kjs_document.cpp
index 097268ebe..f7971ebc2 100644
--- a/core/script/kjs_document.cpp
+++ b/core/script/kjs_document.cpp
@@ -16,7 +16,7 @@
#include <kjs/kjsprototype.h>
#include <kjs/kjsarguments.h>

-#include <QtCore/QDebug>
+#include <QDebug>
#include <assert.h>

#include "../document_p.h"
diff --git a/core/script/kjs_field.cpp b/core/script/kjs_field.cpp
index 8c98ca502..75f07b705 100644
--- a/core/script/kjs_field.cpp
+++ b/core/script/kjs_field.cpp
@@ -16,7 +16,7 @@

#include <qhash.h>

-#include <QtCore/QDebug>
+#include <QDebug>

#include "../debug_p.h"
#include "../document_p.h"
diff --git a/core/script/kjs_spell.cpp b/core/script/kjs_spell.cpp
index 7f43c2d0a..db1a1603a 100644
--- a/core/script/kjs_spell.cpp
+++ b/core/script/kjs_spell.cpp
@@ -13,7 +13,7 @@
#include <kjs/kjsobject.h>
#include <kjs/kjsprototype.h>

-#include <QtCore/QString>
+#include <QString>

using namespace Okular;

diff --git a/core/scripter.cpp b/core/scripter.cpp
index af499e098..46462793b 100644
--- a/core/scripter.cpp
+++ b/core/scripter.cpp
@@ -9,7 +9,7 @@

#include "scripter.h"

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QFile>

#include "debug_p.h"
diff --git a/core/sound.cpp b/core/sound.cpp
index f1e3b7c52..50d18dafd 100644
--- a/core/sound.cpp
+++ b/core/sound.cpp
@@ -9,7 +9,7 @@

#include "sound.h"

-#include <QtCore/QVariant>
+#include <QVariant>

using namespace Okular;

diff --git a/core/sound.h b/core/sound.h
index f412b6873..e71dbe8c0 100644
--- a/core/sound.h
+++ b/core/sound.h
@@ -12,8 +12,8 @@

#include "okularcore_export.h"

-#include <QtCore/QByteArray>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QString>

namespace Okular {

diff --git a/core/sourcereference.cpp b/core/sourcereference.cpp
index bde8bc1bd..eb109de45 100644
--- a/core/sourcereference.cpp
+++ b/core/sourcereference.cpp
@@ -10,8 +10,8 @@
#include "sourcereference.h"
#include "sourcereference_p.h"

-#include <QtCore/QString>
-#include <QtCore/QUrl>
+#include <QString>
+#include <QUrl>
#include <KLocalizedString>

using namespace Okular;
diff --git a/core/textdocumentgenerator.cpp b/core/textdocumentgenerator.cpp
index 78a571425..37286789a 100644
--- a/core/textdocumentgenerator.cpp
+++ b/core/textdocumentgenerator.cpp
@@ -10,16 +10,16 @@
#include "textdocumentgenerator.h"
#include "textdocumentgenerator_p.h"

-#include <QtCore/QFile>
-#include <QtCore/QMutex>
-#include <QtCore/QStack>
-#include <QtCore/QTextStream>
-#include <QtCore/QVector>
-#include <QtGui/QFontDatabase>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
-#include <QtPrintSupport/QPrinter>
-#include <QtGui/QTextDocumentWriter>
+#include <QFile>
+#include <QMutex>
+#include <QStack>
+#include <QTextStream>
+#include <QVector>
+#include <QFontDatabase>
+#include <QImage>
+#include <QPainter>
+#include <QPrinter>
+#include <QTextDocumentWriter>

#include "action.h"
#include "annotations.h"
diff --git a/core/textdocumentgenerator_p.h b/core/textdocumentgenerator_p.h
index df5431c43..1a4b869c5 100644
--- a/core/textdocumentgenerator_p.h
+++ b/core/textdocumentgenerator_p.h
@@ -10,9 +10,9 @@
#ifndef _OKULAR_TEXTDOCUMENTGENERATOR_P_H_
#define _OKULAR_TEXTDOCUMENTGENERATOR_P_H_

-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextDocument>
+#include <QAbstractTextDocumentLayout>
+#include <QTextBlock>
+#include <QTextDocument>

#include "action.h"
#include "document.h"
diff --git a/core/textdocumentsettings_p.h b/core/textdocumentsettings_p.h
index 5f09ba605..998156b0f 100644
--- a/core/textdocumentsettings_p.h
+++ b/core/textdocumentsettings_p.h
@@ -33,6 +33,8 @@ class TextDocumentSettingsWidgetPrivate

class TextDocumentSettingsPrivate : public QObject
{
+ Q_OBJECT
+
public:
TextDocumentSettingsPrivate(QObject *parent)
: QObject(parent)
diff --git a/core/textpage.cpp b/core/textpage.cpp
index 9622f5506..95de94762 100644
--- a/core/textpage.cpp
+++ b/core/textpage.cpp
@@ -10,7 +10,7 @@
#include "textpage.h"
#include "textpage_p.h"

-#include <QtCore/QDebug>
+#include <QDebug>

#include "area.h"
#include "debug_p.h"
diff --git a/core/textpage.h b/core/textpage.h
index f338d5a4f..a343f31e3 100644
--- a/core/textpage.h
+++ b/core/textpage.h
@@ -10,8 +10,8 @@
#ifndef _OKULAR_TEXTPAGE_H_
#define _OKULAR_TEXTPAGE_H_

-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>

#include "okularcore_export.h"
#include "global.h"
diff --git a/core/textpage_p.h b/core/textpage_p.h
index 6b68b51b3..758671241 100644
--- a/core/textpage_p.h
+++ b/core/textpage_p.h
@@ -11,10 +11,10 @@
#ifndef _OKULAR_TEXTPAGE_P_H_
#define _OKULAR_TEXTPAGE_P_H_

-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QPair>
-#include <QtGui/QTransform>
+#include <QList>
+#include <QMap>
+#include <QPair>
+#include <QTransform>

class SearchPoint;
class TinyTextEntity;
diff --git a/core/tilesmanager.cpp b/core/tilesmanager.cpp
index d20c1b1e0..7f3c7f2ac 100644
--- a/core/tilesmanager.cpp
+++ b/core/tilesmanager.cpp
@@ -9,7 +9,7 @@
#include "tilesmanager_p.h"

#include <QPixmap>
-#include <QtCore/qmath.h>
+#include <qmath.h>
#include <QList>
#include <QPainter>

diff --git a/core/utils.cpp b/core/utils.cpp
index 0789132ac..8733982d0 100644
--- a/core/utils.cpp
+++ b/core/utils.cpp
@@ -14,7 +14,7 @@
#include "debug_p.h"
#include "settings_core.h"

-#include <QtCore/QRect>
+#include <QRect>
#include <QApplication>
#include <QDesktopWidget>
#include <QImage>
diff --git a/core/view_p.h b/core/view_p.h
index 17a8b6999..53602803b 100644
--- a/core/view_p.h
+++ b/core/view_p.h
@@ -10,8 +10,8 @@
#ifndef OKULAR_VIEW_P_H
#define OKULAR_VIEW_P_H

-#include <QtCore/QHash>
-#include <QtCore/QString>
+#include <QHash>
+#include <QString>

namespace Okular {

diff --git a/generators/chm/generator_chm.h b/generators/chm/generator_chm.h
index 13fa7108f..728feeee4 100644
--- a/generators/chm/generator_chm.h
+++ b/generators/chm/generator_chm.h
@@ -8,8 +8,8 @@
* (at your option) any later version. *
***************************************************************************/

-#ifndef _OKULAR_CHMGENERATOR_H_
-#define _OKULAR_CHMGENERATOR_H_
+#ifndef _OKULAR_GENERATOR_CHM_H_
+#define _OKULAR_GENERATOR_CHM_H_

#include <core/document.h>
#include <core/generator.h>
diff --git a/generators/chm/lib/ebook_epub.cpp b/generators/chm/lib/ebook_epub.cpp
index 83a777339..f3d14402f 100644
--- a/generators/chm/lib/ebook_epub.cpp
+++ b/generators/chm/lib/ebook_epub.cpp
@@ -23,7 +23,7 @@
#endif

#include <QMessageBox>
-#include <QtXml/QXmlSimpleReader>
+#include <QXmlSimpleReader>

#include "ebook_epub.h"
#include "helperxmlhandler_epubcontainer.h"
diff --git a/generators/comicbook/debug_comicbook.h b/generators/comicbook/debug_comicbook.h
index 6abd4b3d9..69005c780 100644
--- a/generators/comicbook/debug_comicbook.h
+++ b/generators/comicbook/debug_comicbook.h
@@ -7,10 +7,10 @@
* (at your option) any later version. *
***************************************************************************/

-#ifndef OKULAR_COMICBOOK_DEBUG_P_H
-#define OKULAR_COMICBOOK_DEBUG_P_H
+#ifndef OKULAR_DEBUG_COMICBOOK_H
+#define OKULAR_DEBUG_COMICBOOK_H

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

Q_DECLARE_LOGGING_CATEGORY(OkularComicbookDebug)

diff --git a/generators/comicbook/directory.cpp b/generators/comicbook/directory.cpp
index 6ad1bab6c..cc705c986 100644
--- a/generators/comicbook/directory.cpp
+++ b/generators/comicbook/directory.cpp
@@ -10,10 +10,10 @@

#include "directory.h"

-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QFileInfo>

#include <memory>

diff --git a/generators/comicbook/directory.h b/generators/comicbook/directory.h
index 01dd473de..c0bd20b39 100644
--- a/generators/comicbook/directory.h
+++ b/generators/comicbook/directory.h
@@ -11,7 +11,7 @@
#ifndef DIRECTORY_H
#define DIRECTORY_H

-#include <QtCore/QStringList>
+#include <QStringList>

class QIODevice;

diff --git a/generators/comicbook/document.cpp b/generators/comicbook/document.cpp
index 8ba2d89c9..c59874427 100644
--- a/generators/comicbook/document.cpp
+++ b/generators/comicbook/document.cpp
@@ -9,9 +9,9 @@

#include "document.h"

-#include <QtCore/QScopedPointer>
-#include <QtGui/QImage>
-#include <QtGui/QImageReader>
+#include <QScopedPointer>
+#include <QImage>
+#include <QImageReader>

#include <KLocalizedString>
#include <QMimeType>
diff --git a/generators/comicbook/document.h b/generators/comicbook/document.h
index 22c321342..a7fe034c0 100644
--- a/generators/comicbook/document.h
+++ b/generators/comicbook/document.h
@@ -10,7 +10,7 @@
#ifndef COMICBOOK_DOCUMENT_H
#define COMICBOOK_DOCUMENT_H

-#include <QtCore/QStringList>
+#include <QStringList>

class KArchiveDirectory;
class KArchive;
diff --git a/generators/comicbook/generator_comicbook.cpp b/generators/comicbook/generator_comicbook.cpp
index 2687f9b59..2cc9063c8 100644
--- a/generators/comicbook/generator_comicbook.cpp
+++ b/generators/comicbook/generator_comicbook.cpp
@@ -9,8 +9,8 @@

#include "generator_comicbook.h"

-#include <QtGui/QPainter>
-#include <QtPrintSupport/QPrinter>
+#include <QPainter>
+#include <QPrinter>

#include <KAboutData>
#include <KLocalizedString>
diff --git a/generators/comicbook/qnatsort.h b/generators/comicbook/qnatsort.h
index eb63c79ac..00e7a697d 100644
--- a/generators/comicbook/qnatsort.h
+++ b/generators/comicbook/qnatsort.h
@@ -22,7 +22,7 @@
#ifndef QNATSORT_H
#define QNATSORT_H

-#include <QtCore/QString>
+#include <QString>

/**
* The two methods can be used in qSort to sort strings which contain
diff --git a/generators/comicbook/unrar.cpp b/generators/comicbook/unrar.cpp
index 587a3c125..fb8318af5 100644
--- a/generators/comicbook/unrar.cpp
+++ b/generators/comicbook/unrar.cpp
@@ -9,14 +9,14 @@

#include "unrar.h"

-#include <QtCore/QEventLoop>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QRegExp>
-#include <QtCore/QGlobalStatic>
+#include <QEventLoop>
+#include <QFile>
+#include <QFileInfo>
+#include <QRegExp>
+#include <QGlobalStatic>
#include <QTemporaryDir>

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#if defined(WITH_KPTY)
#include <KPty/kptyprocess.h>
#include <KPty/kptydevice.h>
diff --git a/generators/comicbook/unrar.h b/generators/comicbook/unrar.h
index e528b7ba8..cf5e7f220 100644
--- a/generators/comicbook/unrar.h
+++ b/generators/comicbook/unrar.h
@@ -10,9 +10,9 @@
#ifndef UNRAR_H
#define UNRAR_H

-#include <QtCore/QObject>
-#include <QtCore/QProcess>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QProcess>
+#include <QStringList>

class QEventLoop;
class QTemporaryDir;
diff --git a/generators/comicbook/unrarflavours.cpp b/generators/comicbook/unrarflavours.cpp
index 7119a46bd..9e591e453 100644
--- a/generators/comicbook/unrarflavours.cpp
+++ b/generators/comicbook/unrarflavours.cpp
@@ -9,8 +9,8 @@

#include "unrarflavours.h"

-#include <QtCore/QRegExp>
-#include <QtCore/QStringList>
+#include <QRegExp>
+#include <QStringList>

UnrarFlavour::UnrarFlavour()
{
diff --git a/generators/comicbook/unrarflavours.h b/generators/comicbook/unrarflavours.h
index f72bdc3e6..cb6333d92 100644
--- a/generators/comicbook/unrarflavours.h
+++ b/generators/comicbook/unrarflavours.h
@@ -10,7 +10,7 @@
#ifndef UNRARFLAVOURS_H
#define UNRARFLAVOURS_H

-#include <QtCore/QString>
+#include <QString>

class QStringList;

diff --git a/generators/djvu/generator_djvu.cpp b/generators/djvu/generator_djvu.cpp
index 644f746ca..391210014 100644
--- a/generators/djvu/generator_djvu.cpp
+++ b/generators/djvu/generator_djvu.cpp
@@ -18,17 +18,17 @@
#include <core/utils.h>
#include <core/fileprinter.h>

-#include <qdom.h>
-#include <qmutex.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <quuid.h>
+#include <QDomDocument>
+#include <QMutex>
+#include <QPixmap>
+#include <QString>
+#include <QUuid>
#include <QPrinter>

#include <KAboutData>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>
-#include <qtemporaryfile.h>
+#include <QTemporaryFile>
#include <QDir>

static void recurseCreateTOC( QDomDocument &maindoc, const QDomNode &parent, QDomNode &parentDestination, KDjVu *djvu )
diff --git a/generators/djvu/kdjvu.cpp b/generators/djvu/kdjvu.cpp
index e107fc738..b629a6645 100644
--- a/generators/djvu/kdjvu.cpp
+++ b/generators/djvu/kdjvu.cpp
@@ -9,16 +9,16 @@

#include "kdjvu.h"

-#include <qbytearray.h>
-#include <qdom.h>
-#include <qfile.h>
-#include <qhash.h>
-#include <qlist.h>
-#include <qpainter.h>
-#include <qqueue.h>
-#include <qstring.h>
-
-#include <QtCore/QDebug>
+#include <QByteArray>
+#include <QDomDocument>
+#include <QFile>
+#include <QHash>
+#include <QList>
+#include <QPainter>
+#include <QQueue>
+#include <QString>
+
+#include <QDebug>
#include <KLocalizedString>

#include <libdjvu/ddjvuapi.h>
diff --git a/generators/dvi/TeXFontDefinition.cpp b/generators/dvi/TeXFontDefinition.cpp
index f15d8d1b0..78d7eda90 100644
--- a/generators/dvi/TeXFontDefinition.cpp
+++ b/generators/dvi/TeXFontDefinition.cpp
@@ -14,7 +14,7 @@

#include <KLocalizedString>

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QFile>

extern const int MFResolutions[];
diff --git a/generators/dvi/TeXFontDefinition.h b/generators/dvi/TeXFontDefinition.h
index 4d0789281..0b209865a 100644
--- a/generators/dvi/TeXFontDefinition.h
+++ b/generators/dvi/TeXFontDefinition.h
@@ -16,7 +16,7 @@
#define _FONT_H

#include <QHash>
-#include <QtCore/qstring.h>
+#include <QString>

class dviRenderer;
class TeXFont;
diff --git a/generators/dvi/TeXFont_PFB.cpp b/generators/dvi/TeXFont_PFB.cpp
index 38cc7d1e6..d3cac2fed 100644
--- a/generators/dvi/TeXFont_PFB.cpp
+++ b/generators/dvi/TeXFont_PFB.cpp
@@ -20,7 +20,7 @@

#include <KLocalizedString>

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QImage>

//#define DEBUG_PFB 1
diff --git a/generators/dvi/TeXFont_TFM.cpp b/generators/dvi/TeXFont_TFM.cpp
index a55c6deaf..14a31fdcb 100644
--- a/generators/dvi/TeXFont_TFM.cpp
+++ b/generators/dvi/TeXFont_TFM.cpp
@@ -12,7 +12,7 @@
#include "debug_dvi.h"
#include "debug_dvi.h"

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QDataStream>
#include <QFile>

diff --git a/generators/dvi/debug_dvi.h b/generators/dvi/debug_dvi.h
index cae7b2f56..16b650795 100644
--- a/generators/dvi/debug_dvi.h
+++ b/generators/dvi/debug_dvi.h
@@ -11,7 +11,7 @@
#ifndef OKULAR_DVI_DEBUG_P_H
#define OKULAR_DVI_DEBUG_P_H

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

Q_DECLARE_LOGGING_CATEGORY(OkularDviDebug)
Q_DECLARE_LOGGING_CATEGORY(OkularDviShellDebug)
diff --git a/generators/dvi/dviFile.cpp b/generators/dvi/dviFile.cpp
index 0874ca667..75dfe7496 100644
--- a/generators/dvi/dviFile.cpp
+++ b/generators/dvi/dviFile.cpp
@@ -61,7 +61,7 @@

#include <KLocalizedString>

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QProcess>
#include <QSysInfo>
#include <QTemporaryFile>
diff --git a/generators/dvi/dviFile.h b/generators/dvi/dviFile.h
index 1f65ff09b..6a0b0b56a 100644
--- a/generators/dvi/dviFile.h
+++ b/generators/dvi/dviFile.h
@@ -16,7 +16,7 @@
#include <QHash>
#include <QMap>
#include <QVector>
-#include <QtCore/qstring.h>
+#include <QString>

class fontPool;
class pageSize;
diff --git a/generators/dvi/dviRenderer.h b/generators/dvi/dviRenderer.h
index 8b62edbbf..189039ec2 100644
--- a/generators/dvi/dviRenderer.h
+++ b/generators/dvi/dviRenderer.h
@@ -29,7 +29,7 @@
#include <QVector>
#include <QTimer>
#include <QMutex>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>

class Anchor;
class DocumentWidget;
diff --git a/generators/dvi/dviRenderer_draw.cpp b/generators/dvi/dviRenderer_draw.cpp
index d6ed17dda..70e915fc4 100644
--- a/generators/dvi/dviRenderer_draw.cpp
+++ b/generators/dvi/dviRenderer_draw.cpp
@@ -69,7 +69,7 @@
#include <KLocalizedString>

#include <QPainter>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>



diff --git a/generators/dvi/dviexport.cpp b/generators/dvi/dviexport.cpp
index 63e8b766b..4e9d33dc6 100644
--- a/generators/dvi/dviexport.cpp
+++ b/generators/dvi/dviexport.cpp
@@ -33,7 +33,7 @@
#include <QEventLoop>
#include <QFileInfo>
#include <QLabel>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
#include <QTemporaryFile>

#include <cassert>
diff --git a/generators/dvi/dviexport.h b/generators/dvi/dviexport.h
index a15197e8d..63b6d3f07 100644
--- a/generators/dvi/dviexport.h
+++ b/generators/dvi/dviexport.h
@@ -22,7 +22,7 @@
#include <QExplicitlySharedDataPointer>

#include <QObject>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>


class dviRenderer;
diff --git a/generators/dvi/fontEncoding.cpp b/generators/dvi/fontEncoding.cpp
index b51ea363e..c3da59ebe 100644
--- a/generators/dvi/fontEncoding.cpp
+++ b/generators/dvi/fontEncoding.cpp
@@ -13,7 +13,7 @@
#include "fontEncoding.h"
#include "debug_dvi.h"

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QFile>
#include <QProcess>
#include <QTextStream>
diff --git a/generators/dvi/fontMap.cpp b/generators/dvi/fontMap.cpp
index f6d19fc7a..f6d7c3864 100644
--- a/generators/dvi/fontMap.cpp
+++ b/generators/dvi/fontMap.cpp
@@ -12,7 +12,7 @@

#include "fontMap.h"
#include "debug_dvi.h"
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QFile>
#include <QProcess>
#include <QTextStream>
diff --git a/generators/dvi/generator_dvi.cpp b/generators/dvi/generator_dvi.cpp
index 16a64f940..d9fe8341f 100644
--- a/generators/dvi/generator_dvi.cpp
+++ b/generators/dvi/generator_dvi.cpp
@@ -23,17 +23,17 @@
#include "dviexport.h"
#include "TeXFont.h"

-#include <qapplication.h>
-#include <qdir.h>
-#include <qstring.h>
-#include <qurl.h>
-#include <qvector.h>
-#include <qstack.h>
-#include <qtemporaryfile.h>
-#include <qmutex.h>
+#include <QApplication>
+#include <QDir>
+#include <QString>
+#include <QUrl>
+#include <QVector>
+#include <QStack>
+#include <QTemporaryFile>
+#include <QMutex>

#include <KAboutData>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>

#ifdef DVI_OPEN_BUSYLOOP
diff --git a/generators/dvi/pageSize.cpp b/generators/dvi/pageSize.cpp
index 1ae72068d..6c380bc96 100644
--- a/generators/dvi/pageSize.cpp
+++ b/generators/dvi/pageSize.cpp
@@ -14,7 +14,7 @@

#include <KLocalizedString>

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

struct pageSizeItem
{
diff --git a/generators/dvi/psgs.cpp b/generators/dvi/psgs.cpp
index 7a404b9d7..fec91b97b 100644
--- a/generators/dvi/psgs.cpp
+++ b/generators/dvi/psgs.cpp
@@ -21,7 +21,7 @@
#include <qtemporaryfile.h>
#include <QUrl>

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QDir>
#include <QPainter>
#include <QPixmap>
diff --git a/generators/dvi/psgs.h b/generators/dvi/psgs.h
index 14fe4384b..f021945fb 100644
--- a/generators/dvi/psgs.h
+++ b/generators/dvi/psgs.h
@@ -12,7 +12,7 @@

#include <QApplication>
#include <QColor>
-#include <QtGui/qevent.h>
+#include <QEvent>
#include <QHash>
#include <QObject>

diff --git a/generators/dvi/simplePageSize.cpp b/generators/dvi/simplePageSize.cpp
index 61687c6e6..e7e6f4d29 100644
--- a/generators/dvi/simplePageSize.cpp
+++ b/generators/dvi/simplePageSize.cpp
@@ -11,7 +11,7 @@
#include "simplePageSize.h"
#include "debug_dvi.h"

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QPaintDevice>


diff --git a/generators/dvi/util.cpp b/generators/dvi/util.cpp
index 4557eaa88..7a993aa9e 100644
--- a/generators/dvi/util.cpp
+++ b/generators/dvi/util.cpp
@@ -61,7 +61,7 @@

#include <cstdlib>

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

/*
* General utility routines.
diff --git a/generators/epub/converter.cpp b/generators/epub/converter.cpp
index ade26a049..071951800 100644
--- a/generators/epub/converter.cpp
+++ b/generators/epub/converter.cpp
@@ -9,14 +9,14 @@

#include "converter.h"

-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
+#include <QAbstractTextDocumentLayout>
+#include <QTextDocument>
+#include <QTextFrame>
#include <QTextDocumentFragment>
#include <QFileInfo>
#include <QApplication> // Because of the HACK

-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>


diff --git a/generators/epub/epubdocument.h b/generators/epub/epubdocument.h
index da261ab6c..e823e3d06 100644
--- a/generators/epub/epubdocument.h
+++ b/generators/epub/epubdocument.h
@@ -14,9 +14,8 @@
#include <QUrl>
#include <QVariant>
#include <QImage>
-#include <QUrl>
#include <epub.h>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

namespace Epub {

diff --git a/generators/fax/faxdocument.cpp b/generators/fax/faxdocument.cpp
index ad63273cf..cdeb41a6a 100644
--- a/generators/fax/faxdocument.cpp
+++ b/generators/fax/faxdocument.cpp
@@ -7,12 +7,13 @@
* (at your option) any later version. *
***************************************************************************/

+#include "faxdocument.h"
+
#include <stdlib.h>

-#include <QtCore/QFile>
+#include <QFile>

#include "faxexpand.h"
-#include "faxdocument.h"

static const char FAXMAGIC[] = "\000PC Research, Inc\000\000\000\000\000\000";

diff --git a/generators/fax/faxdocument.h b/generators/fax/faxdocument.h
index e917895a2..b45a37ddd 100644
--- a/generators/fax/faxdocument.h
+++ b/generators/fax/faxdocument.h
@@ -10,7 +10,7 @@
#ifndef FAXDOCUMENT_H
#define FAXDOCUMENT_H

-#include <QtGui/QImage>
+#include <QImage>

/**
* Loads a G3/G4 fax document and provides methods
diff --git a/generators/fax/faxexpand.cpp b/generators/fax/faxexpand.cpp
index c551c7d60..11a1f68ea 100644
--- a/generators/fax/faxexpand.cpp
+++ b/generators/fax/faxexpand.cpp
@@ -17,13 +17,14 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */

+#include "faxexpand.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>

-#include <QtCore/QDebug>
+#include <QDebug>

-#include "faxexpand.h"
#include "fax_debug.h"
//Uncomment this for verbose debug output
//#define DEBUG_FAX
diff --git a/generators/fax/faxexpand.h b/generators/fax/faxexpand.h
index 9203187c1..b874de32f 100644
--- a/generators/fax/faxexpand.h
+++ b/generators/fax/faxexpand.h
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
#ifndef _faxexpand_h_
#define _faxexpand_h_

-#include <QtGui/QImage>
+#include <QImage>

#include <sys/types.h>
#ifndef Q_OS_WIN
diff --git a/generators/fax/generator_fax.cpp b/generators/fax/generator_fax.cpp
index 5bbbbd3cd..8e5eae062 100644
--- a/generators/fax/generator_fax.cpp
+++ b/generators/fax/generator_fax.cpp
@@ -9,8 +9,8 @@

#include "generator_fax.h"

-#include <QtGui/QPainter>
-#include <QtPrintSupport/QPrinter>
+#include <QPainter>
+#include <QPrinter>

#include <KAboutData>
#include <KLocalizedString>
diff --git a/generators/fax/generator_fax.h b/generators/fax/generator_fax.h
index 048d176d5..9a2179e55 100644
--- a/generators/fax/generator_fax.h
+++ b/generators/fax/generator_fax.h
@@ -12,7 +12,7 @@

#include <core/generator.h>

-#include <QtGui/QImage>
+#include <QImage>

#include "faxdocument.h"

diff --git a/generators/fictionbook/converter.cpp b/generators/fictionbook/converter.cpp
index 1bdb4aa83..0cf2babcb 100644
--- a/generators/fictionbook/converter.cpp
+++ b/generators/fictionbook/converter.cpp
@@ -9,14 +9,14 @@

#include "converter.h"

-#include <QtCore/QDate>
-#include <QtCore/QUrl>
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomText>
+#include <QDate>
+#include <QUrl>
+#include <QAbstractTextDocumentLayout>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextFrame>
+#include <QDomElement>
+#include <QDomText>

#include <KLocalizedString>

diff --git a/generators/fictionbook/document.cpp b/generators/fictionbook/document.cpp
index 49c4aaabc..df5bf3970 100644
--- a/generators/fictionbook/document.cpp
+++ b/generators/fictionbook/document.cpp
@@ -9,7 +9,7 @@

#include "document.h"

-#include <QtCore/QFile>
+#include <QFile>

#include <KLocalizedString>
#include <kzip.h>
diff --git a/generators/fictionbook/document.h b/generators/fictionbook/document.h
index 0abf5848e..de0b83260 100644
--- a/generators/fictionbook/document.h
+++ b/generators/fictionbook/document.h
@@ -10,10 +10,10 @@
#ifndef FICTIONBOOK_DOCUMENT_H
#define FICTIONBOOK_DOCUMENT_H

-#include <QtCore/QByteArray>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtXml/QDomDocument>
+#include <QByteArray>
+#include <QMap>
+#include <QString>
+#include <QDomDocument>

namespace FictionBook {

diff --git a/generators/kimgio/generator_kimgio.h b/generators/kimgio/generator_kimgio.h
index bd09bbed0..2242b121f 100644
--- a/generators/kimgio/generator_kimgio.h
+++ b/generators/kimgio/generator_kimgio.h
@@ -16,7 +16,7 @@
#include <core/generator.h>
#include <core/document.h>

-#include <QtGui/QImage>
+#include <QImage>

class KIMGIOGenerator : public Okular::Generator
{
diff --git a/generators/markdown/debug_md.h b/generators/markdown/debug_md.h
index 9c06d7742..cab7ec487 100644
--- a/generators/markdown/debug_md.h
+++ b/generators/markdown/debug_md.h
@@ -9,10 +9,10 @@
* (at your option) any later version. *
***************************************************************************/

-#ifndef OKULAR_MD_DEBUG_P_H
-#define OKULAR_MD_DEBUG_P_H
+#ifndef OKULAR_DEBUG_MD_H
+#define OKULAR_DEBUG_MD_H

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

Q_DECLARE_LOGGING_CATEGORY(OkularMdDebug)

diff --git a/generators/mobipocket/converter.cpp b/generators/mobipocket/converter.cpp
index 09ac087bd..9888a1ec9 100644
--- a/generators/mobipocket/converter.cpp
+++ b/generators/mobipocket/converter.cpp
@@ -9,13 +9,13 @@

#include "converter.h"

-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextFrame>
-#include <QtGui/QTextDocumentFragment>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
+#include <QAbstractTextDocumentLayout>
+#include <QTextDocument>
+#include <QTextBlock>
+#include <QTextFrame>
+#include <QTextDocumentFragment>
+#include <QDebug>
+#include <QFile>

#include <KLocalizedString>
#include <core/action.h>
diff --git a/generators/mobipocket/mobidocument.cpp b/generators/mobipocket/mobidocument.cpp
index c3b1f81d3..d89d5580a 100644
--- a/generators/mobipocket/mobidocument.cpp
+++ b/generators/mobipocket/mobidocument.cpp
@@ -9,10 +9,10 @@
#include "mobidocument.h"
#include <qmobipocket/mobipocket.h>
#include <qmobipocket/qfilestream.h>
-#include <QtGui/QColor>
-#include <QtCore/QFile>
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
+#include <QColor>
+#include <QFile>
+#include <QRegExp>
+#include <QDebug>
#include <QApplication> // Because of the HACK
#include <QPalette> // Because of the HACK

diff --git a/generators/ooo/converter.cpp b/generators/ooo/converter.cpp
index 202e14071..159a94f8e 100644
--- a/generators/ooo/converter.cpp
+++ b/generators/ooo/converter.cpp
@@ -9,16 +9,16 @@

#include "converter.h"

-#include <QtCore/QQueue>
-#include <QtCore/QUrl>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
-#include <QtGui/QTextList>
-#include <QtGui/QTextTableCell>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomText>
-#include <QtXml/QXmlSimpleReader>
+#include <QQueue>
+#include <QUrl>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextFrame>
+#include <QTextList>
+#include <QTextTableCell>
+#include <QDomElement>
+#include <QDomText>
+#include <QXmlSimpleReader>

#include <core/action.h>
#include <core/annotations.h>
diff --git a/generators/ooo/converter.h b/generators/ooo/converter.h
index 05cb12a70..056028803 100644
--- a/generators/ooo/converter.h
+++ b/generators/ooo/converter.h
@@ -10,8 +10,8 @@
#ifndef OOO_CONVERTER_H
#define OOO_CONVERTER_H

-#include <QtGui/QTextCharFormat>
-#include <QtXml/QDomDocument>
+#include <QTextCharFormat>
+#include <QDomDocument>

#include <core/textdocumentgenerator.h>

diff --git a/generators/ooo/document.h b/generators/ooo/document.h
index f1dc033fc..9c6bc97f6 100644
--- a/generators/ooo/document.h
+++ b/generators/ooo/document.h
@@ -10,9 +10,9 @@
#ifndef OOO_DOCUMENT_H
#define OOO_DOCUMENT_H

-#include <QtCore/QByteArray>
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QMap>
+#include <QString>

#include "manifest.h"

diff --git a/generators/ooo/formatproperty.cpp b/generators/ooo/formatproperty.cpp
index f3dfbb477..4d1eed557 100644
--- a/generators/ooo/formatproperty.cpp
+++ b/generators/ooo/formatproperty.cpp
@@ -9,7 +9,7 @@

#include "formatproperty.h"

-#include <QtGui/QTextFormat>
+#include <QTextFormat>

#include "styleinformation.h"

diff --git a/generators/ooo/formatproperty.h b/generators/ooo/formatproperty.h
index 279e3ee3b..268066906 100644
--- a/generators/ooo/formatproperty.h
+++ b/generators/ooo/formatproperty.h
@@ -10,8 +10,8 @@
#ifndef OOO_FORMATPROPERTY_H
#define OOO_FORMATPROPERTY_H

-#include <QtCore/QVector>
-#include <QtGui/QColor>
+#include <QVector>
+#include <QColor>

class QTextBlockFormat;
class QTextCharFormat;
diff --git a/generators/ooo/manifest.h b/generators/ooo/manifest.h
index f1b0d5e13..fb5565664 100644
--- a/generators/ooo/manifest.h
+++ b/generators/ooo/manifest.h
@@ -10,15 +10,15 @@
#ifndef OOO_MANIFEST_H
#define OOO_MANIFEST_H

-#include <QtCore/QByteArray>
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QMap>
+#include <QString>

#ifdef QCA2
#include <QtCrypto>
#endif

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

Q_DECLARE_LOGGING_CATEGORY(OkularOooDebug)

diff --git a/generators/ooo/styleinformation.h b/generators/ooo/styleinformation.h
index b21826513..7f5b5ce46 100644
--- a/generators/ooo/styleinformation.h
+++ b/generators/ooo/styleinformation.h
@@ -10,7 +10,7 @@
#ifndef OOO_STYLEINFORMATION_H
#define OOO_STYLEINFORMATION_H

-#include <QtCore/QMap>
+#include <QMap>

#include "formatproperty.h"

diff --git a/generators/ooo/styleparser.cpp b/generators/ooo/styleparser.cpp
index 4277a5359..70fd4712a 100644
--- a/generators/ooo/styleparser.cpp
+++ b/generators/ooo/styleparser.cpp
@@ -9,11 +9,11 @@

#include "styleparser.h"

-#include <QtCore/QDateTime>
-#include <QtGui/QFont>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QXmlSimpleReader>
+#include <QDateTime>
+#include <QFont>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QXmlSimpleReader>

#include <KLocalizedString>

diff --git a/generators/plucker/generator_plucker.cpp b/generators/plucker/generator_plucker.cpp
index 25f8e4978..85c205cea 100644
--- a/generators/plucker/generator_plucker.cpp
+++ b/generators/plucker/generator_plucker.cpp
@@ -9,11 +9,11 @@

#include "generator_plucker.h"

-#include <QtCore/QFile>
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QPainter>
-#include <QtPrintSupport/QPrinter>
-#include <QtGui/QTextDocument>
+#include <QFile>
+#include <QAbstractTextDocumentLayout>
+#include <QPainter>
+#include <QPrinter>
+#include <QTextDocument>

#include <KAboutData>
#include <KLocalizedString>
diff --git a/generators/plucker/generator_plucker.h b/generators/plucker/generator_plucker.h
index 11d714d87..2de7e1835 100644
--- a/generators/plucker/generator_plucker.h
+++ b/generators/plucker/generator_plucker.h
@@ -13,7 +13,7 @@
#include <core/document.h>
#include <core/generator.h>

-#include <QtGui/QTextBlock>
+#include <QTextBlock>

#include "qunpluck.h"

diff --git a/generators/plucker/unpluck/image.cpp b/generators/plucker/unpluck/image.cpp
index 9179c0e44..5ab1c6e34 100644
--- a/generators/plucker/unpluck/image.cpp
+++ b/generators/plucker/unpluck/image.cpp
@@ -9,8 +9,8 @@
* (at your option) any later version. *
***************************************************************************/

-#include <QtCore/QTemporaryFile>
-#include <QtGui/QImage>
+#include <QTemporaryFile>
+#include <QImage>

#include <stdio.h>
#include <stdlib.h>
diff --git a/generators/plucker/unpluck/qunpluck.cpp b/generators/plucker/unpluck/qunpluck.cpp
index 59ad74d73..9176c9d30 100644
--- a/generators/plucker/unpluck/qunpluck.cpp
+++ b/generators/plucker/unpluck/qunpluck.cpp
@@ -9,27 +9,26 @@
* (at your option) any later version. *
***************************************************************************/

-#include <QtCore/QDateTime>
-#include <QtCore/QFile>
-#include <QtCore/QHash>
-#include <QtCore/QStack>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtCore/QDateTime>
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QFont>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextCharFormat>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
-
-#include <QtWidgets/QLabel>
+#include "qunpluck.h"
+
+#include <QDateTime>
+#include <QFile>
+#include <QHash>
+#include <QStack>
+#include <QString>
+#include <QUrl>
+#include <QDateTime>
+#include <QAbstractTextDocumentLayout>
+#include <QFont>
+#include <QTextCharFormat>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextFrame>
+#include <QLabel>

#include <core/action.h>
#include <core/document.h>

-#include "qunpluck.h"
#include "image.h"

#define GET_FUNCTION_CODE_TYPE(x) (((x)>>3) & 0x1F)
diff --git a/generators/plucker/unpluck/qunpluck.h b/generators/plucker/unpluck/qunpluck.h
index fdbc5d769..e1caf5f4b 100644
--- a/generators/plucker/unpluck/qunpluck.h
+++ b/generators/plucker/unpluck/qunpluck.h
@@ -12,9 +12,10 @@
#ifndef QUNPLUCK_H
#define QUNPLUCK_H

-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtGui/QImage>
+#include <QList>
+#include <QMap>
+#include <QImage>
+#include <QTextBlock>

#include "unpluck.h"

diff --git a/generators/poppler/annots.cpp b/generators/poppler/annots.cpp
index a24539e75..a195a0714 100644
--- a/generators/poppler/annots.cpp
+++ b/generators/poppler/annots.cpp
@@ -11,16 +11,17 @@
* (at your option) any later version. *
***************************************************************************/

+#include "annots.h"
+
#include <poppler-annotation.h>

// qt/kde includes
-#include <QtCore/qloggingcategory.h>
-#include <qvariant.h>
+#include <QLoggingCategory>
+#include <QVariant>

#include <core/annotations.h>
#include <core/area.h>

-#include "annots.h"
#include "debug_pdf.h"
#include "generator_pdf.h"
#include "popplerembeddedfile.h"
diff --git a/generators/poppler/debug_pdf.h b/generators/poppler/debug_pdf.h
index 7e3d61d57..039579035 100644
--- a/generators/poppler/debug_pdf.h
+++ b/generators/poppler/debug_pdf.h
@@ -7,10 +7,10 @@
* (at your option) any later version. *
***************************************************************************/

-#ifndef OKULAR_DEBUG_P_H
-#define OKULAR_DEBUG_P_H
+#ifndef OKULAR_DEBUG_PDF_H
+#define OKULAR_DEBUG_PDF_H

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

Q_DECLARE_LOGGING_CATEGORY(OkularPdfDebug)

diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 2c5e6c6e0..d2066b1e0 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -29,7 +29,7 @@
#include <QPrinter>
#include <QPainter>
#include <QTimer>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <KAboutData>
#include <kconfigdialog.h>
diff --git a/generators/spectre/generator_ghostview.cpp b/generators/spectre/generator_ghostview.cpp
index b990c699e..866c738d9 100644
--- a/generators/spectre/generator_ghostview.cpp
+++ b/generators/spectre/generator_ghostview.cpp
@@ -11,18 +11,18 @@

#include <math.h>

-#include <qfile.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qsize.h>
+#include <QFile>
+#include <QPainter>
+#include <QPixmap>
+#include <QSize>
#include <QPrinter>

#include <KAboutData>
#include <kconfigdialog.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QMimeType>
#include <QMimeDatabase>
-#include <qtemporaryfile.h>
+#include <QTemporaryFile>
#include <QDir>
#include <KLocalizedString>

diff --git a/generators/tiff/generator_tiff.cpp b/generators/tiff/generator_tiff.cpp
index 27a921f20..9f122dbc7 100644
--- a/generators/tiff/generator_tiff.cpp
+++ b/generators/tiff/generator_tiff.cpp
@@ -16,10 +16,10 @@
#include <qimage.h>
#include <qlist.h>
#include <qpainter.h>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>

#include <kaboutdata.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>

#include <core/document.h>
diff --git a/generators/tiff/generator_tiff.h b/generators/tiff/generator_tiff.h
index d867b2b6f..6302c5d70 100644
--- a/generators/tiff/generator_tiff.h
+++ b/generators/tiff/generator_tiff.h
@@ -12,8 +12,8 @@

#include <core/generator.h>

-#include <QtCore/qloggingcategory.h>
-#include <qhash.h>
+#include <QLoggingCategory>
+#include <QHash>

class TIFFGenerator : public Okular::Generator
{
diff --git a/generators/txt/converter.cpp b/generators/txt/converter.cpp
index 1dad8daf0..77075c46f 100644
--- a/generators/txt/converter.cpp
+++ b/generators/txt/converter.cpp
@@ -7,10 +7,10 @@
* (at your option) any later version. *
***************************************************************************/

+#include "converter.h"

-#include <QtGui/QTextFrame>
+#include <QTextFrame>

-#include "converter.h"
#include "document.h"

using namespace Txt;
diff --git a/generators/txt/debug_txt.h b/generators/txt/debug_txt.h
index 81b36f1b3..f0f21ca80 100644
--- a/generators/txt/debug_txt.h
+++ b/generators/txt/debug_txt.h
@@ -8,10 +8,10 @@
* (at your option) any later version. *
***************************************************************************/

-#ifndef OKULAR_TXT_DEBUG_P_H
-#define OKULAR_TXT_DEBUG_P_H
+#ifndef OKULAR_DEBUG_TXT_H
+#define OKULAR_DEBUG_TXT_H

-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

Q_DECLARE_LOGGING_CATEGORY(OkularTxtDebug)

diff --git a/generators/txt/document.cpp b/generators/txt/document.cpp
index 0bf5a256e..ee3f8240d 100644
--- a/generators/txt/document.cpp
+++ b/generators/txt/document.cpp
@@ -7,15 +7,15 @@
* (at your option) any later version. *
***************************************************************************/

+#include "document.h"

#include <QFile>
#include <QDataStream>
#include <QTextCodec>

#include <kencodingprober.h>
-#include <QtCore/QDebug>
+#include <QDebug>

-#include "document.h"
#include "debug_txt.h"

using namespace Txt;
diff --git a/generators/txt/document.h b/generators/txt/document.h
index 1c3d7a892..adfcbab52 100644
--- a/generators/txt/document.h
+++ b/generators/txt/document.h
@@ -7,8 +7,10 @@
* (at your option) any later version. *
***************************************************************************/

+#ifndef _TXT_DOCUMENT_H_
+#define _TXT_DOCUMENT_H_

-#include <QtGui/QTextDocument>
+#include <QTextDocument>

namespace Txt
{
@@ -24,3 +26,5 @@ namespace Txt
QString toUnicode( const QByteArray &array );
};
}
+
+#endif
diff --git a/generators/txt/generator_txt.h b/generators/txt/generator_txt.h
index 9bfa7aac2..558ed1253 100644
--- a/generators/txt/generator_txt.h
+++ b/generators/txt/generator_txt.h
@@ -8,8 +8,8 @@
***************************************************************************/


-#ifndef _TXT_GENERATOR_H_
-#define _TXT_GENERATOR_H_
+#ifndef _GENERATOR_TXT_H_
+#define _GENERATOR_TXT_H_


#include <core/textdocumentgenerator.h>
diff --git a/generators/xps/generator_xps.h b/generators/xps/generator_xps.h
index 6097dd1fe..4b99437aa 100644
--- a/generators/xps/generator_xps.h
+++ b/generators/xps/generator_xps.h
@@ -31,7 +31,7 @@
#include <QXmlDefaultHandler>
#include <QStack>
#include <QVariant>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>

#include <kzip.h>

diff --git a/interfaces/configinterface.h b/interfaces/configinterface.h
index 1f4cdc923..bb6181cf7 100644
--- a/interfaces/configinterface.h
+++ b/interfaces/configinterface.h
@@ -12,7 +12,7 @@

#include "../core/okularcore_export.h"

-#include <QtCore/QObject>
+#include <QObject>

class KConfigDialog;

diff --git a/interfaces/guiinterface.h b/interfaces/guiinterface.h
index deb076944..c860d44d9 100644
--- a/interfaces/guiinterface.h
+++ b/interfaces/guiinterface.h
@@ -12,7 +12,7 @@

#include "../core/okularcore_export.h"

-#include <QtCore/QObject>
+#include <QObject>

#include <kxmlguiclient.h>

diff --git a/interfaces/printinterface.h b/interfaces/printinterface.h
index 919a0d745..ac51272f8 100644
--- a/interfaces/printinterface.h
+++ b/interfaces/printinterface.h
@@ -12,7 +12,7 @@

#include "../core/okularcore_export.h"

-#include <QtCore/QObject>
+#include <QObject>

class QWidget;

diff --git a/interfaces/saveinterface.h b/interfaces/saveinterface.h
index 95e7ccb49..f052209e9 100644
--- a/interfaces/saveinterface.h
+++ b/interfaces/saveinterface.h
@@ -12,7 +12,7 @@

#include "../core/okularcore_export.h"

-#include <QtCore/QObject>
+#include <QObject>

namespace Okular {

diff --git a/interfaces/viewerinterface.h b/interfaces/viewerinterface.h
index 9a16ea421..929bc1c19 100644
--- a/interfaces/viewerinterface.h
+++ b/interfaces/viewerinterface.h
@@ -17,8 +17,8 @@
#define VIEWERINTERFACE_EXPORT OKULARCORE_EXPORT
#endif

-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>

namespace Okular {

diff --git a/mobile/app/package/contents/ui/Bookmarks.qml b/mobile/app/package/contents/ui/Bookmarks.qml
index 4b4023365..a6063b3b4 100644
--- a/mobile/app/package/contents/ui/Bookmarks.qml
+++ b/mobile/app/package/contents/ui/Bookmarks.qml
@@ -25,4 +25,4 @@ ThumbnailsBase {
onPageClicked: {
pageArea.delegate.pageItem.goToBookmark(pageArea.delegate.pageItem.bookmarks[0])
}
-}
\ No newline at end of file
+}
diff --git a/mobile/components/test.qml b/mobile/components/test.qml
index fc996f8e0..4c029cafc 100644
--- a/mobile/components/test.qml
+++ b/mobile/components/test.qml
@@ -47,4 +47,4 @@ Item {
onClicked: page.pageNumber++
}
}
-}
\ No newline at end of file
+}
diff --git a/mobile/components/testDocumentView.qml b/mobile/components/testDocumentView.qml
index 79abaf165..d3205b9f4 100644
--- a/mobile/components/testDocumentView.qml
+++ b/mobile/components/testDocumentView.qml
@@ -32,4 +32,4 @@ Item {
anchors.fill: parent
document: docItem
}
-}
\ No newline at end of file
+}
diff --git a/part.cpp b/part.cpp
index 2974159c3..704feddcc 100644
--- a/part.cpp
+++ b/part.cpp
@@ -2500,9 +2500,10 @@ bool Part::saveAs( const QUrl & saveUrl, SaveAsFlags flags )
// since we only have poppler as saving backend for now we're skipping that check
if ( m_fileLastModified != QFileInfo( localFilePath() ).lastModified() )
{
- QMessageBox::warning( widget(),
- i18n( "File Changed" ),
- i18n( "The file '%1' has been modified by another program, which means it can no longer be saved.", url().fileName() ) );
+ KMessageBox::sorry( widget(),
+ i18n( "The file '%1' has been modified by another program, which means it can no longer be saved.", url().fileName() ),
+ i18n( "File Changed" )
+ );
return false;
}

diff --git a/shell/main.cpp b/shell/main.cpp
index c8d731b61..983690d08 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -15,7 +15,7 @@
#include "shell.h"

#include <KLocalizedString>
-#include <QtDBus/qdbusinterface.h>
+#include <QDBusInterface>
#include <QTextStream>
#include <kwindowsystem.h>
#include <QApplication>
diff --git a/shell/okular_main.cpp b/shell/okular_main.cpp
index 2285f64a9..1d33f5ab7 100644
--- a/shell/okular_main.cpp
+++ b/shell/okular_main.cpp
@@ -15,9 +15,9 @@
#include "okular_main.h"

#include "shell.h"
-#include <QtWidgets/qapplication.h>
+#include <QApplication>
#include <KLocalizedString>
-#include <QtDBus/qdbusinterface.h>
+#include <QDBusInterface>
#include <QTextStream>
#include <kwindowsystem.h>
#include "aboutdata.h"
diff --git a/shell/okular_main.h b/shell/okular_main.h
index 950b18ef0..c4dd42e31 100644
--- a/shell/okular_main.h
+++ b/shell/okular_main.h
@@ -12,6 +12,9 @@
* (at your option) any later version. *
***************************************************************************/

+#ifndef _OKULAR_MAIN_H_
+#define _OKULAR_MAIN_H_
+
class QString;
class QStringList;

@@ -24,4 +27,6 @@ Status main(const QStringList &paths, const QString &serializedOptions);

}

+#endif
+
/* kate: replace-tabs on; indent-width 4; */
diff --git a/shell/shell.h b/shell/shell.h
index 4c5604be7..a66c60675 100644
--- a/shell/shell.h
+++ b/shell/shell.h
@@ -22,7 +22,7 @@
#include <QMimeDatabase>
#include <qaction.h>

-#include <QtDBus/QtDBus>
+#include <QtDBus>

class KRecentFilesAction;
class KToggleAction;
diff --git a/shell/shellutils.cpp b/shell/shellutils.cpp
index c9cc221ad..a465d6579 100644
--- a/shell/shellutils.cpp
+++ b/shell/shellutils.cpp
@@ -15,7 +15,7 @@
#include <QFileInfo>
#include <QDir>
#include <QDebug>
-#include <QtCore/qcommandlineparser.h>
+#include <QCommandLineParser>

namespace ShellUtils
{
diff --git a/ui/ktreeviewsearchline.cpp b/ui/ktreeviewsearchline.cpp
index 8a280b9fc..070234f59 100644
--- a/ui/ktreeviewsearchline.cpp
+++ b/ui/ktreeviewsearchline.cpp
@@ -21,19 +21,19 @@

#include "ktreeviewsearchline.h"

-#include <QtCore/QList>
-#include <QtCore/QTimer>
-#include <QtCore/QRegExp>
-#include <QtWidgets/QApplication>
-#include <QtGui/QContextMenuEvent>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QToolButton>
-#include <QtWidgets/QTreeView>
-
-#include <QtCore/QDebug>
+#include <QList>
+#include <QTimer>
+#include <QRegExp>
+#include <QApplication>
+#include <QContextMenuEvent>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QMenu>
+#include <QToolButton>
+#include <QTreeView>
+
+#include <QDebug>
#include <kiconloader.h>
#include <KLocalizedString>
#include <ktoolbar.h>
diff --git a/ui/latexrenderer.cpp b/ui/latexrenderer.cpp
index 47f976109..bed55e2ab 100644
--- a/ui/latexrenderer.cpp
+++ b/ui/latexrenderer.cpp
@@ -12,7 +12,7 @@

#include "latexrenderer.h"

-#include <QtCore/QDebug>
+#include <QDebug>

#include <kprocess.h>

diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index 7c804f072..985aaab4c 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -23,7 +23,7 @@
#include "pageview.h"

// qt/kde includes
-#include <QtCore/qloggingcategory.h>
+#include <qloggingcategory.h>
#include <qcursor.h>
#include <qevent.h>
#include <qimage.h>
@@ -49,7 +49,7 @@
#include <KLocalizedString>
#include <kselectaction.h>
#include <ktoggleaction.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <kmessagebox.h>
#include <QIcon>
#include <kurifilter.h>
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index 9d81f4e45..3e75e0bd3 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -11,9 +11,9 @@

// qt/kde includes
#include <qloggingcategory.h>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusReply>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusReply>

#include <qevent.h>
#include <qfontmetrics.h>
diff --git a/ui/snapshottaker.h b/ui/snapshottaker.h
index 19bee5681..4f624b26c 100644
--- a/ui/snapshottaker.h
+++ b/ui/snapshottaker.h
@@ -12,7 +12,7 @@

#include <phonon/videoplayer.h>

-#include <QtCore/QObject>
+#include <QObject>

class QImage;

[Yuri Chornoivan]

Git commit 6b1a6d1ec51d56941111086dbcf36a67ec008c2b by Yuri Chornoivan.
Committed on 31/08/2018 at 10:24.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 libk3b/core/k3bprogressinfoevent.h
M +1 -1 libk3b/core/k3bthreadjob.h
M +1 -1 libk3b/projects/audiocd/k3baudiotrackreader.h
M +1 -1 libk3b/projects/audiocd/k3baudiozerodatareader.h
M +1 -1 libk3b/tools/k3bintvalidator.h
M +1 -1 libk3b/tools/k3biso9660.cpp
M +1 -1 libk3b/tools/k3biso9660.h
M +2 -2 libk3b/tools/libisofs/isofs.cpp
M +1 -1 libk3b/tools/qprocess/k3bqprocess_win.cpp
M +1 -1 libk3bdevice/k3bcdtext.h
M +2 -2 plugins/decoder/flac/k3bflacdecoder.cpp
M +2 -2 plugins/decoder/mp3/k3bmaddecoder.h
M +1 -1 plugins/encoder/ogg/k3boggvorbisencoder.cpp

https://commits.kde.org/k3b/6b1a6d1ec51d56941111086dbcf36a67ec008c2b

diff --git a/libk3b/core/k3bprogressinfoevent.h b/libk3b/core/k3bprogressinfoevent.h
index aceae7640..8499eec6e 100644
--- a/libk3b/core/k3bprogressinfoevent.h
+++ b/libk3b/core/k3bprogressinfoevent.h
@@ -29,7 +29,7 @@ namespace K3b {
class ProgressInfoEvent : public QEvent
{
public:
- ProgressInfoEvent( int type )
+ explicit ProgressInfoEvent( int type )
: QEvent( QEvent::User ),
m_type(type)
{}
diff --git a/libk3b/core/k3bthreadjob.h b/libk3b/core/k3bthreadjob.h
index e481239c2..7d99b2998 100644
--- a/libk3b/core/k3bthreadjob.h
+++ b/libk3b/core/k3bthreadjob.h
@@ -35,7 +35,7 @@ namespace K3b {
Q_OBJECT

public:
- ThreadJob( JobHandler*, QObject* parent = 0 );
+ explicit ThreadJob( JobHandler*, QObject* parent = 0 );
virtual ~ThreadJob();

/**
diff --git a/libk3b/projects/audiocd/k3baudiotrackreader.h b/libk3b/projects/audiocd/k3baudiotrackreader.h
index 3776c5208..4e8e0896a 100644
--- a/libk3b/projects/audiocd/k3baudiotrackreader.h
+++ b/libk3b/projects/audiocd/k3baudiotrackreader.h
@@ -29,7 +29,7 @@ namespace K3b {
Q_OBJECT

public:
- AudioTrackReader( AudioTrack& track, QObject* parent = 0 );
+ explicit AudioTrackReader( AudioTrack& track, QObject* parent = 0 );
~AudioTrackReader();

const AudioTrack& track() const;
diff --git a/libk3b/projects/audiocd/k3baudiozerodatareader.h b/libk3b/projects/audiocd/k3baudiozerodatareader.h
index 1cef3556a..b8c9e77e4 100644
--- a/libk3b/projects/audiocd/k3baudiozerodatareader.h
+++ b/libk3b/projects/audiocd/k3baudiozerodatareader.h
@@ -28,7 +28,7 @@ namespace K3b {
class LIBK3B_EXPORT AudioZeroDataReader : public QIODevice
{
public:
- AudioZeroDataReader( AudioZeroData& source, QObject* parent = 0 );
+ explicit AudioZeroDataReader( AudioZeroData& source, QObject* parent = 0 );
~AudioZeroDataReader();

virtual bool open( OpenMode mode );
diff --git a/libk3b/tools/k3bintvalidator.h b/libk3b/tools/k3bintvalidator.h
index 7829e8a3a..c314deb7e 100644
--- a/libk3b/tools/k3bintvalidator.h
+++ b/libk3b/tools/k3bintvalidator.h
@@ -34,7 +34,7 @@ namespace K3b {
/**
* Constructor. Also sets the base value.
*/
- IntValidator ( QWidget * parent );
+ explicit IntValidator ( QWidget * parent );

/**
* Constructor. Also sets the minimum, maximum, and numeric base values.
diff --git a/libk3b/tools/k3biso9660.cpp b/libk3b/tools/k3biso9660.cpp
index d6f085c7c..772becb13 100644
--- a/libk3b/tools/k3biso9660.cpp
+++ b/libk3b/tools/k3biso9660.cpp
@@ -66,7 +66,7 @@ int K3b::Iso9660::isofs_callback( struct iso_directory_record *idr, void *udata
// First extract the raw iso9660 name
//
if( !special ) {
- for( i = 0; i < isonum_711( idr->name_len ); i++ ) {
+ for( i = 0; i < isonum_711( idr->name_len ); ++i ) {
if( idr->name[i] )
isoPath += idr->name[i];
}
diff --git a/libk3b/tools/k3biso9660.h b/libk3b/tools/k3biso9660.h
index 1b784d4d0..ac804d791 100644
--- a/libk3b/tools/k3biso9660.h
+++ b/libk3b/tools/k3biso9660.h
@@ -349,7 +349,7 @@ namespace K3b {
* Special case which always reads the TOC from the specified sector
* thus supporting multisession CDs.
*/
- Iso9660( Device::Device* dev, unsigned int startSector = 0 );
+ explicit Iso9660( Device::Device* dev, unsigned int startSector = 0 );

/**
* @param fd open file descriptor
diff --git a/libk3b/tools/libisofs/isofs.cpp b/libk3b/tools/libisofs/isofs.cpp
index 66ce3ba8b..6d75d17c2 100644
--- a/libk3b/tools/libisofs/isofs.cpp
+++ b/libk3b/tools/libisofs/isofs.cpp
@@ -42,7 +42,7 @@ static time_t getisotime(int year,int month,int day,int hour,
days = year * 365;
if (year > 2)
days += (year+1) / 4;
- for (i = 1; i < month; i++)
+ for (i = 1; i < month; ++i)
days += monlen[i-1];
if (((year+2) % 4) == 0 && month > 2)
days++;
@@ -178,7 +178,7 @@ int ReadBootTable(readfunc *read,sector_t sector, boot_head *head, void *udata)
if ( isonum_711(ventry->type) !=1 ) goto err;
sum=0;
c = (char*) ventry;
- for (i=0;i<16;i++) { sum += isonum_721(c); c+=2; }
+ for (i=0;i<16;++i) { sum += isonum_721(c); c+=2; }
if (sum) goto err;
memcpy(&head->ventry,be,0x20);
be += 0x20;
diff --git a/libk3b/tools/qprocess/k3bqprocess_win.cpp b/libk3b/tools/qprocess/k3bqprocess_win.cpp
index c19d7fe3e..102175148 100644
--- a/libk3b/tools/qprocess/k3bqprocess_win.cpp
+++ b/libk3b/tools/qprocess/k3bqprocess_win.cpp
@@ -341,7 +341,7 @@ static QByteArray qt_create_environment(const QStringList &environment)
} else
#endif // UNICODE
{
- for (QStringList::ConstIterator it = envStrings.constBegin(); it != envStrings.constEnd(); it++) {
+ for (QStringList::ConstIterator it = envStrings.constBegin(); it != envStrings.constEnd(); ++it) {
QByteArray tmp = (*it).toLocal8Bit();
uint tmpSize = tmp.length() + 1;
envlist.resize(envlist.size() + tmpSize);
diff --git a/libk3bdevice/k3bcdtext.h b/libk3bdevice/k3bcdtext.h
index 27425b581..7255d20a9 100644
--- a/libk3bdevice/k3bcdtext.h
+++ b/libk3bdevice/k3bcdtext.h
@@ -73,7 +73,7 @@ namespace K3b {
/**
* \sa setRawPackData
*/
- CdText( const QByteArray& );
+ explicit CdText( const QByteArray& );
CdText( const CdText& );
~CdText();

diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp
index 2d86c8d9f..1cec5d870 100644
--- a/plugins/decoder/flac/k3bflacdecoder.cpp
+++ b/plugins/decoder/flac/k3bflacdecoder.cpp
@@ -223,9 +223,9 @@ FLAC__StreamDecoderWriteStatus K3bFLACDecoder::Private::write_callback(const FLA
// Note that in canDecode we made sure that the input is 1-16 bit stereo or mono.
unsigned samples = frame->header.blocksize;

- for(i=0; i < samples; i++) {
+ for(i=0; i < samples; ++i) {
// in FLAC channel 0 is left, 1 is right
- for(j=0; j < this->channels; j++) {
+ for(j=0; j < this->channels; ++j) {
FLAC__int32 value = (buffer[j][i])<<(16 - frame->header.bits_per_sample);
internalBuffer->putChar(value >> 8); // msb
internalBuffer->putChar(value & 0xFF); // lsb
diff --git a/plugins/decoder/mp3/k3bmaddecoder.h b/plugins/decoder/mp3/k3bmaddecoder.h
index 0dd97aed8..d35c6c40a 100644
--- a/plugins/decoder/mp3/k3bmaddecoder.h
+++ b/plugins/decoder/mp3/k3bmaddecoder.h
@@ -29,7 +29,7 @@ class K3bMadDecoderFactory : public K3b::AudioDecoderFactory
Q_OBJECT

public:
- K3bMadDecoderFactory( QObject* parent = 0, const QVariantList& args = QVariantList() );
+ explicit K3bMadDecoderFactory( QObject* parent = 0, const QVariantList& args = QVariantList() );
~K3bMadDecoderFactory();

bool canDecode( const QUrl& filename );
@@ -45,7 +45,7 @@ class K3bMadDecoder : public K3b::AudioDecoder
Q_OBJECT

public:
- K3bMadDecoder( QObject* parent = 0 );
+ explicit K3bMadDecoder( QObject* parent = 0 );
~K3bMadDecoder();

QString metaInfo( MetaDataField );
diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
index 8618e0fa0..8bf29eae6 100644
--- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp
+++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
@@ -297,7 +297,7 @@ qint64 K3bOggVorbisEncoder::encodeInternal( const char* data, qint64 len )

// uninterleave samples
qint64 i = 0;
- for( i = 0; i < len/4; i++ ) {
+ for( i = 0; i < len/4; ++i ) {
buffer[0][i]=( (data[i*4+1]<<8) | (0x00ff&(int)data[i*4]) ) / 32768.f;
buffer[1][i]=( (data[i*4+3]<<8) | (0x00ff&(int)data[i*4+2]) ) / 32768.f;
}

[Yuri Chornoivan]

Git commit 39b6e8147d4e246cce798cc3783ac8476bf13f55 by Yuri Chornoivan.
Committed on 01/09/2018 at 08:25.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +9 -0 conf/editannottooldialog.cpp
M +1 -1 conf/editannottooldialog.h
M +1 -1 conf/widgetannottools.cpp
M +3 -3 core/action.h
M +8 -8 core/annotations.h
M +2 -2 core/area.h
M +1 -1 core/audioplayer_p.h
M +1 -1 core/document_p.h
M +1 -1 core/form_p.h
M +2 -2 core/generator.h
M +2 -2 core/generator_p.h
M +1 -1 core/script/event_p.h
M +1 -1 core/script/executor_kjs_p.h
M +1 -1 core/textdocumentgenerator_p.h
M +1 -1 core/textdocumentsettings.h
M +2 -2 core/textdocumentsettings_p.h
M +2 -2 extensions.h
M +2 -2 generators/djvu/kdjvu.h
M +1 -1 generators/epub/epubdocument.h
M +1 -1 generators/fictionbook/document.h
M +1 -1 generators/mobipocket/mobidocument.h
M +1 -1 generators/ooo/document.h
M +3 -3 generators/ooo/formatproperty.h
M +1 -1 generators/ooo/manifest.h
M +3 -3 generators/poppler/formfields.h
M +1 -1 generators/txt/document.h
M +1 -1 generators/xps/generator_xps.h
M +1 -1 mobile/components/documentitem.cpp
M +1 -1 mobile/components/documentitem.h
M +1 -1 part.h
M +2 -2 shell/shell.h
M +2 -2 ui/annotationtools.h
M +1 -1 ui/annotationwidgets.h
M +1 -1 ui/embeddedfilesdialog.cpp
M +1 -1 ui/formwidgets.h
M +1 -1 ui/magnifierview.h
M +3 -3 ui/minibar.h
M +1 -1 ui/pageitemdelegate.h
M +1 -1 ui/pageviewutils.h
M +1 -1 ui/propertiesdialog.h
M +1 -1 ui/sidebar.h
M +1 -1 ui/snapshottaker.h
M +1 -1 ui/thumbnaillist.h
M +1 -1 ui/toolaction.h
M +1 -1 ui/tts.h

https://commits.kde.org/okular/39b6e8147d4e246cce798cc3783ac8476bf13f55

diff --git a/conf/editannottooldialog.cpp b/conf/editannottooldialog.cpp
index cf79d83c9..64a01ab59 100644
--- a/conf/editannottooldialog.cpp
+++ b/conf/editannottooldialog.cpp
@@ -1,3 +1,12 @@
+/***************************************************************************
+ * Copyright (C) 2012 by Fabio D'Urso <***@hotmail.it> *
+ * Copyright (C) 2015 by Laurent Montel <***@kde.org> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ ***************************************************************************/

#include "editannottooldialog.h"

diff --git a/conf/editannottooldialog.h b/conf/editannottooldialog.h
index 23372b17d..c5794e56e 100644
--- a/conf/editannottooldialog.h
+++ b/conf/editannottooldialog.h
@@ -43,7 +43,7 @@ class EditAnnotToolDialog : public QDialog
ToolStamp
};

- EditAnnotToolDialog( QWidget *parent = nullptr, const QDomElement &initialState = QDomElement() );
+ explicit EditAnnotToolDialog( QWidget *parent = nullptr, const QDomElement &initialState = QDomElement() );
~EditAnnotToolDialog();
QString name() const;
QDomDocument toolXml() const;
diff --git a/conf/widgetannottools.cpp b/conf/widgetannottools.cpp
index f94278a8e..74992374e 100644
--- a/conf/widgetannottools.cpp
+++ b/conf/widgetannottools.cpp
@@ -14,7 +14,7 @@
#include <klocalizedstring.h>


-#include <QtWidgets/QApplication>
+#include <QApplication>
#include <QHBoxLayout>
#include <QListWidget>
#include <QListWidgetItem>
diff --git a/core/action.h b/core/action.h
index 0b3ad370d..019df8850 100644
--- a/core/action.h
+++ b/core/action.h
@@ -237,7 +237,7 @@ class OKULARCORE_EXPORT ExecuteAction : public Action

/**
* The Browse action browses an url by opening a web browser or
- * email client, depedning on the url protocol (e.g. http, mailto, etc.).
+ * email client, depending on the url protocol (e.g. http, mailto, etc.).
*/
class OKULARCORE_EXPORT BrowseAction : public Action
{
@@ -247,7 +247,7 @@ class OKULARCORE_EXPORT BrowseAction : public Action
*
* @param url The url to browse.
*/
- BrowseAction( const QUrl &url );
+ explicit BrowseAction( const QUrl &url );

/**
* Destroys the browse action.
@@ -461,7 +461,7 @@ class OKULARCORE_EXPORT MovieAction : public Action
/**
* Creates a new movie action.
*/
- MovieAction( OperationType operation );
+ explicit MovieAction( OperationType operation );

/**
* Destroys the movie action.
diff --git a/core/annotations.h b/core/annotations.h
index 5c9397cb1..474fa73f8 100644
--- a/core/annotations.h
+++ b/core/annotations.h
@@ -781,7 +781,7 @@ class OKULARCORE_EXPORT TextAnnotation : public Annotation
/**
* Creates a new text annotation from the xml @p description
*/
- TextAnnotation( const QDomNode &description );
+ explicit TextAnnotation( const QDomNode &description );

/**
* Destroys the text annotation.
@@ -1054,7 +1054,7 @@ class OKULARCORE_EXPORT GeomAnnotation : public Annotation
/**
* Creates a new geometrical annotation from the xml @p description
*/
- GeomAnnotation( const QDomNode &description );
+ explicit GeomAnnotation( const QDomNode &description );

/**
* Destroys the geometrical annotation.
@@ -1296,7 +1296,7 @@ class OKULARCORE_EXPORT InkAnnotation : public Annotation
/**
* Creates a new ink annotation from the xml @p description
*/
- InkAnnotation( const QDomNode &description );
+ explicit InkAnnotation( const QDomNode &description );

/**
* Destroys the ink annotation.
@@ -1458,7 +1458,7 @@ class OKULARCORE_EXPORT SoundAnnotation : public Annotation
/**
* Creates a new sound annotation from the xml @p description
*/
- SoundAnnotation( const QDomNode &description );
+ explicit SoundAnnotation( const QDomNode &description );
/**
* Destroys the sound annotation.
*/
@@ -1518,7 +1518,7 @@ class OKULARCORE_EXPORT MovieAnnotation : public Annotation
/**
* Creates a new movie annotation from the xml @p description
*/
- MovieAnnotation( const QDomNode &description );
+ explicit MovieAnnotation( const QDomNode &description );
/**
* Destroys the movie annotation.
*/
@@ -1565,7 +1565,7 @@ class OKULARCORE_EXPORT ScreenAnnotation : public Annotation
/**
* Creates a new screen annotation from the xml @p description
*/
- ScreenAnnotation( const QDomNode &description );
+ explicit ScreenAnnotation( const QDomNode &description );

/**
* Destroys the screen annotation.
@@ -1634,7 +1634,7 @@ class OKULARCORE_EXPORT WidgetAnnotation : public Annotation
/**
* Creates a new widget annotation from the xml @p description
*/
- WidgetAnnotation( const QDomNode &description );
+ explicit WidgetAnnotation( const QDomNode &description );

/**
* Destroys the widget annotation.
@@ -1689,7 +1689,7 @@ class OKULARCORE_EXPORT RichMediaAnnotation : public Annotation
/**
* Creates a new rich media annotation from the xml @p description
*/
- RichMediaAnnotation( const QDomNode &description );
+ explicit RichMediaAnnotation( const QDomNode &description );

/**
* Destroys the rich media annotation.
diff --git a/core/area.h b/core/area.h
index 964f9da65..5f11aea0b 100644
--- a/core/area.h
+++ b/core/area.h
@@ -448,7 +448,7 @@ class OKULARCORE_EXPORT AnnotationObjectRect : public ObjectRect
* Creates a new annotation object rectangle with the
* given @p annotation.
*/
- AnnotationObjectRect( Annotation *annotation );
+ explicit AnnotationObjectRect( Annotation *annotation );

/**
* Destroys the annotation object rectangle.
@@ -871,7 +871,7 @@ class HighlightAreaRect : public RegularAreaRect
* Creates a new highlight area rect with the coordinates of
* the given @p area.
*/
- HighlightAreaRect( const RegularAreaRect *area = nullptr );
+ explicit HighlightAreaRect( const RegularAreaRect *area = nullptr );

/**
* The search ID of the highlight owner.
diff --git a/core/audioplayer_p.h b/core/audioplayer_p.h
index bc325f7cc..1b2ea58f6 100644
--- a/core/audioplayer_p.h
+++ b/core/audioplayer_p.h
@@ -26,7 +26,7 @@ class AudioPlayer;
class AudioPlayerPrivate
{
public:
- AudioPlayerPrivate( AudioPlayer * qq );
+ explicit AudioPlayerPrivate( AudioPlayer * qq );

~AudioPlayerPrivate();

diff --git a/core/document_p.h b/core/document_p.h
index c47229118..792bec813 100644
--- a/core/document_p.h
+++ b/core/document_p.h
@@ -86,7 +86,7 @@ Q_DECLARE_FLAGS(LoadDocumentInfoFlags, LoadDocumentInfoFlag)
class DocumentPrivate
{
public:
- DocumentPrivate( Document *parent )
+ explicit DocumentPrivate( Document *parent )
: m_parent( parent ),
m_tempFile( nullptr ),
m_docSize( -1 ),
diff --git a/core/form_p.h b/core/form_p.h
index 7e8389bf2..cbba06272 100644
--- a/core/form_p.h
+++ b/core/form_p.h
@@ -22,7 +22,7 @@ class FormField;
class FormFieldPrivate
{
public:
- FormFieldPrivate( FormField::FieldType type );
+ explicit FormFieldPrivate( FormField::FieldType type );
virtual ~FormFieldPrivate();

void setDefault();
diff --git a/core/generator.h b/core/generator.h
index ceaa43ced..b989a55de 100644
--- a/core/generator.h
+++ b/core/generator.h
@@ -221,7 +221,7 @@ class OKULARCORE_EXPORT Generator : public QObject
/**
* Creates a new generator.
*/
- Generator(QObject* parent = nullptr, const QVariantList& args = QVariantList());
+ explicit Generator(QObject* parent = nullptr, const QVariantList& args = QVariantList());

/**
* Destroys the generator.
@@ -781,7 +781,7 @@ class OKULARCORE_EXPORT TextRequest
/**
* Creates a new text request.
*/
- TextRequest( Page *page );
+ explicit TextRequest( Page *page );

TextRequest();

diff --git a/core/generator_p.h b/core/generator_p.h
index 62858a9eb..239be0a79 100644
--- a/core/generator_p.h
+++ b/core/generator_p.h
@@ -114,7 +114,7 @@ class PixmapGenerationThread : public QThread
Q_OBJECT

public:
- PixmapGenerationThread( Generator *generator );
+ explicit PixmapGenerationThread( Generator *generator );

void startGeneration( PixmapRequest *request, bool calcBoundingRect );

@@ -142,7 +142,7 @@ class TextPageGenerationThread : public QThread
Q_OBJECT

public:
- TextPageGenerationThread( Generator *generator );
+ explicit TextPageGenerationThread( Generator *generator );

void endGeneration();

diff --git a/core/script/event_p.h b/core/script/event_p.h
index 928833f08..eadd481d2 100644
--- a/core/script/event_p.h
+++ b/core/script/event_p.h
@@ -70,7 +70,7 @@ class Event
PageClose, /// < Not implemented.
};

- Event(EventType type);
+ explicit Event(EventType type);

/** One of the defined EventTypes */
EventType eventType() const;
diff --git a/core/script/executor_kjs_p.h b/core/script/executor_kjs_p.h
index a193391fe..6d1462ef3 100644
--- a/core/script/executor_kjs_p.h
+++ b/core/script/executor_kjs_p.h
@@ -21,7 +21,7 @@ class Event;
class ExecutorKJS
{
public:
- ExecutorKJS( DocumentPrivate *doc );
+ explicit ExecutorKJS( DocumentPrivate *doc );
~ExecutorKJS();

void execute( const QString &script, Event *event );
diff --git a/core/textdocumentgenerator_p.h b/core/textdocumentgenerator_p.h
index 1a4b869c5..e5fb0b34a 100644
--- a/core/textdocumentgenerator_p.h
+++ b/core/textdocumentgenerator_p.h
@@ -115,7 +115,7 @@ class TextDocumentGeneratorPrivate : public GeneratorPrivate
friend class TextDocumentConverter;

public:
- TextDocumentGeneratorPrivate( TextDocumentConverter *converter )
+ explicit TextDocumentGeneratorPrivate( TextDocumentConverter *converter )
: mConverter( converter ), mDocument( nullptr ), mGeneralSettings( nullptr )
{
}
diff --git a/core/textdocumentsettings.h b/core/textdocumentsettings.h
index 50992a9ff..c295ccc81 100644
--- a/core/textdocumentsettings.h
+++ b/core/textdocumentsettings.h
@@ -84,7 +84,7 @@ class OKULARCORE_EXPORT TextDocumentSettingsWidget : public QWidget
Q_OBJECT

public:
- TextDocumentSettingsWidget( QWidget *parent = nullptr );
+ explicit TextDocumentSettingsWidget( QWidget *parent = nullptr );
virtual ~TextDocumentSettingsWidget();

void addRow( const QString& labelText, QWidget *widget );
diff --git a/core/textdocumentsettings_p.h b/core/textdocumentsettings_p.h
index 998156b0f..b69e3d337 100644
--- a/core/textdocumentsettings_p.h
+++ b/core/textdocumentsettings_p.h
@@ -23,7 +23,7 @@ class TextDocumentSettingsWidgetPrivate
* @note the private class won't take ownership of the ui, so you
* must delete it yourself
*/
- TextDocumentSettingsWidgetPrivate(Ui_TextDocumentSettings *ui)
+ explicit TextDocumentSettingsWidgetPrivate(Ui_TextDocumentSettings *ui)
: mUi(ui)
{}

@@ -36,7 +36,7 @@ class TextDocumentSettingsPrivate : public QObject
Q_OBJECT

public:
- TextDocumentSettingsPrivate(QObject *parent)
+ explicit TextDocumentSettingsPrivate(QObject *parent)
: QObject(parent)
{}

diff --git a/extensions.h b/extensions.h
index e61340aeb..9d6b172ef 100644
--- a/extensions.h
+++ b/extensions.h
@@ -24,7 +24,7 @@ class BrowserExtension : public KParts::BrowserExtension
Q_OBJECT

public:
- BrowserExtension(Part*);
+ explicit BrowserExtension(Part*);

public Q_SLOTS:
// Automatically detected by the host.
@@ -39,7 +39,7 @@ class OkularLiveConnectExtension : public KParts::LiveConnectExtension
Q_OBJECT

public:
- OkularLiveConnectExtension( Part *parent );
+ explicit OkularLiveConnectExtension( Part *parent );

// from LiveConnectExtension
bool get( const unsigned long objid, const QString &field, Type &type,
diff --git a/generators/djvu/kdjvu.h b/generators/djvu/kdjvu.h
index 9a5998d64..d111e633e 100644
--- a/generators/djvu/kdjvu.h
+++ b/generators/djvu/kdjvu.h
@@ -157,7 +157,7 @@ class KDjVu
bool inlineText() const;

private:
- TextAnnotation( miniexp_t anno );
+ explicit TextAnnotation( miniexp_t anno );
QSize m_size;
bool m_inlineText;
};
@@ -179,7 +179,7 @@ class KDjVu
void setWidth( int width );

private:
- LineAnnotation( miniexp_t anno );
+ explicit LineAnnotation( miniexp_t anno );
QPoint m_point2;
bool m_isArrow;
miniexp_t m_width;
diff --git a/generators/epub/epubdocument.h b/generators/epub/epubdocument.h
index e823e3d06..2bd922681 100644
--- a/generators/epub/epubdocument.h
+++ b/generators/epub/epubdocument.h
@@ -24,7 +24,7 @@ namespace Epub {
Q_OBJECT

public:
- EpubDocument(const QString &fileName);
+ explicit EpubDocument(const QString &fileName);
bool isValid();
~EpubDocument();
struct epub *getEpub();
diff --git a/generators/fictionbook/document.h b/generators/fictionbook/document.h
index de0b83260..1fee7e9cd 100644
--- a/generators/fictionbook/document.h
+++ b/generators/fictionbook/document.h
@@ -20,7 +20,7 @@ namespace FictionBook {
class Document
{
public:
- Document( const QString &fileName );
+ explicit Document( const QString &fileName );

bool open();

diff --git a/generators/mobipocket/mobidocument.h b/generators/mobipocket/mobidocument.h
index de4398449..d589c942f 100644
--- a/generators/mobipocket/mobidocument.h
+++ b/generators/mobipocket/mobidocument.h
@@ -24,7 +24,7 @@ namespace Mobi {
class MobiDocument : public QTextDocument {

public:
- MobiDocument(const QString &fileName);
+ explicit MobiDocument(const QString &fileName);
~MobiDocument();

Mobipocket::Document* mobi() const { return doc; }
diff --git a/generators/ooo/document.h b/generators/ooo/document.h
index 9c6bc97f6..bb681a7d9 100644
--- a/generators/ooo/document.h
+++ b/generators/ooo/document.h
@@ -21,7 +21,7 @@ namespace OOO {
class Document
{
public:
- Document( const QString &fileName );
+ explicit Document( const QString &fileName );
~Document();

bool open( const QString &password );
diff --git a/generators/ooo/formatproperty.h b/generators/ooo/formatproperty.h
index 268066906..3b13f4d6e 100644
--- a/generators/ooo/formatproperty.h
+++ b/generators/ooo/formatproperty.h
@@ -76,7 +76,7 @@ class TextFormatProperty
{
public:
TextFormatProperty();
- TextFormatProperty( const StyleInformation *information );
+ explicit TextFormatProperty( const StyleInformation *information );

void apply( QTextCharFormat *format ) const;

@@ -155,7 +155,7 @@ class ListFormatProperty
};

ListFormatProperty();
- ListFormatProperty( Type type );
+ explicit ListFormatProperty( Type type );

void apply( QTextListFormat *format, int level ) const;

@@ -202,7 +202,7 @@ class StyleFormatProperty
{
public:
StyleFormatProperty();
- StyleFormatProperty( const StyleInformation *information );
+ explicit StyleFormatProperty( const StyleInformation *information );

void applyBlock( QTextBlockFormat *format ) const;
void applyText( QTextCharFormat *format ) const;
diff --git a/generators/ooo/manifest.h b/generators/ooo/manifest.h
index fb5565664..b251b65fe 100644
--- a/generators/ooo/manifest.h
+++ b/generators/ooo/manifest.h
@@ -45,7 +45,7 @@ class ManifestEntry
/**
Create a new manifest entry
*/
- ManifestEntry( const QString &fileName );
+ explicit ManifestEntry( const QString &fileName );

/**
Set the mimetype of the file.
diff --git a/generators/poppler/formfields.h b/generators/poppler/formfields.h
index 46e95c45a..9f39dfbef 100644
--- a/generators/poppler/formfields.h
+++ b/generators/poppler/formfields.h
@@ -16,7 +16,7 @@
class PopplerFormFieldButton : public Okular::FormFieldButton
{
public:
- PopplerFormFieldButton( Poppler::FormFieldButton * field );
+ explicit PopplerFormFieldButton( Poppler::FormFieldButton * field );
virtual ~PopplerFormFieldButton();

// inherited from Okular::FormField
@@ -46,7 +46,7 @@ class PopplerFormFieldButton : public Okular::FormFieldButton
class PopplerFormFieldText : public Okular::FormFieldText
{
public:
- PopplerFormFieldText( Poppler::FormFieldText * field );
+ explicit PopplerFormFieldText( Poppler::FormFieldText * field );
virtual ~PopplerFormFieldText();

// inherited from Okular::FormField
@@ -79,7 +79,7 @@ class PopplerFormFieldText : public Okular::FormFieldText
class PopplerFormFieldChoice : public Okular::FormFieldChoice
{
public:
- PopplerFormFieldChoice( Poppler::FormFieldChoice * field );
+ explicit PopplerFormFieldChoice( Poppler::FormFieldChoice * field );
virtual ~PopplerFormFieldChoice();

// inherited from Okular::FormField
diff --git a/generators/txt/document.h b/generators/txt/document.h
index adfcbab52..83dac896c 100644
--- a/generators/txt/document.h
+++ b/generators/txt/document.h
@@ -19,7 +19,7 @@ namespace Txt
Q_OBJECT

public:
- Document( const QString &fileName );
+ explicit Document( const QString &fileName );
~Document();

private:
diff --git a/generators/xps/generator_xps.h b/generators/xps/generator_xps.h
index 4b99437aa..f122e38a9 100644
--- a/generators/xps/generator_xps.h
+++ b/generators/xps/generator_xps.h
@@ -110,7 +110,7 @@ class XpsFile;
class XpsHandler: public QXmlDefaultHandler
{
public:
- XpsHandler( XpsPage *page );
+ explicit XpsHandler( XpsPage *page );
~XpsHandler();

bool startElement( const QString & nameSpace,
diff --git a/mobile/components/documentitem.cpp b/mobile/components/documentitem.cpp
index e674d0015..57461f6c2 100644
--- a/mobile/components/documentitem.cpp
+++ b/mobile/components/documentitem.cpp
@@ -19,7 +19,7 @@

#include "documentitem.h"

-#include <QtQml>
+#include <QtQml> // krazy:exclude=includes
#include <QMimeDatabase>

#include <core/document_p.h>
diff --git a/mobile/components/documentitem.h b/mobile/components/documentitem.h
index 2c864811c..180bbb910 100644
--- a/mobile/components/documentitem.h
+++ b/mobile/components/documentitem.h
@@ -169,7 +169,7 @@ class Observer : public QObject, public Okular::DocumentObserver
Q_OBJECT

public:
- Observer(DocumentItem *parent);
+ explicit Observer(DocumentItem *parent);
~Observer();

// inherited from DocumentObserver
diff --git a/part.h b/part.h
index ad963a90b..981d96661 100644
--- a/part.h
+++ b/part.h
@@ -23,7 +23,7 @@
#include <QList>
#include <QPointer>
#include <QProcess>
-#include <QtDBus>
+#include <QtDBus> // krazy:exclude=includes
#include <QUrl>

#include <KCompressionDevice>
diff --git a/shell/shell.h b/shell/shell.h
index a66c60675..1f16cb2fb 100644
--- a/shell/shell.h
+++ b/shell/shell.h
@@ -20,9 +20,9 @@
#include <kparts/readwritepart.h>
#include <QMimeType>
#include <QMimeDatabase>
-#include <qaction.h>
+#include <QAction>

-#include <QtDBus>
+#include <QtDBus> // krazy:exclude=includes

class KRecentFilesAction;
class KToggleAction;
diff --git a/ui/annotationtools.h b/ui/annotationtools.h
index 1f7aa97cf..bd048029f 100644
--- a/ui/annotationtools.h
+++ b/ui/annotationtools.h
@@ -32,7 +32,7 @@ class Page;
class AnnotatorEngine
{
public:
- AnnotatorEngine( const QDomElement & engineElement );
+ explicit AnnotatorEngine( const QDomElement & engineElement );
virtual ~AnnotatorEngine();

// enum definitions
@@ -87,7 +87,7 @@ class SmoothPathEngine
: public AnnotatorEngine
{
public:
- SmoothPathEngine( const QDomElement & engineElement );
+ explicit SmoothPathEngine( const QDomElement & engineElement );

QRect event( EventType type, Button button, double nX, double nY, double xScale, double yScale, const Okular::Page * /*page*/ ) override;

diff --git a/ui/annotationwidgets.h b/ui/annotationwidgets.h
index 13442ce47..ae5e427e7 100644
--- a/ui/annotationwidgets.h
+++ b/ui/annotationwidgets.h
@@ -72,7 +72,7 @@ class AnnotationWidget
Q_OBJECT

public:
- AnnotationWidget( Okular::Annotation * ann );
+ explicit AnnotationWidget( Okular::Annotation * ann );
virtual ~AnnotationWidget();

virtual Okular::Annotation::SubType annotationType() const;
diff --git a/ui/embeddedfilesdialog.cpp b/ui/embeddedfilesdialog.cpp
index e2901923d..ea162b957 100644
--- a/ui/embeddedfilesdialog.cpp
+++ b/ui/embeddedfilesdialog.cpp
@@ -183,7 +183,7 @@ void EmbeddedFilesDialog::viewFile( Okular::EmbeddedFile* ef )
+ QDir::separator()
+ fileInfo.baseName()
+ ".XXXXXX"
- + (fileInfo.completeSuffix().isEmpty() ? QString("") : "." + fileInfo.completeSuffix())
+ + (fileInfo.completeSuffix().isEmpty() ? QString("") : "." + fileInfo.completeSuffix()) // krazy:exclude=doublequote_chars
);
GuiUtils::writeEmbeddedFile( ef, this, *tmpFile );

diff --git a/ui/formwidgets.h b/ui/formwidgets.h
index 218137172..f0206c3bb 100644
--- a/ui/formwidgets.h
+++ b/ui/formwidgets.h
@@ -54,7 +54,7 @@ class FormWidgetsController : public QObject
Q_OBJECT

public:
- FormWidgetsController( Okular::Document *doc );
+ explicit FormWidgetsController( Okular::Document *doc );
virtual ~FormWidgetsController();

void signalAction( Okular::Action *action );
diff --git a/ui/magnifierview.h b/ui/magnifierview.h
index 09f26f7db..cd24e1eb2 100644
--- a/ui/magnifierview.h
+++ b/ui/magnifierview.h
@@ -29,7 +29,7 @@ class MagnifierView : public QWidget, public Okular::DocumentObserver
Q_OBJECT

public:
- MagnifierView( Okular::Document *document, QWidget *parent = nullptr );
+ explicit MagnifierView( Okular::Document *document, QWidget *parent = nullptr );
~MagnifierView();

void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ) override;
diff --git a/ui/minibar.h b/ui/minibar.h
index d49007de1..0bf969ff0 100644
--- a/ui/minibar.h
+++ b/ui/minibar.h
@@ -32,7 +32,7 @@ class PagesEdit : public KLineEdit
Q_OBJECT

public:
- PagesEdit( MiniBar * parent );
+ explicit PagesEdit( MiniBar * parent );
void setText( const QString & ) override;

protected:
@@ -54,7 +54,7 @@ class PageNumberEdit : public PagesEdit
Q_OBJECT

public:
- PageNumberEdit( MiniBar * parent );
+ explicit PageNumberEdit( MiniBar * parent );
void setPagesNumber( int pages );

private:
@@ -65,7 +65,7 @@ class PageLabelEdit : public PagesEdit
{
Q_OBJECT
public:
- PageLabelEdit( MiniBar * parent );
+ explicit PageLabelEdit( MiniBar * parent );
void setText( const QString & newText ) override;
void setPageLabels( const QVector< Okular::Page * > & pageVector );

diff --git a/ui/pageitemdelegate.h b/ui/pageitemdelegate.h
index 4067db060..bbf0a802c 100644
--- a/ui/pageitemdelegate.h
+++ b/ui/pageitemdelegate.h
@@ -17,7 +17,7 @@ class PageItemDelegate : public QItemDelegate
Q_OBJECT

public:
- PageItemDelegate( QObject * parent = nullptr );
+ explicit PageItemDelegate( QObject * parent = nullptr );
virtual ~PageItemDelegate();

static const int PageRole = 0x000f0001;
diff --git a/ui/pageviewutils.h b/ui/pageviewutils.h
index 6c3740927..3fabeb702 100644
--- a/ui/pageviewutils.h
+++ b/ui/pageviewutils.h
@@ -107,7 +107,7 @@ class PageViewMessage : public QWidget
Q_OBJECT

public:
- PageViewMessage( QWidget * parent );
+ explicit PageViewMessage( QWidget * parent );

enum Icon { None, Info, Warning, Error, Find, Annotation };
void display( const QString & message, const QString & details = QString(), Icon icon = Info, int durationMs = 4000 );
diff --git a/ui/propertiesdialog.h b/ui/propertiesdialog.h
index dbf7ebd51..5abe394c3 100644
--- a/ui/propertiesdialog.h
+++ b/ui/propertiesdialog.h
@@ -56,7 +56,7 @@ class FontsListModel
Q_OBJECT

public:
- FontsListModel( QObject * parent = nullptr );
+ explicit FontsListModel( QObject * parent = nullptr );
virtual ~FontsListModel();

// reimplementations from QAbstractTableModel
diff --git a/ui/sidebar.h b/ui/sidebar.h
index 3eb3b4639..1256a39a2 100644
--- a/ui/sidebar.h
+++ b/ui/sidebar.h
@@ -20,7 +20,7 @@ class OKULARPART_EXPORT Sidebar : public QWidget
{
Q_OBJECT
public:
- Sidebar( QWidget *parent = nullptr );
+ explicit Sidebar( QWidget *parent = nullptr );
~Sidebar();

int addItem( QWidget *widget, const QIcon &icon, const QString &text );
diff --git a/ui/snapshottaker.h b/ui/snapshottaker.h
index 4f624b26c..ae4c71f51 100644
--- a/ui/snapshottaker.h
+++ b/ui/snapshottaker.h
@@ -21,7 +21,7 @@ class SnapshotTaker : public QObject
Q_OBJECT

public:
- SnapshotTaker( const QUrl &url, QObject *parent = nullptr );
+ explicit SnapshotTaker( const QUrl &url, QObject *parent = nullptr );
~SnapshotTaker();

Q_SIGNALS:
diff --git a/ui/thumbnaillist.h b/ui/thumbnaillist.h
index f2fd3b34b..0717c58c1 100644
--- a/ui/thumbnaillist.h
+++ b/ui/thumbnaillist.h
@@ -80,7 +80,7 @@ class ThumbnailsBox : public QWidget
Q_OBJECT

public:
- ThumbnailsBox( QWidget * parent ) : QWidget( parent ) { QVBoxLayout *vbox = new QVBoxLayout(this); vbox->setMargin(0); vbox->setSpacing(0);}
+ explicit ThumbnailsBox( QWidget * parent ) : QWidget( parent ) { QVBoxLayout *vbox = new QVBoxLayout(this); vbox->setMargin(0); vbox->setSpacing(0);}
QSize sizeHint() const override { return QSize(); }
};

diff --git a/ui/toolaction.h b/ui/toolaction.h
index 2070ede0e..3f42bcc21 100644
--- a/ui/toolaction.h
+++ b/ui/toolaction.h
@@ -22,7 +22,7 @@ class ToolAction : public KSelectAction
Q_OBJECT

public:
- ToolAction( QObject *parent = nullptr );
+ explicit ToolAction( QObject *parent = nullptr );
virtual ~ToolAction();

void addAction( QAction *action );
diff --git a/ui/tts.h b/ui/tts.h
index 00d8c2e73..767ad4c89 100644
--- a/ui/tts.h
+++ b/ui/tts.h
@@ -17,7 +17,7 @@ class OkularTTS : public QObject
{
Q_OBJECT
public:
- OkularTTS( QObject *parent = nullptr );
+ explicit OkularTTS( QObject *parent = nullptr );
~OkularTTS();

void say( const QString &text );

[Yuri Chornoivan]

Git commit 8c4763af51079d753d16191b9bde56591e365c02 by Yuri Chornoivan.
Committed on 01/09/2018 at 13:25.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +0 -1 kopete/chatwindow/chatview.cpp
M +0 -1 kopete/chatwindow/kopeteemailwindow.cpp
M +0 -1 kopete/config/chatwindow/chatwindowconfig.cpp
M +0 -1 kopete/config/status/statusconfig.cpp
M +0 -1 kopete/systemtray.cpp
M +5 -0 libkopete/avdevice/bayer.h
M +5 -0 libkopete/avdevice/sonix_compress.h
M +0 -1 libkopete/kopeteaccount.cpp
M +2 -2 libkopete/kopetecontact.h
M +4 -4 libkopete/private/kopeteidleplatform_x11.cpp
M +2 -2 libkopete/ui/avatarwebcamdialog.h
M +0 -1 libkopete/ui/contactaddednotifydialog.cpp
M +4 -4 plugins/history/converter.cpp
M +6 -6 plugins/history/historydialog.cpp
M +3 -3 plugins/history/historyguiclient.cpp
M +2 -2 plugins/history/historyimport.cpp
M +9 -9 plugins/history/historylogger.cpp
M +1 -1 plugins/history/historyplugin.cpp
M +5 -5 plugins/history2/history2dialog.cpp
M +2 -2 plugins/history2/history2dialog.h
M +3 -3 plugins/history2/history2guiclient.cpp
M +2 -2 plugins/history2/history2guiclient.h
M +2 -2 plugins/history2/history2import.h
M +9 -9 plugins/history2/history2logger.cpp
M +2 -2 plugins/history2/history2logger.h
M +1 -1 plugins/history2/history2plugin.cpp
M +2 -2 plugins/history2/history2plugin.h
M +4 -4 plugins/history2/history2preferences.cpp
M +2 -2 plugins/history2/history2preferences.h
M +0 -2 plugins/nowlistening/nlamarok.cpp
M +0 -2 plugins/nowlistening/nlaudacious.cpp
M +2 -0 plugins/nowlistening/nlaudacious.h
M +0 -2 plugins/nowlistening/nljuk.cpp
M +0 -2 plugins/nowlistening/nlkaffeine.cpp
M +0 -2 plugins/nowlistening/nlkscd.cpp
M +0 -2 plugins/nowlistening/nlmpris.cpp
M +0 -2 plugins/nowlistening/nlmpris2.cpp
M +0 -2 plugins/nowlistening/nlqmmp.cpp
M +2 -0 plugins/nowlistening/nlqmmp.h
M +0 -1 plugins/otr/otrlchatinterface.cpp
M +6 -0 plugins/pipes/tests/tests.h
M +0 -1 plugins/privacy/privacypreferences.cpp
M +1 -1 plugins/webpresence/webpresenceplugin.h
M +2 -2 protocols/gadu/gaduaccount.cpp
M +2 -2 protocols/gadu/gadurichtextformat.cpp
M +1 -1 protocols/groupwise/libgroupwise/bytestream.cpp
M +0 -1 protocols/jabber/jabberprotocol.cpp
M +1 -1 protocols/jabber/libjingle.h
M +2 -2 protocols/jabber/xoauth2provider.cpp
M +2 -2 protocols/oscar/oscaraccount.cpp
M +2 -2 protocols/oscar/oscarpresencesdataclasses.h
M +0 -1 protocols/qq/md5.c
M +2 -2 protocols/skype/libskype/skypedbus/skypeconnection.cpp
M +2 -2 tests/protocols/oscar/serverversionstest.h

https://commits.kde.org/kopete/8c4763af51079d753d16191b9bde56591e365c02

diff --git a/kopete/chatwindow/chatview.cpp b/kopete/chatwindow/chatview.cpp
index bbf6d6182..9ebe7101f 100644
--- a/kopete/chatwindow/chatview.cpp
+++ b/kopete/chatwindow/chatview.cpp
@@ -47,7 +47,6 @@
#include <kpluginfactory.h>
#include <khtmlview.h>
#include <kxmlguifactory.h>
-#include <kpluginfactory.h>

#include <QMenu>
#include <QTimer>
diff --git a/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/chatwindow/kopeteemailwindow.cpp
index 85c6ab04a..ec32b361f 100644
--- a/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/chatwindow/kopeteemailwindow.cpp
@@ -51,7 +51,6 @@
#include <kwindowsystem.h>
#include <kpluginfactory.h>
#include <kxmlguifactory.h>
-#include <kpluginfactory.h>
#include <kvbox.h>
#include <ktoolbar.h>
#include <kactioncollection.h>
diff --git a/kopete/config/chatwindow/chatwindowconfig.cpp b/kopete/config/chatwindow/chatwindowconfig.cpp
index 871970016..f6e9ec482 100644
--- a/kopete/config/chatwindow/chatwindowconfig.cpp
+++ b/kopete/config/chatwindow/chatwindowconfig.cpp
@@ -52,7 +52,6 @@
#include <KGlobal>
#include <KCMultiDialog>
#include <KComponentData>
-#include <KLocalizedString>

// KNewStuff
//#include <knewstuff2/engine.h>
diff --git a/kopete/config/status/statusconfig.cpp b/kopete/config/status/statusconfig.cpp
index 856463674..dade53759 100644
--- a/kopete/config/status/statusconfig.cpp
+++ b/kopete/config/status/statusconfig.cpp
@@ -21,7 +21,6 @@
#include <QVBoxLayout>
#include <QTabWidget>

-#include <kpluginfactory.h>
#include <kpluginfactory.h>
#include "kopetestatussettings.h"

diff --git a/kopete/systemtray.cpp b/kopete/systemtray.cpp
index 3ff65cde6..6608b7d93 100644
--- a/kopete/systemtray.cpp
+++ b/kopete/systemtray.cpp
@@ -28,7 +28,6 @@
#include <KGlobal>
#include <K4AboutData>
#include <KComponentData>
-#include <KLocalizedString>
#include <KActionCollection>

#include "kopetechatsessionmanager.h"
diff --git a/libkopete/avdevice/bayer.h b/libkopete/avdevice/bayer.h
index bdca11490..635772cad 100644
--- a/libkopete/avdevice/bayer.h
+++ b/libkopete/avdevice/bayer.h
@@ -26,4 +26,9 @@
* SUCH DAMAGE.
*/

+#ifndef _KOPETE_BAYER_H_
+#define _KOPETE_BAYER_H_
+
void bayer2rgb24(unsigned char *dst, unsigned char *src, long int WIDTH, long int HEIGHT);
+
+#endif
diff --git a/libkopete/avdevice/sonix_compress.h b/libkopete/avdevice/sonix_compress.h
index 509bcb077..590eef557 100644
--- a/libkopete/avdevice/sonix_compress.h
+++ b/libkopete/avdevice/sonix_compress.h
@@ -1,3 +1,6 @@
+#ifndef _KOPETE_SONIX_COMPRESS_H_
+#define _KOPETE_SONIX_COMPRESS_H_
+
// Call this function first (just once is needed), before calling sonix_decompress
void sonix_decompress_init(void);

@@ -6,3 +9,5 @@ int sonix_decompress(int width, int height, unsigned char *inp, unsigned char *o

// counter to detect presence of currently unknown huffman codes
extern int sonix_unknown;
+
+#endif
diff --git a/libkopete/kopeteaccount.cpp b/libkopete/kopeteaccount.cpp
index 236853a90..5bce0c7c8 100644
--- a/libkopete/kopeteaccount.cpp
+++ b/libkopete/kopeteaccount.cpp
@@ -26,7 +26,6 @@
#include <QIcon>
#include <QPointer>
#include <QDialog>
-#include <QIcon>
#include <QAction>
#include <QDialogButtonBox>
#include <QPushButton>
diff --git a/libkopete/kopetecontact.h b/libkopete/kopetecontact.h
index f1e0fae99..18b5c2c75 100644
--- a/libkopete/kopetecontact.h
+++ b/libkopete/kopetecontact.h
@@ -89,7 +89,7 @@ public:

/**
* These functions do conversion between enum NameType and QString
- * Usefull for protocol serialize/deserialize funcions
+ * Useful for protocol serialize/deserialize functions
*/
static NameType nameTypeFromString(const QString &nameType);
static const QString nameTypeToString(NameType nameType);
@@ -378,7 +378,7 @@ public:
void setPreferredNameType(NameType type);

/**
- * Returns prefered name type, used by displayName function
+ * Returns preferred name type, used by displayName function
* Default is CustomName
*/
NameType preferredNameType() const;
diff --git a/libkopete/private/kopeteidleplatform_x11.cpp b/libkopete/private/kopeteidleplatform_x11.cpp
index fa208b027..8c06dd7f4 100644
--- a/libkopete/private/kopeteidleplatform_x11.cpp
+++ b/libkopete/private/kopeteidleplatform_x11.cpp
@@ -17,11 +17,11 @@

#include "kopeteidleplatform_p.h"

-#include <QtCore/QObject>
-#include <QtCore/QDateTime>
+#include <QObject>
+#include <QDateTime>
#include <QX11Info>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
+#include <QDBusInterface>
+#include <QDBusReply>

#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff --git a/libkopete/ui/avatarwebcamdialog.h b/libkopete/ui/avatarwebcamdialog.h
index 51d7c3563..49a27dad4 100644
--- a/libkopete/ui/avatarwebcamdialog.h
+++ b/libkopete/ui/avatarwebcamdialog.h
@@ -15,8 +15,8 @@
*************************************************************************
*/

-#ifndef KOPETE_AVATARFROMWEBCAMDIALOG_H
-#define KOPETE_AVATARFROMWEBCAMDIALOG_H
+#ifndef KOPETE_AVATARWEBCAMDIALOG_H
+#define KOPETE_AVATARWEBCAMDIALOG_H

// KDE includes
#include <QDialog>
diff --git a/libkopete/ui/contactaddednotifydialog.cpp b/libkopete/ui/contactaddednotifydialog.cpp
index 02431956b..e5c865641 100644
--- a/libkopete/ui/contactaddednotifydialog.cpp
+++ b/libkopete/ui/contactaddednotifydialog.cpp
@@ -25,7 +25,6 @@

#include <kcontacts/addressee.h>
#include <QDialogButtonBox>
-#include <QPushButton>
#include <QVBoxLayout>

#include "kopetegroup.h"
diff --git a/plugins/history/converter.cpp b/plugins/history/converter.cpp
index 9e5fa7d06..5ff69b255 100644
--- a/plugins/history/converter.cpp
+++ b/plugins/history/converter.cpp
@@ -12,11 +12,11 @@
* the accountId, to know each protocol id, and more
*-----------------------------------------------------------*/

-#include <QtCore/QDir>
-#include <QtCore/QRegExp>
-#include <QtCore/QTextStream>
+#include <QDir>
+#include <QRegExp>
+#include <QTextStream>
#include <QApplication>
-#include <QtXml/QDomDocument>
+#include <QDomDocument>

#include <kconfig.h>
#include <kdebug.h>
diff --git a/plugins/history/historydialog.cpp b/plugins/history/historydialog.cpp
index c88ce515e..f31194688 100644
--- a/plugins/history/historydialog.cpp
+++ b/plugins/history/historydialog.cpp
@@ -18,12 +18,12 @@

#include "historydialog.h"

-#include <QtCore/QPointer>
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
-#include <QtGui/QClipboard>
-#include <QtGui/QTextDocument>
+#include <QPointer>
+#include <QDir>
+#include <QTextStream>
+#include <QTimer>
+#include <QClipboard>
+#include <QTextDocument>

#include <kdebug.h>
#include <krun.h>
diff --git a/plugins/history/historyguiclient.cpp b/plugins/history/historyguiclient.cpp
index a205824b0..1a472050d 100644
--- a/plugins/history/historyguiclient.cpp
+++ b/plugins/history/historyguiclient.cpp
@@ -17,9 +17,9 @@

#include "historyguiclient.h"

-#include <QtCore/QList>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
+#include <QList>
+#include <QTextCursor>
+#include <QTextDocument>

#include <QAction>
#include <kstandardaction.h>
diff --git a/plugins/history/historyimport.cpp b/plugins/history/historyimport.cpp
index c5cec2de4..c5e7fefee 100644
--- a/plugins/history/historyimport.cpp
+++ b/plugins/history/historyimport.cpp
@@ -17,8 +17,8 @@

#include "historyimport.h"

-#include <QtCore/QStack>
-#include <QtCore/QDir>
+#include <QStack>
+#include <QDir>
#include <QTextEdit>
#include <QTreeView>
#include <QPushButton>
diff --git a/plugins/history/historylogger.cpp b/plugins/history/historylogger.cpp
index c3bc80de3..11a411e33 100644
--- a/plugins/history/historylogger.cpp
+++ b/plugins/history/historylogger.cpp
@@ -17,15 +17,15 @@

#include "historylogger.h"

-#include <QtCore/QRegExp>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QDateTime>
-#include <QtCore/QTimer>
-#include <QtCore/QTextStream>
-#include <QtCore/QList>
-#include <QtCore/QDate>
-#include <QtGui/QTextDocument>
+#include <QRegExp>
+#include <QFile>
+#include <QDir>
+#include <QDateTime>
+#include <QTimer>
+#include <QTextStream>
+#include <QList>
+#include <QDate>
+#include <QTextDocument>

#include <kdebug.h>

diff --git a/plugins/history/historyplugin.cpp b/plugins/history/historyplugin.cpp
index 1741c8875..1d064df1a 100644
--- a/plugins/history/historyplugin.cpp
+++ b/plugins/history/historyplugin.cpp
@@ -18,7 +18,7 @@

#include "historyplugin.h"

-#include <QtCore/QList>
+#include <QList>

#include <kpluginfactory.h>
#include <kaboutdata.h>
diff --git a/plugins/history2/history2dialog.cpp b/plugins/history2/history2dialog.cpp
index 50c00072d..4a970cbb6 100644
--- a/plugins/history2/history2dialog.cpp
+++ b/plugins/history2/history2dialog.cpp
@@ -18,11 +18,11 @@

#include "history2dialog.h"

-#include <QtCore/QPointer>
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
-#include <QtGui/QClipboard>
-#include <QtGui/QTextDocument>
+#include <QPointer>
+#include <QDir>
+#include <QTextStream>
+#include <QClipboard>
+#include <QTextDocument>
#include <QtAlgorithms>

#include <kdebug.h>
diff --git a/plugins/history2/history2dialog.h b/plugins/history2/history2dialog.h
index b12795e25..0f2edb5b4 100644
--- a/plugins/history2/history2dialog.h
+++ b/plugins/history2/history2dialog.h
@@ -16,8 +16,8 @@
*************************************************************************
*/

-#ifndef HISTORYDIALOG_H
-#define HISTORYDIALOG_H
+#ifndef HISTORY2DIALOG_H
+#define HISTORY2DIALOG_H

#include <QList>

diff --git a/plugins/history2/history2guiclient.cpp b/plugins/history2/history2guiclient.cpp
index 5927496f3..156220463 100644
--- a/plugins/history2/history2guiclient.cpp
+++ b/plugins/history2/history2guiclient.cpp
@@ -17,9 +17,9 @@

#include "history2guiclient.h"

-#include <QtCore/QList>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
+#include <QList>
+#include <QTextCursor>
+#include <QTextDocument>

#include <kaction.h>
#include <kstandardaction.h>
diff --git a/plugins/history2/history2guiclient.h b/plugins/history2/history2guiclient.h
index eae5c1278..e4b6d63e9 100644
--- a/plugins/history2/history2guiclient.h
+++ b/plugins/history2/history2guiclient.h
@@ -14,8 +14,8 @@
* *
*************************************************************************
*/
-#ifndef HISTORYGUICLIENT_H
-#define HISTORYGUICLIENT_H
+#ifndef HISTORY2GUICLIENT_H
+#define HISTORY2GUICLIENT_H

#include <QObject>

diff --git a/plugins/history2/history2import.h b/plugins/history2/history2import.h
index b99d80e68..accd9b0e2 100644
--- a/plugins/history2/history2import.h
+++ b/plugins/history2/history2import.h
@@ -15,8 +15,8 @@
*************************************************************************
*/

-#ifndef HISTORYIMPORT_H
-#define HISTORYIMPORT_H
+#ifndef HISTORY2IMPORT_H
+#define HISTORY2IMPORT_H

#include <QTextCursor>
#include <QHash>
diff --git a/plugins/history2/history2logger.cpp b/plugins/history2/history2logger.cpp
index 45c9a49b0..eb06ba5aa 100644
--- a/plugins/history2/history2logger.cpp
+++ b/plugins/history2/history2logger.cpp
@@ -18,15 +18,15 @@

#include "history2logger.h"

-#include <QtCore/QRegExp>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QDateTime>
-#include <QtCore/QTimer>
-#include <QtCore/QTextStream>
-#include <QtCore/QList>
-#include <QtCore/QDate>
-#include <QtGui/QTextDocument>
+#include <QRegExp>
+#include <QFile>
+#include <QDir>
+#include <QDateTime>
+#include <QTimer>
+#include <QTextStream>
+#include <QList>
+#include <QDate>
+#include <QTextDocument>
#include <QSqlDatabase>
#include <QSqlQuery>
#include <QSqlRecord>
diff --git a/plugins/history2/history2logger.h b/plugins/history2/history2logger.h
index f18af5903..4ae876077 100644
--- a/plugins/history2/history2logger.h
+++ b/plugins/history2/history2logger.h
@@ -15,8 +15,8 @@
*************************************************************************
*/

-#ifndef HISTORYLOGGER_H
-#define HISTORYLOGGER_H
+#ifndef HISTORY2LOGGER_H
+#define HISTORY2LOGGER_H

#include <QObject>
#include <QList>
diff --git a/plugins/history2/history2plugin.cpp b/plugins/history2/history2plugin.cpp
index dadec4fec..5da820fa6 100644
--- a/plugins/history2/history2plugin.cpp
+++ b/plugins/history2/history2plugin.cpp
@@ -18,7 +18,7 @@

#include "history2plugin.h"

-#include <QtCore/QList>
+#include <QList>

#include <kpluginfactory.h>
#include <kaboutdata.h>
diff --git a/plugins/history2/history2plugin.h b/plugins/history2/history2plugin.h
index 4148620d2..6850b80b8 100644
--- a/plugins/history2/history2plugin.h
+++ b/plugins/history2/history2plugin.h
@@ -15,8 +15,8 @@
*************************************************************************
*/

-#ifndef HISTORYPLUGIN_H
-#define HISTORYPLUGIN_H
+#ifndef HISTORY2PLUGIN_H
+#define HISTORY2PLUGIN_H

#include <QPointer>
#include <QMap>
diff --git a/plugins/history2/history2preferences.cpp b/plugins/history2/history2preferences.cpp
index ec7449b7e..a13b6bff7 100644
--- a/plugins/history2/history2preferences.cpp
+++ b/plugins/history2/history2preferences.cpp
@@ -18,10 +18,10 @@

#include "history2preferences.h"

-#include <QtCore/QPointer>
-#include <QtGui/QLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QCheckBox>
+#include <QPointer>
+#include <QLayout>
+#include <QVBoxLayout>
+#include <QCheckBox>

#include <kcolorbutton.h>
#include <knuminput.h>
diff --git a/plugins/history2/history2preferences.h b/plugins/history2/history2preferences.h
index ed9de06df..b09c835d3 100644
--- a/plugins/history2/history2preferences.h
+++ b/plugins/history2/history2preferences.h
@@ -16,8 +16,8 @@
*************************************************************************
*/

-#ifndef HISTORYPREFERENCES_H
-#define HISTORYPREFERENCES_H
+#ifndef HISTORY2PREFERENCES_H
+#define HISTORY2PREFERENCES_H

#include <kcmodule.h>

diff --git a/plugins/nowlistening/nlamarok.cpp b/plugins/nowlistening/nlamarok.cpp
index 60247c3cb..b0b0f307c 100644
--- a/plugins/nowlistening/nlamarok.cpp
+++ b/plugins/nowlistening/nlamarok.cpp
@@ -25,8 +25,6 @@

#include <kdebug.h>

-#include <QtDBus>
-
#include "nlmediaplayer.h"

// from kvirc mpris interface
diff --git a/plugins/nowlistening/nlaudacious.cpp b/plugins/nowlistening/nlaudacious.cpp
index de2e96d08..7f49a02ea 100644
--- a/plugins/nowlistening/nlaudacious.cpp
+++ b/plugins/nowlistening/nlaudacious.cpp
@@ -26,8 +26,6 @@

#include <kdebug.h>

-#include <QtDBus/QtDBus>
-
struct audaciousPlayerStatus
{
int state; // 0 = Playing, 1 = Paused, 2 = Stopped.
diff --git a/plugins/nowlistening/nlaudacious.h b/plugins/nowlistening/nlaudacious.h
index 53f6d1c68..a1b94cb47 100644
--- a/plugins/nowlistening/nlaudacious.h
+++ b/plugins/nowlistening/nlaudacious.h
@@ -26,6 +26,8 @@
#ifndef NLaudacious_H
#define NLaudacious_H

+#include <QtDBus>
+
#include "nlmediaplayer.h"

class QDBusInterface;
diff --git a/plugins/nowlistening/nljuk.cpp b/plugins/nowlistening/nljuk.cpp
index bbb997ad4..85927267f 100644
--- a/plugins/nowlistening/nljuk.cpp
+++ b/plugins/nowlistening/nljuk.cpp
@@ -25,8 +25,6 @@

#include <kdebug.h>

-#include <QtDBus>
-
#include "nlmediaplayer.h"

NLJuk::NLJuk() : NLMediaPlayer()
diff --git a/plugins/nowlistening/nlkaffeine.cpp b/plugins/nowlistening/nlkaffeine.cpp
index ed0d5352c..bbcb2cbd2 100644
--- a/plugins/nowlistening/nlkaffeine.cpp
+++ b/plugins/nowlistening/nlkaffeine.cpp
@@ -25,8 +25,6 @@

#include <kdebug.h>

-#include <QtDBus>
-
#include "nlmediaplayer.h"

NLKaffeine::NLKaffeine() : NLMediaPlayer()
diff --git a/plugins/nowlistening/nlkscd.cpp b/plugins/nowlistening/nlkscd.cpp
index 97b118138..14f62fdf7 100644
--- a/plugins/nowlistening/nlkscd.cpp
+++ b/plugins/nowlistening/nlkscd.cpp
@@ -25,8 +25,6 @@

#include <kdebug.h>

-#include <QtDBus>
-
#include "nlmediaplayer.h"

NLKscd::NLKscd() : NLMediaPlayer()
diff --git a/plugins/nowlistening/nlmpris.cpp b/plugins/nowlistening/nlmpris.cpp
index 6312e4299..ea07e7ca9 100644
--- a/plugins/nowlistening/nlmpris.cpp
+++ b/plugins/nowlistening/nlmpris.cpp
@@ -25,8 +25,6 @@

#include <kdebug.h>

-#include <QtDBus>
-
struct mprisPlayerStatus
{
int state; // 0 = Playing, 1 = Paused, 2 = Stopped.
diff --git a/plugins/nowlistening/nlmpris2.cpp b/plugins/nowlistening/nlmpris2.cpp
index 616761092..b94dc5dc2 100644
--- a/plugins/nowlistening/nlmpris2.cpp
+++ b/plugins/nowlistening/nlmpris2.cpp
@@ -25,8 +25,6 @@

#include <kdebug.h>

-#include <QtDBus>
-
NLmpris2::NLmpris2() : NLMediaPlayer()
{
m_type = Audio;
diff --git a/plugins/nowlistening/nlqmmp.cpp b/plugins/nowlistening/nlqmmp.cpp
index 9675ba779..5fbab3beb 100644
--- a/plugins/nowlistening/nlqmmp.cpp
+++ b/plugins/nowlistening/nlqmmp.cpp
@@ -26,8 +26,6 @@

#include <kdebug.h>

-#include <QtDBus/QtDBus>
-
#include "nlmediaplayer.h"

struct qmmpPlayerStatus
diff --git a/plugins/nowlistening/nlqmmp.h b/plugins/nowlistening/nlqmmp.h
index 9339e88cf..4ba3ec877 100644
--- a/plugins/nowlistening/nlqmmp.h
+++ b/plugins/nowlistening/nlqmmp.h
@@ -26,6 +26,8 @@
#ifndef NLQMMP_H
#define NLQMMP_H

+#include <QtDBus>
+
class QDBusInterface;

class NLqmmp : public NLMediaPlayer
diff --git a/plugins/otr/otrlchatinterface.cpp b/plugins/otr/otrlchatinterface.cpp
index 9d002e27f..318f1272c 100644
--- a/plugins/otr/otrlchatinterface.cpp
+++ b/plugins/otr/otrlchatinterface.cpp
@@ -39,7 +39,6 @@
#include "plugin_otr_debug.h"
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <KLocalizedString>
#include <kpassivepopup.h>
#include <QPushButton>

diff --git a/plugins/pipes/tests/tests.h b/plugins/pipes/tests/tests.h
index f573ea5c8..44684ab70 100644
--- a/plugins/pipes/tests/tests.h
+++ b/plugins/pipes/tests/tests.h
@@ -14,6 +14,10 @@
* *
*************************************************************************
*/
+
+#ifndef _PIPES_TESTS_H_
+#define _PIPES_TESTS_H_
+
#include <QString>

class KopeteXmlParserTests
@@ -25,3 +29,5 @@ public:
*/
static QString test1(const QString &str);
};
+
+#endif
diff --git a/plugins/privacy/privacypreferences.cpp b/plugins/privacy/privacypreferences.cpp
index ca0321c6f..bb58d065f 100644
--- a/plugins/privacy/privacypreferences.cpp
+++ b/plugins/privacy/privacypreferences.cpp
@@ -22,7 +22,6 @@

#include <kpluginfactory.h>
#include <QDialog>
-#include <QVBoxLayout>
#include <KLocalizedString>
#include <KDebug>
#include <KConfigGroup>
diff --git a/plugins/webpresence/webpresenceplugin.h b/plugins/webpresence/webpresenceplugin.h
index d947b87d5..5eb24fd37 100644
--- a/plugins/webpresence/webpresenceplugin.h
+++ b/plugins/webpresence/webpresenceplugin.h
@@ -83,7 +83,7 @@ protected Q_SLOTS:
*/
void slotUploadJobResult(KJob *);
/**
- * This slot is used for normalising the signal recieved
+ * This slot is used for normalizing the signal received
*/
void slotRecieveStatusUpdate(Kopete::Contact *, const Kopete::OnlineStatus&, const Kopete::OnlineStatus&);
/**
diff --git a/protocols/gadu/gaduaccount.cpp b/protocols/gadu/gaduaccount.cpp
index 465d47cf2..20824d600 100644
--- a/protocols/gadu/gaduaccount.cpp
+++ b/protocols/gadu/gaduaccount.cpp
@@ -1027,7 +1027,7 @@ GaduAccount::slotExportContactsListToFile()
KTemporaryFile tempFile;

if (p->saveListDialog) {
- kDebug(14100) << " save contacts to file: alread waiting for input ";
+ kDebug(14100) << " save contacts to file: already waiting for input ";
return;
}

@@ -1070,7 +1070,7 @@ GaduAccount::slotImportContactsFromFile()
QString oname;

if (p->loadListDialog) {
- kDebug(14100) << "load contacts from file: alread waiting for input ";
+ kDebug(14100) << "load contacts from file: already waiting for input ";
return;
}

diff --git a/protocols/gadu/gadurichtextformat.cpp b/protocols/gadu/gadurichtextformat.cpp
index 1974dfe0c..ac0fa96f4 100644
--- a/protocols/gadu/gadurichtextformat.cpp
+++ b/protocols/gadu/gadurichtextformat.cpp
@@ -25,8 +25,8 @@

#include "gadusession.h"

-#include <QtCore/QString>
-#include <QtCore/QRegExp>
+#include <QString>
+#include <QRegExp>

GaduRichTextFormat::GaduRichTextFormat()
{
diff --git a/protocols/groupwise/libgroupwise/bytestream.cpp b/protocols/groupwise/libgroupwise/bytestream.cpp
index df0c711c3..649dab781 100644
--- a/protocols/groupwise/libgroupwise/bytestream.cpp
+++ b/protocols/groupwise/libgroupwise/bytestream.cpp
@@ -18,8 +18,8 @@
*
*/

-#include <kdebug.h>
#include "bytestream.h"
+#include <kdebug.h>
#include <QByteArray>

// CS_NAMESPACE_BEGIN
diff --git a/protocols/jabber/jabberprotocol.cpp b/protocols/jabber/jabberprotocol.cpp
index e5dfecd1d..2de137b03 100644
--- a/protocols/jabber/jabberprotocol.cpp
+++ b/protocols/jabber/jabberprotocol.cpp
@@ -357,7 +357,6 @@ XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status ,
#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
-#include <QVBoxLayout>

void JabberProtocol::handleURL(const QString&, const QUrl &url) const
{
diff --git a/protocols/jabber/libjingle.h b/protocols/jabber/libjingle.h
index 4f7899ee9..f1124e26e 100644
--- a/protocols/jabber/libjingle.h
+++ b/protocols/jabber/libjingle.h
@@ -203,7 +203,7 @@ class Libjingle : public QObject

/**
* This signal is emitted when user go offline or not support voice call
- * After succesfull login it is all user who are online, but dont support voice call
+ * After succesful login it is all user who are online, but don't support voice call
* @param user name of user who go offline
* @param resource jabber resource of user
*/
diff --git a/protocols/jabber/xoauth2provider.cpp b/protocols/jabber/xoauth2provider.cpp
index c1ad71cfc..9ba216d6f 100644
--- a/protocols/jabber/xoauth2provider.cpp
+++ b/protocols/jabber/xoauth2provider.cpp
@@ -13,6 +13,8 @@
*************************************************************************
*/

+#include "xoauth2provider.h"
+
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QNetworkReply>
@@ -21,8 +23,6 @@
#include <QJsonDocument>
#include <QUrlQuery>

-#include "xoauth2provider.h"
-
class XOAuth2SASLContext : public QCA::SASLContext
{
Q_OBJECT
diff --git a/protocols/oscar/oscaraccount.cpp b/protocols/oscar/oscaraccount.cpp
index 3c4c707d9..30e39484b 100644
--- a/protocols/oscar/oscaraccount.cpp
+++ b/protocols/oscar/oscaraccount.cpp
@@ -39,8 +39,8 @@
#include <qfile.h>
#include <qdom.h>
#include <QHash>
-#include <QtNetwork/QSslSocket>
-#include <QtNetwork/QNetworkProxy>
+#include <QSslSocket>
+#include <QNetworkProxy>
#include <QTextDocument> // Qt::escape
#include <QAbstractButton>

diff --git a/protocols/oscar/oscarpresencesdataclasses.h b/protocols/oscar/oscarpresencesdataclasses.h
index 57d174c65..80b234918 100644
--- a/protocols/oscar/oscarpresencesdataclasses.h
+++ b/protocols/oscar/oscarpresencesdataclasses.h
@@ -15,8 +15,8 @@
*************************************************************************
*/

-#ifndef OSCARSPRESENCEDATACLASSES_H
-#define OSCARSPRESENCEDATACLASSES_H
+#ifndef OSCARSPRESENCESDATACLASSES_H
+#define OSCARSPRESENCESDATACLASSES_H

#include "oscarpresence.h"

diff --git a/protocols/qq/md5.c b/protocols/qq/md5.c
index 82460ff80..d2fb13772 100644
--- a/protocols/qq/md5.c
+++ b/protocols/qq/md5.c
@@ -46,7 +46,6 @@
* The test program should print out the same values as given in section
* A.5 of RFC 1321, reproduced below.
*/
-#include <string.h>
main()
{
static const char *const test[7] = {
diff --git a/protocols/skype/libskype/skypedbus/skypeconnection.cpp b/protocols/skype/libskype/skypedbus/skypeconnection.cpp
index ccca5414a..77b3053d5 100644
--- a/protocols/skype/libskype/skypedbus/skypeconnection.cpp
+++ b/protocols/skype/libskype/skypedbus/skypeconnection.cpp
@@ -171,9 +171,9 @@ void SkypeConnection::connectSkype(const QString &start, const QString &appName,

new SkypeAdaptor(this);
QDBusConnection busConn = BUS;
- bool registred = busConn.registerObject("/com/Skype/Client", this); //Register skype client to dbus for receiving messages to slot Notify
+ bool registered = busConn.registerObject("/com/Skype/Client", this); //Register skype client to dbus for receiving messages to slot Notify

- if ( ! registred ) {
+ if ( ! registered ) {
kDebug(SKYPE_DEBUG_GLOBAL) << "Cant register Skype communication for Kopete on D-Bus";
emit error(i18n("Cannot register Skype communication for Kopete on D-Bus"));
return;
diff --git a/tests/protocols/oscar/serverversionstest.h b/tests/protocols/oscar/serverversionstest.h
index 778da0a91..ed29c7a9e 100755
--- a/tests/protocols/oscar/serverversionstest.h
+++ b/tests/protocols/oscar/serverversionstest.h
@@ -15,8 +15,8 @@
*************************************************************************
*/

-#ifndef SERVERVERSIONSTASKTEST_H
-#define SERVERVERSIONSTASKTEST_H
+#ifndef SERVERVERSIONSTEST_H
+#define SERVERVERSIONSTEST_H

#include "oscartestbase.h"

[Yuri Chornoivan]

Git commit 5d81ddbf469baae39a375beeabdf0f5911688447 by Yuri Chornoivan.
Committed on 02/09/2018 at 08:22.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +3 -3 Modules/memory/base.h
M +1 -1 Modules/samba/ksmbstatus.cpp
M +1 -1 config-X11.h.cmake

https://commits.kde.org/kinfocenter/5d81ddbf469baae39a375beeabdf0f5911688447

diff --git a/Modules/memory/base.h b/Modules/memory/base.h
index 0ab1b73..cc62585 100644
--- a/Modules/memory/base.h
+++ b/Modules/memory/base.h
@@ -1,5 +1,5 @@
-#ifndef SETTINGS_H_
-#define SETTINGS_H_
+#ifndef BASE_H_
+#define BASE_H_

#include <QColor>

@@ -45,4 +45,4 @@ enum { /* entries for memoryInfos[] */

#define SPACING 16

-#endif /*SETTINGS_H_*/
+#endif /*BASE_H_*/
diff --git a/Modules/samba/ksmbstatus.cpp b/Modules/samba/ksmbstatus.cpp
index b450fa3..8443b28 100644
--- a/Modules/samba/ksmbstatus.cpp
+++ b/Modules/samba/ksmbstatus.cpp
@@ -132,7 +132,7 @@ void NetMon::readFromProcess() {
len=sizeof(s)-1;
strncpy(s, start, len);
s[len] = '\0';
- ////qDebug() << "recived: "<<s;
+ ////qDebug() << "received: "<<s;
if (readingpart==nfs)
processNFSLine(s, len);
else
diff --git a/config-X11.h.cmake b/config-X11.h.cmake
index 1ccd26d..7ed1b8c 100644
--- a/config-X11.h.cmake
+++ b/config-X11.h.cmake
@@ -41,4 +41,4 @@
#cmakedefine HAS_RANDR_1_3 1

/* Define if you have X11 at all */
-#cmakedefine HAVE_X11 1
\ No newline at end of file
+#cmakedefine HAVE_X11 1

[Yuri Chornoivan]

Git commit c364c727d5d85e4172495114b2da6ca1ebc9990d by Yuri Chornoivan.
Committed on 03/09/2018 at 18:25.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 cmake/modules/FindPWQuality.cmake
M +0 -2 src/account.ui
M +1 -1 src/accountinfo.h
M +1 -1 src/lib/accountmodel.cpp
M +2 -2 src/lib/accountmodel.h
M +4 -4 src/lib/modeltest.h
M +5 -0 src/passwordedit.h
M +1 -1 src/usermanager.cpp

https://commits.kde.org/user-manager/c364c727d5d85e4172495114b2da6ca1ebc9990d

diff --git a/cmake/modules/FindPWQuality.cmake b/cmake/modules/FindPWQuality.cmake
index fb4dd4d..00ef930 100644
--- a/cmake/modules/FindPWQuality.cmake
+++ b/cmake/modules/FindPWQuality.cmake
@@ -25,4 +25,4 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(pwquality DEFAULT_MSG
PWQUALITY_LIBRARY PWQUALITY_INCLUDE_DIR)

-mark_as_advanced(PWQUALITY_INCLUDE_DIR PWQUALITY_LIBRARY )
\ No newline at end of file
+mark_as_advanced(PWQUALITY_INCLUDE_DIR PWQUALITY_LIBRARY )
diff --git a/src/account.ui b/src/account.ui
index 676ea1a..7cb8d4e 100644
--- a/src/account.ui
+++ b/src/account.ui
@@ -259,8 +259,6 @@
</spacer>
</item>
</layout>
- <zorder>widget_2</zorder>
- <zorder>verticalSpacer</zorder>
</widget>
<tabstops>
<tabstop>face</tabstop>
diff --git a/src/accountinfo.h b/src/accountinfo.h
index 16c8264..aaca59d 100644
--- a/src/accountinfo.h
+++ b/src/accountinfo.h
@@ -19,7 +19,7 @@
#ifndef ACCOUNT_INFO_WIDGET
#define ACCOUNT_INFO_WIDGET

-#include <QtCore/QModelIndex>
+#include <QModelIndex>

#include <QWidget>
#include <QStringList>
diff --git a/src/lib/accountmodel.cpp b/src/lib/accountmodel.cpp
index cc00c1e..e0615e4 100644
--- a/src/lib/accountmodel.cpp
+++ b/src/lib/accountmodel.cpp
@@ -101,7 +101,7 @@ AccountModel::AccountModel(QObject* parent)
connect(m_dbus, SIGNAL(UserAdded(QDBusObjectPath)), SLOT(UserAdded(QDBusObjectPath)));
connect(m_dbus, SIGNAL(UserDeleted(QDBusObjectPath)), SLOT(UserDeleted(QDBusObjectPath)));

- connect(m_sessions, SIGNAL(userLogged(uint, bool)), SLOT(userLogged(uint, bool)));
+ connect(m_sessions, SIGNAL(userLogged(uint,bool)), SLOT(userLogged(uint,bool)));
}

AccountModel::~AccountModel()
diff --git a/src/lib/accountmodel.h b/src/lib/accountmodel.h
index 43c0e39..e3c83e8 100644
--- a/src/lib/accountmodel.h
+++ b/src/lib/accountmodel.h
@@ -21,8 +21,8 @@
#define ACCOUNTMODEL_H

#include "user_manager_debug.h"
-#include <QtCore/QStringList>
-#include <QtCore/QAbstractListModel>
+#include <QStringList>
+#include <QAbstractListModel>
#include <QDBusObjectPath>
#include <QDBusPendingReply>
#include <KEMailSettings>
diff --git a/src/lib/modeltest.h b/src/lib/modeltest.h
index f4000b4..9c59a35 100644
--- a/src/lib/modeltest.h
+++ b/src/lib/modeltest.h
@@ -24,16 +24,16 @@
#ifndef MODELTEST_H
#define MODELTEST_H

-#include <QtCore/QObject>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QStack>
+#include <QObject>
+#include <QAbstractItemModel>
+#include <QStack>

class ModelTest : public QObject
{
Q_OBJECT

public:
- ModelTest(QAbstractItemModel *model, QObject *parent = nullptr);
+ explicit ModelTest(QAbstractItemModel *model, QObject *parent = nullptr);

private Q_SLOTS:
void nonDestructiveBasicTest();
diff --git a/src/passwordedit.h b/src/passwordedit.h
index faf196f..4bbab11 100644
--- a/src/passwordedit.h
+++ b/src/passwordedit.h
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

+#ifndef PASSWORDEDIT_H
+#define PASSWORDEDIT_H
+
#include <QLineEdit>
#include <QFocusEvent>

@@ -32,3 +35,5 @@ class PasswordEdit : public QLineEdit
protected:
void focusInEvent(QFocusEvent* e) override;
};
+
+#endif
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 0045f3b..c586d0e 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -26,7 +26,7 @@

#include <pwquality.h>

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QListView>
#include <QVBoxLayout>

[Yuri Chornoivan]

Git commit 79c0c8d6791c162a43113b1fab1590161341613e by Yuri Chornoivan.
Committed on 04/09/2018 at 19:40.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +3 -3 kcmcddb/cddbconfigwidget.cpp
M +1 -1 kcmcddb/cddbconfigwidget.h
M +4 -4 kcmcddb/kcmcddb.cpp
M +0 -1 kcmcddb/kcmcddbi18n.h
M +1 -1 libkcddb/asynchttpsubmit.cpp
M +3 -3 libkcddb/cache.cpp
M +1 -1 libkcddb/cache.h
M +2 -2 libkcddb/categories.h
M +2 -2 libkcddb/cddb.cpp
M +2 -2 libkcddb/cddb.h
M +1 -1 libkcddb/cddbplookup.cpp
M +1 -1 libkcddb/cddbplookup.h
M +1 -1 libkcddb/cdinfo.cpp
M +2 -2 libkcddb/cdinfo.h
M +8 -8 libkcddb/cdinfodialog.cpp
M +1 -1 libkcddb/cdinfodialog.h
M +1 -1 libkcddb/cdinfoencodingwidget.cpp
M +1 -1 libkcddb/client.h
M +1 -1 libkcddb/genres.h
M +2 -2 libkcddb/httplookup.cpp
M +1 -1 libkcddb/httplookup.h
M +1 -1 libkcddb/httpsubmit.cpp
M +1 -1 libkcddb/httpsubmit.h
M +2 -2 libkcddb/kcddb.h
M +1 -1 libkcddb/logging.h
M +1 -1 libkcddb/lookup.cpp
M +3 -3 libkcddb/lookup.h
M +2 -2 libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
M +3 -3 libkcddb/musicbrainz/musicbrainzlookup.cpp
M +5 -5 libkcddb/sites.cpp
M +1 -1 libkcddb/sites.h
M +1 -1 libkcddb/smtpsubmit.h
M +1 -1 libkcddb/submit.h
M +1 -1 libkcddb/synccddbplookup.cpp
M +1 -1 tests/asynccddblookuptest.cpp
M +1 -1 tests/asynccddblookuptest.h
M +1 -1 tests/asynchttplookuptest.cpp
M +1 -1 tests/asynchttplookuptest.h
M +3 -3 tests/asynchttpsubmittest.cpp
M +1 -1 tests/asynchttpsubmittest.h
M +1 -1 tests/asyncmusicbrainztest.cpp
M +1 -1 tests/asyncmusicbrainztest.h
M +3 -3 tests/asyncsmtpsubmittest.cpp
M +1 -1 tests/asyncsmtpsubmittest.h
M +1 -1 tests/cachetest.cpp
M +1 -1 tests/cachetest.h
M +3 -3 tests/cdinfotest.cpp
M +1 -1 tests/cdinfotest.h
M +1 -1 tests/musicbrainztest-fulldate.cpp
M +1 -1 tests/musicbrainztest-fulldate.h
M +1 -1 tests/musicbrainztest-severaldiscs.cpp
M +1 -1 tests/musicbrainztest-severaldiscs.h
M +1 -1 tests/musicbrainztest.cpp
M +1 -1 tests/musicbrainztest.h
M +3 -3 tests/sitestest.cpp
M +2 -2 tests/synccddblookuptest.cpp
M +1 -1 tests/synccddblookuptest.h
M +2 -2 tests/synchttplookuptest.cpp
M +1 -1 tests/synchttplookuptest.h
M +2 -2 tests/synchttpsubmittest.cpp
M +2 -2 tests/syncsmtpsubmittest.cpp
M +2 -2 tests/utf8test.cpp
M +1 -1 tests/utf8test.h

https://commits.kde.org/libkcddb/79c0c8d6791c162a43113b1fab1590161341613e

diff --git a/kcmcddb/cddbconfigwidget.cpp b/kcmcddb/cddbconfigwidget.cpp
index f740f60..32b485c 100644
--- a/kcmcddb/cddbconfigwidget.cpp
+++ b/kcmcddb/cddbconfigwidget.cpp
@@ -30,9 +30,9 @@
#include <KWidgetsAddons/KMessageBox>
#include <KWidgetsAddons/KEditListWidget>

-#include <QtCore/QList>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QInputDialog>
+#include <QList>
+#include <QCheckBox>
+#include <QInputDialog>

CDDBConfigWidget::CDDBConfigWidget(QWidget * parent)
: QWidget(parent)
diff --git a/kcmcddb/cddbconfigwidget.h b/kcmcddb/cddbconfigwidget.h
index b35f956..ccde242 100644
--- a/kcmcddb/cddbconfigwidget.h
+++ b/kcmcddb/cddbconfigwidget.h
@@ -28,7 +28,7 @@ class CDDBConfigWidget : public QWidget, public Ui::CDDBConfigWidgetBase

public:

- CDDBConfigWidget(QWidget * parent = nullptr);
+ explicit CDDBConfigWidget(QWidget * parent = nullptr);

protected Q_SLOTS:

diff --git a/kcmcddb/kcmcddb.cpp b/kcmcddb/kcmcddb.cpp
index b6fd00c..1c469e7 100644
--- a/kcmcddb/kcmcddb.cpp
+++ b/kcmcddb/kcmcddb.cpp
@@ -29,10 +29,10 @@
#include <KCoreAddons/KPluginFactory>
#include <KWidgetsAddons/KMessageBox>

-#include <QtCore/QDebug>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QVBoxLayout>
+#include <QDebug>
+#include <QCheckBox>
+#include <QRadioButton>
+#include <QVBoxLayout>

K_PLUGIN_FACTORY(KCDDBFactory, registerPlugin<CDDBModule>();)
K_EXPORT_PLUGIN(KCDDBFactory( "kcmcddb" ))
diff --git a/kcmcddb/kcmcddbi18n.h b/kcmcddb/kcmcddbi18n.h
index 1e4703c..d19c34c 100644
--- a/kcmcddb/kcmcddbi18n.h
+++ b/kcmcddb/kcmcddbi18n.h
@@ -1,7 +1,6 @@
#ifndef KCMCDDBI18N_H
#define KCMCDDBI18N_H

-#define TRANSLATION_DOMAIN "kcmcddb"
#include <KI18n/KLocalizedString>

#endif // KCMCDDBI18N_H
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 31ed186..e820df6 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -20,7 +20,7 @@
#include "asynchttpsubmit.h"

#include <KIO/Job>
-#include <QtCore/QDebug>
+#include <QDebug>

namespace KCDDB
{
diff --git a/libkcddb/cache.cpp b/libkcddb/cache.cpp
index 1c3846a..de28a01 100644
--- a/libkcddb/cache.cpp
+++ b/libkcddb/cache.cpp
@@ -31,9 +31,9 @@
#include "musicbrainz/musicbrainzlookup.h"
#endif

-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
+#include <QFile>
+#include <QDir>
+#include <QTextStream>

namespace KCDDB
{
diff --git a/libkcddb/cache.h b/libkcddb/cache.h
index 3858ad4..50d39f7 100644
--- a/libkcddb/cache.h
+++ b/libkcddb/cache.h
@@ -25,7 +25,7 @@
#include "kcddb.h"
#include "cdinfo.h"

-#include <QtCore/QString>
+#include <QString>

namespace KCDDB
{
diff --git a/libkcddb/categories.h b/libkcddb/categories.h
index fde1392..d41d40e 100644
--- a/libkcddb/categories.h
+++ b/libkcddb/categories.h
@@ -9,8 +9,8 @@
#define KCDDB_CATEGORIES_H

#include <kcddb_export.h>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>

namespace KCDDB
{
diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index e86fe9f..52c8528 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -26,8 +26,8 @@

#include <KCoreAddons/KStringHandler>

-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
+#include <QDebug>
+#include <QStringList>

namespace KCDDB
{
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index d914025..e1c9e03 100644
--- a/libkcddb/cddb.h
+++ b/libkcddb/cddb.h
@@ -26,8 +26,8 @@
#include <cdinfo.h>
#include <kcddbconfig.h>

-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>

namespace KCDDB
{
diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp
index b5c6d11..6bad288 100644
--- a/libkcddb/cddbplookup.cpp
+++ b/libkcddb/cddbplookup.cpp
@@ -22,7 +22,7 @@
#include "cddbplookup.h"
#include "logging.h"

-#include <QtCore/QByteArray>
+#include <QByteArray>

namespace KCDDB
{
diff --git a/libkcddb/cddbplookup.h b/libkcddb/cddbplookup.h
index ee5aaf6..b66762e 100644
--- a/libkcddb/cddbplookup.h
+++ b/libkcddb/cddbplookup.h
@@ -24,7 +24,7 @@

#include "lookup.h"

-#include <QtNetwork/QTcpSocket>
+#include <QTcpSocket>

namespace KCDDB
{
diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp
index 9b23793..2ae8bb2 100644
--- a/libkcddb/cdinfo.cpp
+++ b/libkcddb/cdinfo.cpp
@@ -27,7 +27,7 @@
#include "logging.h"

#include <KCoreAddons/KStringHandler>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <QMap>

diff --git a/libkcddb/cdinfo.h b/libkcddb/cdinfo.h
index 4cb03a3..4910c03 100644
--- a/libkcddb/cdinfo.h
+++ b/libkcddb/cdinfo.h
@@ -23,8 +23,8 @@
#define KCDDB_CDINFO_H

#include <kcddb_export.h>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QStringList>
+#include <QVariant>

namespace KCDDB
{
diff --git a/libkcddb/cdinfodialog.cpp b/libkcddb/cdinfodialog.cpp
index ded87f1..3092fb4 100644
--- a/libkcddb/cdinfodialog.cpp
+++ b/libkcddb/cdinfodialog.cpp
@@ -26,13 +26,13 @@

#include <KCodecs/KCharsets>

-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTime>
-#include <QtGui/QStandardItemModel>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QDialogButtonBox>
+#include <QDebug>
+#include <QStringList>
+#include <QTextCodec>
+#include <QTime>
+#include <QStandardItemModel>
+#include <QVBoxLayout>
+#include <QDialogButtonBox>

using KCDDB::TrackInfo;

@@ -151,7 +151,7 @@ class CDInfoDialog::Private
QStringList labels;
labels << i18n("Track") << i18n("Length") << i18n("Title") << i18n("Artist") << i18n("Comment");
m_trackModel->setHorizontalHeaderLabels(labels);
- for (unsigned i = 0; i < tracks; i++) {
+ for (unsigned i = 0; i < tracks; ++i) {
QList<QStandardItem *> trackItems = QList<QStandardItem *>();
TrackInfo ti(info.track(i));
QStandardItem *trackNumberItem = new QStandardItem(QString().sprintf("%02d", i + 1));
diff --git a/libkcddb/cdinfodialog.h b/libkcddb/cdinfodialog.h
index 7bbbaca..cc34f4c 100644
--- a/libkcddb/cdinfodialog.h
+++ b/libkcddb/cdinfodialog.h
@@ -24,7 +24,7 @@
#include <cdinfo.h>
#include <kcddb.h>

-#include <QtWidgets/QDialog>
+#include <QDialog>

class QStandardItemModel;
class QModelIndex;
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index 568cfe7..ba382ea 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -22,7 +22,7 @@
#include "kcddbi18n.h"

#include <KCodecs/KCharsets>
-#include <QtCore/QTextCodec>
+#include <QTextCodec>

namespace KCDDB
{
diff --git a/libkcddb/client.h b/libkcddb/client.h
index 30e39d2..adb4747 100644
--- a/libkcddb/client.h
+++ b/libkcddb/client.h
@@ -24,7 +24,7 @@
#include "cdinfo.h"
#include "kcddb.h"
#include "kcddbconfig.h"
-#include <QtCore/QObject>
+#include <QObject>

namespace KCDDB
{
diff --git a/libkcddb/genres.h b/libkcddb/genres.h
index b067dbd..d93c4ac 100644
--- a/libkcddb/genres.h
+++ b/libkcddb/genres.h
@@ -9,7 +9,7 @@
#define KCDDB_GENRES_H

#include <kcddb_export.h>
-#include <QtCore/QStringList>
+#include <QStringList>

namespace KCDDB
{
diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp
index 8c27945..a9d1d39 100644
--- a/libkcddb/httplookup.cpp
+++ b/libkcddb/httplookup.cpp
@@ -22,8 +22,8 @@
#include "httplookup.h"

#include <KIO/Job>
-#include <QtCore/QDebug>
-#include <QtCore/QUrlQuery>
+#include <QDebug>
+#include <QUrlQuery>

namespace KCDDB
{
diff --git a/libkcddb/httplookup.h b/libkcddb/httplookup.h
index ed99162..13faac3 100644
--- a/libkcddb/httplookup.h
+++ b/libkcddb/httplookup.h
@@ -23,7 +23,7 @@
#define KCDDB_HTTP_LOOKUP_H

#include "lookup.h"
-#include <QtCore/QUrl>
+#include <QUrl>

namespace KIO
{
diff --git a/libkcddb/httpsubmit.cpp b/libkcddb/httpsubmit.cpp
index 96386b9..00373eb 100644
--- a/libkcddb/httpsubmit.cpp
+++ b/libkcddb/httpsubmit.cpp
@@ -21,7 +21,7 @@
#include "httpsubmit.h"

#include <KIO/Job>
-#include <QtCore/QDebug>
+#include <QDebug>

namespace KCDDB
{
diff --git a/libkcddb/httpsubmit.h b/libkcddb/httpsubmit.h
index 4b6d5e4..8dc5123 100644
--- a/libkcddb/httpsubmit.h
+++ b/libkcddb/httpsubmit.h
@@ -20,7 +20,7 @@
*/

#include "submit.h"
-#include <QtCore/QUrl>
+#include <QUrl>

namespace KCDDB
{
diff --git a/libkcddb/kcddb.h b/libkcddb/kcddb.h
index aff2636..e1f7588 100644
--- a/libkcddb/kcddb.h
+++ b/libkcddb/kcddb.h
@@ -20,8 +20,8 @@
#ifndef KCDDB_H
#define KCDDB_H

-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>

#include <kcddb_export.h>

diff --git a/libkcddb/logging.h b/libkcddb/logging.h
index d3115a8..c746115 100644
--- a/libkcddb/logging.h
+++ b/libkcddb/logging.h
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/

-#include <QtCore/QLoggingCategory>
+#include <QLoggingCategory>

Q_DECLARE_LOGGING_CATEGORY(LIBKCDDB)

diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp
index b7efae0..5d42854 100644
--- a/libkcddb/lookup.cpp
+++ b/libkcddb/lookup.cpp
@@ -21,7 +21,7 @@

#include "lookup.h"

-#include <QtCore/QDebug>
+#include <QDebug>

namespace KCDDB
{
diff --git a/libkcddb/lookup.h b/libkcddb/lookup.h
index ce8df97..69c2500 100644
--- a/libkcddb/lookup.h
+++ b/libkcddb/lookup.h
@@ -25,9 +25,9 @@
#include <cddb.h>
#include <cdinfo.h>

-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QPair>
+#include <QList>
+#include <QObject>
+#include <QPair>

namespace KCDDB
{
diff --git a/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp b/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
index 170666f..267c076 100644
--- a/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
+++ b/libkcddb/musicbrainz/asyncmusicbrainzlookup.cpp
@@ -21,8 +21,8 @@

#include "musicbrainzlookup.h"

-#include <QtCore/QDebug>
-#include <QtCore/QThread>
+#include <QDebug>
+#include <QThread>

namespace KCDDB
{
diff --git a/libkcddb/musicbrainz/musicbrainzlookup.cpp b/libkcddb/musicbrainz/musicbrainzlookup.cpp
index f3ed662..cfe7b83 100644
--- a/libkcddb/musicbrainz/musicbrainzlookup.cpp
+++ b/libkcddb/musicbrainz/musicbrainzlookup.cpp
@@ -36,8 +36,8 @@

#include <KCodecs/KCodecs>

-#include <QtCore/QCryptographicHash>
-#include <QtCore/QDebug>
+#include <QCryptographicHash>
+#include <QDebug>

#include <cstdio>
#include <cstring>
@@ -153,7 +153,7 @@ namespace KCDDB

// Prefer title and artist from the track credits, but
// it appears to be empty if same as in Recording
- // Noticable in the musicbrainztest-fulldate test,
+ // Noticeable in the musicbrainztest-fulldate test,
// where the title on the credits of track 18 are
// "Bara om min älskade väntar", but the recording
// has title "Men bara om min älskade"
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index 7b042ff..305c56a 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -20,11 +20,11 @@
#include "sites.h"

#include <KIO/Job>
-#include <QtCore/QDebug>
-#include <QtCore/QRegExp>
-#include <QtCore/QTextStream>
-#include <QtCore/QUrl>
-#include <QtCore/QUrlQuery>
+#include <QDebug>
+#include <QRegExp>
+#include <QTextStream>
+#include <QUrl>
+#include <QUrlQuery>

namespace KCDDB
{
diff --git a/libkcddb/sites.h b/libkcddb/sites.h
index 2cbaae4..b455cad 100644
--- a/libkcddb/sites.h
+++ b/libkcddb/sites.h
@@ -23,7 +23,7 @@
#include <cddb.h>
#include <lookup.h>
#include <kcddb_export.h>
-#include <QtCore/QList>
+#include <QList>

namespace KCDDB
{
diff --git a/libkcddb/smtpsubmit.h b/libkcddb/smtpsubmit.h
index 33682d3..f3fb7cc 100644
--- a/libkcddb/smtpsubmit.h
+++ b/libkcddb/smtpsubmit.h
@@ -20,7 +20,7 @@
*/

#include "submit.h"
-#include <QtCore/QUrl>
+#include <QUrl>

namespace KCDDB
{
diff --git a/libkcddb/submit.h b/libkcddb/submit.h
index ae83222..e46fedb 100644
--- a/libkcddb/submit.h
+++ b/libkcddb/submit.h
@@ -25,7 +25,7 @@

#include "cddb.h"
#include "cdinfo.h"
-#include <QtCore/QObject>
+#include <QObject>

namespace KIO
{
diff --git a/libkcddb/synccddbplookup.cpp b/libkcddb/synccddbplookup.cpp
index 8de04e2..03d4f06 100644
--- a/libkcddb/synccddbplookup.cpp
+++ b/libkcddb/synccddbplookup.cpp
@@ -22,7 +22,7 @@
#include "synccddbplookup.h"
#include "logging.h"

-#include <QtCore/QStringList>
+#include <QStringList>

namespace KCDDB
{
diff --git a/tests/asynccddblookuptest.cpp b/tests/asynccddblookuptest.cpp
index 2078d51..929b478 100644
--- a/tests/asynccddblookuptest.cpp
+++ b/tests/asynccddblookuptest.cpp
@@ -20,7 +20,7 @@
#include "asynccddblookuptest.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include <QtTest/QTest>
+#include <QTest>

void AsyncCDDBLookupTest::testLookup()
{
diff --git a/tests/asynccddblookuptest.h b/tests/asynccddblookuptest.h
index 9364b8a..3c42a79 100644
--- a/tests/asynccddblookuptest.h
+++ b/tests/asynccddblookuptest.h
@@ -21,7 +21,7 @@
#define TEST_H

#include <QEventLoop>
-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"
#include "libkcddb/kcddb.h"

diff --git a/tests/asynchttplookuptest.cpp b/tests/asynchttplookuptest.cpp
index 9208e0c..955db31 100644
--- a/tests/asynchttplookuptest.cpp
+++ b/tests/asynchttplookuptest.cpp
@@ -21,7 +21,7 @@
#include "asynchttplookuptest.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include <QtTest/QTest>
+#include <QTest>

void AsyncHTTPLookupTest::testLookup()
{
diff --git a/tests/asynchttplookuptest.h b/tests/asynchttplookuptest.h
index a1358f4..0ba0b51 100644
--- a/tests/asynchttplookuptest.h
+++ b/tests/asynchttplookuptest.h
@@ -21,7 +21,7 @@
#define TEST_H

#include <QEventLoop>
-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"
#include "libkcddb/kcddb.h"

diff --git a/tests/asynchttpsubmittest.cpp b/tests/asynchttpsubmittest.cpp
index 7b2dddb..bbc49f6 100644
--- a/tests/asynchttpsubmittest.cpp
+++ b/tests/asynchttpsubmittest.cpp
@@ -17,10 +17,10 @@
Boston, MA 02110-1301, USA.
*/

-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
-
#include "asynchttpsubmittest.h"
+#include <QDebug>
+#include <QCoreApplication>
+
#include "libkcddb/submit.h"

AsyncHTTPSubmitTest::AsyncHTTPSubmitTest(QCoreApplication& app)
diff --git a/tests/asynchttpsubmittest.h b/tests/asynchttpsubmittest.h
index 118b337..b6ca803 100644
--- a/tests/asynchttpsubmittest.h
+++ b/tests/asynchttpsubmittest.h
@@ -20,7 +20,7 @@
#ifndef TEST_H
#define TEST_H

-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"

using namespace KCDDB;
diff --git a/tests/asyncmusicbrainztest.cpp b/tests/asyncmusicbrainztest.cpp
index 5879a35..952d419 100644
--- a/tests/asyncmusicbrainztest.cpp
+++ b/tests/asyncmusicbrainztest.cpp
@@ -22,7 +22,7 @@
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>

void AsyncMusicBrainzTest::testLookup()
{
diff --git a/tests/asyncmusicbrainztest.h b/tests/asyncmusicbrainztest.h
index db600dd..b1c9054 100644
--- a/tests/asyncmusicbrainztest.h
+++ b/tests/asyncmusicbrainztest.h
@@ -21,7 +21,7 @@
#define TEST_H

#include <QEventLoop>
-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"
#include "libkcddb/kcddb.h"

diff --git a/tests/asyncsmtpsubmittest.cpp b/tests/asyncsmtpsubmittest.cpp
index ecb4ca0..d15569e 100644
--- a/tests/asyncsmtpsubmittest.cpp
+++ b/tests/asyncsmtpsubmittest.cpp
@@ -17,10 +17,10 @@
Boston, MA 02110-1301, USA.
*/

-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
-
#include "asyncsmtpsubmittest.h"
+#include <QDebug>
+#include <QCoreApplication>
+
#include "libkcddb/submit.h"

AsyncSMTPSubmitTest::AsyncSMTPSubmitTest(QCoreApplication& app)
diff --git a/tests/asyncsmtpsubmittest.h b/tests/asyncsmtpsubmittest.h
index 53eccf4..6ce80e1 100644
--- a/tests/asyncsmtpsubmittest.h
+++ b/tests/asyncsmtpsubmittest.h
@@ -20,7 +20,7 @@
#ifndef TEST_H
#define TEST_H

-#include <QtCore/QObject>
+#include <QObject>
#include "libkcddb/client.h"

using namespace KCDDB;
diff --git a/tests/cachetest.cpp b/tests/cachetest.cpp
index d5db7f6..39a9a67 100644
--- a/tests/cachetest.cpp
+++ b/tests/cachetest.cpp
@@ -23,7 +23,7 @@
#include "libkcddb/cdinfo.h"
#include "libkcddb/client.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>

using namespace KCDDB;

diff --git a/tests/cachetest.h b/tests/cachetest.h
index 6a96753..53ed056 100644
--- a/tests/cachetest.h
+++ b/tests/cachetest.h
@@ -28,7 +28,7 @@ namespace KCDDB
class Client;
}

-#include <QtCore/QObject>
+#include <QObject>

class CacheTest : public QObject
{
diff --git a/tests/cdinfotest.cpp b/tests/cdinfotest.cpp
index ce0c25b..71fce5b 100644
--- a/tests/cdinfotest.cpp
+++ b/tests/cdinfotest.cpp
@@ -17,10 +17,10 @@
Boston, MA 02110-1301, USA.
*/

-#include <QtTest/QtTest>
-#include <QtCore/QCoreApplication>
-#include "libkcddb/cdinfo.h"
#include "cdinfotest.h"
+#include <QTest>
+#include <QCoreApplication>
+#include "libkcddb/cdinfo.h"

using namespace KCDDB;

diff --git a/tests/cdinfotest.h b/tests/cdinfotest.h
index 2c1e963..e2ee594 100644
--- a/tests/cdinfotest.h
+++ b/tests/cdinfotest.h
@@ -20,7 +20,7 @@
#ifndef CDINFOTEST_H
#define CDINFOTEST_H

-#include <QtCore/QObject>
+#include <QObject>

class CDInfoTest : public QObject
{
diff --git a/tests/musicbrainztest-fulldate.cpp b/tests/musicbrainztest-fulldate.cpp
index 8c553db..ac10738 100644
--- a/tests/musicbrainztest-fulldate.cpp
+++ b/tests/musicbrainztest-fulldate.cpp
@@ -22,7 +22,7 @@
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>

void MusicBrainzTestFullDate::testLookup()
{
diff --git a/tests/musicbrainztest-fulldate.h b/tests/musicbrainztest-fulldate.h
index 8a82fb7..aed12d7 100644
--- a/tests/musicbrainztest-fulldate.h
+++ b/tests/musicbrainztest-fulldate.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTESTFULLDATE_H
#define MUSICBRAINZTESTFULLDATE_H

-#include <QtCore/QObject>
+#include <QObject>

class MusicBrainzTestFullDate : public QObject
{
diff --git a/tests/musicbrainztest-severaldiscs.cpp b/tests/musicbrainztest-severaldiscs.cpp
index bd862af..5a74cd1 100644
--- a/tests/musicbrainztest-severaldiscs.cpp
+++ b/tests/musicbrainztest-severaldiscs.cpp
@@ -22,7 +22,7 @@
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>

void MusicBrainzTestSeveralDiscs::testLookup()
{
diff --git a/tests/musicbrainztest-severaldiscs.h b/tests/musicbrainztest-severaldiscs.h
index 3435725..6ad3a76 100644
--- a/tests/musicbrainztest-severaldiscs.h
+++ b/tests/musicbrainztest-severaldiscs.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTESTSEVERALDISCS_H
#define MUSICBRAINZTESTSEVERALDISCS_H

-#include <QtCore/QObject>
+#include <QObject>

class MusicBrainzTestSeveralDiscs : public QObject
{
diff --git a/tests/musicbrainztest.cpp b/tests/musicbrainztest.cpp
index 4503f47..89d4d21 100644
--- a/tests/musicbrainztest.cpp
+++ b/tests/musicbrainztest.cpp
@@ -22,7 +22,7 @@
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
#include "config-musicbrainz.h"
-#include <QtTest/QTest>
+#include <QTest>

void MusicBrainzTest::testLookup()
{
diff --git a/tests/musicbrainztest.h b/tests/musicbrainztest.h
index 079f450..eb60091 100644
--- a/tests/musicbrainztest.h
+++ b/tests/musicbrainztest.h
@@ -20,7 +20,7 @@
#ifndef MUSICBRAINZTEST_H
#define MUSICBRAINZTEST_H

-#include <QtCore/QObject>
+#include <QObject>

class MusicBrainzTest : public QObject
{
diff --git a/tests/sitestest.cpp b/tests/sitestest.cpp
index bab5524..a910ef4 100644
--- a/tests/sitestest.cpp
+++ b/tests/sitestest.cpp
@@ -17,9 +17,9 @@
Boston, MA 02110-1301, USA.
*/

-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QList>
+#include <QDebug>
+#include <QCoreApplication>
+#include <QList>

#include "libkcddb/sites.h"

diff --git a/tests/synccddblookuptest.cpp b/tests/synccddblookuptest.cpp
index 9e240b8..bdaf648 100644
--- a/tests/synccddblookuptest.cpp
+++ b/tests/synccddblookuptest.cpp
@@ -17,11 +17,11 @@
Boston, MA 02110-1301, USA.
*/

+#include "synccddblookuptest.h"
#include "libkcddb/client.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include "synccddblookuptest.h"
-#include <QtTest/QTest>
+#include <QTest>

void SyncCDDBLookupTest::testLookup()
{
diff --git a/tests/synccddblookuptest.h b/tests/synccddblookuptest.h
index 401154b..ca22bd3 100644
--- a/tests/synccddblookuptest.h
+++ b/tests/synccddblookuptest.h
@@ -20,7 +20,7 @@
#ifndef SYNCCDDBLOOKUPTEST_H
#define SYNCCDDBLOOKUPTEST_H

-#include <QtCore/QObject>
+#include <QObject>

class SyncCDDBLookupTest : public QObject
{
diff --git a/tests/synchttplookuptest.cpp b/tests/synchttplookuptest.cpp
index 068f5a0..a46a9e7 100644
--- a/tests/synchttplookuptest.cpp
+++ b/tests/synchttplookuptest.cpp
@@ -17,11 +17,11 @@
Boston, MA 02110-1301, USA.
*/

+#include "synchttplookuptest.h"
#include "libkcddb/client.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include "synchttplookuptest.h"
-#include <QtTest/QTest>
+#include <QTest>

void SyncHTTPLookupTest::testLookup()
{
diff --git a/tests/synchttplookuptest.h b/tests/synchttplookuptest.h
index 6604ff1..6eee97c 100644
--- a/tests/synchttplookuptest.h
+++ b/tests/synchttplookuptest.h
@@ -20,7 +20,7 @@
#ifndef SYNCHTTPLOOKUPTEST_H
#define SYNCHTTPLOOKUPTEST_H

-#include <QtCore/QObject>
+#include <QObject>

class SyncHTTPLookupTest : public QObject
{
diff --git a/tests/synchttpsubmittest.cpp b/tests/synchttpsubmittest.cpp
index fb78839..1e9a3af 100644
--- a/tests/synchttpsubmittest.cpp
+++ b/tests/synchttpsubmittest.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
+#include <QDebug>
+#include <QCoreApplication>

#include "libkcddb/client.h"
#include "libkcddb/kcddbconfig.h"
diff --git a/tests/syncsmtpsubmittest.cpp b/tests/syncsmtpsubmittest.cpp
index e02c8de..1aa4765 100644
--- a/tests/syncsmtpsubmittest.cpp
+++ b/tests/syncsmtpsubmittest.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
+#include <QDebug>
+#include <QCoreApplication>

#include "libkcddb/client.h"
#include "libkcddb/kcddbconfig.h"
diff --git a/tests/utf8test.cpp b/tests/utf8test.cpp
index 8f7f37c..a4f1a99 100644
--- a/tests/utf8test.cpp
+++ b/tests/utf8test.cpp
@@ -17,11 +17,11 @@
Boston, MA 02110-1301, USA.
*/

+#include "utf8test.h"
#include "libkcddb/client.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
-#include "utf8test.h"
-#include <QtTest/QTest>
+#include <QTest>

void Utf8Test::testLookup()
{
diff --git a/tests/utf8test.h b/tests/utf8test.h
index ebd1aa3..ba7b6cd 100644
--- a/tests/utf8test.h
+++ b/tests/utf8test.h
@@ -20,7 +20,7 @@
#ifndef UTF8TEST_H
#define UTF8TEST_H

-#include <QtCore/QObject>
+#include <QObject>

class Utf8Test : public QObject
{

[Yuri Chornoivan]

Git commit c5209c4916e277c1505182eae5cbd854cc62c9c8 by Yuri Chornoivan.
Committed on 06/09/2018 at 19:02.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/fakeUpower.h
M +1 -1 autotests/fakelogind.cpp
M +1 -1 autotests/fakelogind.h
M +1 -1 autotests/qtest_dbus.h
M +1 -1 autotests/solidfreedesktoptest.cpp
M +1 -1 autotests/solidjobtest.cpp
M +1 -1 autotests/solidpowertest.cpp
M +1 -1 src/solid/devices/backends/fakehw/CMakeLists.txt
M +1 -1 src/solid/devices/backends/fstab/CMakeLists.txt
M +1 -1 src/solid/devices/backends/hal/CMakeLists.txt
M +1 -1 src/solid/devices/backends/iokit/iokitmanager.cpp
M +1 -1 src/solid/devices/backends/iokit/iokitopticaldisc.h
M +1 -1 src/solid/devices/backends/udev/CMakeLists.txt
M +1 -1 src/solid/devices/backends/udisks2/udisksdevicebackend.h
M +1 -1 src/solid/devices/backends/upower/CMakeLists.txt
M +1 -1 src/solid/devices/backends/win/CMakeLists.txt
M +1 -2 src/solid/devices/backends/win/windevice.cpp
M +1 -1 src/solid/devices/backends/win/windevicemanager.cpp
M +1 -1 src/solid/devices/frontend/battery.h
M +1 -1 src/solid/power/CMakeLists.txt
M +1 -1 src/solid/power/acpluggedjob_p.h
M +1 -1 src/solid/power/backends/abstractacpluggedjob.h
M +1 -1 src/solid/power/backends/abstractinhibition.h
M +1 -1 src/solid/power/backends/abstractrequeststatejob.h
M +1 -1 src/solid/power/backends/abstractstatesjob.h
M +1 -1 src/solid/power/backends/dummy/dummyacpluggedjob.cpp
M +1 -1 src/solid/power/backends/dummy/dummyacpluggedjob.h
M +1 -1 src/solid/power/backends/dummy/dummyinhibition.h
M +1 -1 src/solid/power/backends/dummy/dummyinhibitionjob.cpp
M +1 -1 src/solid/power/backends/dummy/dummyinhibitionjob.h
M +1 -1 src/solid/power/backends/dummy/dummypowernotifier.h
M +1 -1 src/solid/power/backends/dummy/dummyrequeststatejob.cpp
M +1 -1 src/solid/power/backends/dummy/dummyrequeststatejob.h
M +1 -1 src/solid/power/backends/dummy/dummystatesjob.h
M +1 -1 src/solid/power/backends/freedesktop/fdinhibition.h
M +1 -1 src/solid/power/backends/freedesktop/fdinhibitionjob.cpp
M +1 -1 src/solid/power/backends/freedesktop/fdinhibitionjob.h
M +1 -1 src/solid/power/backends/freedesktop/logindinhibitionargument.cpp
M +2 -2 src/solid/power/backends/freedesktop/logindinhibitionargument.h
M +1 -1 src/solid/power/inhibitionjob_p.h
M +1 -1 src/solid/power/job_p.h
M +1 -1 src/solid/power/powerbackendloader.cpp
M +1 -1 src/solid/power/requeststatejob_p.h
M +1 -1 src/solid/power/statesjob_p.h
M +1 -1 src/tools/CMakeLists.txt
M +1 -1 src/tools/solid-power/solid-power.h

https://commits.kde.org/solid/c5209c4916e277c1505182eae5cbd854cc62c9c8

diff --git a/autotests/fakeUpower.h b/autotests/fakeUpower.h
index 5e149a9..913ad98 100644
--- a/autotests/fakeUpower.h
+++ b/autotests/fakeUpower.h
@@ -51,4 +51,4 @@ public Q_SLOTS:
QDBusObjectPath GetDisplayDevice();
};

-#endif //SOLID_FAKE_UPOWER_H
\ No newline at end of file
+#endif //SOLID_FAKE_UPOWER_H
diff --git a/autotests/fakelogind.cpp b/autotests/fakelogind.cpp
index cd25ea2..52ad4bc 100644
--- a/autotests/fakelogind.cpp
+++ b/autotests/fakelogind.cpp
@@ -67,4 +67,4 @@ void FakeLogind::checkFd()
Q_EMIT inhibitionRemoved();
delete sender();
}
-}
\ No newline at end of file
+}
diff --git a/autotests/fakelogind.h b/autotests/fakelogind.h
index 05d1305..394150b 100644
--- a/autotests/fakelogind.h
+++ b/autotests/fakelogind.h
@@ -46,4 +46,4 @@ private:
int m_fd;
};

-#endif //SOLID_FAKE_LOGIND_H
\ No newline at end of file
+#endif //SOLID_FAKE_LOGIND_H
diff --git a/autotests/qtest_dbus.h b/autotests/qtest_dbus.h
index 577c7da..b90eb8d 100644
--- a/autotests/qtest_dbus.h
+++ b/autotests/qtest_dbus.h
@@ -50,4 +50,4 @@ int main(int argc, char *argv[]) \
dbus.waitForFinished(); \
return result; \
}
-#endif //SOLID_QTEST_DBUS_H
\ No newline at end of file
+#endif //SOLID_QTEST_DBUS_H
diff --git a/autotests/solidfreedesktoptest.cpp b/autotests/solidfreedesktoptest.cpp
index 88db678..8af855e 100644
--- a/autotests/solidfreedesktoptest.cpp
+++ b/autotests/solidfreedesktoptest.cpp
@@ -132,4 +132,4 @@ void solidFreedesktopTest::testRequestState()

QTEST_GUILESS_MAIN_SYSTEM_DBUS(solidFreedesktopTest)

-#include "solidfreedesktoptest.moc"
\ No newline at end of file
+#include "solidfreedesktoptest.moc"
diff --git a/autotests/solidjobtest.cpp b/autotests/solidjobtest.cpp
index a292cc6..d34a535 100644
--- a/autotests/solidjobtest.cpp
+++ b/autotests/solidjobtest.cpp
@@ -134,4 +134,4 @@ void testSolidJob::testError()

QTEST_MAIN(testSolidJob)

-#include "solidjobtest.moc"
\ No newline at end of file
+#include "solidjobtest.moc"
diff --git a/autotests/solidpowertest.cpp b/autotests/solidpowertest.cpp
index 4075257..c265901 100644
--- a/autotests/solidpowertest.cpp
+++ b/autotests/solidpowertest.cpp
@@ -121,4 +121,4 @@ void solidPowerTest::testRequestState()

QTEST_MAIN(solidPowerTest)

-#include "solidpowertest.moc"
\ No newline at end of file
+#include "solidpowertest.moc"
diff --git a/src/solid/devices/backends/fakehw/CMakeLists.txt b/src/solid/devices/backends/fakehw/CMakeLists.txt
index 3e88774..4a4249b 100644
--- a/src/solid/devices/backends/fakehw/CMakeLists.txt
+++ b/src/solid/devices/backends/fakehw/CMakeLists.txt
@@ -14,4 +14,4 @@ set(solid_LIB_SRCS ${solid_LIB_SRCS}
devices/backends/fakehw/fakestorage.cpp
devices/backends/fakehw/fakestorageaccess.cpp
devices/backends/fakehw/fakevolume.cpp
-)
\ No newline at end of file
+)
diff --git a/src/solid/devices/backends/fstab/CMakeLists.txt b/src/solid/devices/backends/fstab/CMakeLists.txt
index 2c19cbe..d2e35d8 100644
--- a/src/solid/devices/backends/fstab/CMakeLists.txt
+++ b/src/solid/devices/backends/fstab/CMakeLists.txt
@@ -5,4 +5,4 @@ set(solid_LIB_SRCS ${solid_LIB_SRCS}
devices/backends/fstab/fstabstorageaccess.cpp
devices/backends/fstab/fstabhandling.cpp
devices/backends/fstab/fstabwatcher.cpp
-)
\ No newline at end of file
+)
diff --git a/src/solid/devices/backends/hal/CMakeLists.txt b/src/solid/devices/backends/hal/CMakeLists.txt
index 5e23a5f..1103534 100644
--- a/src/solid/devices/backends/hal/CMakeLists.txt
+++ b/src/solid/devices/backends/hal/CMakeLists.txt
@@ -14,4 +14,4 @@ set(solid_LIB_SRCS ${solid_LIB_SRCS}
devices/backends/hal/halstorageaccess.cpp
devices/backends/hal/halstorage.cpp
devices/backends/hal/halvolume.cpp
-)
\ No newline at end of file
+)
diff --git a/src/solid/devices/backends/iokit/iokitmanager.cpp b/src/solid/devices/backends/iokit/iokitmanager.cpp
index 869ce93..5d20dd9 100644
--- a/src/solid/devices/backends/iokit/iokitmanager.cpp
+++ b/src/solid/devices/backends/iokit/iokitmanager.cpp
@@ -52,7 +52,7 @@ public:
QSet<Solid::DeviceInterface::Type> supportedInterfaces;
};

-// gets all registry pathes from an iterator
+// gets all registry paths from an iterator
QStringList IOKitManagerPrivate::devicesFromRegistry(io_iterator_t it)
{
QStringList result;
diff --git a/src/solid/devices/backends/iokit/iokitopticaldisc.h b/src/solid/devices/backends/iokit/iokitopticaldisc.h
index ade7383..53df602 100644
--- a/src/solid/devices/backends/iokit/iokitopticaldisc.h
+++ b/src/solid/devices/backends/iokit/iokitopticaldisc.h
@@ -40,7 +40,7 @@ public:
IOKitOpticalDisc(const IOKitDevice *device);
virtual ~IOKitOpticalDisc();

- // overriden from IOKit::Block because optical discs must
+ // overridden from IOKit::Block because optical discs must
// be accessed through the raw device.
virtual QString device() const override;

diff --git a/src/solid/devices/backends/udev/CMakeLists.txt b/src/solid/devices/backends/udev/CMakeLists.txt
index 08c59f1..7f8a84f 100644
--- a/src/solid/devices/backends/udev/CMakeLists.txt
+++ b/src/solid/devices/backends/udev/CMakeLists.txt
@@ -24,4 +24,4 @@ set_package_properties(MediaPlayerInfo PROPERTIES
PURPOSE "Runtime-only dependency of the udev solid backend. Support for m-p-i is included even if not found during build"
URL "http://www.freedesktop.org/wiki/Software/media-player-info"
TYPE RUNTIME
-)
\ No newline at end of file
+)
diff --git a/src/solid/devices/backends/udisks2/udisksdevicebackend.h b/src/solid/devices/backends/udisks2/udisksdevicebackend.h
index 3c1f156..d95040f 100644
--- a/src/solid/devices/backends/udisks2/udisksdevicebackend.h
+++ b/src/solid/devices/backends/udisks2/udisksdevicebackend.h
@@ -86,4 +86,4 @@ private:
} /* namespace Backends */
} /* namespace Solid */

-#endif /* UDISKSDEVICEBACKEND_H */
\ No newline at end of file
+#endif /* UDISKSDEVICEBACKEND_H */
diff --git a/src/solid/devices/backends/upower/CMakeLists.txt b/src/solid/devices/backends/upower/CMakeLists.txt
index 8daa8b0..ec924bf 100644
--- a/src/solid/devices/backends/upower/CMakeLists.txt
+++ b/src/solid/devices/backends/upower/CMakeLists.txt
@@ -4,4 +4,4 @@ set(solid_LIB_SRCS ${solid_LIB_SRCS}
devices/backends/upower/upowerbattery.cpp
devices/backends/upower/upowerdeviceinterface.cpp
devices/backends/upower/upowergenericinterface.cpp
-)
\ No newline at end of file
+)
diff --git a/src/solid/devices/backends/win/CMakeLists.txt b/src/solid/devices/backends/win/CMakeLists.txt
index 5fdf779..4d9ea3f 100644
--- a/src/solid/devices/backends/win/CMakeLists.txt
+++ b/src/solid/devices/backends/win/CMakeLists.txt
@@ -12,4 +12,4 @@ set(solid_LIB_SRCS ${solid_LIB_SRCS}
devices/backends/win/winstoragedrive.cpp
devices/backends/win/winstoragevolume.cpp
devices/backends/win/winbattery.cpp
-)
\ No newline at end of file
+)
diff --git a/src/solid/devices/backends/win/windevice.cpp b/src/solid/devices/backends/win/windevice.cpp
index b4525fa..aabefa4 100644
--- a/src/solid/devices/backends/win/windevice.cpp
+++ b/src/solid/devices/backends/win/windevice.cpp
@@ -28,7 +28,6 @@
#include "winstoragedrive.h"
#include "winopticaldrive.h"
#include "winopticaldisc.h"
-#include "windevice.h"
#include "winprocessor.h"
#include "winbattery.h"

@@ -144,7 +143,7 @@ void WinDevice::initStorageDevice()
if (info->ProductIdOffset != 0) {
m_product = QString((char *)buff + info->ProductIdOffset).trimmed();
}
- } else if (info->ProductIdOffset != 0) { //fallback doesnt work for all devices
+ } else if (info->ProductIdOffset != 0) { //fallback doesn't work for all devices
QStringList tmp = QString((char *)buff + info->ProductIdOffset).trimmed().split(" ");
m_vendor = tmp.takeFirst();
m_product = tmp.join(" ");
diff --git a/src/solid/devices/backends/win/windevicemanager.cpp b/src/solid/devices/backends/win/windevicemanager.cpp
index 469456e..2c59703 100644
--- a/src/solid/devices/backends/win/windevicemanager.cpp
+++ b/src/solid/devices/backends/win/windevicemanager.cpp
@@ -211,7 +211,7 @@ QObject *Solid::Backends::Win::WinDeviceManager::createDevice(const QString &udi

void WinDeviceManager::slotDeviceAdded(const QSet<QString> &udi)
{
- QSet<QString> tmp = udi - m_devices;//dont report devices that are already known(cd drive)
+ QSet<QString> tmp = udi - m_devices;//don't report devices that are already known(cd drive)
m_devices += tmp;
m_devicesList = m_devices.toList();
qSort(m_devicesList);
diff --git a/src/solid/devices/frontend/battery.h b/src/solid/devices/frontend/battery.h
index 4ed121f..710a328 100644
--- a/src/solid/devices/frontend/battery.h
+++ b/src/solid/devices/frontend/battery.h
@@ -91,7 +91,7 @@ public:
* the state is Unknown
* - Charging : Battery is charging
* - Discharging : Battery is discharging
- * - FullyCharged: The battery is fully charged; a battery not neccessarily
+ * - FullyCharged: The battery is fully charged; a battery not necessarily
* charges up to 100%
*/
enum ChargeState { NoCharge, Charging, Discharging, FullyCharged };
diff --git a/src/solid/power/CMakeLists.txt b/src/solid/power/CMakeLists.txt
index f6dcd8d..5290fc5 100644
--- a/src/solid/power/CMakeLists.txt
+++ b/src/solid/power/CMakeLists.txt
@@ -31,4 +31,4 @@ endif()

if(WITH_NEW_POWER_ASYNC_API AND WITH_NEW_POWER_ASYNC_FREEDESKTOP)
include(power/backends/freedesktop/CMakeLists.txt)
-endif()
\ No newline at end of file
+endif()
diff --git a/src/solid/power/acpluggedjob_p.h b/src/solid/power/acpluggedjob_p.h
index 5e1e657..997cca7 100644
--- a/src/solid/power/acpluggedjob_p.h
+++ b/src/solid/power/acpluggedjob_p.h
@@ -38,4 +38,4 @@ public:
};
}//Solid namespace

-#endif //SOLID_AC_PUGGED_JOB_PRIVATE_H
\ No newline at end of file
+#endif //SOLID_AC_PUGGED_JOB_PRIVATE_H
diff --git a/src/solid/power/backends/abstractacpluggedjob.h b/src/solid/power/backends/abstractacpluggedjob.h
index 9983855..1c5b53b 100644
--- a/src/solid/power/backends/abstractacpluggedjob.h
+++ b/src/solid/power/backends/abstractacpluggedjob.h
@@ -35,4 +35,4 @@ public:
};
}

-#endif //ABSTRACT_AC_PLUGGED_JOB_H
\ No newline at end of file
+#endif //ABSTRACT_AC_PLUGGED_JOB_H
diff --git a/src/solid/power/backends/abstractinhibition.h b/src/solid/power/backends/abstractinhibition.h
index 54d26a4..59b909f 100644
--- a/src/solid/power/backends/abstractinhibition.h
+++ b/src/solid/power/backends/abstractinhibition.h
@@ -49,4 +49,4 @@ Q_SIGNALS:
void stateChanged(Inhibition::State state);
};
} //Solid nanmespace
-#endif //ABSTRACT_INHIBITION_H
\ No newline at end of file
+#endif //ABSTRACT_INHIBITION_H
diff --git a/src/solid/power/backends/abstractrequeststatejob.h b/src/solid/power/backends/abstractrequeststatejob.h
index 389f045..577cc90 100644
--- a/src/solid/power/backends/abstractrequeststatejob.h
+++ b/src/solid/power/backends/abstractrequeststatejob.h
@@ -37,4 +37,4 @@ public:
};
}

-#endif //ABSTRACT_REQUEST_STATE_JOB_H
\ No newline at end of file
+#endif //ABSTRACT_REQUEST_STATE_JOB_H
diff --git a/src/solid/power/backends/abstractstatesjob.h b/src/solid/power/backends/abstractstatesjob.h
index 684bf06..73d2051 100644
--- a/src/solid/power/backends/abstractstatesjob.h
+++ b/src/solid/power/backends/abstractstatesjob.h
@@ -37,4 +37,4 @@ public:
};
}

-#endif //ABSTRACT_STATES_JOB_H
\ No newline at end of file
+#endif //ABSTRACT_STATES_JOB_H
diff --git a/src/solid/power/backends/dummy/dummyacpluggedjob.cpp b/src/solid/power/backends/dummy/dummyacpluggedjob.cpp
index ba63b8e..b66a6d0 100644
--- a/src/solid/power/backends/dummy/dummyacpluggedjob.cpp
+++ b/src/solid/power/backends/dummy/dummyacpluggedjob.cpp
@@ -30,4 +30,4 @@ void DummyAcPluggedJob::doStart()
bool DummyAcPluggedJob::isPlugged() const
{
return true;
-}
\ No newline at end of file
+}
diff --git a/src/solid/power/backends/dummy/dummyacpluggedjob.h b/src/solid/power/backends/dummy/dummyacpluggedjob.h
index d48d96c..f9bbd7c 100644
--- a/src/solid/power/backends/dummy/dummyacpluggedjob.h
+++ b/src/solid/power/backends/dummy/dummyacpluggedjob.h
@@ -36,4 +36,4 @@ private Q_SLOTS:
};
}

-#endif //UPOWER_AC_PLUGGED_JOB_H
\ No newline at end of file
+#endif //UPOWER_AC_PLUGGED_JOB_H
diff --git a/src/solid/power/backends/dummy/dummyinhibition.h b/src/solid/power/backends/dummy/dummyinhibition.h
index 0f55d83..7abafda 100644
--- a/src/solid/power/backends/dummy/dummyinhibition.h
+++ b/src/solid/power/backends/dummy/dummyinhibition.h
@@ -48,4 +48,4 @@ public:
};
}

-#endif //SOLID_DUMMY_INHIBITION_H
\ No newline at end of file
+#endif //SOLID_DUMMY_INHIBITION_H
diff --git a/src/solid/power/backends/dummy/dummyinhibitionjob.cpp b/src/solid/power/backends/dummy/dummyinhibitionjob.cpp
index d3a2f7b..e150711 100644
--- a/src/solid/power/backends/dummy/dummyinhibitionjob.cpp
+++ b/src/solid/power/backends/dummy/dummyinhibitionjob.cpp
@@ -43,4 +43,4 @@ Inhibition* DummyInhibitionJob::inhibition()
dummyInhibition->description = m_description;

return new Inhibition(dummyInhibition);
-}
\ No newline at end of file
+}
diff --git a/src/solid/power/backends/dummy/dummyinhibitionjob.h b/src/solid/power/backends/dummy/dummyinhibitionjob.h
index 71c4ece..75886e7 100644
--- a/src/solid/power/backends/dummy/dummyinhibitionjob.h
+++ b/src/solid/power/backends/dummy/dummyinhibitionjob.h
@@ -42,4 +42,4 @@ private:
QString m_description;
};
}
-#endif //SOLID_DUMMY_ADD_INHIBITION_JOB_H
\ No newline at end of file
+#endif //SOLID_DUMMY_ADD_INHIBITION_JOB_H
diff --git a/src/solid/power/backends/dummy/dummypowernotifier.h b/src/solid/power/backends/dummy/dummypowernotifier.h
index adf45bc..330bfad 100644
--- a/src/solid/power/backends/dummy/dummypowernotifier.h
+++ b/src/solid/power/backends/dummy/dummypowernotifier.h
@@ -36,4 +36,4 @@ private Q_SLOTS:
};
}

-#endif //SOLID_DUMMY_POWER_NOTIFIER_H
\ No newline at end of file
+#endif //SOLID_DUMMY_POWER_NOTIFIER_H
diff --git a/src/solid/power/backends/dummy/dummyrequeststatejob.cpp b/src/solid/power/backends/dummy/dummyrequeststatejob.cpp
index 9815a7e..d12a6b6 100644
--- a/src/solid/power/backends/dummy/dummyrequeststatejob.cpp
+++ b/src/solid/power/backends/dummy/dummyrequeststatejob.cpp
@@ -31,4 +31,4 @@ void DummyRequestStateJob::doStart()
setErrorText(QLatin1Literal("State Brightness is unsupported"));
}
emitResult();
-}
\ No newline at end of file
+}
diff --git a/src/solid/power/backends/dummy/dummyrequeststatejob.h b/src/solid/power/backends/dummy/dummyrequeststatejob.h
index a49edaf..28cd2a0 100644
--- a/src/solid/power/backends/dummy/dummyrequeststatejob.h
+++ b/src/solid/power/backends/dummy/dummyrequeststatejob.h
@@ -34,4 +34,4 @@ private Q_SLOTS:
};
}

-#endif //DUMMY_REQUEST_STATE_JOB_H
\ No newline at end of file
+#endif //DUMMY_REQUEST_STATE_JOB_H
diff --git a/src/solid/power/backends/dummy/dummystatesjob.h b/src/solid/power/backends/dummy/dummystatesjob.h
index 2ddf0e8..5ad3d8e 100644
--- a/src/solid/power/backends/dummy/dummystatesjob.h
+++ b/src/solid/power/backends/dummy/dummystatesjob.h
@@ -36,4 +36,4 @@ private Q_SLOTS:
};
}

-#endif //DUMMY_STATES_JOB_H
\ No newline at end of file
+#endif //DUMMY_STATES_JOB_H
diff --git a/src/solid/power/backends/freedesktop/fdinhibition.h b/src/solid/power/backends/freedesktop/fdinhibition.h
index 7afc09a..5dd5bf9 100644
--- a/src/solid/power/backends/freedesktop/fdinhibition.h
+++ b/src/solid/power/backends/freedesktop/fdinhibition.h
@@ -58,4 +58,4 @@ private:
};
}

-#endif //SOLID_FD_INHIBITION_H
\ No newline at end of file
+#endif //SOLID_FD_INHIBITION_H
diff --git a/src/solid/power/backends/freedesktop/fdinhibitionjob.cpp b/src/solid/power/backends/freedesktop/fdinhibitionjob.cpp
index d1aff29..7430d7a 100644
--- a/src/solid/power/backends/freedesktop/fdinhibitionjob.cpp
+++ b/src/solid/power/backends/freedesktop/fdinhibitionjob.cpp
@@ -57,4 +57,4 @@ void FdInhibitionJob::stateChanged(Inhibition::State state)
Inhibition* FdInhibitionJob::inhibition()
{
return new Inhibition(m_inhibition);
-}
\ No newline at end of file
+}
diff --git a/src/solid/power/backends/freedesktop/fdinhibitionjob.h b/src/solid/power/backends/freedesktop/fdinhibitionjob.h
index 0e79da6..d99d889 100644
--- a/src/solid/power/backends/freedesktop/fdinhibitionjob.h
+++ b/src/solid/power/backends/freedesktop/fdinhibitionjob.h
@@ -48,4 +48,4 @@ private:
FdInhibition *m_inhibition;
};
}
-#endif //SOLID_FD_ADD_INHIBITION_JOB_H
\ No newline at end of file
+#endif //SOLID_FD_ADD_INHIBITION_JOB_H
diff --git a/src/solid/power/backends/freedesktop/logindinhibitionargument.cpp b/src/solid/power/backends/freedesktop/logindinhibitionargument.cpp
index 9e9619a..3692339 100644
--- a/src/solid/power/backends/freedesktop/logindinhibitionargument.cpp
+++ b/src/solid/power/backends/freedesktop/logindinhibitionargument.cpp
@@ -34,4 +34,4 @@ QString LogindInhibitionArgument::fromPowerState(Power::InhibitionTypes states)
args << QStringLiteral("shutdown");
}
return args.join(QChar(':'));
-}
\ No newline at end of file
+}
diff --git a/src/solid/power/backends/freedesktop/logindinhibitionargument.h b/src/solid/power/backends/freedesktop/logindinhibitionargument.h
index 4590396..d93f1cf 100644
--- a/src/solid/power/backends/freedesktop/logindinhibitionargument.h
+++ b/src/solid/power/backends/freedesktop/logindinhibitionargument.h
@@ -24,7 +24,7 @@

#include "solid/power/power.h"
/**
- * The single responsability of this class is to create arguments valid for
+ * The single responsibility of this class is to create arguments valid for
* logind Inhibit call.
*/
namespace Solid
@@ -35,4 +35,4 @@ public:
static QString fromPowerState(Power::InhibitionTypes states);
};
}
-#endif //LOGIND_INHIBITION_ARGUMENT_H
\ No newline at end of file
+#endif //LOGIND_INHIBITION_ARGUMENT_H
diff --git a/src/solid/power/inhibitionjob_p.h b/src/solid/power/inhibitionjob_p.h
index 7c84169..d544e96 100644
--- a/src/solid/power/inhibitionjob_p.h
+++ b/src/solid/power/inhibitionjob_p.h
@@ -41,4 +41,4 @@ public:
};
}//Solid namespace

-#endif //SOLID_ADD_INHIBITION_JOB_PRIVATE_H
\ No newline at end of file
+#endif //SOLID_ADD_INHIBITION_JOB_PRIVATE_H
diff --git a/src/solid/power/job_p.h b/src/solid/power/job_p.h
index d641438..06d5a67 100644
--- a/src/solid/power/job_p.h
+++ b/src/solid/power/job_p.h
@@ -38,4 +38,4 @@ public:
Q_DECLARE_PUBLIC(Job)
};
}
-#endif //SOLID_JOB_PRIVATE
\ No newline at end of file
+#endif //SOLID_JOB_PRIVATE
diff --git a/src/solid/power/powerbackendloader.cpp b/src/solid/power/powerbackendloader.cpp
index 9cb1cc0..0661206 100644
--- a/src/solid/power/powerbackendloader.cpp
+++ b/src/solid/power/powerbackendloader.cpp
@@ -63,4 +63,4 @@ PowerNotifier* PowerBackendLoader::notifier()
return new DummyPowerNotifier();
}
return new FDPowerNotifier();
-}
\ No newline at end of file
+}
diff --git a/src/solid/power/requeststatejob_p.h b/src/solid/power/requeststatejob_p.h
index a4d58b4..3ae3ca8 100644
--- a/src/solid/power/requeststatejob_p.h
+++ b/src/solid/power/requeststatejob_p.h
@@ -39,4 +39,4 @@ public:
};
}//Solid namespace

-#endif //SOLID_REQUEST_STATE_JOB_PRIVATE_H
\ No newline at end of file
+#endif //SOLID_REQUEST_STATE_JOB_PRIVATE_H
diff --git a/src/solid/power/statesjob_p.h b/src/solid/power/statesjob_p.h
index a1284a2..1fb097c 100644
--- a/src/solid/power/statesjob_p.h
+++ b/src/solid/power/statesjob_p.h
@@ -37,4 +37,4 @@ public:
};
}//Solid namespace

-#endif //SOLID_SLEEP_STAES_JOB_PRIVATE_H
\ No newline at end of file
+#endif //SOLID_SLEEP_STAES_JOB_PRIVATE_H
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 1bb3db4..b7218a8 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -2,4 +2,4 @@ add_subdirectory(solid-hardware)

if(WITH_NEW_SOLID_JOB AND WITH_NEW_POWER_ASYNC_API)
add_subdirectory(solid-power)
-endif()
\ No newline at end of file
+endif()
diff --git a/src/tools/solid-power/solid-power.h b/src/tools/solid-power/solid-power.h
index eda9917..f8c276a 100644
--- a/src/tools/solid-power/solid-power.h
+++ b/src/tools/solid-power/solid-power.h
@@ -34,4 +34,4 @@ public:
void listen();
};

-#endif //SOLID_POWER_TOOL_H
\ No newline at end of file
+#endif //SOLID_POWER_TOOL_H

[Yuri Chornoivan]

Git commit 588d62b4c60ff0599793c20a07be5142da3a04ee by Yuri Chornoivan.
Committed on 06/09/2018 at 19:24.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/client/test_wayland_outputmanagement.cpp
M +1 -1 autotests/client/test_wayland_seat.cpp
M +1 -1 src/client/plasmawindowmodel.h
M +2 -2 src/client/protocols/fullscreen-shell.xml
M +2 -2 src/client/protocols/outputdevice.xml
M +1 -1 src/client/protocols/plasma-shell.xml
M +1 -1 src/client/protocols/plasma-window-management.xml
M +2 -2 src/client/protocols/pointer-constraints-unstable-v1.xml
M +1 -1 src/client/protocols/shadow.xml
M +2 -2 src/client/protocols/text-input-unstable-v2.xml
M +2 -2 src/server/textinput_interface.h

https://commits.kde.org/kwayland/588d62b4c60ff0599793c20a07be5142da3a04ee

diff --git a/autotests/client/test_wayland_outputmanagement.cpp b/autotests/client/test_wayland_outputmanagement.cpp
index 3b21b18..2eb723f 100644
--- a/autotests/client/test_wayland_outputmanagement.cpp
+++ b/autotests/client/test_wayland_outputmanagement.cpp
@@ -537,7 +537,7 @@ void TestWaylandOutputManagement::testScale()
//will be setApplied using the connect above

QCOMPARE(output->scale(), 3);
- QCOMPARE(output->scaleF(), 3.0); //test fowards compatibility
+ QCOMPARE(output->scaleF(), 3.0); //test forward compatibility
}


diff --git a/autotests/client/test_wayland_seat.cpp b/autotests/client/test_wayland_seat.cpp
index 05c7fbc..b769a5d 100644
--- a/autotests/client/test_wayland_seat.cpp
+++ b/autotests/client/test_wayland_seat.cpp
@@ -2183,7 +2183,7 @@ void TestWaylandSeat::testTouch()
QCOMPARE(unboundSpy.count(), 1);
QCOMPARE(destroyedSpy.count(), 0);
QVERIFY(!serverTouch->resource());
- // try to call into all the the methods of the touch interface, should not crash
+ // try to call into all the methods of the touch interface, should not crash
QCOMPARE(m_seatInterface->focusedTouch(), serverTouch);
m_seatInterface->setTimestamp(8);
QCOMPARE(m_seatInterface->touchDown(QPointF(15, 26)), 0);
diff --git a/src/client/plasmawindowmodel.h b/src/client/plasmawindowmodel.h
index 65cdaa3..ae8d69e 100644
--- a/src/client/plasmawindowmodel.h
+++ b/src/client/plasmawindowmodel.h
@@ -44,7 +44,7 @@ class Surface;
* The model resets when the PlasmaWindowManagement parent signals that its
* interface is about to be destroyed.
*
- * To use this class you can create an instance yourself, or preferrably use the
+ * To use this class you can create an instance yourself, or preferably use the
* convenience method in PlasmaWindowManagement:
* @code
* PlasmaWindowModel *model = wm->createWindowModel();
diff --git a/src/client/protocols/fullscreen-shell.xml b/src/client/protocols/fullscreen-shell.xml
index e834913..b385196 100644
--- a/src/client/protocols/fullscreen-shell.xml
+++ b/src/client/protocols/fullscreen-shell.xml
@@ -45,7 +45,7 @@

ARBITRARY_MODE:
This is a hint to the client that indicates that the compositor is
- capable of setting practially any mode on its outputs. If this
+ capable of setting practically any mode on its outputs. If this
capability is provided, wl_fullscreen_shell.present_surface_for_mode
will almost never fail and clients should feel free to set whatever
mode they like. If the compositor does not advertise this, it may
@@ -73,7 +73,7 @@
once for each capability advertised. Valid capabilities are given by
the wl_fullscreen_shell.capability enum. If clients want to take
advantage of any of these capabilities, they sould use a
- wl_display.sync request immediatly after binding to ensure that they
+ wl_display.sync request immediately after binding to ensure that they
receive all the capability events.
</description>
<arg name="capabilty" type="uint"/>
diff --git a/src/client/protocols/outputdevice.xml b/src/client/protocols/outputdevice.xml
index 8a0c1ca..21f7cb5 100644
--- a/src/client/protocols/outputdevice.xml
+++ b/src/client/protocols/outputdevice.xml
@@ -45,7 +45,7 @@
accordingly.

This object is published as global during start up for every available
- display devcies, or when one later becomes available, for example by
+ display devices, or when one later becomes available, for example by
being hotplugged via a physical connector.
</description>

@@ -257,7 +257,7 @@

<event name="colorcurves" since="2">
<description summary="output color curves">
- Decribes the color intensity profile of the output.
+ Describes the color intensity profile of the output.
Commonly used for gamma/color correction.

The array contains all color ramp values of the output.
diff --git a/src/client/protocols/plasma-shell.xml b/src/client/protocols/plasma-shell.xml
index 2f94ffd..6795b1d 100644
--- a/src/client/protocols/plasma-shell.xml
+++ b/src/client/protocols/plasma-shell.xml
@@ -203,7 +203,7 @@
Assign a role to a shell surface.

The compositor handles surfaces depending on their role.
- See the explaination below.
+ See the explanation below.

This request fails if the surface already has a role, this means
the surface role may be assigned only once.
diff --git a/src/client/protocols/plasma-window-management.xml b/src/client/protocols/plasma-window-management.xml
index 3dac258..05432f8 100644
--- a/src/client/protocols/plasma-window-management.xml
+++ b/src/client/protocols/plasma-window-management.xml
@@ -242,7 +242,7 @@
<event name="geometry" since="6">
<description summary="The geometry of this window in absolute coordinates">
This event will be sent whenever the window geometry of this org_kde_plasma_window changes.
- The coordinages are in absolute coordinates of the windowing system.
+ The coordinates are in absolute coordinates of the windowing system.
</description>
<arg name="x" type="int" summary="x position of the org_kde_plasma_window"/>
<arg name="y" type="int" summary="y position of the org_kde_plasma_window"/>
diff --git a/src/client/protocols/pointer-constraints-unstable-v1.xml b/src/client/protocols/pointer-constraints-unstable-v1.xml
index 4b95a5c..6fca84a 100644
--- a/src/client/protocols/pointer-constraints-unstable-v1.xml
+++ b/src/client/protocols/pointer-constraints-unstable-v1.xml
@@ -132,7 +132,7 @@

The request creates a new object wp_locked_pointer which is used to
interact with the lock as well as receive updates about its state. See
- the the description of wp_locked_pointer for further information.
+ the description of wp_locked_pointer for further information.

Note that while a pointer is locked, the wl_pointer objects of the
corresponding seat will not emit any wl_pointer.motion events, but
@@ -168,7 +168,7 @@

The request will create a new object wp_confined_pointer which is used
to interact with the confinement as well as receive updates about its
- state. See the the description of wp_confined_pointer for further
+ state. See the description of wp_confined_pointer for further
information.
</description>

diff --git a/src/client/protocols/shadow.xml b/src/client/protocols/shadow.xml
index 7cfab19..dfa9aa2 100644
--- a/src/client/protocols/shadow.xml
+++ b/src/client/protocols/shadow.xml
@@ -72,7 +72,7 @@
<request name="destroy" type="destructor" since="2">
<description summary="Destroy the org_kde_kwin_shadow">
Destroy the org_kde_kwin_shadow object. If the org_kde_kwin_shadow is
- still set on a wl_surface the shadow will be immediatelly removed.
+ still set on a wl_surface the shadow will be immediately removed.
Prefer to first call the request unset on the org_kde_kwin_shadow_manager and
commit the wl_surface to apply the change.
</description>
diff --git a/src/client/protocols/text-input-unstable-v2.xml b/src/client/protocols/text-input-unstable-v2.xml
index bb366c9..dbc7abd 100644
--- a/src/client/protocols/text-input-unstable-v2.xml
+++ b/src/client/protocols/text-input-unstable-v2.xml
@@ -381,8 +381,8 @@
This event should be handled as part of a following commit_string
or preedit_string event.
</description>
- <arg name="before_length" type="uint" summary="length of text before current cursor positon"/>
- <arg name="after_length" type="uint" summary="length of text after current cursor positon"/>
+ <arg name="before_length" type="uint" summary="length of text before current cursor position"/>
+ <arg name="after_length" type="uint" summary="length of text after current cursor position"/>
</event>

<event name="modifiers_map">
diff --git a/src/server/textinput_interface.h b/src/server/textinput_interface.h
index c2ed07a..9416649 100644
--- a/src/server/textinput_interface.h
+++ b/src/server/textinput_interface.h
@@ -329,8 +329,8 @@ public:
*
* The Client processes this event together with the commit string
*
- * @param beforeLength length of text before current cursor positon.
- * @param afterLength length of text after current cursor positon.
+ * @param beforeLength length of text before current cursor position.
+ * @param afterLength length of text after current cursor position.
* @see commit
**/
void deleteSurroundingText(quint32 beforeLength, quint32 afterLength);

[Yuri Chornoivan]

Git commit 0de8815e277d1e87c217efd2ace95da9aa1ae00c by Yuri Chornoivan.
Committed on 07/09/2018 at 05:57.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 docs/development/build-instructions.md
M +1 -1 docs/user/searching.md
M +3 -3 src/engine/documentiddb.h
M +3 -3 src/engine/documenttimedb.h
M +1 -1 src/engine/global.h
M +3 -3 src/engine/phraseanditerator.h
M +3 -3 src/engine/termgenerator.h
M +1 -1 src/engine/writetransaction.h
M +2 -2 src/file/extractor/idlestatemonitor.h
M +2 -2 src/file/fileindexerconfig.h
M +2 -2 src/file/powerstatemonitor.h
M +3 -3 src/file/storagedevices.h
M +2 -2 src/kioslaves/kded/baloosearchmodule.h
M +1 -1 src/lib/file.h
M +2 -2 src/qml/queryresultsmodel.h
M +0 -1 src/tools/balooshow/main.cpp

https://commits.kde.org/baloo/0de8815e277d1e87c217efd2ace95da9aa1ae00c

diff --git a/docs/development/build-instructions.md b/docs/development/build-instructions.md
index 1d405b28..577658d3 100644
--- a/docs/development/build-instructions.md
+++ b/docs/development/build-instructions.md
@@ -20,9 +20,9 @@ FIXME: What about basic requirements such as gcc and cmake?
$ git clone git://anongit.kde.org/baloo
```

-## Setting up the development enviornment
+## Setting up the development environment

-Baloo installs a number of executables and libraries. While these can be installed in `/usr/`, that requires root access and typically intefers with the distro packages. Instead we prefer installing Baloo locally, and updating the required environment variables. This isolates environment also protects us from mistakes.
+Baloo installs a number of executables and libraries. While these can be installed in `/usr/`, that requires root access and typically interfers with the distro packages. Instead we prefer installing Baloo locally, and updating the required environment variables. This isolates environment also protects us from mistakes.

Python development typically also uses an isolated environment called a virtual environment. For now we can just use their tool.

diff --git a/docs/user/searching.md b/docs/user/searching.md
index 5b238c4d..c6686737 100644
--- a/docs/user/searching.md
+++ b/docs/user/searching.md
@@ -35,7 +35,7 @@ Currently the following types are supported:

These expressions can be combined using `AND` or `OR` and additional parenthesis.

-The full list of properites which can be searched is listed below. They are
+The full list of properties which can be searched is listed below. They are
grouped by file types.

### All Files
diff --git a/src/engine/documentiddb.h b/src/engine/documentiddb.h
index 2f30290c..0c3422bf 100644
--- a/src/engine/documentiddb.h
+++ b/src/engine/documentiddb.h
@@ -18,8 +18,8 @@
*
*/

-#ifndef BALOO_INDEXINGLEVELDB_H
-#define BALOO_INDEXINGLEVELDB_H
+#ifndef BALOO_DOCUMENTIDDB_H
+#define BALOO_DOCUMENTIDDB_H

#include "engine_export.h"
#include <QByteArray>
@@ -52,4 +52,4 @@ private:

}

-#endif // BALOO_INDEXINGLEVELDB_H
+#endif // BALOO_DOCUMENTIDDB_H
diff --git a/src/engine/documenttimedb.h b/src/engine/documenttimedb.h
index 4ee2c69d..83c34176 100644
--- a/src/engine/documenttimedb.h
+++ b/src/engine/documenttimedb.h
@@ -18,8 +18,8 @@
*
*/

-#ifndef BALOO_DOCUMENTIMEDB_H
-#define BALOO_DOCUMENTIMEDB_H
+#ifndef BALOO_DOCUMENTTIMEDB_H
+#define BALOO_DOCUMENTTIMEDB_H

#include "engine_export.h"

@@ -63,4 +63,4 @@ private:

}

-#endif // BALOO_DOCUMENTVALUEDB_H
+#endif // BALOO_DOCUMENTTIMEDB_H
diff --git a/src/engine/global.h b/src/engine/global.h
index 15326b19..62ebf169 100644
--- a/src/engine/global.h
+++ b/src/engine/global.h
@@ -40,7 +40,7 @@ namespace Baloo {
* because if we open database twice at the same time and closes one of them, then it
* would invalidate the handles of both the instances and may lead to crash or some
* other undesirable behaviour. So, keeping one global database would solve this problem
- * and improve the performace too.
+ * and improve the performance too.
*/
BALOO_ENGINE_EXPORT Database* globalDatabaseInstance();
}
diff --git a/src/engine/phraseanditerator.h b/src/engine/phraseanditerator.h
index 13284fd9..0b8a176c 100644
--- a/src/engine/phraseanditerator.h
+++ b/src/engine/phraseanditerator.h
@@ -18,8 +18,8 @@
*
*/

-#ifndef BALOO_PHRASEANDITER_H
-#define BALOO_PHRASEANDITER_H
+#ifndef BALOO_PHRASEANDITERATOR_H
+#define BALOO_PHRASEANDITERATOR_H

#include "postingiterator.h"

@@ -44,4 +44,4 @@ private:
};
}

-#endif // BALOO_PHRASEANDITER_H
+#endif // BALOO_PHRASEANDITERATOR_H
diff --git a/src/engine/termgenerator.h b/src/engine/termgenerator.h
index 9f4ccc14..84fa52bc 100644
--- a/src/engine/termgenerator.h
+++ b/src/engine/termgenerator.h
@@ -18,8 +18,8 @@
*
*/

-#ifndef BALOO_TOKENIZER_H
-#define BALOO_TOKENIZER_H
+#ifndef BALOO_TERMGENERATOR_H
+#define BALOO_TERMGENERATOR_H

#include <QString>
#include "engine_export.h"
@@ -57,4 +57,4 @@ private:
};
}

-#endif // BALOO_TOKENIZER_H
+#endif // BALOO_TERMGENERATOR_H
diff --git a/src/engine/writetransaction.h b/src/engine/writetransaction.h
index 4d6d5107..07971761 100644
--- a/src/engine/writetransaction.h
+++ b/src/engine/writetransaction.h
@@ -53,7 +53,7 @@ public:
* \arg shouldDelete takes a quint64 as a parameter
*
* This function should typically be called when there are no other ReadTransaction in process
- * as that would otherwise baloon the size of the database.
+ * as that would otherwise balloon the size of the database.
*/
template <typename Functor>
void removeRecursively(quint64 parentId, Functor shouldDelete) {
diff --git a/src/file/extractor/idlestatemonitor.h b/src/file/extractor/idlestatemonitor.h
index 04403e00..d5841823 100644
--- a/src/file/extractor/idlestatemonitor.h
+++ b/src/file/extractor/idlestatemonitor.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef BALOO_EXTRACTOR_IDLE_MONITOR_H_
-#define BALOO_EXTRACTOR_IDLE_MONITOR_H_
+#ifndef BALOO_EXTRACTOR_IDLE_STATE_MONITOR_H_
+#define BALOO_EXTRACTOR_IDLE_STATE_MONITOR_H_

#include <QObject>

diff --git a/src/file/fileindexerconfig.h b/src/file/fileindexerconfig.h
index f6304542..8c7fe36f 100644
--- a/src/file/fileindexerconfig.h
+++ b/src/file/fileindexerconfig.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef BALOO_FILEINDEXER_SERVICE_CONFIG_H_
-#define BALOO_FILEINDEXER_SERVICE_CONFIG_H_
+#ifndef BALOO_FILEINDEXER_CONFIG_H_
+#define BALOO_FILEINDEXER_CONFIG_H_

#include <QObject>
#include <QList>
diff --git a/src/file/powerstatemonitor.h b/src/file/powerstatemonitor.h
index e0157f1a..956de45e 100644
--- a/src/file/powerstatemonitor.h
+++ b/src/file/powerstatemonitor.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef BALOO_FILEINDEXER_POWER_MONITOR_H_
-#define BALOO_FILEINDEXER_POWER_MONITOR_H_
+#ifndef BALOO_FILEINDEXER_POWER_STATE_MONITOR_H_
+#define BALOO_FILEINDEXER_POWER_STATE_MONITOR_H_

#include <QObject>

diff --git a/src/file/storagedevices.h b/src/file/storagedevices.h
index 737d193b..fa90e597 100644
--- a/src/file/storagedevices.h
+++ b/src/file/storagedevices.h
@@ -20,8 +20,8 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef REMOVABLEMEDIACACHE_H
-#define REMOVABLEMEDIACACHE_H
+#ifndef STORAGE_DEVICES_H
+#define STORAGE_DEVICES_H

#include <QObject>

@@ -92,4 +92,4 @@ private:

} // namespace Baloo

-#endif // REMOVABLEMEDIACACHE_H
+#endif // STORAGE_DEVICES_H
diff --git a/src/kioslaves/kded/baloosearchmodule.h b/src/kioslaves/kded/baloosearchmodule.h
index 8d4f83da..312b9724 100644
--- a/src/kioslaves/kded/baloosearchmodule.h
+++ b/src/kioslaves/kded/baloosearchmodule.h
@@ -20,8 +20,8 @@
*
*/

-#ifndef BALOO_SEARCH_KDED_MODULE_H_
-#define BALOO_SEARCH_KDED_MODULE_H_
+#ifndef KDED_BALOO_SEARCH_MODULE_H_
+#define KDED_BALOO_SEARCH_MODULE_H_

#include <KDEDModule>
#include <kdirnotify.h>
diff --git a/src/lib/file.h b/src/lib/file.h
index d92aa179..2aeb30a3 100644
--- a/src/lib/file.h
+++ b/src/lib/file.h
@@ -31,7 +31,7 @@ namespace Baloo {
/**
* @class File file.h <Baloo/File>
*
- * @short Provides acess to all File Metadata
+ * @short Provides access to all File Metadata
*
* The File class acts as a temporary container for all the file metadata.
*/
diff --git a/src/qml/queryresultsmodel.h b/src/qml/queryresultsmodel.h
index a934b44e..ff282234 100644
--- a/src/qml/queryresultsmodel.h
+++ b/src/qml/queryresultsmodel.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef BALOODATAMODEL_H
-#define BALOODATAMODEL_H
+#ifndef BALOO_QUERYRESULTSMODEL_H
+#define BALOO_QUERYRESULTSMODEL_H

#include <QAbstractListModel>
#include <QString>
diff --git a/src/tools/balooshow/main.cpp b/src/tools/balooshow/main.cpp
index 88d708c9..d545a8b2 100644
--- a/src/tools/balooshow/main.cpp
+++ b/src/tools/balooshow/main.cpp
@@ -40,7 +40,6 @@
#include "transaction.h"

#include <unistd.h>
-#include <KLocalizedString>
#include <KFileMetaData/PropertyInfo>

[Yuri Chornoivan]

Git commit a519c29e93de84e949ac308831160102cc733e59 by Yuri Chornoivan.
Committed on 07/09/2018 at 06:06.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 attic/modules/CheckCXXSourceCompiles.cmake
M +1 -1 attic/modules/CheckCXXSourceRuns.cmake
M +1 -1 attic/modules/FindExiv2.cmake
M +1 -1 attic/modules/FindKDEWIN_Packager.cmake
M +1 -1 attic/modules/FindPyQt4.cmake
M +1 -1 attic/modules/FindSIP.cmake
M +1 -1 attic/modules/Qt4Macros.cmake
M +1 -1 find-modules/FindPythonModuleGeneration.cmake
M +2 -2 kde-modules/KDECMakeSettings.cmake
M +1 -1 modules/ECMAddQch.cmake
M +1 -1 modules/ECMWinResolveSymlinks.cmake
M +6 -6 tests/GenerateSipBindings/cpplib.h

https://commits.kde.org/extra-cmake-modules/a519c29e93de84e949ac308831160102cc733e59

diff --git a/attic/modules/CheckCXXSourceCompiles.cmake b/attic/modules/CheckCXXSourceCompiles.cmake
index d2ba293..bdf5858 100644
--- a/attic/modules/CheckCXXSourceCompiles.cmake
+++ b/attic/modules/CheckCXXSourceCompiles.cmake
@@ -70,7 +70,7 @@ MACRO(CHECK_CXX_SOURCE_COMPILES SOURCE VAR)
SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
MESSAGE(STATUS "Performing Test ${VAR} - Success")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n"
+ "Performing C++ SOURCE FILE Test ${VAR} succeeded with the following output:\n"
"${OUTPUT}\n"
"Source file was:\n${SOURCE}\n")
ELSE(${VAR})
diff --git a/attic/modules/CheckCXXSourceRuns.cmake b/attic/modules/CheckCXXSourceRuns.cmake
index b8f2344..a06afc9 100644
--- a/attic/modules/CheckCXXSourceRuns.cmake
+++ b/attic/modules/CheckCXXSourceRuns.cmake
@@ -57,7 +57,7 @@ MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR)
SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
MESSAGE(STATUS "Performing Test ${VAR} - Success")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n"
+ "Performing C++ SOURCE FILE Test ${VAR} succeeded with the following output:\n"
"${OUTPUT}\n"
"Return value: ${${VAR}}\n"
"Source file was:\n${SOURCE}\n")
diff --git a/attic/modules/FindExiv2.cmake b/attic/modules/FindExiv2.cmake
index 770b3c6..2c4cbb7 100644
--- a/attic/modules/FindExiv2.cmake
+++ b/attic/modules/FindExiv2.cmake
@@ -13,7 +13,7 @@
# The minimum required version of Exiv2 can be specified using the
# standard syntax, e.g. find_package(Exiv2 0.17)
#
-# For compatiblity, also the variable EXIV2_MIN_VERSION can be set to the minimum version
+# For compatibility, also the variable EXIV2_MIN_VERSION can be set to the minimum version
# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.

# Copyright (c) 2010, Alexander Neundorf, <***@kde.org>
diff --git a/attic/modules/FindKDEWIN_Packager.cmake b/attic/modules/FindKDEWIN_Packager.cmake
index c587deb..6a8af57 100644
--- a/attic/modules/FindKDEWIN_Packager.cmake
+++ b/attic/modules/FindKDEWIN_Packager.cmake
@@ -38,7 +38,7 @@

if (WIN32)
if(NOT KDEWIN_PACKAGER_DIR)
- # check for enviroment variable
+ # check for environment variable
file(TO_CMAKE_PATH "$ENV{KDEWIN_PACKAGER_DIR}" KDEWIN_PACKAGER_DIR)
if(NOT KDEWIN_PACKAGER_DIR)
# search in the default program install folder
diff --git a/attic/modules/FindPyQt4.cmake b/attic/modules/FindPyQt4.cmake
index 3c7d288..dab7a9f 100644
--- a/attic/modules/FindPyQt4.cmake
+++ b/attic/modules/FindPyQt4.cmake
@@ -9,7 +9,7 @@
# Find the installed version of PyQt4. FindPyQt4 should only be called after
# Python has been found.
#
-# This file defines the following variables, which can also be overriden by
+# This file defines the following variables, which can also be overridden by
# users:
#
# PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
diff --git a/attic/modules/FindSIP.cmake b/attic/modules/FindSIP.cmake
index 61eaa65..58b95c8 100644
--- a/attic/modules/FindSIP.cmake
+++ b/attic/modules/FindSIP.cmake
@@ -9,7 +9,7 @@
# This file defines the following variables:
#
# SIP_VERSION - The version of SIP found expressed as a 6 digit hex number
-# suitable for comparision as a string.
+# suitable for comparison as a string.
#
# SIP_VERSION_STR - The version of SIP found as a human readable string.
#
diff --git a/attic/modules/Qt4Macros.cmake b/attic/modules/Qt4Macros.cmake
index 1422c59..24379a6 100644
--- a/attic/modules/Qt4Macros.cmake
+++ b/attic/modules/Qt4Macros.cmake
@@ -130,7 +130,7 @@ MACRO (QT4_GENERATE_MOC infile outfile )
QT4_GET_MOC_FLAGS(moc_flags)
GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "")
- SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
+ SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # don't run automoc on this file

MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
ENDMACRO (QT4_GENERATE_MOC)
diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake
index 0468f9d..c3a12ef 100644
--- a/find-modules/FindPythonModuleGeneration.cmake
+++ b/find-modules/FindPythonModuleGeneration.cmake
@@ -20,7 +20,7 @@
#
# The optional rules file specifies the rules for creating the bindings
#
-# A simple invokation would be:
+# A simple invocation would be:
#
# ecm_generate_python_binding(KMyTarget
# PYTHONNAMESPACE PyKF5
diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake
index 2d20c60..5e62c6f 100644
--- a/kde-modules/KDECMakeSettings.cmake
+++ b/kde-modules/KDECMakeSettings.cmake
@@ -217,7 +217,7 @@ if(NOT KDE_SKIP_BUILD_SETTINGS)

# put the include dirs which are in the source or build tree
# before all other include dirs, so the headers in the sources
- # are prefered over the already installed ones
+ # are preferred over the already installed ones
# since cmake 2.4.1
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)

@@ -231,7 +231,7 @@ if(NOT KDE_SKIP_BUILD_SETTINGS)
# Since CMake 2.8.11
set(CMAKE_LINK_DEPENDS_NO_SHARED ON)

- # Default to shared libs for KDE, if no type is explicitely given to add_library():
+ # Default to shared libs for KDE, if no type is explicitly given to add_library():
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "If enabled, shared libs will be built by default, otherwise static libs")

# Enable automoc in cmake
diff --git a/modules/ECMAddQch.cmake b/modules/ECMAddQch.cmake
index 69a3bb4..40b6026 100644
--- a/modules/ECMAddQch.cmake
+++ b/modules/ECMAddQch.cmake
@@ -222,7 +222,7 @@
# installed. It usually is the same as the one where the CMake config files
# for this software are installed.
#
-# COMPONENT specifies the the installation component name with which the
+# COMPONENT specifies the installation component name with which the
# install rule is associated.
#
# Example usage:
diff --git a/modules/ECMWinResolveSymlinks.cmake b/modules/ECMWinResolveSymlinks.cmake
index d944466..8036a4c 100644
--- a/modules/ECMWinResolveSymlinks.cmake
+++ b/modules/ECMWinResolveSymlinks.cmake
@@ -52,7 +52,7 @@ function(ECM_WIN_RESOLVE_SYMLINKS _dir)
endforeach()
message(STATUS "Resolving symlinks in ${dir}... Done.")

- # touch cache every build to force CMake to re-run these functions everytime
+ # touch cache every build to force CMake to re-run these functions every time
if(NOT TARGET wrs_touch_cache)
add_custom_target(wrs_touch_cache ALL
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/CMakeCache.txt
diff --git a/tests/GenerateSipBindings/cpplib.h b/tests/GenerateSipBindings/cpplib.h
index 958b875..23d0072 100644
--- a/tests/GenerateSipBindings/cpplib.h
+++ b/tests/GenerateSipBindings/cpplib.h
@@ -1,12 +1,12 @@

#pragma once

-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QSharedData>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QMap>
+#include <QCoreApplication>
+#include <QSharedData>

#include <functional>

[Yuri Chornoivan]

Git commit ba1c94607ef2a3e94df6c58161baefb2114de352 by Yuri Chornoivan.
Committed on 07/09/2018 at 09:55.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 messagecomposer/autotests/encryptjobtest.h
M +2 -2 messagecomposer/autotests/setupenv.h
M +2 -2 messagecomposer/autotests/signencrypttest.h
M +2 -2 messagecomposer/autotests/signjobtest.h
M +3 -3 messagecomposer/src/imagescaling/imagescalingutils.h
M +2 -2 messagecomposer/src/job/attachmentfrompublickeyjob.h
M +2 -2 messagecomposer/src/job/contentjobbase_p.h
M +2 -2 messagecomposer/src/job/distributionlistexpandjob.h
M +2 -2 messagecore/autotests/qtest_messagecore.h
M +17 -0 messagecore/src/misc/mailinglist.cpp
M +17 -0 messagecore/src/misc/mailinglist.h
M +2 -2 messagecore/src/settings/messagecoresettings.h
M +2 -2 messageviewer/autotests/setupenv.h
M +3 -3 messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.h
M +1 -1 messageviewer/src/messagepartthemes/default/defaultrenderer.h
M +2 -2 messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
M +1 -1 messageviewer/src/viewer/objecttreeviewersource.cpp
M +2 -2 messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
M +6 -0 mimetreeparser/autotests/util.h
M +2 -2 mimetreeparser/src/bodyformatter/applicationpgpencrypted.h
M +2 -2 mimetreeparser/src/bodyformatter/multipartalternative.cpp
M +1 -1 mimetreeparser/src/bodypartformatterfactory_p.h
M +2 -2 mimetreeparser/src/job/qgpgmejobexecutor.h
M +6 -6 mimetreeparser/src/messagepart.h
M +1 -1 mimetreeparser/src/nodehelper.cpp
M +1 -1 templateparser/src/templateparserjob.cpp
M +0 -1 templateparser/src/templatescommandmenu.cpp
M +2 -2 templateparser/src/templatesinsertcommandpushbutton.h
M +2 -2 templateparser/tests/templateeditor_gui.h
M +5 -0 webengineviewer/src/checkphishingurl/localdatabasemanager_p.h
M +0 -1 webengineviewer/src/checkphishingurl/tests/managelocaldatabasegui.cpp
M +3 -3 webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h
M +3 -3 webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h
M +1 -1 webengineviewer/src/checkphishingurl/urlhashing.h
M +2 -2 webengineviewer/src/findbar/findbarwebengineview.h
M +3 -3 webengineviewer/src/networkmanager/interceptormanager.h
M +0 -1 webengineviewer/src/tests/testjquerysupportwebengine.cpp
M +3 -3 webengineviewer/src/tests/testselectionchangedwebengine.h

https://commits.kde.org/messagelib/ba1c94607ef2a3e94df6c58161baefb2114de352

diff --git a/messagecomposer/autotests/encryptjobtest.h b/messagecomposer/autotests/encryptjobtest.h
index d817cfe4..9c8fd114 100644
--- a/messagecomposer/autotests/encryptjobtest.h
+++ b/messagecomposer/autotests/encryptjobtest.h
@@ -18,8 +18,8 @@
02110-1301, USA.
*/

-#ifndef ENCRYPTJOBJOBTEST_H
-#define ENCRYPTJOBJOBTEST_H
+#ifndef ENCRYPTJOBTEST_H
+#define ENCRYPTJOBTEST_H

#include <QObject>

diff --git a/messagecomposer/autotests/setupenv.h b/messagecomposer/autotests/setupenv.h
index d5d7e7ff..9dfcfbff 100644
--- a/messagecomposer/autotests/setupenv.h
+++ b/messagecomposer/autotests/setupenv.h
@@ -18,8 +18,8 @@
02110-1301, USA.
*/

-#ifndef MESSAGECORE_TESTS_UTIL_H
-#define MESSAGECORE_TESTS_UTIL_H
+#ifndef MESSAGECORE_TESTS_SETUPENV_H
+#define MESSAGECORE_TESTS_SETUPENV_H

#include <gpgme++/key.h>

diff --git a/messagecomposer/autotests/signencrypttest.h b/messagecomposer/autotests/signencrypttest.h
index 19813ff1..711ec46c 100644
--- a/messagecomposer/autotests/signencrypttest.h
+++ b/messagecomposer/autotests/signencrypttest.h
@@ -18,8 +18,8 @@
02110-1301, USA.
*/

-#ifndef SIGNENCRYPTJOBJOBTEST_H
-#define SIGNENCRYPTJOBJOBTEST_H
+#ifndef SIGNENCRYPTTEST_H
+#define SIGNENCRYPTTEST_H

#include <QObject>

diff --git a/messagecomposer/autotests/signjobtest.h b/messagecomposer/autotests/signjobtest.h
index b8cae97f..e9d7e3a3 100644
--- a/messagecomposer/autotests/signjobtest.h
+++ b/messagecomposer/autotests/signjobtest.h
@@ -18,8 +18,8 @@
02110-1301, USA.
*/

-#ifndef SIGNJOBJOBTEST_H
-#define SIGNJOBJOBTEST_H
+#ifndef SIGNJOBTEST_H
+#define SIGNJOBTEST_H

#include <QObject>

diff --git a/messagecomposer/src/imagescaling/imagescalingutils.h b/messagecomposer/src/imagescaling/imagescalingutils.h
index a993912b..34ea4e16 100644
--- a/messagecomposer/src/imagescaling/imagescalingutils.h
+++ b/messagecomposer/src/imagescaling/imagescalingutils.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef AUTORESIZEIMAGEUTIL_H
-#define AUTORESIZEIMAGEUTIL_H
+#ifndef IMAGESCALINGUTILS_H
+#define IMAGESCALINGUTILS_H
#include <MessageCore/AttachmentPart>

namespace MessageComposer {
@@ -33,4 +33,4 @@ public:
};
}

-#endif // AUTORESIZEIMAGEUTIL_H
+#endif // IMAGESCALINGUTILS_H
diff --git a/messagecomposer/src/job/attachmentfrompublickeyjob.h b/messagecomposer/src/job/attachmentfrompublickeyjob.h
index 37573f81..bb57623f 100644
--- a/messagecomposer/src/job/attachmentfrompublickeyjob.h
+++ b/messagecomposer/src/job/attachmentfrompublickeyjob.h
@@ -18,8 +18,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef MESSAGE_ATTACHMENTFROMPUBLICKEY_H
-#define MESSAGE_ATTACHMENTFROMPUBLICKEY_H
+#ifndef MESSAGE_ATTACHMENTFROMPUBLICKEYJOB_H
+#define MESSAGE_ATTACHMENTFROMPUBLICKEYJOB_H

#include <MessageCore/AttachmentLoadJob>

diff --git a/messagecomposer/src/job/contentjobbase_p.h b/messagecomposer/src/job/contentjobbase_p.h
index 2971e369..e8bb7f84 100644
--- a/messagecomposer/src/job/contentjobbase_p.h
+++ b/messagecomposer/src/job/contentjobbase_p.h
@@ -17,8 +17,8 @@
02110-1301, USA.
*/

-#ifndef MESSAGECOMPOSER_JOB_P_H
-#define MESSAGECOMPOSER_JOB_P_H
+#ifndef CONTENTJOBBASE_P_H
+#define CONTENTJOBBASE_P_H

#include "contentjobbase.h"
#include "job/jobbase_p.h"
diff --git a/messagecomposer/src/job/distributionlistexpandjob.h b/messagecomposer/src/job/distributionlistexpandjob.h
index ee3a0b57..80e06f28 100644
--- a/messagecomposer/src/job/distributionlistexpandjob.h
+++ b/messagecomposer/src/job/distributionlistexpandjob.h
@@ -20,8 +20,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef ALIASESEXPANDJOB_P_H
-#define ALIASESEXPANDJOB_P_H
+#ifndef DISTRIBUTIONLISTEXPANDJOB_H
+#define DISTRIBUTIONLISTEXPANDJOB_H

#include <kjob.h>
#include <QStringList>
diff --git a/messagecore/autotests/qtest_messagecore.h b/messagecore/autotests/qtest_messagecore.h
index 21c31e67..0d1c4d83 100644
--- a/messagecore/autotests/qtest_messagecore.h
+++ b/messagecore/autotests/qtest_messagecore.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef QTEST_LIBKDEPIM_H
-#define QTEST_LIBKDEPIM_H
+#ifndef QTEST_MESSAGECORE_H
+#define QTEST_MESSAGECORE_H

/**
* Runs a KJob synchronously and aborts if the job failed.
diff --git a/messagecore/src/misc/mailinglist.cpp b/messagecore/src/misc/mailinglist.cpp
index 60db6fe9..450be3ff 100644
--- a/messagecore/src/misc/mailinglist.cpp
+++ b/messagecore/src/misc/mailinglist.cpp
@@ -1,3 +1,20 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
#include "mailinglist.h"

#include <kconfig.h>
diff --git a/messagecore/src/misc/mailinglist.h b/messagecore/src/misc/mailinglist.h
index de3eff7f..44929a1c 100644
--- a/messagecore/src/misc/mailinglist.h
+++ b/messagecore/src/misc/mailinglist.h
@@ -1,3 +1,20 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
#ifndef MESSAGECORE_MAILINGLIST_H
#define MESSAGECORE_MAILINGLIST_H

diff --git a/messagecore/src/settings/messagecoresettings.h b/messagecore/src/settings/messagecoresettings.h
index d01a09c2..8dfbe12b 100644
--- a/messagecore/src/settings/messagecoresettings.h
+++ b/messagecore/src/settings/messagecoresettings.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef MESSAGECORE_GLOBALSETTINGS_H
-#define MESSAGECORE_GLOBALSETTINGS_H
+#ifndef MESSAGECORE_SETTINGS_H
+#define MESSAGECORE_SETTINGS_H

#include "messagecore_export.h"

diff --git a/messageviewer/autotests/setupenv.h b/messageviewer/autotests/setupenv.h
index 1761a52c..f5dd1564 100644
--- a/messageviewer/autotests/setupenv.h
+++ b/messageviewer/autotests/setupenv.h
@@ -18,8 +18,8 @@
02110-1301, USA.
*/

-#ifndef MESSAGECORE_TESTS_UTIL_H
-#define MESSAGECORE_TESTS_UTIL_H
+#ifndef MESSAGECORE_SETUPENV_H
+#define MESSAGECORE_SETUPENV_H

namespace MessageViewer {
namespace Test {
diff --git a/messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.h b/messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.h
index b947ba0d..7799fa29 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.h
+++ b/messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.h
@@ -18,8 +18,8 @@
02110-1301, USA.
*/

-#ifndef MESSAGEVIEWER_TESTS_UNENCRYPTEDMESSSAGE_H
-#define MESSAGEVIEWER_TESTS_UNENCRYPTEDMESSSAGE_H
+#ifndef MESSAGEVIEWER_TESTS_UNENCRYPTEDMESSAGETEST_H
+#define MESSAGEVIEWER_TESTS_UNENCRYPTEDMESSAGETEST_H

#include <QObject>

@@ -43,4 +43,4 @@ private Q_SLOTS:
void testSMimeAutoCertImport();
};

-#endif //__MESSAGEVIEWER_TESTS_UNENCRYPTEDMESSSAGE_H
+#endif // MESSAGEVIEWER_TESTS_UNENCRYPTEDMESSAGETEST_H
diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.h b/messageviewer/src/messagepartthemes/default/defaultrenderer.h
index b905b2cf..ec56ed03 100644
--- a/messageviewer/src/messagepartthemes/default/defaultrenderer.h
+++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.h
@@ -42,7 +42,7 @@ class CSSHelperBase;
class DefaultRenderer
{
public:
- DefaultRenderer(CSSHelperBase *cssHelder);
+ explicit DefaultRenderer(CSSHelperBase *cssHelder);
~DefaultRenderer();

void setShowOnlyOneMimePart(bool onlyOneMimePart);
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
index 0fc2adc2..74e4b4b0 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
+++ b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
@@ -27,8 +27,8 @@
your version.
*/

-#ifndef MESSAGEVIEWER_MESSAGEPARTRENDERERBASEFACTORY_P_H
-#define MESSAGEVIEWER_MESSAGEPARTRENDERERBASEFACTORY_P_H
+#ifndef MESSAGEVIEWER_MESSAGEPARTRENDERERFACTORY_P_H
+#define MESSAGEVIEWER_MESSAGEPARTRENDERERFACTORY_P_H

#include <QByteArray>
#include <QHash>
diff --git a/messageviewer/src/viewer/objecttreeviewersource.cpp b/messageviewer/src/viewer/objecttreeviewersource.cpp
index 997ae9ca..af2a6175 100644
--- a/messageviewer/src/viewer/objecttreeviewersource.cpp
+++ b/messageviewer/src/viewer/objecttreeviewersource.cpp
@@ -66,7 +66,7 @@ void MailViewerSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QL
// for (int i = 0; i < availableModes.count(); ++i) {
// qDebug() << "MailViewerSource::setHtmlMode Mode " << MimeTreeParser::Util::htmlModeToString(availableModes.at(i));
// }
-// qDebug() << "MailViewerSource::setHtmlMode prefered " << MimeTreeParser::Util::htmlModeToString(mode);
+// qDebug() << "MailViewerSource::setHtmlMode preferred " << MimeTreeParser::Util::htmlModeToString(mode);

mViewer->mColorBar->setAvailableModes(availableModes);
mViewer->mColorBar->setMode(mode);
diff --git a/messageviewer/src/viewerplugins/tests/viewerplugin_gui.h b/messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
index 2471e6fd..f860aeed 100644
--- a/messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
+++ b/messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef TEST_VIEWVERPLUGIN_GUI_H
-#define TEST_VIEWVERPLUGIN_GUI_H
+#ifndef TEST_VIEWERPLUGIN_GUI_H
+#define TEST_VIEWERPLUGIN_GUI_H

#include <QWidget>
namespace MessageViewer {
diff --git a/mimetreeparser/autotests/util.h b/mimetreeparser/autotests/util.h
index 1f4a32f0..e2d19830 100644
--- a/mimetreeparser/autotests/util.h
+++ b/mimetreeparser/autotests/util.h
@@ -16,6 +16,12 @@
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
+
+#ifndef AUTOTESTS_UTIL_H
+#define AUTOTESTS_UTIL_H
+
#include <KMime/Message>

KMime::Message::Ptr readAndParseMail(const QString &mailFile);
+
+#endif
diff --git a/mimetreeparser/src/bodyformatter/applicationpgpencrypted.h b/mimetreeparser/src/bodyformatter/applicationpgpencrypted.h
index 217dead3..04636ae3 100644
--- a/mimetreeparser/src/bodyformatter/applicationpgpencrypted.h
+++ b/mimetreeparser/src/bodyformatter/applicationpgpencrypted.h
@@ -17,8 +17,8 @@
02110-1301, USA.
*/

-#ifndef MIMETREEPARSER_BODYFORAMATTER_APPLICATIONPGPENCYPTED_H
-#define MIMETREEPARSER_BODYFORAMATTER_APPLICATIONPGPENCYPTED_H
+#ifndef MIMETREEPARSER_BODYFORAMATTER_APPLICATIONPGPENCRYPTED_H
+#define MIMETREEPARSER_BODYFORAMATTER_APPLICATIONPGPENCRYPTED_H

#include "interfaces/bodypartformatter.h"
#include "interfaces/bodypart.h"
diff --git a/mimetreeparser/src/bodyformatter/multipartalternative.cpp b/mimetreeparser/src/bodyformatter/multipartalternative.cpp
index 0f1a32c7..4d489a27 100644
--- a/mimetreeparser/src/bodyformatter/multipartalternative.cpp
+++ b/mimetreeparser/src/bodyformatter/multipartalternative.cpp
@@ -58,7 +58,7 @@ MessagePart::Ptr MultiPartAlternativeBodyPartFormatter::process(Interface::BodyP
KMime::Content *dataHtml = mp->childParts().contains(Util::MultipartHtml) ? mp->childParts()[Util::MultipartHtml]->content() : nullptr;
KMime::Content *dataPlain = mp->childParts().contains(Util::MultipartPlain) ? mp->childParts()[Util::MultipartPlain]->content() : nullptr;

- // Make sure that in default ical is prefered over html and plain text
+ // Make sure that in default ical is preferred over html and plain text
if (dataIcal && ((preferredMode != Util::MultipartHtml && preferredMode != Util::MultipartPlain))) {
if (dataHtml) {
part.nodeHelper()->setNodeProcessed(dataHtml, false);
@@ -82,7 +82,7 @@ MessagePart::Ptr MultiPartAlternativeBodyPartFormatter::process(Interface::BodyP
// for (int i = 0; i < mp->availableModes().count(); ++i) {
// qDebug() << "MultiPartAlternativeBodyPartFormatter::processe Modes " << MimeTreeParser::Util::htmlModeToString(mp->availableModes().at(i));
// }
-// qDebug() << "MultiPartAlternativeBodyPartFormatter::process prefered " << MimeTreeParser::Util::htmlModeToString(preferredMode);
+// qDebug() << "MultiPartAlternativeBodyPartFormatter::process preferred " << MimeTreeParser::Util::htmlModeToString(preferredMode);

part.source()->setHtmlMode(preferredMode, mp->availableModes());
mp->setPreferredMode(preferredMode);
diff --git a/mimetreeparser/src/bodypartformatterfactory_p.h b/mimetreeparser/src/bodypartformatterfactory_p.h
index 148b7771..c9ee3aab 100644
--- a/mimetreeparser/src/bodypartformatterfactory_p.h
+++ b/mimetreeparser/src/bodypartformatterfactory_p.h
@@ -43,7 +43,7 @@ class BodyPartFormatterFactory;
class BodyPartFormatterFactoryPrivate
{
public:
- BodyPartFormatterFactoryPrivate(BodyPartFormatterFactory *factory);
+ explicit BodyPartFormatterFactoryPrivate(BodyPartFormatterFactory *factory);
~BodyPartFormatterFactoryPrivate() = default;

void setup();
diff --git a/mimetreeparser/src/job/qgpgmejobexecutor.h b/mimetreeparser/src/job/qgpgmejobexecutor.h
index dd7c3717..2f2ba60a 100644
--- a/mimetreeparser/src/job/qgpgmejobexecutor.h
+++ b/mimetreeparser/src/job/qgpgmejobexecutor.h
@@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef MIMETREEPARSER_KLEOJOBEXECUTOR_H
-#define MIMETREEPARSER_KLEOJOBEXECUTOR_H
+#ifndef MIMETREEPARSER_QGPGMEJOBEXECUTOR_H
+#define MIMETREEPARSER_QGPGMEJOBEXECUTOR_H

#include <gpgme++/decryptionresult.h>
#include <gpgme++/importresult.h>
diff --git a/mimetreeparser/src/messagepart.h b/mimetreeparser/src/messagepart.h
index fa77e8d1..2a3e9981 100644
--- a/mimetreeparser/src/messagepart.h
+++ b/mimetreeparser/src/messagepart.h
@@ -102,7 +102,7 @@ public:
/** @see NodeHelper::asHREF */
QString attachmentLink() const;

- /** Returns a string respresentation of an URL that can be used
+ /** Returns a string representation of an URL that can be used
* to invoke a BodyPartURLHandler for this body part.
*/
QString makeLink(const QString &path) const;
@@ -353,9 +353,9 @@ public:
const std::vector<std::pair<GpgME::DecryptionResult::Recipient, GpgME::Key> > &decryptRecipients() const;

private:
- /** Handles the dectyptioon of a given content
- * returns true if the decryption was successfull
- * if used in async mode, check if mMetaData.inProgress is true, it inicates a running decryption process.
+ /** Handles the decryption of a given content
+ * returns true if the decryption was successful
+ * if used in async mode, check if mMetaData.inPogress is true, it initiates a running decryption process.
*/
bool okDecryptMIME(KMime::Content &data);

@@ -399,8 +399,8 @@ public:
private:
/** Handles the verification of data
* If signature is empty it is handled as inline signature otherwise as detached signature mode.
- * Returns true if the verfication was successfull and the block is signed.
- * If used in async mode, check if mMetaData.inProgress is true, it inicates a running verification process.
+ * Returns true if the verification was successful and the block is signed.
+ * If used in async mode, check if mMetaData.inProgress is true, it initiates a running verification process.
*/
bool okVerify(const QByteArray &data, const QByteArray &signature, KMime::Content *textNode);

diff --git a/mimetreeparser/src/nodehelper.cpp b/mimetreeparser/src/nodehelper.cpp
index 71f5f895..2fc9ee4b 100644
--- a/mimetreeparser/src/nodehelper.cpp
+++ b/mimetreeparser/src/nodehelper.cpp
@@ -767,7 +767,7 @@ KMime::Content *NodeHelper::fromHREF(const KMime::Message::Ptr &mMessage, const
// index is the last part of the folder name: /
const QRegExp rIndex(QStringLiteral("\\D\\.([e0-9.:]+)/"));

- //search the occurence at most at the end
+ //search the occurrence at most at the end
if (rIndex.lastIndexIn(path) != -1) {
return contentFromIndex(mMessage.data(), rIndex.cap(1));
}
diff --git a/templateparser/src/templateparserjob.cpp b/templateparser/src/templateparserjob.cpp
index 86524b87..517c264d 100644
--- a/templateparser/src/templateparserjob.cpp
+++ b/templateparser/src/templateparserjob.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#include "templateparserjob_p.h"
#include "templateparserjob.h"
+#include "templateparserjob_p.h"
#include "templateparserextracthtmlinfo.h"
#include "globalsettings_templateparser.h"
#include "customtemplates_kfg.h"
diff --git a/templateparser/src/templatescommandmenu.cpp b/templateparser/src/templatescommandmenu.cpp
index dd24c810..de4052b6 100644
--- a/templateparser/src/templatescommandmenu.cpp
+++ b/templateparser/src/templatescommandmenu.cpp
@@ -24,7 +24,6 @@
#include <KActionMenu>
#include "templateparser_debug.h"
#include <KLocalizedString>
-#include <QAction>

#undef I18N_NOOP
#define I18N_NOOP(t) nullptr, t
diff --git a/templateparser/src/templatesinsertcommandpushbutton.h b/templateparser/src/templatesinsertcommandpushbutton.h
index 8fb86b8b..ae1720ef 100644
--- a/templateparser/src/templatesinsertcommandpushbutton.h
+++ b/templateparser/src/templatesinsertcommandpushbutton.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef TEMPLATEPARSER_TEMPLATESINSERTCOMMAND_H
-#define TEMPLATEPARSER_TEMPLATESINSERTCOMMAND_H
+#ifndef TEMPLATEPARSER_TEMPLATESINSERTCOMMANDPUSHBUTTON_H
+#define TEMPLATEPARSER_TEMPLATESINSERTCOMMANDPUSHBUTTON_H

#include <QPushButton>
#include "templateparser_export.h"
diff --git a/templateparser/tests/templateeditor_gui.h b/templateparser/tests/templateeditor_gui.h
index 356b09cd..de14d20c 100644
--- a/templateparser/tests/templateeditor_gui.h
+++ b/templateparser/tests/templateeditor_gui.h
@@ -15,8 +15,8 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifndef TEST_TEMPLATEPARSER_GUI_H
-#define TEST_TEMPLATEPARSER_GUI_H
+#ifndef TEST_TEMPLATEEDITOR_GUI_H
+#define TEST_TEMPLATEEDITOR_GUI_H

#include <QWidget>

diff --git a/webengineviewer/src/checkphishingurl/localdatabasemanager_p.h b/webengineviewer/src/checkphishingurl/localdatabasemanager_p.h
index 5f297d54..7ddf3a24 100644
--- a/webengineviewer/src/checkphishingurl/localdatabasemanager_p.h
+++ b/webengineviewer/src/checkphishingurl/localdatabasemanager_p.h
@@ -17,6 +17,9 @@
Boston, MA 02110-1301, USA.
*/

+#ifndef LOCALDATABASEMANAGER_P_H
+#define LOCALDATABASEMANAGER_P_H
+
#include "localdatabasefile.h"
#include "webengineviewer_debug.h"
#include "downloadlocaldatabasethread.h"
@@ -144,3 +147,5 @@ public:
QPointer<WebEngineViewer::DownloadLocalDatabaseThread> downloadLocalDatabaseThread;
};
}
+
+#endif
diff --git a/webengineviewer/src/checkphishingurl/tests/managelocaldatabasegui.cpp b/webengineviewer/src/checkphishingurl/tests/managelocaldatabasegui.cpp
index 300f7f98..338bf95c 100644
--- a/webengineviewer/src/checkphishingurl/tests/managelocaldatabasegui.cpp
+++ b/webengineviewer/src/checkphishingurl/tests/managelocaldatabasegui.cpp
@@ -22,7 +22,6 @@
#include "../localdatabasemanager.h"

#include <QApplication>
-#include <QStandardPaths>
#include <QPushButton>
#include <QPlainTextEdit>
#include <QVBoxLayout>
diff --git a/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h b/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h
index 7c91c2af..b1122269 100644
--- a/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h
+++ b/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef CHECKPHISHINGURLGUI_H
-#define CHECKPHISHINGURLGUI_H
+#ifndef SEARCHFULLHASHGUI_H
+#define SEARCHFULLHASHGUI_H

#include <QWidget>
#include "../searchfullhashjob.h"
@@ -41,4 +41,4 @@ private:
QPlainTextEdit *mResult;
};

-#endif // CHECKPHISHINGURLGUI_H
+#endif // SEARCHFULLHASHGUI_H
diff --git a/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h b/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h
index 311d859b..f66d2774 100644
--- a/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h
+++ b/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef CHECKPHISHINGURLGUI_H
-#define CHECKPHISHINGURLGUI_H
+#ifndef WEBENGINEVIEWWITHSAFEBROWSINGSUPPORT_H
+#define WEBENGINEVIEWWITHSAFEBROWSINGSUPPORT_H

#include <QWidget>
#include "../searchfullhashjob.h"
@@ -43,4 +43,4 @@ private:
WebEngineViewer::WebEngineView *pageView = nullptr;
};

-#endif // CHECKPHISHINGURLGUI_H
+#endif // WEBENGINEVIEWWITHSAFEBROWSINGSUPPORT_H
diff --git a/webengineviewer/src/checkphishingurl/urlhashing.h b/webengineviewer/src/checkphishingurl/urlhashing.h
index 04ed880d..87f9f83d 100644
--- a/webengineviewer/src/checkphishingurl/urlhashing.h
+++ b/webengineviewer/src/checkphishingurl/urlhashing.h
@@ -29,7 +29,7 @@ namespace WebEngineViewer {
class WEBENGINEVIEWER_TESTS_EXPORT UrlHashing
{
public:
- UrlHashing(const QUrl &url);
+ explicit UrlHashing(const QUrl &url);
~UrlHashing();

static QString canonicalizeUrl(QUrl url);
diff --git a/webengineviewer/src/findbar/findbarwebengineview.h b/webengineviewer/src/findbar/findbarwebengineview.h
index 912e2d00..df16fbb3 100644
--- a/webengineviewer/src/findbar/findbarwebengineview.h
+++ b/webengineviewer/src/findbar/findbarwebengineview.h
@@ -16,8 +16,8 @@
* Boston, MA 02110-1301, USA.
*/

-#ifndef WEBENGINEVIEWER_FINDBAR_MAILWEBENGINEVIEW_H
-#define WEBENGINEVIEWER_FINDBAR_MAILWEBENGINEVIEW_H
+#ifndef WEBENGINEVIEWER_FINDBAR_WEBENGINEVIEW_H
+#define WEBENGINEVIEWER_FINDBAR_WEBENGINEVIEW_H

#include "findbarbase.h"
#include "webengineviewer_export.h"
diff --git a/webengineviewer/src/networkmanager/interceptormanager.h b/webengineviewer/src/networkmanager/interceptormanager.h
index 0cc9505b..c7496c7f 100644
--- a/webengineviewer/src/networkmanager/interceptormanager.h
+++ b/webengineviewer/src/networkmanager/interceptormanager.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef MAILNETWORKACCESSMANAGER_H
-#define MAILNETWORKACCESSMANAGER_H
+#ifndef INTERCEPTORMANAGER_H
+#define INTERCEPTORMANAGER_H

#include "webengineviewer_export.h"
#include "webengineviewer/networkpluginurlinterceptor.h"
@@ -42,4 +42,4 @@ private:
NetworkAccessManagerWebEnginePrivate *const d;
};
}
-#endif // MAILNETWORKACCESSMANAGER_H
+#endif // INTERCEPTORMANAGER_H
diff --git a/webengineviewer/src/tests/testjquerysupportwebengine.cpp b/webengineviewer/src/tests/testjquerysupportwebengine.cpp
index 017d0625..476ff83a 100644
--- a/webengineviewer/src/tests/testjquerysupportwebengine.cpp
+++ b/webengineviewer/src/tests/testjquerysupportwebengine.cpp
@@ -26,7 +26,6 @@
#include <QVBoxLayout>
#include <QPointer>
#include <WebEngineViewer/WebEngineManageScript>
-#include <WebEngineViewer/WebEnginePage>

template<typename Arg, typename R, typename C>
struct InvokeWrapper {
diff --git a/webengineviewer/src/tests/testselectionchangedwebengine.h b/webengineviewer/src/tests/testselectionchangedwebengine.h
index 83a3043f..f6afe2fa 100644
--- a/webengineviewer/src/tests/testselectionchangedwebengine.h
+++ b/webengineviewer/src/tests/testselectionchangedwebengine.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef TestSelectionChangedEngine_H
-#define TestSelectionChangedEngine_H
+#ifndef TestSelectionChangedWebEngine_H
+#define TestSelectionChangedWebEngine_H

#include <QWidget>

@@ -38,4 +38,4 @@ private:
WebEngineViewer::WebEngineView *pageView;
};

-#endif // TestSelectionChangedEngine_H
+#endif // TestSelectionChangedWebEngine_H

[Boudewijn Rempt]

Git commit 26b7653d71007b8fc0997833d7ae548cd2ca683f by Boudewijn Rempt, on behalf of Yuri Chornoivan.
Committed on 07/09/2018 at 12:38.
Pushed by rempt into branch 'krita/4.1'.

Fix minor EBN issues

M +1 -1 libs/flake/tools/KoShapeRubberSelectStrategy.cpp
M +1 -1 libs/pigment/KoColorProfile.cpp
M +1 -1 libs/ui/KisSessionResource.h
M +1 -1 libs/ui/KisWindowLayoutResource.h
M +1 -1 libs/ui/dialogs/KisNewWindowLayoutDialog.h
M +1 -1 libs/ui/dialogs/KisSessionManagerDialog.h
M +1 -1 libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
M +1 -1 libs/ui/widgets/kis_tone_curve_widget.cpp
M +1 -1 libs/ui/widgets/kis_tone_curve_widget.h
M +1 -1 plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
M +3 -3 plugins/extensions/clonesarray/dlg_clonesarray.cpp
M +1 -1 plugins/filters/indexcolors/indexcolorpalette.h
M +1 -1 plugins/filters/levelfilter/levelfilter.cpp
M +1 -1 plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
M +1 -1 plugins/filters/unsharp/unsharp.cpp

https://commits.kde.org/krita/26b7653d71007b8fc0997833d7ae548cd2ca683f

diff --git a/libs/flake/tools/KoShapeRubberSelectStrategy.cpp b/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
index 83862e25d00..b6463dd1610 100644
--- a/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
+++ b/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
@@ -119,4 +119,4 @@ KUndo2Command *KoShapeRubberSelectStrategy::createCommand()
QRectF KoShapeRubberSelectStrategy::selectedRectangle() const {
Q_D(const KoShapeRubberSelectStrategy);
return d->selectedRect();
-}
\ No newline at end of file
+}
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 &copyright)
{
d->copyright = copyright;
-}
\ No newline at end of file
+}
diff --git a/libs/ui/KisSessionResource.h b/libs/ui/KisSessionResource.h
index 257bccb9b7f..6ae173bcc7f 100644
--- a/libs/ui/KisSessionResource.h
+++ b/libs/ui/KisSessionResource.h
@@ -43,4 +43,4 @@ private:
};


-#endif
\ No newline at end of file
+#endif
diff --git a/libs/ui/KisWindowLayoutResource.h b/libs/ui/KisWindowLayoutResource.h
index ef50b0903b8..7ca38ccc8e9 100644
--- a/libs/ui/KisWindowLayoutResource.h
+++ b/libs/ui/KisWindowLayoutResource.h
@@ -58,4 +58,4 @@ private:
QScopedPointer<Private> d;
};

-#endif
\ No newline at end of file
+#endif
diff --git a/libs/ui/dialogs/KisNewWindowLayoutDialog.h b/libs/ui/dialogs/KisNewWindowLayoutDialog.h
index 1266d8c2962..3608dc441d4 100644
--- a/libs/ui/dialogs/KisNewWindowLayoutDialog.h
+++ b/libs/ui/dialogs/KisNewWindowLayoutDialog.h
@@ -33,4 +33,4 @@ public:
bool primaryWorkspaceFollowsFocus() const;
};

-#endif
\ No newline at end of file
+#endif
diff --git a/libs/ui/dialogs/KisSessionManagerDialog.h b/libs/ui/dialogs/KisSessionManagerDialog.h
index a3e400daed4..5ba4566f928 100644
--- a/libs/ui/dialogs/KisSessionManagerDialog.h
+++ b/libs/ui/dialogs/KisSessionManagerDialog.h
@@ -47,4 +47,4 @@ private:
KisSessionResource *getSelectedSession() const;
};

-#endif
\ No newline at end of file
+#endif
diff --git a/libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp b/libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
index 01c7fec92ed..0531e150cde 100644
--- a/libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
+++ b/libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
@@ -91,4 +91,4 @@ void KisMultipliersDoubleSliderSpinBox::setExponentRatio(qreal dbl)
d->form.sliderSpinBox->setExponentRatio(dbl);
}

-#include "moc_kis_multipliers_double_slider_spinbox.cpp"
\ No newline at end of file
+#include "moc_kis_multipliers_double_slider_spinbox.cpp"
diff --git a/libs/ui/widgets/kis_tone_curve_widget.cpp b/libs/ui/widgets/kis_tone_curve_widget.cpp
index cc197e8e437..679fed4fd50 100644
--- a/libs/ui/widgets/kis_tone_curve_widget.cpp
+++ b/libs/ui/widgets/kis_tone_curve_widget.cpp
@@ -359,4 +359,4 @@ void KisToneCurveWidget::resizeEvent(QResizeEvent* event)
setMinimumWidth(height());
setMaximumWidth(height());
d->needUpdatePixmap = true;
-}
\ No newline at end of file
+}
diff --git a/libs/ui/widgets/kis_tone_curve_widget.h b/libs/ui/widgets/kis_tone_curve_widget.h
index d0d657c4ae2..21f01ba5633 100644
--- a/libs/ui/widgets/kis_tone_curve_widget.h
+++ b/libs/ui/widgets/kis_tone_curve_widget.h
@@ -64,4 +64,4 @@ private :
Private* const d;
};

-#endif /* KISTONECURVEWIDGET_H */
\ No newline at end of file
+#endif /* KISTONECURVEWIDGET_H */
diff --git a/plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp b/plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
index 1f7d70b6ca9..7051282cd8c 100644
--- a/plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
+++ b/plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
@@ -54,4 +54,4 @@ ArtisticColorSelectorPlugin::ArtisticColorSelectorPlugin(QObject* parent, const
KoDockRegistry::instance()->add(new ArtisticColorSelectorDockFactory());
}

-#include "artisticcolorselector_plugin.moc"
\ No newline at end of file
+#include "artisticcolorselector_plugin.moc"
diff --git a/plugins/extensions/clonesarray/dlg_clonesarray.cpp b/plugins/extensions/clonesarray/dlg_clonesarray.cpp
index 51447ae480d..f553c213928 100644
--- a/plugins/extensions/clonesarray/dlg_clonesarray.cpp
+++ b/plugins/extensions/clonesarray/dlg_clonesarray.cpp
@@ -223,14 +223,14 @@ void DlgClonesArray::reapplyClones()
int endColumn = m_page->numPositiveColumns->value() - 1;
int endRow = m_page->numPositiveRows->value() - 1;

- QString positiveGroupName = QString(i18n("+ Array of %1")).arg(m_baseLayer->name());
+ QString positiveGroupName = i18n("+ Array of %1", m_baseLayer->name());
KisGroupLayerSP positiveGroupLayer = new KisGroupLayer(image, positiveGroupName, OPACITY_OPAQUE_U8);
m_applicator->applyCommand(new KisImageLayerAddCommand(image, positiveGroupLayer, m_baseLayer->parent(), m_baseLayer, false, true), KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE);

KisGroupLayerSP negativeGroupLayer;

if (startRow < 0 || startColumn < 0) {
- QString negativeGroupName = QString(i18n("- Array of %1")).arg(m_baseLayer->name());
+ QString negativeGroupName = i18n("- Array of %1", m_baseLayer->name());
negativeGroupLayer = new KisGroupLayer(image, negativeGroupName, OPACITY_OPAQUE_U8);
m_applicator->applyCommand(new KisImageLayerAddCommand(image, negativeGroupLayer, m_baseLayer->parent(), m_baseLayer->prevSibling(), false, true), KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE);
}
@@ -243,7 +243,7 @@ void DlgClonesArray::reapplyClones()
KisNodeSP parent = choosePositiveGroup ? positiveGroupLayer : negativeGroupLayer;


- QString cloneName = QString("Clone %1, %2").arg(col).arg(row);
+ QString cloneName = i18n("Clone %1, %2", col, row);
KisCloneLayerSP clone = new KisCloneLayer(m_baseLayer, image, cloneName, OPACITY_OPAQUE_U8);
clone->setX(-row * rowXOffset + col * columnXOffset);
clone->setY(-row * rowYOffset + col * columnYOffset);
diff --git a/plugins/filters/indexcolors/indexcolorpalette.h b/plugins/filters/indexcolors/indexcolorpalette.h
index 820304787c5..7833878ac53 100644
--- a/plugins/filters/indexcolors/indexcolorpalette.h
+++ b/plugins/filters/indexcolors/indexcolorpalette.h
@@ -63,4 +63,4 @@ struct IndexColorPalette
QPair< int, int > getNeighbours(int mainClr) const;
};

-#endif // INDEXCOLORPALETTE_H
\ No newline at end of file
+#endif // INDEXCOLORPALETTE_H
diff --git a/plugins/filters/levelfilter/levelfilter.cpp b/plugins/filters/levelfilter/levelfilter.cpp
index 9e997614580..ab2697a414e 100644
--- a/plugins/filters/levelfilter/levelfilter.cpp
+++ b/plugins/filters/levelfilter/levelfilter.cpp
@@ -38,4 +38,4 @@ LevelFilter::~LevelFilter()
{
}

-#include "levelfilter.moc"
\ No newline at end of file
+#include "levelfilter.moc"
diff --git a/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp b/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
index b986fcdfd91..d4b93f5892f 100644
--- a/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
+++ b/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
@@ -38,4 +38,4 @@ KisSmallTilesFilterPlugin::~KisSmallTilesFilterPlugin()
{
}

-#include "kis_small_tiles_filter_plugin.moc"
\ No newline at end of file
+#include "kis_small_tiles_filter_plugin.moc"
diff --git a/plugins/filters/unsharp/unsharp.cpp b/plugins/filters/unsharp/unsharp.cpp
index a829881b115..118c6541146 100644
--- a/plugins/filters/unsharp/unsharp.cpp
+++ b/plugins/filters/unsharp/unsharp.cpp
@@ -38,4 +38,4 @@ UnsharpPlugin::~UnsharpPlugin()
{
}

-#include "unsharp.moc"
\ No newline at end of file
+#include "unsharp.moc"

[Yuri Chornoivan]

Git commit bfc9a64950fed9a8da0e277d25c99dee2ee42e4b by Yuri Chornoivan.
Committed on 07/09/2018 at 18:06.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +12 -12 kcachegrind/configdlg.cpp
M +8 -8 kcachegrind/toplevel.cpp
M +0 -2 libcore/costitem.cpp
M +1 -1 libviews/treemap.cpp
M +3 -3 qcachegrind/qcgtoplevel.cpp

https://commits.kde.org/kcachegrind/bfc9a64950fed9a8da0e277d25c99dee2ee42e4b

diff --git a/kcachegrind/configdlg.cpp b/kcachegrind/configdlg.cpp
index 4ada578..26e6836 100644
--- a/kcachegrind/configdlg.cpp
+++ b/kcachegrind/configdlg.cpp
@@ -43,28 +43,28 @@ ConfigDlg::ConfigDlg(GlobalGUIConfig* c, TraceData* data,
_classCS = 0;
_fileCS = 0;

- connect(objectCombo, SIGNAL(activated(const QString &)),
- this, SLOT(objectActivated(const QString &)));
- connect(objectCombo, SIGNAL(editTextChanged(const QString &)),
- this, SLOT(objectActivated(const QString &)));
+ connect(objectCombo, SIGNAL(activated(QString)),
+ this, SLOT(objectActivated(QString)));
+ connect(objectCombo, SIGNAL(editTextChanged(QString)),
+ this, SLOT(objectActivated(QString)));
connect(objectCheck, &QAbstractButton::toggled,
this, &ConfigDlg::objectCheckChanged);
connect(objectColor, &KColorButton::changed,
this, &ConfigDlg::objectColorChanged);

- connect(classCombo, SIGNAL(activated(const QString &)),
- this, SLOT(classActivated(const QString &)));
- connect(classCombo, SIGNAL(editTextChanged(const QString &)),
- this, SLOT(classActivated(const QString &)));
+ connect(classCombo, SIGNAL(activated(QString)),
+ this, SLOT(classActivated(QString)));
+ connect(classCombo, SIGNAL(editTextChanged(QString)),
+ this, SLOT(classActivated(QString)));
connect(classCheck, &QAbstractButton::toggled,
this, &ConfigDlg::classCheckChanged);
connect(classColor, &KColorButton::changed,
this, &ConfigDlg::classColorChanged);

- connect(fileCombo, SIGNAL(activated(const QString &)),
- this, SLOT(fileActivated(const QString &)));
- connect(fileCombo, SIGNAL(editTextChanged(const QString &)),
- this, SLOT(fileActivated(const QString &)));
+ connect(fileCombo, SIGNAL(activated(QString)),
+ this, SLOT(fileActivated(QString)));
+ connect(fileCombo, SIGNAL(editTextChanged(QString)),
+ this, SLOT(fileActivated(QString)));
connect(fileCheck, &QAbstractButton::toggled,
this, &ConfigDlg::fileCheckChanged);
connect(fileColor, &KColorButton::changed,
diff --git a/kcachegrind/toplevel.cpp b/kcachegrind/toplevel.cpp
index b93b9b5..f7d21c0 100644
--- a/kcachegrind/toplevel.cpp
+++ b/kcachegrind/toplevel.cpp
@@ -42,7 +42,7 @@
#include <QTemporaryFile>
#include <QTimer>
#include <QUrl>
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>

#include <ktoggleaction.h>
#include <ktoolbarpopupaction.h>
@@ -427,7 +427,7 @@ void TopLevel::createMiscActions()

action = actionCollection()->addAction( QStringLiteral("file_add") );
action->setText( i18n( "&Add..." ) );
- connect(action, SIGNAL(triggered(bool) ), SLOT(add()));
+ connect(action, SIGNAL(triggered(bool)), SLOT(add()));
hint = i18n("<b>Add Profile Data</b>"
"<p>This opens an additional profile data file in the current window.</p>");
action->setWhatsThis( hint );
@@ -486,7 +486,7 @@ void TopLevel::createMiscActions()
action->setToolTip( hint );
action->setWhatsThis( hint );

- _openRecent = KStandardAction::openRecent(this, SLOT(load(const QUrl&)),
+ _openRecent = KStandardAction::openRecent(this, SLOT(load(QUrl)),
actionCollection());

KStandardAction::showStatusbar(this,
@@ -661,8 +661,8 @@ void TopLevel::createMiscActions()

// cost types are dependent on loaded data, thus KSelectAction
// is filled in setData()
- connect( _saCost, SIGNAL(triggered(const QString&)),
- this, SLOT(eventTypeSelected(const QString&)));
+ connect( _saCost, SIGNAL(triggered(QString)),
+ this, SLOT(eventTypeSelected(QString)));

_saCost2 = actionCollection()->add<KSelectAction>(QStringLiteral("view_cost_type2"));
_saCost2->setText(i18n("Secondary Event Type"));
@@ -672,8 +672,8 @@ void TopLevel::createMiscActions()
_saCost2->setWhatsThis( hint );
_saCost2->setItems(dummyItems);

- connect( _saCost2, SIGNAL(triggered(const QString&)),
- this, SLOT(eventType2Selected(const QString&)));
+ connect( _saCost2, SIGNAL(triggered(QString)),
+ this, SLOT(eventType2Selected(QString)));

saGroup = actionCollection()->add<KSelectAction>(QStringLiteral("view_group_type"));
saGroup->setText(i18n("Grouping"));
@@ -713,7 +713,7 @@ void TopLevel::createMiscActions()
_taSplitDir->setWhatsThis( hint );

// copied from KMail...
- KStandardAction::tipOfDay( this, SLOT( slotShowTip() ), actionCollection() );
+ KStandardAction::tipOfDay( this, SLOT(slotShowTip()), actionCollection() );
}

void TopLevel::createActions()
diff --git a/libcore/costitem.cpp b/libcore/costitem.cpp
index 255ec03..e61f81a 100644
--- a/libcore/costitem.cpp
+++ b/libcore/costitem.cpp
@@ -22,8 +22,6 @@

#include "tracedata.h"

-#include <QObject>
-
#define TRACE_DEBUG 0
#define TRACE_ASSERTIONS 0

diff --git a/libviews/treemap.cpp b/libviews/treemap.cpp
index af2aeb6..f31be23 100644
--- a/libviews/treemap.cpp
+++ b/libviews/treemap.cpp
@@ -1841,7 +1841,7 @@ void TreeMapWidget::contextMenuEvent( QContextMenuEvent* e )
{
//qDebug() << "TreeMapWidget::contextMenuEvent";

- if ( receivers( SIGNAL(contextMenuRequested(TreeMapItem*, const QPoint &)) ) )
+ if ( receivers( SIGNAL(contextMenuRequested(TreeMapItem*,QPoint)) ) )
e->accept();

if ( e->reason() == QContextMenuEvent::Keyboard ) {
diff --git a/qcachegrind/qcgtoplevel.cpp b/qcachegrind/qcgtoplevel.cpp
index a897863..b424d43 100644
--- a/qcachegrind/qcgtoplevel.cpp
+++ b/qcachegrind/qcgtoplevel.cpp
@@ -44,7 +44,7 @@
#include <QWhatsThis>

#ifdef QT_DBUS_SUPPORT
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
#endif

#include "partselection.h"
@@ -562,8 +562,8 @@ void QCGTopLevel::createActions()
_eventTypeBox->setMinimumContentsLength(25);
hint = tr("Select primary event type of costs");
_eventTypeBox->setToolTip( hint );
- connect( _eventTypeBox, SIGNAL(activated(const QString&)),
- this, SLOT(eventTypeSelected(const QString&)));
+ connect( _eventTypeBox, SIGNAL(activated(QString)),
+ this, SLOT(eventTypeSelected(QString)));
}

void QCGTopLevel::createMenu()

[Yuri Chornoivan]

Git commit 4c627c3f427353c3779501cac265c659a996fac3 by Yuri Chornoivan.
Committed on 07/09/2018 at 18:42.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 bazaar/fileviewbazaarplugin.cpp
M +3 -3 dropbox/fileviewdropboxplugin.cpp
M +0 -1 git/tagdialog.cpp
M +3 -3 hg/branchdialog.h
M +3 -3 hg/clonedialog.h
M +3 -3 hg/configdialog.h
M +3 -3 hg/createdialog.h
M +3 -3 hg/mergedialog.h
M +3 -3 hg/pulldialog.h
M +3 -3 hg/pushdialog.h
M +0 -1 hg/syncdialogbase.cpp
M +3 -3 hg/syncdialogbase.h

https://commits.kde.org/dolphin-plugins/4c627c3f427353c3779501cac265c659a996fac3

diff --git a/bazaar/fileviewbazaarplugin.cpp b/bazaar/fileviewbazaarplugin.cpp
index ca4ec11..3e4d829 100644
--- a/bazaar/fileviewbazaarplugin.cpp
+++ b/bazaar/fileviewbazaarplugin.cpp
@@ -136,7 +136,7 @@ bool FileViewBazaarPlugin::beginRetrieval(const QString& directory)
}
}
// if bzr is not installed
- if (baseDir == "") {
+ if (baseDir.isEmpty()) {
return false;
}

diff --git a/dropbox/fileviewdropboxplugin.cpp b/dropbox/fileviewdropboxplugin.cpp
index e54547a..34bc74f 100644
--- a/dropbox/fileviewdropboxplugin.cpp
+++ b/dropbox/fileviewdropboxplugin.cpp
@@ -20,6 +20,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
*****************************************************************************/

+#include "fileviewdropboxplugin.h"
+
#include <KFileItem>
#include <KFileItemListProperties>
#include <KLocalizedString>
@@ -32,8 +34,6 @@
#include <QFileSystemWatcher>
#include <QStringBuilder>

-#include "fileviewdropboxplugin.h"
-
K_PLUGIN_FACTORY(FileViewDropboxPluginFactory, registerPlugin<FileViewDropboxPlugin>();)

class FileViewDropboxPlugin::Private
@@ -217,4 +217,4 @@ bool FileViewDropboxPlugin::connectWithDropbox(const QPointer<QLocalSocket>& soc
return true;
}

-#include "fileviewdropboxplugin.moc"
\ No newline at end of file
+#include "fileviewdropboxplugin.moc"
diff --git a/git/tagdialog.cpp b/git/tagdialog.cpp
index 142d7b6..5d95c27 100644
--- a/git/tagdialog.cpp
+++ b/git/tagdialog.cpp
@@ -33,7 +33,6 @@
#include <QVBoxLayout>
#include <QLabel>
#include <QLineEdit>
-#include <QVBoxLayout>
#include <QDialogButtonBox>

TagDialog::TagDialog (QWidget* parent ):
diff --git a/hg/branchdialog.h b/hg/branchdialog.h
index 7b17ba5..c5df43a 100644
--- a/hg/branchdialog.h
+++ b/hg/branchdialog.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/

-#ifndef HGBRANCH_H
-#define HGBRANCH_H
+#ifndef HGBRANCHDIALOG_H
+#define HGBRANCHDIALOG_H

#include <QString>
#include "dialogbase.h"
@@ -54,5 +54,5 @@ private:
QStringList m_branchList;
};

-#endif // HGBRANCH_H
+#endif // HGBRANCHDIALOG_H

diff --git a/hg/clonedialog.h b/hg/clonedialog.h
index e2e7127..208d701 100644
--- a/hg/clonedialog.h
+++ b/hg/clonedialog.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/

-#ifndef HGCLONEDILAOG_H
-#define HGCLONEDILAOG_H
+#ifndef HGCLONEDIALOG_H
+#define HGCLONEDIALOG_H

#include <QString>
#include <QProcess>
@@ -88,5 +88,5 @@ private:

};

-#endif // HGCLONEDILAOG_H
+#endif // HGCLONEDIALOG_H

diff --git a/hg/configdialog.h b/hg/configdialog.h
index 5ccc9d8..f15318b 100644
--- a/hg/configdialog.h
+++ b/hg/configdialog.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/

-#ifndef HGCONFIGDILAOG_H
-#define HGCONFIGDILAOG_H
+#ifndef HGCONFIGDIALOG_H
+#define HGCONFIGDIALOG_H

#include "hgconfig.h"
#include <KPageDialog>
@@ -59,5 +59,5 @@ private:
HgConfig::ConfigType m_configType;
};

-#endif // HGCONFIGDILAOG_H
+#endif // HGCONFIGDIALOG_H

diff --git a/hg/createdialog.h b/hg/createdialog.h
index 6ffe1af..ffd93fa 100644
--- a/hg/createdialog.h
+++ b/hg/createdialog.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/

-#ifndef HGCREATEDILAOG_H
-#define HGCREATEDILAOG_H
+#ifndef HGCREATEDIALOG_H
+#define HGCREATEDIALOG_H

#include <QString>
#include "dialogbase.h"
@@ -47,5 +47,5 @@ private:

};

-#endif // HGCREATEDILAOG_H
+#endif // HGCREATEDIALOG_H

diff --git a/hg/mergedialog.h b/hg/mergedialog.h
index 00c3913..c3e8891 100644
--- a/hg/mergedialog.h
+++ b/hg/mergedialog.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/

-#ifndef HGMERGE_H
-#define HGMERGE_H
+#ifndef HGMERGEDIALOG_H
+#define HGMERGEDIALOG_H

#include <QString>
#include "dialogbase.h"
@@ -48,5 +48,5 @@ private:
HgCommitInfoWidget *m_commitInfoWidget;
};

-#endif // HGMERGE_H
+#endif // HGMERGEDIALOG_H

diff --git a/hg/pulldialog.h b/hg/pulldialog.h
index 8e7869e..70add1b 100644
--- a/hg/pulldialog.h
+++ b/hg/pulldialog.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/

-#ifndef HGPULLDILAOG_H
-#define HGPULLDILAOG_H
+#ifndef HGPULLDIALOG_H
+#define HGPULLDIALOG_H

#include "syncdialogbase.h"

@@ -62,5 +62,5 @@ private:
QTableWidget *m_changesList;
};

-#endif // HGPULLDILAOG_H
+#endif // HGPULLDIALOG_H

diff --git a/hg/pushdialog.h b/hg/pushdialog.h
index f392438..7458cfe 100644
--- a/hg/pushdialog.h
+++ b/hg/pushdialog.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/

-#ifndef HGPUSHDILAOG_H
-#define HGPUSHDILAOG_H
+#ifndef HGPUSHDIALOG_H
+#define HGPUSHDIALOG_H

#include "hgwrapper.h"
#include "syncdialogbase.h"
@@ -64,5 +64,5 @@ private:
KTextEdit *m_changesetInfo;
};

-#endif // HGPUSHDILAOG_H
+#endif // HGPUSHDIALOG_H

diff --git a/hg/syncdialogbase.cpp b/hg/syncdialogbase.cpp
index 86ed17c..584e7fa 100644
--- a/hg/syncdialogbase.cpp
+++ b/hg/syncdialogbase.cpp
@@ -33,7 +33,6 @@
#include <QCheckBox>
#include <QGroupBox>
#include <QProgressBar>
-#include <QStringList>
#include <KTextEdit>
#include <KLocalizedString>
#include <KMessageBox>
diff --git a/hg/syncdialogbase.h b/hg/syncdialogbase.h
index 589dda5..4c6430c 100644
--- a/hg/syncdialogbase.h
+++ b/hg/syncdialogbase.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/

-#ifndef HGSYNCBASEDIALOG_H
-#define HGSYNCBASEDIALOG_H
+#ifndef HGSYNCDIALOGBASE_H
+#define HGSYNCDIALOGBASE_H

#include "hgwrapper.h"

@@ -110,5 +110,5 @@ protected:

};

-#endif // HGSYNCBASEDIALOG_H
+#endif // HGSYNCDIALOGBASE_H

[Yuri Chornoivan]

Git commit 351fde427ee1a9ec6d6dafdb17262dbce7e00341 by Yuri Chornoivan.
Committed on 08/09/2018 at 07:02.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 src/backend/datasources/projects/OriginProjectParser.cpp
M +2 -2 src/kdefrontend/datasources/ImportFileWidget.cpp
M +1 -1 src/kdefrontend/datasources/JsonOptionsWidget.cpp
M +2 -2 src/kdefrontend/dockwidgets/LiveDataDock.cpp
M +4 -0 tests/analysis/fit/FitTest.h
M +4 -0 tests/import_export/ASCII/AsciiFilterTest.h
M +2 -2 tests/import_export/ASCII/MqttTest/MQTT_test.cpp
M +3 -3 tests/import_export/ASCII/MqttTest/MQTT_test.h
M +1 -1 tests/import_export/JSON/JsonFilterTest.h
M +6 -1 tests/import_export/MQTT/MQTTUnitTest.h
M +5 -1 tests/import_export/project/ProjectImportTest.h

https://commits.kde.org/labplot/351fde427ee1a9ec6d6dafdb17262dbce7e00341

diff --git a/src/backend/datasources/projects/OriginProjectParser.cpp b/src/backend/datasources/projects/OriginProjectParser.cpp
index d5b78feb..4ce8bbee 100644
--- a/src/backend/datasources/projects/OriginProjectParser.cpp
+++ b/src/backend/datasources/projects/OriginProjectParser.cpp
@@ -1923,7 +1923,7 @@ QList<QPair<QString, QString>> OriginProjectParser::charReplacementList() const
replacements << qMakePair(QString("€"), QString("&euro;"));
replacements << qMakePair(QString("£"), QString("&pound;"));
replacements << qMakePair(QString("¥"), QString("&yen;"));
- replacements << qMakePair(QString("¤"), QString("&curren;"));
+ replacements << qMakePair(QString("¤"), QString("&curren;")); // krazy:exclude=spelling
replacements << qMakePair(QString("¦"), QString("&brvbar;"));
replacements << qMakePair(QString("§"), QString("&sect;"));
replacements << qMakePair(QString("µ"), QString("&micro;"));
diff --git a/src/kdefrontend/datasources/ImportFileWidget.cpp b/src/kdefrontend/datasources/ImportFileWidget.cpp
index a0b5a057..584c5ddc 100644
--- a/src/kdefrontend/datasources/ImportFileWidget.cpp
+++ b/src/kdefrontend/datasources/ImportFileWidget.cpp
@@ -207,7 +207,7 @@ ImportFileWidget::ImportFileWidget(QWidget* parent, bool liveDataSource, const Q
connect( ui.leFileName, SIGNAL(textChanged(QString)), SLOT(fileNameChanged(QString)) );
connect(ui.leHost, SIGNAL(textChanged(QString)), this, SIGNAL(hostChanged()));
connect(ui.lePort, SIGNAL(textChanged(QString)), this, SIGNAL(portChanged()));
- connect( ui.tvJson, SIGNAL(clicked(const QModelIndex&)), this, SLOT(refreshPreview()));
+ connect( ui.tvJson, SIGNAL(clicked(QModelIndex)), this, SLOT(refreshPreview()));
connect( ui.bOpen, SIGNAL(clicked()), this, SLOT (selectFile()) );
connect( ui.bFileInfo, SIGNAL(clicked()), this, SLOT (fileInfoDialog()) );
connect( ui.bSaveFilter, SIGNAL(clicked()), this, SLOT (saveFilter()) );
@@ -2413,7 +2413,7 @@ void ImportFileWidget::mqttSubscribe() {
emit subscriptionsChanged();
}

- if (name.endsWith("#")) {
+ if (name.endsWith('#'))) {
//adding every topic that the subscription contains to twSubscriptions
addSubscriptionChildren(item, newTopLevelItem);

diff --git a/src/kdefrontend/datasources/JsonOptionsWidget.cpp b/src/kdefrontend/datasources/JsonOptionsWidget.cpp
index 76b7cf2f..5d40d8dc 100644
--- a/src/kdefrontend/datasources/JsonOptionsWidget.cpp
+++ b/src/kdefrontend/datasources/JsonOptionsWidget.cpp
@@ -27,8 +27,8 @@
* *
***************************************************************************/

-#include "ImportFileWidget.h"
#include "JsonOptionsWidget.h"
+#include "ImportFileWidget.h"
#include "backend/datasources/filters/QJsonModel.h"
#include "backend/datasources/filters/AbstractFileFilter.h"
#include "backend/datasources/filters/JsonFilter.h"
diff --git a/src/kdefrontend/dockwidgets/LiveDataDock.cpp b/src/kdefrontend/dockwidgets/LiveDataDock.cpp
index 7c0dfb5a..39394db5 100644
--- a/src/kdefrontend/dockwidgets/LiveDataDock.cpp
+++ b/src/kdefrontend/dockwidgets/LiveDataDock.cpp
@@ -742,7 +742,7 @@ void LiveDataDock::addSubscription() {
QTreeWidgetItem* newTopLevelItem = new QTreeWidgetItem(toplevelName);
ui.twSubscriptions->addTopLevelItem(newTopLevelItem);

- if(name.endsWith("#")) {
+ if(name.endsWith('#'))) {
//adding every topic that the subscription contains to twSubscriptions
addSubscriptionChildren(item, newTopLevelItem);
}
@@ -752,7 +752,7 @@ void LiveDataDock::addSubscription() {
source->addMQTTSubscription(name, ui.cbQoS->currentIndex());
}

- if(name.endsWith("#")) {
+ if(name.endsWith('#'))) {
//if an already existing subscription contains a topic that the new subscription also contains
//we decompose the already existing subscription
//by unsubscribing from its topics, that are present in the new subscription as well
diff --git a/tests/analysis/fit/FitTest.h b/tests/analysis/fit/FitTest.h
index 957d3829..c6dc65d6 100644
--- a/tests/analysis/fit/FitTest.h
+++ b/tests/analysis/fit/FitTest.h
@@ -25,6 +25,9 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
+#ifndef FITTEST_H
+#define FITTEST_H
+
#include <QtTest>
#include <backend/lib/macros.h> // DEBUG()

@@ -97,3 +100,4 @@ private slots:
void testLinearGP_PY_xyerror_custom_instrumental_weight();
void testLinearGP_PY_xyerror_custom_inverse_weight();
};
+#endif
diff --git a/tests/import_export/ASCII/AsciiFilterTest.h b/tests/import_export/ASCII/AsciiFilterTest.h
index bc19acf0..c2612f2d 100644
--- a/tests/import_export/ASCII/AsciiFilterTest.h
+++ b/tests/import_export/ASCII/AsciiFilterTest.h
@@ -24,6 +24,9 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
+#ifndef ASCIIFILTERTEST_H
+#define ASCIIFILTERTEST_H
+
#include <QtTest>

class AsciiFilterTest : public QObject {
@@ -62,3 +65,4 @@ private slots:
private:
QString m_dataDir;
};
+#endif
diff --git a/tests/import_export/ASCII/MqttTest/MQTT_test.cpp b/tests/import_export/ASCII/MqttTest/MQTT_test.cpp
index e957d1b8..cd8d6084 100644
--- a/tests/import_export/ASCII/MqttTest/MQTT_test.cpp
+++ b/tests/import_export/ASCII/MqttTest/MQTT_test.cpp
@@ -1,9 +1,9 @@
#include "MQTT_test.h"
#include "ui_MQTT_test.h"

-#include <QtCore/QDateTime>
+#include <QDateTime>
#include <QtMqtt/QMqttClient>
-#include <QtWidgets/QMessageBox>
+#include <QMessageBox>
#include <QtMath>
#include <QTimer>

diff --git a/tests/import_export/ASCII/MqttTest/MQTT_test.h b/tests/import_export/ASCII/MqttTest/MQTT_test.h
index 31a1322f..0a0460e5 100644
--- a/tests/import_export/ASCII/MqttTest/MQTT_test.h
+++ b/tests/import_export/ASCII/MqttTest/MQTT_test.h
@@ -1,5 +1,5 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#ifndef MQTT_TEST_H
+#define MQTT_TEST_H

#include <QMainWindow>
#include <QtMqtt/QMqttClient>
@@ -54,4 +54,4 @@ private:
QVector<double> m_x;
};

-#endif // MAINWINDOW_H
+#endif // MQTT_TEST_H
diff --git a/tests/import_export/JSON/JsonFilterTest.h b/tests/import_export/JSON/JsonFilterTest.h
index a93241ed..b9155ae5 100644
--- a/tests/import_export/JSON/JsonFilterTest.h
+++ b/tests/import_export/JSON/JsonFilterTest.h
@@ -1,7 +1,7 @@
#ifndef JSONFILTERTEST_H
#define JSONFILTERTEST_H

-#include <QtTest/QtTest>
+#include <QtTest>

class JsonFilterTest : public QObject {
Q_OBJECT
diff --git a/tests/import_export/MQTT/MQTTUnitTest.h b/tests/import_export/MQTT/MQTTUnitTest.h
index 86bfcbd1..a6884015 100644
--- a/tests/import_export/MQTT/MQTTUnitTest.h
+++ b/tests/import_export/MQTT/MQTTUnitTest.h
@@ -24,7 +24,10 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
-#include <QtTest/QtTest>
+#ifndef MQTTUNITTEST_H
+#define MQTTUNITTEST_H
+
+#include <QtTest>

class MQTTUnitTest : public QObject {
#ifdef HAVE_MQTT
@@ -55,3 +58,5 @@ private:
QString m_dataDir;
#endif //HAVE_MQTT
};
+
+#endif
diff --git a/tests/import_export/project/ProjectImportTest.h b/tests/import_export/project/ProjectImportTest.h
index a707b3bc..2e27bcd0 100755
--- a/tests/import_export/project/ProjectImportTest.h
+++ b/tests/import_export/project/ProjectImportTest.h
@@ -24,7 +24,10 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
-#include <QtTest/QtTest>
+#ifndef PROJECTIMPORTTEST_H
+#define PROJECTIMPORTTEST_H
+
+#include <QtTest>

class ProjectImportTest : public QObject {
Q_OBJECT
@@ -44,3 +47,4 @@ private slots:
private:
QString m_dataDir;
};
+#endif

[Yuri Chornoivan]

Git commit 342bfdcb2bb54614eadfdb8ce69e3c06d0cd7e30 by Yuri Chornoivan.
Committed on 09/09/2018 at 06:30.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +3 -3 libchoqok/ui/choqokmainwindow.h
M +3 -3 microblogs/twitter/twittercomposerwidget.h
M +5 -0 plugins/imstatus/imstatus.h

https://commits.kde.org/choqok/342bfdcb2bb54614eadfdb8ce69e3c06d0cd7e30

diff --git a/libchoqok/ui/choqokmainwindow.h b/libchoqok/ui/choqokmainwindow.h
index 5b92d914..5f44c8ef 100644
--- a/libchoqok/ui/choqokmainwindow.h
+++ b/libchoqok/ui/choqokmainwindow.h
@@ -21,8 +21,8 @@

*/

-#ifndef CHOQOK_UI_MAINWINDOW_H
-#define CHOQOK_UI_MAINWINDOW_H
+#ifndef UI_CHOQOK_MAINWINDOW_H
+#define UI_CHOQOK_MAINWINDOW_H

#include <QHideEvent>

@@ -76,4 +76,4 @@ protected:

}

-#endif // CHOQOK_UI_MAINWINDOW_H
+#endif // UI_CHOQOK_MAINWINDOW_H
diff --git a/microblogs/twitter/twittercomposerwidget.h b/microblogs/twitter/twittercomposerwidget.h
index 4243aaf9..ef8d2bf4 100644
--- a/microblogs/twitter/twittercomposerwidget.h
+++ b/microblogs/twitter/twittercomposerwidget.h
@@ -21,8 +21,8 @@

*/

-#ifndef LACONICACOMPOSERWIDGET_H
-#define LACONICACOMPOSERWIDGET_H
+#ifndef TWITTERCOMPOSERWIDGET_H
+#define TWITTERCOMPOSERWIDGET_H

#include "twitterapicomposerwidget.h"

@@ -44,4 +44,4 @@ private:
Private *d;
};

-#endif // LACONICACOMPOSERWIDGET_H
+#endif // TWITTERCOMPOSERWIDGET_H
diff --git a/plugins/imstatus/imstatus.h b/plugins/imstatus/imstatus.h
index d77482da..eebd9523 100644
--- a/plugins/imstatus/imstatus.h
+++ b/plugins/imstatus/imstatus.h
@@ -21,6 +21,9 @@

*/

+#ifndef PLUGINS_IMSTATUS_H
+#define PLUGINS_IMSTATUS_H
+
#include "plugin.h"

#include "choqoktypes.h"
@@ -45,3 +48,5 @@ public Q_SLOTS:
private:
IMStatusPrivate *const d;
};
+
+#endif // PLUGINS_IMSTATUS_H

[Yuri Chornoivan]

Git commit 2a6f973f75e738a91f23becd857b7fac183a5471 by Yuri Chornoivan.
Committed on 09/09/2018 at 08:04.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 autotests/dependencyinfotest.cpp
M +1 -1 autotests/sourceslisttest.cpp
M +1 -1 example/qapttest.cpp
M +3 -3 src/backend.cpp
M +3 -3 src/backend.h
M +1 -1 src/cache.cpp
M +2 -2 src/cache.h
M +4 -4 src/changelog.cpp
M +4 -4 src/changelog.h
M +5 -5 src/config.cpp
M +2 -2 src/config.h
M +4 -4 src/debfile.cpp
M +1 -1 src/debfile.h
M +2 -2 src/dependencyinfo.h
M +2 -2 src/downloadprogress.cpp
M +3 -3 src/downloadprogress.h
M +3 -3 src/globals.h
M +6 -6 src/history.cpp
M +5 -5 src/history.h
M +2 -2 src/markingerrorinfo.h
M +3 -3 src/package.cpp
M +4 -4 src/package.h
M +1 -1 src/transaction.cpp
M +3 -3 src/transaction.h
M +1 -1 src/worker/aptlock.h
M +7 -7 src/worker/aptworker.cpp
M +3 -3 src/worker/aptworker.h
M +3 -3 src/worker/transaction.cpp
M +4 -4 src/worker/transaction.h
M +2 -2 src/worker/transactionqueue.cpp
M +2 -2 src/worker/transactionqueue.h
M +4 -4 src/worker/workeracquire.cpp
M +1 -1 src/worker/workeracquire.h
M +2 -2 src/worker/workerdaemon.cpp
M +2 -2 src/worker/workerdaemon.h
M +3 -3 src/worker/workerinstallprogress.cpp
M +3 -3 utils/qapt-deb-installer/DebCommitWidget.cpp
M +2 -2 utils/qapt-deb-thumbnailer/DebThumbnailer.cpp
M +1 -1 utils/qapt-deb-thumbnailer/DebThumbnailer.h

https://commits.kde.org/libqapt/2a6f973f75e738a91f23becd857b7fac183a5471

diff --git a/autotests/dependencyinfotest.cpp b/autotests/dependencyinfotest.cpp
index 2ecb57d..9f2848c 100644
--- a/autotests/dependencyinfotest.cpp
+++ b/autotests/dependencyinfotest.cpp
@@ -20,7 +20,7 @@

#include "sourceslisttest.h"

-#include <QtTest/QtTest>
+#include <QtTest>

#include <dependencyinfo.h>

@@ -39,7 +39,7 @@ private slots:

void DependencyInfoTest::testSimpleParse()
{
- // Build list of [ dep1 dep2 dep3 ] to later use for comparision.
+ // Build list of [ dep1 dep2 dep3 ] to later use for comparison.
int depCount = 3;
QStringList packageNames;
for (int i = 0; i < depCount; ++i) {
diff --git a/autotests/sourceslisttest.cpp b/autotests/sourceslisttest.cpp
index b878589..d69fb89 100644
--- a/autotests/sourceslisttest.cpp
+++ b/autotests/sourceslisttest.cpp
@@ -21,7 +21,7 @@
*/
#include "sourceslisttest.h"

-#include <QtTest/QtTest>
+#include <QtTest>

#include <apt-pkg/init.h>

diff --git a/example/qapttest.cpp b/example/qapttest.cpp
index 7879a05..c876018 100644
--- a/example/qapttest.cpp
+++ b/example/qapttest.cpp
@@ -20,7 +20,7 @@

#include "qapttest.h"

-#include <QtCore/QDir>
+#include <QDir>
#include <QLabel>
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/src/backend.cpp b/src/backend.cpp
index 45a7fd8..16bc769 100644
--- a/src/backend.cpp
+++ b/src/backend.cpp
@@ -21,9 +21,9 @@
#include "backend.h"

// Qt includes
-#include <QtCore/QByteArray>
-#include <QtCore/QTemporaryFile>
-#include <QtDBus/QDBusConnection>
+#include <QByteArray>
+#include <QTemporaryFile>
+#include <QDBusConnection>

// Apt includes
#include <apt-pkg/algorithms.h>
diff --git a/src/backend.h b/src/backend.h
index f7cb809..f9879b7 100644
--- a/src/backend.h
+++ b/src/backend.h
@@ -21,9 +21,9 @@
#ifndef QAPT_BACKEND_H
#define QAPT_BACKEND_H

-#include <QtCore/QHash>
-#include <QtCore/QStringList>
-#include <QtCore/QVariantMap>
+#include <QHash>
+#include <QStringList>
+#include <QVariantMap>

#include "globals.h"
#include "package.h"
diff --git a/src/cache.cpp b/src/cache.cpp
index 4923055..1fc4db7 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -20,7 +20,7 @@

#include "cache.h"

-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>

#include <apt-pkg/cachefile.h>

diff --git a/src/cache.h b/src/cache.h
index 7acad1b..9bc8ca2 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -21,8 +21,8 @@
#ifndef QAPT_CACHE_H
#define QAPT_CACHE_H

-#include <QtCore/QHash>
-#include <QtCore/QObject>
+#include <QHash>
+#include <QObject>

#include <apt-pkg/pkgcache.h>

diff --git a/src/changelog.cpp b/src/changelog.cpp
index 5cdd964..8922694 100644
--- a/src/changelog.cpp
+++ b/src/changelog.cpp
@@ -21,10 +21,10 @@
#include "changelog.h"

// Qt includes
-#include <QtCore/QRegExp>
-#include <QtCore/QSharedData>
-#include <QtCore/QStringBuilder>
-#include <QtCore/QStringList>
+#include <QRegExp>
+#include <QSharedData>
+#include <QStringBuilder>
+#include <QStringList>

// QApt includes
#include "package.h"
diff --git a/src/changelog.h b/src/changelog.h
index 7864477..892c0fc 100644
--- a/src/changelog.h
+++ b/src/changelog.h
@@ -21,10 +21,10 @@
#ifndef QAPT_CHANGELOG_H
#define QAPT_CHANGELOG_H

-#include <QtCore/QDateTime>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QSharedDataPointer>
+#include <QDateTime>
+#include <QList>
+#include <QString>
+#include <QSharedDataPointer>

namespace QApt {

diff --git a/src/config.cpp b/src/config.cpp
index c56205e..95ca030 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -21,11 +21,11 @@
#include "config.h" // krazy:exclude=includes

// Qt includes
-#include <QtCore/QByteArray>
-#include <QtCore/QFile>
-#include <QtCore/QHash>
-#include <QtCore/QLatin1String>
-#include <QtDBus/QDBusConnection>
+#include <QByteArray>
+#include <QFile>
+#include <QHash>
+#include <QLatin1String>
+#include <QDBusConnection>

// APT includes
#include <apt-pkg/aptconfiguration.h>
diff --git a/src/config.h b/src/config.h
index 2bd9bf2..b55d653 100644
--- a/src/config.h
+++ b/src/config.h
@@ -21,8 +21,8 @@
#ifndef QAPT_CONFIG_H
#define QAPT_CONFIG_H

-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>

/**
* The QApt namespace is the main namespace for LibQApt. All classes in this
diff --git a/src/debfile.cpp b/src/debfile.cpp
index bf29b32..e8041ea 100644
--- a/src/debfile.cpp
+++ b/src/debfile.cpp
@@ -20,10 +20,10 @@

#include "debfile.h"

-#include <QtCore/QDir>
-#include <QtCore/QProcess>
-#include <QtCore/QStringBuilder>
-#include <QtCore/QTemporaryFile>
+#include <QDir>
+#include <QProcess>
+#include <QStringBuilder>
+#include <QTemporaryFile>

#include <apt-pkg/debfile.h>
#include <apt-pkg/fileutl.h>
diff --git a/src/debfile.h b/src/debfile.h
index f2052b0..bd028fb 100644
--- a/src/debfile.h
+++ b/src/debfile.h
@@ -21,7 +21,7 @@
#ifndef QAPT_DEBFILE_H
#define QAPT_DEBFILE_H

-#include <QtCore/QStringList>
+#include <QStringList>

#include "dependencyinfo.h"

diff --git a/src/dependencyinfo.h b/src/dependencyinfo.h
index 3448d0c..c664a3c 100644
--- a/src/dependencyinfo.h
+++ b/src/dependencyinfo.h
@@ -22,8 +22,8 @@
#ifndef QAPT_DEPENDENCYINFO_H
#define QAPT_DEPENDENCYINFO_H

-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
+#include <QSharedDataPointer>
+#include <QString>

#include "globals.h"

diff --git a/src/downloadprogress.cpp b/src/downloadprogress.cpp
index 94f89f6..ec1b2fd 100644
--- a/src/downloadprogress.cpp
+++ b/src/downloadprogress.cpp
@@ -21,8 +21,8 @@
#include "downloadprogress.h"

// Qt includes
-#include <QtCore/QSharedData>
-#include <QtDBus/QDBusMetaType>
+#include <QSharedData>
+#include <QDBusMetaType>
#include <QDebug>

namespace QApt {
diff --git a/src/downloadprogress.h b/src/downloadprogress.h
index b522065..b1fd97c 100644
--- a/src/downloadprogress.h
+++ b/src/downloadprogress.h
@@ -21,9 +21,9 @@
#ifndef DOWNLOADPROGRESS_H
#define DOWNLOADPROGRESS_H

-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
-#include <QtDBus/QDBusArgument>
+#include <QSharedDataPointer>
+#include <QString>
+#include <QDBusArgument>

#include "globals.h"

diff --git a/src/globals.h b/src/globals.h
index a22cc7e..3abec06 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -21,9 +21,9 @@
#ifndef QAPT_GLOBALS_H
#define QAPT_GLOBALS_H

-#include <QtCore/QFlags>
-#include <QtCore/QList>
-#include <QtCore/QVariantMap>
+#include <QFlags>
+#include <QList>
+#include <QVariantMap>

namespace QApt
{
diff --git a/src/history.cpp b/src/history.cpp
index 02afe59..6f1b4f6 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -20,12 +20,12 @@

#include "history.h"

-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QProcess>
-#include <QtCore/QSharedData>
-#include <QtCore/QStringBuilder>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QProcess>
+#include <QSharedData>
+#include <QStringBuilder>

// APT includes
#include <apt-pkg/configuration.h>
diff --git a/src/history.h b/src/history.h
index 294e311..5e7e71b 100644
--- a/src/history.h
+++ b/src/history.h
@@ -21,11 +21,11 @@
#ifndef QAPT_HISTORY_H
#define QAPT_HISTORY_H

-#include <QtCore/QDateTime>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
+#include <QDateTime>
+#include <QList>
+#include <QObject>
+#include <QSharedDataPointer>
+#include <QString>

#include "package.h"

diff --git a/src/markingerrorinfo.h b/src/markingerrorinfo.h
index cbc2ecb..7ddfb46 100644
--- a/src/markingerrorinfo.h
+++ b/src/markingerrorinfo.h
@@ -21,8 +21,8 @@
#ifndef MARKINGERRORINFO_H
#define MARKINGERRORINFO_H

-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
+#include <QSharedDataPointer>
+#include <QString>

#include "dependencyinfo.h"

diff --git a/src/package.cpp b/src/package.cpp
index f2953b1..c6a5152 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -837,19 +837,19 @@ bool Package::isInUpdatePhase() const
return d->setInUpdatePhase(true);
}

- // This is a more or less an exact reimplemenation of the update phasing
+ // This is a more or less an exact reimplementation of the update phasing
// algorithm Ubuntu uses.
// Deciding whether a machine is in the phasing pool or not happens in
// two steps.
// 1. repeatable random number generation between 0..100
- // 2. comparision of random number with phasing percentage and marking
+ // 2. comparison of random number with phasing percentage and marking
// as upgradable if rand is greater than the phasing.

// Repeatable discrete random number generation is based on
// the MD5 hash of "sourcename-sourceversion-dbusmachineid", this
// hash is used as seed for the random number generator to provide
// stable randomness based on the stable seed. Combined with the discrete
- // quasi-randomiziation we get about even distribution of machines accross
+ // quasi-randomiziation we get about even distribution of machines across
// phases.
static QString machineId;
if (machineId.isNull()) {
diff --git a/src/package.h b/src/package.h
index c58ccbe..7b6917b 100644
--- a/src/package.h
+++ b/src/package.h
@@ -22,10 +22,10 @@
#ifndef QAPT_PACKAGE_H
#define QAPT_PACKAGE_H

-#include <QtCore/QFlags>
-#include <QtCore/QUrl>
-#include <QtCore/QDateTime>
-#include <QtCore/QVariantMap>
+#include <QFlags>
+#include <QUrl>
+#include <QDateTime>
+#include <QVariantMap>

#include <apt-pkg/pkgcache.h>

diff --git a/src/transaction.cpp b/src/transaction.cpp
index 40a0b06..fc44b91 100644
--- a/src/transaction.cpp
+++ b/src/transaction.cpp
@@ -21,7 +21,7 @@
#include "transaction.h"

// Qt includes
-#include <QtDBus/QDBusPendingCallWatcher>
+#include <QDBusPendingCallWatcher>
#include <QDebug>

// Own includes
diff --git a/src/transaction.h b/src/transaction.h
index 3e89172..378fe09 100644
--- a/src/transaction.h
+++ b/src/transaction.h
@@ -21,9 +21,9 @@
#ifndef QAPT_TRANSACTION_H
#define QAPT_TRANSACTION_H

-#include <QtCore/QObject>
-#include <QtCore/QVariantMap>
-#include <QtDBus/QDBusVariant>
+#include <QObject>
+#include <QVariantMap>
+#include <QDBusVariant>

#include "downloadprogress.h"

diff --git a/src/worker/aptlock.h b/src/worker/aptlock.h
index 73435d4..5bc4fef 100644
--- a/src/worker/aptlock.h
+++ b/src/worker/aptlock.h
@@ -21,7 +21,7 @@
#ifndef APTLOCK_H
#define APTLOCK_H

-#include <QtCore/QString>
+#include <QString>

#include <apt-pkg/fileutl.h>

diff --git a/src/worker/aptworker.cpp b/src/worker/aptworker.cpp
index 8124519..608eb63 100644
--- a/src/worker/aptworker.cpp
+++ b/src/worker/aptworker.cpp
@@ -21,13 +21,13 @@
#include "aptworker.h"

// Qt includes
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringBuilder>
-#include <QtCore/QStringList>
-#include <QtCore/QThread>
-#include <QtCore/QDebug>
+#include <QDateTime>
+#include <QDir>
+#include <QFileInfo>
+#include <QStringBuilder>
+#include <QStringList>
+#include <QThread>
+#include <QDebug>

// Apt-pkg includes
#include <apt-pkg/acquire-item.h>
diff --git a/src/worker/aptworker.h b/src/worker/aptworker.h
index 544bbf9..eefbea9 100644
--- a/src/worker/aptworker.h
+++ b/src/worker/aptworker.h
@@ -21,9 +21,9 @@
#ifndef APTWORKER_H
#define APTWORKER_H

-#include <QtCore/QMutex>
-#include <QtCore/QProcess>
-#include <QtCore/QVector>
+#include <QMutex>
+#include <QProcess>
+#include <QVector>

class QProcess;

diff --git a/src/worker/transaction.cpp b/src/worker/transaction.cpp
index bde5258..e8228fe 100644
--- a/src/worker/transaction.cpp
+++ b/src/worker/transaction.cpp
@@ -22,9 +22,9 @@
#include "transaction.h"

// Qt includes
-#include <QtCore/QTimer>
-#include <QtCore/QUuid>
-#include <QtDBus/QDBusConnection>
+#include <QTimer>
+#include <QUuid>
+#include <QDBusConnection>

// Own includes
#include "qaptauthorization.h"
diff --git a/src/worker/transaction.h b/src/worker/transaction.h
index 1f26aed..f4bb188 100644
--- a/src/worker/transaction.h
+++ b/src/worker/transaction.h
@@ -23,10 +23,10 @@
#define TRANSACTION_H

// Qt includes
-#include <QtCore/QMutex>
-#include <QtCore/QObject>
-#include <QtDBus/QDBusContext>
-#include <QtDBus/QDBusVariant>
+#include <QMutex>
+#include <QObject>
+#include <QDBusContext>
+#include <QDBusVariant>

// Own includes
#include "downloadprogress.h"
diff --git a/src/worker/transactionqueue.cpp b/src/worker/transactionqueue.cpp
index 1ca61c1..fca589a 100644
--- a/src/worker/transactionqueue.cpp
+++ b/src/worker/transactionqueue.cpp
@@ -22,8 +22,8 @@
#include "transactionqueue.h"

// Qt includes
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
+#include <QStringList>
+#include <QTimer>

// Own includes
#include "aptworker.h"
diff --git a/src/worker/transactionqueue.h b/src/worker/transactionqueue.h
index 4d6882b..fb3544b 100644
--- a/src/worker/transactionqueue.h
+++ b/src/worker/transactionqueue.h
@@ -22,8 +22,8 @@
#ifndef TRANSACTIONQUEUE_H
#define TRANSACTIONQUEUE_H

-#include <QtCore/QObject>
-#include <QtCore/QQueue>
+#include <QObject>
+#include <QQueue>

class AptWorker;
class Transaction;
diff --git a/src/worker/workeracquire.cpp b/src/worker/workeracquire.cpp
index c72a0ea..7f6be8c 100644
--- a/src/worker/workeracquire.cpp
+++ b/src/worker/workeracquire.cpp
@@ -21,10 +21,10 @@
#include "workeracquire.h"

// Qt includes
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QEventLoop>
-#include <QtCore/QStringBuilder>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QEventLoop>
+#include <QStringBuilder>

// Apt-pkg includes
#include <apt-pkg/error.h>
diff --git a/src/worker/workeracquire.h b/src/worker/workeracquire.h
index 324a787..fe0d823 100644
--- a/src/worker/workeracquire.h
+++ b/src/worker/workeracquire.h
@@ -22,7 +22,7 @@
#define WORKERACQUIRE_H

// Qt includes
-#include <QtCore/QObject>
+#include <QObject>

// Apt-pkg includes
#include <apt-pkg/acquire.h>
diff --git a/src/worker/workerdaemon.cpp b/src/worker/workerdaemon.cpp
index dda526c..5b0a378 100644
--- a/src/worker/workerdaemon.cpp
+++ b/src/worker/workerdaemon.cpp
@@ -21,8 +21,8 @@
#include "workerdaemon.h"

// Qt includes
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
+#include <QThread>
+#include <QTimer>

// Apt-pkg includes
#include <apt-pkg/configuration.h>
diff --git a/src/worker/workerdaemon.h b/src/worker/workerdaemon.h
index 51c1231..e219db2 100644
--- a/src/worker/workerdaemon.h
+++ b/src/worker/workerdaemon.h
@@ -21,8 +21,8 @@
#ifndef WORKERDAEMON_H
#define WORKERDAEMON_H

-#include <QtCore/QCoreApplication>
-#include <QtDBus/QDBusContext>
+#include <QCoreApplication>
+#include <QDBusContext>

#include "globals.h"

diff --git a/src/worker/workerinstallprogress.cpp b/src/worker/workerinstallprogress.cpp
index c096917..361a4d0 100644
--- a/src/worker/workerinstallprogress.cpp
+++ b/src/worker/workerinstallprogress.cpp
@@ -21,9 +21,9 @@

#include "workerinstallprogress.h"

-#include <QtCore/QStringBuilder>
-#include <QtCore/QStringList>
-#include <QtCore/QTextCodec>
+#include <QStringBuilder>
+#include <QStringList>
+#include <QTextCodec>
#include <QDebug>

#include <apt-pkg/error.h>
diff --git a/utils/qapt-deb-installer/DebCommitWidget.cpp b/utils/qapt-deb-installer/DebCommitWidget.cpp
index 541f4a7..912b4be 100644
--- a/utils/qapt-deb-installer/DebCommitWidget.cpp
+++ b/utils/qapt-deb-installer/DebCommitWidget.cpp
@@ -21,9 +21,9 @@
#include "DebCommitWidget.h"

// Qt includes
-#include <QtCore/QDir>
-#include <QtCore/QStringBuilder>
-#include <QtCore/QUuid>
+#include <QDir>
+#include <QStringBuilder>
+#include <QUuid>
#include <QLabel>
#include <QProgressBar>
#include <QVBoxLayout>
diff --git a/utils/qapt-deb-thumbnailer/DebThumbnailer.cpp b/utils/qapt-deb-thumbnailer/DebThumbnailer.cpp
index 7497b5d..344a196 100644
--- a/utils/qapt-deb-thumbnailer/DebThumbnailer.cpp
+++ b/utils/qapt-deb-thumbnailer/DebThumbnailer.cpp
@@ -21,8 +21,8 @@

#include "DebThumbnailer.h"

-#include <QtCore/QDir>
-#include <QtCore/QStringBuilder>
+#include <QDir>
+#include <QStringBuilder>
#include <QImage>
#include <QPainter>

diff --git a/utils/qapt-deb-thumbnailer/DebThumbnailer.h b/utils/qapt-deb-thumbnailer/DebThumbnailer.h
index b80439d..3fbdb9f 100644
--- a/utils/qapt-deb-thumbnailer/DebThumbnailer.h
+++ b/utils/qapt-deb-thumbnailer/DebThumbnailer.h
@@ -21,7 +21,7 @@
#ifndef DEBTHUMBNAILER_H
#define DEBTHUMBNAILER_H

-#include <QtCore/QStringList>
+#include <QStringList>

#include <kio/thumbcreator.h>

[Yuri Chornoivan]

Git commit f392907c3d5553c78affa936f05d8071236f6c60 by Yuri Chornoivan.
Committed on 09/09/2018 at 15:55.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 examples/staticmaps/main.cpp
M +1 -1 src/blogger/blog.cpp
M +1 -1 src/blogger/blog.h
M +3 -3 src/blogger/pagefetchjob.h
M +2 -2 src/core/accountstorage_kwallet_p.h
M +3 -3 src/core/private/queuehelper_p.h
M +0 -1 src/latitude/locationfetchjob.cpp

https://commits.kde.org/libkgapi/f392907c3d5553c78affa936f05d8071236f6c60

diff --git a/examples/staticmaps/main.cpp b/examples/staticmaps/main.cpp
index 74704df..ded3a99 100644
--- a/examples/staticmaps/main.cpp
+++ b/examples/staticmaps/main.cpp
@@ -18,7 +18,7 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/

-#include <QtGui/QApplication>
+#include <QApplication>

#include "mainwindow.h"

diff --git a/src/blogger/blog.cpp b/src/blogger/blog.cpp
index f0dc530..cd2a7f1 100644
--- a/src/blogger/blog.cpp
+++ b/src/blogger/blog.cpp
@@ -102,7 +102,7 @@ uint Blog::pagesCount() const
return d->pagesCount;
}

-QString Blog::langauge() const
+QString Blog::language() const
{
return d->language;
}
diff --git a/src/blogger/blog.h b/src/blogger/blog.h
index e5e2e25..cc2a1af 100644
--- a/src/blogger/blog.h
+++ b/src/blogger/blog.h
@@ -47,7 +47,7 @@ class KGAPIBLOGGER_EXPORT Blog : public KGAPI2::Object
QUrl url() const;
uint postsCount() const;
uint pagesCount() const;
- QString langauge() const;
+ QString language() const;
QString country() const;
QString languageVariant() const;
QVariant customMetaData() const;
diff --git a/src/blogger/pagefetchjob.h b/src/blogger/pagefetchjob.h
index bc14652..ab59071 100644
--- a/src/blogger/pagefetchjob.h
+++ b/src/blogger/pagefetchjob.h
@@ -19,8 +19,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef KGAPI2_BLOGGER_FETCHPAGEJOB_H
-#define KGAPI2_BLOGGER_FETCHPAGEJOB_H
+#ifndef KGAPI2_BLOGGER_PAGEFETCHJOB_H
+#define KGAPI2_BLOGGER_PAGEFETCHJOB_H

#include "fetchjob.h"
#include "page.h"
@@ -73,4 +73,4 @@ class KGAPIBLOGGER_EXPORT PageFetchJob : public KGAPI2::FetchJob
}
}

-#endif // KGAPI2_BLOGGER_FETCHPAGEJOB_H
+#endif // KGAPI2_BLOGGER_PAGEFETCHJOB_H
diff --git a/src/core/accountstorage_kwallet_p.h b/src/core/accountstorage_kwallet_p.h
index 0d2e836..715b9ef 100644
--- a/src/core/accountstorage_kwallet_p.h
+++ b/src/core/accountstorage_kwallet_p.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef LIBKGAPI2_ACCOUNSTSTORAGE_KWALLET_P_H_
-#define LIBKGAPI2_ACCOUNSTSTORAGE_KWALLET_P_H_
+#ifndef LIBKGAPI2_ACCOUNTSTORAGE_KWALLET_P_H_
+#define LIBKGAPI2_ACCOUNTSTORAGE_KWALLET_P_H_

#include "accountstorage_p.h"

diff --git a/src/core/private/queuehelper_p.h b/src/core/private/queuehelper_p.h
index 77e2950..b4d0b74 100644
--- a/src/core/private/queuehelper_p.h
+++ b/src/core/private/queuehelper_p.h
@@ -21,8 +21,8 @@
*/


-#ifndef LIBKGAPI2_PRIVATE_QUEUEHELPER_H
-#define LIBKGAPI2_PRIVATE_QUEUEHELPER_H
+#ifndef LIBKGAPI2_PRIVATE_QUEUEHELPER_P_H
+#define LIBKGAPI2_PRIVATE_QUEUEHELPER_P_H

#include <QQueue>

@@ -77,4 +77,4 @@ class QueueHelper
QList<T>::ConstIterator m_iter;
};

-#endif // QUEUEHELPER_H
+#endif // LIBKGAPI2_PRIVATE_QUEUEHELPER_P_H
diff --git a/src/latitude/locationfetchjob.cpp b/src/latitude/locationfetchjob.cpp
index ed57817..9037bfa 100644
--- a/src/latitude/locationfetchjob.cpp
+++ b/src/latitude/locationfetchjob.cpp
@@ -26,7 +26,6 @@
#include "../debug.h"
#include "location.h"
#include "utils.h"
-#include "latitudeservice.h"

#include <QNetworkRequest>
#include <QNetworkReply>

[Yuri Chornoivan]

Git commit d2f971c979fbd8d6daabd26d50c7bcd2e172920d by Yuri Chornoivan.
Committed on 10/09/2018 at 14:19.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +0 -2 autotests/core/Process.cpp
M +4 -0 src/cli/utils.h
M +3 -3 src/common/dbus/org.kde.ActivityManager.Activities.h
M +3 -3 src/imports/activitiesextensionplugin.h
M +5 -5 src/imports/activitymodel.cpp
M +4 -4 src/imports/resourcemodel.cpp
M +3 -3 src/lib/activitiescache_p.cpp
M +5 -5 src/lib/activitiesmodel.cpp
M +3 -3 src/lib/activitiesmodel_p.h
M +1 -1 src/lib/consumer.h
M +11 -11 src/lib/info.cpp
M +3 -3 src/utils/model_updaters.h
M +3 -3 src/utils/optional_view.h

https://commits.kde.org/kactivities/d2f971c979fbd8d6daabd26d50c7bcd2e172920d

diff --git a/autotests/core/Process.cpp b/autotests/core/Process.cpp
index 694d15b..8e246aa 100644
--- a/autotests/core/Process.cpp
+++ b/autotests/core/Process.cpp
@@ -28,8 +28,6 @@
#include <QProcess>
#include <QRegularExpression>

-#include <QDBusConnection>
-
#include <sys/types.h>
#include <signal.h>

diff --git a/src/cli/utils.h b/src/cli/utils.h
index 1e97e92..836c180 100644
--- a/src/cli/utils.h
+++ b/src/cli/utils.h
@@ -19,6 +19,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/

+#ifndef KACTIVITIES_UTILS_H
+#define KACTIVITIES_UTILS_H
+
QTextStream out(stdout);

class StringListView {
@@ -166,3 +169,4 @@ void switchToActivity(const QString &id)
\
int Command##_command::operator()()

+#endif
diff --git a/src/common/dbus/org.kde.ActivityManager.Activities.h b/src/common/dbus/org.kde.ActivityManager.Activities.h
index 94f0fbe..ac8432f 100644
--- a/src/common/dbus/org.kde.ActivityManager.Activities.h
+++ b/src/common/dbus/org.kde.ActivityManager.Activities.h
@@ -19,8 +19,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef KAMD_ACTIVITIES_DBUS_H
-#define KAMD_ACTIVITIES_DBUS_H
+#ifndef KAMD_ORG_KDE_ACTIVITYMANAGER_ACTIVITIES_H
+#define KAMD_ORG_KDE_ACTIVITYMANAGER_ACTIVITIES_H

#include <QString>
#include <QList>
@@ -58,4 +58,4 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, ActivityInfo &rec);

QDebug operator<<(QDebug dbg, const ActivityInfo &r);

-#endif // KAMD_ACTIVITIES_DBUS_H
+#endif // KAMD_ORG_KDE_ACTIVITYMANAGER_ACTIVITIES_H
diff --git a/src/imports/activitiesextensionplugin.h b/src/imports/activitiesextensionplugin.h
index 4b91ea7..d95fe9e 100644
--- a/src/imports/activitiesextensionplugin.h
+++ b/src/imports/activitiesextensionplugin.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef KACTIVITIES_IMPORTS_PLUGIN_H
-#define KACTIVITIES_IMPORTS_PLUGIN_H
+#ifndef KACTIVITIES_ACTIVITIES_EXTENSION_PLUGIN_H
+#define KACTIVITIES_ACTIVITIES_EXTENSION_PLUGIN_H

#include <QQmlExtensionPlugin>

@@ -31,5 +31,5 @@ public:
void registerTypes(const char *uri) override;
};

-#endif // KACTIVITIES_IMPORTS_PLUGIN_H
+#endif // KACTIVITIES_ACTIVITIES_EXTENSION_PLUGIN_H

diff --git a/src/imports/activitymodel.cpp b/src/imports/activitymodel.cpp
index 48e999c..9aa8c13 100644
--- a/src/imports/activitymodel.cpp
+++ b/src/imports/activitymodel.cpp
@@ -59,7 +59,7 @@ public:
DECLARE_RAII_MODEL_UPDATERS(ActivityModel)

/**
- * Returns whether the the activity has a desired state.
+ * Returns whether the activity has a desired state.
* If the state is 0, returns true
*/
template <typename T>
@@ -460,15 +460,15 @@ void ActivityModel::hideActivity(const QString &id)
}
}

-#define CREATE_SIGNAL_EMITTER(What, Role) \
+#define CREATE_SIGNAL_EMITTER(What,Role) \
void ActivityModel::onActivity##What##Changed(const QString &) \
{ \
Private::emitActivityUpdated(this, m_shownActivities, sender(), Role); \
}

-CREATE_SIGNAL_EMITTER(Name, Qt::DisplayRole)
-CREATE_SIGNAL_EMITTER(Description, ActivityDescription)
-CREATE_SIGNAL_EMITTER(Icon, Qt::DecorationRole)
+CREATE_SIGNAL_EMITTER(Name,Qt::DisplayRole)
+CREATE_SIGNAL_EMITTER(Description,ActivityDescription)
+CREATE_SIGNAL_EMITTER(Icon,Qt::DecorationRole)

#undef CREATE_SIGNAL_EMITTER

diff --git a/src/imports/resourcemodel.cpp b/src/imports/resourcemodel.cpp
index 88c31e1..21734b0 100644
--- a/src/imports/resourcemodel.cpp
+++ b/src/imports/resourcemodel.cpp
@@ -116,10 +116,10 @@ ResourceModel::ResourceModel(QObject *parent)
connect(&m_service, &KActivities::Consumer::currentActivityChanged,
this, &ResourceModel::onCurrentActivityChanged);

- connect(m_linker.get(), SIGNAL(ResourceLinkedToActivity(QString, QString, QString)),
- this, SLOT(onResourceLinkedToActivity(QString, QString, QString)));
- connect(m_linker.get(), SIGNAL(ResourceUnlinkedFromActivity(QString, QString, QString)),
- this, SLOT(onResourceUnlinkedFromActivity(QString, QString, QString)));
+ connect(m_linker.get(), SIGNAL(ResourceLinkedToActivity(QString,QString,QString)),
+ this, SLOT(onResourceLinkedToActivity(QString,QString,QString)));
+ connect(m_linker.get(), SIGNAL(ResourceUnlinkedFromActivity(QString,QString,QString)),
+ this, SLOT(onResourceUnlinkedFromActivity(QString,QString,QString)));

setDynamicSortFilter(true);
sort(0);
diff --git a/src/lib/activitiescache_p.cpp b/src/lib/activitiescache_p.cpp
index bfd2d9a..d3af77c 100644
--- a/src/lib/activitiescache_p.cpp
+++ b/src/lib/activitiescache_p.cpp
@@ -147,13 +147,13 @@ void ActivitiesCache::updateAllActivities()
auto call = Manager::self()->activities()->asyncCall(
QStringLiteral("CurrentActivity"));

- onCallFinished(call, SLOT(setCurrentActivityFromReply(QDBusPendingCallWatcher *)));
+ onCallFinished(call, SLOT(setCurrentActivityFromReply(QDBusPendingCallWatcher*)));

// Loading all the activities
call = Manager::self()->activities()->asyncCall(
QStringLiteral("ListActivitiesWithInformation"));

- onCallFinished(call, SLOT(setAllActivitiesFromReply(QDBusPendingCallWatcher *)));
+ onCallFinished(call, SLOT(setAllActivitiesFromReply(QDBusPendingCallWatcher*)));
}

void ActivitiesCache::updateActivity(const QString &id)
@@ -163,7 +163,7 @@ void ActivitiesCache::updateActivity(const QString &id)
auto call = Manager::self()->activities()->asyncCall(
QStringLiteral("ActivityInformation"), id);

- onCallFinished(call, SLOT(setActivityInfoFromReply(QDBusPendingCallWatcher *)));
+ onCallFinished(call, SLOT(setActivityInfoFromReply(QDBusPendingCallWatcher*)));
}

void ActivitiesCache::updateActivityState(const QString &id, int state)
diff --git a/src/lib/activitiesmodel.cpp b/src/lib/activitiesmodel.cpp
index ab888d7..aef2811 100644
--- a/src/lib/activitiesmodel.cpp
+++ b/src/lib/activitiesmodel.cpp
@@ -67,7 +67,7 @@ namespace Private {
};

/**
- * Returns whether the the activity has a desired state.
+ * Returns whether the activity has a desired state.
* If the state is 0, returns true
*/
template <typename T>
@@ -324,15 +324,15 @@ void ActivitiesModelPrivate::hideActivity(const QString &id)
}
}

-#define CREATE_SIGNAL_EMITTER(What, Role) \
+#define CREATE_SIGNAL_EMITTER(What,Role) \
void ActivitiesModelPrivate::onActivity##What##Changed(const QString &) \
{ \
Private::emitActivityUpdated(this, shownActivities, sender(), Role); \
}

-CREATE_SIGNAL_EMITTER(Name, Qt::DisplayRole)
-CREATE_SIGNAL_EMITTER(Description, ActivitiesModel::ActivityDescription)
-CREATE_SIGNAL_EMITTER(Icon, Qt::DecorationRole)
+CREATE_SIGNAL_EMITTER(Name,Qt::DisplayRole)
+CREATE_SIGNAL_EMITTER(Description,ActivitiesModel::ActivityDescription)
+CREATE_SIGNAL_EMITTER(Icon,Qt::DecorationRole)

#undef CREATE_SIGNAL_EMITTER

diff --git a/src/lib/activitiesmodel_p.h b/src/lib/activitiesmodel_p.h
index 4e0134c..6e9458a 100644
--- a/src/lib/activitiesmodel_p.h
+++ b/src/lib/activitiesmodel_p.h
@@ -19,8 +19,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef ACTIVITIES_ACTIVITYMODEL_P_H
-#define ACTIVITIES_ACTIVITYMODEL_P_H
+#ifndef ACTIVITIES_ACTIVITIESMODEL_P_H
+#define ACTIVITIES_ACTIVITIESMODEL_P_H

#include "activitiesmodel.h"

@@ -83,5 +83,5 @@ public:

} // namespace KActivities

-#endif // ACTIVITIES_ACTIVITYMODEL_P_H
+#endif // ACTIVITIES_ACTIVITIESMODEL_P_H

diff --git a/src/lib/consumer.h b/src/lib/consumer.h
index 79fd1d3..1cae6d5 100644
--- a/src/lib/consumer.h
+++ b/src/lib/consumer.h
@@ -140,7 +140,7 @@ Q_SIGNALS:

/**
* This signal is emitted when the activity service goes online or offline,
- * or when the class manages to synchronise the data with the service.
+ * or when the class manages to synchronize the data with the service.
* @param status new status of the service
*/
void serviceStatusChanged(Consumer::ServiceStatus status);
diff --git a/src/lib/info.cpp b/src/lib/info.cpp
index 3166055..5d6b16a 100644
--- a/src/lib/info.cpp
+++ b/src/lib/info.cpp
@@ -104,25 +104,25 @@ Info::Info(const QString &activity, QObject *parent)
, d(new InfoPrivate(this, activity))
{
// qDebug() << "Created an instance of Info: " << (void*)this;
-#define PASS_SIGNAL_HANDLER(SIGNAL_NAME, SLOT_NAME) \
+#define PASS_SIGNAL_HANDLER(SIGNAL_NAME,SLOT_NAME) \
connect(d->cache.get(), SIGNAL(SIGNAL_NAME(QString)), \
this, SLOT(SLOT_NAME(QString)));

- PASS_SIGNAL_HANDLER(activityAdded, added)
- PASS_SIGNAL_HANDLER(activityRemoved, removed)
+ PASS_SIGNAL_HANDLER(activityAdded,added)
+ PASS_SIGNAL_HANDLER(activityRemoved,removed)
// PASS_SIGNAL_HANDLER(started)
// PASS_SIGNAL_HANDLER(stopped)
- PASS_SIGNAL_HANDLER(activityChanged, infoChanged)
+ PASS_SIGNAL_HANDLER(activityChanged,infoChanged)
#undef PASS_SIGNAL_HANDLER

-#define PASS_SIGNAL_HANDLER(SIGNAL_NAME, SLOT_NAME, TYPE) \
- connect(d->cache.get(), SIGNAL(SIGNAL_NAME(QString, TYPE)), \
- this, SLOT(SLOT_NAME(QString, TYPE))); \
+#define PASS_SIGNAL_HANDLER(SIGNAL_NAME,SLOT_NAME,TYPE) \
+ connect(d->cache.get(), SIGNAL(SIGNAL_NAME(QString,TYPE)), \
+ this, SLOT(SLOT_NAME(QString,TYPE))); \

- PASS_SIGNAL_HANDLER(activityStateChanged, activityStateChanged, int);
- PASS_SIGNAL_HANDLER(activityNameChanged, nameChanged, QString);
- PASS_SIGNAL_HANDLER(activityDescriptionChanged, descriptionChanged, QString);
- PASS_SIGNAL_HANDLER(activityIconChanged, iconChanged, QString);
+ PASS_SIGNAL_HANDLER(activityStateChanged,activityStateChanged,int);
+ PASS_SIGNAL_HANDLER(activityNameChanged,nameChanged,QString);
+ PASS_SIGNAL_HANDLER(activityDescriptionChanged,descriptionChanged,QString);
+ PASS_SIGNAL_HANDLER(activityIconChanged,iconChanged,QString);
#undef PASS_SIGNAL_HANDLER

connect(d->cache.get(), SIGNAL(currentActivityChanged(QString)),
diff --git a/src/utils/model_updaters.h b/src/utils/model_updaters.h
index ae8e279..007ac83 100644
--- a/src/utils/model_updaters.h
+++ b/src/utils/model_updaters.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef KACTIVITIES_IMPORTS_UTILS_P_H
-#define KACTIVITIES_IMPORTS_UTILS_P_H
+#ifndef KACTIVITIES_MODEL_UPDATERS_H
+#define KACTIVITIES_MODEL_UPDATERS_H

// -----------------------------------------
// RAII classes for model updates ----------
@@ -72,5 +72,5 @@

// -----------------------------------------

-#endif // KACTIVITIES_IMPORTS_UTILS_P_H
+#endif // KACTIVITIES_MODEL_UPDATERS_H

diff --git a/src/utils/optional_view.h b/src/utils/optional_view.h
index 3699caa..25ce54e 100644
--- a/src/utils/optional_view.h
+++ b/src/utils/optional_view.h
@@ -19,8 +19,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef UTILS_OPTIONAL_H
-#define UTILS_OPTIONAL_H
+#ifndef UTILS_OPTIONAL_VIEW_H
+#define UTILS_OPTIONAL_VIEW_H

namespace kamd {
namespace utils {
@@ -76,5 +76,5 @@ optional_view<T> make_optional_view(const T &value)
} // namespace kamd


-#endif // UTILS_OPTIONAL_H
+#endif // UTILS_OPTIONAL_VIEW_H

[Yuri Chornoivan]

Git commit 4efa47f522a8571ebe3febbd9ff6e48418f2744a by Yuri Chornoivan.
Committed on 10/09/2018 at 14:25.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 autotests/TestHelper.h
M +1 -1 src/kauthexecutejob.h

https://commits.kde.org/kauth/4efa47f522a8571ebe3febbd9ff6e48418f2744a

diff --git a/autotests/TestHelper.h b/autotests/TestHelper.h
index 396d047..81a1349 100644
--- a/autotests/TestHelper.h
+++ b/autotests/TestHelper.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA .
*/

-#ifndef HELPER_CLASS_H
-#define HELPER_CLASS_H
+#ifndef TEST_HELPER_H
+#define TEST_HELPER_H

#include <QObject>

diff --git a/src/kauthexecutejob.h b/src/kauthexecutejob.h
index 25c69ea..6f02ba9 100644
--- a/src/kauthexecutejob.h
+++ b/src/kauthexecutejob.h
@@ -125,7 +125,7 @@ Q_SIGNALS:

/**
* @brief Signal emitted when the authentication status changes
- * @param status the the new authentication status
+ * @param status the new authentication status
*/
void statusChanged(KAuth::Action::AuthStatus status);

[Yuri Chornoivan]

Git commit e4d8085950b38e410ae9a5a147d3ecf7de559a8e by Yuri Chornoivan.
Committed on 10/09/2018 at 15:00.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/data/servicetypes/bad-groups-input.desktop
M +1 -1 autotests/kpluginmetadatatest.cpp
M +1 -1 src/desktoptojson/main.cpp
M +6 -1 src/lib/caching/posix_fallocate_mac.h
M +2 -2 src/lib/io/kbackup.cpp
M +6 -6 src/lib/io/kdirwatch.cpp
M +1 -1 src/lib/io/kdirwatch.h
M +1 -1 src/lib/io/kdirwatch_p.h
M +1 -1 src/lib/io/kprocess.h
M +2 -2 src/lib/jobs/kjob.h
M +3 -3 src/lib/kaboutdata.cpp
M +3 -3 src/lib/kaboutdata.h
M +2 -1 src/lib/kcoreaddons.cpp
M +1 -1 src/lib/plugin/kpluginfactory.h
M +1 -1 src/lib/randomness/krandomsequence.cpp
M +2 -2 src/lib/text/ktexttohtml.cpp
M +1 -1 src/lib/util/kformat.h
M +1 -1 src/lib/util/kuser_win.cpp

https://commits.kde.org/kcoreaddons/e4d8085950b38e410ae9a5a147d3ecf7de559a8e

diff --git a/autotests/data/servicetypes/bad-groups-input.desktop b/autotests/data/servicetypes/bad-groups-input.desktop
index 6b17103..48da13f 100644
--- a/autotests/data/servicetypes/bad-groups-input.desktop
+++ b/autotests/data/servicetypes/bad-groups-input.desktop
@@ -26,7 +26,7 @@ Name[uk]=Погані групи
Name[x-test]=xxBad Groupsxx
Name[zh_CN]=坏分组
Type=Service
-# one value for every property defintion in bad-groups-servicetype.desktop
+# one value for every property definition in bad-groups-servicetype.desktop
ThisIsOkay=10
#empty
=11
diff --git a/autotests/kpluginmetadatatest.cpp b/autotests/kpluginmetadatatest.cpp
index fb6d10f..145051e 100644
--- a/autotests/kpluginmetadatatest.cpp
+++ b/autotests/kpluginmetadatatest.cpp
@@ -329,7 +329,7 @@ private Q_SLOTS:
QCOMPARE(md.rawData().value(QStringLiteral("TrailingSpacesAreOkay")), QJsonValue(16)); // accept trailing spaces in group name -> integer
QCOMPARE(md.rawData().value(QStringLiteral("MissingType")), QJsonValue(QStringLiteral("17"))); // Type= missing -> fall back to string
QCOMPARE(md.rawData().value(QStringLiteral("InvalidType")), QJsonValue(QStringLiteral("18"))); // Type= is invalid -> fall back to string
- QCOMPARE(md.rawData().value(QStringLiteral("ThisIsOkayAgain")), QJsonValue(19)); // valid defintion after invalid ones should still work -> integer
+ QCOMPARE(md.rawData().value(QStringLiteral("ThisIsOkayAgain")), QJsonValue(19)); // valid definition after invalid ones should still work -> integer
}

void testJSONMetadata()
diff --git a/src/desktoptojson/main.cpp b/src/desktoptojson/main.cpp
index 1bb8c9c..2c50a8b 100644
--- a/src/desktoptojson/main.cpp
+++ b/src/desktoptojson/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char** argv) {
QCommandLineOption compat = QCommandLineOption(QStringList() << QStringLiteral("c") << _c,
QStringLiteral("Generate JSON that is compatible with KPluginInfo instead of the new KPluginMetaData"));
QCommandLineOption serviceTypes = QCommandLineOption(QStringList() << QStringLiteral("s") << _s,
- QStringLiteral("The name or full path of a KServiceType defintion .desktop file. Can be passed multiple times"), _s);
+ QStringLiteral("The name or full path of a KServiceType definition .desktop file. Can be passed multiple times"), _s);

QCommandLineParser parser;
parser.addVersionOption();
diff --git a/src/lib/caching/posix_fallocate_mac.h b/src/lib/caching/posix_fallocate_mac.h
index e752db5..b4dfe07 100644
--- a/src/lib/caching/posix_fallocate_mac.h
+++ b/src/lib/caching/posix_fallocate_mac.h
@@ -36,6 +36,9 @@
*
* ***** END LICENSE BLOCK ***** */

+#ifndef POSIX_FALLOCATE_MAC_H
+#define POSIX_FALLOCATE_MAC_H
+
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
@@ -94,7 +97,7 @@ static int posix_fallocate(int fd, off_t offset, off_t len)
int ret;
if (!__builtin_saddll_overflow(offset, len, &c_test)) {
fstore_t store = {F_ALLOCATECONTIG, F_PEOFPOSMODE, 0, offset + len};
- // Try to get a continous chunk of disk space
+ // Try to get a continuous chunk of disk space
fcntl(fd, F_PREALLOCATE, &store);
if (ret < 0) {
// OK, perhaps we are too fragmented, allocate non-continuous
@@ -111,3 +114,5 @@ static int posix_fallocate(int fd, off_t offset, off_t len)
}
return ret;
}
+
+#endif
diff --git a/src/lib/io/kbackup.cpp b/src/lib/io/kbackup.cpp
index 08d39c1..dc27218 100644
--- a/src/lib/io/kbackup.cpp
+++ b/src/lib/io/kbackup.cpp
@@ -21,14 +21,14 @@
Boston, MA 02110-1301, USA.
*/

+#include "kbackup.h"
+
#include <QFileInfo>
#include <QDir>
#include <QProcess>

#include <qstandardpaths.h>

-#include "kbackup.h"
-
namespace KBackup
{

diff --git a/src/lib/io/kdirwatch.cpp b/src/lib/io/kdirwatch.cpp
index bfbba80..b61ee1d 100644
--- a/src/lib/io/kdirwatch.cpp
+++ b/src/lib/io/kdirwatch.cpp
@@ -29,7 +29,7 @@
// Jul 30, 2007 - Substituted addEntry boolean params with KDirWatch::WatchModes
// flag (Flavio Castelli)
// Oct 4, 2005 - Inotify support (Dirk Mueller)
-// Februar 2002 - Add file watching and remote mount check for STAT
+// February 2002 - Add file watching and remote mount check for STAT
// Mar 30, 2001 - Native support for Linux dir change notification.
// Jan 28, 2000 - Usage of FAM service on IRIX (***@in.tum.de)
// May 24. 1998 - List of times introduced, and some bugs are fixed. (sven)
@@ -158,8 +158,8 @@ static const char s_envNfsMethod[] = "KDIRWATCH_NFSMETHOD";
* - FAM (File Alternation Monitor): first used on IRIX, SGI
* has ported this method to LINUX. It uses a kernel part
* (IMON, sending change events to /dev/imon) and a user
- * level damon (fam), to which applications connect for
- * notification of file changes. For NFS, the fam damon
+ * level daemon (fam), to which applications connect for
+ * notification of file changes. For NFS, the fam daemon
* on the NFS server machine is used; if IMON is not built
* into the kernel, fam uses polling for local files.
* - INOTIFY: In LINUX 2.6.13, inode change notification was
@@ -1399,7 +1399,7 @@ void KDirWatchPrivate::emitEvent(Entry *e, int event, const QString &fileName)
continue;
}

- // Emit the signals delayed, to avoid unexpected re-entrancy from the slots (#220153)
+ // Emit the signals delayed, to avoid unexpected re-entrance from the slots (#220153)

if (event & Deleted) {
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
@@ -1474,7 +1474,7 @@ void KDirWatchPrivate::slotRescan()
}
rescan_all = false;
} else {
- // progate dirty flag to dependant entries (e.g. file watches)
+ // propagate dirty flag to dependent entries (e.g. file watches)
it = m_mapEntries.begin();
for (; it != m_mapEntries.end(); ++it)
if (((*it).m_mode == INotifyMode || (*it).m_mode == QFSWatchMode) && (*it).dirty) {
@@ -1531,7 +1531,7 @@ void KDirWatchPrivate::slotRescan()

#if HAVE_SYS_INOTIFY_H
if (entry->isDir) {
- // Report and clear the the list of files that have changed in this directory.
+ // Report and clear the list of files that have changed in this directory.
// Remove duplicates by changing to set and back again:
// we don't really care about preserving the order of the
// original changes.
diff --git a/src/lib/io/kdirwatch.h b/src/lib/io/kdirwatch.h
index f7bb3ee..8455208 100644
--- a/src/lib/io/kdirwatch.h
+++ b/src/lib/io/kdirwatch.h
@@ -186,7 +186,7 @@ public:
* empty. First call should be called with @p false or else all
* directories
* in list will be notified.
- * @param skippedToo if true, the skipped directoris (scanning of which was
+ * @param skippedToo if true, the skipped directories (scanning of which was
* stopped with stopDirScan() ) will be reset and notified
* for change. Otherwise, stopped directories will continue to be
* unnotified.
diff --git a/src/lib/io/kdirwatch_p.h b/src/lib/io/kdirwatch_p.h
index 24ad770..541bb06 100644
--- a/src/lib/io/kdirwatch_p.h
+++ b/src/lib/io/kdirwatch_p.h
@@ -149,7 +149,7 @@ public:
#if HAVE_SYS_INOTIFY_H
int wd;
// Creation and Deletion of files happens infrequently, so
- // can safely be reported as they occur. File changes i.e. those that emity "dirty()" can
+ // can safely be reported as they occur. File changes i.e. those that emit "dirty()" can
// happen many times per second, though, so maintain a list of files in this directory
// that can be emitted and flushed at the next slotRescan(...).
// This will be unused if the Entry is not a directory.
diff --git a/src/lib/io/kprocess.h b/src/lib/io/kprocess.h
index 103aa43..40e3a9b 100644
--- a/src/lib/io/kprocess.h
+++ b/src/lib/io/kprocess.h
@@ -200,7 +200,7 @@ public:
* respective functions provided by QProcess.
*
* If KProcess determines that the command does not really need a
- * shell, it will trasparently execute it without one for performance
+ * shell, it will transparently execute it without one for performance
* reasons.
*
* This function must be called before starting the process, obviously.
diff --git a/src/lib/jobs/kjob.h b/src/lib/jobs/kjob.h
index 1540b24..9a0f571 100644
--- a/src/lib/jobs/kjob.h
+++ b/src/lib/jobs/kjob.h
@@ -253,9 +253,9 @@ public:
* called, which usually wreaks havoc.
*
* Note that the event loop started by this method does not process user input events, which means
- * your user interface will effectivly be blocked. Other events like paint or network events are
+ * your user interface will effectively be blocked. Other events like paint or network events are
* still being processed. The advantage of not processing user input events is that the chance of
- * accidental reentrancy is greatly reduced. Still you should avoid calling this function.
+ * accidental reentrance is greatly reduced. Still you should avoid calling this function.
*
* @return true if the job has been executed without error, false otherwise
*/
diff --git a/src/lib/kaboutdata.cpp b/src/lib/kaboutdata.cpp
index 76471e6..85f67c7 100644
--- a/src/lib/kaboutdata.cpp
+++ b/src/lib/kaboutdata.cpp
@@ -536,7 +536,7 @@ KAboutData::KAboutData(const QString &_componentName,
d->organizationDomain = hostComponents.join(dotChar);

// KF6: do not set a default desktopFileName value here, but remove this code and leave it empty
- // see KAboutData::desktopFileName() for detals
+ // see KAboutData::desktopFileName() for details

// desktop file name is reverse domain name
std::reverse(hostComponents.begin(), hostComponents.end());
@@ -568,7 +568,7 @@ KAboutData::KAboutData(const QString &_componentName,
d->_bugAddress = "***@bugs.kde.org";
d->organizationDomain = QStringLiteral("kde.org");
// KF6: do not set a default desktopFileName value here, but remove this code and leave it empty
- // see KAboutData::desktopFileName() for detals
+ // see KAboutData::desktopFileName() for details
d->desktopFileName = QStringLiteral("org.kde.%1").arg(d->_componentName);
}

@@ -1003,7 +1003,7 @@ QString KAboutData::desktopFileName() const
return d->desktopFileName;
// KF6: switch to this code and adapt API dox
#if 0
- // if desktopFileName has been explicitely set, use that value
+ // if desktopFileName has been explicitly set, use that value
if (!d->desktopFileName.isEmpty()) {
return d->desktopFileName;
}
diff --git a/src/lib/kaboutdata.h b/src/lib/kaboutdata.h
index a140f07..b733982 100644
--- a/src/lib/kaboutdata.h
+++ b/src/lib/kaboutdata.h
@@ -257,8 +257,8 @@ public:
*
* @note SPDX expression are expansive constructs. If you parse the return value, do it in a
* SPDX specification compliant manner by splitting on whitespaces to discard unwanted
- * informationor or by using a complete SPDX license expression parser.
- * @note SPDX identifiers are case-insensitive. Do not use case-senstivie checks on the return
+ * information or by using a complete SPDX license expression parser.
+ * @note SPDX identifiers are case-insensitive. Do not use case-sensitive checks on the return
* value.
* @see https://spdx.org/licenses
* @return SPDX license expression or QString() if the license has no identifier. Compliant
@@ -840,7 +840,7 @@ public:
* For example, KDBusService will use a name created from the reversed organization domain
* with the component name attached, so for an organization domain "bar.org" and a
* component name "foo" the name of an installed D-Bus service file needs to be
- * "org.bar.foo.service" or the the name of the installed desktop file "org.bar.foo.desktop"
+ * "org.bar.foo.service" or the name of the installed desktop file "org.bar.foo.desktop"
* (and the desktopFileName property accordingly set to "org.bar.foo").
* For still supporting the deprecated start of services via KToolInvocation,
* the desktop file needs to have an entry with the key "X-DBUS-ServiceName"
diff --git a/src/lib/kcoreaddons.cpp b/src/lib/kcoreaddons.cpp
index 2e8d876..4b9ffc9 100644
--- a/src/lib/kcoreaddons.cpp
+++ b/src/lib/kcoreaddons.cpp
@@ -19,9 +19,10 @@
*
*/

+#include "kcoreaddons.h"
+
#include <QString>

-#include "kcoreaddons.h"
#include "kcoreaddons_version.h"

QString KCoreAddons::versionString()
diff --git a/src/lib/plugin/kpluginfactory.h b/src/lib/plugin/kpluginfactory.h
index ab5418a..1d5b248 100644
--- a/src/lib/plugin/kpluginfactory.h
+++ b/src/lib/plugin/kpluginfactory.h
@@ -509,7 +509,7 @@ protected:
* This function is called when the factory asked to create an Object.
*
* You may reimplement it to provide a very flexible factory. This is especially useful to
- * provide generic factories for plugins implemeted using a scripting language.
+ * provide generic factories for plugins implemented using a scripting language.
*
* \param iface The staticMetaObject::className() string identifying the plugin interface that
* was requested. E.g. for KCModule plugins this string will be "KCModule".
diff --git a/src/lib/randomness/krandomsequence.cpp b/src/lib/randomness/krandomsequence.cpp
index dc4393c..de8293e 100644
--- a/src/lib/randomness/krandomsequence.cpp
+++ b/src/lib/randomness/krandomsequence.cpp
@@ -79,7 +79,7 @@ void KRandomSequence::setSeed(long lngSeed1)
void KRandomSequence::setSeed(int lngSeed1)
{
// Convert the positive seed number to a negative one so that the draw()
- // function can intialise itself the first time it is called. We just have
+ // function can initialise itself the first time it is called. We just have
// to make sure that the seed used != 0 as zero perpetuates itself in a
// sequence of random numbers.
if (lngSeed1 < 0) {
diff --git a/src/lib/text/ktexttohtml.cpp b/src/lib/text/ktexttohtml.cpp
index 14bc8ef..28e629e 100644
--- a/src/lib/text/ktexttohtml.cpp
+++ b/src/lib/text/ktexttohtml.cpp
@@ -45,7 +45,7 @@ static void loadEmoticonsPlugin()
// Check if QGuiApplication::platformName property exists. This is a
// hackish way of determining whether we are running QGuiApplication,
// because we cannot load the FrameworkIntegration plugin into a
- // QCoreApplication, as it would crash immediatelly
+ // QCoreApplication, as it would crash immediately
if (qApp->metaObject()->indexOfProperty("platformName") > -1) {
QPluginLoader lib(QStringLiteral("kf5/KEmoticonsIntegrationPlugin"));
QObject *rootObj = lib.instance();
@@ -301,7 +301,7 @@ QString KTextToHTMLHelper::getUrl(bool *badurl)
}

// HACK: This is actually against the RFC. However, most people don't properly escape the URL in
- // their text with "" or <>. That leads to people writing an url, followed immediatley by
+ // their text with "" or <>. That leads to people writing an url, followed immediately by
// a dot to finish the sentence. That would lead the parser to include the dot in the url,
// even though that is not wanted. So work around that here.
// Most real-life URLs hopefully don't end with dots or commas.
diff --git a/src/lib/util/kformat.h b/src/lib/util/kformat.h
index c9cf1f7..44dea35 100644
--- a/src/lib/util/kformat.h
+++ b/src/lib/util/kformat.h
@@ -275,7 +275,7 @@ public:
* e.g. given formatDuration(60000), returns "1.0 minutes"
*
* @param msecs Time duration in milliseconds
- * @param decimalPlaces Deciaml places to round off to, defaults to 2
+ * @param decimalPlaces Decimal places to round off to, defaults to 2
* @return converted duration as a string - e.g. "5.5 seconds" "23.0 minutes"
*/

diff --git a/src/lib/util/kuser_win.cpp b/src/lib/util/kuser_win.cpp
index bb38845..9fa0f18 100644
--- a/src/lib/util/kuser_win.cpp
+++ b/src/lib/util/kuser_win.cpp
@@ -154,7 +154,7 @@ void enumerateGroupsForUser(uint maxCount, const QString &name, Callback callbac
netApiEnumerate<T>(maxCount, callback, [&](int level, LPBYTE *buffer, DWORD *count, DWORD *total, PDWORD_PTR resumeHandle) -> NET_API_STATUS {
Q_UNUSED(resumeHandle);
NET_API_STATUS ret = NetUserGetGroups(nullptr, nameStr, level, buffer, MAX_PREFERRED_LENGTH, count, total);
- // if we return ERROR_MORE_DATA here it will result in an enless loop
+ // if we return ERROR_MORE_DATA here it will result in an endless loop
if (ret == ERROR_MORE_DATA) {
qCWarning(KCOREADDONS_DEBUG) << "NetUserGetGroups for user" << name << "returned ERROR_MORE_DATA. This should not happen!";
ret = NERR_Success;

[Yuri Chornoivan]

Git commit e91abfd720ecf364085349aa41c0fa736b6b6733 by Yuri Chornoivan.
Committed on 10/09/2018 at 15:59.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 autotests/modeltest.cpp
M +1 -1 autotests/quickviewsharedengine.cpp
M +2 -2 src/kdeclarative/qmlobject.h
M +1 -1 src/kpackagelauncherqml/main.cpp
M +2 -2 src/qmlcontrols/kcmcontrols/qml/GridView.qml
M +2 -2 src/qmlcontrols/kcmcontrols/qml/ScrollView.qml
M +2 -2 src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h
M +2 -2 src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h
M +1 -1 src/qmlcontrols/kquickcontrolsaddons/plotter.h
M +2 -2 src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp
M +2 -2 src/quickaddons/configmodule.h
M +0 -1 src/quickaddons/quickviewsharedengine.cpp

https://commits.kde.org/kdeclarative/e91abfd720ecf364085349aa41c0fa736b6b6733

diff --git a/autotests/modeltest.cpp b/autotests/modeltest.cpp
index e6fa002..1911b9e 100644
--- a/autotests/modeltest.cpp
+++ b/autotests/modeltest.cpp
@@ -40,10 +40,10 @@
****************************************************************************/


-#include <QtGui>
-
#include "modeltest.h"

+#include <QtGui>
+
#include <QtTest>
//#undef Q_ASSERT
//#define Q_ASSERT QVERIFY
diff --git a/autotests/quickviewsharedengine.cpp b/autotests/quickviewsharedengine.cpp
index 6d2dca2..bdd9ecf 100644
--- a/autotests/quickviewsharedengine.cpp
+++ b/autotests/quickviewsharedengine.cpp
@@ -30,6 +30,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
+#include <quickviewsharedengine.h>
#include <qtest.h>
#include <QSignalSpy>
#include <qqmlcomponent.h>
@@ -40,7 +41,6 @@
#include <QWindow>
#include <QDebug>
#include <qqmlengine.h>
-#include <quickviewsharedengine.h>

class QuickViewSharedEngineTest : public QQmlDataTest
{
diff --git a/src/kdeclarative/qmlobject.h b/src/kdeclarative/qmlobject.h
index b8a545c..048fa70 100644
--- a/src/kdeclarative/qmlobject.h
+++ b/src/kdeclarative/qmlobject.h
@@ -152,7 +152,7 @@ public:
* In this case it will be possible to assign new objects in the main engine context
* before the main component gets initialized.
* In that case it will be possible to access it immediately from the QML code.
- * The initialization will either be completed automatically asyncronously
+ * The initialization will either be completed automatically asynchronously
* or explicitly by calling completeInitialization()
*
* @param delay if true the initialization of the QML file will be delayed
@@ -208,7 +208,7 @@ public:

/**
* Creates and returns an object based on the provided QQmlComponent
- * with the same QQmlEngine and the same root context as the amin object,
+ * with the same QQmlEngine and the same root context as the admin object,
* that will be the parent of the newly created object
* @param component the component we want to instantiate
* @param context The QQmlContext in which we will create the object,
diff --git a/src/kpackagelauncherqml/main.cpp b/src/kpackagelauncherqml/main.cpp
index 03e6987..e6207d3 100644
--- a/src/kpackagelauncherqml/main.cpp
+++ b/src/kpackagelauncherqml/main.cpp
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
for (auto author : data.authors()) {
aboutData.addAuthor(author.name(), author.task(), author.emailAddress(), author.webAddress(), author.ocsUsername());
}
- // We assume that desktop file in applicaitons dir is named similar as
+ // We assume that desktop file in applications dir is named similar as
// the pluginId, this is required to get icons working on wayland for example
aboutData.setDesktopFileName(data.pluginId());

diff --git a/src/qmlcontrols/kcmcontrols/qml/GridView.qml b/src/qmlcontrols/kcmcontrols/qml/GridView.qml
index 233195e..9f44a6a 100644
--- a/src/qmlcontrols/kcmcontrols/qml/GridView.qml
+++ b/src/qmlcontrols/kcmcontrols/qml/GridView.qml
@@ -23,8 +23,8 @@ import org.kde.kirigami 2.3 as Kirigami

/**
* A ScrollView containing a GridView, with the default behavior about
- * sizing and background as recomended by the user interface guidelines
- * For most KControl modules, it's recomended to use instead the GridViewKCM
+ * sizing and background as recommended by the user interface guidelines
+ * For most KControl modules, it's recommended to use instead the GridViewKCM
* component as the root element of your module.
* @see GridViewKCM
*/
diff --git a/src/qmlcontrols/kcmcontrols/qml/ScrollView.qml b/src/qmlcontrols/kcmcontrols/qml/ScrollView.qml
index 564e1e3..8ef57a2 100644
--- a/src/qmlcontrols/kcmcontrols/qml/ScrollView.qml
+++ b/src/qmlcontrols/kcmcontrols/qml/ScrollView.qml
@@ -23,8 +23,8 @@ import org.kde.kirigami 2.3 as Kirigami

/**
* A ScrollView containing a GridView, with the default behavior about
- * sizing and background as recomended by the user interface guidelines
- * For most KControl modules, it's recomended to use instead the GridViewKCM
+ * sizing and background as recommended by the user interface guidelines
+ * For most KControl modules, it's recommended to use instead the GridViewKCM
* component as the root element of your module.
* @code
* import org.kde.kcm 1.2 as KCM
diff --git a/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h b/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h
index c74ce25..c1127b4 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h
+++ b/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h
@@ -19,8 +19,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef QTEXTRACOMPONENTSPLUGIN_H
-#define QTEXTRACOMPONENTSPLUGIN_H
+#ifndef KQUICKCONTROLSADDONSPLUGIN_H
+#define KQUICKCONTROLSADDONSPLUGIN_H

#include <QQmlExtensionPlugin>

diff --git a/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h b/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h
index 631b7a5..9a4d974 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h
+++ b/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h
@@ -25,10 +25,10 @@

/**
* This item spies on mouse events from all child objects including child MouseAreas regardless
- * of whether the child MouseArea propegates events. It does not accept the event.
+ * of whether the child MouseArea propagates events. It does not accept the event.
*
* In addition unlike MouseArea events include the mouse position in global co-ordinates and provides
- * the sceen the mouse is in.
+ * the screen the mouse is in.
*/


diff --git a/src/qmlcontrols/kquickcontrolsaddons/plotter.h b/src/qmlcontrols/kquickcontrolsaddons/plotter.h
index 34f9597..01c0ef2 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/plotter.h
+++ b/src/qmlcontrols/kquickcontrolsaddons/plotter.h
@@ -51,7 +51,7 @@ class ManagedTextureNode;

/**
* a Plotter can draw a graph of values arriving from an arbitrary number of data sources
- * to show their evoluton in time.
+ * to show their evolution in time.
* an example can be a plot of the network transfer speed or CPU temperature over time.
* Multiple plots can be fitted in the same graph, either stacked or intersected.
*/
diff --git a/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp b/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp
index 4850011..c485de3 100644
--- a/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp
+++ b/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp
@@ -16,13 +16,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

+#include "kwindowsystemproxy.h"
+
#include <QMetaMethod>
#include <QWindow>

#include <kwindowsystem.h>

-#include "kwindowsystemproxy.h"
-
KWindowSystemProxy::KWindowSystemProxy(QObject *parent)
: QObject(parent)
, m_initialized(false)
diff --git a/src/quickaddons/configmodule.h b/src/quickaddons/configmodule.h
index 3e7d758..a0fb724 100644
--- a/src/quickaddons/configmodule.h
+++ b/src/quickaddons/configmodule.h
@@ -60,7 +60,7 @@ class ConfigModulePrivate;
* the module author.
*
* To write a config module, you have to create a C++ library
- * and an accompaining QML user interface.
+ * and an accompaning QML user interface.
* The library must contain a factory function like the following:
*
* \code
@@ -475,7 +475,7 @@ Q_SIGNALS:
void rootOnlyMessageChanged();

/**
- * Emits this signal whenever the the root only message gets used or discarded.
+ * Emits this signal whenever the root only message gets used or discarded.
*/
void useRootOnlyMessageChanged();

diff --git a/src/quickaddons/quickviewsharedengine.cpp b/src/quickaddons/quickviewsharedengine.cpp
index afd4d0d..430a5ec 100644
--- a/src/quickaddons/quickviewsharedengine.cpp
+++ b/src/quickaddons/quickviewsharedengine.cpp
@@ -28,7 +28,6 @@
#include <QQmlEngine>
#include <QQmlContext>
#include <QQuickItem>
-#include <QQmlEngine>
#include <QQmlExpression>
#include <QQmlProperty>

[Yuri Chornoivan]

Git commit 39e8d3730ef1a090e72adb1f8566d18539075823 by Yuri Chornoivan.
Committed on 10/09/2018 at 17:37.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 KF5Kirigami2Macros.cmake
M +1 -1 src/controls/AbstractApplicationHeader.qml
M +5 -5 src/controls/AbstractApplicationItem.qml
M +5 -5 src/controls/AbstractApplicationWindow.qml
M +1 -1 src/controls/ApplicationHeader.qml
M +2 -2 src/controls/Card.qml
M +1 -1 src/controls/CardsGridView.qml
M +2 -2 src/controls/CardsListView.qml
M +2 -2 src/controls/FormLayout.qml
M +2 -2 src/controls/ListItemDragHandle.qml
M +1 -1 src/controls/ToolBarApplicationHeader.qml
M +2 -2 src/controls/private/RefreshableScrollView.qml
M +1 -1 src/controls/templates/AbstractApplicationHeader.qml
M +3 -3 src/controls/templates/ApplicationHeader.qml
M +1 -1 src/controls/templates/OverlayDrawer.qml
M +4 -4 src/controls/templates/OverlaySheet.qml
M +1 -1 src/delegaterecycler.h
M +0 -2 src/desktopicon.cpp
M +2 -2 src/desktopicon.h
M +4 -4 src/kirigamiplugin.cpp
M +2 -2 src/kirigamiplugin.h
M +1 -1 src/mnemonicattached.cpp
M +1 -1 src/styles/org.kde.desktop/AbstractApplicationHeader.qml

https://commits.kde.org/kirigami/39e8d3730ef1a090e72adb1f8566d18539075823

diff --git a/KF5Kirigami2Macros.cmake b/KF5Kirigami2Macros.cmake
index 26cfa39..70abb6a 100644
--- a/KF5Kirigami2Macros.cmake
+++ b/KF5Kirigami2Macros.cmake
@@ -19,7 +19,7 @@ function(kirigami_package_breeze_icons)
SET(path "")
file(GLOB_RECURSE path ${_BREEZEICONS_DIR}/icons/*/48/${icon}.svg )

- #seach in other sizes as well
+ #search in other sizes as well
if (path STREQUAL "")
file(GLOB_RECURSE path ${_BREEZEICONS_DIR}/icons/*/32/${icon}.svg )
if (path STREQUAL "")
diff --git a/src/controls/AbstractApplicationHeader.qml b/src/controls/AbstractApplicationHeader.qml
index a6e17c6..c3e024b 100644
--- a/src/controls/AbstractApplicationHeader.qml
+++ b/src/controls/AbstractApplicationHeader.qml
@@ -27,7 +27,7 @@ import "templates" as T
/**
* An item that can be used as a title for the application.
* Scrolling the main page will make it taller or shorter (trough the point of going away)
- * It's a behavior similar to the typical mobile web browser adressbar
+ * It's a behavior similar to the typical mobile web browser addressbar
* the minimum, preferred and maximum heights of the item can be controlled with
* * minimumHeight: default is 0, i.e. hidden
* * preferredHeight: default is Units.gridUnit * 1.6
diff --git a/src/controls/AbstractApplicationItem.qml b/src/controls/AbstractApplicationItem.qml
index 914b440..437606f 100644
--- a/src/controls/AbstractApplicationItem.qml
+++ b/src/controls/AbstractApplicationItem.qml
@@ -27,9 +27,9 @@ import QtGraphicalEffects 1.0
/**
* A window that provides some basic features needed for all apps
* Use this class only if you need a custom content for your application,
- * different from the Page Row behavior recomended by the HIG and provided
+ * different from the Page Row behavior recommended by the HIG and provided
* by ApplicationItem.
- * It is recomended to use ApplicationItem instead
+ * It is recommended to use ApplicationItem instead
* @see ApplicationItem
*
* It's usually used as a root QML component for the application.
@@ -174,7 +174,7 @@ Item {
* header: ApplicationHeader
* An item that can be used as a title for the application.
* Scrolling the main page will make it taller or shorter (trough the point of going away)
- * It's a behavior similar to the typical mobile web browser adressbar
+ * It's a behavior similar to the typical mobile web browser addressbar
* the minimum, preferred and maximum heights of the item can be controlled with
* * Layout.minimumHeight: default is 0, i.e. hidden
* * Layout.preferredHeight: default is Units.gridUnit * 1.6
@@ -194,7 +194,7 @@ Item {

/**
* controlsVisible: bool
- * This property controls wether the standard chrome of the app, such
+ * This property controls whether the standard chrome of the app, such
* as the Action button, the drawer handles and the application
* header should be visible or not.
*/
@@ -217,7 +217,7 @@ Item {

/**
* contextDrawer: OverlayDrawer
- * The drawer for context-dependednt actions, that will be opened by sliding from the
+ * The drawer for context-dependent actions, that will be opened by sliding from the
* right screen edge or by dragging the ActionButton to the left.
* It is recommended to use the ContextDrawer class here.
* The contents of the context drawer should depend from what page is
diff --git a/src/controls/AbstractApplicationWindow.qml b/src/controls/AbstractApplicationWindow.qml
index 4aa3dcb..7f60675 100644
--- a/src/controls/AbstractApplicationWindow.qml
+++ b/src/controls/AbstractApplicationWindow.qml
@@ -26,9 +26,9 @@ import QtGraphicalEffects 1.0
/**
* A window that provides some basic features needed for all apps
* Use this class only if you need a custom content for your application,
- * different from the Page Row behavior recomended by the HIG and provided
+ * different from the Page Row behavior recommended by the HIG and provided
* by ApplicationWindow.
- * It is recomended to use ApplicationWindow instead
+ * It is recommended to use ApplicationWindow instead
* @see ApplicationWindow
*
* It's usually used as a root QML component for the application.
@@ -133,7 +133,7 @@ QQC2.ApplicationWindow {
* header: ApplicationHeader
* An item that can be used as a title for the application.
* Scrolling the main page will make it taller or shorter (trough the point of going away)
- * It's a behavior similar to the typical mobile web browser adressbar
+ * It's a behavior similar to the typical mobile web browser addressbar
* the minimum, preferred and maximum heights of the item can be controlled with
* * Layout.minimumHeight: default is 0, i.e. hidden
* * Layout.preferredHeight: default is Units.gridUnit * 1.6
@@ -146,7 +146,7 @@ QQC2.ApplicationWindow {

/**
* controlsVisible: bool
- * This property controls wether the standard chrome of the app, such
+ * This property controls whether the standard chrome of the app, such
* as the Action button, the drawer handles and the application
* header should be visible or not.
*/
@@ -169,7 +169,7 @@ QQC2.ApplicationWindow {

/**
* contextDrawer: OverlayDrawer
- * The drawer for context-dependednt actions, that will be opened by sliding from the
+ * The drawer for context-dependent actions, that will be opened by sliding from the
* right screen edge or by dragging the ActionButton to the left.
* It is recommended to use the ContextDrawer class here.
* The contents of the context drawer should depend from what page is
diff --git a/src/controls/ApplicationHeader.qml b/src/controls/ApplicationHeader.qml
index a46085c..914ef75 100644
--- a/src/controls/ApplicationHeader.qml
+++ b/src/controls/ApplicationHeader.qml
@@ -24,7 +24,7 @@ import "templates" as T
/**
* An item that can be used as a title for the application.
* Scrolling the main page will make it taller or shorter (trough the point of going away)
- * It's a behavior similar to the typical mobile web browser adressbar
+ * It's a behavior similar to the typical mobile web browser addressbar
* the minimum, preferred and maximum heights of the item can be controlled with
* * minimumHeight: default is 0, i.e. hidden
* * preferredHeight: default is Units.gridUnit * 1.6
diff --git a/src/controls/Card.qml b/src/controls/Card.qml
index 343bf3f..eacdf5e 100644
--- a/src/controls/Card.qml
+++ b/src/controls/Card.qml
@@ -25,13 +25,13 @@ import "private"

/**
* This is the standard layout of a Card.
- * It is recomended to use this class when the concept of Cards is needed
+ * It is recommended to use this class when the concept of Cards is needed
* in the application.
* This Card has default items as header and footer. The header is an
* image that can contain an optional title and icon, accessible via the
* banner grouped property.
* The footer will show a series of toolbuttons (and eventual overflow menu)
- * represewnting the actions list accessible with the list property actions.
+ * representing the actions list accessible with the list property actions.
* It is possible even tough is discouraged to override the footer:
* in this case the actions property shouldn't be used.
*
diff --git a/src/controls/CardsGridView.qml b/src/controls/CardsGridView.qml
index 95ee0d8..dda95c8 100644
--- a/src/controls/CardsGridView.qml
+++ b/src/controls/CardsGridView.qml
@@ -25,7 +25,7 @@ import "private"

/**
* CardsGridView is used to display a grid of Cards generated from any model.
- * The behavior is same as CardsLayout, and it allowes cards to be put in one or two
+ * The behavior is same as CardsLayout, and it allows cards to be put in one or two
* columns depending from the available width.
* GridView has the limitation that every Card must have the same exact height,
* so cellHeight must be manually set to a value in which the content fits
diff --git a/src/controls/CardsListView.qml b/src/controls/CardsListView.qml
index e543264..b189d5a 100644
--- a/src/controls/CardsListView.qml
+++ b/src/controls/CardsListView.qml
@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.2
import org.kde.kirigami 2.4 as Kirigami
import "private"
/**
- * CardsListView is a ListView which can have AbstractCard as its delegete: it will
+ * CardsListView is a ListView which can have AbstractCard as its delegate: it will
* automatically assign the proper spacings and margins around the cards adhering
* to the design guidelines.
* CardsListView should be used only with cards which can look good at any
@@ -32,7 +32,7 @@ import "private"
* Therefore is discouraged to use it with the Card type, unless it has
* Horizontal as headerOrientation.
* The choice between using this view with AbstractCard or a normal ListView
- * with AbstractListItem/BasicListItem is purely a choice based on aestetics alone.
+ * with AbstractListItem/BasicListItem is purely a choice based on aesthetics alone.
* It is discouraged to tweak the properties of this ListView.
* @inherits ListView
* @since 2.4
diff --git a/src/controls/FormLayout.qml b/src/controls/FormLayout.qml
index 0201f39..5b52c2d 100644
--- a/src/controls/FormLayout.qml
+++ b/src/controls/FormLayout.qml
@@ -59,9 +59,9 @@ Item {
* a desktop machine (the labels will be on a left column,
* the fields on a right column beside it), if false (such as on a phone)
* everything is laid out in a single column.
- * by default this will be based on wether the application is
+ * by default this will be based on whether the application is
* wide enough for the layout of being in such mode.
- * It can be overridden by reasigning the property
+ * It can be overridden by reassigning the property
*/
property bool wideMode: width >= lay.wideImplicitWidth

diff --git a/src/controls/ListItemDragHandle.qml b/src/controls/ListItemDragHandle.qml
index 4ab9be7..71037b2 100644
--- a/src/controls/ListItemDragHandle.qml
+++ b/src/controls/ListItemDragHandle.qml
@@ -28,7 +28,7 @@ import org.kde.kirigami 2.4 as Kirigami
* In order for ListItemDragHandle to work correctly, the listItem that is being dragged
* should not directly be the delegate of the ListView, but a child of it.
*
- * It is recomended to use DelagateRecycler as base delegate like the following code:
+ * It is recommended to use DelagateRecycler as base delegate like the following code:
* @code
* ...
* Component {
@@ -109,7 +109,7 @@ Item {

/**
* Emitted when the drag operation is complete and the item has been
- * droppped in the new final position
+ * dropped in the new final position
*/
signal dropped()

diff --git a/src/controls/ToolBarApplicationHeader.qml b/src/controls/ToolBarApplicationHeader.qml
index 7a495b5..bcd66e1 100644
--- a/src/controls/ToolBarApplicationHeader.qml
+++ b/src/controls/ToolBarApplicationHeader.qml
@@ -36,7 +36,7 @@ ApplicationHeader {
maximumHeight: preferredHeight
headerStyle: ApplicationHeaderStyle.Titles

- //FIXME: needs a property difinition to have its own type in qml
+ //FIXME: needs a property definition to have its own type in qml
property string _internal: ""

Component.onCompleted: print("Warning: ToolbarApplicationHeader is deprecated, remove and use the automatic internal toolbar instead.")
diff --git a/src/controls/private/RefreshableScrollView.qml b/src/controls/private/RefreshableScrollView.qml
index 6800992..1fc724d 100644
--- a/src/controls/private/RefreshableScrollView.qml
+++ b/src/controls/private/RefreshableScrollView.qml
@@ -203,7 +203,7 @@ P.ScrollView {
}

//NOTE: there is no function to know if an item is descended from another,
- //so we have to walk the parent hyerarchy by hand
+ //so we have to walk the parent hierarchy by hand
var isDescendent = false;
var candidate = focusItem.parent;
while (candidate) {
@@ -224,7 +224,7 @@ P.ScrollView {

var pos = focusItem.mapToItem(root.contentItem, 0, cursorY);

- //focused item alreqady visible? add some margin for the space of the action buttons
+ //focused item already visible? add some margin for the space of the action buttons
if (pos.y >= root.flickableItem.contentY && pos.y <= root.flickableItem.contentY + root.flickableItem.height - Units.gridUnit * 8) {
return;
}
diff --git a/src/controls/templates/AbstractApplicationHeader.qml b/src/controls/templates/AbstractApplicationHeader.qml
index d0aec1b..150f39a 100644
--- a/src/controls/templates/AbstractApplicationHeader.qml
+++ b/src/controls/templates/AbstractApplicationHeader.qml
@@ -26,7 +26,7 @@ import org.kde.kirigami 2.4
/**
* An item that can be used as a title for the application.
* Scrolling the main page will make it taller or shorter (trough the point of going away)
- * It's a behavior similar to the typical mobile web browser adressbar
+ * It's a behavior similar to the typical mobile web browser addressbar
* the minimum, preferred and maximum heights of the item can be controlled with
* * minimumHeight: default is 0, i.e. hidden
* * preferredHeight: default is Units.gridUnit * 1.6
diff --git a/src/controls/templates/ApplicationHeader.qml b/src/controls/templates/ApplicationHeader.qml
index d8e7be3..fbbe56e 100644
--- a/src/controls/templates/ApplicationHeader.qml
+++ b/src/controls/templates/ApplicationHeader.qml
@@ -27,7 +27,7 @@ import org.kde.kirigami 2.4
/**
* An item that can be used as a title for the application.
* Scrolling the main page will make it taller or shorter (trough the point of going away)
- * It's a behavior similar to the typical mobile web browser adressbar
+ * It's a behavior similar to the typical mobile web browser addressbar
* the minimum, preferred and maximum heights of the item can be controlled with
* * minimumHeight: default is 0, i.e. hidden
* * preferredHeight: default is Units.gridUnit * 1.6
@@ -42,11 +42,11 @@ AbstractApplicationHeader {
* headerStyle: int
* The way the separator between pages should be drawn in the header.
* Allowed values are:
- * * Breadcrumb: the pages are hyerarchical and the separator will look like a >
+ * * Breadcrumb: the pages are hierarchical and the separator will look like a >
* * TabBar: the pages are intended to behave like tabbar pages
* and the separator will look limke a dot.
*
- * When the heaer is in wide screen mode, no separator will be drawn.
+ * When the header is in wide screen mode, no separator will be drawn.
*/
property int headerStyle: ApplicationHeaderStyle.Auto

diff --git a/src/controls/templates/OverlayDrawer.qml b/src/controls/templates/OverlayDrawer.qml
index fdd412c..7814f61 100644
--- a/src/controls/templates/OverlayDrawer.qml
+++ b/src/controls/templates/OverlayDrawer.qml
@@ -84,7 +84,7 @@ T2.Drawer {
* When collapsed, the drawer will be resized to this size
* (which may be width for vertical drawers or height for
* horizontal drawers).
- * By default it's just enough to accomodate medium sized icons
+ * By default it's just enough to accommodate medium sized icons
*/
property int collapsedSize: Units.iconSizes.medium + Units.smallSpacing * 2

diff --git a/src/controls/templates/OverlaySheet.qml b/src/controls/templates/OverlaySheet.qml
index c768dc8..10515ed 100644
--- a/src/controls/templates/OverlaySheet.qml
+++ b/src/controls/templates/OverlaySheet.qml
@@ -48,7 +48,7 @@ QtObject {
* Note: The content item is automatically resized inside the
* padding of the control.
* Conversely, the Sheet will be sized based on the size hints
- * of the contentItem, so if you need a cusom size sheet,
+ * of the contentItem, so if you need a custom size sheet,
* redefine contentWidth and contentHeight of your contentItem
*/
default property Item contentItem
@@ -216,7 +216,7 @@ QtObject {
}

//NOTE: there is no function to know if an item is descended from another,
- //so we have to walk the parent hyerarchy by hand
+ //so we have to walk the parent hierarchy by hand
var isDescendent = false;
var candidate = focusItem.parent;
while (candidate) {
@@ -237,7 +237,7 @@ QtObject {


var pos = focusItem.mapToItem(flickableContents, 0, cursorY - Units.gridUnit*3);
- //focused item alreqady visible? add some margin for the space of the action buttons
+ //focused item already visible? add some margin for the space of the action buttons
if (pos.y >= scrollView.flickableItem.contentY && pos.y <= scrollView.flickableItem.contentY + scrollView.flickableItem.height - Units.gridUnit * 8) {
return;
}
@@ -380,7 +380,7 @@ QtObject {
//Show an extra margin when:
//* the application is in mobile mode (no toolbarapplicationheader)
//* the bottom screen controls are visible
- //* the sheet is disaplayed *under* the controls
+ //* the sheet is displayed *under* the controls
property int extraMargin: (!root.parent ||
typeof applicationWindow === "undefined" ||
(root.parent === applicationWindow().overlay) ||
diff --git a/src/delegaterecycler.h b/src/delegaterecycler.h
index 647ad67..5a5f3c5 100644
--- a/src/delegaterecycler.h
+++ b/src/delegaterecycler.h
@@ -30,7 +30,7 @@ class DelegateCache;
/**
* This class may be used as a delegate of a ListView or a GridView in the case
* the intended delegate is a bit heavy, with many objects inside.
- * This will ensure the delegate instances will be put back in a commoin pool after
+ * This will ensure the delegate instances will be put back in a common pool after
* destruction, so when scrolling a big list, the delegates from old delete items will
* be taken from the pool and reused, minimizing the need of instantiating new objects
* and deleting old ones. It ensures scrolling of lists with heavy delegates is
diff --git a/src/desktopicon.cpp b/src/desktopicon.cpp
index bd414ee..f4620a6 100644
--- a/src/desktopicon.cpp
+++ b/src/desktopicon.cpp
@@ -27,8 +27,6 @@
#include <QBitmap>
#include <QSGTexture>
#include <QDebug>
-#include <QSGSimpleTextureNode>
-#include <QSGTexture>
#include <QSharedPointer>
#include <QtQml>
#include <QQuickImageProvider>
diff --git a/src/desktopicon.h b/src/desktopicon.h
index 4e2fba7..4740b60 100644
--- a/src/desktopicon.h
+++ b/src/desktopicon.h
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef QICONITEM_H
-#define QICONITEM_H
+#ifndef DESKTOPICON_H
+#define DESKTOPICON_H

#include <QIcon>
#include <QQuickItem>
diff --git a/src/kirigamiplugin.cpp b/src/kirigamiplugin.cpp
index f7cafff..1c89e4b 100644
--- a/src/kirigamiplugin.cpp
+++ b/src/kirigamiplugin.cpp
@@ -147,12 +147,12 @@ void KirigamiPlugin::registerTypes(const char *uri)

//2.2
//Theme changed from a singleton to an attached property
- qmlRegisterUncreatableType<Kirigami::PlatformTheme>(uri, 2, 2, "Theme", "Cannot create objects of type Theme, use it as an attached poperty");
+ qmlRegisterUncreatableType<Kirigami::PlatformTheme>(uri, 2, 2, "Theme", "Cannot create objects of type Theme, use it as an attached property");

//2.3
qmlRegisterType(componentUrl(QStringLiteral("FormLayout.qml")), uri, 2, 3, "FormLayout");
- qmlRegisterUncreatableType<FormLayoutAttached>(uri, 2, 3, "FormData", "Cannot create objects of type FormData, use it as an attached poperty");
- qmlRegisterUncreatableType<MnemonicAttached>(uri, 2, 3, "MnemonicData", "Cannot create objects of type MnemonicData, use it as an attached poperty");
+ qmlRegisterUncreatableType<FormLayoutAttached>(uri, 2, 3, "FormData", "Cannot create objects of type FormData, use it as an attached property");
+ qmlRegisterUncreatableType<MnemonicAttached>(uri, 2, 3, "MnemonicData", "Cannot create objects of type MnemonicData, use it as an attached property");

//2.4
qmlRegisterType(componentUrl(QStringLiteral("AbstractCard.qml")), uri, 2, 4, "AbstractCard");
@@ -167,7 +167,7 @@ void KirigamiPlugin::registerTypes(const char *uri)
//2.5
qmlRegisterType(componentUrl(QStringLiteral("ListItemDragHandle.qml")), uri, 2, 5, "ListItemDragHandle");
qmlRegisterType(componentUrl(QStringLiteral("ActionToolBar.qml")), uri, 2, 5, "ActionToolBar");
- qmlRegisterUncreatableType<ScenePositionAttached>(uri, 2, 5, "ScenePosition", "Cannot create objects of type ScenePosition, use it as an attached poperty");
+ qmlRegisterUncreatableType<ScenePositionAttached>(uri, 2, 5, "ScenePosition", "Cannot create objects of type ScenePosition, use it as an attached property");

qmlProtectModule(uri, 2);
}
diff --git a/src/kirigamiplugin.h b/src/kirigamiplugin.h
index 0c1d829..7ae31ec 100644
--- a/src/kirigamiplugin.h
+++ b/src/kirigamiplugin.h
@@ -19,8 +19,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef MOBILECOMPONENTSPLUGIN_H
-#define MOBILECOMPONENTSPLUGIN_H
+#ifndef KIRIGAMIPLUGIN_H
+#define KIRIGAMIPLUGIN_H

#include <QUrl>

diff --git a/src/mnemonicattached.cpp b/src/mnemonicattached.cpp
index a3a954f..9789b1a 100644
--- a/src/mnemonicattached.cpp
+++ b/src/mnemonicattached.cpp
@@ -137,7 +137,7 @@ void MnemonicAttached::calculateWeights()
weight += (50 - pos);
}

- // try to preserve the wanted accelarators
+ // try to preserve the wanted accelerators
if (c == QLatin1Char('&') && (pos == m_label.length() - 1 || m_label[pos+1] != QLatin1Char('&'))) {
wanted_character = true;
++pos;
diff --git a/src/styles/org.kde.desktop/AbstractApplicationHeader.qml b/src/styles/org.kde.desktop/AbstractApplicationHeader.qml
index 3f2ede5..5cad71d 100644
--- a/src/styles/org.kde.desktop/AbstractApplicationHeader.qml
+++ b/src/styles/org.kde.desktop/AbstractApplicationHeader.qml
@@ -26,7 +26,7 @@ import "../../templates" as T
/**
* An item that can be used as a title for the application.
* Scrolling the main page will make it taller or shorter (trough the point of going away)
- * It's a behavior similar to the typical mobile web browser adressbar
+ * It's a behavior similar to the typical mobile web browser addressbar
* the minimum, preferred and maximum heights of the item can be controlled with
* * minimumHeight: default is 0, i.e. hidden
* * preferredHeight: default is Units.gridUnit * 1.6

[Yuri Chornoivan]

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 &copyright)
{
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')

[Dag]

Yori, this fails now, could you have look?

82%] Building CXX object
filters/libmsooxml/CMakeFiles/komsooxml.dir/MsooXmlUtils.cpp.o
In file included from /mnt/src/kdesrc/calligra med
space/calligra/filters/libmsooxml/MsooXmlUtils.cpp:58:0:
/mnt/src/kdesrc/calligra med
space/calligra/filters/libmsooxml/MsooXmlUtils.cpp: In function
‘KoFilter::ConversionStatus MSOOXML::Utils::loadAndParse(QIODevice*,
KoXmlDocument&, QString&, const QString&)’:
/mnt/src/kdesrc/calligra med
space/calligra/filters/libmsooxml/MsooXmlUtils.cpp:181:76: error: no
matching function for call to ‘i18nd(const char [16], QString&)’
"Error message: %3", errorLine ,
errorColumn , i18n(errorMsg));

[Yuri Chornoivan]

Git commit 06dce21e2f48399f50c2a5dda33476e4652e8da7 by Yuri Chornoivan.
Committed on 11/09/2018 at 16:14.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 autotests/ecmatest.cpp
M +1 -1 autotests/ecmatest.h
M +1 -1 src/kjs/JSWrapperObject.h
M +1 -1 src/kjs/api/kjsprivate.h
M +2 -2 src/kjs/array_instance.cpp
M +1 -1 src/kjs/bytecode/generator/codeprinter.cpp
M +1 -1 src/kjs/bytecode/generator/codeprinter.h
M +1 -1 src/kjs/bytecode/generator/driver.cpp
M +1 -1 src/kjs/bytecode/generator/filetemplate.h
M +1 -1 src/kjs/bytecode/generator/lexer.cpp
M +1 -1 src/kjs/bytecode/generator/lexer.h
M +1 -1 src/kjs/bytecode/generator/parser.cpp
M +1 -1 src/kjs/bytecode/generator/parser.h
M +1 -1 src/kjs/bytecode/generator/tablebuilder.cpp
M +2 -2 src/kjs/bytecode/generator/tablebuilder.h
M +1 -1 src/kjs/bytecode/generator/types.cpp
M +1 -1 src/kjs/bytecode/generator/types.h
M +1 -1 src/kjs/completion.h
M +3 -0 src/kjs/context.h
M +1 -1 src/kjs/debugger.h
M +1 -1 src/kjs/nodes.h
M +4 -0 src/kjs/nodes2bytecode.h
M +1 -1 src/kjs/object.h
M +1 -1 src/kjs/property_map.h
M +2 -2 src/kjs/propertydescriptor.h
M +1 -1 src/kjs/regexp.h
M +1 -1 src/kjs/regexp_object.h
M +1 -1 src/wtf/HashCountedSet.h
M +1 -1 src/wtf/HashSet.h
M +5 -0 src/wtf/RefPtrHashMap.h
M +1 -1 tests/testkjs.cpp

https://commits.kde.org/kjs/06dce21e2f48399f50c2a5dda33476e4652e8da7

diff --git a/autotests/ecmatest.cpp b/autotests/ecmatest.cpp
index ebb8bd2..e6857b9 100644
--- a/autotests/ecmatest.cpp
+++ b/autotests/ecmatest.cpp
@@ -18,8 +18,8 @@
#include "JSVariableObject.h"
#include "Parser.h"

-#include <QtCore/QMap>
-#include <QtCore/QDebug>
+#include <QMap>
+#include <QDebug>

// Let the interpreter create its own global Object instead of using our selfcreated
#define USE_KJS_GLOBAL 1
diff --git a/autotests/ecmatest.h b/autotests/ecmatest.h
index d0df325..4704963 100644
--- a/autotests/ecmatest.h
+++ b/autotests/ecmatest.h
@@ -12,7 +12,7 @@
#ifndef ECMATEST_H
#define ECMATEST_H

-#include <QtCore/QObject>
+#include <QObject>

class ECMAscriptTest : public QObject
{
diff --git a/src/kjs/JSWrapperObject.h b/src/kjs/JSWrapperObject.h
index 6153e28..17001cd 100644
--- a/src/kjs/JSWrapperObject.h
+++ b/src/kjs/JSWrapperObject.h
@@ -40,7 +40,7 @@ public:

/**
* Returns the internal value of the object. This is used for objects such
- * as String and Boolean which are wrappers for native types. The interal
+ * as String and Boolean which are wrappers for native types. The internal
* value is the actual value represented by the wrapper objects.
*
* @see ECMA 8.6.2
diff --git a/src/kjs/api/kjsprivate.h b/src/kjs/api/kjsprivate.h
index daa4ea9..ff9eaed 100644
--- a/src/kjs/api/kjsprivate.h
+++ b/src/kjs/api/kjsprivate.h
@@ -25,7 +25,7 @@
#include "kjs/ustring.h"
#include "kjs/identifier.h"
#include "kjs/list.h"
-#include <QtCore/QString>
+#include <QString>

#define JSVALUE_HANDLE(v) reinterpret_cast<KJSObjectHandle*>(v)
#define JSVALUE(h) reinterpret_cast<KJS::JSValue*>((h)->hnd)
diff --git a/src/kjs/array_instance.cpp b/src/kjs/array_instance.cpp
index 7cdd5be..a998eac 100644
--- a/src/kjs/array_instance.cpp
+++ b/src/kjs/array_instance.cpp
@@ -585,10 +585,10 @@ void ArrayInstance::putDirect(unsigned i, JSValue *value, int attributes)
return;
}

- // note: an invariant here is that indeces < sparseArrayCutoff
+ // note: an invariant here is that indices < sparseArrayCutoff
// are always inside the vector portion.

- // lowish indeces or high density -> we have decided that we'll put the new item into the vector.
+ // lowish indices or high density -> we have decided that we'll put the new item into the vector.
// Fast case is when there is no sparse map, so we can increase the vector size without moving values from the sparse map.
if (!map || map->isEmpty()) {
increaseVectorLength(i + 1);
diff --git a/src/kjs/bytecode/generator/codeprinter.cpp b/src/kjs/bytecode/generator/codeprinter.cpp
index 6d3da91..5fc0108 100644
--- a/src/kjs/bytecode/generator/codeprinter.cpp
+++ b/src/kjs/bytecode/generator/codeprinter.cpp
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/codeprinter.h b/src/kjs/bytecode/generator/codeprinter.h
index 64ba7bc..42b6df0 100644
--- a/src/kjs/bytecode/generator/codeprinter.h
+++ b/src/kjs/bytecode/generator/codeprinter.h
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/driver.cpp b/src/kjs/bytecode/generator/driver.cpp
index afaeee6..7bad507 100644
--- a/src/kjs/bytecode/generator/driver.cpp
+++ b/src/kjs/bytecode/generator/driver.cpp
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/filetemplate.h b/src/kjs/bytecode/generator/filetemplate.h
index fc919a8..c869354 100644
--- a/src/kjs/bytecode/generator/filetemplate.h
+++ b/src/kjs/bytecode/generator/filetemplate.h
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/lexer.cpp b/src/kjs/bytecode/generator/lexer.cpp
index 7e73aac..30472ef 100644
--- a/src/kjs/bytecode/generator/lexer.cpp
+++ b/src/kjs/bytecode/generator/lexer.cpp
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/lexer.h b/src/kjs/bytecode/generator/lexer.h
index 1d49a94..e134304 100644
--- a/src/kjs/bytecode/generator/lexer.h
+++ b/src/kjs/bytecode/generator/lexer.h
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/parser.cpp b/src/kjs/bytecode/generator/parser.cpp
index 27eaebf..699f392 100644
--- a/src/kjs/bytecode/generator/parser.cpp
+++ b/src/kjs/bytecode/generator/parser.cpp
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/parser.h b/src/kjs/bytecode/generator/parser.h
index 4de9978..c3437ab 100644
--- a/src/kjs/bytecode/generator/parser.h
+++ b/src/kjs/bytecode/generator/parser.h
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/tablebuilder.cpp b/src/kjs/bytecode/generator/tablebuilder.cpp
index e80b8a1..fdf77e9 100644
--- a/src/kjs/bytecode/generator/tablebuilder.cpp
+++ b/src/kjs/bytecode/generator/tablebuilder.cpp
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/tablebuilder.h b/src/kjs/bytecode/generator/tablebuilder.h
index 3a8a411..fc92619 100644
--- a/src/kjs/bytecode/generator/tablebuilder.h
+++ b/src/kjs/bytecode/generator/tablebuilder.h
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
@@ -93,7 +93,7 @@ private:

StringList operationNames;
unsigned operationFlags;
- map<string, string> operationRetTypes; // uglily enough specified on the impl. I suck.
+ map<string, string> operationRetTypes; // ugly enough specified on the impl. I suck.
vector<Operation> operations;
map<string, Operation> implementations;

diff --git a/src/kjs/bytecode/generator/types.cpp b/src/kjs/bytecode/generator/types.cpp
index d3a7ba0..b5fd9c1 100644
--- a/src/kjs/bytecode/generator/types.cpp
+++ b/src/kjs/bytecode/generator/types.cpp
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/bytecode/generator/types.h b/src/kjs/bytecode/generator/types.h
index 5c5fa2d..db785c1 100644
--- a/src/kjs/bytecode/generator/types.h
+++ b/src/kjs/bytecode/generator/types.h
@@ -1,5 +1,5 @@
/*
- * A utilitity for building various tables and specializations for the
+ * A utility for building various tables and specializations for the
* KJS Frostbyte bytecode
*
* Copyright (C) 2007, 2008 Maks Orlovich (***@kde.org)
diff --git a/src/kjs/completion.h b/src/kjs/completion.h
index 1ea8ce5..71ffc17 100644
--- a/src/kjs/completion.h
+++ b/src/kjs/completion.h
@@ -29,7 +29,7 @@
namespace KJS
{

-typedef unsigned Addr; // ### should there be some separare types h?
+typedef unsigned Addr; // ### should there be some separate types h?

class Node;
class JSValue;
diff --git a/src/kjs/context.h b/src/kjs/context.h
index 6d7231c..453e434 100644
--- a/src/kjs/context.h
+++ b/src/kjs/context.h
@@ -1 +1,4 @@
+#ifndef CONTEXT_H
+#define CONTEXT_H
#include <ExecState.h>
+#endif
diff --git a/src/kjs/debugger.h b/src/kjs/debugger.h
index 9589028..69ae89b 100644
--- a/src/kjs/debugger.h
+++ b/src/kjs/debugger.h
@@ -195,7 +195,7 @@ public:
JSObject *function, const List &args);

/**
- * Called when the inteprreter exits an execution context. This always
+ * Called when the interpreter exits an execution context. This always
* corresponds to a previous call to enterContext()
*
* The default implementation does nothing. Override this method if
diff --git a/src/kjs/nodes.h b/src/kjs/nodes.h
index 092aada..06581e5 100644
--- a/src/kjs/nodes.h
+++ b/src/kjs/nodes.h
@@ -232,7 +232,7 @@ public:
// w/o generateRefBegin
virtual OpValue generateRefDelete(CompileState *) = 0;

- // For function calls, we also do a specialized lookup, getting both the valie and the
+ // For function calls, we also do a specialized lookup, getting both the value and the
// scope/this, also making sure it's not an activation.
virtual void generateRefFunc(CompileState *comp, OpValue *funOut, OpValue *thisOut) = 0;
};
diff --git a/src/kjs/nodes2bytecode.h b/src/kjs/nodes2bytecode.h
index 2377495..b0ee4bd 100644
--- a/src/kjs/nodes2bytecode.h
+++ b/src/kjs/nodes2bytecode.h
@@ -19,6 +19,9 @@
*
*/

+#ifndef NODES2BYTECODE_H
+#define NODES2BYTECODE_H
+
#include "nodes.h"
#include "CompileState.h"

@@ -34,3 +37,4 @@ struct CompileReference {

}

+#endif
diff --git a/src/kjs/object.h b/src/kjs/object.h
index fa3531a..dda6a37 100644
--- a/src/kjs/object.h
+++ b/src/kjs/object.h
@@ -324,7 +324,7 @@ public:
*
* @param exec The current execution state
* @param hint The desired primitive type to convert to
- * @return A primitive value converted from the objetc. Note that the
+ * @return A primitive value converted from the object. Note that the
* type of primitive value returned may not be the same as the requested
* hint.
*/
diff --git a/src/kjs/property_map.h b/src/kjs/property_map.h
index a4b9d82..d3061e8 100644
--- a/src/kjs/property_map.h
+++ b/src/kjs/property_map.h
@@ -135,7 +135,7 @@ public:

// This /computes/ whether the table has getters or setters, while the above is
// used to cache the result. In other words, one usually does
- // setHasGetterSetterProperties(containsGettersOrSetters()) whenver
+ // setHasGetterSetterProperties(containsGettersOrSetters()) whenever
// there is a reason to believe that the result has changed
bool containsGettersOrSetters() const;
private:
diff --git a/src/kjs/propertydescriptor.h b/src/kjs/propertydescriptor.h
index 52d3e44..933fa79 100644
--- a/src/kjs/propertydescriptor.h
+++ b/src/kjs/propertydescriptor.h
@@ -79,14 +79,14 @@ public:
// PropertyDescriptor. New Attributes are set depending if Descriptor has
// enumerable/writeable/configurableSet, if absent default is used.
// NOTE: As interval have enumerable/writable/configurable always set and
- // javascript object dont, the order matters here.
+ // javascript object don't, the order matters here.
// In this case the correct order is: current.attributesWithOverride(new)
// where new is the javascript object that might not have all attributes set.
unsigned int attributesWithOverride(PropertyDescriptor &other) const;

private:
// Check if PropertyDescriptor really is the same. This is private for
- // internal use only, so that it will not easily be confussed with equalTo.
+ // internal use only, so that it will not easily be confused with equalTo.
// This function does compared set Attributes.
bool operator==(PropertyDescriptor &other) const;

diff --git a/src/kjs/regexp.h b/src/kjs/regexp.h
index 5dd4b39..7931f83 100644
--- a/src/kjs/regexp.h
+++ b/src/kjs/regexp.h
@@ -45,7 +45,7 @@ extern "C" { // bug with some libc5 distributions
namespace KJS
{

-// Represents a strign re-encoded to whatever PCRE can handle
+// Represents a string re-encoded to whatever PCRE can handle
class RegExpStringContext
{
public:
diff --git a/src/kjs/regexp_object.h b/src/kjs/regexp_object.h
index 1adf547..547de39 100644
--- a/src/kjs/regexp_object.h
+++ b/src/kjs/regexp_object.h
@@ -100,7 +100,7 @@ public:
virtual bool getOwnPropertySlot(ExecState *, const Identifier &, PropertySlot &);
JSValue *getValueProperty(ExecState *, int token) const;

- // If resources are exhaused during a match, exec parameter will have an exception
+ // If resources are exhausted during a match, exec parameter will have an exception
// set, and endOffset will be -1
UString performMatch(RegExp *, ExecState *, const RegExpStringContext &, const UString &,
int startOffset = 0, int *endOffset = nullptr, int **ovector = nullptr);
diff --git a/src/wtf/HashCountedSet.h b/src/wtf/HashCountedSet.h
index aad4874..b55797c 100644
--- a/src/wtf/HashCountedSet.h
+++ b/src/wtf/HashCountedSet.h
@@ -57,7 +57,7 @@ public:
unsigned count(const ValueType &value) const;

// increases the count if an equal value is already present
- // the return value is a pair of an interator to the new value's location,
+ // the return value is a pair of an iterator to the new value's location,
// and a bool that is true if an new entry was added
std::pair<iterator, bool> add(const ValueType &value);

diff --git a/src/wtf/HashSet.h b/src/wtf/HashSet.h
index 1486147..c83b676 100644
--- a/src/wtf/HashSet.h
+++ b/src/wtf/HashSet.h
@@ -75,7 +75,7 @@ public:
template<typename T, typename HashTranslator> const_iterator find(const T &) const;
template<typename T, typename HashTranslator> bool contains(const T &) const;

- // The return value is a pair of an interator to the new value's location,
+ // The return value is a pair of an iterator to the new value's location,
// and a bool that is true if an new entry was added.
pair<iterator, bool> add(const ValueType &);

diff --git a/src/wtf/RefPtrHashMap.h b/src/wtf/RefPtrHashMap.h
index c044efb..8e7ae29 100644
--- a/src/wtf/RefPtrHashMap.h
+++ b/src/wtf/RefPtrHashMap.h
@@ -18,6 +18,9 @@
*
*/

+#ifndef REFPTRHASHMAP_H
+#define REFPTRHASHMAP_H
+
namespace WTF
{

@@ -347,3 +350,5 @@ HashMap<RefPtr<T>, U, V, W, MappedTraits>::take(RawKeyType key)
}

} // namespace WTF
+
+#endif
diff --git a/tests/testkjs.cpp b/tests/testkjs.cpp
index fd7f850..0b40980 100644
--- a/tests/testkjs.cpp
+++ b/tests/testkjs.cpp
@@ -192,7 +192,7 @@ JSValue *TestFunctionImp::callAsFunction(ExecState *exec, JSObject *, const List

#if PLATFORM(WIN_OS) && defined(HAVE_CRTDBG_H) && !defined(__MINGW32__)
// Use SEH for Release builds only to get rid of the crash report dialog
-// (luckyly the same tests fail in Release and Debug builds so far). Need to
+// (luckily the same tests fail in Release and Debug builds so far). Need to
// be in a separate main function because the kjsmain function requires object
// unwinding.

[Yuri Chornoivan]

Git commit 94adf4fe961528d432297f8bebfd6da0bb3b85e8 by Yuri Chornoivan.
Committed on 11/09/2018 at 16:44.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 examples/kjsconsole/console.cpp
M +1 -1 examples/kjsconsole/kjs_object_model.cpp
M +2 -2 examples/kjsconsole/kjs_object_model.h
M +1 -1 examples/kjsconsole/numberedtextview.cpp
M +3 -3 src/kjscmd/kjscmd.cpp
M +2 -2 src/kjsembed/application.cpp
M +1 -1 src/kjsembed/application.h
M +3 -3 src/kjsembed/binding_support.h
M +1 -1 src/kjsembed/brush.cpp
M +6 -6 src/kjsembed/builtins.cpp
M +1 -1 src/kjsembed/color.cpp
M +2 -2 src/kjsembed/dom.cpp
M +3 -3 src/kjsembed/eventproxy.h
M +3 -3 src/kjsembed/filedialog_binding.cpp
M +3 -3 src/kjsembed/fileio.cpp
M +2 -2 src/kjsembed/font.cpp
M +3 -3 src/kjsembed/image.cpp
M +3 -3 src/kjsembed/iosupport.cpp
M +2 -2 src/kjsembed/jseventmapper.h
M +1 -1 src/kjsembed/jseventutils.h
M +1 -1 src/kjsembed/kjseglobal.h
M +4 -4 src/kjsembed/kjsembed.cpp
M +2 -2 src/kjsembed/object_binding.cpp
M +1 -1 src/kjsembed/pen.cpp
M +1 -1 src/kjsembed/pixmap.cpp
M +2 -2 src/kjsembed/point.cpp
M +1 -1 src/kjsembed/pointer.h
M +1 -1 src/kjsembed/qaction_binding.cpp
M +1 -1 src/kjsembed/qaction_binding.h
M +2 -2 src/kjsembed/qformbuilder_binding.cpp
M +1 -1 src/kjsembed/qlayout_binding.cpp
M +8 -8 src/kjsembed/qobject_binding.cpp
M +2 -2 src/kjsembed/qobject_binding.h
M +3 -3 src/kjsembed/qpainter_binding.cpp
M +2 -2 src/kjsembed/quiloader_binding.cpp
M +2 -2 src/kjsembed/qwidget_binding.cpp
M +4 -4 src/kjsembed/rect.cpp
M +1 -1 src/kjsembed/settings.cpp
M +2 -2 src/kjsembed/size.cpp
M +3 -3 src/kjsembed/slotproxy.cpp
M +3 -3 src/kjsembed/slotproxy.h
M +1 -1 src/kjsembed/static_binding.cpp
M +2 -2 src/kjsembed/static_binding.h
M +1 -1 src/kjsembed/svg_binding.cpp
M +1 -1 src/kjsembed/test/QByteArray_bind.cpp
M +2 -2 src/kjsembed/url.cpp
M +4 -4 src/kjsembed/variant_binding.cpp
M +1 -1 src/kjsembed/variant_binding.h

https://commits.kde.org/kjsembed/94adf4fe961528d432297f8bebfd6da0bb3b85e8

diff --git a/examples/kjsconsole/console.cpp b/examples/kjsconsole/console.cpp
index e1f25bd..8a9d675 100644
--- a/examples/kjsconsole/console.cpp
+++ b/examples/kjsconsole/console.cpp
@@ -24,9 +24,9 @@

#include <math.h>

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QFileDialog>
-#include <QtCore/QFile>
+#include <QFile>

#include <kjsembed/kjseglobal.h>
#include <kjs/interpreter.h>
diff --git a/examples/kjsconsole/kjs_object_model.cpp b/examples/kjsconsole/kjs_object_model.cpp
index ab809de..143bb39 100644
--- a/examples/kjsconsole/kjs_object_model.cpp
+++ b/examples/kjsconsole/kjs_object_model.cpp
@@ -22,7 +22,7 @@
#include "kjs_object_model.h"

#include <QPixmap>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <kjs/object.h>
#include <kjs/interpreter.h>
diff --git a/examples/kjsconsole/kjs_object_model.h b/examples/kjsconsole/kjs_object_model.h
index 0f6f252..7fe4cf4 100644
--- a/examples/kjsconsole/kjs_object_model.h
+++ b/examples/kjsconsole/kjs_object_model.h
@@ -22,8 +22,8 @@
#ifndef KJS_OBJECT_MODEL
#define KJS_OBJECT_MODEL

-#include <QtCore/QModelIndex>
-#include <QtCore/QVariant>
+#include <QModelIndex>
+#include <QVariant>

namespace KJS
{
diff --git a/examples/kjsconsole/numberedtextview.cpp b/examples/kjsconsole/numberedtextview.cpp
index e67e68d..42c36cf 100644
--- a/examples/kjsconsole/numberedtextview.cpp
+++ b/examples/kjsconsole/numberedtextview.cpp
@@ -30,7 +30,7 @@
#include <QPainter>
#include <QTextObjectInterface>
#include <QToolTip>
-#include <QtCore/QDebug>
+#include <QDebug>

NumberBar::NumberBar(QWidget *parent)
: QWidget(parent), edit(nullptr), m_stopLine(-1), m_currentLine(-1), m_bugLine(-1)
diff --git a/src/kjscmd/kjscmd.cpp b/src/kjscmd/kjscmd.cpp
index ba356a2..45012eb 100644
--- a/src/kjscmd/kjscmd.cpp
+++ b/src/kjscmd/kjscmd.cpp
@@ -21,8 +21,8 @@
*/

#include <QApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
+#include <QDebug>
+#include <QStringList>

#include <kjs/interpreter.h>
#include <kjs/ustring.h>
@@ -30,7 +30,7 @@
#include <kjsembed/kjseglobal.h>
#include <kjsembed/kjsembed.h>

-#include <QtCore/QDate>
+#include <QDate>

using namespace KJSEmbed;

diff --git a/src/kjsembed/application.cpp b/src/kjsembed/application.cpp
index 15c6f57..3420798 100644
--- a/src/kjsembed/application.cpp
+++ b/src/kjsembed/application.cpp
@@ -21,9 +21,9 @@
*/
#include "application.h"

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QApplication>
-#include <QtCore/QStringList>
+#include <QStringList>
using namespace KJSEmbed;

namespace CoreApplicationNS
diff --git a/src/kjsembed/application.h b/src/kjsembed/application.h
index c05f14c..87e9d4c 100644
--- a/src/kjsembed/application.h
+++ b/src/kjsembed/application.h
@@ -24,7 +24,7 @@
#define APPLICATION_H

#include <QApplication>
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
#include "qobject_binding.h"
#include "static_binding.h"

diff --git a/src/kjsembed/binding_support.h b/src/kjsembed/binding_support.h
index 0e7bda2..99818da 100644
--- a/src/kjsembed/binding_support.h
+++ b/src/kjsembed/binding_support.h
@@ -23,8 +23,8 @@
#ifndef BINDING_SUPPORT_H
#define BINDING_SUPPORT_H

-#include <QtCore/QDate>
-#include <QtCore/QStringList>
+#include <QDate>
+#include <QStringList>

#include <kjsembed/kjseglobal.h>
#include <kjsembed/pointer.h>
@@ -286,7 +286,7 @@ T *extractBindingImp(KJS::JSObject *obj)
/**
* Method callback signature.
* @param exec The execution state.
-* @param object The current object that the method is working on (equivelent of "this")
+* @param object The current object that the method is working on (equivalent of "this")
* @param args A KJS::List of KJS::JSValue objects that represents the arguments that where
* passed in from the javascript function signature.
*/
diff --git a/src/kjsembed/brush.cpp b/src/kjsembed/brush.cpp
index 08af2c1..c988279 100644
--- a/src/kjsembed/brush.cpp
+++ b/src/kjsembed/brush.cpp
@@ -21,7 +21,7 @@
*/
#include "brush.h"

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QBrush>
#include <QPixmap>
#include <QColor>
diff --git a/src/kjsembed/builtins.cpp b/src/kjsembed/builtins.cpp
index 646713a..9ff725b 100644
--- a/src/kjsembed/builtins.cpp
+++ b/src/kjsembed/builtins.cpp
@@ -22,13 +22,13 @@

#include "builtins.h"

-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QStandardPaths>
+#include <QCoreApplication>
+#include <QFile>
+#include <QStandardPaths>
#include <QMessageBox>
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
-#include <QtCore/QMetaType>
+#include <QTextStream>
+#include <QDebug>
+#include <QMetaType>

#include "variant_binding.h"
#include "object_binding.h"
diff --git a/src/kjsembed/color.cpp b/src/kjsembed/color.cpp
index dc18064..1208359 100644
--- a/src/kjsembed/color.cpp
+++ b/src/kjsembed/color.cpp
@@ -21,7 +21,7 @@
*/
#include "color.h"

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QColor>

using namespace KJSEmbed;
diff --git a/src/kjsembed/dom.cpp b/src/kjsembed/dom.cpp
index a5d646b..370c33d 100644
--- a/src/kjsembed/dom.cpp
+++ b/src/kjsembed/dom.cpp
@@ -21,8 +21,8 @@
*/
#include "dom.h"

-#include <QtXml/QDomAttr>
-#include <QtCore/QDebug>
+#include <QDomAttr>
+#include <QDebug>

using namespace KJSEmbed;

diff --git a/src/kjsembed/eventproxy.h b/src/kjsembed/eventproxy.h
index 4d6c110..3320b7f 100644
--- a/src/kjsembed/eventproxy.h
+++ b/src/kjsembed/eventproxy.h
@@ -22,9 +22,9 @@

#ifndef EVENTPROXY_H
#define EVENTPROXY_H
-#include <QtCore/QObject>
-#include <QtCore/QBitRef>
-#include <QtCore/QEvent>
+#include <QObject>
+#include <QBitRef>
+#include <QEvent>

#include <kjs/object.h>

diff --git a/src/kjsembed/filedialog_binding.cpp b/src/kjsembed/filedialog_binding.cpp
index c813432..0bc4e08 100644
--- a/src/kjsembed/filedialog_binding.cpp
+++ b/src/kjsembed/filedialog_binding.cpp
@@ -21,10 +21,10 @@
*/
#include "filedialog_binding.h"

-#include <QtCore/QStringList>
-#include <QtCore/QProcess>
+#include <QStringList>
+#include <QProcess>
#include <QFileDialog>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <kjs/object.h>

diff --git a/src/kjsembed/fileio.cpp b/src/kjsembed/fileio.cpp
index d704f0e..3348db5 100644
--- a/src/kjsembed/fileio.cpp
+++ b/src/kjsembed/fileio.cpp
@@ -20,10 +20,10 @@
Boston, MA 02110-1301, USA.
*/
#include "fileio.h"
-#include <QtCore/QFile>
+#include <QFile>
#include "kjseglobal.h"
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QDebug>
+#include <QTemporaryFile>
+#include <QDebug>

using namespace KJSEmbed;

diff --git a/src/kjsembed/font.cpp b/src/kjsembed/font.cpp
index a0fcec2..3877006 100644
--- a/src/kjsembed/font.cpp
+++ b/src/kjsembed/font.cpp
@@ -21,9 +21,9 @@
*/
#include "font.h"

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QFont>
-#include <QtCore/QStringList>
+#include <QStringList>
using namespace KJSEmbed;

const KJS::ClassInfo FontBinding::info = { "QFont", &VariantBinding::info, nullptr, nullptr };
diff --git a/src/kjsembed/image.cpp b/src/kjsembed/image.cpp
index 5ea9259..94b7bea 100644
--- a/src/kjsembed/image.cpp
+++ b/src/kjsembed/image.cpp
@@ -23,10 +23,10 @@
#include "variant_binding.h"
#include "object_binding.h"

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QImage>
-#include <QtCore/QPoint>
-#include <QtCore/QSize>
+#include <QPoint>
+#include <QSize>

using namespace KJSEmbed;

diff --git a/src/kjsembed/iosupport.cpp b/src/kjsembed/iosupport.cpp
index 2c70f22..0783a3e 100644
--- a/src/kjsembed/iosupport.cpp
+++ b/src/kjsembed/iosupport.cpp
@@ -24,10 +24,10 @@
#include "kjseglobal.h"

#include <kjs/object.h>
-#include <QtCore/QDebug>
+#include <QDebug>

-#include <QtCore/QStringList>
-#include <QtCore/QProcess>
+#include <QStringList>
+#include <QProcess>

using namespace KJSEmbed;

diff --git a/src/kjsembed/jseventmapper.h b/src/kjsembed/jseventmapper.h
index 9e9fb77..c707f9f 100644
--- a/src/kjsembed/jseventmapper.h
+++ b/src/kjsembed/jseventmapper.h
@@ -23,8 +23,8 @@
#ifndef JSEVENTMAPPER_H
#define JSEVENTMAPPER_H

-#include <QtCore/QHash>
-#include <QtCore/QEvent>
+#include <QHash>
+#include <QEvent>

#include <kjs/identifier.h>

diff --git a/src/kjsembed/jseventutils.h b/src/kjsembed/jseventutils.h
index bf80aaa..e26231f 100644
--- a/src/kjsembed/jseventutils.h
+++ b/src/kjsembed/jseventutils.h
@@ -23,7 +23,7 @@
#ifndef KJSEMBED_JSEVENTUTILS_H
#define KJSEMBED_JSEVENTUTILS_H

-#include <QtCore/QEvent>
+#include <QEvent>
#include <QKeyEvent>

#include <kjs/object.h>
diff --git a/src/kjsembed/kjseglobal.h b/src/kjsembed/kjseglobal.h
index 8552425..c694f64 100644
--- a/src/kjsembed/kjseglobal.h
+++ b/src/kjsembed/kjseglobal.h
@@ -37,7 +37,7 @@ KJSEMBED_EXPORT void RedirectIOToConsole();

#endif

-#include <QtCore/QTextStream>
+#include <QTextStream>
namespace KJSEmbed
{
KJSEMBED_EXPORT QTextStream *conin();
diff --git a/src/kjsembed/kjsembed.cpp b/src/kjsembed/kjsembed.cpp
index 5e02fab..dfb5ff8 100644
--- a/src/kjsembed/kjsembed.cpp
+++ b/src/kjsembed/kjsembed.cpp
@@ -57,11 +57,11 @@
#include <kjs/interpreter.h>
#include <kjs/completion.h>

-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QObject>
+#include <QFile>
+#include <QTextStream>
+#include <QObject>

-#include <QtCore/QDebug>
+#include <QDebug>

/**
* Implement QString-KJS::UString conversion methods. These methods are declared
diff --git a/src/kjsembed/object_binding.cpp b/src/kjsembed/object_binding.cpp
index df2ebac..b05205a 100644
--- a/src/kjsembed/object_binding.cpp
+++ b/src/kjsembed/object_binding.cpp
@@ -22,8 +22,8 @@

#include "object_binding.h"

-#include <QtCore/QArgument>
-#include <QtCore/QDebug>
+#include <QArgument>
+#include <QDebug>

#include "static_binding.h"
#include "variant_binding.h"
diff --git a/src/kjsembed/pen.cpp b/src/kjsembed/pen.cpp
index a3f8ae0..2215519 100644
--- a/src/kjsembed/pen.cpp
+++ b/src/kjsembed/pen.cpp
@@ -21,7 +21,7 @@
*/
#include "pen.h"

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QPen>
#include <QBrush>
#include <QColor>
diff --git a/src/kjsembed/pixmap.cpp b/src/kjsembed/pixmap.cpp
index 28abb1e..9a09f92 100644
--- a/src/kjsembed/pixmap.cpp
+++ b/src/kjsembed/pixmap.cpp
@@ -21,7 +21,7 @@
*/
#include "pixmap.h"

-#include <QtCore/QDebug>
+#include <QDebug>
#include <QPixmap>
#include <QBitmap>
#include <QWidget>
diff --git a/src/kjsembed/point.cpp b/src/kjsembed/point.cpp
index a0d4242..4ab6c09 100644
--- a/src/kjsembed/point.cpp
+++ b/src/kjsembed/point.cpp
@@ -21,8 +21,8 @@
*/
#include "point.h"

-#include <QtCore/QDebug>
-#include <QtCore/QPoint>
+#include <QDebug>
+#include <QPoint>

using namespace KJSEmbed;

diff --git a/src/kjsembed/pointer.h b/src/kjsembed/pointer.h
index 0714f5a..e44dba7 100644
--- a/src/kjsembed/pointer.h
+++ b/src/kjsembed/pointer.h
@@ -25,7 +25,7 @@

#include <algorithm>
#include <typeinfo>
-#include <QtCore/QVariant>
+#include <QVariant>

namespace KJSEmbed
{
diff --git a/src/kjsembed/qaction_binding.cpp b/src/kjsembed/qaction_binding.cpp
index 3ee6025..84bc2f3 100644
--- a/src/kjsembed/qaction_binding.cpp
+++ b/src/kjsembed/qaction_binding.cpp
@@ -24,7 +24,7 @@
#include "kjseglobal.h"

#include <kjs/object.h>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <QAction>
#include <QtUiTools/QUiLoader>
diff --git a/src/kjsembed/qaction_binding.h b/src/kjsembed/qaction_binding.h
index ef21160..fcc1bd3 100644
--- a/src/kjsembed/qaction_binding.h
+++ b/src/kjsembed/qaction_binding.h
@@ -23,7 +23,7 @@
#ifndef QACTION_BINDING_H
#define QACTION_BINDING_H

-#include <QtCore/QObject>
+#include <QObject>
#include <QAction>
//#include <QActionGroup>

diff --git a/src/kjsembed/qformbuilder_binding.cpp b/src/kjsembed/qformbuilder_binding.cpp
index d7d4817..95d5e86 100644
--- a/src/kjsembed/qformbuilder_binding.cpp
+++ b/src/kjsembed/qformbuilder_binding.cpp
@@ -23,8 +23,8 @@

#include <QWidget>
#include <QtDesigner/QFormBuilder>
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
+#include <QFile>
+#include <QDebug>

#include <kjs/object.h>

diff --git a/src/kjsembed/qlayout_binding.cpp b/src/kjsembed/qlayout_binding.cpp
index 0d77d3b..33ed842 100644
--- a/src/kjsembed/qlayout_binding.cpp
+++ b/src/kjsembed/qlayout_binding.cpp
@@ -24,7 +24,7 @@
#include "kjseglobal.h"

#include <kjs/object.h>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <QWidget>
#include <QAction>
diff --git a/src/kjsembed/qobject_binding.cpp b/src/kjsembed/qobject_binding.cpp
index bfa253e..c8678fe 100644
--- a/src/kjsembed/qobject_binding.cpp
+++ b/src/kjsembed/qobject_binding.cpp
@@ -22,14 +22,14 @@
*/
#include "qobject_binding.h"

-#include <QtCore/QObject>
-#include <QtCore/QArgument>
-#include <QtCore/QMetaEnum>
-#include <QtCore/QMetaType>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#include <QtCore/QDebug>
+#include <QObject>
+#include <QArgument>
+#include <QMetaEnum>
+#include <QMetaType>
+#include <QVariant>
+#include <QVector>
+#include <QUrl>
+#include <QDebug>
#include <QWidget>

#include "slotproxy.h"
diff --git a/src/kjsembed/qobject_binding.h b/src/kjsembed/qobject_binding.h
index 2ff871f..90be7fd 100644
--- a/src/kjsembed/qobject_binding.h
+++ b/src/kjsembed/qobject_binding.h
@@ -24,8 +24,8 @@
#ifndef QOBJECT_BINDING_H
#define QOBJECT_BINDING_H

-#include <QtCore/QObjectCleanupHandler>
-#include <QtCore/QDebug>
+#include <QObjectCleanupHandler>
+#include <QDebug>

#include <kjs/function.h>

diff --git a/src/kjsembed/qpainter_binding.cpp b/src/kjsembed/qpainter_binding.cpp
index 6cd1ef8..7a97a0d 100644
--- a/src/kjsembed/qpainter_binding.cpp
+++ b/src/kjsembed/qpainter_binding.cpp
@@ -25,7 +25,7 @@
#include "kjseglobal.h"

#include <kjs/object.h>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <QWidget>
#include <QPainter>
@@ -33,9 +33,9 @@
#include <QPixmap>
#include <QPen>
#include <QBrush>
-#include <QtCore/QLine>
+#include <QLine>
#include <QPolygon>
-#include <QtCore/QPoint>
+#include <QPoint>

#include <QFrame>

diff --git a/src/kjsembed/quiloader_binding.cpp b/src/kjsembed/quiloader_binding.cpp
index 3a60e60..8e0f479 100644
--- a/src/kjsembed/quiloader_binding.cpp
+++ b/src/kjsembed/quiloader_binding.cpp
@@ -22,8 +22,8 @@
#include "quiloader_binding.h"

#include <QWidget>
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
+#include <QFile>
+#include <QDebug>

#include "qwidget_binding.h"
#include "qobject_binding.h"
diff --git a/src/kjsembed/qwidget_binding.cpp b/src/kjsembed/qwidget_binding.cpp
index 19369ec..6ad034e 100644
--- a/src/kjsembed/qwidget_binding.cpp
+++ b/src/kjsembed/qwidget_binding.cpp
@@ -25,14 +25,14 @@
#include "kjseglobal.h"

#include <kjs/object.h>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <QWidget>
#include <QAction>
#include <QLayout>
#include <QtUiTools/QUiLoader>

-#include <QtCore/QFile>
+#include <QFile>

namespace KJSEmbed
{
diff --git a/src/kjsembed/rect.cpp b/src/kjsembed/rect.cpp
index b3086f2..4e265e0 100644
--- a/src/kjsembed/rect.cpp
+++ b/src/kjsembed/rect.cpp
@@ -21,10 +21,10 @@
*/
#include "rect.h"

-#include <QtCore/QDebug>
-#include <QtCore/QRect>
-#include <QtCore/QPoint>
-#include <QtCore/QSize>
+#include <QDebug>
+#include <QRect>
+#include <QPoint>
+#include <QSize>

using namespace KJSEmbed;

diff --git a/src/kjsembed/settings.cpp b/src/kjsembed/settings.cpp
index bb663eb..49fae92 100644
--- a/src/kjsembed/settings.cpp
+++ b/src/kjsembed/settings.cpp
@@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA.
*/
#include "settings.h"
-#include <QtCore/QSettings>
+#include <QSettings>
#include "kjseglobal.h"

using namespace KJSEmbed;
diff --git a/src/kjsembed/size.cpp b/src/kjsembed/size.cpp
index 5e57560..899cce9 100644
--- a/src/kjsembed/size.cpp
+++ b/src/kjsembed/size.cpp
@@ -21,8 +21,8 @@
*/
#include "size.h"

-#include <QtCore/QDebug>
-#include <QtCore/QSize>
+#include <QDebug>
+#include <QSize>

using namespace KJSEmbed;

diff --git a/src/kjsembed/slotproxy.cpp b/src/kjsembed/slotproxy.cpp
index 3533611..d61f4a4 100644
--- a/src/kjsembed/slotproxy.cpp
+++ b/src/kjsembed/slotproxy.cpp
@@ -21,9 +21,9 @@
*/
#include "slotproxy.h"

-#include <QtCore/QMetaEnum>
-#include <QtCore/QMetaType>
-#include <QtCore/QDebug>
+#include <QMetaEnum>
+#include <QMetaType>
+#include <QDebug>
#include <QWidget>

#include <kjs/interpreter.h>
diff --git a/src/kjsembed/slotproxy.h b/src/kjsembed/slotproxy.h
index 34d61d2..5b3285f 100644
--- a/src/kjsembed/slotproxy.h
+++ b/src/kjsembed/slotproxy.h
@@ -23,9 +23,9 @@
#ifndef SLOTPROXY_H
#define SLOTPROXY_H

-#include <QtCore/QObject>
-#include <QtCore/QByteRef>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QByteRef>
+#include <QVariant>
#include <kjs/object.h>
#include "kjsembed.h"

diff --git a/src/kjsembed/static_binding.cpp b/src/kjsembed/static_binding.cpp
index eb60e7f..8c8b864 100644
--- a/src/kjsembed/static_binding.cpp
+++ b/src/kjsembed/static_binding.cpp
@@ -22,7 +22,7 @@
#include "static_binding.h"
#include <kjs/interpreter.h>
#include <kjs/function_object.h>
-#include <QtCore/QDebug>
+#include <QDebug>

namespace KJSEmbed
{
diff --git a/src/kjsembed/static_binding.h b/src/kjsembed/static_binding.h
index 3a4e05e..238ef98 100644
--- a/src/kjsembed/static_binding.h
+++ b/src/kjsembed/static_binding.h
@@ -22,7 +22,7 @@

#ifndef STATIC_BINDING_H
#define STATIC_BINDING_H
-#include <QtCore/QHash>
+#include <QHash>

#include <kjs/function.h>

@@ -114,7 +114,7 @@ public:
* args.append("test");
* KJS::Value myType = KJSEmbed::construct(exec, "MyType", args);
* @endcode
- * is equivelent to the following javascript
+ * is equivalent to the following javascript
* @code
* var myType = new MyType("test");
* @endcode
diff --git a/src/kjsembed/svg_binding.cpp b/src/kjsembed/svg_binding.cpp
index b70f282..914d745 100644
--- a/src/kjsembed/svg_binding.cpp
+++ b/src/kjsembed/svg_binding.cpp
@@ -22,7 +22,7 @@
#include "svg_binding.h"

#include <QtSvg/QSvgWidget>
-#include <QtCore/QDebug>
+#include <QDebug>

#include <kjs/object.h>

diff --git a/src/kjsembed/test/QByteArray_bind.cpp b/src/kjsembed/test/QByteArray_bind.cpp
index c433d17..99ddb20 100644
--- a/src/kjsembed/test/QByteArray_bind.cpp
+++ b/src/kjsembed/test/QByteArray_bind.cpp
@@ -1,5 +1,5 @@
#include "QByteArray_bind.h"
-#include <QtCore/QByteArray>
+#include <QByteArray>
#include <variant_binding.h>
#include <value_binding.h>

diff --git a/src/kjsembed/url.cpp b/src/kjsembed/url.cpp
index 5d60001..b8b7e79 100644
--- a/src/kjsembed/url.cpp
+++ b/src/kjsembed/url.cpp
@@ -21,8 +21,8 @@
*/
#include "url.h"

-#include <QtCore/QDebug>
-#include <QtCore/QUrl>
+#include <QDebug>
+#include <QUrl>

using namespace KJSEmbed;

diff --git a/src/kjsembed/variant_binding.cpp b/src/kjsembed/variant_binding.cpp
index d68c7a1..45c7614 100644
--- a/src/kjsembed/variant_binding.cpp
+++ b/src/kjsembed/variant_binding.cpp
@@ -28,10 +28,10 @@
#include <kjs/PropertyNameArray.h>
#include <kjs/array_instance.h>

-#include <QtCore/QBitRef>
-#include <QtCore/QByteRef>
-#include <QtCore/QDebug>
-#include <QtCore/QObject>
+#include <QBitRef>
+#include <QByteRef>
+#include <QDebug>
+#include <QObject>
#include <QWidget>

#include "kjseglobal.h"
diff --git a/src/kjsembed/variant_binding.h b/src/kjsembed/variant_binding.h
index 1d99de8..c1fdffc 100644
--- a/src/kjsembed/variant_binding.h
+++ b/src/kjsembed/variant_binding.h
@@ -24,7 +24,7 @@
#ifndef VARIANT_BINDING_H
#define VARIANT_BINDING_H

-#include <QtCore/QVariant>
+#include <QVariant>

#include <kjs/object.h>
#include <kjs/interpreter.h>

[Yuri Chornoivan]

Git commit 0c01bf17c5f0373412ef8dda058b733858598b0c by Yuri Chornoivan.
Committed on 11/09/2018 at 17:09.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 src/core/engine.h
M +1 -1 src/core/question.h
M +1 -1 src/kmoretools/kmoretools.cpp
M +3 -3 src/kmoretools/kmoretools.h
M +4 -4 src/kmoretools/kmoretools_p.h
M +3 -3 src/kmoretools/kmoretoolspresets.h
M +1 -1 src/uploaddialog.h
M +2 -2 tests/khotnewstuff_test.h

https://commits.kde.org/knewstuff/0c01bf17c5f0373412ef8dda058b733858598b0c

diff --git a/src/core/engine.h b/src/core/engine.h
index 05b7dee..7e814cb 100644
--- a/src/core/engine.h
+++ b/src/core/engine.h
@@ -189,7 +189,7 @@ public:
* out entries marked as ghns_exclude=1. To retain this when setting a custom
* filter, add "ghns_exclude!=1" as one of the filters.
*
- * @note Some tags provided by OCS do not supply a value (and are simply passsed
+ * @note Some tags provided by OCS do not supply a value (and are simply passed
* as a key). These will be interpreted as having the value 1 for filtering
* purposes. An example of this might be ghns_exclude, which in reality will
* generally be passed through ocs as "ghns_exclude" rather than "ghns_exclude=1"
diff --git a/src/core/question.h b/src/core/question.h
index 1ac56c8..b961d16 100644
--- a/src/core/question.h
+++ b/src/core/question.h
@@ -27,7 +27,7 @@
namespace KNSCore
{
/**
- * @short A way to ask a user a question from insude a GUI-less library (like KNewStuffCore)
+ * @short A way to ask a user a question from inside a GUI-less library (like KNewStuffCore)
*
* Rather than using a message box (which is a UI thing), when you want to ask your user
* a question, create an instance of this class and use that instead. The consuming library
diff --git a/src/kmoretools/kmoretools.cpp b/src/kmoretools/kmoretools.cpp
index a164739..01f195f 100644
--- a/src/kmoretools/kmoretools.cpp
+++ b/src/kmoretools/kmoretools.cpp
@@ -70,7 +70,7 @@ public:
* 'uniqueId' = @see uniqueId()
*
* @param can be a filename with or without relative path. But no absolute path.
- * @returns the first occurence if there are more than one found
+ * @returns the first occurrence if there are more than one found
*/
QString findFileInKmtDesktopfilesDir(const QString& filename)
{
diff --git a/src/kmoretools/kmoretools.h b/src/kmoretools/kmoretools.h
index 4d7f1db..8feb8e7 100644
--- a/src/kmoretools/kmoretools.h
+++ b/src/kmoretools/kmoretools.h
@@ -58,7 +58,7 @@ class KMoreToolsPrivate;
* - Provide an API to define external applications for a given context.
* - If a defined application is not installed (yet) the application is (optionally)
* still presented to the user with a hint that it is not installed and a link
- * to the homepage (later with integration to package managment).
+ * to the homepage (later with integration to package management).
* This increases the discoverability of useful applications the user never
* heard about yet.
* - In case of many applications for a given context, it provides a GUI to the
@@ -260,7 +260,7 @@ public:
* 2) the location where the kmt-desktopfiles should be installed because
* there they will be searched by default.
* If @p uniqueId contains slashes they will result in subdirectories.
- * The default location can be overriden by
+ * The default location can be overridden by
* registerServiceByDesktopEntryName's kmtDesktopfileSubdir parameter.
* This is currently used in KMoreToolsPresets implementation to
* separate the kmt-desktopfiles location from the user's config section
@@ -439,7 +439,7 @@ public:
/**
* In KMoreToolsMenuFactory some minor magic is done. In the context of
* connecting the action trigger signal we need to know the maximum number
- * of URL arguments a given service can accept. Usaually a number between
+ * of URL arguments a given service can accept. Usually a number between
* 0 and 1. Sometimes 2.
* E.g. kdf must not be called with any positional argument.
* E.g. gitg can be called with zero or one arguments.
diff --git a/src/kmoretools/kmoretools_p.h b/src/kmoretools/kmoretools_p.h
index 3dce441..86c20d9 100644
--- a/src/kmoretools/kmoretools_p.h
+++ b/src/kmoretools/kmoretools_p.h
@@ -105,7 +105,7 @@ public:
}

/**
- * todo: is there a QT method that can be used insted of this?
+ * todo: is there a QT method that can be used instead of this?
*/
static QString removeMenuAmpersand(const QString& str)
{
@@ -232,7 +232,7 @@ public: // should be private but we would like to unit test

public:
/**
- * moves an item up or down respecting its catgory
+ * moves an item up or down respecting its category
* @param direction: 1: down, -1: up
*/
void moveWithinSection(const QString& id, int direction)
@@ -331,7 +331,7 @@ public:
const auto a = item->action();
KmtMenuItemDto dto;
dto.id = item->id();
- dto.text = a->text(); // might be overriden, so we use directly from QAction
+ dto.text = a->text(); // might be overridden, so we use directly from QAction
dto.icon = a->icon();
dto.isInstalled = true;
dto.menuSection = KMoreTools::MenuSection_Main;
@@ -342,7 +342,7 @@ public:
const auto a = item->action();
KmtMenuItemDto dto;
dto.id = item->id();
- dto.text = a->text(); // might be overriden, so we use directly from QAction
+ dto.text = a->text(); // might be overridden, so we use directly from QAction
dto.icon = a->icon();
dto.isInstalled = true;
dto.menuSection = KMoreTools::MenuSection_More;
diff --git a/src/kmoretools/kmoretoolspresets.h b/src/kmoretools/kmoretoolspresets.h
index 6306242..eebfa03 100644
--- a/src/kmoretools/kmoretoolspresets.h
+++ b/src/kmoretools/kmoretoolspresets.h
@@ -37,7 +37,7 @@ class KMoreToolsService;
* registerServicesByGroupingNames takes a list of a set of predefined
* grouping names and returns a list KMoreToolsService instances. Remember,
* a KMoreToolsService represents a service which might or might not be
- * installed on the current maschine.
+ * installed on the current machine.
*
* The groupings defined here are used for the KMoreToolsMenuFactory.
*
@@ -69,7 +69,7 @@ public:
* where the search should be started.
*
* - "font-tools" (since 5.37.0)
- * Tools to manage and analyse fonts.
+ * Tools to manage and analyze fonts.
*
* - "git-clients-for-folder"
* Collection of git clients which all take 1 URL argument pointing
@@ -97,7 +97,7 @@ public:
* Tools related to the mouse pointer device.
*
* - "screenrecorder" (since 5.37.0)
- * Record screen contents to a video file (including animatated gif).
+ * Record screen contents to a video file (including animated gif).
*
* - "screenshot-take"
* Tools for taking and maybe also editing screenshots.
diff --git a/src/uploaddialog.h b/src/uploaddialog.h
index 3c59045..3c1b2e5 100644
--- a/src/uploaddialog.h
+++ b/src/uploaddialog.h
@@ -117,7 +117,7 @@ public:
// void setLicense(License license);

/**
- Set one of the threee preview images displayed in the upload dialog.
+ Set one of the three preview images displayed in the upload dialog.
The user can still change this.
@param number The number of the preview image to set, either 1, 2, or 3.
@param file A URL to the file to be used as preview image
diff --git a/tests/khotnewstuff_test.h b/tests/khotnewstuff_test.h
index 9554ad1..e392b99 100644
--- a/tests/khotnewstuff_test.h
+++ b/tests/khotnewstuff_test.h
@@ -17,8 +17,8 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef KNEWSTUFF2_TEST_TEST_H
-#define KNEWSTUFF2_TEST_TEST_H
+#ifndef KHOTNEWSTUFF_TEST_H
+#define KHOTNEWSTUFF_TEST_H

#include <KNSCore/Provider>
#include <KNSCore/EntryInternal>

[Yuri Chornoivan]

Git commit 7c8e332d885363ba58c41a6def78d94f99fedea6 by Yuri Chornoivan.
Committed on 11/09/2018 at 17:30.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +5 -0 autotests/fake_notifications_server.h
M +3 -3 src/knotification.h
M +1 -1 src/knotificationmanager.cpp
M +1 -1 src/knotificationrestrictions.cpp
M +2 -2 src/kstatusnotifieritem.h
M +3 -3 src/notifybyaudio_phonon.cpp
M +1 -1 src/notifybyflatpak.cpp
M +1 -1 src/notifybyflatpak.h
M +2 -2 src/notifybypopup.cpp
M +1 -1 src/notifybypopup.h

https://commits.kde.org/knotifications/7c8e332d885363ba58c41a6def78d94f99fedea6

diff --git a/autotests/fake_notifications_server.h b/autotests/fake_notifications_server.h
index 75cd401..a0241db 100644
--- a/autotests/fake_notifications_server.h
+++ b/autotests/fake_notifications_server.h
@@ -16,6 +16,9 @@
Boston, MA 02110-1301, USA.
*/

+#ifndef FAKE_NOTIFICATION_SERVER_H
+#define FAKE_NOTIFICATION_SERVER_H
+
#include <QObject>
#include <QHash>
#include <QVariantMap>
@@ -67,3 +70,5 @@ Q_SIGNALS:

void newNotification();
};
+
+#endif
diff --git a/src/knotification.h b/src/knotification.h
index 3e899d2..12f6b94 100644
--- a/src/knotification.h
+++ b/src/knotification.h
@@ -134,7 +134,7 @@ class QDBusError;
* KNotification as plugins, by deriving from KNotificationPlugin.
* At the time of writing, the following actions are available: Taskbar,
* Sound, Popup, Logfile, TTS, Execute.
- * Actions can be combined by seperating them with '|'.
+ * Actions can be combined by separating them with '|'.
*
* Contexts is a comma separated list of possible context for this event.
*
@@ -317,7 +317,7 @@ public:
/**
* @brief the widget associated to the notification
*
- * If the widget is destroyed, the notification will be automatically cancelled.
+ * If the widget is destroyed, the notification will be automatically canceled.
* If the widget is activated, the notification will be automatically closed if the NotificationFlags specify that
*
* When the notification is activated, the widget might be raised.
@@ -532,7 +532,7 @@ Q_SIGNALS:
* The parameter passed by the signal is the index of the action
* in the QStringList set by setActions() call.
*
- * @param action will be 0 if the default aciton was activated, or the index of the action in the actions QStringList
+ * @param action will be 0 if the default action was activated, or the index of the action in the actions QStringList
*/
void activated(unsigned int action);

diff --git a/src/knotificationmanager.cpp b/src/knotificationmanager.cpp
index 71eda6f..4b426a0 100644
--- a/src/knotificationmanager.cpp
+++ b/src/knotificationmanager.cpp
@@ -126,7 +126,7 @@ KNotificationPlugin *KNotificationManager::pluginForAction(const QString &action

// Load plugin.
// We have a series of built-ins up first, and fall back to trying
- // to instanciate an externally supplied plugin.
+ // to instantiate an externally supplied plugin.
if (action == QLatin1String("Popup")) {
if (d->inSandbox && d->portalDBusServiceExists) {
plugin = new NotifyByFlatpak(this);
diff --git a/src/knotificationrestrictions.cpp b/src/knotificationrestrictions.cpp
index 8c55c34..e0697c5 100644
--- a/src/knotificationrestrictions.cpp
+++ b/src/knotificationrestrictions.cpp
@@ -155,7 +155,7 @@ void KNotificationRestrictions::Private::startScreenSaverPrevention()

qCDebug(LOG_KNOTIFICATIONS) << "---- using XTest";
// send a fake event right away in case this got started after a period of
- // innactivity leading to the screensaver set to activate in <55s
+ // inactivity leading to the screensaver set to activate in <55s
screensaverFakeKeyEvent();
screensaverTimer->start(55000);
#endif // HAVE_XTEST
diff --git a/src/kstatusnotifieritem.h b/src/kstatusnotifieritem.h
index 9b6e35b..aed0f18 100644
--- a/src/kstatusnotifieritem.h
+++ b/src/kstatusnotifieritem.h
@@ -360,7 +360,7 @@ public:
* usually you don't need to call this unless you want to use
* a custom QMenu subclass as context menu.
*
- * The KStatusNotifierItem instance takes ownerhip of the menu,
+ * The KStatusNotifierItem instance takes ownership of the menu,
* and will delete it upon its destruction.
*/
void setContextMenu(QMenu *menu);
@@ -460,7 +460,7 @@ Q_SIGNALS:
* Inform the host application that an activation has been requested,
* for instance left mouse click, but this is not guaranteed since
* it's dependent from the visualization
- * @param active if it's true the application asked for the activatin
+ * @param active if it's true the application asked for the activation
* of the main window, if it's false it asked for hiding
* @param pos the position in the screen where the user clicked to
* trigger this signal, QPoint() if it's not the consequence of a mouse click.
diff --git a/src/notifybyaudio_phonon.cpp b/src/notifybyaudio_phonon.cpp
index ae3c97a..4d3b64a 100644
--- a/src/notifybyaudio_phonon.cpp
+++ b/src/notifybyaudio_phonon.cpp
@@ -94,12 +94,12 @@ void NotifyByAudio::notify(KNotification *notification, KNotifyConfig *config)
m->play();

if (notification->flags() & KNotification::LoopSound) {
- // Enqueing essentially prevents the subsystem pipeline from partial teardown
+ // Enqueuing essentially prevents the subsystem pipeline from partial teardown
// which is the most desired thing in terms of load and delay between loop cycles.
// All of this is timing dependent, which is why we want at least one source queued;
// in reality the shorter the source the more sources we want to be queued to prevent
// the MO from running out of sources.
- // Point being that all phonon signals are forcefully queued (becuase qthread has problems detecting !pthread threads),
+ // Point being that all phonon signals are forcefully queued (because qthread has problems detecting !pthread threads),
// so when you get for example the aboutToFinish signal the MO might already have stopped playing.
//
// And so we queue it three times at least; doesn't cost anything and keeps us safe.
@@ -145,7 +145,7 @@ void NotifyByAudio::onAudioFinished()
if (!notification) {
// This means that close was called already so there's nothing else to do.
// Ideally we should not be getting here if close has already been called
- // since stoping a mediaobject means it won't emit finished() *BUT*
+ // since stopping a mediaobject means it won't emit finished() *BUT*
// since the finished signal is a queued connection in phonon it can happen
// that the playing had already finished and we just had not got the signal yet
return;
diff --git a/src/notifybyflatpak.cpp b/src/notifybyflatpak.cpp
index e16e0db..1d9966d 100644
--- a/src/notifybyflatpak.cpp
+++ b/src/notifybyflatpak.cpp
@@ -131,7 +131,7 @@ void NotifyByFlatpak::notify(KNotification *notification, const KNotifyConfig &n
// check if Notifications DBus service exists on bus, use it if it does
if (d->dbusServiceExists) {
if (!d->sendNotificationToPortal(notification, notifyConfig)) {
- finish(notification); //an error ocurred.
+ finish(notification); //an error occurred.
}
}
}
diff --git a/src/notifybyflatpak.h b/src/notifybyflatpak.h
index cf8620b..43beab3 100644
--- a/src/notifybyflatpak.h
+++ b/src/notifybyflatpak.h
@@ -46,7 +46,7 @@ public:

private Q_SLOTS:

- // slot to catch appearance or dissapearance of org.freedesktop.Desktop DBus service
+ // slot to catch appearance or disappearance of org.freedesktop.Desktop DBus service
void onServiceOwnerChanged(const QString &, const QString &, const QString &);

void onPortalNotificationActionInvoked(const QString &, const QString &, const QVariantList &);
diff --git a/src/notifybypopup.cpp b/src/notifybypopup.cpp
index 6e6f2ac..8cdf93a 100644
--- a/src/notifybypopup.cpp
+++ b/src/notifybypopup.cpp
@@ -218,7 +218,7 @@ void NotifyByPopup::notify(KNotification *notification, KNotifyConfig *notifyCon
void NotifyByPopup::notify(KNotification *notification, const KNotifyConfig &notifyConfig)
{
if (d->passivePopups.contains(notification) || d->galagoNotifications.contains(notification->id())) {
- // notification is alrady on the screen, do nothing
+ // notification is already on the screen, do nothing
finish(notification);
return;
}
@@ -233,7 +233,7 @@ void NotifyByPopup::notify(KNotification *notification, const KNotifyConfig &not
d->queryPopupServerCapabilities();
} else {
if (!d->sendNotificationToGalagoServer(notification, notifyConfig)) {
- finish(notification); //an error ocurred.
+ finish(notification); //an error occurred.
}
}
return;
diff --git a/src/notifybypopup.h b/src/notifybypopup.h
index f992d39..66d9bdf 100644
--- a/src/notifybypopup.h
+++ b/src/notifybypopup.h
@@ -51,7 +51,7 @@ protected:
private Q_SLOTS:
void onPassivePopupDestroyed();
void onPassivePopupLinkClicked(const QString &link);
- // slot to catch appearance or dissapearance of Notifications DBus service
+ // slot to catch appearance or disappearance of Notifications DBus service
void onServiceOwnerChanged(const QString &, const QString &, const QString &);
// slot which gets called when DBus signals that some notification action was invoked
void onGalagoNotificationActionInvoked(uint notificationId, const QString &actionKey);

[Yuri Chornoivan]

Git commit 20d254e5afe4a88c180d4050c4e1bbb0c24f795d by Yuri Chornoivan.
Committed on 11/09/2018 at 18:03.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 KF5PackageMacros.cmake
M +1 -1 src/kpackage/package.cpp
M +1 -1 src/kpackage/package.h
M +1 -1 src/kpackage/packageloader.cpp
M +2 -2 src/kpackage/private/package_p.h
M +1 -1 src/kpackage/private/packagejobthread.cpp
M +1 -1 src/kpackage/private/packagejobthread_p.h

https://commits.kde.org/kpackage/20d254e5afe4a88c180d4050c4e1bbb0c24f795d

diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
index c3e7cb8..761eab3 100644
--- a/KF5PackageMacros.cmake
+++ b/KF5PackageMacros.cmake
@@ -159,7 +159,7 @@ function(kpackage_install_bundled_package dir component)
COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=${install_dir} -DROOT=${root} -DCOMPONENT=${component} -DDIRECTORY=${DIRECTORY} -D OUTPUTFILE=${OUTPUTFILE} -P ${kpackagedir}/qrc.cmake
DEPENDS ${component}-${root}-metadata-json)
set(GENERATED_RCC_CONTENTS "${CMAKE_CURRENT_BINARY_DIR}/${component}-contents.rcc")
- # add_custom_target depends on ALL target so qrc is run everytime
+ # add_custom_target depends on ALL target so qrc is run every time
# it doesn't have OUTPUT property so it's considered out-of-date every build
add_custom_target(${component}-${root}-contents-rcc ALL
COMMENT "Generating ${component}-contents.rcc"
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
index 6cfe82c..cb2bf8a 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -367,7 +367,7 @@ QString Package::filePath(const QByteArray &fileType, const QString &filename) c
//We are an installed package
if (d->tempRoot.isEmpty()) {
prefix = fileType == "metadata" ? d->path : (d->path + contentsPrefix);
- //We are a compressed package temporarly uncompressed in /tmp
+ //We are a compressed package temporarily uncompressed in /tmp
} else {
prefix = fileType == "metadata" ? d->tempRoot : (d->tempRoot + contentsPrefix);
}
diff --git a/src/kpackage/package.h b/src/kpackage/package.h
index af30d30..cd89af0 100644
--- a/src/kpackage/package.h
+++ b/src/kpackage/package.h
@@ -91,7 +91,7 @@ public:
PackageOpenError, /**< Can't open the package file for reading */
MetadataFileMissingError, /**< The package doesn't have a metadata.desktop file */
PluginNameMissingError, /**< The metadata.desktop file doesn't specify a plugin name */
- PluginNameInvalidError, /**< The plugin name contains charaters different from letters, digits, dots and underscores */
+ PluginNameInvalidError, /**< The plugin name contains characters different from letters, digits, dots and underscores */
UpdatePackageTypeMismatchError, /**< A package with this plugin name was already installed, but has a different type in the metadata.desktop file */
OldVersionRemovalError, /**< Failed to remove the old version of the package during an upgrade */
NewerVersionAlreadyInstalledError, /**< We tried to update, but the same version or a newer one is already installed */
diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
index 33d763b..aa30484 100644
--- a/src/kpackage/packageloader.cpp
+++ b/src/kpackage/packageloader.cpp
@@ -51,7 +51,7 @@ QSet<QString> PackageLoaderPrivate::s_customCategories;

QSet<QString> PackageLoaderPrivate::knownCategories()
{
- // this is to trick the tranlsation tools into making the correct
+ // this is to trick the translation tools into making the correct
// strings for translation
QSet<QString> categories = s_customCategories;
categories << QStringLiteral(I18N_NOOP("Accessibility")).toLower()
diff --git a/src/kpackage/private/package_p.h b/src/kpackage/private/package_p.h
index c151cc4..5b4d0a7 100644
--- a/src/kpackage/private/package_p.h
+++ b/src/kpackage/private/package_p.h
@@ -35,11 +35,11 @@ namespace KPackage
//leaving the PackageJob with a dangling pointer
//we need some way to invalidate the Package* pointer if it gets deleted

-//we can't just take a copy in the packagejob as we need to detatch and update the *original* KPackage object
+//we can't just take a copy in the packagejob as we need to detach and update the *original* KPackage object
//without changing anything else which happened to share the same KPackage::d

//TODO KF6 - make KPackage::install()'s KJob return a new Package copy rather than modify
-//an existing opbject.
+//an existing object.
class PackageDeletionNotifier : public QObject
{
Q_OBJECT
diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
index a2cc2b1..6ad6c8d 100644
--- a/src/kpackage/private/packagejobthread.cpp
+++ b/src/kpackage/private/packagejobthread.cpp
@@ -347,7 +347,7 @@ bool PackageJobThread::installPackage(const QString &src, const QString &dest, O
KPluginMetaData oldMeta(targetName + QLatin1String("/metadata.desktop"));

if (oldMeta.serviceTypes() != meta.serviceTypes()) {
- d->errorMessage = i18n("The new package has a different type from the old version already installed.", meta.version(), meta.pluginId(), oldMeta.version());
+ d->errorMessage = i18n("The new package has a different type from the old version already installed.");
d->errorCode = Package::JobError::UpdatePackageTypeMismatchError;
} else if (isVersionNewer(oldMeta.version(), meta.version())) {
const bool ok = uninstallPackage(targetName);
diff --git a/src/kpackage/private/packagejobthread_p.h b/src/kpackage/private/packagejobthread_p.h
index d6010f8..61346a9 100644
--- a/src/kpackage/private/packagejobthread_p.h
+++ b/src/kpackage/private/packagejobthread_p.h
@@ -65,7 +65,7 @@ Q_SIGNALS:
void installPathChanged(const QString &installPath);

private:
- //OperationType says wether we want to install, update or any
+ //OperationType says whether we want to install, update or any
//new similar operation it will be expanded
bool installDependency(const QUrl &src);
bool installPackage(const QString &src, const QString &dest, OperationType operation);

[Yuri Chornoivan]

Git commit c39df38b662f089bf28b51ffa9f0f534e87fe567 by Yuri Chornoivan.
Committed on 12/09/2018 at 16:04.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/personsmodeltest.cpp
M +2 -2 src/backends/abstractcontact.h
M +3 -3 src/personssortfilterproxymodel.h
M +3 -3 src/widgets/actions.h
M +3 -3 src/widgets/plugins/mergecontactswidget.h

https://commits.kde.org/kpeople/c39df38b662f089bf28b51ffa9f0f534e87fe567

diff --git a/autotests/personsmodeltest.cpp b/autotests/personsmodeltest.cpp
index 3e5b9a5..2432bc4 100644
--- a/autotests/personsmodeltest.cpp
+++ b/autotests/personsmodeltest.cpp
@@ -150,7 +150,7 @@ void PersonsModelTest::unmergeContacts()
QCOMPARE(modelRowsInsert.count(), 1);
QCOMPARE(modelRowsInsert.first().at(0).toModelIndex(), QModelIndex());

- // Similarily, there must be one row removed and the parent must be
+ // Similarly, there must be one row removed and the parent must be
// the old Person index
QCOMPARE(modelRowsRemove.count(), 1);
QCOMPARE(modelRowsRemove.first().at(0).toModelIndex(), personIndex);
diff --git a/src/backends/abstractcontact.h b/src/backends/abstractcontact.h
index 933ff09..787eda7 100644
--- a/src/backends/abstractcontact.h
+++ b/src/backends/abstractcontact.h
@@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifndef KPEOPLE_CONTACT
-#define KPEOPLE_CONTACT
+#ifndef KPEOPLE_ABSTRACT_CONTACT_H
+#define KPEOPLE_ABSTRACT_CONTACT_H

#include <QSharedData>
#include <QVariant>
diff --git a/src/personssortfilterproxymodel.h b/src/personssortfilterproxymodel.h
index c411f48..3be1028 100644
--- a/src/personssortfilterproxymodel.h
+++ b/src/personssortfilterproxymodel.h
@@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifndef PERSONSSORTFILTERMODEL_H
-#define PERSONSSORTFILTERMODEL_H
+#ifndef PERSONSSORTFILTERPROXYMODEL_H
+#define PERSONSSORTFILTERPROXYMODEL_H

#include <QScopedPointer>
#include <QSortFilterProxyModel>
@@ -60,4 +60,4 @@ private:

}

-#endif // PERSONSSORTFILTERMODEL_H
+#endif // PERSONSSORTFILTERPROXYMODEL_H
diff --git a/src/widgets/actions.h b/src/widgets/actions.h
index cbac2d5..870a157 100644
--- a/src/widgets/actions.h
+++ b/src/widgets/actions.h
@@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifndef KPEOPLEWIDGETS_GLOBAL_H
-#define KPEOPLEWIDGETS_GLOBAL_H
+#ifndef KPEOPLEWIDGETS_ACTIONS_H
+#define KPEOPLEWIDGETS_ACTIONS_H

#include <QList>
#include <kpeople/widgets/kpeoplewidgets_export.h>
@@ -51,4 +51,4 @@ enum ActionType {
KPEOPLEWIDGETS_EXPORT QList<QAction *> actionsForPerson(const QString &contactUri, QObject *parent);
}

-#endif // KPEOPLEWIDGETS_GLOBAL_H
+#endif // KPEOPLEWIDGETS_ACTIONS_H
diff --git a/src/widgets/plugins/mergecontactswidget.h b/src/widgets/plugins/mergecontactswidget.h
index be02753..1941dba 100644
--- a/src/widgets/plugins/mergecontactswidget.h
+++ b/src/widgets/plugins/mergecontactswidget.h
@@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifndef MERGE_CONTACT_WIDGET_H
-#define MERGE_CONTACT_WIDGET_H
+#ifndef MERGE_CONTACTS_WIDGET_H
+#define MERGE_CONTACTS_WIDGET_H

#include "abstractpersondetailswidget.h"

@@ -59,4 +59,4 @@ private:
QList< QPair<QPersistentModelIndex, PersonPresentationWidget *> > m_listMergeContacts;
};

-#endif // MERGE_CONTACT_WIDGET_H
+#endif // MERGE_CONTACTS_WIDGET_H

[Yuri Chornoivan]

Git commit ffc91a7563b3241b4871a9a1c342ee0f04c56603 by Yuri Chornoivan.
Committed on 12/09/2018 at 16:27.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/dbusrunnertest.cpp
M +2 -1 autotests/runnercontexttest.h
M +2 -1 autotests/testremoterunner.cpp
M +1 -1 src/abstractrunner.cpp
M +1 -1 src/querymatch.h
M +2 -2 src/runnercontext.h
M +1 -1 src/runnermanager.h

https://commits.kde.org/krunner/ffc91a7563b3241b4871a9a1c342ee0f04c56603

diff --git a/autotests/dbusrunnertest.cpp b/autotests/dbusrunnertest.cpp
index dbc51e3..d3b6396 100644
--- a/autotests/dbusrunnertest.cpp
+++ b/autotests/dbusrunnertest.cpp
@@ -114,7 +114,7 @@ void DBusRunnerTest::testMatch()
QCOMPARE(result.text(), QStringLiteral("Match 1"));
QCOMPARE(result.iconName(), QStringLiteral("icon1"));
QCOMPARE(result.type(), Plasma::QueryMatch::ExactMatch);
- //relevance can't be compared easily becuase RunnerContext meddles with it
+ //relevance can't be compared easily because RunnerContext meddles with it

//verify actions
auto actions = m.actionsForMatch(result);
diff --git a/autotests/runnercontexttest.h b/autotests/runnercontexttest.h
index da7abb7..d9e2d8a 100644
--- a/autotests/runnercontexttest.h
+++ b/autotests/runnercontexttest.h
@@ -17,7 +17,8 @@
* Boston, MA 02110-1301, USA. *
*******************************************************************************/

-#ifndef PACKAGEMETADATATEST_H
+#ifndef RUNNER_CONTEXT_TEST_H
+#define RUNNER_CONTEXT_TEST_H

#include <QtTest>

diff --git a/autotests/testremoterunner.cpp b/autotests/testremoterunner.cpp
index 8324f9b..3b1a935 100644
--- a/autotests/testremoterunner.cpp
+++ b/autotests/testremoterunner.cpp
@@ -16,12 +16,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

+#include "testremoterunner.h"
+
#include <QCoreApplication>
#include <QDBusConnection>

#include <iostream>

-#include "testremoterunner.h"
#include "krunner1adaptor.h"

//Test DBus runner, if the search term contains "foo" it returns a match, otherwise nothing
diff --git a/src/abstractrunner.cpp b/src/abstractrunner.cpp
index bab4c0e..d10b366 100644
--- a/src/abstractrunner.cpp
+++ b/src/abstractrunner.cpp
@@ -18,6 +18,7 @@
*/

#include "abstractrunner.h"
+#include "abstractrunner_p.h"

#include <QAction>
#include <QHash>
@@ -35,7 +36,6 @@
#include <Plasma/PluginLoader>
#include <qstandardpaths.h>

-#include "abstractrunner_p.h"
#include "querymatch.h"
#include "runnercontext.h"

diff --git a/src/querymatch.h b/src/querymatch.h
index 62538ce..d0687c2 100644
--- a/src/querymatch.h
+++ b/src/querymatch.h
@@ -157,7 +157,7 @@ class KRUNNER_EXPORT QueryMatch
* AbstractRunner.
*
* When set, it is also used to form
- * part of the id() for this match. If that is innapropriate
+ * part of the id() for this match. If that is inappropriate
* as an id, the runner may generate its own id and set that
* with setId(const QString&) directly after calling setData
*/
diff --git a/src/runnercontext.h b/src/runnercontext.h
index bae1919..75c97b1 100644
--- a/src/runnercontext.h
+++ b/src/runnercontext.h
@@ -136,7 +136,7 @@ class KRUNNER_EXPORT RunnerContext : public QObject
* ... some processing ...
* }
*
- * While not required to be used within runners, it provies a nice way
+ * While not required to be used within runners, it provides a nice way
* to avoid unnecessary processing in runners that may run for an extended
* period (as measured in 10s of ms) and therefore improve the user experience.
* @since 4.2.3
@@ -209,7 +209,7 @@ class KRUNNER_EXPORT RunnerContext : public QObject
*
* @param id the id of the match to return
* @return the match associated with this id, or an invalid QueryMatch object
- * if the id does not eixst
+ * if the id does not exist
*/
QueryMatch match(const QString &id) const;

diff --git a/src/runnermanager.h b/src/runnermanager.h
index 50555b9..9eadb56 100644
--- a/src/runnermanager.h
+++ b/src/runnermanager.h
@@ -249,7 +249,7 @@ class KRUNNER_EXPORT RunnerManager : public QObject
void matchSessionComplete();

/**
- * Launch a query, this will create threads and return inmediately.
+ * Launch a query, this will create threads and return immediately.
* When the information will be available can be known using the
* matchesChanged signal.
*

[Yuri Chornoivan]

Git commit be7ee6dd6f803536135a0fb1d64c27b2533436fb by Yuri Chornoivan.
Committed on 12/09/2018 at 17:04.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 src/api/KWallet/kwallet.cpp
M +1 -1 src/api/KWallet/kwallet_mac.cpp
M +1 -1 src/runtime/kwalletd/backend/backendpersisthandler.cpp
M +6 -6 src/runtime/kwalletd/backend/kwalletbackend.cc
M +0 -1 src/runtime/kwalletd/kwalletwizard.cpp
M +2 -1 tests/kwalletd/kwalletasync.cpp
M +2 -1 tests/kwalletd/kwalletboth.cpp
M +2 -2 tests/kwalletd/kwalletmany.cpp
M +2 -2 tests/kwalletd/kwalletpath.cpp
M +2 -2 tests/kwalletd/kwalletsync.cpp

https://commits.kde.org/kwallet/be7ee6dd6f803536135a0fb1d64c27b2533436fb

diff --git a/src/api/KWallet/kwallet.cpp b/src/api/KWallet/kwallet.cpp
index 52bb567..30ed2e6 100644
--- a/src/api/KWallet/kwallet.cpp
+++ b/src/api/KWallet/kwallet.cpp
@@ -21,7 +21,7 @@
*/

#include "kwallet.h"
-#include "config-kwallet.h"
+#include <config-kwallet.h>
#include "kwallet_api_debug.h"

#include <QApplication>
diff --git a/src/api/KWallet/kwallet_mac.cpp b/src/api/KWallet/kwallet_mac.cpp
index 08f7e4c..1e11106 100644
--- a/src/api/KWallet/kwallet_mac.cpp
+++ b/src/api/KWallet/kwallet_mac.cpp
@@ -571,7 +571,7 @@ static OSStatus writeEntryImplementation(const QString &walletName, const QStrin
qWarning() << "Could not store password in keychain: " << qPrintable(errMsg);
return err;
}
- // qDebug() << "Succesfully written out key:" << key;
+ // qDebug() << "Successfully written out key:" << key;
return err;

}
diff --git a/src/runtime/kwalletd/backend/backendpersisthandler.cpp b/src/runtime/kwalletd/backend/backendpersisthandler.cpp
index 9971a51..5d0f432 100644
--- a/src/runtime/kwalletd/backend/backendpersisthandler.cpp
+++ b/src/runtime/kwalletd/backend/backendpersisthandler.cpp
@@ -17,6 +17,7 @@
* Boston, MA 02110-1301, USA.
*/

+#include "backendpersisthandler.h"
#include "kwalletbackend_debug.h"

#include <QIODevice>
@@ -36,7 +37,6 @@
#include <gpgme++/encryptionresult.h>
#include <gpgme++/decryptionresult.h>
#endif
-#include "backendpersisthandler.h"
#include "kwalletbackend.h"
#include "blowfish.h"
#include "sha1.h"
diff --git a/src/runtime/kwalletd/backend/kwalletbackend.cc b/src/runtime/kwalletd/backend/kwalletbackend.cc
index 5af7914..f97d902 100644
--- a/src/runtime/kwalletd/backend/kwalletbackend.cc
+++ b/src/runtime/kwalletd/backend/kwalletbackend.cc
@@ -31,12 +31,12 @@
#include <KNotification>
#include <KLocalizedString>

-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSaveFile>
-#include <QtCore/QRegExp>
-#include <QtCore/QCryptographicHash>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QSaveFile>
+#include <QRegExp>
+#include <QCryptographicHash>
#include <QStandardPaths>

#include "blowfish.h"
diff --git a/src/runtime/kwalletd/kwalletwizard.cpp b/src/runtime/kwalletd/kwalletwizard.cpp
index 7a0c378..3b2a2ea 100644
--- a/src/runtime/kwalletd/kwalletwizard.cpp
+++ b/src/runtime/kwalletd/kwalletwizard.cpp
@@ -36,7 +36,6 @@
#include <gpgme++/context.h>
#include <gpgme++/key.h>
#include <gpgme++/keylistresult.h>
-#include <QDebug>
#include <kmessagebox.h>
#include <gpgme.h>
#endif
diff --git a/tests/kwalletd/kwalletasync.cpp b/tests/kwalletd/kwalletasync.cpp
index fdce732..009e76a 100644
--- a/tests/kwalletd/kwalletasync.cpp
+++ b/tests/kwalletd/kwalletasync.cpp
@@ -1,3 +1,5 @@
+#include "kwalletasync.h"
+
#include <QTextStream>
#include <QApplication>
#include <QTimer>
@@ -11,7 +13,6 @@
#include <QDBusReply>
#include <KLocalizedString>

-#include "kwalletasync.h"
#include "kwallettest.h"

static QTextStream _out(stdout, QIODevice::WriteOnly);
diff --git a/tests/kwalletd/kwalletboth.cpp b/tests/kwalletd/kwalletboth.cpp
index 2468255..9d4eb4f 100644
--- a/tests/kwalletd/kwalletboth.cpp
+++ b/tests/kwalletd/kwalletboth.cpp
@@ -1,3 +1,5 @@
+#include "kwalletboth.h"
+
#include <QTextStream>
#include <QTimer>
#include <QMap>
@@ -11,7 +13,6 @@
#include <QDBusReply>
#include <KLocalizedString>

-#include "kwalletboth.h"
#include "kwallettest.h"

static QTextStream _out(stdout, QIODevice::WriteOnly);
diff --git a/tests/kwalletd/kwalletmany.cpp b/tests/kwalletd/kwalletmany.cpp
index 9102dad..bf2a6ef 100644
--- a/tests/kwalletd/kwalletmany.cpp
+++ b/tests/kwalletd/kwalletmany.cpp
@@ -20,6 +20,8 @@

*/

+#include "kwalletmany.h"
+
#include <QTextStream>
#include <QTimer>
#include <QThread>
@@ -29,8 +31,6 @@
#include <KLocalizedString>
#include <kwallet.h>

-#include "kwalletmany.h"
-
#define NUMWALLETS 10

using namespace KWallet;
diff --git a/tests/kwalletd/kwalletpath.cpp b/tests/kwalletd/kwalletpath.cpp
index a1ba2e5..9be8ab8 100644
--- a/tests/kwalletd/kwalletpath.cpp
+++ b/tests/kwalletd/kwalletpath.cpp
@@ -1,3 +1,5 @@
+#include "kwalletpath.h"
+
#include <QTextStream>
#include <QTimer>
#include <QTest>
@@ -10,8 +12,6 @@
#include <QDBusReply>
#include <KLocalizedString>

-#include "kwalletpath.h"
-
static QTextStream _out(stdout, QIODevice::WriteOnly);

void KWalletPathTest::init()
diff --git a/tests/kwalletd/kwalletsync.cpp b/tests/kwalletd/kwalletsync.cpp
index bc8fe4c..8600c3b 100644
--- a/tests/kwalletd/kwalletsync.cpp
+++ b/tests/kwalletd/kwalletsync.cpp
@@ -1,3 +1,5 @@
+#include "kwalletsync.h"
+
#include <QTextStream>
#include <QApplication>
#include <QTimer>
@@ -10,8 +12,6 @@
#include <QDBusReply>
#include <KLocalizedString>

-#include "kwalletsync.h"
-
static QTextStream _out(stdout, QIODevice::WriteOnly);

void KWalletSyncTest::init()

[Yuri Chornoivan]

Git commit a539c19f1ce393c49384e5b56e1c988d577e34f7 by Yuri Chornoivan.
Committed on 12/09/2018 at 17:49.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/client/test_wayland_outputdevice.cpp
M +1 -1 autotests/client/test_wayland_outputmanagement.cpp
M +1 -1 autotests/client/test_wayland_seat.cpp
M +0 -1 autotests/client/test_wayland_windowmanagement.cpp
M +5 -0 autotests/client/test_xdg_shell.h
M +1 -1 src/client/contrast.h
M +2 -2 src/client/idle.h
M +1 -1 src/client/outputconfiguration.h
M +1 -1 src/client/outputdevice.cpp
M +2 -2 src/client/xdgshell.h
M +2 -2 src/server/appmenu_interface.h
M +1 -1 src/server/idle_interface.h
M +2 -2 src/server/idleinhibit_interface.h
M +2 -2 src/server/idleinhibit_interface_p.h
M +2 -2 src/server/outputchangeset.h
M +2 -2 src/server/outputconfiguration_interface.h
M +0 -1 src/server/outputmanagement_interface.cpp
M +2 -2 src/server/outputmanagement_interface.h
M +2 -2 src/server/pointerconstraints_interface.h
M +2 -2 src/server/pointerconstraints_interface_p.h
M +2 -2 src/server/pointergestures_interface.h
M +2 -2 src/server/pointergestures_interface_p.h
M +2 -2 src/server/relativepointer_interface.h
M +1 -1 src/server/remote_access_interface.cpp
M +2 -2 src/server/remote_access_interface.h
M +2 -2 src/server/remote_access_interface_p.h
M +2 -2 src/server/server_decoration_interface.h
M +2 -2 src/server/server_decoration_palette_interface.h
M +1 -1 src/server/shell_interface.h
M +2 -2 src/server/slide_interface.h
M +1 -1 src/server/textinput_interface.h
M +2 -2 src/server/xdgforeign_interface.h
M +2 -2 src/server/xdgforeign_v2_interface_p.h
M +2 -2 src/server/xdgoutput_interface.h
M +2 -2 src/server/xdgshell_interface.h
M +1 -1 tests/dpmstest.cpp
M +2 -2 tests/qtwaylandintegrationtest.h
M +2 -2 tests/touchclienttest.h

https://commits.kde.org/kwayland/a539c19f1ce393c49384e5b56e1c988d577e34f7

diff --git a/autotests/client/test_wayland_outputdevice.cpp b/autotests/client/test_wayland_outputdevice.cpp
index a21f179..f84559c 100644
--- a/autotests/client/test_wayland_outputdevice.cpp
+++ b/autotests/client/test_wayland_outputdevice.cpp
@@ -372,7 +372,7 @@ void TestWaylandOutputDevice::testScaleChange_legacy()
m_serverOutputDevice->setScale(2);
QVERIFY(outputChanged.wait());
QCOMPARE(output.scale(), 2);
- QCOMPARE(output.scaleF(), 2.0); //check we're forward compatiable
+ QCOMPARE(output.scaleF(), 2.0); //check we're forward compatible


// change once more
diff --git a/autotests/client/test_wayland_outputmanagement.cpp b/autotests/client/test_wayland_outputmanagement.cpp
index 2eb723f..46b915d 100644
--- a/autotests/client/test_wayland_outputmanagement.cpp
+++ b/autotests/client/test_wayland_outputmanagement.cpp
@@ -479,7 +479,7 @@ void TestWaylandOutputManagement::testConfigFailed()

QVERIFY(serverApplySpy.wait(200));

- // Artificialy make the server fail to apply the settings
+ // Artificially make the server fail to apply the settings
// Make sure the applied signal never comes, and that failed has been received
QVERIFY(!configAppliedSpy.wait(200));
QCOMPARE(configFailedSpy.count(), 1);
diff --git a/autotests/client/test_wayland_seat.cpp b/autotests/client/test_wayland_seat.cpp
index b769a5d..d07f1a1 100644
--- a/autotests/client/test_wayland_seat.cpp
+++ b/autotests/client/test_wayland_seat.cpp
@@ -1820,7 +1820,7 @@ void TestWaylandSeat::testSelection()
// setting the same again should not change
m_seatInterface->setSelection(ddi);
QVERIFY(!selectionSpy.wait(100));
- // now clear it manully
+ // now clear it manually
m_seatInterface->setSelection(nullptr);
QVERIFY(selectionClearedSpy.wait());
QCOMPARE(selectionSpy.count(), 2);
diff --git a/autotests/client/test_wayland_windowmanagement.cpp b/autotests/client/test_wayland_windowmanagement.cpp
index 353d3ae..58f9c8a 100644
--- a/autotests/client/test_wayland_windowmanagement.cpp
+++ b/autotests/client/test_wayland_windowmanagement.cpp
@@ -27,7 +27,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
#include "../../src/client/registry.h"
#include "../../src/client/surface.h"
#include "../../src/client/plasmawindowmanagement.h"
-#include "../../src/client/surface.h"
#include "../../src/server/display.h"
#include "../../src/server/compositor_interface.h"
#include "../../src/server/region_interface.h"
diff --git a/autotests/client/test_xdg_shell.h b/autotests/client/test_xdg_shell.h
index 0f8e977..3ed3b63 100644
--- a/autotests/client/test_xdg_shell.h
+++ b/autotests/client/test_xdg_shell.h
@@ -17,6 +17,9 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
+#ifndef TEST_XDG_SHELL_H
+#define TEST_XDG_SHELL_H
+
// Qt
#include <QtTest/QtTest>
// client
@@ -99,3 +102,5 @@ private:
QVERIFY(xdgSurfaceCreatedSpy.wait()); \
auto serverXdgSurface = xdgSurfaceCreatedSpy.first().first().value<XdgShellSurfaceInterface*>(); \
QVERIFY(serverXdgSurface);
+
+#endif
diff --git a/src/client/contrast.h b/src/client/contrast.h
index cc32a53..8965798 100644
--- a/src/client/contrast.h
+++ b/src/client/contrast.h
@@ -180,7 +180,7 @@ public:
void commit();

/**
- * Sets the area of the window that will have a contrastred
+ * Sets the area of the window that will have a contrasted
* background.
* The region will have to be created with
* Compositor::createRegion(QRegion)
diff --git a/src/client/idle.h b/src/client/idle.h
index f34c947..c339240 100644
--- a/src/client/idle.h
+++ b/src/client/idle.h
@@ -127,8 +127,8 @@ public:
* timeout. A Wayland server might for example have a minimum timeout which is
* larger than @p msec.
*
- * @param msec The duration in milli seconds after which an idle timeout should fire
- * @param seat The Seat on which the user acitivity should be monitored.
+ * @param msec The duration in milliseconds after which an idle timeout should fire
+ * @param seat The Seat on which the user activity should be monitored.
**/
IdleTimeout *getTimeout(quint32 msecs, Seat *seat, QObject *parent = nullptr);

diff --git a/src/client/outputconfiguration.h b/src/client/outputconfiguration.h
index 242108f..eeaebe9 100644
--- a/src/client/outputconfiguration.h
+++ b/src/client/outputconfiguration.h
@@ -177,7 +177,7 @@ public:
/**
* Position this output in the global space, relative to other outputs.
* QPoint(0, 0) for top-left. The position is the top-left corner of this output.
- * There may not be gaps between outputs, they have to be positioned adjacend to
+ * There may not be gaps between outputs, they have to be positioned adjacent to
* each other.
* The changes done in this call will be recorded in the
* OutputDevice and only applied after apply() has been called.
diff --git a/src/client/outputdevice.cpp b/src/client/outputdevice.cpp
index b8e30c3..a6c4b53 100644
--- a/src/client/outputdevice.cpp
+++ b/src/client/outputdevice.cpp
@@ -18,8 +18,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#include "logging_p.h"
#include "outputdevice.h"
+#include "logging_p.h"
#include "wayland_pointer_p.h"
// Qt
#include <QDebug>
diff --git a/src/client/xdgshell.h b/src/client/xdgshell.h
index 7ad2885..20aaf4c 100644
--- a/src/client/xdgshell.h
+++ b/src/client/xdgshell.h
@@ -104,7 +104,7 @@ public:

/**
* Specifies in what direction the popup should be positioned around the anchor
- * i.e if the gravity is "bottom", then then the top of top of the poup will be at the anchor edge
+ * i.e if the gravity is "bottom", then then the top of top of the popup will be at the anchor edge
* if the gravity is top, then the bottom of the popup will be at the anchor edge
*
*/
@@ -128,7 +128,7 @@ public:
* Specifies how the compositor should position the popup if it does not fit in the requested position
*/
Constraints constraints() const;
- void setConstraints(Constraints constaints);
+ void setConstraints(Constraints constraints);

/**
* An additional offset that should be applied from the anchor.
diff --git a/src/server/appmenu_interface.h b/src/server/appmenu_interface.h
index 4213650..5548ad6 100644
--- a/src/server/appmenu_interface.h
+++ b/src/server/appmenu_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_APPMENU_H
-#define KWAYLAND_SERVER_APPMENU_H
+#ifndef KWAYLAND_SERVER_APPMENU_INTERFACE_H
+#define KWAYLAND_SERVER_APPMENU_INTERFACE_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/idle_interface.h b/src/server/idle_interface.h
index 15bb0a5..c26acb1 100644
--- a/src/server/idle_interface.h
+++ b/src/server/idle_interface.h
@@ -75,7 +75,7 @@ public:
void inhibit();

/**
- * Unhibits the IdleInterface. The idle timeouts are only restarted if uninhibit has been
+ * Inhibits the IdleInterface. The idle timeouts are only restarted if uninhibit has been
* called the same amount as inhibit.
*
* @see inhibit
diff --git a/src/server/idleinhibit_interface.h b/src/server/idleinhibit_interface.h
index b634770..6a5c7d9 100644
--- a/src/server/idleinhibit_interface.h
+++ b/src/server/idleinhibit_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_IDLEINHIBIT_H
-#define KWAYLAND_SERVER_IDLEINHIBIT_H
+#ifndef KWAYLAND_SERVER_IDLEINHIBIT_INTERFACE_H
+#define KWAYLAND_SERVER_IDLEINHIBIT_INTERFACE_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/idleinhibit_interface_p.h b/src/server/idleinhibit_interface_p.h
index 8ba5766..3577ddc 100644
--- a/src/server/idleinhibit_interface_p.h
+++ b/src/server/idleinhibit_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_IDLEINHIBIT_P_H
-#define KWAYLAND_SERVER_IDLEINHIBIT_P_H
+#ifndef KWAYLAND_SERVER_IDLEINHIBIT_INTERFACE_P_H
+#define KWAYLAND_SERVER_IDLEINHIBIT_INTERFACE_P_H

#include "idleinhibit_interface.h"
#include "global_p.h"
diff --git a/src/server/outputchangeset.h b/src/server/outputchangeset.h
index 0555f55..6c5b8e4 100644
--- a/src/server/outputchangeset.h
+++ b/src/server/outputchangeset.h
@@ -18,8 +18,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/

-#ifndef WAYLAND_SERVER_CHANGESET_H
-#define WAYLAND_SERVER_CHANGESET_H
+#ifndef WAYLAND_SERVER_OUTPUT_CHANGESET_H
+#define WAYLAND_SERVER_OUTPUT_CHANGESET_H

#include <QObject>

diff --git a/src/server/outputconfiguration_interface.h b/src/server/outputconfiguration_interface.h
index 2ab5f66..a7e2db2 100644
--- a/src/server/outputconfiguration_interface.h
+++ b/src/server/outputconfiguration_interface.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_OUTPUTCONFIGURATION_H
-#define KWAYLAND_SERVER_OUTPUTCONFIGURATION_H
+#ifndef KWAYLAND_SERVER_OUTPUTCONFIGURATION_INTERFACE_H
+#define KWAYLAND_SERVER_OUTPUTCONFIGURATION_INTERFACE_H

#include "resource.h"
#include "outputmanagement_interface.h"
diff --git a/src/server/outputmanagement_interface.cpp b/src/server/outputmanagement_interface.cpp
index 3aa0213..7099716 100644
--- a/src/server/outputmanagement_interface.cpp
+++ b/src/server/outputmanagement_interface.cpp
@@ -22,7 +22,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
#include "outputconfiguration_interface.h"
#include "display.h"
#include "global_p.h"
-#include "display.h"

#include <wayland-server.h>
#include "wayland-output-management-server-protocol.h"
diff --git a/src/server/outputmanagement_interface.h b/src/server/outputmanagement_interface.h
index c954764..9498668 100644
--- a/src/server/outputmanagement_interface.h
+++ b/src/server/outputmanagement_interface.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_OUTPUTMANAGEMENT_H
-#define KWAYLAND_SERVER_OUTPUTMANAGEMENT_H
+#ifndef KWAYLAND_SERVER_OUTPUTMANAGEMENT_INTERFACE_H
+#define KWAYLAND_SERVER_OUTPUTMANAGEMENT_INTERFACE_H

#include "global.h"

diff --git a/src/server/pointerconstraints_interface.h b/src/server/pointerconstraints_interface.h
index 7efceaa..32f8752 100644
--- a/src/server/pointerconstraints_interface.h
+++ b/src/server/pointerconstraints_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_POINTERCONSTRAINTS_H
-#define KWAYLAND_SERVER_POINTERCONSTRAINTS_H
+#ifndef KWAYLAND_SERVER_POINTERCONSTRAINTS_INTERFACE_H
+#define KWAYLAND_SERVER_POINTERCONSTRAINTS_INTERFACE_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/pointerconstraints_interface_p.h b/src/server/pointerconstraints_interface_p.h
index 0dafbfe..eb25ee4 100644
--- a/src/server/pointerconstraints_interface_p.h
+++ b/src/server/pointerconstraints_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_POINTERCONSTRAINTS_P_H
-#define KWAYLAND_SERVER_POINTERCONSTRAINTS_P_H
+#ifndef KWAYLAND_SERVER_POINTERCONSTRAINTS_INTERFACE_P_H
+#define KWAYLAND_SERVER_POINTERCONSTRAINTS_INTERFACE_P_H
#include "pointerconstraints_interface.h"
#include "global_p.h"
#include "resource_p.h"
diff --git a/src/server/pointergestures_interface.h b/src/server/pointergestures_interface.h
index 4af2d69..e5f9d09 100644
--- a/src/server/pointergestures_interface.h
+++ b/src/server/pointergestures_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_POINTERGESTURES_H
-#define KWAYLAND_SERVER_POINTERGESTURES_H
+#ifndef KWAYLAND_SERVER_POINTERGESTURES_INTERFACE_H
+#define KWAYLAND_SERVER_POINTERGESTURES_INTERFACE_H

#include "global.h"

diff --git a/src/server/pointergestures_interface_p.h b/src/server/pointergestures_interface_p.h
index 170b6b6..264d111 100644
--- a/src/server/pointergestures_interface_p.h
+++ b/src/server/pointergestures_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_POINTERGESTURES_P_H
-#define KWAYLAND_SERVER_POINTERGESTURES_P_H
+#ifndef KWAYLAND_SERVER_POINTERGESTURES_INTERFACE_P_H
+#define KWAYLAND_SERVER_POINTERGESTURES_INTERFACE_P_H

#include "pointergestures_interface.h"
#include "resource_p.h"
diff --git a/src/server/relativepointer_interface.h b/src/server/relativepointer_interface.h
index aa8507c..c2311f6 100644
--- a/src/server/relativepointer_interface.h
+++ b/src/server/relativepointer_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_RELATIVE_POINTER_H
-#define KWAYLAND_SERVER_RELATIVE_POINTER_H
+#ifndef KWAYLAND_SERVER_RELATIVE_POINTER_INTERFACE_H
+#define KWAYLAND_SERVER_RELATIVE_POINTER_INTERFACE_H

#include "global.h"

diff --git a/src/server/remote_access_interface.cpp b/src/server/remote_access_interface.cpp
index 8b96f38..f0571d4 100644
--- a/src/server/remote_access_interface.cpp
+++ b/src/server/remote_access_interface.cpp
@@ -17,9 +17,9 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#include "output_interface.h"
#include "remote_access_interface.h"
#include "remote_access_interface_p.h"
+#include "output_interface.h"
#include "display.h"
#include "global_p.h"
#include "resource_p.h"
diff --git a/src/server/remote_access_interface.h b/src/server/remote_access_interface.h
index 67ba00e..c0f8ee6 100644
--- a/src/server/remote_access_interface.h
+++ b/src/server/remote_access_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_REMOTE_ACCESS_H
-#define KWAYLAND_SERVER_REMOTE_ACCESS_H
+#ifndef KWAYLAND_SERVER_REMOTE_ACCESS_INTERFACE_H
+#define KWAYLAND_SERVER_REMOTE_ACCESS_INTERFACE_H

#include "global.h"

diff --git a/src/server/remote_access_interface_p.h b/src/server/remote_access_interface_p.h
index dd8db0f..fa28ea9 100644
--- a/src/server/remote_access_interface_p.h
+++ b/src/server/remote_access_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_REMOTE_ACCESS_P_H
-#define KWAYLAND_SERVER_REMOTE_ACCESS_P_H
+#ifndef KWAYLAND_SERVER_REMOTE_ACCESS_INTERFACE_P_H
+#define KWAYLAND_SERVER_REMOTE_ACCESS_INTERFACE_P_H

#include "resource.h"

diff --git a/src/server/server_decoration_interface.h b/src/server/server_decoration_interface.h
index b33cd27..4bf8040 100644
--- a/src/server/server_decoration_interface.h
+++ b/src/server/server_decoration_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_SERVER_DECORATION_H
-#define KWAYLAND_SERVER_SERVER_DECORATION_H
+#ifndef KWAYLAND_SERVER_SERVER_DECORATION_INTERFACE_H
+#define KWAYLAND_SERVER_SERVER_DECORATION_INTERFACE_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/server_decoration_palette_interface.h b/src/server/server_decoration_palette_interface.h
index 2ec3346..7f22a97 100644
--- a/src/server/server_decoration_palette_interface.h
+++ b/src/server/server_decoration_palette_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_DECORATION_PALETTE_H
-#define KWAYLAND_SERVER_DECORATION_PALETTE_H
+#ifndef KWAYLAND_SERVER_DECORATION_PALETTE_INTERFACE_H
+#define KWAYLAND_SERVER_DECORATION_PALETTE_INTERFACE_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/shell_interface.h b/src/server/shell_interface.h
index 542e273..75757ae 100644
--- a/src/server/shell_interface.h
+++ b/src/server/shell_interface.h
@@ -90,7 +90,7 @@ class KWAYLANDSERVER_EXPORT ShellSurfaceInterface : public Resource
**/
Q_PROPERTY(QByteArray windowClass READ windowClass NOTIFY windowClassChanged)
/**
- * Whether the window is fullscren.
+ * Whether the window is fullscreen.
**/
Q_PROPERTY(bool fullscreen READ isFullscreen NOTIFY fullscreenChanged)
/**
diff --git a/src/server/slide_interface.h b/src/server/slide_interface.h
index 485e1e0..07fc513 100644
--- a/src/server/slide_interface.h
+++ b/src/server/slide_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_SLIDE_H
-#define KWAYLAND_SERVER_SLIDE_H
+#ifndef KWAYLAND_SERVER_SLIDE_INTERFACE_H
+#define KWAYLAND_SERVER_SLIDE_INTERFACE_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/textinput_interface.h b/src/server/textinput_interface.h
index 9416649..005bf81 100644
--- a/src/server/textinput_interface.h
+++ b/src/server/textinput_interface.h
@@ -384,7 +384,7 @@ Q_SIGNALS:
**/
void requestReset();
/**
- * Emitted whenever the preffered @p language changes.
+ * Emitted whenever the preferred @p language changes.
* @see preferredLanguage
**/
void preferredLanguageChanged(const QByteArray &language);
diff --git a/src/server/xdgforeign_interface.h b/src/server/xdgforeign_interface.h
index ffa5fcd..c498314 100644
--- a/src/server/xdgforeign_interface.h
+++ b/src/server/xdgforeign_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_XDGFOREIGN_H
-#define KWAYLAND_SERVER_XDGFOREIGN_H
+#ifndef KWAYLAND_SERVER_XDGFOREIGN_INTERFACE_H
+#define KWAYLAND_SERVER_XDGFOREIGN_INTERFACE_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/xdgforeign_v2_interface_p.h b/src/server/xdgforeign_v2_interface_p.h
index d042430..c3fce2e 100644
--- a/src/server/xdgforeign_v2_interface_p.h
+++ b/src/server/xdgforeign_v2_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_XDGFOREIGNV2_P_H
-#define KWAYLAND_SERVER_XDGFOREIGNV2_P_H
+#ifndef KWAYLAND_SERVER_XDGFOREIGNV2_INTERFACE_P_H
+#define KWAYLAND_SERVER_XDGFOREIGNV2_INTERFACE_P_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/xdgoutput_interface.h b/src/server/xdgoutput_interface.h
index 2d23788..ec70fda 100644
--- a/src/server/xdgoutput_interface.h
+++ b/src/server/xdgoutput_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
-#ifndef KWAYLAND_SERVER_XDGOUTPUT_H
-#define KWAYLAND_SERVER_XDGOUTPUT_H
+#ifndef KWAYLAND_SERVER_XDGOUTPUT_INTERFACE_H
+#define KWAYLAND_SERVER_XDGOUTPUT_INTERFACE_H

#include "global.h"
#include "resource.h"
diff --git a/src/server/xdgshell_interface.h b/src/server/xdgshell_interface.h
index c9c28d3..a035966 100644
--- a/src/server/xdgshell_interface.h
+++ b/src/server/xdgshell_interface.h
@@ -334,7 +334,7 @@ Q_SIGNALS:
void transientForChanged();

/**
- * Emitted whenever the maximun size hint changes
+ * Emitted whenever the maximum size hint changes
* @since 5.39
*/
void maxSizeChanged(const QSize &size);
@@ -421,7 +421,7 @@ public:

/**
* Specifies in what direction the popup should be positioned around the anchor
- * i.e if the gravity is "bottom", then then the top of top of the poup will be at the anchor edge
+ * i.e if the gravity is "bottom", then then the top of top of the popup will be at the anchor edge
* if the gravity is top, then the bottom of the popup will be at the anchor edge
*
* @since 5.39
diff --git a/tests/dpmstest.cpp b/tests/dpmstest.cpp
index c23ddd4..8071c79 100644
--- a/tests/dpmstest.cpp
+++ b/tests/dpmstest.cpp
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
if (hasDpms) {
hasDpmsLabel->setText(QStringLiteral("Compositor provides a DpmsManager"));
} else {
- hasDpmsLabel->setText(QStringLiteral("Compositor does not provid a DpmsManager"));
+ hasDpmsLabel->setText(QStringLiteral("Compositor does not provide a DpmsManager"));
}

QVBoxLayout *layout = new QVBoxLayout;
diff --git a/tests/qtwaylandintegrationtest.h b/tests/qtwaylandintegrationtest.h
index 68bec77..b972edc 100644
--- a/tests/qtwaylandintegrationtest.h
+++ b/tests/qtwaylandintegrationtest.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef WAYLANDCLIENTTEST_H
-#define WAYLANDCLIENTTEST_H
+#ifndef QTWAYLANDINTEGRATIONTEST_H
+#define QTWAYLANDINTEGRATIONTEST_H

#include <QObject>
#include <QSize>
diff --git a/tests/touchclienttest.h b/tests/touchclienttest.h
index 963089d..48f424b 100644
--- a/tests/touchclienttest.h
+++ b/tests/touchclienttest.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
-#ifndef WAYLANDCLIENTTEST_H
-#define WAYLANDCLIENTTEST_H
+#ifndef TOUCHCLIENTTEST_H
+#define TOUCHCLIENTTEST_H

#include <QObject>
#include <QSize>

[Yuri Chornoivan]

Git commit 8bab1b36e812c1745ab6007ae7972e64184654ea by Yuri Chornoivan.
Committed on 12/09/2018 at 18:31.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/kmessagewidgetautotest.cpp
M +1 -1 examples/kmessagebox/main.cpp
M +2 -2 src/kacceleratormanager.cpp
M +1 -1 src/kcollapsiblegroupbox.cpp
M +1 -2 src/kdatepicker.cpp
M +1 -2 src/kdualaction.cpp
M +1 -1 src/kfontrequester.cpp
M +1 -1 src/kmessagewidget.cpp
M +4 -4 src/kmultitabbar.h
M +1 -1 src/kpassworddialog.h
M +1 -1 src/kpixmapsequenceoverlaypainter.cpp
M +1 -1 src/kpopupframe.h
M +1 -1 src/kstyleextensions.cpp
M +2 -2 src/kstyleextensions.h

https://commits.kde.org/kwidgetsaddons/8bab1b36e812c1745ab6007ae7972e64184654ea

diff --git a/autotests/kmessagewidgetautotest.cpp b/autotests/kmessagewidgetautotest.cpp
index 10456e6..5c04e17 100644
--- a/autotests/kmessagewidgetautotest.cpp
+++ b/autotests/kmessagewidgetautotest.cpp
@@ -25,7 +25,7 @@

QTEST_MAIN(KMessageWidgetTest)

-// KMessageWidget is currently hardcoded to a 500 ms timeline and default QTimeLine 40 ms update intervall
+// KMessageWidget is currently hardcoded to a 500 ms timeline and default QTimeLine 40 ms update interval
// let's have 7 updates for now, should be save
const int overlappingWaitingTime = 280;

diff --git a/examples/kmessagebox/main.cpp b/examples/kmessagebox/main.cpp
index 99691d2..ba0fbe1 100644
--- a/examples/kmessagebox/main.cpp
+++ b/examples/kmessagebox/main.cpp
@@ -43,7 +43,7 @@ int main (int argc, char *argv[])
QStringLiteral("Description to tell you to click<br />on <b>either</b> button"),
QStringLiteral("My Title"),
yesButton
- /*noButton not explicitely set, falls back to default*/
+ /*noButton not explicitly set, falls back to default*/
);

if (res == KMessageBox::Yes) {
diff --git a/src/kacceleratormanager.cpp b/src/kacceleratormanager.cpp
index 0dcd614..478218f 100644
--- a/src/kacceleratormanager.cpp
+++ b/src/kacceleratormanager.cpp
@@ -18,6 +18,7 @@
*/

#include "kacceleratormanager.h"
+#include "kacceleratormanager_p.h"

#include <QApplication>
#include <QMainWindow>
@@ -41,7 +42,6 @@
#include <QTextDocument>
#include <QDebug>

-#include "kacceleratormanager_p.h"
#include "loggingcategory.h"
#include "common_helpers_p.h"

@@ -549,7 +549,7 @@ void KAccelString::calculateWeights(int initialWeight)
weight += (50 - pos);
}

- // try to preserve the wanted accelarators
+ // try to preserve the wanted accelerators
if (pos == accel()) {
weight += KAccelManagerAlgorithm::WANTED_ACCEL_EXTRA_WEIGHT;
// qCDebug(KWidgetsAddonsLog) << "wanted " << m_pureText << " " << KAcceleratorManagerPrivate::standardName(m_origText);
diff --git a/src/kcollapsiblegroupbox.cpp b/src/kcollapsiblegroupbox.cpp
index 15a9ef8..e44ef2a 100644
--- a/src/kcollapsiblegroupbox.cpp
+++ b/src/kcollapsiblegroupbox.cpp
@@ -271,7 +271,7 @@ void KCollapsibleGroupBox::leaveEvent(QEvent *event)

void KCollapsibleGroupBox::keyPressEvent(QKeyEvent *event)
{
- //event might have just propogated up from a child, if so we don't want to react to it
+ //event might have just propagated up from a child, if so we don't want to react to it
if (!hasFocus()) {
return;
}
diff --git a/src/kdatepicker.cpp b/src/kdatepicker.cpp
index eb8a751..b428032 100644
--- a/src/kdatepicker.cpp
+++ b/src/kdatepicker.cpp
@@ -35,7 +35,6 @@
#include <QStyle>
#include <QToolButton>
#include <QDoubleValidator>
-#include <QFontDatabase>

#include "moc_kdatepicker.cpp"
#include "moc_kdatepicker_p.cpp"
@@ -455,7 +454,7 @@ void KDatePicker::selectMonthClicked()

QMenu popup(d->selectMonth);
// Populate the pick list with all the month names, this may change by year
- // JPL do we need to do somethng here for months that fall outside valid range?
+ // JPL do we need to do something here for months that fall outside valid range?
const int monthsInYear = QDate(thisDate.year() + 1, 1, 1).addDays(-1).month();
for (int m = 1; m <= monthsInYear; m++) {
popup.addAction(locale().standaloneMonthName(m))->setData(m);
diff --git a/src/kdualaction.cpp b/src/kdualaction.cpp
index 5196b6a..b7547dd 100644
--- a/src/kdualaction.cpp
+++ b/src/kdualaction.cpp
@@ -18,11 +18,10 @@
* 02110-1301 USA
*/
#include "kdualaction.h"
+#include "kdualaction_p.h"

#include <QIcon>

-#include "kdualaction_p.h"
-
//---------------------------------------------------------------------
// KDualActionPrivate
//---------------------------------------------------------------------
diff --git a/src/kfontrequester.cpp b/src/kfontrequester.cpp
index b980360..599c153 100644
--- a/src/kfontrequester.cpp
+++ b/src/kfontrequester.cpp
@@ -38,7 +38,7 @@ static QFont nearestExistingFont(const QFont &font)
{
QFontDatabase dbase;

- // Initialize font data accoring to given font object.
+ // Initialize font data according to given font object.
QString family = font.family();
QString style = dbase.styleString(font);
qreal size = font.pointSizeF();
diff --git a/src/kmessagewidget.cpp b/src/kmessagewidget.cpp
index c8db99f..32e6128 100644
--- a/src/kmessagewidget.cpp
+++ b/src/kmessagewidget.cpp
@@ -464,7 +464,7 @@ void KMessageWidget::animatedHide()
}

if (!isVisible()) {
- // explicitely hide it, so it stays hidden in case it is only not visible due to the parents
+ // explicitly hide it, so it stays hidden in case it is only not visible due to the parents
hide();
emit hideAnimationFinished();
return;
diff --git a/src/kmultitabbar.h b/src/kmultitabbar.h
index 3146e49..4cf6b0f 100644
--- a/src/kmultitabbar.h
+++ b/src/kmultitabbar.h
@@ -89,7 +89,7 @@ public:
* append a new button to the button area. The button can later on be accessed with button(ID)
* eg for connecting signals to it
* @param icon a icon for the button
- * @param id an arbitraty ID value. It will be emitted in the clicked signal for identifying the button
+ * @param id an arbitrary ID value. It will be emitted in the clicked signal for identifying the button
* if more than one button is connected to a signals.
* @param popup A popup menu which should be displayed if the button is clicked
* @param not_used_yet will be used for a popup text in the future
@@ -160,7 +160,7 @@ public:
class KMultiTabBarButton *button(int id) const;

/**
- * get a pointer to a tab within the tab area, identiifed by its ID
+ * get a pointer to a tab within the tab area, identified by its ID
*/
class KMultiTabBarTab *tab(int id) const;

@@ -253,13 +253,13 @@ public:

public Q_SLOTS:
/**
- * this is used internaly, but can be used by the user, if (s)he wants to
+ * this is used internally, but can be used by the user, if (s)he wants to
* It the according call of KMultiTabBar is invoked though this modifications will be overwritten
*/
void setPosition(KMultiTabBar::KMultiTabBarPosition);

/**
- * this is used internaly, but can be used by the user, if (s)he wants to
+ * this is used internally, but can be used by the user, if (s)he wants to
* It the according call of KMultiTabBar is invoked though this modifications will be overwritten
*/
void setStyle(KMultiTabBar::KMultiTabBarStyle);
diff --git a/src/kpassworddialog.h b/src/kpassworddialog.h
index 5e9e375..fcb5a7c 100644
--- a/src/kpassworddialog.h
+++ b/src/kpassworddialog.h
@@ -34,7 +34,7 @@
*
* \section usage Usage Example
*
- * Requesting a simple password, assynchronous
+ * Requesting a simple password, asynchronous
*
* \code
* KPasswordDialog *dlg = new KPasswordDialog( parent );
diff --git a/src/kpixmapsequenceoverlaypainter.cpp b/src/kpixmapsequenceoverlaypainter.cpp
index 0c1bad9..07ffdec 100644
--- a/src/kpixmapsequenceoverlaypainter.cpp
+++ b/src/kpixmapsequenceoverlaypainter.cpp
@@ -249,7 +249,7 @@ bool KPixmapSequenceOverlayPainter::eventFilter(QObject *obj, QEvent *event)
switch (event->type()) {
case QEvent::Paint:
// make sure we paint after everyone else including other event filters
- obj->removeEventFilter(this); // don't recurse...
+ obj->removeEventFilter(this); // don't recourse...
QCoreApplication::sendEvent(obj, event);
d->paintFrame();
obj->installEventFilter(this); // catch on...
diff --git a/src/kpopupframe.h b/src/kpopupframe.h
index 6d3ab4b..ea05567 100644
--- a/src/kpopupframe.h
+++ b/src/kpopupframe.h
@@ -66,7 +66,7 @@ public:

/**
* Set the main widget. You cannot set the main widget from the constructor,
- * since it must be a child of the frame itselfes.
+ * since it must be a child of the frame itself.
* Be careful: the size is set to the main widgets size. It is up to you to
* set the main widgets correct size before setting it as the main
* widget.
diff --git a/src/kstyleextensions.cpp b/src/kstyleextensions.cpp
index 79ba73e..188956e 100644
--- a/src/kstyleextensions.cpp
+++ b/src/kstyleextensions.cpp
@@ -96,4 +96,4 @@ QStyle::SubElement customSubElement(const QString &element, const QWidget *widge
return (QStyle::SubElement) customStyleElement(SH_KCustomStyleElement, element, const_cast<QWidget*>(widget));
}

-}
\ No newline at end of file
+}
diff --git a/src/kstyleextensions.h b/src/kstyleextensions.h
index 7106230..7e6a1e6 100644
--- a/src/kstyleextensions.h
+++ b/src/kstyleextensions.h
@@ -48,7 +48,7 @@ namespace KStyleExtensions
/**
* Resolve a dynamic QStyle::ControlElement for eg. QStyle::drawControl()
*
- * @returns a unique QStyle::ControlElement or 0 in case the style doesn't suuport this element
+ * @returns a unique QStyle::ControlElement or 0 in case the style doesn't support this element
* @p element a valid element string appname.CE_element, eg. "amarok.CE_Analyzer"
* @p widget the widget to paint this element for. This parameter is mandatory, nullptr will return 0!
* @since 5.3
@@ -74,4 +74,4 @@ KWIDGETSADDONS_EXPORT QStyle::StyleHint customStyleHint(const QString &element,
KWIDGETSADDONS_EXPORT QStyle::SubElement customSubElement(const QString &element, const QWidget *widget);
}

-#endif // KSTYLEEXTENSIONS_H
\ No newline at end of file
+#endif // KSTYLEEXTENSIONS_H

[Yuri Chornoivan]

Git commit f82241ffdc0ab7e0c1b7dd794ed41a8a8780bb53 by Yuri Chornoivan.
Committed on 13/09/2018 at 06:01.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp
M +1 -1 agents/unifiedmailboxagent/unifiedmailbox.cpp
M +5 -0 agents/unifiedmailboxagent/unifiedmailboxeditor.h
M +2 -2 agents/unifiedmailboxagent/unifiedmailboxmanager.h
M +2 -2 ktnef/src/qwmf.cpp
M +3 -3 src/collectionpage/collectionquotawidget.h
M +1 -1 src/configuredialog/configurecomposerpage.cpp
M +3 -2 src/configuredialog/configuredialog.cpp
M +2 -2 src/editor/kmcomposerwin.cpp
M +3 -3 src/editor/kmcomposerwin.h
M +1 -1 src/job/fillcomposerjob.cpp
M +1 -1 src/kmcommands.cpp
M +1 -1 src/kmkernel.cpp
M +1 -3 src/kmmainwidget.cpp
M +0 -1 src/kmmainwin.cpp
M +1 -1 src/searchdialog/searchwindow.cpp
M +3 -3 src/settings/kmailsettings.h

https://commits.kde.org/kmail/f82241ffdc0ab7e0c1b7dd794ed41a8a8780bb53

diff --git a/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp b/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp
index f6f53d736..e4e531627 100644
--- a/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp
+++ b/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp
@@ -593,7 +593,7 @@ private Q_SLOTS:
void testSpecialSourceCollectionCreated()
{
// TODO: this does not work yet: we only monitor collections that we are
- // intersted in, we don't monitor other collections
+ // interested in, we don't monitor other collections
}

void testSpecialSourceCollectionDemoted()
diff --git a/agents/unifiedmailboxagent/unifiedmailbox.cpp b/agents/unifiedmailboxagent/unifiedmailbox.cpp
index 7649facf9..3ac497a71 100644
--- a/agents/unifiedmailboxagent/unifiedmailbox.cpp
+++ b/agents/unifiedmailboxagent/unifiedmailbox.cpp
@@ -45,7 +45,7 @@ void UnifiedMailbox::save(KConfigGroup& group) const
group.writeEntry("name", mName);
group.writeEntry("icon", mIcon);
group.writeEntry("sources", setToList(mSources));
- // just for cacheing, we will do collection discovery on next start anyway
+ // just for caching, we will do collection discovery on next start anyway
if (mCollectionId) {
group.writeEntry("collectionId", *mCollectionId);
} else {
diff --git a/agents/unifiedmailboxagent/unifiedmailboxeditor.h b/agents/unifiedmailboxagent/unifiedmailboxeditor.h
index 96aa8d832..2a1b2c38b 100644
--- a/agents/unifiedmailboxagent/unifiedmailboxeditor.h
+++ b/agents/unifiedmailboxagent/unifiedmailboxeditor.h
@@ -17,6 +17,9 @@
Boston, MA 02110-1301, USA.
*/

+#ifndef UNIFIEDMAILBOXEDITOR_H
+#define UNIFIEDMAILBOXEDITOR_H
+
#include <QDialog>

#include "unifiedmailboxmanager.h"
@@ -35,3 +38,5 @@ private:
UnifiedMailbox *mMailbox = nullptr;
KSharedConfigPtr mConfig;
};
+
+#endif
diff --git a/agents/unifiedmailboxagent/unifiedmailboxmanager.h b/agents/unifiedmailboxagent/unifiedmailboxmanager.h
index aea46e115..e58160105 100644
--- a/agents/unifiedmailboxagent/unifiedmailboxmanager.h
+++ b/agents/unifiedmailboxagent/unifiedmailboxmanager.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef UNIFIEDBOXMANAGER_H
-#define UNIFIEDBOXMANAGER_H
+#ifndef UNIFIEDMAILBOXMANAGER_H
+#define UNIFIEDMAILBOXMANAGER_H

#include "utils.h"

diff --git a/ktnef/src/qwmf.cpp b/ktnef/src/qwmf.cpp
index 297de1560..499ece157 100644
--- a/ktnef/src/qwmf.cpp
+++ b/ktnef/src/qwmf.cpp
@@ -359,7 +359,7 @@ bool QWinMetaFile::paint(QPaintDevice *aTarget, bool absolute)
delete[] mObjHandleTab;
}
mObjHandleTab = new WinObjHandle * [ MAX_OBJHANDLE ];
- for (i = MAX_OBJHANDLE - 1; i >= 0; i--) {
+ for (i = MAX_OBJHANDLE - 1; i >= 0; --i) {
mObjHandleTab[ i ] = NULL;
}

@@ -514,7 +514,7 @@ void QWinMetaFile::polyPolygon(long, short *parm)
startPolygon = 1 + parm[ 0 ];
for (i = 0; i < parm[ 0 ]; ++i) {
QPolygon pa1(parm[ 1 + i ]);
- for (j = 0; j < parm[ 1 + i ]; j++) {
+ for (j = 0; j < parm[ 1 + i ]; ++j) {
pa1.setPoint(j, parm[ startPolygon ], parm[ startPolygon + 1 ]);
startPolygon += 2;
}
diff --git a/src/collectionpage/collectionquotawidget.h b/src/collectionpage/collectionquotawidget.h
index 52bc30691..19b7d5642 100644
--- a/src/collectionpage/collectionquotawidget.h
+++ b/src/collectionpage/collectionquotawidget.h
@@ -29,8 +29,8 @@
* your version.
*/

-#ifndef COLLECTIONQUOTAPAGE_P_H
-#define COLLECTIONQUOTAPAGE_P_H
+#ifndef COLLECTIONQUOTAWIDGET_H
+#define COLLECTIONQUOTAWIDGET_H

#include <QWidget>

@@ -53,4 +53,4 @@ private:
QLabel *mUsage = nullptr;
};

-#endif /* COLLECTIONQUOTAPAGE_P_H */
+#endif /* COLLECTIONQUOTAWIDGET_H */
diff --git a/src/configuredialog/configurecomposerpage.cpp b/src/configuredialog/configurecomposerpage.cpp
index de4a70bc1..b9f6bcc21 100644
--- a/src/configuredialog/configurecomposerpage.cpp
+++ b/src/configuredialog/configurecomposerpage.cpp
@@ -328,7 +328,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent)
// Spacing
++row;

- // "Use Baloo seach in composer" checkbox
+ // "Use Baloo search in composer" checkbox
mShowAkonadiSearchAddressesInComposer = new QCheckBox(
MessageComposer::MessageComposerSettings::self()->showBalooSearchInComposerItem()->label(),
this);
diff --git a/src/configuredialog/configuredialog.cpp b/src/configuredialog/configuredialog.cpp
index 3ffd1a6cc..8a561e99c 100644
--- a/src/configuredialog/configuredialog.cpp
+++ b/src/configuredialog/configuredialog.cpp
@@ -20,12 +20,13 @@
*
*/

-#include "settings/kmailsettings.h"
-#include "kmkernel.h"
// my headers:
#include "configuredialog.h"
#include "configuredialog_p.h"

+#include "settings/kmailsettings.h"
+#include "kmkernel.h"
+
#include <KWindowSystem>
#include <KIconLoader>
#include <QPushButton>
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 5b005ccb9..89a00c287 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -1571,10 +1571,10 @@ void KMComposerWin::setMessage(const KMime::Message::Ptr &newMsg, bool lastSignS
});

// manually load the identity's value into the fields; either the one from the
- // messge, where appropriate, or the one from the sticky identity. What's in
+ // message, where appropriate, or the one from the sticky identity. What's in
// mId might have changed meanwhile, thus the save value
slotIdentityChanged(mId, true /*initalChange*/);
- // Fixing the identitis with auto signing activated
+ // Fixing the identities with auto signing activated
mLastSignActionState = mSignAction->isChecked();

const KIdentityManagement::Identity &ident = im->identityForUoid(mComposerBase->identityCombo()->currentIdentity());
diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h
index c93ec85b5..9d3fa8cb8 100644
--- a/src/editor/kmcomposerwin.h
+++ b/src/editor/kmcomposerwin.h
@@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef KMAIL_KMComposeWin
-#define KMAIL_KMComposeWin
+#ifndef KMAIL_KMCOMPOSERWIN_H
+#define KMAIL_KMCOMPOSERWIN_H

// KMail includes
#include "editor/composer.h"
@@ -323,7 +323,7 @@ private Q_SLOTS:
void slotUpdateWindowTitle();

/**
- * Switch the icon to lock or unlock respectivly.
+ * Switch the icon to lock or unlock respectively.
* Change states of all encrypt check boxes in the attachments listview
*/
void slotEncryptToggled(bool);
diff --git a/src/job/fillcomposerjob.cpp b/src/job/fillcomposerjob.cpp
index 02240266f..f9b845340 100644
--- a/src/job/fillcomposerjob.cpp
+++ b/src/job/fillcomposerjob.cpp
@@ -96,7 +96,7 @@ void FillComposerJob::slotOpenComposer()
arg(mSettings.mAttachParamValue).toLatin1());

iCalAutoSend = true; // no point in editing raw ICAL
- noWordWrap = true; // we shant word wrap inline invitations
+ noWordWrap = true; // we shouldn't word wrap inline invitations
} else {
// Just do what we're told to do
msgPart = new KMime::Content;
diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp
index 2993f80c7..0617c90b3 100644
--- a/src/kmcommands.cpp
+++ b/src/kmcommands.cpp
@@ -1569,7 +1569,7 @@ KMTrashMsgCommand::KMTrashMsgCommand(const Akonadi::Collection &srcFolder, const
, mRef(ref)
{
// When trashing items from a virtual collection, they may each have a different
- // trash folder, so we need to handle it here carefuly
+ // trash folder, so we need to handle it here carefully
if (srcFolder.isVirtual()) {
QHash<qint64, Akonadi::Collection> cache;
for (const auto &msg : msgList) {
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index c87263795..87ab18759 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -99,7 +99,7 @@ using KMail::MailServiceImpl;
#include <QDir>
#include <QWidget>
#include <QFileInfo>
-#include <QtDBus/QtDBus>
+#include <QtDBus>

#include <MailCommon/ResourceReadConfigFile>

diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index 45889656f..82818c055 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -20,6 +20,7 @@
*/

// KMail includes
+#include "kmmainwidget.h"
#include "kmreadermainwin.h"
#include "job/composenewmessagejob.h"
#include "editor/composer.h"
@@ -75,10 +76,7 @@
#include "MailCommon/MailFilter"
#include "MailCommon/FavoriteCollectionWidget"
#include "MailCommon/FavoriteCollectionOrderProxyModel"
-#include "MailCommon/FolderTreeWidget"
-#include "MailCommon/FolderTreeView"
#include "mailcommonsettings_base.h"
-#include "kmmainwidget.h"

// Other PIM includes
#include "kmail-version.h"
diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
index 15ee3c39e..825b22703 100644
--- a/src/kmmainwin.cpp
+++ b/src/kmmainwin.cpp
@@ -32,7 +32,6 @@

#include <KConfigGui>
#include <QMenuBar>
-#include <KConfigGui>
#include <KLocalizedString>
#include <kedittoolbar.h>
#include <kconfig.h>
diff --git a/src/searchdialog/searchwindow.cpp b/src/searchdialog/searchwindow.cpp
index 4a7fd00de..c09fea4ba 100644
--- a/src/searchdialog/searchwindow.cpp
+++ b/src/searchdialog/searchwindow.cpp
@@ -21,8 +21,8 @@
*
*/

-#include "incompleteindexdialog.h"
#include "searchwindow.h"
+#include "incompleteindexdialog.h"

#include "MailCommon/FolderRequester"
#include "kmcommands.h"
diff --git a/src/settings/kmailsettings.h b/src/settings/kmailsettings.h
index 595314a9d..41a62dba6 100644
--- a/src/settings/kmailsettings.h
+++ b/src/settings/kmailsettings.h
@@ -21,8 +21,8 @@
without including the source code for Qt in the source distribution.
*/

-#ifndef KMAIL_GLOBALSETTINGS_H
-#define KMAIL_GLOBALSETTINGS_H
+#ifndef KMAIL_SETTINGS_H
+#define KMAIL_SETTINGS_H

#include "globalsettings_kmail.h"

@@ -52,4 +52,4 @@ private:
QTimer *mConfigSyncTimer = nullptr;
};

-#endif /* KMAIL_GLOBALSETTINGS_H */
+#endif /* KMAIL_SETTINGS_H */

[Yuri Chornoivan]

Git commit 00d0d0654fae4386ea588446dad6c1cb9b860a86 by Yuri Chornoivan.
Committed on 13/09/2018 at 18:18.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/expungejobtest.cpp
M +1 -1 autotests/fetchjobtest.cpp
M +0 -1 autotests/kimaptest/fakeserver.cpp
M +2 -2 autotests/testrfccodecs.h
M +2 -2 src/getmetadatajob.h
M +2 -2 src/movejob.h
M +2 -2 src/response_p.h

https://commits.kde.org/kimap/00d0d0654fae4386ea588446dad6c1cb9b860a86

diff --git a/autotests/expungejobtest.cpp b/autotests/expungejobtest.cpp
index b4db025..9733c7f 100644
--- a/autotests/expungejobtest.cpp
+++ b/autotests/expungejobtest.cpp
@@ -59,7 +59,7 @@ private Q_SLOTS:
scenario.clear();
scenario << FakeServer::preauth()
<< "C: A000001 EXPUNGE"
- << "S: A000001 NO access deined";
+ << "S: A000001 NO access denied";
QTest::newRow("no") << scenario;
}

diff --git a/autotests/fetchjobtest.cpp b/autotests/fetchjobtest.cpp
index bd6308b..4ce9665 100644
--- a/autotests/fetchjobtest.cpp
+++ b/autotests/fetchjobtest.cpp
@@ -350,7 +350,7 @@ private Q_SLOTS:
QCOMPARE(m_messages[2]->messageID()->identifier(), QByteArray("***@example.com"));
QCOMPARE(m_msgs[2].message->messageID()->identifier(), QByteArray("***@example.com"));

- // Check that we recieved the flags
+ // Check that we received the flags
QMap<qint64, KIMAP::MessageFlags> expectedFlags;
expectedFlags.insert(2, KIMAP::MessageFlags() << "\\Seen");
QCOMPARE(m_flags, expectedFlags);
diff --git a/autotests/kimaptest/fakeserver.cpp b/autotests/kimaptest/fakeserver.cpp
index 9289162..d4e7057 100644
--- a/autotests/kimaptest/fakeserver.cpp
+++ b/autotests/kimaptest/fakeserver.cpp
@@ -27,7 +27,6 @@
#include <QDebug>
#include <QTcpServer>

-#include <QDebug>
#include <QFile>
#include <qtest.h>

diff --git a/autotests/testrfccodecs.h b/autotests/testrfccodecs.h
index f3565a1..70bde84 100644
--- a/autotests/testrfccodecs.h
+++ b/autotests/testrfccodecs.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef RFCCODECSTEST_H
-#define RFCCODECSTEST_H
+#ifndef TESTRFCCODECS_H
+#define TESTRFCCODECS_H

#include <QObject>

diff --git a/src/getmetadatajob.h b/src/getmetadatajob.h
index 2b349e9..aaa0be7 100644
--- a/src/getmetadatajob.h
+++ b/src/getmetadatajob.h
@@ -71,7 +71,7 @@ public:
~GetMetaDataJob() override;

/**
- * Used to specify the depth of the metadata heirachy to walk.
+ * Used to specify the depth of the metadata hierarchy to walk.
*/
enum Depth {
NoDepth = 0, /**< Only the requested entries */
@@ -132,7 +132,7 @@ public:
/**
* Sets whether to retrieve children or descendants of the requested entries.
*
- * Metadata entry names are heirachical, much like UNIX path names.
+ * Metadata entry names are hierarchical, much like UNIX path names.
* It therefore makes sense to ask for an entry and all its children
* (OneLevel) or an entry and all its descendants (AllLevels).
*
diff --git a/src/movejob.h b/src/movejob.h
index 5e484ce..2a08164 100644
--- a/src/movejob.h
+++ b/src/movejob.h
@@ -17,8 +17,8 @@
02110-1301, USA.
*/

-#ifndef KIMAP_MOVE_H_
-#define KIMAP_MOVE_H_
+#ifndef KIMAP_MOVEJOB_H_
+#define KIMAP_MOVEJOB_H_

#include "kimap_export.h"

diff --git a/src/response_p.h b/src/response_p.h
index 40e07de..04c7d2a 100644
--- a/src/response_p.h
+++ b/src/response_p.h
@@ -17,8 +17,8 @@
02110-1301, USA.
*/

-#ifndef KIMAP_MESSAGE_P_H
-#define KIMAP_MESSAGE_P_H
+#ifndef KIMAP_RESPONSE_P_H
+#define KIMAP_RESPONSE_P_H

#include <QByteArray>
#include <QList>

[Yuri Chornoivan]

Git commit 48bd5f8534ac8c6c0a43cece31b0ea2432c64831 by Yuri Chornoivan.
Committed on 13/09/2018 at 18:38.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -1 ksnakeduelui.rc
M +1 -1 ktron.cpp
M +3 -3 tron.cpp
M +4 -4 tron.h

https://commits.kde.org/ksnakeduel/48bd5f8534ac8c6c0a43cece31b0ea2432c64831

diff --git a/ksnakeduelui.rc b/ksnakeduelui.rc
index f942fde..2f05918 100644
--- a/ksnakeduelui.rc
+++ b/ksnakeduelui.rc
@@ -3,5 +3,6 @@
version="4"
xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
+ xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0
+ http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
</gui>
diff --git a/ktron.cpp b/ktron.cpp
index 1000078..0b39657 100644
--- a/ktron.cpp
+++ b/ktron.cpp
@@ -55,7 +55,7 @@ public:
};

/**
- * Constuctor
+ * Constructor
*/
KTron::KTron(QWidget *parent) : KXmlGuiWindow(parent, KDE_DEFAULT_WINDOWFLAGS) {
m_tron = new Tron(this);
diff --git a/tron.cpp b/tron.cpp
index c9cada3..234388a 100644
--- a/tron.cpp
+++ b/tron.cpp
@@ -586,7 +586,7 @@ void Tron::movementHelper(bool onlyAcceleratedPlayers)
/* player collision check */
if (!players[1]->isAlive())
{
- checkHeadToHeadCollission();
+ checkHeadToHeadCollision();
}

updatePixmap();
@@ -616,10 +616,10 @@ void Tron::movementHelper(bool onlyAcceleratedPlayers)
}
}

-void Tron::checkHeadToHeadCollission()
+void Tron::checkHeadToHeadCollision()
{
// As player 1 and player 2 move at the same time
- // a head to head collission is possible
+ // a head to head collision is possible
// but tough movement actually is done sequential
// we have to check back if player 1 should die when player 2 did so
// that's where this function comes in :)
diff --git a/tron.h b/tron.h
index 849613f..5493fb5 100644
--- a/tron.h
+++ b/tron.h
@@ -141,8 +141,8 @@ class Tron : public QWidget
// Key handling / movement
void switchKeyOn(int, KBAction::Action);
void switchKeyOff(int, KBAction::Action);
- /** Check head to head collissions */
- void checkHeadToHeadCollission();
+ /** Check head to head collisions */
+ void checkHeadToHeadCollision();
/** Helper for the doMove() function */
void movementHelper(bool onlyAcceleratedPlayers);
/** Tries to generate a new obstacle */
@@ -151,8 +151,8 @@ class Tron : public QWidget
private slots:
/**
* This is the main function of KTron.
- * It checkes if an accelerator is pressed and than moves this player
- * forward. Then it checkes if a crash occurred.
+ * It checks if an accelerator is pressed and than moves this player
+ * forward. Then it checks if a crash occurred.
* If no crash happen it moves both players forward and checks again
* if someone crashed.
*/

[Yuri Chornoivan]

Git commit 0477039fcbd32d8fb3bac789835258f34bbbda09 by Yuri Chornoivan.
Committed on 14/09/2018 at 08:22.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 agents/newmailnotifier/specialnotifierjob.cpp
M +1 -1 kioslave/pop3/common.h
M +2 -2 resources/dav/resource/akonadietagcache.h
M +1 -1 resources/ews/ewsfetchfoldersincrjob.cpp
M +1 -1 resources/ews/test/fakeserver/test/ewsfakesrv_test.cpp
M +1 -2 resources/facebook/tokenjobs.cpp
M +3 -3 resources/gmail/gmailchangeitemslabelstask.h
M +3 -3 resources/gmail/gmailconfigdialog.h
M +2 -2 resources/gmail/saslplugin/config.h
M +1 -2 resources/gmail/saslplugin/plugin_common.c
M +1 -1 resources/gmail/saslplugin/xoauth2plugin_init.c
M +1 -1 resources/imap/imapresource.cpp
M +1 -1 resources/imap/passwordrequester.cpp
M +1 -1 resources/imap/sessionpool.cpp
M +1 -1 resources/imap/settings.cpp
M +1 -1 resources/imap/setupserver.cpp
M +1 -1 resources/kolab/kolabaddtagtask.cpp
M +0 -1 resources/kolab/kolabresource.cpp
M +2 -2 resources/kolab/pimkolab/autotests/benchmark.h
M +2 -2 resources/kolab/pimkolab/autotests/kcalconversiontest.h
M +3 -3 resources/kolab/pimkolab/autotests/legacyformattest.h
M +1 -1 resources/kolab/pimkolab/autotests/mimeobjecttest.cpp
M +2 -2 resources/kolab/pimkolab/autotests/testhelpers.h
M +2 -2 resources/kolab/pimkolab/autotests/upgradetest.h
M +1 -1 resources/kolab/pimkolab/calendaring/event.h
M +17 -0 resources/kolab/pimkolab/kolabformat/formathelpers.cpp
M +17 -0 resources/kolab/pimkolab/kolabformat/formathelpers.h
M +1 -1 resources/kolab/pimkolab/kolabformat/kolabobject.cpp
M +1 -1 resources/kolab/pimkolab/kolabformat/mimeobject.cpp
M +3 -3 resources/kolab/pimkolab/kolabformatV2/kolabbase.h
M +1 -1 resources/kolab/pimkolab/libkolab-version.h.cmake
M +2 -2 resources/maildir/libmaildir/autotests/testmaildir.h
M +18 -0 resources/shared/singlefileresource/settingsdialog.ui
M +1 -1 resources/shared/singlefileresource/singlefileresourcebase.h
M +1 -1 resources/tomboynotes/o2/README.md
M +1 -1 resources/tomboynotes/o2/o0baseauth.h

https://commits.kde.org/kdepim-runtime/0477039fcbd32d8fb3bac789835258f34bbbda09

diff --git a/agents/newmailnotifier/specialnotifierjob.cpp b/agents/newmailnotifier/specialnotifierjob.cpp
index a5d6ad1bd..f37592213 100644
--- a/agents/newmailnotifier/specialnotifierjob.cpp
+++ b/agents/newmailnotifier/specialnotifierjob.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

-#include "newmailnotifiershowmessagejob.h"
#include "specialnotifierjob.h"
+#include "newmailnotifiershowmessagejob.h"
#include "newmailnotifieragentsettings.h"

#include <Akonadi/Contact/ContactSearchJob>
diff --git a/kioslave/pop3/common.h b/kioslave/pop3/common.h
index 98bfe6f80..db865ec23 100644
--- a/kioslave/pop3/common.h
+++ b/kioslave/pop3/common.h
@@ -40,7 +40,7 @@ inline bool initSASL()
}
#endif

- if (sasl_client_init(NULL) != SASL_OK) {
+ if (sasl_client_init(nullptr) != SASL_OK) {
fprintf(stderr, "SASL library initialization failed!\n");
return false;
}
diff --git a/resources/dav/resource/akonadietagcache.h b/resources/dav/resource/akonadietagcache.h
index 07f1b50ef..53f48a5f8 100644
--- a/resources/dav/resource/akonadietagcache.h
+++ b/resources/dav/resource/akonadietagcache.h
@@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#ifndef ETAGCACHE_AKONADI_H
-#define ETAGCACHE_AKONADI_H
+#ifndef AKONADI_ETAGCACHE_H
+#define AKONADI_ETAGCACHE_H

#include <KDAV/EtagCache>

diff --git a/resources/ews/ewsfetchfoldersincrjob.cpp b/resources/ews/ewsfetchfoldersincrjob.cpp
index f06137fea..8a9634151 100644
--- a/resources/ews/ewsfetchfoldersincrjob.cpp
+++ b/resources/ews/ewsfetchfoldersincrjob.cpp
@@ -367,7 +367,7 @@ bool EwsFetchFoldersIncrJobPrivate::processRemoteFolders()
if (!parentIt->isProcessed()) {
qCDebugNC(EWSRES_LOG) << QStringLiteral("Parent not yet processed - delaying");
/* The new parent collection is not yet processed - defer the move to make
- * sure all the oprtations are done in down-the-tree order. */
+ * sure all the operations are done in down-the-tree order. */
reparentPassNeeded = true;
} else {
moveCollection(*it);
diff --git a/resources/ews/test/fakeserver/test/ewsfakesrv_test.cpp b/resources/ews/test/fakeserver/test/ewsfakesrv_test.cpp
index f2ff21f5a..9f04da44b 100644
--- a/resources/ews/test/fakeserver/test/ewsfakesrv_test.cpp
+++ b/resources/ews/test/fakeserver/test/ewsfakesrv_test.cpp
@@ -636,7 +636,7 @@ void UtEwsFakeSrvTest::getStreamingEventsRequest()
srv->queueEventsXml(QStringList() << event2);
pushEventTime = QDateTime::currentDateTime();
} else if (responseNo == 2) {
- /* Check if the response to the above event came "immediatelly" */
+ /* Check if the response to the above event came "immediately" */
QDateTime now = QDateTime::currentDateTime();
if (pushEventTime.msecsTo(now) > 200) {
qWarning() << "Push event maximum roundtrip time exceeded";
diff --git a/resources/facebook/tokenjobs.cpp b/resources/facebook/tokenjobs.cpp
index 2e817ac68..91c6e064f 100644
--- a/resources/facebook/tokenjobs.cpp
+++ b/resources/facebook/tokenjobs.cpp
@@ -38,7 +38,6 @@
#include <QWebEngineProfile>
#include <QWebEngineCertificateError>
#include <QWebEngineCookieStore>
-#include <QWebEngineCertificateError>

#include <KWallet>

@@ -251,7 +250,7 @@ private Q_SLOTS:
if (newUrl.path() == QLatin1String("/login.php")) {
if (!isVisible() && !mShowTimer->isActive()) {
// If we get stuck on login.php for at least a second, then it means
- // facebook wants user login, otherwise we are just immediatelly redirected
+ // facebook wants user login, otherwise we are just immediately redirected
// to login_success.html, which causes the webview to just flash on the
// screen, which is not nice, and can be confusing if it happens randomly
// when the resource is syncing in the background
diff --git a/resources/gmail/gmailchangeitemslabelstask.h b/resources/gmail/gmailchangeitemslabelstask.h
index d1c4d7f26..ab66f7a34 100644
--- a/resources/gmail/gmailchangeitemslabelstask.h
+++ b/resources/gmail/gmailchangeitemslabelstask.h
@@ -17,8 +17,8 @@
*
*/

-#ifndef GMAILCHANGEGMLABELTASK_H
-#define GMAILCHANGEGMLABELTASK_H
+#ifndef GMAILCHANGEITEMSLABELSTASK_H
+#define GMAILCHANGEITEMSLABELSTASK_H

#include <imap/changeitemsflagstask.h>

@@ -37,4 +37,4 @@ protected:
void triggerRemoveFlagsJob(KIMAP::Session *session);
};

-#endif // GMAILCHANGEGMLABELTASK_H
+#endif // GMAILCHANGEITEMSLABELSTASK_H
diff --git a/resources/gmail/gmailconfigdialog.h b/resources/gmail/gmailconfigdialog.h
index afbed127f..49872cece 100644
--- a/resources/gmail/gmailconfigdialog.h
+++ b/resources/gmail/gmailconfigdialog.h
@@ -17,8 +17,8 @@
*
*/

-#ifndef GMAILSETUPSERVER_H
-#define GMAILSETUPSERVER_H
+#ifndef GMAILCONFIGDIALOG_H
+#define GMAILCONFIGDIALOG_H

#include <QDialog>

@@ -72,4 +72,4 @@ private:
QPushButton *mOkButton = nullptr;
};

-#endif // GMAILSETUPSERVER_H
+#endif // GMAILCONFIGDIALOG_H
diff --git a/resources/gmail/saslplugin/config.h b/resources/gmail/saslplugin/config.h
index e897f12ad..3f717c0b9 100644
--- a/resources/gmail/saslplugin/config.h
+++ b/resources/gmail/saslplugin/config.h
@@ -119,10 +119,10 @@
*/
/* #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY */

-/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
+/* Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE */
#define HAVE_GSS_C_NT_HOSTBASED_SERVICE

-/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
+/* Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME */
#define HAVE_GSS_C_NT_USER_NAME

/* Define to 1 if you have the `inet_aton' function. */
diff --git a/resources/gmail/saslplugin/plugin_common.c b/resources/gmail/saslplugin/plugin_common.c
index f60be46db..193507cc1 100644
--- a/resources/gmail/saslplugin/plugin_common.c
+++ b/resources/gmail/saslplugin/plugin_common.c
@@ -43,6 +43,7 @@
*/

#include <config.h>
+#include "plugin_common.h"
#ifndef macintosh
#ifdef WIN32
# include <winsock2.h>
@@ -71,8 +72,6 @@
#include <inttypes.h>
#endif

-#include "plugin_common.h"
-
/* translate IPv4 mapped IPv6 address to IPv4 address */
static void sockaddr_unmapped(
#ifdef IN6_IS_ADDR_V4MAPPED
diff --git a/resources/gmail/saslplugin/xoauth2plugin_init.c b/resources/gmail/saslplugin/xoauth2plugin_init.c
index 90028b2b9..0ad1287a1 100644
--- a/resources/gmail/saslplugin/xoauth2plugin_init.c
+++ b/resources/gmail/saslplugin/xoauth2plugin_init.c
@@ -17,7 +17,7 @@
02110-1301, USA.
*/

-#include "config.h"
+#include <config.h>

#include <string.h>
#include <stdlib.h>
diff --git a/resources/imap/imapresource.cpp b/resources/imap/imapresource.cpp
index d7120a500..5d19ad09c 100644
--- a/resources/imap/imapresource.cpp
+++ b/resources/imap/imapresource.cpp
@@ -30,7 +30,7 @@
#include "sessionpool.h"
#include "sessionuiproxy.h"
#include "utils.h"
-#include "config-imap.h"
+#include <config-imap.h>

#ifdef WITH_GMAIL_XOAUTH2
#include "passwordrequester.h"
diff --git a/resources/imap/passwordrequester.cpp b/resources/imap/passwordrequester.cpp
index b97613bcc..576fbb150 100644
--- a/resources/imap/passwordrequester.cpp
+++ b/resources/imap/passwordrequester.cpp
@@ -20,7 +20,7 @@
#include "passwordrequester.h"
#include "imapresourcebase.h"
#include "settings.h"
-#include "config-imap.h"
+#include <config-imap.h>

#include "gmailpasswordrequester.h"
#include "settingspasswordrequester.h"
diff --git a/resources/imap/sessionpool.cpp b/resources/imap/sessionpool.cpp
index 8dd15585b..fc63910a5 100644
--- a/resources/imap/sessionpool.cpp
+++ b/resources/imap/sessionpool.cpp
@@ -22,7 +22,7 @@
#include "sessionpool.h"

#include <QTimer>
-#include <QtNetwork/QSslSocket>
+#include <QSslSocket>

#include "imapresource_debug.h"
#include <KLocalizedString>
diff --git a/resources/imap/settings.cpp b/resources/imap/settings.cpp
index b4eea5c75..81454aec5 100644
--- a/resources/imap/settings.cpp
+++ b/resources/imap/settings.cpp
@@ -22,7 +22,7 @@
#include "settingsadaptor.h"

#include "imapaccount.h"
-#include "config-imap.h"
+#include <config-imap.h>

#include <kwallet.h>
using KWallet::Wallet;
diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp
index e24366976..440dc1162 100644
--- a/resources/imap/setupserver.cpp
+++ b/resources/imap/setupserver.cpp
@@ -34,7 +34,7 @@
#include "serverinfodialog.h"
#include "folderarchivesettingpage.h"
#include "utils.h"
-#include "config-imap.h"
+#include <config-imap.h>

#include <mailtransport/transport.h>
#include <mailtransport/servertest.h>
diff --git a/resources/kolab/kolabaddtagtask.cpp b/resources/kolab/kolabaddtagtask.cpp
index ebce592ea..8fc9109a9 100644
--- a/resources/kolab/kolabaddtagtask.cpp
+++ b/resources/kolab/kolabaddtagtask.cpp
@@ -63,7 +63,7 @@ void KolabAddTagTask::applyFoundUid(qint64 uid)
tag.setRemoteId(QByteArray::number(uid));
}

- qCDebug(KOLABRESOURCE_LOG) << "comitting new tag";
+ qCDebug(KOLABRESOURCE_LOG) << "committing new tag";
changeCommitted(tag);

Akonadi::Collection c = relationCollection();
diff --git a/resources/kolab/kolabresource.cpp b/resources/kolab/kolabresource.cpp
index 8fa2f9d0d..0ee1bddf5 100644
--- a/resources/kolab/kolabresource.cpp
+++ b/resources/kolab/kolabresource.cpp
@@ -48,7 +48,6 @@
#include "kolabchangetagtask.h"
#include "kolabremovetagtask.h"
#include "kolabretrievecollectionstask.h"
-#include "kolabretrievetagstask.h"

KolabResource::KolabResource(const QString &id)
: ImapResourceBase(id)
diff --git a/resources/kolab/pimkolab/autotests/benchmark.h b/resources/kolab/pimkolab/autotests/benchmark.h
index 6f66e73eb..b1dc8e813 100644
--- a/resources/kolab/pimkolab/autotests/benchmark.h
+++ b/resources/kolab/pimkolab/autotests/benchmark.h
@@ -18,8 +18,8 @@
#ifndef BENCHMARK_TEST_H
#define BENCHMARK_TEST_H

-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>

class BenchmarkTests : public QObject
{
diff --git a/resources/kolab/pimkolab/autotests/kcalconversiontest.h b/resources/kolab/pimkolab/autotests/kcalconversiontest.h
index b8a00ffc3..c89fa39ca 100644
--- a/resources/kolab/pimkolab/autotests/kcalconversiontest.h
+++ b/resources/kolab/pimkolab/autotests/kcalconversiontest.h
@@ -18,8 +18,8 @@
#ifndef KCALCONVERSIONTEST_H
#define KCALCONVERSIONTEST_H

-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>

class KCalConversionTest : public QObject
{
diff --git a/resources/kolab/pimkolab/autotests/legacyformattest.h b/resources/kolab/pimkolab/autotests/legacyformattest.h
index 277662376..53145925f 100644
--- a/resources/kolab/pimkolab/autotests/legacyformattest.h
+++ b/resources/kolab/pimkolab/autotests/legacyformattest.h
@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef V2TEST_H
-#define V2TEST_H
+#ifndef LEGACYFORMATTEST_H
+#define LEGACYFORMATTEST_H

#include <QObject>

@@ -28,4 +28,4 @@ private slots:
void testWriteDistlistUID();
};

-#endif // V2TEST_H
+#endif // LEGACYFORMATTEST_H
diff --git a/resources/kolab/pimkolab/autotests/mimeobjecttest.cpp b/resources/kolab/pimkolab/autotests/mimeobjecttest.cpp
index 4493611b1..f7810be25 100644
--- a/resources/kolab/pimkolab/autotests/mimeobjecttest.cpp
+++ b/resources/kolab/pimkolab/autotests/mimeobjecttest.cpp
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#include <QTest>
#include "mimeobjecttest.h"
+#include <QTest>
#include "testutils.h"
#include "kolabformat/mimeobject.h"
#include "conversion/commonconversion.h"
diff --git a/resources/kolab/pimkolab/autotests/testhelpers.h b/resources/kolab/pimkolab/autotests/testhelpers.h
index dfc966f84..1e71d1fcc 100644
--- a/resources/kolab/pimkolab/autotests/testhelpers.h
+++ b/resources/kolab/pimkolab/autotests/testhelpers.h
@@ -20,8 +20,8 @@

#include <contact.h>

-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <kcalcore/recurrence.h>
#include <kcalcore/event.h>
#include <kcalcore/todo.h>
diff --git a/resources/kolab/pimkolab/autotests/upgradetest.h b/resources/kolab/pimkolab/autotests/upgradetest.h
index 9716c2119..1e4085526 100644
--- a/resources/kolab/pimkolab/autotests/upgradetest.h
+++ b/resources/kolab/pimkolab/autotests/upgradetest.h
@@ -23,8 +23,8 @@
/**
* Test format upgrade from v2 to v3
*
- * - Parse using v2 implementeation
- * - Serialize and reparse using v3 implementeation
+ * - Parse using v2 implementation
+ * - Serialize and reparse using v3 implementation
* - Compare results
*
* This ensures that all properties which are interpreted by the v2 implementation can be serialized and deserialized by the v3 implementation.
diff --git a/resources/kolab/pimkolab/calendaring/event.h b/resources/kolab/pimkolab/calendaring/event.h
index 0fbedd9fb..b6b9db139 100644
--- a/resources/kolab/pimkolab/calendaring/event.h
+++ b/resources/kolab/pimkolab/calendaring/event.h
@@ -85,7 +85,7 @@ public:
/**
* Returns the next occurrence for a recurring event.
*
- * If the start date of the event is passed in, the second occurrence is returned (so it can be used in a for loop to loop through all occurences).
+ * If the start date of the event is passed in, the second occurrence is returned (so it can be used in a for loop to loop through all occurrences).
*
* If there is no next occurrence or the event is not recurring at all an invalid cDateTime is returned.
*/
diff --git a/resources/kolab/pimkolab/kolabformat/formathelpers.cpp b/resources/kolab/pimkolab/kolabformat/formathelpers.cpp
index 91851f51b..73ed25cb3 100644
--- a/resources/kolab/pimkolab/kolabformat/formathelpers.cpp
+++ b/resources/kolab/pimkolab/kolabformat/formathelpers.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2012 Christian Mollekopf <***@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include "formathelpers.h"
#include <klocalizedstring.h>
#include "kolabdefinitions.h"
diff --git a/resources/kolab/pimkolab/kolabformat/formathelpers.h b/resources/kolab/pimkolab/kolabformat/formathelpers.h
index 2c1ac21cb..e01f900a1 100644
--- a/resources/kolab/pimkolab/kolabformat/formathelpers.h
+++ b/resources/kolab/pimkolab/kolabformat/formathelpers.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2012 Christian Mollekopf <***@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifndef FORMATHELPERS_H
#define FORMATHELPERS_H

diff --git a/resources/kolab/pimkolab/kolabformat/kolabobject.cpp b/resources/kolab/pimkolab/kolabformat/kolabobject.cpp
index 2f7695ba5..1a7d3b14f 100644
--- a/resources/kolab/pimkolab/kolabformat/kolabobject.cpp
+++ b/resources/kolab/pimkolab/kolabformat/kolabobject.cpp
@@ -191,7 +191,7 @@ KOLAB_EXPORT QString generateMemberUrl(const RelationMember &member)
path << QUrl::toPercentEncoding(mb);
}
path << QByteArray::number(member.uid);
- url.setEncodedPath("/" + join(path, "/"));
+ url.setEncodedPath('/' + join(path, "/"));

QList<QPair<QByteArray, QByteArray> > queryItems;
queryItems.append(qMakePair(QStringLiteral("message-id").toLatin1(), QUrl::toPercentEncoding(member.messageId)));
diff --git a/resources/kolab/pimkolab/kolabformat/mimeobject.cpp b/resources/kolab/pimkolab/kolabformat/mimeobject.cpp
index b48a571b7..64d2f7678 100644
--- a/resources/kolab/pimkolab/kolabformat/mimeobject.cpp
+++ b/resources/kolab/pimkolab/kolabformat/mimeobject.cpp
@@ -115,7 +115,7 @@ static std::string getProductId(const std::string &pId)
if (pId.empty()) {
return LIBKOLAB_LIB_VERSION_STRING;
}
- return pId + " " + LIBKOLAB_LIB_VERSION_STRING;
+ return pId + ' ' + LIBKOLAB_LIB_VERSION_STRING;
}

namespace Kolab {
diff --git a/resources/kolab/pimkolab/kolabformatV2/kolabbase.h b/resources/kolab/pimkolab/kolabformatV2/kolabbase.h
index 3b2c90b50..0e048a124 100644
--- a/resources/kolab/pimkolab/kolabformatV2/kolabbase.h
+++ b/resources/kolab/pimkolab/kolabformatV2/kolabbase.h
@@ -31,8 +31,8 @@
your version.
*/

-#ifndef KOLABV2BASE_H
-#define KOLABV2BASE_H
+#ifndef KOLABV2_KOLABBASE_H
+#define KOLABV2_KOLABBASE_H

#include <kcalcore/incidence.h>

@@ -179,4 +179,4 @@ protected:
};
}

-#endif // KOLABBASE_H
+#endif // KOLABV2_KOLABBASE_H
diff --git a/resources/kolab/pimkolab/libkolab-version.h.cmake b/resources/kolab/pimkolab/libkolab-version.h.cmake
index 1e921f9ac..f8d2c865b 100644
--- a/resources/kolab/pimkolab/libkolab-version.h.cmake
+++ b/resources/kolab/pimkolab/libkolab-version.h.cmake
@@ -22,4 +22,4 @@
#define LIBKOLAB_LIB_VERSION "@Libkolab_VERSION@"
#define LIBKOLAB_LIB_VERSION_STRING "@Libkolab_VERSION_STRING@"

-#endif
\ No newline at end of file
+#endif
diff --git a/resources/maildir/libmaildir/autotests/testmaildir.h b/resources/maildir/libmaildir/autotests/testmaildir.h
index 4e45ded94..98886c307 100644
--- a/resources/maildir/libmaildir/autotests/testmaildir.h
+++ b/resources/maildir/libmaildir/autotests/testmaildir.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef MAILDIRTEST_H
-#define MAILDIRTEST_H
+#ifndef TESTMAILDIR_H
+#define TESTMAILDIR_H

#include <QObject>

diff --git a/resources/shared/singlefileresource/settingsdialog.ui b/resources/shared/singlefileresource/settingsdialog.ui
index 72e42b11a..8d82a9be7 100644
--- a/resources/shared/singlefileresource/settingsdialog.ui
+++ b/resources/shared/singlefileresource/settingsdialog.ui
@@ -25,6 +25,12 @@
</property>
<item>
<widget class="QTabWidget" name="tabWidget">
+ <property name="toolTip">
+ <string>Directory settings of the resource.</string>
+ </property>
+ <property name="whatsThis">
+ <string>Select settings of the directory whose contents should be represented by this resource.</string>
+ </property>
<property name="currentIndex">
<number>0</number>
</property>
@@ -77,6 +83,12 @@
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="kcfg_ReadOnly">
+ <property name="toolTip">
+ <string>If read-only mode is enabled, no changes will be written to the directory selected above.</string>
+ </property>
+ <property name="whatsThis">
+ <string>If read-only mode is enabled, no changes will be written to the directory selected above. Read-only mode will be automatically enabled if you do not have write access to the directory.</string>
+ </property>
<property name="text">
<string>Read only</string>
</property>
@@ -136,6 +148,12 @@
</item>
<item>
<widget class="KPluralHandlingSpinBox" name="kcfg_AutosaveInterval">
+ <property name="toolTip">
+ <string>Autosave interval time (in minutes).</string>
+ </property>
+ <property name="whatsThis">
+ <string>Select autosave interval time for the resource data (in minutes).</string>
+ </property>
<property name="minimum">
<number>0</number>
</property>
diff --git a/resources/shared/singlefileresource/singlefileresourcebase.h b/resources/shared/singlefileresource/singlefileresourcebase.h
index b076be157..79e9425e4 100644
--- a/resources/shared/singlefileresource/singlefileresourcebase.h
+++ b/resources/shared/singlefileresource/singlefileresourcebase.h
@@ -112,7 +112,7 @@ protected:
* when it actually needs to read the file.
*
* The default implementation will just call readFromFile( fileName ), so
- * implementing resources will have to explictly reimplement this method to
+ * implementing resources will have to explicitly reimplement this method to
* actually get any profit of this.
*
* @p fileName This will always be a path to a local file.
diff --git a/resources/tomboynotes/o2/README.md b/resources/tomboynotes/o2/README.md
index bafc14b12..ccbb947a2 100644
--- a/resources/tomboynotes/o2/README.md
+++ b/resources/tomboynotes/o2/README.md
@@ -178,7 +178,7 @@ That's it. Tweets using the O2 library!

### Storing OAuth Tokens

-O2 provides simple storage classes for writing OAuth tokens in a peristent location. Currently, a QSettings based backing store **O2SettingsStore** is provided in O2. O2SettingsStore keeps all token values in an encrypted form. You have to specify the encryption key to use while constructing the object:
+O2 provides simple storage classes for writing OAuth tokens in a persistent location. Currently, a QSettings based backing store **O2SettingsStore** is provided in O2. O2SettingsStore keeps all token values in an encrypted form. You have to specify the encryption key to use while constructing the object:

O0SettingsStore settings = new O0SettingsStore("myencryptionkey");
// Set the store before starting OAuth, i.e before calling link()
diff --git a/resources/tomboynotes/o2/o0baseauth.h b/resources/tomboynotes/o2/o0baseauth.h
index ca6bb902f..e9af83af0 100644
--- a/resources/tomboynotes/o2/o0baseauth.h
+++ b/resources/tomboynotes/o2/o0baseauth.h
@@ -54,7 +54,7 @@ public:
int localPort() const;
void setLocalPort(int value);

- /// Sets the storage object to use for storing the OAuth tokens on a peristent medium
+ /// Sets the storage object to use for storing the OAuth tokens on a persistent medium
void setStore(O0AbstractStore *store);

/// Construct query string from list of headers

[Yuri Chornoivan]

Git commit c0445f4fdcc267ef71736722e72420dd9f474192 by Yuri Chornoivan.
Committed on 14/09/2018 at 10:32.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 libpala/slicer.h
M +1 -1 libpala/slicerjob.cpp
M +4 -4 libpala/slicerjob.h
M +1 -1 libpala/slicermode.h
M +3 -3 libpala/slicerproperty.h
M +2 -2 libpala/slicerpropertyset.h
M +2 -2 slicers/goldberg/goldberg-engine.h
M +1 -1 slicers/goldberg/grid-voronoi.cpp
M +2 -2 slicers/goldberg/slicer-goldberg.h
M +2 -2 slicers/slicer-jigsaw.cpp
M +1 -1 src/config/configdialog.h
M +1 -1 src/config/configdialog_p.h
M +1 -1 src/config/elidinglabel.h
M +1 -1 src/config/mouseinputbutton.h
M +1 -1 src/config/triggerconfigwidget.h
M +1 -1 src/creator/slicerconfwidget.h
M +1 -1 src/creator/slicerselector.h
M +1 -1 src/engine/constraintinteractor.h
M +1 -1 src/engine/constraintvisualizer.h
M +7 -7 src/engine/gameplay.cpp
M +1 -1 src/engine/gameplay.h
M +9 -9 src/engine/interactors.h
M +1 -1 src/engine/mathtricks.h
M +1 -1 src/engine/piece.cpp
M +1 -1 src/engine/piecevisuals.cpp
M +1 -1 src/engine/puzzlepreview.h
M +1 -1 src/engine/scene.cpp
M +2 -2 src/engine/scene.h
M +1 -1 src/engine/zoomwidget.h
M +1 -1 src/file-io/collection-delegate.h
M +1 -1 src/file-io/collection-view.h
M +1 -1 src/file-io/components-archivestorage.cpp
M +2 -2 src/file-io/components-collectionstorage.cpp
M +2 -2 src/file-io/components-copy.cpp
M +2 -2 src/file-io/components-directorystorage.cpp
M +2 -2 src/file-io/components-retailstorage.cpp
M +3 -3 src/file-io/components.h
M +2 -2 src/file-io/puzzle.h
M +1 -1 src/file-io/puzzlestructs.h
M +2 -2 src/importhelper.cpp
M +1 -1 src/importhelper.h
M +1 -1 src/window/loadingwidget.h
M +1 -1 src/window/mainwindow.h

https://commits.kde.org/palapeli/c0445f4fdcc267ef71736722e72420dd9f474192

diff --git a/libpala/slicer.h b/libpala/slicer.h
index 0bee785..29e3c71 100644
--- a/libpala/slicer.h
+++ b/libpala/slicer.h
@@ -25,8 +25,8 @@
# include <libpala/libpala_export.h>
#endif

-#include <QtCore/QObject>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QVariant>

namespace Pala
{
diff --git a/libpala/slicerjob.cpp b/libpala/slicerjob.cpp
index f0d0fe2..c9781a1 100644
--- a/libpala/slicerjob.cpp
+++ b/libpala/slicerjob.cpp
@@ -19,7 +19,7 @@
#include "slicerjob.h"
#include "slicer.h"

-#include <QtGui/QPainter>
+#include <QPainter>

//BEGIN Pala::SlicerJob::Private

diff --git a/libpala/slicerjob.h b/libpala/slicerjob.h
index 6902b16..d629d4d 100644
--- a/libpala/slicerjob.h
+++ b/libpala/slicerjob.h
@@ -25,10 +25,10 @@
# include <libpala/libpala_export.h>
#endif

-#include <QtCore/QMap>
-#include <QtCore/QPoint>
-#include <QtCore/QVariant>
-#include <QtGui/QImage>
+#include <QMap>
+#include <QPoint>
+#include <QVariant>
+#include <QImage>

namespace Pala
{
diff --git a/libpala/slicermode.h b/libpala/slicermode.h
index 7874e67..ac5e877 100644
--- a/libpala/slicermode.h
+++ b/libpala/slicermode.h
@@ -25,7 +25,7 @@
# include <libpala/libpala_export.h>
#endif

-#include <QtCore/QByteArray>
+#include <QByteArray>

namespace Pala
{
diff --git a/libpala/slicerproperty.h b/libpala/slicerproperty.h
index c954ffd..8704728 100644
--- a/libpala/slicerproperty.h
+++ b/libpala/slicerproperty.h
@@ -25,9 +25,9 @@
# include <libpala/libpala_export.h>
#endif

-#include <QtCore/QPair>
-#include <QtCore/QVariant>
-#include <QtCore/QVariantList>
+#include <QPair>
+#include <QVariant>
+#include <QVariantList>

namespace Pala
{
diff --git a/libpala/slicerpropertyset.h b/libpala/slicerpropertyset.h
index aa355be..85cace9 100644
--- a/libpala/slicerpropertyset.h
+++ b/libpala/slicerpropertyset.h
@@ -26,7 +26,7 @@
#endif

class QByteArray;
-#include <QtCore/QSize>
+#include <QSize>

namespace Pala
{
@@ -70,7 +70,7 @@ namespace Pala
class LIBPALA_EXPORT SimpleGridPropertySet : public Pala::SlicerPropertySet
{
public:
- SimpleGridPropertySet(Pala::Slicer* slicer);
+ explicit SimpleGridPropertySet(Pala::Slicer* slicer);
~SimpleGridPropertySet();

QSize pieceCount(Pala::SlicerJob* job) const;
diff --git a/slicers/goldberg/goldberg-engine.h b/slicers/goldberg/goldberg-engine.h
index db388eb..d348288 100644
--- a/slicers/goldberg/goldberg-engine.h
+++ b/slicers/goldberg/goldberg-engine.h
@@ -40,7 +40,7 @@ struct GBClassicPlugParams {
qreal basepos, basewidth;
// knobsize: distance of knob ctl points from base points
// knobangle, knobtilt: hard to describe.. they determine width
- // and asymetry of the knob.
+ // and asymmetry of the knob.
qreal knobsize, knobangle, knobtilt;

};
@@ -62,7 +62,7 @@ class GoldbergEngine {
// determines the actual size of the knob.
qreal m_length_base;

- GoldbergEngine(Pala::SlicerJob *job);
+ explicit GoldbergEngine(Pala::SlicerJob *job);

void set_dump_grid(bool dump);
bool get_dump_grid();
diff --git a/slicers/goldberg/grid-voronoi.cpp b/slicers/goldberg/grid-voronoi.cpp
index d0767b6..a2b48ce 100644
--- a/slicers/goldberg/grid-voronoi.cpp
+++ b/slicers/goldberg/grid-voronoi.cpp
@@ -19,7 +19,7 @@
#include "grid.h"

#include <cmath>
-#include <QtCore/qmath.h>
+#include <QtMath>
#include <QDebug>
#include <QPainterPath>
#include <QProcess>
diff --git a/slicers/goldberg/slicer-goldberg.h b/slicers/goldberg/slicer-goldberg.h
index 2e9141a..424c29d 100644
--- a/slicers/goldberg/slicer-goldberg.h
+++ b/slicers/goldberg/slicer-goldberg.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
***************************************************************************/

-#ifndef PALAPELISLICERS_GOLDBERG_SLICER_H //krazy:exclude=includes
-#define PALAPELISLICERS_GOLDBERG_SLICER_H
+#ifndef PALAPELISLICERS_SLICER_GOLDBERG_H
+#define PALAPELISLICERS_SLICER_GOLDBERG_H

#include "../../libpala/slicer.h"
#include "../../libpala/slicerjob.h"
diff --git a/slicers/slicer-jigsaw.cpp b/slicers/slicer-jigsaw.cpp
index da1f7f9..71ff19a 100644
--- a/slicers/slicer-jigsaw.cpp
+++ b/slicers/slicer-jigsaw.cpp
@@ -235,8 +235,8 @@ void JigsawSlicer::addPlugToPath(QPainterPath& path, qreal plugNormLength, const
//rN is the control point of pN on the cubic between pN and p{N+1}.
const QPointF p1 = line.p1(), p5 = line.p2();
const QPointF growthDirection = plugDirection / sqrt(plugDirection * plugDirection);
- const qreal sizeFactor = line.length();
- const QPointF growthVector = growthDirection * sizeFactor;
+ //const qreal sizeFactor = line.length();
+ //const QPointF growthVector = growthDirection * sizeFactor;
const QPointF plugVector = params.plugLength * plugNormLength * growthDirection;
//calculate points p2, p3, p4
const qreal t3 = params.plugPosition;
diff --git a/src/config/configdialog.h b/src/config/configdialog.h
index 96074f6..9fd3288 100644
--- a/src/config/configdialog.h
+++ b/src/config/configdialog.h
@@ -31,7 +31,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- ConfigDialog(QWidget* parent = 0);
+ explicit ConfigDialog(QWidget* parent = 0);

enum SolutionSpace { Center, None, TopLeft, TopRight,
BottomLeft, BottomRight };
diff --git a/src/config/configdialog_p.h b/src/config/configdialog_p.h
index 0831446..49fe41f 100644
--- a/src/config/configdialog_p.h
+++ b/src/config/configdialog_p.h
@@ -28,7 +28,7 @@ namespace Palapeli
Q_OBJECT
Q_PROPERTY(QString backgroundKey READ backgroundKey WRITE setBackgroundKey NOTIFY backgroundKeyChanged USER true)
public:
- TriggerComboBox(QWidget* parent = 0);
+ explicit TriggerComboBox(QWidget* parent = 0);

QString backgroundKey() const;
public Q_SLOTS:
diff --git a/src/config/elidinglabel.h b/src/config/elidinglabel.h
index 8397c4a..58d2412 100644
--- a/src/config/elidinglabel.h
+++ b/src/config/elidinglabel.h
@@ -26,7 +26,7 @@ namespace Palapeli
class ElidingLabel : public QLabel
{
public:
- ElidingLabel(QWidget* parent = 0);
+ explicit ElidingLabel(QWidget* parent = 0);

QSize minimumSizeHint() const Q_DECL_OVERRIDE;
QSize sizeHint() const Q_DECL_OVERRIDE;
diff --git a/src/config/mouseinputbutton.h b/src/config/mouseinputbutton.h
index d8f0353..9a18b2d 100644
--- a/src/config/mouseinputbutton.h
+++ b/src/config/mouseinputbutton.h
@@ -32,7 +32,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- MouseInputButton(QWidget* parent = 0);
+ explicit MouseInputButton(QWidget* parent = 0);
QSize sizeHint() const Q_DECL_OVERRIDE;

///If unset, this button will not generate any wheel triggers.
diff --git a/src/config/triggerconfigwidget.h b/src/config/triggerconfigwidget.h
index a48e076..f3ba6fd 100644
--- a/src/config/triggerconfigwidget.h
+++ b/src/config/triggerconfigwidget.h
@@ -32,7 +32,7 @@ namespace Palapeli
Q_OBJECT
public:
//TODO: Provide signal interface for changes (to enable "Apply" button in config dialog.)
- TriggerConfigWidget(QWidget* parent = 0);
+ explicit TriggerConfigWidget(QWidget* parent = 0);
virtual ~TriggerConfigWidget();

bool hasChanged() const;
diff --git a/src/creator/slicerconfwidget.h b/src/creator/slicerconfwidget.h
index fbddf14..61bce28 100644
--- a/src/creator/slicerconfwidget.h
+++ b/src/creator/slicerconfwidget.h
@@ -36,7 +36,7 @@ namespace Palapeli
class SlicerConfigWidget : public QWidget
{
public:
- SlicerConfigWidget(const Pala::Slicer* slicer);
+ explicit SlicerConfigWidget(const Pala::Slicer* slicer);

QMap<QByteArray, QVariant> arguments() const;
void setMode(const Pala::SlicerMode* mode);
diff --git a/src/creator/slicerselector.h b/src/creator/slicerselector.h
index 47b456c..3b11b73 100644
--- a/src/creator/slicerselector.h
+++ b/src/creator/slicerselector.h
@@ -43,7 +43,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- SlicerSelector(QWidget* parent = 0);
+ explicit SlicerSelector(QWidget* parent = 0);
~SlicerSelector();

QList<const Pala::Slicer*> slicers() const;
diff --git a/src/engine/constraintinteractor.h b/src/engine/constraintinteractor.h
index 9b42b20..f4aa1e4 100644
--- a/src/engine/constraintinteractor.h
+++ b/src/engine/constraintinteractor.h
@@ -26,7 +26,7 @@ namespace Palapeli
class ConstraintInteractor : public Palapeli::Interactor
{
public:
- ConstraintInteractor(QGraphicsView* view);
+ explicit ConstraintInteractor(QGraphicsView* view);
protected:
bool startInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
void continueInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
diff --git a/src/engine/constraintvisualizer.h b/src/engine/constraintvisualizer.h
index 52fef64..1fd2708 100644
--- a/src/engine/constraintvisualizer.h
+++ b/src/engine/constraintvisualizer.h
@@ -48,7 +48,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- ConstraintVisualizer(Palapeli::Scene* scene);
+ explicit ConstraintVisualizer(Palapeli::Scene* scene);

bool isActive() const;
void start (const QRectF& sceneRect,
diff --git a/src/engine/gameplay.cpp b/src/engine/gameplay.cpp
index f0ab211..179f9a8 100644
--- a/src/engine/gameplay.cpp
+++ b/src/engine/gameplay.cpp
@@ -41,7 +41,7 @@
#include <QPointer>
#include <QPropertyAnimation>
#include <QFutureWatcher>
-#include <QtCore/qmath.h>
+#include <QtMath>
#include <QStandardPaths>
#include <QInputDialog>
#include <QAction>
@@ -95,9 +95,9 @@ Palapeli::GamePlay::GamePlay(MainWindow* mainWindow)
connect(this, SIGNAL(victoryAnimationFinished()),
m_puzzleTable->view(), SLOT(startVictoryAnimation()));
connect(m_puzzleTable->view(),
- SIGNAL(teleport(Piece*,const QPointF&,View*)),
+ SIGNAL(teleport(Piece*,QPointF,View*)),
this,
- SLOT(teleport(Piece*,const QPointF&,View*)));
+ SLOT(teleport(Piece*,QPointF,View*)));
}

Palapeli::GamePlay::~GamePlay()
@@ -379,9 +379,9 @@ void Palapeli::GamePlay::createHolder()
connect(view->scene(), SIGNAL(saveMove(int)),
this, SLOT(positionChanged(int)));
connect(view,
- SIGNAL(teleport(Piece*,const QPointF&,View*)),
+ SIGNAL(teleport(Piece*,QPointF,View*)),
this,
- SLOT(teleport(Piece*,const QPointF&,View*)));
+ SLOT(teleport(Piece*,QPointF,View*)));
connect(view, SIGNAL(newPieceSelectionSeen(View*)),
this, SLOT(handleNewPieceSelection(View*)));
}
@@ -1148,9 +1148,9 @@ void Palapeli::GamePlay::finishLoading()
this, SLOT(positionChanged(int)));
if (view != m_puzzleTable->view()) {
connect(view,
- SIGNAL(teleport(Piece*,const QPointF&,View*)),
+ SIGNAL(teleport(Piece*,QPointF,View*)),
this,
- SLOT(teleport(Piece*,const QPointF&,View*)));
+ SLOT(teleport(Piece*,QPointF,View*)));
connect(view, SIGNAL(newPieceSelectionSeen(View*)),
this, SLOT(handleNewPieceSelection(View*)));
}
diff --git a/src/engine/gameplay.h b/src/engine/gameplay.h
index 0c6d2f8..79ffa57 100644
--- a/src/engine/gameplay.h
+++ b/src/engine/gameplay.h
@@ -51,7 +51,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- GamePlay(MainWindow* mainWindow = 0);
+ explicit GamePlay(MainWindow* mainWindow = 0);
virtual ~GamePlay();
void init();
void shutdown();
diff --git a/src/engine/interactors.h b/src/engine/interactors.h
index a3b9fa3..d4f3a61 100644
--- a/src/engine/interactors.h
+++ b/src/engine/interactors.h
@@ -34,7 +34,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- MovePieceInteractor(QGraphicsView* view);
+ explicit MovePieceInteractor(QGraphicsView* view);
protected:
bool startInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
void continueInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
@@ -56,7 +56,7 @@ namespace Palapeli
class SelectPieceInteractor : public Palapeli::Interactor
{
public:
- SelectPieceInteractor(QGraphicsView* view);
+ explicit SelectPieceInteractor(QGraphicsView* view);
protected:
bool startInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
void stopInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
@@ -81,7 +81,7 @@ namespace Palapeli
class TeleportPieceInteractor : public Palapeli::Interactor
{
public:
- TeleportPieceInteractor(QGraphicsView* view);
+ explicit TeleportPieceInteractor(QGraphicsView* view);
protected:
bool startInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
};
@@ -91,7 +91,7 @@ namespace Palapeli
class MoveViewportInteractor : public Palapeli::Interactor
{
public:
- MoveViewportInteractor(QGraphicsView* view);
+ explicit MoveViewportInteractor(QGraphicsView* view);
protected:
bool startInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
void continueInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
@@ -104,7 +104,7 @@ namespace Palapeli
class ToggleCloseUpInteractor : public Palapeli::Interactor
{
public:
- ToggleCloseUpInteractor(QGraphicsView* view);
+ explicit ToggleCloseUpInteractor(QGraphicsView* view);
protected:
bool startInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
};
@@ -114,7 +114,7 @@ namespace Palapeli
class ZoomViewportInteractor : public Palapeli::Interactor
{
public:
- ZoomViewportInteractor(QGraphicsView* view);
+ explicit ZoomViewportInteractor(QGraphicsView* view);
protected:
void doInteraction(const Palapeli::WheelEvent& event) Q_DECL_OVERRIDE;
};
@@ -134,7 +134,7 @@ namespace Palapeli
class RubberBandItem : public QGraphicsItem
{
public:
- RubberBandItem(QGraphicsItem* parent = 0);
+ explicit RubberBandItem(QGraphicsItem* parent = 0);

QRectF rect() const;
void setRect(const QRectF& rect);
@@ -150,7 +150,7 @@ namespace Palapeli
class RubberBandInteractor : public Palapeli::Interactor
{
public:
- RubberBandInteractor(QGraphicsView* view);
+ explicit RubberBandInteractor(QGraphicsView* view);
virtual ~RubberBandInteractor();
protected:
void sceneChangeEvent(QGraphicsScene* oldScene, QGraphicsScene* newScene) Q_DECL_OVERRIDE;
@@ -167,7 +167,7 @@ namespace Palapeli
class ToggleConstraintInteractor : public Palapeli::Interactor
{
public:
- ToggleConstraintInteractor(QGraphicsView* view);
+ explicit ToggleConstraintInteractor(QGraphicsView* view);
protected:
bool startInteraction(const Palapeli::MouseEvent& event) Q_DECL_OVERRIDE;
};
diff --git a/src/engine/mathtricks.h b/src/engine/mathtricks.h
index 72486ef..2be5706 100644
--- a/src/engine/mathtricks.h
+++ b/src/engine/mathtricks.h
@@ -19,7 +19,7 @@
#ifndef PALAPELI_ENGINE_MATHTRICKS_H
#define PALAPELI_ENGINE_MATHTRICKS_H

-#include <QtCore/qmath.h>
+#include <QtMath>

namespace Palapeli
{
diff --git a/src/engine/piece.cpp b/src/engine/piece.cpp
index e0c2170..cf8f688 100644
--- a/src/engine/piece.cpp
+++ b/src/engine/piece.cpp
@@ -300,7 +300,7 @@ void Palapeli::Piece::setPlace(const QPointF& topLeft, int x, int y,
const QRectF b = sceneBareBoundingRect();
const QSizeF pieceSize = b.size();
QPointF areaOffset;
- QPoint pieceOffset = m_pieceItem->offset().toPoint();
+ // QPoint pieceOffset = m_pieceItem->offset().toPoint();
if (random) {
int dx = area.width() - pieceSize.width();
int dy = area.height() - pieceSize.height();
diff --git a/src/engine/piecevisuals.cpp b/src/engine/piecevisuals.cpp
index b22080b..abba07a 100644
--- a/src/engine/piecevisuals.cpp
+++ b/src/engine/piecevisuals.cpp
@@ -24,7 +24,7 @@
#include <QDebug>
#include <QImage>
#include <QPainter>
-#include <QtCore/qmath.h>
+#include <QtMath>

//BEGIN shadow blur algorithm

diff --git a/src/engine/puzzlepreview.h b/src/engine/puzzlepreview.h
index 7589e8d..620b9fe 100644
--- a/src/engine/puzzlepreview.h
+++ b/src/engine/puzzlepreview.h
@@ -30,7 +30,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- PuzzlePreview(QWidget* parent);
+ explicit PuzzlePreview(QWidget* parent);

void setImage(const QImage &image);
void loadImageFrom(const Palapeli::PuzzleMetadata& md);
diff --git a/src/engine/scene.cpp b/src/engine/scene.cpp
index 91a097c..88357b2 100644
--- a/src/engine/scene.cpp
+++ b/src/engine/scene.cpp
@@ -209,7 +209,7 @@ void Palapeli::Scene::pieceMoved(bool finished)
emit saveMove(0);
return;
}
- int before = m_pieces.count();
+ // int before = m_pieces.count();
QList<Palapeli::Piece*> mergeCandidates;
foreach (QGraphicsItem* item, selectedItems())
{
diff --git a/src/engine/scene.h b/src/engine/scene.h
index 3e46e36..41ac002 100644
--- a/src/engine/scene.h
+++ b/src/engine/scene.h
@@ -32,7 +32,7 @@ namespace Palapeli
* Palapeli scene, which can be either a piece-holder or the main
* puzzle table. The scene also handles adding and removing pieces,
* moving pieces, merging (or joining) pieces, arranging pieces into
- * a grid and signalling changes in the state of the puzzle and its
+ * a grid and signaling changes in the state of the puzzle and its
* pieces, wherever they may be.
*/

@@ -40,7 +40,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- Scene(QObject* parent = 0);
+ explicit Scene(QObject* parent = 0);

void addPieceToList(Palapeli::Piece* piece);
void addPieceItemsToScene();
diff --git a/src/engine/zoomwidget.h b/src/engine/zoomwidget.h
index 64a9b39..901612d 100644
--- a/src/engine/zoomwidget.h
+++ b/src/engine/zoomwidget.h
@@ -29,7 +29,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- ZoomWidget(QWidget* parent = 0);
+ explicit ZoomWidget(QWidget* parent = 0);
public Q_SLOTS:
void setConstrained(bool constrained);
void setLevel(int level);
diff --git a/src/file-io/collection-delegate.h b/src/file-io/collection-delegate.h
index b337ae1..f636230 100644
--- a/src/file-io/collection-delegate.h
+++ b/src/file-io/collection-delegate.h
@@ -26,7 +26,7 @@ namespace Palapeli
class CollectionDelegate : public QStyledItemDelegate
{
public:
- CollectionDelegate (QObject* parent = 0);
+ explicit CollectionDelegate (QObject* parent = 0);

void paint (QPainter* painter,
const QStyleOptionViewItem& option,
diff --git a/src/file-io/collection-view.h b/src/file-io/collection-view.h
index 11e9946..d69c1b8 100644
--- a/src/file-io/collection-view.h
+++ b/src/file-io/collection-view.h
@@ -32,7 +32,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- CollectionView(QWidget* parent = 0);
+ explicit CollectionView(QWidget* parent = 0);

void setModel(QAbstractItemModel* model);
QModelIndexList selectedIndexes() const;
diff --git a/src/file-io/components-archivestorage.cpp b/src/file-io/components-archivestorage.cpp
index 9e552bd..ce3ce2f 100644
--- a/src/file-io/components-archivestorage.cpp
+++ b/src/file-io/components-archivestorage.cpp
@@ -18,7 +18,7 @@

#include "components.h"

-#include <QtCore/QVariant>
+#include <QVariant>
#include <KTar>

Palapeli::ArchiveStorageComponent::ArchiveStorageComponent()
diff --git a/src/file-io/components-collectionstorage.cpp b/src/file-io/components-collectionstorage.cpp
index 6f6d394..b970aae 100644
--- a/src/file-io/components-collectionstorage.cpp
+++ b/src/file-io/components-collectionstorage.cpp
@@ -18,8 +18,8 @@

#include "components.h"

-#include <QtCore/QBuffer>
-#include <QtCore/QFileInfo>
+#include <QBuffer>
+#include <QFileInfo>
#include <KConfigGroup>

Palapeli::CollectionStorageComponent::CollectionStorageComponent(KConfigGroup* group)
diff --git a/src/file-io/components-copy.cpp b/src/file-io/components-copy.cpp
index cf2ae2b..a560323 100644
--- a/src/file-io/components-copy.cpp
+++ b/src/file-io/components-copy.cpp
@@ -18,8 +18,8 @@

#include "components.h"

-#include <QtCore/QFile>
-#include <QtCore/QVariant>
+#include <QFile>
+#include <QVariant>

Palapeli::CopyComponent::CopyComponent(Palapeli::Puzzle* puzzle)
: m_puzzle(puzzle)
diff --git a/src/file-io/components-directorystorage.cpp b/src/file-io/components-directorystorage.cpp
index 68ff3ba..77f0726 100644
--- a/src/file-io/components-directorystorage.cpp
+++ b/src/file-io/components-directorystorage.cpp
@@ -18,8 +18,8 @@

#include "components.h"

-#include <QtCore/QDir>
-#include <QtCore/QFutureSynchronizer>
+#include <QDir>
+#include <QFutureSynchronizer>
#include <KConfigGroup>
#include <KDesktopFile>
#include <QTemporaryDir>
diff --git a/src/file-io/components-retailstorage.cpp b/src/file-io/components-retailstorage.cpp
index 5ed8c96..2d49a9e 100644
--- a/src/file-io/components-retailstorage.cpp
+++ b/src/file-io/components-retailstorage.cpp
@@ -20,8 +20,8 @@
#include "puzzle.h"
#include "puzzlestructs.h"

-#include <QtCore/QDir>
-#include <QtCore/QVariant>
+#include <QDir>
+#include <QVariant>
#include <KConfigGroup>
#include <KDesktopFile>

diff --git a/src/file-io/components.h b/src/file-io/components.h
index fea8091..23d4285 100644
--- a/src/file-io/components.h
+++ b/src/file-io/components.h
@@ -67,7 +67,7 @@ namespace Palapeli
{
COMPONENT_SUBCLASS(Copy)
public:
- CopyComponent(Palapeli::Puzzle* puzzle);
+ explicit CopyComponent(Palapeli::Puzzle* puzzle);

Palapeli::PuzzleComponent* cast(Type type) const Q_DECL_OVERRIDE;
private:
@@ -106,7 +106,7 @@ namespace Palapeli
COMPONENT_SUBCLASS(CollectionStorage)
public:
///Takes ownership of @a group.
- CollectionStorageComponent(KConfigGroup* group);
+ explicit CollectionStorageComponent(KConfigGroup* group);
virtual ~CollectionStorageComponent();

Palapeli::PuzzleComponent* cast(Type type) const Q_DECL_OVERRIDE;
@@ -121,7 +121,7 @@ namespace Palapeli
{
COMPONENT_SUBCLASS(RetailStorage)
public:
- RetailStorageComponent(const QString& desktopFile);
+ explicit RetailStorageComponent(const QString& desktopFile);

Palapeli::PuzzleComponent* cast(Type type) const Q_DECL_OVERRIDE;
private:
diff --git a/src/file-io/puzzle.h b/src/file-io/puzzle.h
index 8e64440..7bdeace 100644
--- a/src/file-io/puzzle.h
+++ b/src/file-io/puzzle.h
@@ -19,8 +19,8 @@
#ifndef PALAPELI_PUZZLE_H
#define PALAPELI_PUZZLE_H

-#include <QtCore/QFuture>
-#include <QtCore/QMetaType>
+#include <QFuture>
+#include <QMetaType>

#include <iostream>
#define CAST_ERROR(x) std::cerr << qPrintable(x) << std::endl; //TODO: these errors should be reported to Puzzle
diff --git a/src/file-io/puzzlestructs.h b/src/file-io/puzzlestructs.h
index 655f69f..6bab401 100644
--- a/src/file-io/puzzlestructs.h
+++ b/src/file-io/puzzlestructs.h
@@ -23,7 +23,7 @@
#include <QPair>
#include <QPixmap>

-//NOTE: This header defines data structues for Palapeli::Puzzle. PuzzleMetadata contains a bunch of metadata, which is used in the Palapeli::Collection classes. PuzzleContents contains the constituents of the puzzle, and is used by the Palapeli::Scene. Both structures are separate, to allow Palapeli::Puzzle to load only the metadata if only they are needed. The PuzzleCreationContext structure contains some data which is generated during puzzle creation, but not loaded in the current Palapeli version. When writing a newly generated puzzle for the first time, they are also written into the file, to have them available if a newer Palapeli version decides to use them.
+//NOTE: This header defines data structures for Palapeli::Puzzle. PuzzleMetadata contains a bunch of metadata, which is used in the Palapeli::Collection classes. PuzzleContents contains the constituents of the puzzle, and is used by the Palapeli::Scene. Both structures are separate, to allow Palapeli::Puzzle to load only the metadata if only they are needed. The PuzzleCreationContext structure contains some data which is generated during puzzle creation, but not loaded in the current Palapeli version. When writing a newly generated puzzle for the first time, they are also written into the file, to have them available if a newer Palapeli version decides to use them.

namespace Palapeli
{
diff --git a/src/importhelper.cpp b/src/importhelper.cpp
index 2015c0b..4e7b215 100644
--- a/src/importhelper.cpp
+++ b/src/importhelper.cpp
@@ -21,8 +21,8 @@
#include "file-io/components.h"
#include "file-io/puzzle.h"

-#include <QtCore/QFutureWatcher>
-#include <QtCore/QTimer>
+#include <QFutureWatcher>
+#include <QTimer>
#include <QApplication>
#include <QDebug>
#include <KLocalizedString>
diff --git a/src/importhelper.h b/src/importhelper.h
index a314b58..25bcd07 100644
--- a/src/importhelper.h
+++ b/src/importhelper.h
@@ -27,7 +27,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- ImportHelper(const QString &path);
+ explicit ImportHelper(const QString &path);
public Q_SLOTS:
void doWork();
private:
diff --git a/src/window/loadingwidget.h b/src/window/loadingwidget.h
index fb35576..e78e6d0 100644
--- a/src/window/loadingwidget.h
+++ b/src/window/loadingwidget.h
@@ -27,7 +27,7 @@ namespace Palapeli
class LoadingWidget : public QWidget
{
public:
- LoadingWidget(QWidget* parent = 0);
+ explicit LoadingWidget(QWidget* parent = 0);
protected:
void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
diff --git a/src/window/mainwindow.h b/src/window/mainwindow.h
index b259e59..dccd3e6 100644
--- a/src/window/mainwindow.h
+++ b/src/window/mainwindow.h
@@ -34,7 +34,7 @@ namespace Palapeli
{
Q_OBJECT
public:
- MainWindow(const QString &path);
+ explicit MainWindow(const QString &path);
protected:
bool queryClose() Q_DECL_OVERRIDE;
private Q_SLOTS:

[Yuri Chornoivan]

Git commit 1f977bd3818b3598a4d18192e39b98e3ad15c956 by Yuri Chornoivan.
Committed on 14/09/2018 at 12:01.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 kgamepopupitem.h
M +1 -1 kgamerenderer_p.h
M +6 -0 kgaudioscene.h
M +5 -0 kgsound.h
M +3 -3 kgthemeselector_p.h
M +2 -2 kstandardgameaction.h
M +2 -2 libkdegamesprivate/kchatbase.h
M +1 -1 libkdegamesprivate/kchatbasemodel.h
M +7 -7 libkdegamesprivate/kgame/DESIGN
M +4 -4 libkdegamesprivate/kgame/kgame.cpp
M +2 -2 libkdegamesprivate/kgame/kgame.h
M +8 -8 libkdegamesprivate/kgame/kgameio.h
M +4 -4 libkdegamesprivate/kgame/kgamenetwork.h
M +3 -3 libkdegamesprivate/kgame/kgameproperty.h
M +4 -4 libkdegamesprivate/kgame/kgamepropertyhandler.cpp
M +6 -6 libkdegamesprivate/kgame/kgamepropertyhandler.h
M +2 -2 libkdegamesprivate/kgame/kmessageclient.h
M +1 -1 libkdegamesprivate/kgame/kmessageio.cpp
M +5 -5 libkdegamesprivate/kgame/kmessageio.h
M +2 -2 libkdegamesprivate/kgame/kmessageserver.h
M +2 -2 libkdegamesprivate/kgame/kplayer.cpp
M +9 -9 libkdegamesprivate/kgame/kplayer.h
M +1 -1 libkdegamesprivate/kgamecanvas.h
M +3 -3 libkdegamesprivate/kgamedifficulty.cpp
M +3 -3 libkdegamesprivate/kgamesvgdocument.cpp
M +2 -2 libkdegamesprivate/kgamesvgdocument.h
M +1 -1 libkdegamesprivate/kgametheme.h
M +1 -1 libkdegamesprivate/tests/kgamepropertytest.cpp
M +1 -1 libkdegamesprivate/tests/kgamesvgdocumenttest.cpp
M +2 -2 tests/kgamepopupitemtest.h
M +1 -1 tests/kgamepopupitemtest.ui

https://commits.kde.org/libkdegames/1f977bd3818b3598a4d18192e39b98e3ad15c956

diff --git a/kgamepopupitem.h b/kgamepopupitem.h
index 5dee511a..1cab844a 100644
--- a/kgamepopupitem.h
+++ b/kgamepopupitem.h
@@ -132,7 +132,7 @@ public:
*/
void forceHide(HideType type=AnimatedHide);
/**
- * Sets brush used to paint item backgound
+ * Sets brush used to paint item background
* By default system-default brush is used
* @see KColorScheme
*/
diff --git a/kgamerenderer_p.h b/kgamerenderer_p.h
index 5b2c6eb3..e435dbed 100644
--- a/kgamerenderer_p.h
+++ b/kgamerenderer_p.h
@@ -139,7 +139,7 @@ class KGameRendererPrivate : public QObject
//pixmap cache.
//1. The worker renders a QImage and stores it in the cache. The main
// thread reads the QImage again and converts it into a QPixmap,
- // storing it inthe pixmap cache for later re-use.
+ // storing it in the pixmap cache for later re-use.
//i.e. QImage -> diskcache -> QImage -> QPixmap -> pixmapcache -> serve
//2. The worker renders a QImage and sends it directly to the main
// thread, which converts it to a QPixmap. The QPixmap is stored in
diff --git a/kgaudioscene.h b/kgaudioscene.h
index 2274fa3e..7c90d670 100644
--- a/kgaudioscene.h
+++ b/kgaudioscene.h
@@ -18,4 +18,10 @@

//This file is needed because the <KgSound> header needs to link to
//"../kgaudioscene.h" instead of "../audio/kgaudioscene.h".
+
+#ifndef LIBKDEGAMEG_KGAUDIOSCENE_H
+#define LIBKDEGAMEG_KGAUDIOSCENE_H
+
#include "audio/kgaudioscene.h"
+
+#endif
diff --git a/kgsound.h b/kgsound.h
index 644ab37f..c2b96a96 100644
--- a/kgsound.h
+++ b/kgsound.h
@@ -18,4 +18,9 @@

//This file is needed because the <KgSound> header needs to link to
//"../kgsound.h" instead of "../audio/kgsound.h".
+#ifndef LIBKDEGAMES_KGSOUND_H
+#define LIBKDEGAMES_KGSOUND_H
+
#include "audio/kgsound.h"
+
+#endif
diff --git a/kgthemeselector_p.h b/kgthemeselector_p.h
index 81e63285..186be7b9 100644
--- a/kgthemeselector_p.h
+++ b/kgthemeselector_p.h
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

-#ifndef KGAME_GRAPHICSDELEGATE_P_H
-#define KGAME_GRAPHICSDELEGATE_P_H
+#ifndef KG_THEMESELECTOR_P_H
+#define KG_THEMESELECTOR_P_H

#include <QStyledItemDelegate>

@@ -41,4 +41,4 @@ class KgThemeDelegate : public QStyledItemDelegate
QRect thumbnailRect(const QRect& baseRect) const;
};

-#endif // KGAME_GRAPHICSDELEGATE_P_H
+#endif // KG_THEMESELECTOR_P_H
diff --git a/kstandardgameaction.h b/kstandardgameaction.h
index 88407d60..c3a532ec 100644
--- a/kstandardgameaction.h
+++ b/kstandardgameaction.h
@@ -17,7 +17,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-// this class was shamelessy stolen from kdelibs/kdeui/kstdction.[cpp|h] and
+// this class was shamelessly stolen from kdelibs/kdeui/kstdction.[cpp|h] and
// after that just edited for our needs
#ifndef KSTANDARDGAMEACTION_H
#define KSTANDARDGAMEACTION_H
@@ -94,7 +94,7 @@ namespace KStandardGameAction
QObject *parent );

/**
- * Load a previousely saved game.
+ * Load a previously saved game.
*/
KDEGAMES_EXPORT QAction *load(const QObject *recvr, const char *slot,
QObject *parent );
diff --git a/libkdegamesprivate/kchatbase.h b/libkdegamesprivate/kchatbase.h
index 081edbb3..e98f03c5 100644
--- a/libkdegamesprivate/kchatbase.h
+++ b/libkdegamesprivate/kchatbase.h
@@ -44,7 +44,7 @@ Q_DECLARE_LOGGING_CATEGORY(GAMES_PRIVATE_KGAME)
*
* This is the base class for both KChat and KGameChat. KGameChat is the class
* you want to use if you write a KGame based game as it will do most things for
- * you. KChat is more or less the same but not KGame dependant
+ * you. KChat is more or less the same but not KGame dependent
*
* KChatBase provides a complete chat widget, featuring different sending means
* (e.g. "send to all", "send to player1", "send to group2" and so on - see
@@ -235,7 +235,7 @@ public:

/**
* This font should be used for a message. layoutMessage sets the
- * font of a message using KChatBaseItemDelegate::setMessageFont but if ypu
+ * font of a message using KChatBaseItemDelegate::setMessageFont but if you
* replace layoutMessage with your own function you should use
* messageFont() yourself.
* @return The font that is used for a message
diff --git a/libkdegamesprivate/kchatbasemodel.h b/libkdegamesprivate/kchatbasemodel.h
index 06e2d0ae..5e6e3cb6 100644
--- a/libkdegamesprivate/kchatbasemodel.h
+++ b/libkdegamesprivate/kchatbasemodel.h
@@ -146,7 +146,7 @@ public:

/**
* This font should be used for a message. layoutMessage sets the
- * font of a message using KChatBaseItemDelegate::setMessageFont but if ypu
+ * font of a message using KChatBaseItemDelegate::setMessageFont but if you
* replace layoutMessage with your own function you should use
* messageFont() yourself.
* @return The font that is used for a message
diff --git a/libkdegamesprivate/kgame/DESIGN b/libkdegamesprivate/kgame/DESIGN
index d71ec99f..43309603 100644
--- a/libkdegamesprivate/kgame/DESIGN
+++ b/libkdegamesprivate/kgame/DESIGN
@@ -9,7 +9,7 @@ This document is published under the terms of the GNU FDL

!!!
Note that this is the initial version of this document and has not yet been
-aproved by all core developers (and is far from being complete)
+approved by all core developers (and is far from being complete)
AB: please remove this comments as soon as all KGame hackers have read the
document
!!!
@@ -54,13 +54,13 @@ need a definition are
1.6 Player

The most important and confusing ones are Master, Admin and Server. We make
-quite big differerences between those inside KGame.
+quite big differences between those inside KGame.

1.1 Message Server:
-------------------
A game has always exactly one object of this class, for local games as well as
for network games. For network games, this object can be on one of the users
-processes (usually inside KGame), or it can also be on an independant computer,
+processes (usually inside KGame), or it can also be on an independent computer,
that has no idea about what game is played on it.

A KMessageClient object can connect to it. Its main purpose is transmitting
@@ -105,11 +105,11 @@ also the definition of Admin!
One (and only one) of the Clients is the Admin. He can configure the Message
Server and the game in general in several ways. He can limit the maximum number
of connected message clients and can drop the connection to some other clients,
-as well as he can configure game specific ssettings (like max/min players, start
+as well as he can configure game specific settings (like max/min players, start
money, ...). The Admin also initializes newly connected Clients. If the Admin
himself disconnects, another Client becomes Admin (The Admin can himself elect
some other Client to become Admin. He himself loses that Admin status then).
-An Admin is *alway* a KGame object. The Admin is usually the same as the Master,
+An Admin is *always* a KGame object. The Admin is usually the same as the Master,
but if the Master is an own process (i.e. the Message Server has been started
outside KGame) then Master and Admin differ. An Admin *must* be a KGame object
while the Master doesn't have to be.
@@ -138,8 +138,8 @@ Both concepts have advantages and disadvantages. It is on you - the game
developer - to decide which way is better for you.
E.g. the Server-Solution makes it easier for you to write games. The version
must not necessarily be the same, you have one central computer which does the
-calcultations. The No-Server-Solution on the other hand decreases network
-traffik as the Clients just send their moves and all Clients can calculate the
+calculations. The No-Server-Solution on the other hand decreases network
+traffic as the Clients just send their moves and all Clients can calculate the
reactions. I'm sure there are a lot of advantages/disadvantages more for both
concepts.

diff --git a/libkdegamesprivate/kgame/kgame.cpp b/libkdegamesprivate/kgame/kgame.cpp
index 229997e5..2ce5486c 100644
--- a/libkdegamesprivate/kgame/kgame.cpp
+++ b/libkdegamesprivate/kgame/kgame.cpp
@@ -107,7 +107,7 @@ KGame::KGame(int cookie,QObject* parent)
setGameSequence(new KGameSequence());

// BL: FIXME This signal does no longer exist. When we are merging
- // MH: super....and how do I find out about the lost conenction now?
+ // MH: super....and how do I find out about the lost connection now?
// KGame and KGameNetwork, this could be improved!
// connect(this,SIGNAL(signalConnectionLost(KGameClient*)),
// this,SLOT(slotConnectionLost(KGameClient*)));
@@ -210,7 +210,7 @@ bool KGame::loadgame(QDataStream &stream, bool network,bool resetgame)
// loading properties. This can cause inconsistencies
// otherwise if a property emits and this emit accesses
// a property not yet loaded
- // Note we habe to have this external locking to prevent the games unlocking
+ // Note we have to have this external locking to prevent the games unlocking
// to access the players
dataHandler()->lockDirectEmit();

@@ -247,7 +247,7 @@ bool KGame::loadgame(QDataStream &stream, bool network,bool resetgame)
qint16 cookie;
stream >> cookie;
if (cookie==KGAME_LOAD_COOKIE) {
- qCDebug(GAMES_PRIVATE_KGAME) << " Game loaded propertly";
+ qCDebug(GAMES_PRIVATE_KGAME) << " Game loaded properly";
} else {
qCCritical(GAMES_PRIVATE_KGAME) << " Game loading error. probably format error";
}
@@ -1090,7 +1090,7 @@ void KGame::setupGameContinue(QDataStream& stream, quint32 sender)
qCDebug(GAMES_PRIVATE_KGAME) << "havePlayers" << cnt+playerCount()-inactivateIds.count();
while (maxPlayers() > 0 && maxPlayers() < (int)(cnt+playerCount() - inactivateIds.count()))
{
- qCDebug(GAMES_PRIVATE_KGAME) << " Still to deacticvate "
+ qCDebug(GAMES_PRIVATE_KGAME) << " Still to deactivate "
<< (int)(cnt+playerCount()-inactivateIds.count())-(int)maxPlayers()
;
KPlayer *currentPlayer=0;
diff --git a/libkdegamesprivate/kgame/kgame.h b/libkdegamesprivate/kgame/kgame.h
index dd6c7a51..f9952348 100644
--- a/libkdegamesprivate/kgame/kgame.h
+++ b/libkdegamesprivate/kgame/kgame.h
@@ -577,7 +577,7 @@ Q_SIGNALS:
void signalSave(QDataStream &stream);

/**
- * Is emmited if a game with a different version cookie is loaded.
+ * Is emitted if a game with a different version cookie is loaded.
* Normally this should result in an error. But maybe you do support
* loading of older game versions. Here would be a good place to do a
* conversion.
@@ -592,7 +592,7 @@ Q_SIGNALS:
/**
* We got an user defined update message. This is usually done
* by a sendData in a inherited KGame Object which defines its
- * own methods and has to syncronise them over the network.
+ * own methods and has to syncronize them over the network.
* Reaction to this is usually a call to a KGame function.
*/
void signalNetworkData(int msgid,const QByteArray& buffer, quint32 receiver, quint32 sender);
diff --git a/libkdegamesprivate/kgame/kgameio.h b/libkdegamesprivate/kgame/kgameio.h
index 2b03d627..a4746dc5 100644
--- a/libkdegamesprivate/kgame/kgameio.h
+++ b/libkdegamesprivate/kgame/kgameio.h
@@ -84,7 +84,7 @@ public:
*/
enum IOMode {GenericIO=1,KeyIO=2,MouseIO=4,ProcessIO=8,ComputerIO=16};
/**
- * Run time idendification. Predefined values are from IOMode
+ * Run time identification. Predefined values are from IOMode
* You MUST overwrite this in derived classes!
*
* @return rtti value
@@ -202,7 +202,7 @@ public:
* Note the widget you pass to the constructor must be
* the main window of your application, e.g. view->parentWidget()
* as QT does not forward your keyevents otherwise. This means
- * that this might be a different widget comapred to the one you
+ * that this might be a different widget compared to the one you
* use for mouse inputs!
* Example:
* \code
@@ -218,7 +218,7 @@ public:
virtual ~KGameKeyIO();

/**
- * The idendification of the IO
+ * The identification of the IO
*
* @return KeyIO
*/
@@ -231,7 +231,7 @@ Q_SIGNALS:
* move for the player the device belongs to. If this is done
* and the event is eaten eatevent needs to be set to true.
* What move you generate (i.e. what you write to the stream)
- * is totally up to you as it will not be evaluated but forwared
+ * is totally up to you as it will not be evaluated but forwarded
* to the player's/game's input move function
* Example:
* \code
@@ -299,7 +299,7 @@ public:
*/
void setMouseTracking(bool b);
/**
- * The idendification of the IO
+ * The identification of the IO
*
* @return MouseIO
*/
@@ -345,7 +345,7 @@ private:
* \class KGameProcessIO kgameio.h <KGame/KGameIO>
*
* The KGameProcessIO class. It is used to create a computer player
- * via a separate process and communicate transparetly with it.
+ * via a separate process and communicate transparently with it.
* Its counterpart is the @ref KGameProcess class which needs
* to be used by the computer player. See its documentation
* for the definition of the computer player.
@@ -378,7 +378,7 @@ public:
virtual ~KGameProcessIO();

/**
- * The idendification of the IO
+ * The identification of the IO
*
* @return ProcessIO
*/
@@ -431,7 +431,7 @@ public:

protected:
/**
- * Internal ~ombined function for all message handling
+ * Internal combined function for all message handling
**/
void sendAllMessages(QDataStream &stream,int msgid, quint32 receiver, quint32 sender, bool usermsg);

diff --git a/libkdegamesprivate/kgame/kgamenetwork.h b/libkdegamesprivate/kgame/kgamenetwork.h
index 578c0c2a..ed1ac238 100644
--- a/libkdegamesprivate/kgame/kgamenetwork.h
+++ b/libkdegamesprivate/kgame/kgamenetwork.h
@@ -215,7 +215,7 @@ public:
bool isOfferingConnections() const;

/**
- * Application cookie. this idendifies the game application. It
+ * Application cookie. this identifies the game application. It
* help to distinguish between e.g. KPoker and KWin4
* @return the application cookie
**/
@@ -232,13 +232,13 @@ public:
* receiver and sender parameters. See KGameMessage::calsMessageId
*
* SendMessage differs from sendSystemMessage only by the msgid parameter.
- * sendSystemMessage is thought as a KGame only mehtod while
+ * sendSystemMessage is thought as a KGame only method while
* sendMessage is for public use. The msgid parameter will be
* +=KGameMessage::IdUser and in KGame::signalNetworkData msgid will
* be -= KGameMessage::IdUser again, so that one can easily distinguish
* between system and user messages.
*
- * Use sendSystemMessage to comunicate with KGame (e.g. by adding a
+ * Use sendSystemMessage to communicate with KGame (e.g. by adding a
* player) and sendMessage for your own user message.
*
* Note: a player should send messages through a KGameIO!
@@ -296,7 +296,7 @@ public:
void electAdmin(quint32 clientID);

/**
- * Don't use this unless you really know what youre doing! You might
+ * Don't use this unless you really know what you're doing! You might
* experience some strange behaviour if you send your messages directly
* through the KMessageClient!
*
diff --git a/libkdegamesprivate/kgame/kgameproperty.h b/libkdegamesprivate/kgame/kgameproperty.h
index b9613bbe..38567b7b 100644
--- a/libkdegamesprivate/kgame/kgameproperty.h
+++ b/libkdegamesprivate/kgame/kgameproperty.h
@@ -121,7 +121,7 @@ public:
/**
* Constructs a KGamePropertyBase object and calls registerData.
* @param id The id of this property. MUST be UNIQUE! Used to send and
- * receive changes in the property of the playere automatically via
+ * receive changes in the property of the player automatically via
* network.
* @param owner The owner of the object. Must be a KGamePropertyHandler which manages
* the changes made to this object, i.e. which will send the new data
@@ -229,7 +229,7 @@ public:

/**
* send a command to advanced properties like arrays
- * @param stream The stream containing the data of the comand
+ * @param stream The stream containing the data of the command
* @param msgid The ID of the command - see PropertyCommandIds
* @param isSender whether this client is also the sender of the command
**/
@@ -390,7 +390,7 @@ private:
* Note: The entire API documentation is obsolete!
*
* The class KGameProperty can store any form of data and will transmit it via
- * network whenver you call send. This makes network transparent games
+ * network whenever you call send. This makes network transparent games
* very easy. You first have to register the data to a KGamePropertyHandler
* using KGamePropertyBase::registerData (which is called by the
* constructor). For the KGamePropertyHandler you can use
diff --git a/libkdegamesprivate/kgame/kgamepropertyhandler.cpp b/libkdegamesprivate/kgame/kgamepropertyhandler.cpp
index 6375fea3..1d829a2f 100644
--- a/libkdegamesprivate/kgame/kgamepropertyhandler.cpp
+++ b/libkdegamesprivate/kgame/kgamepropertyhandler.cpp
@@ -191,7 +191,7 @@ bool KGamePropertyHandler::load(QDataStream &stream)
qint16 cookie;
stream >> cookie;
if (cookie == KPLAYERHANDLER_LOAD_COOKIE) {
- qDebug() << " KGamePropertyHandler loaded propertly";
+ qDebug() << " KGamePropertyHandler loaded properly";
} else {
qCritical() << "KGamePropertyHandler loading error. probably format error";
}
@@ -287,7 +287,7 @@ void KGamePropertyHandler::unlockDirectEmit()
while(!d->mSignalQueue.isEmpty())
{
KGamePropertyBase *prop=d->mSignalQueue.dequeue();
-// qDebug() << "emmiting signal for" << prop->id();
+// qDebug() << "emitting signal for" << prop->id();
emit signalPropertyChanged(prop);
}
}
@@ -296,8 +296,8 @@ void KGamePropertyHandler::unlockDirectEmit()
void KGamePropertyHandler::emitSignal(KGamePropertyBase *prop)
{
// If the indirect flag is set (load and network transmit)
- // we cannot emit the signals directly as it can happend that
- // a sigal causes an access to a property which is e.g. not
+ // we cannot emit the signals directly as it can happened that
+ // a signal causes an access to a property which is e.g. not
// yet loaded or received

if (d->mIndirectEmit>0)
diff --git a/libkdegamesprivate/kgame/kgamepropertyhandler.h b/libkdegamesprivate/kgame/kgamepropertyhandler.h
index fcfb9b45..62be35fb 100644
--- a/libkdegamesprivate/kgame/kgamepropertyhandler.h
+++ b/libkdegamesprivate/kgame/kgamepropertyhandler.h
@@ -54,7 +54,7 @@ class KGamePropertyHandlerPrivate; // wow - what a name ;-)
* property) to the correct handler. Inside the handler the property ID is used
* to change the correct property.
*
- * The constructor or registerHandler takes 3 addittional arguments: a
+ * The constructor or registerHandler takes 3 additional arguments: a
* receiver and two slots. The first slot is connected to
* signalSendMessage, the second to signalPropertyChanged. You must provide
* these in order to use the KGamePropertyHandler.
@@ -145,7 +145,7 @@ public:
/**
* returns a unique property ID starting called usually with a base of
* KGamePropertyBase::IdAutomatic. This is used internally by
- * the property base to assign automtic id's. Not much need to
+ * the property base to assign automatic id's. Not much need to
* call this yourself.
**/
int uniquePropertyId();
@@ -236,9 +236,9 @@ public:

/**
* Called by the KGame or KPlayer object or the handler itself to delay
- * emmiting of signals. Lockign keeps a counter and unlock is only achieved
- * when every lock is canceld by an unlock.
- * While this is set signals are quequed and only emmited after this
+ * emitting of signals. Locking keeps a counter and unlock is only achieved
+ * when every lock is canceled by an unlock.
+ * While this is set signals are queued and only emitted after this
* is reset. Its deeper meaning is to prevent inconsistencies in a game
* load or network transfer where a emit could access a property not
* yet loaded or transmitted. Calling this by yourself you better know
@@ -271,7 +271,7 @@ public:

/**
* Sends all properties which are marked dirty over the network. This will
- * make a forced synchornisation of the properties and mark them all not dirty.
+ * make a forced synchronization of the properties and mark them all not dirty.
**/
void flush();

diff --git a/libkdegamesprivate/kgame/kmessageclient.h b/libkdegamesprivate/kgame/kmessageclient.h
index ace3402d..1a9164d2 100644
--- a/libkdegamesprivate/kgame/kmessageclient.h
+++ b/libkdegamesprivate/kgame/kmessageclient.h
@@ -221,7 +221,7 @@ public:
void sendForward (const QByteArray &msg, const QList <quint32> &clients);

/**
- Sends a message to a single client. This is a convenieance method. It calls
+ Sends a message to a single client. This is a convenience method. It calls
sendForward (const QByteArray &msg, const QValueList &ltquint32> &clients)
with a list containing only one client ID.

@@ -284,7 +284,7 @@ Q_SIGNALS:
use this e.g. to send a reply message to only that client.

receivers contains the list of the clients that got the message. (If this list
- only contains one number, this will be your client ID, and it was exclusivly
+ only contains one number, this will be your client ID, and it was exclusively
sent to you.)

If you don't want to distinguish between broadcast and forward messages and
diff --git a/libkdegamesprivate/kgame/kmessageio.cpp b/libkdegamesprivate/kgame/kmessageio.cpp
index f603ab6c..d2aef292 100644
--- a/libkdegamesprivate/kgame/kmessageio.cpp
+++ b/libkdegamesprivate/kgame/kmessageio.cpp
@@ -252,7 +252,7 @@ KMessageProcess::KMessageProcess(QObject *parent, const QString& file) : KMessag
}
bool KMessageProcess::isConnected() const
{
- qCDebug(GAMES_PRIVATE_KGAME) << "@@@KMessageProcess::Is conencted";
+ qCDebug(GAMES_PRIVATE_KGAME) << "@@@KMessageProcess::Is connected";
if (!mProcess)
return false;
return (mProcess->state() == QProcess::Running);
diff --git a/libkdegamesprivate/kgame/kmessageio.h b/libkdegamesprivate/kgame/kmessageio.h
index 9fab988c..50067c47 100644
--- a/libkdegamesprivate/kgame/kmessageio.h
+++ b/libkdegamesprivate/kgame/kmessageio.h
@@ -75,7 +75,7 @@ public:
~KMessageIO ();

/**
- * The runtime idendifcation
+ * The runtime identification
*/
virtual int rtti() const {return 0;}

@@ -99,7 +99,7 @@ public:
//virtual bool isConnected () const = 0;
virtual bool isConnected () const
{
- qCCritical(GAMES_PRIVATE_KGAME) << "Calling PURE virtual isConencted...BAD";
+ qCCritical(GAMES_PRIVATE_KGAME) << "Calling PURE virtual isConnected...BAD";
return false;
}

@@ -231,7 +231,7 @@ public:
~KMessageSocket ();

/**
- * The runtime idendifcation
+ * The runtime identification
*/
int rtti() const Q_DECL_OVERRIDE {return 1;}

@@ -316,7 +316,7 @@ public:
~KMessageDirect ();

/**
- * The runtime idendifcation
+ * The runtime identification
*/
int rtti() const Q_DECL_OVERRIDE {return 2;}

@@ -367,7 +367,7 @@ class KMessageProcess : public KMessageIO
bool isNetwork() const Q_DECL_OVERRIDE { return false; }

/**
- * The runtime idendifcation
+ * The runtime identification
*/
int rtti() const Q_DECL_OVERRIDE {return 3;}

diff --git a/libkdegamesprivate/kgame/kmessageserver.h b/libkdegamesprivate/kgame/kmessageserver.h
index 7f10d491..27d2d671 100644
--- a/libkdegamesprivate/kgame/kmessageserver.h
+++ b/libkdegamesprivate/kgame/kmessageserver.h
@@ -360,7 +360,7 @@ public:
// int gameId() const;

/*
- * Application cookie. this idendifies the game application. It
+ * Application cookie. this identifies the game application. It
* help to distinguish between e.g. KPoker and KWin4
*
* @return the application cookie
@@ -454,7 +454,7 @@ protected:
/**
* @return A unique number which can be used as the id of a @ref KMessageIO. It is
* incremented after every call so if you need the id twice you have to save
- * it anywhere. It's currently used to initialize newly connected clints only.
+ * it anywhere. It's currently used to initialize newly connected clients only.
**/
quint32 uniqueClientNumber() const;

diff --git a/libkdegamesprivate/kgame/kplayer.cpp b/libkdegamesprivate/kgame/kplayer.cpp
index 1effecbc..c013c99d 100644
--- a/libkdegamesprivate/kgame/kplayer.cpp
+++ b/libkdegamesprivate/kgame/kplayer.cpp
@@ -85,7 +85,7 @@ void KPlayer::init()
d->mId=0; // "0" is always an invalid ID!
d->mPriority=0;
// I guess we cannot translate the group otherwise no
- // international conenctions are possible
+ // international connections are possible

d->mUserId.registerData(KGamePropertyBase::IdUserId, this, i18n("UserId"));
d->mUserId.setLocal(0);
@@ -381,7 +381,7 @@ bool KPlayer::load(QDataStream &stream)
stream >> cookie;
if (cookie==KPLAYER_LOAD_COOKIE)
{
- qCDebug(GAMES_PRIVATE_KGAME) << " Player loaded propertly";
+ qCDebug(GAMES_PRIVATE_KGAME) << " Player loaded properly";
}
else
{
diff --git a/libkdegamesprivate/kgame/kplayer.h b/libkdegamesprivate/kgame/kplayer.h
index b922c1ee..357a818f 100644
--- a/libkdegamesprivate/kgame/kplayer.h
+++ b/libkdegamesprivate/kgame/kplayer.h
@@ -83,8 +83,8 @@ public:
virtual ~KPlayer();

/**
- * The idendification of the player. Overwrite this in
- * classes inherting KPlayer to run time identify them.
+ * The identification of the player. Overwrite this in
+ * classes inheriting KPlayer to run time identify them.
*
* @return 0 for default KPlayer.
*/
@@ -137,9 +137,9 @@ public:
bool asyncInput() const;

/**
- * Is this player a virtual player, ie is it
+ * Is this player a virtual player, i.e. is it
* created by mirroring a real player from another
- * network game. This mirroring is done autmatically
+ * network game. This mirroring is done automatically
* as soon as a network connection is build and it affects
* all players regardless what type
*
@@ -189,10 +189,10 @@ public:
/**
* Returns the user defined id of the player
* This value can be used arbitrary by you to
- * have some user idendification for your player,
+ * have some user identification for your player,
* e.g. 0 for a white chess player, 1 for a black
* one. This value is more reliable than the player
- * id whcih can even change when you make a network
+ * id which can even change when you make a network
* connection.
*
* @return the user defined player id
@@ -290,7 +290,7 @@ public:
* you do not want this set the parameter deleteit to false
*
* @param input the device to be removed or 0 for all devices
- * @param deleteit true (default) to delete the device otherwisse just remove it
+ * @param deleteit true (default) to delete the device otherwise just remove it
* @return true on ok
*/
bool removeGameIO(KGameIO *input=0,bool deleteit=true);
@@ -407,7 +407,7 @@ public:
* Calculates a checksum over the IO devices. Can be used to
* restore the IO handlers. The value returned is the 'or'ed
* value of the KGameIO rtti's.
- * this is itnernally used for saving and restorign a player.
+ * this is internally used for saving and restoring a player.
*/
int calcIOValue();

@@ -426,7 +426,7 @@ Q_SIGNALS:
void signalNetworkData(int msgid, const QByteArray& buffer, quint32 sender, KPlayer *me);

/**
- * This signal is emmited if a player property changes its value and
+ * This signal is emitted if a player property changes its value and
* the property is set to notify this change. This is an
* important signal as you should base the actions on a reaction
* to this property changes.
diff --git a/libkdegamesprivate/kgamecanvas.h b/libkdegamesprivate/kgamecanvas.h
index d70420a4..c4dabd05 100644
--- a/libkdegamesprivate/kgamecanvas.h
+++ b/libkdegamesprivate/kgamecanvas.h
@@ -599,7 +599,7 @@ public:
/** Set the delay of the animation, in milliseconds */
void setAnimationDelay(int d);

- /** Return the number of millisecons from the creation of the canvas
+ /** Return the number of milliseconds from the creation of the canvas
(see also KGameCanvasItem::advance)*/
int mSecs();

diff --git a/libkdegamesprivate/kgamedifficulty.cpp b/libkdegamesprivate/kgamedifficulty.cpp
index 8f7da7a6..9a031f82 100644
--- a/libkdegamesprivate/kgamedifficulty.cpp
+++ b/libkdegamesprivate/kgamedifficulty.cpp
@@ -67,7 +67,7 @@ class KGameDifficultyPrivate : public QObject
/**
* @brief Player wants to change the difficulty level to a standard level
*
- * The difference with the methode "setSelection" is that the player may have to confirm that he agrees to end the current game (if needed).
+ * The difference with the method "setSelection" is that the player may have to confirm that he agrees to end the current game (if needed).
* @param newSelection Selected item.
*/
void changeSelection(int newSelection);
@@ -76,7 +76,7 @@ class KGameDifficultyPrivate : public QObject
/**
* @brief Current difficulty level changed to a standard level
*
- * The game catchs this signal and restarts a game with the new standard difficulty level.
+ * The game catches this signal and restarts a game with the new standard difficulty level.
* @param level New standard level.
*/
void standardLevelChanged(KGameDifficulty::standardLevel level);
@@ -84,7 +84,7 @@ class KGameDifficultyPrivate : public QObject
/**
* @brief Current difficulty level changed to a custom level
*
- * The game catchs this signal and restarts a game with the new standard difficulty level.
+ * The game catches this signal and restarts a game with the new standard difficulty level.
* @param key Custom level identifier.
*/
void customLevelChanged(int key);
diff --git a/libkdegamesprivate/kgamesvgdocument.cpp b/libkdegamesprivate/kgamesvgdocument.cpp
index 8551bd40..d8b38315 100644
--- a/libkdegamesprivate/kgamesvgdocument.cpp
+++ b/libkdegamesprivate/kgamesvgdocument.cpp
@@ -287,7 +287,7 @@ void KGameSvgDocument::scale(double xFactor, double yFactor, const MatrixOptions
QMatrix matrix;
if ((xFactor == 0) || (yFactor == 0))
{
- qWarning () << "KGameSvgDocument::scale: You cannnot scale by zero";
+ qWarning () << "KGameSvgDocument::scale: You cannot scale by zero";
}

if (options == ApplyToCurrentMatrix)
@@ -667,7 +667,7 @@ QDomNode KGameSvgDocumentPrivate::findElementById(const QString& attributeName,
if (!node.firstChild().isNull())
{
QDomNode result = findElementById(attributeName, attributeValue, node.firstChild());
- /** We have recursed, now we need to have this recursion end when
+ /** We have recoursed, now we need to have this recursion end when
* the function call above returns
*/
if (!result.isNull()) return result; // If we found the node with id, then return it
@@ -675,7 +675,7 @@ QDomNode KGameSvgDocumentPrivate::findElementById(const QString& attributeName,
if (!node.nextSibling().isNull())
{
QDomNode result = findElementById(attributeName, attributeValue, node.nextSibling());
- /** We have recursed, now we need to have this recursion end when
+ /** We have recoursed, now we need to have this recursion end when
* the function call above returns */
if (!result.isNull()) return result;
}
diff --git a/libkdegamesprivate/kgamesvgdocument.h b/libkdegamesprivate/kgamesvgdocument.h
index fe28ca61..425b6342 100644
--- a/libkdegamesprivate/kgamesvgdocument.h
+++ b/libkdegamesprivate/kgamesvgdocument.h
@@ -181,7 +181,7 @@ public:
*
* This function also sets @p m_currentNode to this node.
*
- * @param attributeName The name of the identifing attribute, such as "id" to find.
+ * @param attributeName The name of the identifying attribute, such as "id" to find.
* @param attributeValue The value to look for in the attribute @p attributeName
* The values held in this attribute must be unique in the document, or the consequences
* may be unpredictably incorrect. You've been warned. ;-)
@@ -368,7 +368,7 @@ public:
* Unless you are parsing your own style attribute for some reason, you probably
* want to use styleProperty() or styleProperties().
*
- * @returns The style atttibute.
+ * @returns The style attribute.
* @see styleProperty() styleProperties()
*/
QString style() const;
diff --git a/libkdegamesprivate/kgametheme.h b/libkdegamesprivate/kgametheme.h
index d86107e9..7a0e79a3 100644
--- a/libkdegamesprivate/kgametheme.h
+++ b/libkdegamesprivate/kgametheme.h
@@ -38,7 +38,7 @@ class QPixmap;
* Essentially just a wrapper around a .desktop theme file. Load a file with
* load() and then access its properties.
*
- * For more advanced feaures like dynamic themes or custom game rules, it
+ * For more advanced features like dynamic themes or custom game rules, it
* will likely be necessary to derive from this class
*
* @author Mauricio Piacentini
diff --git a/libkdegamesprivate/tests/kgamepropertytest.cpp b/libkdegamesprivate/tests/kgamepropertytest.cpp
index 237d5cc5..406e4a5b 100644
--- a/libkdegamesprivate/tests/kgamepropertytest.cpp
+++ b/libkdegamesprivate/tests/kgamepropertytest.cpp
@@ -17,7 +17,7 @@
***************************************************************************/

#include "kgamepropertytest.h"
-#include "config-tests.h"
+#include <config-tests.h>

#include <QtCore>
#include <QtTest>
diff --git a/libkdegamesprivate/tests/kgamesvgdocumenttest.cpp b/libkdegamesprivate/tests/kgamesvgdocumenttest.cpp
index ec11b195..ad322e43 100644
--- a/libkdegamesprivate/tests/kgamesvgdocumenttest.cpp
+++ b/libkdegamesprivate/tests/kgamesvgdocumenttest.cpp
@@ -19,7 +19,7 @@
#include "kgamesvgdocumenttest.h"
#include "kgamesvgdocument_p.h"

-#include "config-tests.h"
+#include <config-tests.h>

#include <QtCore>
#include <QtTest>
diff --git a/tests/kgamepopupitemtest.h b/tests/kgamepopupitemtest.h
index d2f8e3c1..890c5b7b 100644
--- a/tests/kgamepopupitemtest.h
+++ b/tests/kgamepopupitemtest.h
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/

-#ifndef KGPI_TEST_H
-#define KGPI_TEST_H
+#ifndef KGAMEPOPUPITEM_TEST_H
+#define KGAMEPOPUPITEM_TEST_H

#include <KXmlGuiWindow>

diff --git a/tests/kgamepopupitemtest.ui b/tests/kgamepopupitemtest.ui
index 52a251bc..6edfcddf 100644
--- a/tests/kgamepopupitemtest.ui
+++ b/tests/kgamepopupitemtest.ui
@@ -91,7 +91,7 @@
<item row="15" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
- <string>Backgound color:</string>
+ <string>Background color:</string>
</property>
</widget>
</item>

[Yuri Chornoivan]

Git commit 9e38a01b54235b82a3cf392df2c1eb34343f9725 by Yuri Chornoivan.
Committed on 14/09/2018 at 15:43.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 src/rsidock.h
M +1 -1 src/rsirelaxpopup.cpp
M +1 -1 src/rsiwidget.cpp
M +1 -1 src/slideshoweffect.cpp
M +30 -30 test/rsitimer_test.cpp

https://commits.kde.org/rsibreak/9e38a01b54235b82a3cf392df2c1eb34343f9725

diff --git a/src/rsidock.h b/src/rsidock.h
index bf19286..2bbc569 100644
--- a/src/rsidock.h
+++ b/src/rsidock.h
@@ -85,7 +85,7 @@ signals:

/**
* This signal is emitted when the user wishes to see all
- * debug timing info. Needs a --enable-debug comiled RSIBreak
+ * debug timing info. Needs a --enable-debug compiled RSIBreak
*/
void debugRequest();

diff --git a/src/rsirelaxpopup.cpp b/src/rsirelaxpopup.cpp
index 9326fb0..29bc03d 100644
--- a/src/rsirelaxpopup.cpp
+++ b/src/rsirelaxpopup.cpp
@@ -96,7 +96,7 @@ void RSIRelaxPopup::relax( int n, bool bigBreakNext )
resetcount += 1;
if ( n > m_progress->value() )
flash();
- else if ( resetcount % 4 == 0 ) // flash regulary when the user keeps working
+ else if ( resetcount % 4 == 0 ) // flash regularily when the user keeps working
flash();
}

diff --git a/src/rsiwidget.cpp b/src/rsiwidget.cpp
index 6c2b60b..038c25a 100644
--- a/src/rsiwidget.cpp
+++ b/src/rsiwidget.cpp
@@ -67,7 +67,7 @@ RSIObject::RSIObject( QWidget *parent ) : QObject( parent )
connect(m_tray, &RSIDock::configChanged, m_relaxpopup, &RSIRelaxPopup::slotReadConfig);
connect(m_tray, &RSIDock::suspend, m_relaxpopup, &RSIRelaxPopup::setSuspended);

- srand( time( NULL ) );
+ qsrand( time( NULL ) );

readConfig();

diff --git a/src/slideshoweffect.cpp b/src/slideshoweffect.cpp
index 26f4b9c..07de15f 100644
--- a/src/slideshoweffect.cpp
+++ b/src/slideshoweffect.cpp
@@ -104,7 +104,7 @@ void SlideEffect::loadImage()
int j;
QString name;
do {
- j = ( int )( m_files.count() * ( rand() / ( RAND_MAX + 1.0 ) ) );
+ j = ( int )( m_files.count() * ( qrand() / ( RAND_MAX + 1.0 ) ) );
name = m_files[ j ];
} while ( m_files_done.indexOf( name ) != -1 );

diff --git a/test/rsitimer_test.cpp b/test/rsitimer_test.cpp
index c802d34..ed37df6 100644
--- a/test/rsitimer_test.cpp
+++ b/test/rsitimer_test.cpp
@@ -39,8 +39,8 @@ void RSITimerTest::triggerSimpleTinyBreak()
RSITimer timer( idleTime, m_intervals, true, true );

// Part one, no idleness till small break.
- QSignalSpy spy1Relax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spy1UpdateIdleAvg( &timer, SIGNAL( updateIdleAvg( double ) ) );
+ QSignalSpy spy1Relax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spy1UpdateIdleAvg( &timer, SIGNAL(updateIdleAvg(double)) );

idleTime->setIdleTime( 0 );
for ( int i = 0; i < m_intervals[TINY_BREAK_INTERVAL]; i++ ) {
@@ -66,9 +66,9 @@ void RSITimerTest::triggerSimpleTinyBreak()
}

// Part two, obeying and idle as suggested.
- QSignalSpy spy2Relax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spy2UpdateIdleAvg( &timer, SIGNAL( updateIdleAvg( double ) ) );
- QSignalSpy spy2Minimize( &timer, SIGNAL( minimize() ) );
+ QSignalSpy spy2Relax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spy2UpdateIdleAvg( &timer, SIGNAL(updateIdleAvg(double)) );
+ QSignalSpy spy2Minimize( &timer, SIGNAL(minimize()) );

for ( int i = 0; i < m_intervals[TINY_BREAK_DURATION]; i++ ) {
QCOMPARE( timer.m_state, RSITimer::TimerState::Suggesting );
@@ -98,8 +98,8 @@ void RSITimerTest::triggerComplexTinyBreak()
int part3 = m_intervals[TINY_BREAK_INTERVAL] - part1 - part2; // The rest non-idle.

// Part 1, no idleness.
- QSignalSpy spy1Relax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spy1UpdateIdleAvg( &timer, SIGNAL( updateIdleAvg( double ) ) );
+ QSignalSpy spy1Relax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spy1UpdateIdleAvg( &timer, SIGNAL(updateIdleAvg(double)) );
idleTime->setIdleTime( 0 );
for ( int i = 0; i < part1; i++ ) {
timer.timeout();
@@ -109,8 +109,8 @@ void RSITimerTest::triggerComplexTinyBreak()
QCOMPARE( spy1UpdateIdleAvg.count(), part1 );

// Part 2, idle for a while.
- QSignalSpy spy2Relax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spy2UpdateIdleAvg( &timer, SIGNAL( updateIdleAvg( double ) ) );
+ QSignalSpy spy2Relax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spy2UpdateIdleAvg( &timer, SIGNAL(updateIdleAvg(double)) );
for ( int i = 0; i < part2; i++ ) {
idleTime->setIdleTime( ( i + 1 ) * 1000 );
timer.timeout();
@@ -120,8 +120,8 @@ void RSITimerTest::triggerComplexTinyBreak()
QCOMPARE( spy2UpdateIdleAvg.count(), part2 );

// Part 3, non-idle till break.
- QSignalSpy spy3Relax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spy3UpdateIdleAvg( &timer, SIGNAL( updateIdleAvg( double ) ) );
+ QSignalSpy spy3Relax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spy3UpdateIdleAvg( &timer, SIGNAL(updateIdleAvg(double)) );
for ( int i = 0; i < part3; i++ ) {
QCOMPARE( timer.m_state, RSITimer::TimerState::Monitoring );
idleTime->setIdleTime( 0 );
@@ -141,8 +141,8 @@ void RSITimerTest::testSuspended()
timer.slotStop();
QCOMPARE( timer.m_state, RSITimer::TimerState::Suspended );

- QSignalSpy spy1Relax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spy1UpdateIdleAvg( &timer, SIGNAL( updateIdleAvg( double ) ) );
+ QSignalSpy spy1Relax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spy1UpdateIdleAvg( &timer, SIGNAL(updateIdleAvg(double)) );

// Not idle for long enough to have a break.
idleTime->setIdleTime( 0 );
@@ -169,8 +169,8 @@ void RSITimerTest::triggerSimpleBigBreak()
int ticks = m_intervals[BIG_BREAK_INTERVAL] + tinyBreaks * ( m_intervals[PATIENCE_INTERVAL] + m_intervals[TINY_BREAK_DURATION] );

// Part one, no idleness till big break.
- QSignalSpy spy1Relax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spy1UpdateIdleAvg( &timer, SIGNAL( updateIdleAvg( double ) ) );
+ QSignalSpy spy1Relax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spy1UpdateIdleAvg( &timer, SIGNAL(updateIdleAvg(double)) );

idleTime->setIdleTime( 0 );
for ( int i = 0; i < ticks; i++ ) {
@@ -183,7 +183,7 @@ void RSITimerTest::triggerSimpleBigBreak()
QVERIFY2( spy1UpdateIdleAvg.count() >= m_intervals[BIG_BREAK_INTERVAL], "Failed to update the indicator regularly." );

// Part two, making the big break.
- QSignalSpy spy2Relax( &timer, SIGNAL( relax( int, bool ) ) );
+ QSignalSpy spy2Relax( &timer, SIGNAL(relax(int,bool)) );
for ( int i = 0; i < m_intervals[BIG_BREAK_DURATION]; i++ ) {
QCOMPARE( timer.m_state, RSITimer::TimerState::Suggesting );
idleTime->setIdleTime( ( i + 1 ) * 1000 );
@@ -207,8 +207,8 @@ void RSITimerTest::postponeBreak()
}
QCOMPARE( timer.m_state, RSITimer::TimerState::Suggesting );

- QSignalSpy spyRelax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spyMinimize( &timer, SIGNAL( minimize() ) );
+ QSignalSpy spyRelax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spyMinimize( &timer, SIGNAL(minimize()) );
timer.postponeBreak();

QCOMPARE( timer.m_state, RSITimer::TimerState::Monitoring );
@@ -238,8 +238,8 @@ void RSITimerTest::screenLock()
}
QCOMPARE( timer.m_state, RSITimer::TimerState::Suggesting );

- QSignalSpy spyRelax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spyMinimize( &timer, SIGNAL( minimize() ) );
+ QSignalSpy spyRelax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spyMinimize( &timer, SIGNAL(minimize()) );
timer.slotLock();

QCOMPARE( timer.m_state, RSITimer::TimerState::Monitoring );
@@ -265,8 +265,8 @@ void RSITimerTest::skipBreak()
}
QCOMPARE( timer.m_state, RSITimer::TimerState::Suggesting );

- QSignalSpy spyRelax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spyMinimize( &timer, SIGNAL( minimize() ) );
+ QSignalSpy spyRelax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spyMinimize( &timer, SIGNAL(minimize()) );
timer.skipBreak();

QCOMPARE( timer.m_state, RSITimer::TimerState::Monitoring );
@@ -286,8 +286,8 @@ void RSITimerTest::noPopupBreak()
RSITimer timer( idleTime, m_intervals, false, true );

// Part one, no idleness till small break.
- QSignalSpy spy1BreakNow( &timer, SIGNAL( breakNow( void ) ) );
- QSignalSpy spy1UpdateWidget( &timer, SIGNAL( updateWidget( int ) ) );
+ QSignalSpy spy1BreakNow( &timer, SIGNAL(breakNow()) );
+ QSignalSpy spy1UpdateWidget( &timer, SIGNAL(updateWidget(int)) );

idleTime->setIdleTime( 0 );
for ( int i = 0; i < m_intervals[TINY_BREAK_INTERVAL]; i++ ) {
@@ -303,8 +303,8 @@ void RSITimerTest::noPopupBreak()
QCOMPARE( spy1UpdateWidgetSignals.at( 0 ).toInt(), m_intervals[TINY_BREAK_DURATION] );

// Part two, waiting out break.
- QSignalSpy spy2UpdateWidget( &timer, SIGNAL( updateWidget( int ) ) );
- QSignalSpy spy2Minimize( &timer, SIGNAL( minimize( void ) ) );
+ QSignalSpy spy2UpdateWidget( &timer, SIGNAL(updateWidget(int)) );
+ QSignalSpy spy2Minimize( &timer, SIGNAL(minimize()) );

for ( int i = 0; i < m_intervals[TINY_BREAK_DURATION]; i++ ) {
QCOMPARE( timer.m_state, RSITimer::TimerState::Resting );
@@ -332,10 +332,10 @@ void RSITimerTest::regularBreaks()

for ( int j = 0; j < tinyBreaks; j++ ) {
// Tiny break, mix of activity and idleness till small break.
- QSignalSpy spyRelax( &timer, SIGNAL( relax( int, bool ) ) );
- QSignalSpy spyUpdateIdleAvg( &timer, SIGNAL( updateIdleAvg( double ) ) );
+ QSignalSpy spyRelax( &timer, SIGNAL(relax(int,bool)) );
+ QSignalSpy spyUpdateIdleAvg( &timer, SIGNAL(updateIdleAvg(double)) );

- for ( int i = 0; i < m_intervals[TINY_BREAK_INTERVAL]; i++, tick++ ) {
+ for ( int i = 0; i < m_intervals[TINY_BREAK_INTERVAL]; ++i, ++tick ) {
QCOMPARE( timer.m_state, RSITimer::TimerState::Monitoring );
if ( i % 2 == 0 ) {
idleTime->setIdleTime( 0 );
@@ -345,7 +345,7 @@ void RSITimerTest::regularBreaks()
timer.timeout();
}

- for ( int i = 0; i < m_intervals[TINY_BREAK_DURATION]; i++, tick++ ) {
+ for ( int i = 0; i < m_intervals[TINY_BREAK_DURATION]; ++i, ++tick ) {
// No activity during break -- obeying.
QCOMPARE( timer.m_state, RSITimer::TimerState::Suggesting );
idleTime->setIdleTime( ( i + 1 ) * 1000 );

[Yuri Chornoivan]

Git commit dd34aa427656bd64fbc63f72135ef7af818fb3db by Yuri Chornoivan.
Committed on 15/09/2018 at 04:29.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +4 -1 kgthemeprovider.h
M +1 -1 libkdegamesprivate/kgame/kgame.h
M +1 -1 libkdegamesprivate/kgamesvgdocument.cpp

https://commits.kde.org/libkdegames/dd34aa427656bd64fbc63f72135ef7af818fb3db

diff --git a/kgthemeprovider.h b/kgthemeprovider.h
index ac697d8b..e2452cd7 100644
--- a/kgthemeprovider.h
+++ b/kgthemeprovider.h
@@ -20,7 +20,10 @@
#define KGTHEMEPROVIDER_H

#include <QObject>
-#include <QtQml>
+#include <QQmlEngine>
+#include <QQmlContext>
+#include <QDir>
+#include <QPointer>

#include <kgtheme.h>
#include <libkdegames_export.h>
diff --git a/libkdegamesprivate/kgame/kgame.h b/libkdegamesprivate/kgame/kgame.h
index f9952348..fd89655e 100644
--- a/libkdegamesprivate/kgame/kgame.h
+++ b/libkdegamesprivate/kgame/kgame.h
@@ -592,7 +592,7 @@ Q_SIGNALS:
/**
* We got an user defined update message. This is usually done
* by a sendData in a inherited KGame Object which defines its
- * own methods and has to syncronize them over the network.
+ * own methods and has to synchronize them over the network.
* Reaction to this is usually a call to a KGame function.
*/
void signalNetworkData(int msgid,const QByteArray& buffer, quint32 receiver, quint32 sender);
diff --git a/libkdegamesprivate/kgamesvgdocument.cpp b/libkdegamesprivate/kgamesvgdocument.cpp
index d8b38315..e6bc2cfe 100644
--- a/libkdegamesprivate/kgamesvgdocument.cpp
+++ b/libkdegamesprivate/kgamesvgdocument.cpp
@@ -196,7 +196,7 @@ void KGameSvgDocument::load()
QByteArray content = file.readAll();

// If the file is compressed, decompress the contents before loading it.
- if (!content.startsWith("<?xml"))
+ if (!content.startsWith("<?xml")) // krazy:exclude=strings
{
QBuffer buf(&content);
KCompressionDevice::CompressionType type = KFilterDev::compressionTypeForMimeType(QStringLiteral("application/x-gzip"));

[Yuri Chornoivan]

Git commit 6eeb3be02897775172fc688c48f30bfe32063bfa by Yuri Chornoivan.
Committed on 18/09/2018 at 14:50.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +3 -3 declarative-plugins/qmlplugins.h
M +1 -1 print-manager-kded/NewPrinterNotification.h

https://commits.kde.org/print-manager/6eeb3be02897775172fc688c48f30bfe32063bfa

diff --git a/declarative-plugins/qmlplugins.h b/declarative-plugins/qmlplugins.h
index 238019a..b3bbf61 100644
--- a/declarative-plugins/qmlplugins.h
+++ b/declarative-plugins/qmlplugins.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/

-#ifndef PRINT_MANAGER_PLUGINS_H
-#define PRINT_MANAGER_PLUGINS_H
+#ifndef PRINT_MANAGER_QMLPLUGINS_H
+#define PRINT_MANAGER_QMLPLUGINS_H

#include <QQmlExtensionPlugin>

@@ -31,4 +31,4 @@ class QmlPlugins : public QQmlExtensionPlugin
void registerTypes(const char * uri) override;
};

-#endif // PRINT_MANAGER_PLUGINS_H
+#endif // PRINT_MANAGER_QMLPLUGINS_H
diff --git a/print-manager-kded/NewPrinterNotification.h b/print-manager-kded/NewPrinterNotification.h
index d5fe0f1..5402062 100644
--- a/print-manager-kded/NewPrinterNotification.h
+++ b/print-manager-kded/NewPrinterNotification.h
@@ -29,7 +29,7 @@ class NewPrinterNotification : public QObject, protected QDBusContext
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "com.redhat.NewPrinterNotification")
public:
- NewPrinterNotification(QObject *parent);
+ explicit NewPrinterNotification(QObject *parent);
~NewPrinterNotification();

public:

[Yuri Chornoivan]

Git commit f6b5bfb1676833b736246e9a976860adfd07b150 by Yuri Chornoivan.
Committed on 18/09/2018 at 15:34.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 ktimer.h
M +1 -1 main.cpp

https://commits.kde.org/ktimer/f6b5bfb1676833b736246e9a976860adfd07b150

diff --git a/ktimer.h b/ktimer.h
index 1454f7c..f256326 100644
--- a/ktimer.h
+++ b/ktimer.h
@@ -31,7 +31,7 @@ class KTimerJob : public QObject {
Q_OBJECT

public:
- KTimerJob( QObject *parent=0);
+ explicit KTimerJob( QObject *parent=0);
virtual ~KTimerJob();

enum States { Stopped, Paused, Started };
@@ -98,7 +98,7 @@ class KTimerPref : public QDialog, public Ui::PrefWidget
{
Q_OBJECT
public:
- KTimerPref( QWidget *parent=0);
+ explicit KTimerPref( QWidget *parent=0);
virtual ~KTimerPref();

public Q_SLOTS:
diff --git a/main.cpp b/main.cpp
index 173f113..e8cef60 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,7 +25,7 @@
#include <kdelibs4configmigrator.h>
#include <KDBusService>
#include "ktimer.h"
-#include "config-ktimer.h"
+#include <config-ktimer.h>

static const char description[] =
I18N_NOOP("KDE Timer");

[Yuri Chornoivan]

Git commit 53ae37b06f1c8dbe5b2451e9af1d31a583a85b40 by Yuri Chornoivan.
Committed on 18/09/2018 at 16:21.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +7 -5 floppy.cpp
M +1 -1 floppy.h
M +4 -3 format.cpp
M +10 -10 format.h

https://commits.kde.org/kfloppy/53ae37b06f1c8dbe5b2451e9af1d31a583a85b40

diff --git a/floppy.cpp b/floppy.cpp
index 796fd7e..c2fe98d 100644
--- a/floppy.cpp
+++ b/floppy.cpp
@@ -25,20 +25,22 @@
#include "floppy.h"
#include "format.h"

+#include <QApplication>
#include <QCheckBox>
#include <QLabel>
-#include <qcursor.h>
-#include <qgroupbox.h>
-#include <qradiobutton.h>
+#include <QCursor>
+#include <QGroupBox>
+#include <QRadioButton>
#include <QVBoxLayout>
#include <QFrame>
#include <QHBoxLayout>
#include <QGridLayout>
#include <QKeyEvent>
#include <QCloseEvent>
-#include <QtDBus/QtDBus>
+#include <QDBusInterface>
+#include <QDBusReply>
#include <QPushButton>
-#include <qprogressbar.h>
+#include <QProgressBar>
#include <QUrl>

#include <kmessagebox.h>
diff --git a/floppy.h b/floppy.h
index 17813a8..68080fc 100644
--- a/floppy.h
+++ b/floppy.h
@@ -48,7 +48,7 @@ class FloppyData : public QDialog
Q_OBJECT

public:
- FloppyData(QWidget* parent = 0);
+ explicit FloppyData(QWidget* parent = 0);
virtual ~FloppyData();

/// Need to overload normal show() in order to mangle caption
diff --git a/format.cpp b/format.cpp
index c018c43..86763e0 100644
--- a/format.cpp
+++ b/format.cpp
@@ -29,6 +29,7 @@
#include <QTimer>
#include <QRegExp>
#include <QStandardPaths>
+#include "qplatformdefs.h"

#include <KLocalizedString>
#include <KProcess>
@@ -298,7 +299,7 @@ bool FloppyAction::configureDevice(int drive,int density)
for (const char* const* devices=deviceinfo->devices ;
*devices ; devices++)
{
- if (access(*devices,W_OK)>=0)
+ if (QT_ACCESS(*devices,W_OK)>=0)
{
qCDebug(KFLOPPY_LOG) << "Found device " << *devices ;
devicename=*devices;
@@ -369,8 +370,8 @@ bool FloppyAction::startProcess()
{
DEBUGSETUP;

- connect(theProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
- this, SLOT(processDone(int, QProcess::ExitStatus)));
+ connect(theProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
+ this, SLOT(processDone(int,QProcess::ExitStatus)));
connect(theProcess, SIGNAL(readyReadStandardOutput()),
this, SLOT(readStdOut()));
connect(theProcess, SIGNAL(readyReadStandardError()),
diff --git a/format.h b/format.h
index 4154dbb..30a0e96 100644
--- a/format.h
+++ b/format.h
@@ -70,7 +70,7 @@ class KFAction : public QObject
Q_OBJECT

public:
- KFAction(QObject *parent = 0L);
+ explicit KFAction(QObject *parent = 0L);
virtual ~KFAction();

public slots:
@@ -119,7 +119,7 @@ class KFActionQueue : public KFAction
Q_OBJECT

public:
- KFActionQueue(QObject *parent = 0L);
+ explicit KFActionQueue(QObject *parent = 0L);
virtual ~KFActionQueue();

/**
@@ -178,7 +178,7 @@ class FloppyAction : public KFAction
Q_OBJECT

public:
- FloppyAction(QObject *parent = 0L);
+ explicit FloppyAction(QObject *parent = 0L);

/**
* Kills the running process, if one exists.
@@ -258,7 +258,7 @@ private slots:
class FDFormat : public FloppyAction
{
public:
- FDFormat(QObject *parent = 0L);
+ explicit FDFormat(QObject *parent = 0L);

virtual void exec();

@@ -288,13 +288,13 @@ protected:
} ;

/**
- * Zero out disk by runnind dd(1)
+ * Zero out disk by running dd(1)
* \bug As dd terminates with the error "No space left on device", KFloppy aborts
*/
class DDZeroOut : public FloppyAction
{
public:
- DDZeroOut(QObject *parent = 0L);
+ explicit DDZeroOut(QObject *parent = 0L);

virtual void exec();

@@ -324,7 +324,7 @@ protected:
class FATFilesystem : public FloppyAction
{
public:
- FATFilesystem(QObject *parent = 0L);
+ explicit FATFilesystem(QObject *parent = 0L);

virtual void exec();

@@ -355,7 +355,7 @@ protected:
class Ext2Filesystem : public FloppyAction
{
public:
- Ext2Filesystem(QObject *parent = 0L);
+ explicit Ext2Filesystem(QObject *parent = 0L);

virtual void exec();

@@ -383,7 +383,7 @@ protected:
class UFSFilesystem : public FloppyAction
{
public:
- UFSFilesystem(QObject *parent = 0L);
+ explicit UFSFilesystem(QObject *parent = 0L);

virtual void exec();

@@ -405,7 +405,7 @@ protected:
class MinixFilesystem : public FloppyAction
{
public:
- MinixFilesystem(QObject *parent = 0L);
+ explicit MinixFilesystem(QObject *parent = 0L);

virtual void exec();

[Yuri Chornoivan]

Git commit ecf5e05fce0e8513a99cd5e3572cc467a1f2d332 by Yuri Chornoivan.
Committed on 18/09/2018 at 17:29.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 doc/CMakeLists.txt
M +2 -2 src/fileTree.cpp
M +1 -1 src/fileTree.h
M +1 -1 src/localLister.cpp
M +1 -1 src/mainWindow.cpp
M +1 -1 src/radialMap/labels.cpp
M +2 -2 src/settingsDialog.cpp

https://commits.kde.org/filelight/ecf5e05fce0e8513a99cd5e3572cc467a1f2d332

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 4564cee..b655246 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR filelight)
\ No newline at end of file
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR filelight)
diff --git a/src/fileTree.cpp b/src/fileTree.cpp
index d53cbbe..84c7938 100644
--- a/src/fileTree.cpp
+++ b/src/fileTree.cpp
@@ -32,8 +32,8 @@ QString File::displayName() const {

QString File::displayPath(const Folder *root) const
{
- // Use QUrl to sanitize the path for display and then run it throuh
- // QDir to make sure we use native path seprators.
+ // Use QUrl to sanitize the path for display and then run it through
+ // QDir to make sure we use native path separators.
const QUrl url = this->url(root);
const QString cleanPath = url.toDisplayString(QUrl::PreferLocalFile | QUrl::NormalizePathSegments);
return url.isLocalFile() ? QDir::toNativeSeparators(cleanPath) : cleanPath;
diff --git a/src/fileTree.h b/src/fileTree.h
index 552042f..91af4d9 100644
--- a/src/fileTree.h
+++ b/src/fileTree.h
@@ -60,7 +60,7 @@ public:
return QFile::decodeName(m_name);
}
/**
- * Humand readable name (including native seperators where applicable).
+ * Human readable name (including native separators where applicable).
* Only use for display.
*/
QString displayName() const;
diff --git a/src/localLister.cpp b/src/localLister.cpp
index 20657ee..789f5be 100644
--- a/src/localLister.cpp
+++ b/src/localLister.cpp
@@ -85,7 +85,7 @@ LocalLister::run()
qDebug() << "Scan completed in" << (timer.elapsed()/1000);

//delete the list of trees useful for this scan,
- //in a sucessful scan the contents would now be transferred to 'tree'
+ //in a successful scan the contents would now be transferred to 'tree'
delete m_trees;

if (m_parent->m_abort) //scan was cancelled
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 83f356b..15caab8 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -369,7 +369,7 @@ bool MainWindow::openUrl(const QUrl &u)

if (uri.isEmpty())
{
- //do nothing, chances are the user accidently pressed ENTER
+ //do nothing, chances are the user accidentally pressed ENTER
}
else if (!uri.isValid())
{
diff --git a/src/radialMap/labels.cpp b/src/radialMap/labels.cpp
index 4680b15..030f4f4 100644
--- a/src/radialMap/labels.cpp
+++ b/src/radialMap/labels.cpp
@@ -84,7 +84,7 @@ void RadialMap::Widget::paintExplodedLabels(QPainter &paint) const

//**** Levels should be on a scale starting with 0
//**** range is a useless parameter
- //**** keep a topblock var which is the lowestLevel OR startLevel for identation purposes
+ //**** keep a topblock var which is the lowestLevel OR startLevel for indentation purposes
for (unsigned int i = startLevel; i <= m_map.m_visibleDepth; ++i) {
for (const Segment *segment : m_map.m_signature[i]) {
if (segment->start() >= start && segment->end() <= end) {
diff --git a/src/settingsDialog.cpp b/src/settingsDialog.cpp
index 8612999..72a7c04 100644
--- a/src/settingsDialog.cpp
+++ b/src/settingsDialog.cpp
@@ -26,7 +26,7 @@
#include <QRadioButton>
#include <QCloseEvent>
#include <QDir>
-#include <QMessageBox>
+#include <KMessageBox>
#include <QFileDialog>
#include <QDialogButtonBox>
#include <QButtonGroup>
@@ -177,7 +177,7 @@ void SettingsDialog::addFolder()
if (m_listBox->currentItem() == nullptr) m_listBox->setCurrentRow(0);
m_removeButton->setEnabled(true);
}
- else QMessageBox::information(this, i18n("Folder already ignored"), i18n("That folder is already set to be excluded from scans."));
+ else KMessageBox::information(this, i18n("That folder is already set to be excluded from scans."), i18n("Folder already ignored"));
}
}

[Yuri Chornoivan]

Git commit 3fa28a273dc37980518938696dbab0c2a4669417 by Yuri Chornoivan.
Committed on 20/09/2018 at 05:45.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +4 -3 arealistview.cpp
M +6 -5 drawzone.cpp
M +2 -2 imagemapchoosedialog.cpp
M +5 -5 imageslistview.cpp
M +42 -41 kimagemapeditor.cpp
M +10 -10 kimearea.cpp
M +1 -1 kimearea.h
M +4 -4 kimecommands.cpp
M +1 -0 kimecommands.h
M +20 -20 kimedialogs.cpp
M +5 -5 kimeshell.cpp
M +7 -7 mapslistview.cpp

https://commits.kde.org/kimagemapeditor/3fa28a273dc37980518938696dbab0c2a4669417

diff --git a/arealistview.cpp b/arealistview.cpp
index 28b2d57..f0c5728 100644
--- a/arealistview.cpp
+++ b/arealistview.cpp
@@ -15,9 +15,11 @@
* *
***************************************************************************/

+#include "arealistview.h"
+
// Qt
-#include <qpushbutton.h>
-#include <qtooltip.h>
+#include <QPushButton>
+#include <QToolTip>
#include <QTreeWidget>
#include <QVBoxLayout>

@@ -27,7 +29,6 @@

// local
#include "kimearea.h"
-#include "arealistview.h"


AreaListView::AreaListView(QWidget *parent)
diff --git a/drawzone.cpp b/drawzone.cpp
index 6dddac4..07a815e 100644
--- a/drawzone.cpp
+++ b/drawzone.cpp
@@ -15,23 +15,24 @@
* *
***************************************************************************/

+#include "drawzone.h"
+
// Qt
-#include <qbitmap.h>
+#include <QBitmap>
#include <QDragEnterEvent>
#include <QDropEvent>
#include <QMimeDatabase>
#include <QMimeType>
#include <QResizeEvent>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <QPainter>
+#include <QPixmap>
#include <QMouseEvent>
#include <QStandardPaths>
-#
+
// KDE Frameworks
#include "kimagemapeditor_debug.h"

// Local
-#include "drawzone.h"
#include "kimagemapeditor.h"
#include "kimecommands.h"
#include "areacreator.h"
diff --git a/imagemapchoosedialog.cpp b/imagemapchoosedialog.cpp
index e93eab2..c6eb3a9 100644
--- a/imagemapchoosedialog.cpp
+++ b/imagemapchoosedialog.cpp
@@ -14,6 +14,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
+#include "imagemapchoosedialog.h"
+
#include <QDialogButtonBox>
#include <QLineEdit>
#include <QListWidget>
@@ -28,8 +30,6 @@

#include "kimagemapeditor_debug.h"

-#include "imagemapchoosedialog.h"
-
ImageMapChooseDialog::ImageMapChooseDialog(
QWidget* parent,
QList<MapTag*> _maps,
diff --git a/imageslistview.cpp b/imageslistview.cpp
index ccfaf1f..1ff98dc 100644
--- a/imageslistview.cpp
+++ b/imageslistview.cpp
@@ -15,6 +15,9 @@
* *
***************************************************************************/

+// local
+#include "imageslistview.h"
+
// Qt
#include <QLinkedList>

@@ -23,9 +26,6 @@
#include <klocalizedstring.h>
#include "kimagemapeditor_debug.h"

-// locale
-#include "imageslistview.h"
-
ImagesListViewItem::ImagesListViewItem(ImagesListView* parent, ImageTag* tag)
: QTreeWidgetItem(parent)
{
@@ -67,8 +67,8 @@ ImagesListView::ImagesListView(QWidget *parent)
// setFullWidth(true);


- connect( this, SIGNAL( itemSelectionChanged()),
- this, SLOT( slotSelectionChanged()));
+ connect( this, SIGNAL(itemSelectionChanged()),
+ this, SLOT(slotSelectionChanged()));
}


diff --git a/kimagemapeditor.cpp b/kimagemapeditor.cpp
index 2c0570d..1089d30 100644
--- a/kimagemapeditor.cpp
+++ b/kimagemapeditor.cpp
@@ -15,6 +15,8 @@
* *
***************************************************************************/

+#include "kimagemapeditor.h"
+
#include <iostream>
#include <assert.h>

@@ -22,13 +24,13 @@
#include <QApplication>
#include <QAction>
#include <QDialogButtonBox>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qcombobox.h>
-#include <qfontdatabase.h>
-#include <qfile.h>
+#include <QLayout>
+#include <QPushButton>
+#include <QComboBox>
+#include <QFontDatabase>
+#include <QFile>
#include <QFileDialog>
-#include <qfileinfo.h>
+#include <QFileInfo>
#include <QIcon>
#include <QInputDialog>
#include <QLinkedList>
@@ -36,16 +38,16 @@
#include <QMenu>
#include <QMimeDatabase>
#include <QMimeType>
-#include <qpixmap.h>
-#include <qpainter.h>
+#include <QPixmap>
+#include <QPainter>
#include <QPushButton>
#include <QScrollArea>
-#include <qsplitter.h>
+#include <QSplitter>
#include <QStandardPaths>
-#include <qtabwidget.h>
+#include <QTabWidget>
#include <QTextEdit>
-#include <qtextstream.h>
-#include <qtooltip.h>
+#include <QTextStream>
+#include <QToolTip>
#include <QUndoStack>
#include <QVBoxLayout>

@@ -68,7 +70,6 @@
#include <KConfigGroup>

// local
-#include "kimagemapeditor.h"
#include "kimagemapeditor.moc"
#include "drawzone.h"
#include "kimedialogs.h"
@@ -149,28 +150,28 @@ KImageMapEditor::KImageMapEditor(QWidget *parentWidget,
this,
SLOT(showTagEditor(QTreeWidgetItem*)));
connect( areaListView->listView,
- SIGNAL(customContextMenuRequested(const QPoint&)),
+ SIGNAL(customContextMenuRequested(QPoint)),
this,
- SLOT(slotShowPopupMenu(const QPoint &)));
+ SLOT(slotShowPopupMenu(QPoint)));

- connect( mapsListView, SIGNAL( mapSelected(const QString &)),
- this, SLOT( setMap(const QString &)));
+ connect( mapsListView, SIGNAL(mapSelected(QString)),
+ this, SLOT(setMap(QString)));

- connect( mapsListView, SIGNAL( mapRenamed(const QString &)),
- this, SLOT( setMapName(const QString &)));
+ connect( mapsListView, SIGNAL(mapRenamed(QString)),
+ this, SLOT(setMapName(QString)));

connect( mapsListView->listView(),
- SIGNAL(customContextMenuRequested(const QPoint &)),
+ SIGNAL(customContextMenuRequested(QPoint)),
this,
- SLOT(slotShowMapPopupMenu(const QPoint &)));
+ SLOT(slotShowMapPopupMenu(QPoint)));

- connect( imagesListView, SIGNAL( imageSelected(const KUrl &)),
- this, SLOT( setPicture(const KUrl &)));
+ connect( imagesListView, SIGNAL(imageSelected(KUrl)),
+ this, SLOT(setPicture(KUrl)));

connect( imagesListView,
- SIGNAL(customContextMenuRequested(const QPoint &)),
+ SIGNAL(customContextMenuRequested(QPoint)),
this,
- SLOT(slotShowImagePopupMenu(const QPoint &)));
+ SLOT(slotShowImagePopupMenu(QPoint)));

if (splitter) {
drawZone = new DrawZone(splitter,this);
@@ -446,7 +447,7 @@ void KImageMapEditor::setupActions()
temp->setToolTip(i18n("Open new picture or HTML file"));

// File Open Recent
- recentFilesAction = KStandardAction::openRecent(this, SLOT(openURL(const QUrl&)),
+ recentFilesAction = KStandardAction::openRecent(this, SLOT(openURL(QUrl)),
actionCollection());
// File Save
temp =KStandardAction::save(this, SLOT(fileSave()), actionCollection());
@@ -485,7 +486,7 @@ void KImageMapEditor::setupActions()
deleteAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")),
i18n("&Delete"), this);
actionCollection()->addAction("edit_delete", deleteAction );
- connect(deleteAction, SIGNAL(triggered(bool) ), SLOT (slotDelete()));
+ connect(deleteAction, SIGNAL(triggered(bool)), SLOT (slotDelete()));
actionCollection()->setDefaultShortcut(deleteAction, QKeySequence(Qt::Key_Delete));
deleteAction->setWhatsThis(i18n("<h3>Delete</h3>"
"Click this to <em>delete</em> the selected area."));
@@ -653,64 +654,64 @@ void KImageMapEditor::setupActions()

QAction *action = new QAction(i18n("Cancel Drawing"), this);
actionCollection()->addAction("canceldrawing", action );
- connect(action, SIGNAL(triggered(bool)), SLOT( slotCancelDrawing() ));
+ connect(action, SIGNAL(triggered(bool)), SLOT(slotCancelDrawing()));
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::Key_Escape));

moveLeftAction = new QAction(i18n("Move Left"), this);
actionCollection()->addAction("moveleft", moveLeftAction );
connect(moveLeftAction, SIGNAL(triggered(bool)),
- SLOT( slotMoveLeft() ));
+ SLOT(slotMoveLeft()));
actionCollection()->setDefaultShortcut(moveLeftAction, QKeySequence(Qt::Key_Left));

moveRightAction = new QAction(i18n("Move Right"), this);
actionCollection()->addAction("moveright", moveRightAction );
- connect(moveRightAction, SIGNAL(triggered(bool)), SLOT( slotMoveRight() ));
+ connect(moveRightAction, SIGNAL(triggered(bool)), SLOT(slotMoveRight()));
actionCollection()->setDefaultShortcut(moveRightAction, QKeySequence(Qt::Key_Right));

moveUpAction = new QAction(i18n("Move Up"), this);
actionCollection()->addAction("moveup", moveUpAction );
- connect(moveUpAction, SIGNAL(triggered(bool)), SLOT( slotMoveUp() ));
+ connect(moveUpAction, SIGNAL(triggered(bool)), SLOT(slotMoveUp()));
actionCollection()->setDefaultShortcut(moveUpAction, QKeySequence(Qt::Key_Up));

moveDownAction = new QAction(i18n("Move Down"), this);
actionCollection()->addAction("movedown", moveDownAction );
- connect(moveDownAction, SIGNAL(triggered(bool)), SLOT( slotMoveDown() ));
+ connect(moveDownAction, SIGNAL(triggered(bool)), SLOT(slotMoveDown()));
actionCollection()->setDefaultShortcut(moveDownAction, QKeySequence(Qt::Key_Down));

increaseWidthAction = new QAction(i18n("Increase Width"), this);
actionCollection()->addAction("increasewidth", increaseWidthAction );
- connect(increaseWidthAction, SIGNAL(triggered(bool)), SLOT( slotIncreaseWidth() ));
+ connect(increaseWidthAction, SIGNAL(triggered(bool)), SLOT(slotIncreaseWidth()));
actionCollection()->setDefaultShortcut(increaseWidthAction, QKeySequence(Qt::Key_Right + Qt::SHIFT));

decreaseWidthAction = new QAction(i18n("Decrease Width"), this);
actionCollection()->addAction("decreasewidth", decreaseWidthAction );
- connect(decreaseWidthAction, SIGNAL(triggered(bool)), SLOT( slotDecreaseWidth() ));
+ connect(decreaseWidthAction, SIGNAL(triggered(bool)), SLOT(slotDecreaseWidth()));
actionCollection()->setDefaultShortcut(decreaseWidthAction, QKeySequence(Qt::Key_Left + Qt::SHIFT));

increaseHeightAction = new QAction(i18n("Increase Height"), this);
actionCollection()->addAction("increaseheight", increaseHeightAction );
- connect(increaseHeightAction, SIGNAL(triggered(bool)), SLOT( slotIncreaseHeight() ));
+ connect(increaseHeightAction, SIGNAL(triggered(bool)), SLOT(slotIncreaseHeight()));
actionCollection()->setDefaultShortcut(increaseHeightAction, QKeySequence(Qt::Key_Up + Qt::SHIFT));

decreaseHeightAction = new QAction(i18n("Decrease Height"), this);
actionCollection()->addAction("decreaseheight", decreaseHeightAction );
- connect(decreaseHeightAction, SIGNAL(triggered(bool)), SLOT( slotDecreaseHeight() ));
+ connect(decreaseHeightAction, SIGNAL(triggered(bool)), SLOT(slotDecreaseHeight()));
actionCollection()->setDefaultShortcut(decreaseHeightAction, QKeySequence(Qt::Key_Down + Qt::SHIFT));

toFrontAction = new QAction(i18n("Bring to Front"), this);
actionCollection()->addAction("tofront", toFrontAction );
- connect(toFrontAction, SIGNAL(triggered(bool)), SLOT( slotToFront() ));
+ connect(toFrontAction, SIGNAL(triggered(bool)), SLOT(slotToFront()));

toBackAction = new QAction(i18n("Send to Back"), this);
actionCollection()->addAction("toback", toBackAction );
- connect(toBackAction, SIGNAL(triggered(bool)), SLOT( slotToBack() ));
+ connect(toBackAction, SIGNAL(triggered(bool)), SLOT(slotToBack()));

forwardOneAction = new QAction(QIcon::fromTheme(QStringLiteral("raise")), i18n("Bring Forward One"), this);
actionCollection()->addAction("forwardone", forwardOneAction );
- connect(forwardOneAction, SIGNAL(triggered(bool) ), SLOT( slotForwardOne() ));
+ connect(forwardOneAction, SIGNAL(triggered(bool)), SLOT(slotForwardOne()));
backOneAction = new QAction(QIcon::fromTheme(QStringLiteral("lower")), i18n("Send Back One"), this);
actionCollection()->addAction("backone", backOneAction );
- connect(backOneAction, SIGNAL(triggered(bool) ), SLOT( slotBackOne() ));
+ connect(backOneAction, SIGNAL(triggered(bool)), SLOT(slotBackOne()));

areaListView->upBtn->addAction(forwardOneAction);
areaListView->downBtn->addAction(backOneAction);
@@ -720,7 +721,7 @@ void KImageMapEditor::setupActions()

action = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Configure KImageMapEditor..."), this);
actionCollection()->addAction("configure_kimagemapeditor", action );
- connect(action, SIGNAL(triggered(bool) ), SLOT(slotShowPreferences()));
+ connect(action, SIGNAL(triggered(bool)), SLOT(slotShowPreferences()));

qCDebug(KIMAGEMAPEDITOR_LOG) << "KImageMapEditor: 1";

diff --git a/kimearea.cpp b/kimearea.cpp
index 67eafd2..7f4e46d 100644
--- a/kimearea.cpp
+++ b/kimearea.cpp
@@ -15,20 +15,20 @@
* *
***************************************************************************/

-#include <QPolygon>
+#include "kimearea.h"

-#include <qbitmap.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qpen.h>
-#include <qbrush.h>
-#include <qpalette.h>
-#include <qcolor.h>
+#include <QPolygon>
+#include <QBitmap>
+#include <QPainter>
+#include <QPixmap>
+#include <QImage>
+#include <QPen>
+#include <QBrush>
+#include <QPalette>
+#include <QColor>

#include "kimagemapeditor_debug.h"

-#include "kimearea.h"
#include "kimecommon.h"


diff --git a/kimearea.h b/kimearea.h
index ff25182..e9e6b85 100644
--- a/kimearea.h
+++ b/kimearea.h
@@ -344,7 +344,7 @@ public :
bool isEmpty() const;

/**
- * Overiden Methods of the Area class
+ * Overridden Methods of the Area class
*/
virtual bool contains(const QPoint & p) const;

diff --git a/kimecommands.cpp b/kimecommands.cpp
index d0d0851..11da286 100644
--- a/kimecommands.cpp
+++ b/kimecommands.cpp
@@ -14,12 +14,12 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include <qstring.h>
+#include "kimecommands.h"
+
+#include <QString>
#include "kimagemapeditor_debug.h"
-#include <klocalizedstring.h>
+#include <KLocalizedString>

-#include "kimagemapeditor.h"
-#include "kimecommands.h"
#include "drawzone.h"

CutCommand::CutCommand(KImageMapEditor * document, const AreaSelection & a)
diff --git a/kimecommands.h b/kimecommands.h
index 9ba0c38..bd9bac6 100644
--- a/kimecommands.h
+++ b/kimecommands.h
@@ -18,6 +18,7 @@
#ifndef KIMECOMMANDS_H
#define KIMECOMMANDS_H

+#include "kimagemapeditor.h"

#include <qundostack.h>

diff --git a/kimedialogs.cpp b/kimedialogs.cpp
index bf25916..ab498ec 100644
--- a/kimedialogs.cpp
+++ b/kimedialogs.cpp
@@ -15,21 +15,24 @@
* *
***************************************************************************/

+// LOCAL
+#include "kimedialogs.h"
+
// Qt
-#include <qcheckbox.h>
+#include <QCheckBox>
#include <QDialogButtonBox>
#include <QFileDialog>
#include <QFormLayout>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qlineedit.h>
+#include <QLayout>
+#include <QLabel>
+#include <QLineEdit>
#include <QListWidget>
#include <QPushButton>
#include <QTableWidget>
#include <QHeaderView>
-#include <qspinbox.h>
-#include <qtabwidget.h>
-#include <qimage.h>
+#include <QSpinBox>
+#include <QTableWidget>
+#include <QImage>
#include <QPixmap>
#include <QLinkedList>
#include <QFrame>
@@ -46,9 +49,6 @@
#include <KSharedConfig>
#include <KConfigGroup>

-// LOCAL
-#include "kimedialogs.h"
-
CoordsEdit::CoordsEdit(QWidget *parent, Area* a)
: QWidget(parent)
{
@@ -77,28 +77,28 @@ RectCoordsEdit::RectCoordsEdit(QWidget *parent, Area* a)
topXSpin->setMaximum(INT_MAX);
topXSpin->setMinimum(0);
topXSpin->setValue(a->rect().left());
- connect( topXSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( topXSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));
layout->addRow(i18n("Top &X:"), topXSpin);

topYSpin = new QSpinBox(this);
topYSpin->setMaximum(INT_MAX);
topYSpin->setMinimum(0);
topYSpin->setValue(a->rect().top());
- connect( topYSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( topYSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));
layout->addRow(i18n("Top &Y:"), topYSpin);

widthSpin = new QSpinBox(this);
widthSpin->setMaximum(INT_MAX);
widthSpin->setMinimum(0);
widthSpin->setValue(a->rect().width());
- connect( widthSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( widthSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));
layout->addRow(i18n("&Width:"), widthSpin);

heightSpin = new QSpinBox(this);
heightSpin->setMaximum(INT_MAX);
heightSpin->setMinimum(0);
heightSpin->setValue(a->rect().height());
- connect( heightSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( heightSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));
layout->addRow(i18n("Hei&ght:"), heightSpin);
}

@@ -120,21 +120,21 @@ CircleCoordsEdit::CircleCoordsEdit(QWidget *parent, Area* a)
centerXSpin->setMaximum(INT_MAX);
centerXSpin->setMinimum(0);
centerXSpin->setValue(a->rect().center().x());
- connect( centerXSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( centerXSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));
layout->addRow(i18n("Center &X:"), centerXSpin);

centerYSpin = new QSpinBox(this);
centerYSpin->setMaximum(INT_MAX);
centerYSpin->setMinimum(0);
centerYSpin->setValue(a->rect().center().y());
- connect( centerYSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( centerYSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));
layout->addRow(i18n("Center &Y:"), centerYSpin);

radiusSpin = new QSpinBox(this);
radiusSpin->setMaximum(INT_MAX);
radiusSpin->setMinimum(0);
radiusSpin->setValue(a->rect().width()/2);
- connect( radiusSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( radiusSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));
layout->addRow(i18n("&Radius:"), radiusSpin);

}
@@ -245,14 +245,14 @@ SelectionCoordsEdit::SelectionCoordsEdit(QWidget *parent, Area* a)
topXSpin->setMaximum(INT_MAX);
topXSpin->setMinimum(0);
topXSpin->setValue(a->rect().left());
- connect( topXSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( topXSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));
layout->addRow(i18n("Top &X"), topXSpin);

topYSpin = new QSpinBox(this);
topYSpin->setMaximum(INT_MAX);
topYSpin->setMinimum(0);
topYSpin->setValue(a->rect().top());
- connect( topYSpin, SIGNAL(valueChanged(const QString &)), this, SLOT(slotTriggerUpdate()));
+ connect( topYSpin, SIGNAL(valueChanged(QString)), this, SLOT(slotTriggerUpdate()));

layout->addRow(i18n("Top &Y"), topYSpin);
}
@@ -625,7 +625,7 @@ HTMLPreviewDialog::HTMLPreviewDialog(QWidget* parent, const QString & htmlCode)
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
mainLayout->addWidget(buttonBox);

- connect( htmlPart, SIGNAL( onURL(const QString&)), lbl, SLOT( setText(const QString&)));
+ connect( htmlPart, SIGNAL(onURL(QString)), lbl, SLOT(setText(QString)));

resize(800,600);
}
diff --git a/kimeshell.cpp b/kimeshell.cpp
index fa253b6..50015d6 100644
--- a/kimeshell.cpp
+++ b/kimeshell.cpp
@@ -15,6 +15,7 @@
* *
***************************************************************************/

+#include "kimeshell.h"

#include <iostream>

@@ -39,7 +40,6 @@

#include "drawzone.h"
#include "kimagemapeditor.h" // the KPart
-#include "kimeshell.h"
#include "kimeshell.moc"

KimeShell::KimeShell(const char * )
@@ -83,11 +83,11 @@ KimeShell::KimeShell(const char * )
if (!initialGeometrySet())
resize( QSize(725, 525).expandedTo(minimumSizeHint()));

- connect( m_part, SIGNAL(setStatusBarText(const QString &)),
- this, SLOT(slotSetStatusBarText ( const QString & )));
+ connect( m_part, SIGNAL(setStatusBarText(QString)),
+ this, SLOT(slotSetStatusBarText(QString)));

- connect( m_part, SIGNAL(setWindowCaption(const QString &)),
- this, SLOT(setWindowTitle( const QString &)));
+ connect( m_part, SIGNAL(setWindowCaption(QString)),
+ this, SLOT(setWindowTitle(QString)));

setAutoSaveSettings( "General Options" );
qCDebug(KIMAGEMAPEDITOR_LOG) << "KimeShell starting 4";
diff --git a/mapslistview.cpp b/mapslistview.cpp
index d78eb1d..a70701b 100644
--- a/mapslistview.cpp
+++ b/mapslistview.cpp
@@ -14,6 +14,9 @@
* (at your option) any later version. *
* *
***************************************************************************/
+// local
+#include "mapslistview.h"
+
#include <QListWidget>
#include <QVBoxLayout>

@@ -21,9 +24,6 @@
#include <klocalizedstring.h>
#include "kimagemapeditor_debug.h"

-// locale
-#include "mapslistview.h"
-

MapsListView::MapsListView(QWidget *parent)
: QWidget(parent) {
@@ -42,11 +42,11 @@ MapsListView::MapsListView(QWidget *parent)
_listView->setSortingEnabled(false);
mainLayout->addWidget(_listView);

- connect( _listView, SIGNAL( itemSelectionChanged()),
- this, SLOT( slotSelectionChanged()));
+ connect( _listView, SIGNAL(itemSelectionChanged()),
+ this, SLOT(slotSelectionChanged()));

- connect( _listView, SIGNAL( itemChanged( QTreeWidgetItem*,int)),
- this, SLOT( slotItemRenamed(QTreeWidgetItem*)));
+ connect( _listView, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
+ this, SLOT(slotItemRenamed(QTreeWidgetItem*)));
}

[Yuri Chornoivan]

Git commit cdc547c78f4a0c789460b4a5694d9f23a814b33a by Yuri Chornoivan.
Committed on 21/09/2018 at 17:51.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +8 -7 audiocd.cpp
M +3 -3 plugins/audiocdencoder.h
M +2 -2 plugins/flac/encoderflac.cpp
M +1 -1 plugins/flac/encoderflac.h
M +2 -2 plugins/lame/encoderlame.cpp
M +2 -2 plugins/lame/encoderlame.h
M +3 -3 plugins/vorbis/encodervorbis.cpp
M +2 -2 plugins/vorbis/encodervorbis.h
M +2 -2 plugins/wav/encodercda.cpp
M +1 -1 plugins/wav/encodercda.h

https://commits.kde.org/audiocd-kio/cdc547c78f4a0c789460b4a5694d9f23a814b33a

diff --git a/audiocd.cpp b/audiocd.cpp
index badc9d4..c9c1352 100644
--- a/audiocd.cpp
+++ b/audiocd.cpp
@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

+#include "audiocd.h"
#include <config-audiocd.h>

#include <kdemacros.h>
@@ -36,7 +37,6 @@ extern "C"
KDE_EXPORT int kdemain(int argc, char ** argv);
}

-#include "audiocd.h"
#include "plugins/audiocdencoder.h"

#include <sys/stat.h>
@@ -47,7 +47,8 @@ extern "C"

#include <kmacroexpander.h>
#include <QFile>
-#include <qfileinfo.h>
+#include <QFileInfo>
+#include <QGlobalStatic>
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -71,7 +72,7 @@ int kdemain(int argc, char ** argv)
// KApplication uses libkcddb which needs a valid kapp pointer
// GUIenabled must be true as libkcddb sometimes wants to communicate
// with the user
- putenv(strdup("SESSION_MANAGER="));
+ qunsetenv("SESSION_MANAGER");
//KApplication::disableAutoDcopRegistration();
KCmdLineArgs::init(argc, argv, "kio_audiocd", 0, KLocalizedString(), 0, KLocalizedString());

@@ -406,12 +407,12 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const QUrl & url)
break;
}
// Find where the numbers end
- for (end = start; end < name.length(); end++)
+ for (end = start; end < name.length(); ++end)
if (!name[end].isDigit())
break;
if (start < name.length()){
bool ok;
- // The external representation counts from 1 so subtrac 1.
+ // The external representation counts from 1 so subtract 1.
d->req_track = name.mid(start-1, end - start+2).toInt(&ok) - 1;
if (!ok)
d->req_track = -1;
@@ -895,7 +896,7 @@ void AudioCDProtocol::paranoiaRead(
while (currentSector <= lastSector)
{
// TODO make the 5 configurable? The default in the lib is 20 fyi
- int16_t * buf = paranoia_read_limited(paranoia, paranoiaCallback, 5);
+ qint16 * buf = paranoia_read_limited(paranoia, paranoiaCallback, 5);
if( warned == 0 && paranoia_read_limited_error >= 5 && d->reportErrors ){
warning(i18n("AudioCD: Disk damage detected on this track, risk of data corruption."));
warned = 1;
@@ -1162,7 +1163,7 @@ void AudioCDProtocol::generateTemplateTitles()
* Based upon the cdparanoia ripping application
* Only output BAD stuff
* The higher the paranoia_read_limited_error the worse the problem is
- * FYI: PARANOIA_CB_READ & PARANOIA_CB_VERIFY happen continusly when ripping
+ * FYI: PARANOIA_CB_READ & PARANOIA_CB_VERIFY happen continuously when ripping
*/
void paranoiaCallback(long, int function)
{
diff --git a/plugins/audiocdencoder.h b/plugins/audiocdencoder.h
index 9e0c5b1..361901e 100644
--- a/plugins/audiocdencoder.h
+++ b/plugins/audiocdencoder.h
@@ -23,7 +23,7 @@

#include <sys/types.h>
#include <kio/slavebase.h>
-#include <QtCore/QList>
+#include <QList>

#include <KCddb/Cdinfo>

@@ -102,12 +102,12 @@ public:

/**
* Passes a little bit of cd data to be encoded
- * This function is most likly called many many times.
+ * This function is most likely called many many times.
* @param buf pointer to the audio that has been read in so far
* @param frames the number of frames of audio that are in buf
* @return size of the data that was created by this function, -1 on error.
*/
- virtual long read(int16_t * buf, int frames) = 0;
+ virtual long read(qint16 * buf, int frames) = 0;

/**
* Perform any final file creation/padding that is necessary
diff --git a/plugins/flac/encoderflac.cpp b/plugins/flac/encoderflac.cpp
index 148f209..5e5b61b 100644
--- a/plugins/flac/encoderflac.cpp
+++ b/plugins/flac/encoderflac.cpp
@@ -155,7 +155,7 @@ long EncoderFLAC::readInit(long size) {
#endif

#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
- // The options match approximely those of flac compression-level-5
+ // The options match approximately those of flac compression-level-5
FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
FLAC__stream_encoder_set_max_lpc_order(d->encoder, 8); // flac -l8
FLAC__stream_encoder_set_min_residual_partition_order(d->encoder, 3);
@@ -176,7 +176,7 @@ long EncoderFLAC::readInit(long size) {
return d->data;
}

-long EncoderFLAC::read(int16_t * buf, int frames)
+long EncoderFLAC::read(qint16 * buf, int frames)
{
unsigned long olddata = d->data;
FLAC__int32 *buffer = new FLAC__int32[frames*2];
diff --git a/plugins/flac/encoderflac.h b/plugins/flac/encoderflac.h
index 1bef16c..2a434be 100644
--- a/plugins/flac/encoderflac.h
+++ b/plugins/flac/encoderflac.h
@@ -53,7 +53,7 @@ public:
virtual const char * mimeType() const { return "audio/x-flac"; }
virtual void fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment );
virtual long readInit(long size);
- virtual long read(int16_t * buf, int frames);
+ virtual long read(qint16 * buf, int frames);
virtual long readCleanup();
virtual QWidget* getConfigureWidget(KConfigSkeleton** manager) const;

diff --git a/plugins/lame/encoderlame.cpp b/plugins/lame/encoderlame.cpp
index 7b93bc9..87f925f 100644
--- a/plugins/lame/encoderlame.cpp
+++ b/plugins/lame/encoderlame.cpp
@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#include "config-audiocd.h"
+#include <config-audiocd.h>

#include "encoderlame.h"
#include "audiocd_lame_encoder.h"
@@ -288,7 +288,7 @@ void EncoderLame::receivedStdout(){
// d->waitingForWrite = false;
// }

-long EncoderLame::read(int16_t *buf, int frames){
+long EncoderLame::read(qint16 *buf, int frames){
if(!d->currentEncodeProcess)
return 0;
if (d->processHasExited)
diff --git a/plugins/lame/encoderlame.h b/plugins/lame/encoderlame.h
index 06784af..4fd5e50 100644
--- a/plugins/lame/encoderlame.h
+++ b/plugins/lame/encoderlame.h
@@ -42,7 +42,7 @@ class EncoderLame : public QObject, public AudioCDEncoder {
Q_OBJECT

public:
- EncoderLame(KIO::SlaveBase *slave);
+ explicit EncoderLame(KIO::SlaveBase *slave);
~EncoderLame();

virtual QString type() const { return "MP3"; }
@@ -53,7 +53,7 @@ public:
virtual const char * mimeType() const { return "audio/x-mp3"; }
virtual void fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment );
virtual long readInit(long size);
- virtual long read(int16_t * buf, int frames);
+ virtual long read(qint16 * buf, int frames);
virtual long readCleanup();
virtual QString lastErrorMessage() const;

diff --git a/plugins/vorbis/encodervorbis.cpp b/plugins/vorbis/encodervorbis.cpp
index 5e02eb9..7f9466f 100644
--- a/plugins/vorbis/encodervorbis.cpp
+++ b/plugins/vorbis/encodervorbis.cpp
@@ -214,8 +214,8 @@ long EncoderVorbis::readInit(long /*size*/){
vorbis_analysis_init(&d->vd,&d->vi);
vorbis_block_init(&d->vd,&d->vb);

- srand(time(NULL));
- ogg_stream_init(&d->os,rand());
+ qsrand(time(NULL));
+ ogg_stream_init(&d->os,qrand());

vorbis_analysis_headerout(&d->vd,&d->vc,&header,&header_comm,&header_code);

@@ -241,7 +241,7 @@ long EncoderVorbis::readInit(long /*size*/){
return 0;
}

-long EncoderVorbis::read(int16_t * buf, int frames){
+long EncoderVorbis::read(qint16 * buf, int frames){
int i;
float **buffer=vorbis_analysis_buffer(&d->vd,frames);

diff --git a/plugins/vorbis/encodervorbis.h b/plugins/vorbis/encodervorbis.h
index 52389dd..069824b 100644
--- a/plugins/vorbis/encodervorbis.h
+++ b/plugins/vorbis/encodervorbis.h
@@ -45,7 +45,7 @@ public:
class EncoderVorbis : public AudioCDEncoder {

public:
- EncoderVorbis(KIO::SlaveBase *slave);
+ explicit EncoderVorbis(KIO::SlaveBase *slave);
~EncoderVorbis();

virtual QString type() const { return QLatin1String( "Ogg Vorbis" ); }
@@ -56,7 +56,7 @@ public:
virtual const char * mimeType() const;
virtual void fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment );
virtual long readInit(long size);
- virtual long read(int16_t * buf, int frames);
+ virtual long read(qint16 * buf, int frames);
virtual long readCleanup();
virtual QWidget* getConfigureWidget(KConfigSkeleton** manager) const;

diff --git a/plugins/wav/encodercda.cpp b/plugins/wav/encodercda.cpp
index de61229..f4436eb 100644
--- a/plugins/wav/encodercda.cpp
+++ b/plugins/wav/encodercda.cpp
@@ -47,12 +47,12 @@ extern "C"
#include "cdda_interface.hpp"
}

-inline int16_t swap16 (int16_t i)
+inline qint16 swap16 (qint16 i)
{
return (((i >> 8) & 0xFF) | ((i << 8) & 0xFF00));
}

-long EncoderCda::read(int16_t * buf, int frames){
+long EncoderCda::read(qint16 * buf, int frames){
QByteArray output;
int16_t i16 = 1;
/* WAV is defined to be little endian, so we need to swap it
diff --git a/plugins/wav/encodercda.h b/plugins/wav/encodercda.h
index 9f0c911..fff556f 100644
--- a/plugins/wav/encodercda.h
+++ b/plugins/wav/encodercda.h
@@ -48,7 +48,7 @@ public:
virtual const char * fileType() const { return "cda"; }
virtual void fillSongInfo( KCDDB::CDInfo, int, const QString &){}
virtual long readInit(long){ return 0; }
- virtual long read(int16_t * buf, int frames);
+ virtual long read(qint16 * buf, int frames);
virtual long readCleanup(){ return 0; }

private:

[Yuri Chornoivan]

Git commit 56358be70aa5bbf655406de0e6ce721250870a47 by Yuri Chornoivan.
Committed on 23/09/2018 at 16:46.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 advancedsearchdialog.h
M +3 -3 cache.h
M +1 -1 collectionlist.h
M +1 -1 coverdialog.h
M +1 -1 coverinfo.h
M +2 -2 covermanager.h
M +2 -2 coverproxy.h
M +2 -2 deletedialog.h
M +1 -1 directorylist.h
M +2 -2 exampleoptions.h
M +2 -2 filerenamer.h
M +1 -1 filerenamerconfigdlg.h
M +1 -1 historyplaylist.h
M +1 -1 juk.h
M +5 -5 ktrm.h
M +2 -1 lyricswidget.cpp
M +1 -1 main.cpp
M +1 -1 mediafiles.cpp
M +2 -2 mpris2/mediaplayer2player.h
M +1 -1 musicbrainzquery.h
M +2 -2 nowplaying.h
M +1 -1 playlist.cpp
M +2 -2 playlist.h
M +2 -2 playlistitem.h
M +2 -2 playlistsearch.h
M +3 -3 scrobbleconfigdlg.h
M +1 -1 slider.h
M +1 -1 stringhash.h
M +1 -1 tag.cpp
M +1 -1 tageditor.h
M +2 -2 tagguesser.h
M +1 -1 tagrenameroptions.h
M +1 -1 tracksequencemanager.cpp
M +3 -3 viewmode.h
M +1 -1 volumepopupbutton.h
M +1 -1 webimagefetcher.h

https://commits.kde.org/juk/56358be70aa5bbf655406de0e6ce721250870a47

diff --git a/advancedsearchdialog.h b/advancedsearchdialog.h
index 3ff4ff0..86cf40b 100644
--- a/advancedsearchdialog.h
+++ b/advancedsearchdialog.h
@@ -33,7 +33,7 @@ class AdvancedSearchDialog : public QDialog
Q_OBJECT

public:
- AdvancedSearchDialog(
+ explicit AdvancedSearchDialog(
const QString& defaultName,
const PlaylistSearch& defaultSearch = PlaylistSearch(),
QWidget* parent = nullptr);
diff --git a/cache.h b/cache.h
index d3e35c2..afc26ac 100644
--- a/cache.h
+++ b/cache.h
@@ -18,9 +18,9 @@
#ifndef JUK_CACHE_H
#define JUK_CACHE_H

-#include <QtCore/QDataStream>
-#include <QtCore/QFile>
-#include <QtCore/QBuffer>
+#include <QDataStream>
+#include <QFile>
+#include <QBuffer>

class Playlist;
class PlaylistCollection;
diff --git a/collectionlist.h b/collectionlist.h
index d1bccf2..3c3e953 100644
--- a/collectionlist.h
+++ b/collectionlist.h
@@ -52,7 +52,7 @@ typedef QVector<TagCountDict *> TagCountDicts;
* It is being implemented as a "semi-singleton" because I need universal access
* to just one instance. However, because the collection needs initialization
* parameters (that will not always be available when an instance is needed).
- * Hence there will be the familiar singleton "instance()" method allong with an
+ * Hence there will be the familiar singleton "instance()" method along with an
* "initialize()" method.
*/

diff --git a/coverdialog.h b/coverdialog.h
index 1d49366..2daccbb 100644
--- a/coverdialog.h
+++ b/coverdialog.h
@@ -28,7 +28,7 @@ class CoverDialog : public QWidget, public Ui::CoverDialogBase
{
Q_OBJECT
public:
- CoverDialog(QWidget *parent);
+ explicit CoverDialog(QWidget *parent);
~CoverDialog();

virtual void show();
diff --git a/coverinfo.h b/coverinfo.h
index 91fce54..bf3b2e8 100644
--- a/coverinfo.h
+++ b/coverinfo.h
@@ -32,7 +32,7 @@ class CoverInfo
public:
enum CoverSize { FullSize, Thumbnail };

- CoverInfo(const FileHandle &file);
+ explicit CoverInfo(const FileHandle &file);

bool hasCover() const;

diff --git a/covermanager.h b/covermanager.h
index 281ece8..cedecff 100644
--- a/covermanager.h
+++ b/covermanager.h
@@ -44,7 +44,7 @@ class CoverSaveHelper : public QObject
Q_OBJECT

public:
- CoverSaveHelper(QObject *parent);
+ explicit CoverSaveHelper(QObject *parent);
void saveCovers();

private slots:
@@ -94,7 +94,7 @@ class CoverDrag : public QMimeData
Q_OBJECT

public:
- CoverDrag(coverKey id);
+ explicit CoverDrag(coverKey id);

static const char* mimetype();

diff --git a/coverproxy.h b/coverproxy.h
index 6f63dd3..0bcda5b 100644
--- a/coverproxy.h
+++ b/coverproxy.h
@@ -17,7 +17,7 @@
#ifndef JUK_COVERPROXY_H
#define JUK_COVERPROXY_H

-#include <QtCore/QObject>
+#include <QObject>

class KJob;

@@ -30,7 +30,7 @@ class CoverProxy : public QObject
Q_OBJECT

public:
- CoverProxy(QObject *parent = 0);
+ explicit CoverProxy(QObject *parent = 0);

private slots:
void handleResult(KJob *);
diff --git a/deletedialog.h b/deletedialog.h
index e503009..dfccacb 100644
--- a/deletedialog.h
+++ b/deletedialog.h
@@ -36,7 +36,7 @@ class DeleteWidget : public QWidget
Q_OBJECT

public:
- DeleteWidget(QWidget *parent);
+ explicit DeleteWidget(QWidget *parent);

void setFiles(const QStringList &files);
bool shouldDelete() const;
@@ -59,7 +59,7 @@ class DeleteDialog : public QDialog
Q_OBJECT

public:
- DeleteDialog(QWidget* parent);
+ explicit DeleteDialog(QWidget* parent);

bool confirmDeleteList(const QStringList &condemnedFiles);
void setFiles(const QStringList &files);
diff --git a/directorylist.h b/directorylist.h
index 5af745e..a0c4b8b 100644
--- a/directorylist.h
+++ b/directorylist.h
@@ -48,7 +48,7 @@ public:
bool addPlaylists;
};

- DirectoryList(
+ explicit DirectoryList(
const QStringList &directories,
const QStringList &excludeDirectories,
bool importPlaylists,
diff --git a/exampleoptions.h b/exampleoptions.h
index d211306..bed8df2 100644
--- a/exampleoptions.h
+++ b/exampleoptions.h
@@ -28,7 +28,7 @@ class ExampleOptions : public QWidget, public Ui::ExampleOptionsBase
{
Q_OBJECT
public:
- ExampleOptions(QWidget *parent);
+ explicit ExampleOptions(QWidget *parent);

protected slots:
void exampleSelectionChanged();
@@ -44,7 +44,7 @@ class ExampleOptionsDialog : public QDialog
{
Q_OBJECT
public:
- ExampleOptionsDialog(QWidget *parent);
+ explicit ExampleOptionsDialog(QWidget *parent);

const ExampleOptions *widget() const { return m_options; }

diff --git a/filerenamer.h b/filerenamer.h
index 36d2342..1de538f 100644
--- a/filerenamer.h
+++ b/filerenamer.h
@@ -145,7 +145,7 @@ class FileRenamerWidget : public QWidget, public CategoryReaderInterface
Q_OBJECT

public:
- FileRenamerWidget(QWidget *parent);
+ explicit FileRenamerWidget(QWidget *parent);
~FileRenamerWidget();

/// Maximum number of total categories the widget will allow.
@@ -452,7 +452,7 @@ private slots:
virtual void exampleDialogShown();

/**
- * This slot should be called whever the example input dialog is hidden.
+ * This slot should be called whenever the example input dialog is hidden.
*/
virtual void exampleDialogHidden();

diff --git a/filerenamerconfigdlg.h b/filerenamerconfigdlg.h
index 85bd078..def3199 100644
--- a/filerenamerconfigdlg.h
+++ b/filerenamerconfigdlg.h
@@ -26,7 +26,7 @@ class FileRenamerConfigDlg : public QDialog
{
Q_OBJECT
public:
- FileRenamerConfigDlg(QWidget *parent);
+ explicit FileRenamerConfigDlg(QWidget *parent);

protected slots:
virtual void accept();
diff --git a/historyplaylist.h b/historyplaylist.h
index 63d7597..bfed5b2 100644
--- a/historyplaylist.h
+++ b/historyplaylist.h
@@ -39,7 +39,7 @@ class HistoryPlaylist : public Playlist
Q_OBJECT

public:
- HistoryPlaylist(PlaylistCollection *collection);
+ explicit HistoryPlaylist(PlaylistCollection *collection);
virtual ~HistoryPlaylist();

virtual HistoryPlaylistItem *createItem(const FileHandle &file, QTreeWidgetItem *after = nullptr);
diff --git a/juk.h b/juk.h
index 9de30a1..2b18899 100644
--- a/juk.h
+++ b/juk.h
@@ -37,7 +37,7 @@ class JuK : public KXmlGuiWindow
Q_OBJECT

public:
- JuK(const QStringList &filesToOpen, QWidget* parent = 0);
+ explicit JuK(const QStringList &filesToOpen, QWidget* parent = 0);
virtual ~JuK();

static JuK* JuKInstance();
diff --git a/ktrm.h b/ktrm.h
index 9e0b441..53afc3f 100644
--- a/ktrm.h
+++ b/ktrm.h
@@ -142,14 +142,14 @@ public:
/**
* This method is called when the puid was already generated. It will then do
* the lookup with MusicBrainz's server. This may be reimplemented to provide
- * specific behavion for the lookup.
+ * specific behavior for the lookup.
*/
virtual void puidGenerated();

/**
* This method is called if the track was recognized by the TRM server.
* results() will return just one value. This may be reimplemented to
- * provide specific behavion in the case of the track being recognized.
+ * provide specific behavior in the case of the track being recognized.
*
* \note The base class call should happen at the beginning of the subclass
* reimplementation; it populates the values of results().
@@ -159,7 +159,7 @@ public:
/**
* This method is called if the track was not recognized by the TRM server.
* results() will return an empty set. This may be reimplemented to provide
- * specific behavion in the case of the track not being recognized.
+ * specific behavior in the case of the track not being recognized.
*/
virtual void unrecognized();

@@ -167,7 +167,7 @@ public:
* This method is called if there are multiple potential matches for the TRM
* value. results() will return a list of the potential matches, sorted by
* liklihood. This may be reimplemented to provide
- * specific behavion in the case of the track not being recognized.
+ * specific behavior in the case of the track not being recognized.
*
* \note The base class call should happen at the beginning of the subclass
* reimplementation; it populates the values of results().
@@ -177,7 +177,7 @@ public:
/**
* This method is called if the track was not recognized by the TRM server.
* results() will return an empty set. This may be reimplemented to provide
- * specific behavion in the case of the track not being recognized.
+ * specific behavior in the case of the track not being recognized.
*/
virtual void error();

diff --git a/lyricswidget.cpp b/lyricswidget.cpp
index dbda32c..1b77816 100644
--- a/lyricswidget.cpp
+++ b/lyricswidget.cpp
@@ -14,6 +14,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#include "lyricswidget.h"
+
#include <QDomDocument>
#include <QNetworkAccessManager>
#include <QNetworkReply>
@@ -27,7 +29,6 @@
#include <KConfigGroup>
#include <KSharedConfig>

-#include "lyricswidget.h"
#include "tag.h"
#include "actioncollection.h"
#include "juk_debug.h"
diff --git a/main.cpp b/main.cpp
index 18e2669..5902e8f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -29,7 +29,7 @@
#include <QApplication>

#include "juk.h"
-#include "config-juk.h"
+#include <config-juk.h>

static const char description[] = I18N_NOOP("Jukebox and music manager by the KDE community");
static const char scott[] = I18N_NOOP("Author, chief dork and keeper of the funk");
diff --git a/mediafiles.cpp b/mediafiles.cpp
index cf059ff..861896e 100644
--- a/mediafiles.cpp
+++ b/mediafiles.cpp
@@ -38,7 +38,7 @@
#include <oggflacfile.h>
#include <mpcfile.h>

-#include "config-juk.h"
+#include <config-juk.h>
#if TAGLIB_HAS_OPUSFILE
# include <opusfile.h>
#endif
diff --git a/mpris2/mediaplayer2player.h b/mpris2/mediaplayer2player.h
index 3b6fb29..2f9cc6d 100644
--- a/mpris2/mediaplayer2player.h
+++ b/mpris2/mediaplayer2player.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
***********************************************************************/

-#ifndef JUK_MEDIAPLAYRER2PLAYER_H
-#define JUK_MEDIAPLAYRER2PLAYER_H
+#ifndef JUK_MEDIAPLAYER2PLAYER_H
+#define JUK_MEDIAPLAYER2PLAYER_H

#include <QDBusAbstractAdaptor>
#include <QDBusObjectPath>
diff --git a/musicbrainzquery.h b/musicbrainzquery.h
index 9377732..589489b 100644
--- a/musicbrainzquery.h
+++ b/musicbrainzquery.h
@@ -27,7 +27,7 @@
class MusicBrainzLookup : public KTRMLookup
{
public:
- MusicBrainzLookup(const FileHandle &file);
+ explicit MusicBrainzLookup(const FileHandle &file);
virtual void recognized();
virtual void unrecognized();
virtual void collision();
diff --git a/nowplaying.h b/nowplaying.h
index 4cd4eea..5480edb 100644
--- a/nowplaying.h
+++ b/nowplaying.h
@@ -98,7 +98,7 @@ private:
class CoverItem : public QLabel, public NowPlayingItem
{
public:
- CoverItem(NowPlaying *parent);
+ explicit CoverItem(NowPlaying *parent);
virtual void update(const FileHandle &file);
virtual void mouseReleaseEvent(QMouseEvent *event);

@@ -125,7 +125,7 @@ class TrackItem : public QWidget, public NowPlayingItem
Q_OBJECT

public:
- TrackItem(NowPlaying *parent);
+ explicit TrackItem(NowPlaying *parent);
virtual void update(const FileHandle &file);

private slots:
diff --git a/playlist.cpp b/playlist.cpp
index 0943e8d..7cc3418 100644
--- a/playlist.cpp
+++ b/playlist.cpp
@@ -1823,7 +1823,7 @@ void Playlist::slotUpdateColumnWidths()
int usedWidth = 0;

// Now set the actual column widths. If the weighted widths are all greater
- // than the minimum widths, just use those, otherwise use the "reajusted
+ // than the minimum widths, just use those, otherwise use the "readjusted
// weighted width".

foreach(int column, visibleColumns) {
diff --git a/playlist.h b/playlist.h
index 60e6c4f..88a7d4c 100644
--- a/playlist.h
+++ b/playlist.h
@@ -206,7 +206,7 @@ public:
/**
* Hides column \a c. If \a updateSearch is true then a signal that the
* visible columns have changed will be emitted and things like the search
- * will be udated.
+ * will be updated.
*/
void hideColumn(int c, bool updateSearch = true);

@@ -265,7 +265,7 @@ public:
PlaylistSearch search() const { return m_search; }

/**
- * Set the search associtated with this playlist.
+ * Set the search associated with this playlist.
*/
void setSearch(const PlaylistSearch &s);

diff --git a/playlistitem.h b/playlistitem.h
index ca6d8ff..6076420 100644
--- a/playlistitem.h
+++ b/playlistitem.h
@@ -151,7 +151,7 @@ public:
PlaylistItem *itemAbove() { return static_cast<PlaylistItem *>(treeWidget()->itemAbove(this)); }

/**
- * Returns a reference to the list of the currnetly playing items, with the
+ * Returns a reference to the list of the currently playing items, with the
* first being the "master" item (i.e. the item from which the next track is
* chosen).
*/
@@ -166,7 +166,7 @@ protected:
PlaylistItem(CollectionListItem *item, Playlist *parent, QTreeWidgetItem *after);

/**
- * This is the constructor that shold be used by subclasses.
+ * This is the constructor that should be used by subclasses.
*/
PlaylistItem(CollectionList *parent);

diff --git a/playlistsearch.h b/playlistsearch.h
index 6733027..9f52dca 100644
--- a/playlistsearch.h
+++ b/playlistsearch.h
@@ -80,7 +80,7 @@ private:
};

/**
- * A search is built from several search components. These corespond to to lines
+ * A search is built from several search components. These correspond to to lines
* in the search bar.
*/

@@ -96,7 +96,7 @@ public:
Component();

/**
- * Create a query component. This defaults to searching all visible coulumns.
+ * Create a query component. This defaults to searching all visible columns.
*/
Component(const QString &query,
bool caseSensitive = false,
diff --git a/scrobbleconfigdlg.h b/scrobbleconfigdlg.h
index 2e2d990..51d3fae 100644
--- a/scrobbleconfigdlg.h
+++ b/scrobbleconfigdlg.h
@@ -15,8 +15,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef JUK_SCROBBLESETTINGS_H
-#define JUK_SCROBBLESETTINGS_H
+#ifndef JUK_SCROBBLECONFIGDLG_H
+#define JUK_SCROBBLECONFIGDLG_H

#include <QDialog>
#include <KWallet>
@@ -54,4 +54,4 @@ private:
std::unique_ptr<Wallet> m_wallet;
};

-#endif //JUK_SCROBBLESETTINGS_H
+#endif //JUK_SCROBBLECONFIGDLG_H
diff --git a/slider.h b/slider.h
index 7c4c6f8..4f2decc 100644
--- a/slider.h
+++ b/slider.h
@@ -106,7 +106,7 @@ class TimeSlider : public Slider
Q_OBJECT

public:
- TimeSlider( QWidget *parent );
+ explicit TimeSlider( QWidget *parent );

void setSliderValue( int value );
protected:
diff --git a/stringhash.h b/stringhash.h
index f64617f..32c4553 100644
--- a/stringhash.h
+++ b/stringhash.h
@@ -27,7 +27,7 @@ template <class T> class Hash : public QSet<T>
public:
/**
* To combine two operations into one (that takes the same amount as each
- * independantly) this inserts an item and returns true if the item was
+ * independently) this inserts an item and returns true if the item was
* already in the set or false if it did not.
*/
inline bool insert(const T &value)
diff --git a/tag.cpp b/tag.cpp
index 4723da9..79090eb 100644
--- a/tag.cpp
+++ b/tag.cpp
@@ -19,7 +19,7 @@

#include <KLocalizedString>

-#include <QtCore/QFile>
+#include <QFile>

#include <taglib/tag.h>
#include <tfile.h>
diff --git a/tageditor.h b/tageditor.h
index ff1928c..7285f8e 100644
--- a/tageditor.h
+++ b/tageditor.h
@@ -43,7 +43,7 @@ class TagEditor : public QWidget, public Ui::TagEditor
Q_OBJECT

public:
- TagEditor(QWidget *parent = 0);
+ explicit TagEditor(QWidget *parent = 0);
virtual ~TagEditor();
PlaylistItemList items() const { return m_items; }
void setupObservers();
diff --git a/tagguesser.h b/tagguesser.h
index 0673ef4..a0411b2 100644
--- a/tagguesser.h
+++ b/tagguesser.h
@@ -27,7 +27,7 @@ class FileNameScheme
typedef QList<FileNameScheme> List;

FileNameScheme() { }
- FileNameScheme(const QString &s);
+ explicit FileNameScheme(const QString &s);

bool matches(const QString &s) const;

@@ -58,7 +58,7 @@ class TagGuesser
static void setSchemeStrings(const QStringList &schemes);

TagGuesser();
- TagGuesser(const QString &absFileName);
+ explicit TagGuesser(const QString &absFileName);

void guess(const QString &absFileName);

diff --git a/tagrenameroptions.h b/tagrenameroptions.h
index d459de3..40c5d0f 100644
--- a/tagrenameroptions.h
+++ b/tagrenameroptions.h
@@ -17,7 +17,7 @@
#ifndef TAGRENAMEROPTIONS_H
#define TAGRENAMEROPTIONS_H

-#include <QtCore/QString>
+#include <QString>

// Insert all new tag types before NumTypes, that way NumTypes will always be
// the count of valid tag types.
diff --git a/tracksequencemanager.cpp b/tracksequencemanager.cpp
index c49646f..4a5c38d 100644
--- a/tracksequencemanager.cpp
+++ b/tracksequencemanager.cpp
@@ -14,13 +14,13 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#include "tracksequencemanager.h"
#include <KLocalizedString>
#include <kconfig.h>

#include <QAction>

#include "actioncollection.h"
-#include "tracksequencemanager.h"
#include "playlist.h"
#include "playlistitem.h"
#include "tracksequenceiterator.h"
diff --git a/viewmode.h b/viewmode.h
index 7b9d0c9..622d1e0 100644
--- a/viewmode.h
+++ b/viewmode.h
@@ -33,7 +33,7 @@ class ViewMode : public QObject
Q_OBJECT

public:
- ViewMode(PlaylistBox *b);
+ explicit ViewMode(PlaylistBox *b);
virtual ~ViewMode();

virtual QString name() const;
@@ -100,7 +100,7 @@ private:
class CompactViewMode : public ViewMode
{
public:
- CompactViewMode(PlaylistBox *b);
+ explicit CompactViewMode(PlaylistBox *b);
virtual ~CompactViewMode();

virtual QString name() const;
@@ -125,7 +125,7 @@ class TreeViewMode : public CompactViewMode
Q_OBJECT

public:
- TreeViewMode(PlaylistBox *l);
+ explicit TreeViewMode(PlaylistBox *l);
virtual ~TreeViewMode();

virtual QString name() const;
diff --git a/volumepopupbutton.h b/volumepopupbutton.h
index a7853a7..0162dc6 100644
--- a/volumepopupbutton.h
+++ b/volumepopupbutton.h
@@ -34,7 +34,7 @@ class VolumePopupButton : public QToolButton
Q_OBJECT

public:
- VolumePopupButton( QWidget * parent );
+ explicit VolumePopupButton( QWidget * parent );
void refresh();

protected:
diff --git a/webimagefetcher.h b/webimagefetcher.h
index 701f6f0..de12102 100644
--- a/webimagefetcher.h
+++ b/webimagefetcher.h
@@ -29,7 +29,7 @@ class WebImageFetcher : public QObject
Q_OBJECT

public:
- WebImageFetcher(QObject *parent);
+ explicit WebImageFetcher(QObject *parent);
~WebImageFetcher();

void setFile(const FileHandle &file);

[Yuri Chornoivan]

Git commit 8d09f513145b40d3f1115bf5d37b8619688f8434 by Yuri Chornoivan.
Committed on 23/09/2018 at 17:12.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +11 -11 kcontrol/kamera.cpp
M +2 -2 kcontrol/kameraconfigdialog.cpp
M +13 -13 kcontrol/kameradevice.cpp
M +3 -0 kcontrol/kameradevice.h
M +9 -9 kioslave/kamera.cpp

https://commits.kde.org/kamera/8d09f513145b40d3f1115bf5d37b8619688f8434

diff --git a/kcontrol/kamera.cpp b/kcontrol/kamera.cpp
index 4b490ed..523cf8e 100644
--- a/kcontrol/kamera.cpp
+++ b/kcontrol/kamera.cpp
@@ -110,12 +110,12 @@ void KKameraConfig::displayGPSuccessDialogue(void)

m_deviceSel->setModel(m_deviceModel);

- connect(m_deviceSel, SIGNAL(customContextMenuRequested(const QPoint &)),
- SLOT(slot_deviceMenu(const QPoint &)));
- connect(m_deviceSel, SIGNAL(doubleClicked(const QModelIndex &)),
+ connect(m_deviceSel, SIGNAL(customContextMenuRequested(QPoint)),
+ SLOT(slot_deviceMenu(QPoint)));
+ connect(m_deviceSel, SIGNAL(doubleClicked(QModelIndex)),
SLOT(slot_configureCamera()));
- connect(m_deviceSel, SIGNAL(activated(const QModelIndex &)),
- SLOT(slot_deviceSelected(const QModelIndex &)));
+ connect(m_deviceSel, SIGNAL(activated(QModelIndex)),
+ SLOT(slot_deviceSelected(QModelIndex)));
connect(m_deviceSel, SIGNAL(clicked(QModelIndex)),
SLOT(slot_deviceSelected(QModelIndex)));

@@ -221,8 +221,8 @@ void KKameraConfig::load(void)
qCDebug(KAMERA_KCONTROL) << "Loading configuration for serial port camera: "
<< *it;
kcamera = new KCamera(*it, cg.readEntry("Path"));
- connect(kcamera, SIGNAL(error(const QString &)), SLOT(slot_error(const QString &)));
- connect(kcamera, SIGNAL(error(const QString &, const QString &)), SLOT(slot_error(const QString &, const QString &)));
+ connect(kcamera, SIGNAL(error(QString)), SLOT(slot_error(QString)));
+ connect(kcamera, SIGNAL(error(QString,QString)), SLOT(slot_error(QString,QString)));
kcamera->load(m_config);
m_devices[*it] = kcamera;
}
@@ -263,8 +263,8 @@ void KKameraConfig::load(void)
qCDebug(KAMERA_KCONTROL) << "Adding USB camera: " << portit.value() << " at " << portit.key();

kcamera = new KCamera(portit.value(), portit.key());
- connect(kcamera, SIGNAL(error(const QString &)), SLOT(slot_error(const QString &)));
- connect(kcamera, SIGNAL(error(const QString &, const QString &)), SLOT(slot_error(const QString &, const QString &)));
+ connect(kcamera, SIGNAL(error(QString)), SLOT(slot_error(QString)));
+ connect(kcamera, SIGNAL(error(QString,QString)), SLOT(slot_error(QString,QString)));
m_devices[portit.value()] = kcamera;
}
populateDeviceListView();
@@ -319,8 +319,8 @@ QString KKameraConfig::suggestName(const QString &name)
void KKameraConfig::slot_addCamera()
{
KCamera *m_device = new KCamera(QString::null, QString()); //krazy:exclusion=nullstrassign for old broken gcc
- connect(m_device, SIGNAL(error(const QString &)), SLOT(slot_error(const QString &)));
- connect(m_device, SIGNAL(error(const QString &, const QString &)), SLOT(slot_error(const QString &, const QString &)));
+ connect(m_device, SIGNAL(error(QString)), SLOT(slot_error(QString)));
+ connect(m_device, SIGNAL(error(QString,QString)), SLOT(slot_error(QString,QString)));
KameraDeviceSelectDialog dialog(this, m_device);
if (dialog.exec() == QDialog::Accepted) {
dialog.save();
diff --git a/kcontrol/kameraconfigdialog.cpp b/kcontrol/kameraconfigdialog.cpp
index ea7bc83..cb3db5b 100644
--- a/kcontrol/kameraconfigdialog.cpp
+++ b/kcontrol/kameraconfigdialog.cpp
@@ -21,6 +21,8 @@

*/

+#include "kameraconfigdialog.h"
+
#include <QLabel>
#include <QGroupBox>
#include <QCheckBox>
@@ -39,8 +41,6 @@

#include <KLocalizedString>

-#include "kameraconfigdialog.h"
-
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(KAMERA_KCONTROL)

diff --git a/kcontrol/kameradevice.cpp b/kcontrol/kameradevice.cpp
index 7f59ba9..eb3d63d 100644
--- a/kcontrol/kameradevice.cpp
+++ b/kcontrol/kameradevice.cpp
@@ -21,6 +21,8 @@

*/

+#include "kameradevice.h"
+
#include <QComboBox>
#include <QGroupBox>
#include <QVBoxLayout>
@@ -37,15 +39,13 @@
#include <KConfigGroup>
#include <KMessageBox>

-#include "config-kamera.h"
+#include <config-kamera.h>

extern "C" {
#include <gphoto2.h>
}

-#include "kamera.h"
#include "kameraconfigdialog.h"
-#include "kameradevice.h"

// Define some parts of the old API
#define GP_PROMPT_OK 0
@@ -300,10 +300,10 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera *dev

setModal( true );
m_device = device;
- connect(m_device, SIGNAL(error(const QString &)),
- SLOT(slot_error(const QString &)));
- connect(m_device, SIGNAL(error(const QString &, const QString &)),
- SLOT(slot_error(const QString &, const QString &)));
+ connect(m_device, SIGNAL(error(QString)),
+ SLOT(slot_error(QString)));
+ connect(m_device, SIGNAL(error(QString,QString)),
+ SLOT(slot_error(QString,QString)));

QWidget *page = new QWidget( this );

@@ -320,8 +320,8 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera *dev
m_modelSel->setModel(m_model);

topLayout->addWidget( m_modelSel );
- connect(m_modelSel, SIGNAL(activated(const QModelIndex &)),
- SLOT(slot_setModel(const QModelIndex &)));
+ connect(m_modelSel, SIGNAL(activated(QModelIndex)),
+ SLOT(slot_setModel(QModelIndex)));
connect(m_modelSel, SIGNAL(clicked(QModelIndex)),
SLOT(slot_setModel(QModelIndex)));
// make sure listview only as wide as it needs to be
@@ -362,10 +362,10 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera *dev

lay->addWidget(grid2);
lay->addWidget( m_settingsStack );
- connect(m_serialRB, SIGNAL( toggled(bool) ),
- this, SLOT( changeCurrentIndex() ) );
- connect(m_USBRB, SIGNAL( toggled(bool) ),
- this, SLOT( changeCurrentIndex() ) );
+ connect(m_serialRB, SIGNAL(toggled(bool)),
+ this, SLOT(changeCurrentIndex()) );
+ connect(m_USBRB, SIGNAL(toggled(bool)),
+ this, SLOT(changeCurrentIndex()) );
// none tab
m_settingsStack->insertWidget(INDEX_NONE,
new QLabel(i18n("No port type selected."),
diff --git a/kcontrol/kameradevice.h b/kcontrol/kameradevice.h
index 27e292e..5f3932a 100644
--- a/kcontrol/kameradevice.h
+++ b/kcontrol/kameradevice.h
@@ -23,8 +23,11 @@
#ifndef __kameradevice_h__
#define __kameradevice_h__

+#include "kamera.h"
+
#include <QDialog>
#include <QWidget>
+#include <QDialogButtonBox>

class KConfig;
class QString;
diff --git a/kioslave/kamera.cpp b/kioslave/kamera.cpp
index 42190c3..7e7fe3b 100644
--- a/kioslave/kamera.cpp
+++ b/kioslave/kamera.cpp
@@ -23,6 +23,8 @@

// remove comment to enable debugging
// #undef QT_NO_DEBUG
+#include "kamera.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
@@ -48,9 +50,7 @@
#include <kio/global.h>
#include <kio/slaveconfig.h>

-#include "config-kamera.h"
-
-#include "kamera.h"
+#include <config-kamera.h>

#define tocstr(x) ((x).toLocal8Bit())

@@ -496,7 +496,7 @@ void KameraProtocol::statRegular(const QUrl &xurl)
if (directory == "/") {
KIO::UDSEntry entry;

- QString xname = current_camera + "@" + current_port;
+ QString xname = current_camera + '@' + current_port;
entry.insert( KIO::UDSEntry::UDS_NAME, path_quote(xname));
entry.insert( KIO::UDSEntry::UDS_DISPLAY_NAME, current_camera);
entry.insert( KIO::UDSEntry::UDS_FILE_TYPE,S_IFDIR);
@@ -626,9 +626,9 @@ void KameraProtocol::listDir(const QUrl &yurl)

if (!file.isEmpty()) {
if (directory == "/") {
- directory = "/" + file;
+ directory = '/' + file;
} else {
- directory = directory + "/" + file;
+ directory = directory + '/' + file;
}
}

@@ -721,7 +721,7 @@ void KameraProtocol::listDir(const QUrl &yurl)
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,S_IFDIR);
entry.insert(KIO::UDSEntry::UDS_ACCESS,
(S_IRUSR | S_IRGRP | S_IROTH |S_IWUSR | S_IWGRP | S_IWOTH));
- xname = (*it)+"@"+m_cfgPath;
+ xname = (*it)+'@'+m_cfgPath;
entry.insert(KIO::UDSEntry::UDS_NAME,path_quote(xname));
// do not confuse regular users with the @usb...
entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME,*it);
@@ -736,7 +736,7 @@ void KameraProtocol::listDir(const QUrl &yurl)
// do not confuse regular users with the @usb...
entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME,portsit.value());
entry.insert(KIO::UDSEntry::UDS_NAME,
- path_quote(portsit.value()+"@"+portsit.key()));
+ path_quote(portsit.value()+'@'+portsit.key()));

entry.insert(KIO::UDSEntry::UDS_ACCESS,
(S_IRUSR | S_IRGRP | S_IROTH |S_IWUSR | S_IWGRP | S_IWOTH));
@@ -751,7 +751,7 @@ void KameraProtocol::listDir(const QUrl &yurl)

qCDebug(KAMERA_KIOSLAVE) << "redirecting to /";
if (!current_camera.isEmpty() && !current_port.isEmpty()) {
- rooturl.setPath("/"+current_camera+"@"+current_port+"/");
+ rooturl.setPath('/'+current_camera+'@'+current_port+'/');
} else {
rooturl.setPath("/");
}

[Yuri Chornoivan]

Git commit b3ea9fba97190c303ba688d49ff9b5b651d40aa5 by Yuri Chornoivan.
Committed on 23/09/2018 at 19:19.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 autotests/allpass1test.cpp
M +1 -1 autotests/allpass2test.cpp
M +1 -1 autotests/parleyunittestutilities.h
M +2 -2 plasmoid/parley_plasma.cpp
M +1 -1 scripts_test/myscript.py
M +2 -2 src/collection/entryfilter.h
M +4 -4 src/dashboard/collectionwidget.cpp
M +3 -0 src/dashboard/collectionwidget.h
M +6 -5 src/dashboard/dashboard.cpp
M +4 -0 src/dashboard/gradereferencewidget.h
M +1 -1 src/editor/audiowidget.cpp
M +1 -1 src/editor/browserwidget.cpp
M +1 -1 src/editor/browserwidget.h
M +7 -7 src/editor/editor.cpp
M +2 -2 src/editor/inflectionwidget.cpp
M +1 -1 src/editor/latexwidget.h
M +1 -1 src/editor/summarywordwidget.h
M +1 -1 src/editor/vocabularyview.cpp
M +1 -1 src/parleydocument.cpp
M +1 -1 src/parleydocument.h
M +4 -4 src/parleymainwindow.cpp
M +1 -1 src/practice/abstractfrontend.h
M +1 -1 src/practice/abstractwidget.h
M +2 -2 src/practice/audiobutton.h
M +1 -1 src/practice/boxeswidget.cpp
M +1 -1 src/practice/comparisonmodewidget.cpp
M +1 -1 src/practice/configure/blockoptions.h
M +3 -3 src/practice/conjugationdata.h
M +1 -1 src/practice/conjugationmodewidget.cpp
M +1 -1 src/practice/flashcardmodewidget.h
M +1 -1 src/practice/guifrontend.cpp
M +5 -5 src/practice/imagewidget.cpp
M +1 -1 src/practice/imagewidget.h
M +3 -3 src/practice/latexrenderer.cpp
M +3 -3 src/practice/multiplechoicedata.h
M +1 -1 src/practice/practicemainwindow.h
M +1 -1 src/practice/practicestatemachine.h
M +2 -2 src/practice/practicesummarycomponent.h
M +1 -1 src/practice/summarybarwidget.h
M +4 -4 src/settings/kgametheme/kgametheme.cpp
M +1 -1 src/settings/kgametheme/kgametheme.h
M +2 -2 src/settings/kgametheme/kgamethemeselector.cpp
M +1 -1 src/settings/kgametheme/kgamethemeselector.h
M +2 -1 src/settings/languagepropertiespage.cpp
M +0 -1 src/statistics/conjugationoptions.cpp
M +1 -1 src/statistics/conjugationoptions.h
M +1 -1 src/statistics/statisticsmainwindow.cpp
M +1 -1 src/utils.h

https://commits.kde.org/parley/b3ea9fba97190c303ba688d49ff9b5b651d40aa5

diff --git a/autotests/allpass1test.cpp b/autotests/allpass1test.cpp
index 39e5d289..6692777f 100644
--- a/autotests/allpass1test.cpp
+++ b/autotests/allpass1test.cpp
@@ -21,7 +21,7 @@

#include "parleydocument.h"

-#include <QtTest/QtTest>
+#include <QtTest>

using namespace UnitTestUtilities;

diff --git a/autotests/allpass2test.cpp b/autotests/allpass2test.cpp
index af877e13..b57ceab6 100644
--- a/autotests/allpass2test.cpp
+++ b/autotests/allpass2test.cpp
@@ -21,7 +21,7 @@

#include "parleydocument.h"

-#include <QtTest/QtTest>
+#include <QtTest>

/** This class is a unittest stub with 2 tests that always pass
*/
diff --git a/autotests/parleyunittestutilities.h b/autotests/parleyunittestutilities.h
index e2768bc7..7dbfd0a6 100644
--- a/autotests/parleyunittestutilities.h
+++ b/autotests/parleyunittestutilities.h
@@ -31,7 +31,7 @@

#include <QUrl>

-#include <QtTest/QtTest>
+#include <QtTest>
#include <QDebug>

namespace UnitTestUtilities
diff --git a/plasmoid/parley_plasma.cpp b/plasmoid/parley_plasma.cpp
index ce5ad84a..60b5cfbb 100644
--- a/plasmoid/parley_plasma.cpp
+++ b/plasmoid/parley_plasma.cpp
@@ -188,7 +188,7 @@ void ParleyPlasma::createConfigurationInterface(KConfigDialog * parent)

ui.filechooser->setUrl(m_sourceFile);
ui.filechooser->setFilter(i18n("*.kvtml|Vocabulary Collections"));
- connect(ui.filechooser, SIGNAL(urlSelected(const QUrl &)), this, SLOT(urlSelected(const QUrl &)));
+ connect(ui.filechooser, SIGNAL(urlSelected(QUrl)), this, SLOT(urlSelected(QUrl)));
ui.language1->addItems(m_languages);
ui.language2->addItems(m_languages);
ui.language1->setCurrentIndex(m_lang1);
@@ -206,7 +206,7 @@ void ParleyPlasma::createConfigurationInterface(KConfigDialog * parent)
connect(ui.fontSelectButton, SIGNAL(clicked()), parent, SLOT(settingsModified()));
connect(ui.solutionOnHover, SIGNAL(toggled(bool)), parent, SLOT(settingsModified()));
connect(ui.solutionAlways, SIGNAL(toggled(bool)), parent, SLOT(settingsModified()));
- connect(ui.filechooser, SIGNAL(urlSelected(const QUrl &)), parent, SLOT(settingsModified()));
+ connect(ui.filechooser, SIGNAL(urlSelected(QUrl)), parent, SLOT(settingsModified()));
connect(ui.updateIntervalSpinBox, SIGNAL(valueChanged(int)), parent, SLOT(settingsModified()));
}

diff --git a/scripts_test/myscript.py b/scripts_test/myscript.py
index ba5e65c4..d5a0bb67 100644
--- a/scripts_test/myscript.py
+++ b/scripts_test/myscript.py
@@ -93,4 +93,4 @@ def returnlist():
def testTuple():
return [("first","second"),("first1","second1")]

-print fetchTranslation("love")
\ No newline at end of file
+print fetchTranslation("love")
diff --git a/src/collection/entryfilter.h b/src/collection/entryfilter.h
index 74c02d34..85553396 100644
--- a/src/collection/entryfilter.h
+++ b/src/collection/entryfilter.h
@@ -14,8 +14,8 @@
#ifndef ENTRYFILTER_H
#define ENTRYFILTER_H

-#include <QtCore/QList>
-#include <QtCore/QSet>
+#include <QList>
+#include <QSet>
#include <prefs.h>

class KEduVocText;
diff --git a/src/dashboard/collectionwidget.cpp b/src/dashboard/collectionwidget.cpp
index f0ae413c..74b19d5a 100755
--- a/src/dashboard/collectionwidget.cpp
+++ b/src/dashboard/collectionwidget.cpp
@@ -25,10 +25,10 @@
// Qt
#include <QtGui>
#include <QColor>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QGraphicsDropShadowEffect>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QLabel>
+#include <QPushButton>
+#include <QGraphicsDropShadowEffect>
+#include <QVBoxLayout>
+#include <QLabel>

// Parley
#include "utils.h"
diff --git a/src/dashboard/collectionwidget.h b/src/dashboard/collectionwidget.h
index 54d2574c..4572ff44 100644
--- a/src/dashboard/collectionwidget.h
+++ b/src/dashboard/collectionwidget.h
@@ -12,6 +12,8 @@
* *
***************************************************************************/

+#ifndef COLLECTIONWIDGET_H
+#define COLLECTIONWIDGET_H

#include <QWidget>

@@ -64,3 +66,4 @@ private:
Collection *m_collection;
};

+#endif
diff --git a/src/dashboard/dashboard.cpp b/src/dashboard/dashboard.cpp
index 4e382e10..8c01b319 100644
--- a/src/dashboard/dashboard.cpp
+++ b/src/dashboard/dashboard.cpp
@@ -11,6 +11,8 @@
* *
***************************************************************************/

+#include "dashboard.h"
+
#include <Qt>
#include <QtGui>
#include <QTimer>
@@ -24,7 +26,6 @@
#include <KActionCollection>

#include "../utils.h"
-#include "dashboard.h"
#include "buttondelegate.h"
#include "parleymainwindow.h"
#include "parleydocument.h"
@@ -104,10 +105,10 @@ Dashboard::Dashboard(ParleyMainWindow *parent)

// Signals FROM the signal mappers. The ones TO the signal mappers are
// handled below.
- connect(m_practiceSignalMapper, SIGNAL(mapped(const QString &)),
- this, SLOT(slotPracticeButtonClicked(const QString &)));
- connect(m_removeSignalMapper, SIGNAL(mapped(const QString &)),
- this, SLOT(slotRemoveButtonClicked(const QString &)));
+ connect(m_practiceSignalMapper, SIGNAL(mapped(QString)),
+ this, SLOT(slotPracticeButtonClicked(QString)));
+ connect(m_removeSignalMapper, SIGNAL(mapped(QString)),
+ this, SLOT(slotRemoveButtonClicked(QString)));

KConfigGroup cfg(KSharedConfig::openConfig(QStringLiteral("parleyrc")), objectName());
applyMainWindowSettings(cfg);
diff --git a/src/dashboard/gradereferencewidget.h b/src/dashboard/gradereferencewidget.h
index 4ff42bc4..e0ec96fa 100644
--- a/src/dashboard/gradereferencewidget.h
+++ b/src/dashboard/gradereferencewidget.h
@@ -12,6 +12,8 @@
* *
***************************************************************************/

+#ifndef GRADEREFERENCEWIDGET_H
+#define GRADEREFERENCEWIDGET_H

#include <QWidget>

@@ -25,3 +27,5 @@ protected:
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;

};
+
+#endif
diff --git a/src/editor/audiowidget.cpp b/src/editor/audiowidget.cpp
index 5dd79b02..44655559 100644
--- a/src/editor/audiowidget.cpp
+++ b/src/editor/audiowidget.cpp
@@ -17,7 +17,7 @@

#include <keduvocexpression.h>

-#include <QtMultimedia/QMediaPlayer>
+#include <QMediaPlayer>
#include <QDebug>

using namespace Editor;
diff --git a/src/editor/browserwidget.cpp b/src/editor/browserwidget.cpp
index 533a96fc..58cc582d 100644
--- a/src/editor/browserwidget.cpp
+++ b/src/editor/browserwidget.cpp
@@ -16,7 +16,7 @@
#include "browserwidget.h"

#include <keduvocexpression.h>
-#include <QtWebEngineWidgets/QWebEngineView>
+#include <QWebEngineView>

#include <QDragEnterEvent>

diff --git a/src/editor/browserwidget.h b/src/editor/browserwidget.h
index a6cabdc1..5fe58318 100644
--- a/src/editor/browserwidget.h
+++ b/src/editor/browserwidget.h
@@ -18,7 +18,7 @@


#include "ui_browserwidget.h"
-#include <QtWebEngineWidgets/QWebEngineView>
+#include <QWebEngineView>

class KEduVocExpression;

diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
index 170375ed..2f1c8a61 100644
--- a/src/editor/editor.cpp
+++ b/src/editor/editor.cpp
@@ -16,7 +16,7 @@

#include "editor.h"

-#include "../config-parley.h"
+#include <config-parley.h>

// Qt models on top of the KEduVocDocument
#include "containermodel.h"
@@ -55,12 +55,12 @@
#include <KActionMenu>
#include <KCharSelect>

-#include <QtCore/QTimer>
-#include <QtCore/QSignalMapper>
-#include <QtWidgets/QDockWidget>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QStackedWidget>
+#include <QTimer>
+#include <QSignalMapper>
+#include <QDockWidget>
+#include <QHeaderView>
+#include <QMenu>
+#include <QStackedWidget>
#include <QScrollArea>

using namespace Editor;
diff --git a/src/editor/inflectionwidget.cpp b/src/editor/inflectionwidget.cpp
index bca45469..2728c03f 100644
--- a/src/editor/inflectionwidget.cpp
+++ b/src/editor/inflectionwidget.cpp
@@ -13,6 +13,8 @@
***************************************************************************/


+#include "inflectionwidget.h"
+
#include <keduvocdocument.h>
#include <keduvocexpression.h>
#include <keduvocwordtype.h>
@@ -21,8 +23,6 @@
#include "declensionwidget.h"
#include "conjugationwidget.h"

-#include "inflectionwidget.h"
-
#include <KLocalizedString>

#include <QDialogButtonBox>
diff --git a/src/editor/latexwidget.h b/src/editor/latexwidget.h
index e3156b0e..39dc4234 100644
--- a/src/editor/latexwidget.h
+++ b/src/editor/latexwidget.h
@@ -17,7 +17,7 @@

#include <QItemDelegate>
#include <QItemSelection>
-#include <QtWidgets/QWidget>
+#include <QWidget>

class QDataWidgetMapper;
class KEduVocDocument;
diff --git a/src/editor/summarywordwidget.h b/src/editor/summarywordwidget.h
index a4327457..c0f201c4 100644
--- a/src/editor/summarywordwidget.h
+++ b/src/editor/summarywordwidget.h
@@ -18,7 +18,7 @@
#include "ui_summarywordwidget.h"

#include <QItemDelegate>
-#include <QtWidgets/QWidget>
+#include <QWidget>

class QTreeView;
class QDataWidgetMapper;
diff --git a/src/editor/vocabularyview.cpp b/src/editor/vocabularyview.cpp
index 2760c06d..eb539d9c 100644
--- a/src/editor/vocabularyview.cpp
+++ b/src/editor/vocabularyview.cpp
@@ -381,7 +381,7 @@ void VocabularyView::checkSpelling(int language)
if (!m_spellChecker) {
m_spellChecker = new Sonnet::BackgroundChecker(this);
m_spellDialog = new Sonnet::Dialog(m_spellChecker, this);
- connect(m_spellDialog, SIGNAL(done(const QString&)), this, SLOT(continueSpelling()));
+ connect(m_spellDialog, SIGNAL(done(QString)), this, SLOT(continueSpelling()));
connect(m_spellDialog, &Sonnet::Dialog::misspelling, this, &VocabularyView::misspelling);
connect(m_spellDialog, &Sonnet::Dialog::replace, this, &VocabularyView::spellingReplace);
}
diff --git a/src/parleydocument.cpp b/src/parleydocument.cpp
index 173ab4d9..0e065c3d 100644
--- a/src/parleydocument.cpp
+++ b/src/parleydocument.cpp
@@ -327,7 +327,7 @@ void ParleyDocument::openGHNS()

void ParleyDocument::save()
{
- if (m_doc->url().fileName() == QString()) {
+ if (m_doc->url().fileName().isEmpty()) {
saveAs();
return;
}
diff --git a/src/parleydocument.h b/src/parleydocument.h
index 470883d3..af791776 100644
--- a/src/parleydocument.h
+++ b/src/parleydocument.h
@@ -18,7 +18,7 @@
#include <keduvocdocument.h>
#include <QObject>

-#include "../config-parley.h"
+#include <config-parley.h>

class ParleyMainWindow;
class QTimer;
diff --git a/src/parleymainwindow.cpp b/src/parleymainwindow.cpp
index 5f774a5a..1315dc7d 100644
--- a/src/parleymainwindow.cpp
+++ b/src/parleymainwindow.cpp
@@ -25,7 +25,7 @@

#include "parleymainwindow.h"

-#include "../config-parley.h"
+#include <config-parley.h>
#include "editor/editor.h"
#include "statistics/statisticsmainwindow.h"
#include "settings/parleyprefs.h"
@@ -47,7 +47,7 @@
#include <KToolBar>
#include <QMenuBar>

-#include <QtCore/QTimer>
+#include <QTimer>

using namespace Editor;

@@ -103,7 +103,7 @@ ParleyMainWindow::ParleyMainWindow(const QUrl& filename)
menuBar()->show();

// finally show tip-of-day (if the user wants it)
- //QTimer::singleShot( 0, this, SLOT( startupTipOfDay() ) );
+ //QTimer::singleShot( 0, this, SLOT(startupTipOfDay()) );
}

ParleyMainWindow::~ParleyMainWindow()
@@ -245,7 +245,7 @@ void ParleyMainWindow::initActions()
ParleyActions::create(ParleyActions::FileOpenDownloaded, m_document, SLOT(openGHNS()), actionCollection());

m_recentFilesAction = ParleyActions::createRecentFilesAction(
- m_document, SLOT(slotFileOpenRecent(const QUrl&)), actionCollection());
+ m_document, SLOT(slotFileOpenRecent(QUrl)), actionCollection());
m_recentFilesAction->loadEntries(KSharedConfig::openConfig()->group("Recent Files"));

ParleyActions::create(ParleyActions::FileSave, m_document, SLOT(save()), actionCollection());
diff --git a/src/practice/abstractfrontend.h b/src/practice/abstractfrontend.h
index f5f9552a..01ac7581 100644
--- a/src/practice/abstractfrontend.h
+++ b/src/practice/abstractfrontend.h
@@ -14,7 +14,7 @@
#ifndef PRACTICE_ABSTRACTFRONTEND_H
#define PRACTICE_ABSTRACTFRONTEND_H

-#include <QtCore/QObject>
+#include <QObject>
#include <keduvoctext.h>
#include <QFont>

diff --git a/src/practice/abstractwidget.h b/src/practice/abstractwidget.h
index 51357631..19ce671a 100644
--- a/src/practice/abstractwidget.h
+++ b/src/practice/abstractwidget.h
@@ -16,7 +16,7 @@

#include "abstractfrontend.h"

-#include <QtWidgets/QWidget>
+#include <QWidget>

class QVariant;

diff --git a/src/practice/audiobutton.h b/src/practice/audiobutton.h
index ffeed42e..9e578e7a 100644
--- a/src/practice/audiobutton.h
+++ b/src/practice/audiobutton.h
@@ -14,8 +14,8 @@
#ifndef PRACTICE_AUDIOBUTTON_H
#define PRACTICE_AUDIOBUTTON_H

-#include <QtWidgets/QToolButton>
-#include <QtMultimedia/QMediaPlayer>
+#include <QToolButton>
+#include <QMediaPlayer>
#include <QUrl>

class QMediaPlayer;
diff --git a/src/practice/boxeswidget.cpp b/src/practice/boxeswidget.cpp
index e7ca24d4..51ce764b 100644
--- a/src/practice/boxeswidget.cpp
+++ b/src/practice/boxeswidget.cpp
@@ -18,7 +18,7 @@
#include <keduvoctext.h>
#include <QDebug>

-#include <QtGui/QPainter>
+#include <QPainter>
#include <QBrush>
#include <QEvent>

diff --git a/src/practice/comparisonmodewidget.cpp b/src/practice/comparisonmodewidget.cpp
index e820c230..5d87d1c9 100644
--- a/src/practice/comparisonmodewidget.cpp
+++ b/src/practice/comparisonmodewidget.cpp
@@ -17,7 +17,7 @@

#include <QDebug>
#include <kcolorscheme.h>
-#include <QtWidgets/QRadioButton>
+#include <QRadioButton>
#include <QTimer>
#include <KLocalizedString>

diff --git a/src/practice/configure/blockoptions.h b/src/practice/configure/blockoptions.h
index 4ec441f1..8ed10ad2 100644
--- a/src/practice/configure/blockoptions.h
+++ b/src/practice/configure/blockoptions.h
@@ -24,7 +24,7 @@
#ifndef BLOCKOPTIONS_H
#define BLOCKOPTIONS_H

-#include <QtCore/QList>
+#include <QList>

#include "ui_blockoptions.h"
#include "practice/sessionmanagerbase.h"
diff --git a/src/practice/conjugationdata.h b/src/practice/conjugationdata.h
index ceb8b384..51fb47f1 100644
--- a/src/practice/conjugationdata.h
+++ b/src/practice/conjugationdata.h
@@ -15,9 +15,9 @@
#ifndef CONJUGATIONDATA_H
#define CONJUGATIONDATA_H

-#include <QtCore/QStringList>
-#include <QtCore/QString>
-#include <QtCore/QMetaType>
+#include <QStringList>
+#include <QString>
+#include <QMetaType>

#include <keduvocconjugation.h>

diff --git a/src/practice/conjugationmodewidget.cpp b/src/practice/conjugationmodewidget.cpp
index a6949185..075c67c6 100644
--- a/src/practice/conjugationmodewidget.cpp
+++ b/src/practice/conjugationmodewidget.cpp
@@ -19,7 +19,7 @@
#include <QDebug>
#include <kcolorscheme.h>
#include <KLocalizedString>
-#include <QtWidgets/QRadioButton>
+#include <QRadioButton>
#include <QTimer>

namespace Practice
diff --git a/src/practice/flashcardmodewidget.h b/src/practice/flashcardmodewidget.h
index 931987ef..aae6a65f 100644
--- a/src/practice/flashcardmodewidget.h
+++ b/src/practice/flashcardmodewidget.h
@@ -17,7 +17,7 @@

#include "abstractwidget.h"

-#include <QtCore/QVariant>
+#include <QVariant>


namespace Ui
diff --git a/src/practice/guifrontend.cpp b/src/practice/guifrontend.cpp
index 4ee63481..407387ff 100644
--- a/src/practice/guifrontend.cpp
+++ b/src/practice/guifrontend.cpp
@@ -13,7 +13,7 @@

#include "guifrontend.h"

-#include <QtCore/QTimer>
+#include <QTimer>

#include <kcolorscheme.h>
#include <QDebug>
diff --git a/src/practice/imagewidget.cpp b/src/practice/imagewidget.cpp
index ab9d83cf..4a359fff 100644
--- a/src/practice/imagewidget.cpp
+++ b/src/practice/imagewidget.cpp
@@ -12,12 +12,12 @@
***************************************************************************/

#include "imagewidget.h"
-#include "../config-parley.h"
+#include <config-parley.h>

-#include <QtGui/QPainter>
-#include <QtGui/QPaintEngine>
-#include <QtCore/QTimer>
-#include <QtCore/QTimeLine>
+#include <QPainter>
+#include <QPaintEngine>
+#include <QTimer>
+#include <QTimeLine>

#include <QDebug>
#include <QtWidgets>
diff --git a/src/practice/imagewidget.h b/src/practice/imagewidget.h
index 80fa45d0..d3ffe7d9 100644
--- a/src/practice/imagewidget.h
+++ b/src/practice/imagewidget.h
@@ -14,7 +14,7 @@
#ifndef PRACTICE_IMAGEWIDGET_H
#define PRACTICE_IMAGEWIDGET_H

-#include <QtWidgets/QWidget>
+#include <QWidget>

class QTimeLine;

diff --git a/src/practice/latexrenderer.cpp b/src/practice/latexrenderer.cpp
index a2cc6639..df268ebc 100644
--- a/src/practice/latexrenderer.cpp
+++ b/src/practice/latexrenderer.cpp
@@ -88,7 +88,7 @@ void LatexRenderer::renderLatex(QString tex)

(*p) << QStringLiteral("latex") << QStringLiteral("-interaction=batchmode") << QStringLiteral("-halt-on-error") << fileName;

- connect(p, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(convertToPs()));
+ connect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(convertToPs()));
connect(p, SIGNAL(error(QProcess::ProcessError)), this, SLOT(latexRendered()));
p->start();
}
@@ -109,7 +109,7 @@ void LatexRenderer::convertToPs()
qDebug() << "running: " << "dvips" << "-E" << "-o" << m_latexFilename << dviFile;
(*p) << QStringLiteral("dvips") << QStringLiteral("-E") << QStringLiteral("-o") << m_latexFilename << dviFile;

- connect(p, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(convertToImage()));
+ connect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(convertToImage()));
connect(p, SIGNAL(error(QProcess::ProcessError)), this, SLOT(latexRendered()));
p->start();
}
@@ -123,7 +123,7 @@ void LatexRenderer::convertToImage()
qDebug() << "running:" << "convert" << m_latexFilename << pngFile;
(*p) << QStringLiteral("convert") << QStringLiteral("-density") << QStringLiteral("85") << m_latexFilename << pngFile;

- connect(p, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(latexRendered()));
+ connect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(latexRendered()));
connect(p, SIGNAL(error(QProcess::ProcessError)), this, SLOT(latexRendered()));
p->start();
}
diff --git a/src/practice/multiplechoicedata.h b/src/practice/multiplechoicedata.h
index e45721be..989ba0fd 100644
--- a/src/practice/multiplechoicedata.h
+++ b/src/practice/multiplechoicedata.h
@@ -15,9 +15,9 @@
#ifndef MULTIPLECHOICEDATA_H
#define MULTIPLECHOICEDATA_H

-#include <QtCore/QStringList>
-#include <QtCore/QString>
-#include <QtCore/QMetaType>
+#include <QStringList>
+#include <QString>
+#include <QMetaType>

namespace Practice
{
diff --git a/src/practice/practicemainwindow.h b/src/practice/practicemainwindow.h
index afa674db..91e7f777 100644
--- a/src/practice/practicemainwindow.h
+++ b/src/practice/practicemainwindow.h
@@ -15,7 +15,7 @@
#define PRACTICE_MAINWINDOW_H

#include <KXmlGuiWindow>
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
#include "sessionmanagerbase.h"

class ParleyMainWindow;
diff --git a/src/practice/practicestatemachine.h b/src/practice/practicestatemachine.h
index b67ba327..72781410 100644
--- a/src/practice/practicestatemachine.h
+++ b/src/practice/practicestatemachine.h
@@ -15,7 +15,7 @@
#ifndef PRACTICESTATEMACHINE_H
#define PRACTICESTATEMACHINE_H

-#include <QtCore/QObject>
+#include <QObject>

#include "abstractbackendmode.h"

diff --git a/src/practice/practicesummarycomponent.h b/src/practice/practicesummarycomponent.h
index 293121c6..4f53ace3 100644
--- a/src/practice/practicesummarycomponent.h
+++ b/src/practice/practicesummarycomponent.h
@@ -11,8 +11,8 @@
* *
***************************************************************************/

-#ifndef PRACTICESUMMARYDIALOG_H
-#define PRACTICESUMMARYDIALOG_H
+#ifndef PRACTICESUMMARYCOMPONENT_H
+#define PRACTICESUMMARYCOMPONENT_H

#include "practice/sessionmanagerbase.h"

diff --git a/src/practice/summarybarwidget.h b/src/practice/summarybarwidget.h
index bbb0180b..890fb867 100644
--- a/src/practice/summarybarwidget.h
+++ b/src/practice/summarybarwidget.h
@@ -15,7 +15,7 @@
#ifndef SUMMARYBARWIDGET_H
#define SUMMARYBARWIDGET_H

-#include <QtWidgets/QWidget>
+#include <QWidget>

class QLabel;
class QHBoxLayout;
diff --git a/src/settings/kgametheme/kgametheme.cpp b/src/settings/kgametheme/kgametheme.cpp
index 352902a3..c70df552 100644
--- a/src/settings/kgametheme/kgametheme.cpp
+++ b/src/settings/kgametheme/kgametheme.cpp
@@ -22,10 +22,10 @@
#include <KConfig>
#include <KConfigGroup>
#include <QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QMap>
-#include <QtGui/QPixmap>
+#include <QFile>
+#include <QFileInfo>
+#include <QMap>
+#include <QPixmap>

class KGameThemePrivate
{
diff --git a/src/settings/kgametheme/kgametheme.h b/src/settings/kgametheme/kgametheme.h
index 40c598b7..6519a340 100644
--- a/src/settings/kgametheme/kgametheme.h
+++ b/src/settings/kgametheme/kgametheme.h
@@ -21,7 +21,7 @@
#define KGAMETHEME_H


-#include <QtCore/QString>
+#include <QString>

class KGameThemePrivate;
class QPixmap;
diff --git a/src/settings/kgametheme/kgamethemeselector.cpp b/src/settings/kgametheme/kgamethemeselector.cpp
index b15c9aed..95a706bd 100644
--- a/src/settings/kgametheme/kgamethemeselector.cpp
+++ b/src/settings/kgametheme/kgamethemeselector.cpp
@@ -73,7 +73,7 @@ void KGameThemeSelectorPrivate::setupData(KConfigSkeleton * aconfig, KGameThemeS
//The lineEdit widget holds our theme path for automatic connection via KConfigXT.
//But the user should not manipulate it directly, so we hide it.
ui.kcfg_Theme->hide();
- q_func()->connect(ui.kcfg_Theme, SIGNAL(textChanged(const QString&)), q_ptr, SLOT(_k_updateThemeList(const QString&)));
+ q_func()->connect(ui.kcfg_Theme, SIGNAL(textChanged(QString)), q_ptr, SLOT(_k_updateThemeList(QString)));

//Disable KNS button?
if (knsflags == KGameThemeSelector::NewStuffDisableDownload) {
@@ -156,7 +156,7 @@ void KGameThemeSelectorPrivate::findThemes(const QString &initialSelection)
}

//Reconnect the themeList
- q_func()->connect(ui.themeList, SIGNAL(currentItemChanged(QListWidgetItem * , QListWidgetItem *)), q_ptr, SLOT(_k_updatePreview()));
+ q_func()->connect(ui.themeList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), q_ptr, SLOT(_k_updatePreview()));
}

void KGameThemeSelectorPrivate::_k_updatePreview()
diff --git a/src/settings/kgametheme/kgamethemeselector.h b/src/settings/kgametheme/kgamethemeselector.h
index 3c17620f..ea0b551e 100644
--- a/src/settings/kgametheme/kgamethemeselector.h
+++ b/src/settings/kgametheme/kgamethemeselector.h
@@ -20,7 +20,7 @@
#ifndef KGAMETHEMESELECTOR_H
#define KGAMETHEMESELECTOR_H

-#include <QtWidgets/QWidget>
+#include <QWidget>

//#include <libkdegames_export.h>

diff --git a/src/settings/languagepropertiespage.cpp b/src/settings/languagepropertiespage.cpp
index 7ffa22ae..a87c21d5 100644
--- a/src/settings/languagepropertiespage.cpp
+++ b/src/settings/languagepropertiespage.cpp
@@ -23,7 +23,8 @@
#include <QInputDialog>
#include <QCheckBox>
#include <QLabel>
-#include <QtDBus>
+#include <QDBusInterface>
+#include <QDBusReply>
#include <sonnet/speller.h>

#include <keduvocdocument.h>
diff --git a/src/statistics/conjugationoptions.cpp b/src/statistics/conjugationoptions.cpp
index 34774bf8..d6031a62 100644
--- a/src/statistics/conjugationoptions.cpp
+++ b/src/statistics/conjugationoptions.cpp
@@ -22,7 +22,6 @@
#include <KLocalizedString>
#include <QStackedLayout>
#include <QLabel>
-#include <QtDBus>
#include <QTreeWidget>

ConjugationOptions::ConjugationOptions(KEduVocDocument *doc, QWidget *parent)
diff --git a/src/statistics/conjugationoptions.h b/src/statistics/conjugationoptions.h
index 8901613b..fcf37a11 100644
--- a/src/statistics/conjugationoptions.h
+++ b/src/statistics/conjugationoptions.h
@@ -14,7 +14,7 @@
#ifndef CONJUGATIONOPTIONS_H
#define CONJUGATIONOPTIONS_H

-#include <QtWidgets/QWidget>
+#include <QWidget>
#include <QMap>

class KEduVocDocument;
diff --git a/src/statistics/statisticsmainwindow.cpp b/src/statistics/statisticsmainwindow.cpp
index fe594606..6bbc027a 100644
--- a/src/statistics/statisticsmainwindow.cpp
+++ b/src/statistics/statisticsmainwindow.cpp
@@ -17,7 +17,7 @@
#include "statisticsmainwindow.h"

#include <QHeaderView>
-#include <QtCore/qsignalmapper.h>
+#include <QSignalMapper>

#include <KLocalizedString>
#include <KConfig>
diff --git a/src/utils.h b/src/utils.h
index 4e839b3d..c075d6d4 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -16,7 +16,7 @@
#define UTILS_H

// Qt
-#include <QtGui>
+#include <QColor>

// KEduVocDocument library
#include <keduvoccontainer.h>

[Yuri Chornoivan]

Git commit df32d977eb288c8595f5fac1a709d5669a182cfc by Yuri Chornoivan.
Committed on 24/09/2018 at 19:46.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 examples/Axis/Labels/mainwindow.cpp
M +1 -1 examples/DrawIntoPainter/framewidget.cpp
M +2 -2 examples/DrawIntoPainter/mainwindow.cpp
M +3 -3 examples/Gantt/legend_example/entrydialog.cpp
M +9 -9 examples/Gantt/legend_example/mainwindow.cpp
M +11 -11 examples/Gantt/project/mainwindow.cpp
M +1 -1 examples/LeveyJennings/Simple/main.cpp
M +1 -1 examples/Lines/Advanced/mainwindow.cpp
M +3 -3 examples/ModelView/TableView/mainwindow.cpp
M +1 -1 examples/Pie/Advanced/mainwindow.cpp
M +4 -4 examples/Plotter/BigDataset/MainWidget.cpp
M +1 -1 examples/Plotter/BigDataset/Model.cpp
M +1 -1 examples/Plotter/BubbleChart/mainwindow.cpp
M +0 -1 examples/Plotter/Logarithmic/main.cpp
M +5 -5 examples/Plotter/Timeline/main.cpp
M +1 -1 examples/Plotter/Timeline/timeaxis.cpp
M +2 -2 examples/RealTime/main.cpp
M +1 -1 examples/Stock/Advanced/mainwindow.cpp
M +2 -2 examples/TernaryCharts/Advanced/mainwindow.cpp
M +4 -4 examples/Widget/Advanced/mainwindow.cpp
M +1 -1 examples/Zoom/ScrollBars/mainwindow.cpp
M +6 -6 examples/demo/axissettings.cpp
M +3 -3 examples/demo/colorslider.cpp
M +6 -6 examples/demo/datasetsettings.cpp
M +22 -22 examples/demo/datavaluesettings.cpp
M +5 -5 examples/demo/diagramsettings.cpp
M +2 -2 examples/demo/diagramtypedialog.cpp
M +1 -1 examples/demo/diagramtypedialog.h
M +13 -13 examples/demo/gradientdialog.cpp
M +2 -2 examples/demo/main.cpp
M +6 -6 examples/demo/mainwindow.cpp
M +1 -1 qtests/DrawIntoPainter/framewidget.cpp
M +2 -2 qtests/DrawIntoPainter/mainwindow.cpp
M +1 -1 src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.cpp
M +1 -1 src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.cpp
M +1 -1 src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
M +25 -25 src/KChart/Cartesian/KChartAbstractCartesianDiagram.cpp
M +1 -1 src/KChart/Cartesian/KChartCartesianAxis.cpp
M +3 -3 src/KChart/Cartesian/KChartCartesianCoordinatePlane.cpp
M +47 -47 src/KChart/Cartesian/KChartCartesianDiagramDataCompressor_p.cpp
M +28 -28 src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp
M +2 -2 src/KChart/Cartesian/KChartLeveyJenningsDiagram_p.cpp
M +1 -1 src/KChart/Cartesian/KChartLineDiagram_p.cpp
M +12 -12 src/KChart/Cartesian/KChartPlotter.cpp
M +4 -4 src/KChart/Cartesian/KChartPlotterDiagramCompressor.cpp
M +5 -5 src/KChart/Cartesian/KChartPlotterDiagramCompressor.h
M +2 -2 src/KChart/Cartesian/KChartPlotterDiagramCompressor_p.h
M +4 -4 src/KChart/KChartAbstractAxis.cpp
M +3 -3 src/KChart/KChartAbstractAxis_p.h
M +10 -10 src/KChart/KChartAbstractCoordinatePlane.cpp
M +2 -2 src/KChart/KChartAbstractCoordinatePlane_p.h
M +4 -4 src/KChart/KChartAbstractDiagram.cpp
M +28 -28 src/KChart/KChartAbstractDiagram_p.cpp
M +44 -44 src/KChart/KChartAttributesModel.cpp
M +17 -17 src/KChart/KChartChart.cpp
M +5 -5 src/KChart/KChartDatasetProxyModel.cpp
M +1 -1 src/KChart/KChartDiagramObserver.cpp
M +8 -8 src/KChart/KChartLegend.cpp
M +2 -2 src/KChart/KChartMath_p.h
M +16 -16 src/KChart/KChartModelDataCache_p.cpp
M +3 -3 src/KChart/KChartThreeDLineAttributes_p.h
M +3 -3 src/KChart/KTextDocument.h
M +2 -2 src/KChart/Polar/KChartPolarCoordinatePlane.cpp
M +0 -1 src/KGantt/kganttconstraintmodel.h
M +10 -10 src/KGantt/kganttconstraintproxy.cpp
M +21 -21 src/KGantt/kganttforwardingproxymodel.cpp
M +6 -6 src/KGantt/kganttgraphicsscene.cpp
M +34 -34 src/KGantt/kganttgraphicsview.cpp
M +6 -6 src/KGantt/kganttlegend.cpp
M +15 -15 src/KGantt/kganttview.cpp
M +3 -0 src/KGantt/test/TestKGanttConstraint.h
M +3 -0 src/KGantt/test/TestKGanttConstraintModel.h
M +3 -0 src/KGantt/test/TestKGanttView.h
M +2 -2 tests/Gantt/apireview/entrydialog.cpp
M +15 -15 tests/Gantt/apireview/mainwindow.cpp
M +2 -2 tests/Gantt/customconstraints/main.cpp
M +2 -2 tests/Gantt/gfxview/main.cpp
M +2 -2 tests/Gantt/listview/main.cpp
M +1 -1 tests/Gantt/reorder/main.cpp
M +4 -4 tests/Gantt/view/main.cpp

https://commits.kde.org/kdiagram/df32d977eb288c8595f5fac1a709d5669a182cfc

diff --git a/examples/Axis/Labels/mainwindow.cpp b/examples/Axis/Labels/mainwindow.cpp
index 8b6ced5..dbafb7d 100644
--- a/examples/Axis/Labels/mainwindow.cpp
+++ b/examples/Axis/Labels/mainwindow.cpp
@@ -97,8 +97,8 @@ MainWindow::MainWindow( QWidget* parent ) :
m_legend->setAlignment( Qt::AlignTop );
m_chart->addLegend( m_legend );

- connect( m_annotations, SIGNAL( toggled( bool ) ), SLOT( annotationsToggled( bool ) ) );
- connect( m_linesOnAnnotations, SIGNAL( toggled( bool ) ), SLOT( gridLinesOnAnnotationsToggled( bool ) ) );
+ connect( m_annotations, SIGNAL(toggled(bool)), SLOT(annotationsToggled(bool)) );
+ connect( m_linesOnAnnotations, SIGNAL(toggled(bool)), SLOT(gridLinesOnAnnotationsToggled(bool)) );
}

void MainWindow::annotationsToggled( bool showAnnotations )
diff --git a/examples/DrawIntoPainter/framewidget.cpp b/examples/DrawIntoPainter/framewidget.cpp
index b134112..dca4bf4 100644
--- a/examples/DrawIntoPainter/framewidget.cpp
+++ b/examples/DrawIntoPainter/framewidget.cpp
@@ -36,7 +36,7 @@ void FrameWidget::setChart( KChart::Chart* chart )
mChart = chart;
// This is necessary because Chart can't automatically schedule somebody else (this object) to
// call its custom paint method.
- connect( mChart, SIGNAL( propertiesChanged() ), SLOT( update() ) );
+ connect( mChart, SIGNAL(propertiesChanged()), SLOT(update()) );
}

void FrameWidget::paintEvent( QPaintEvent* e )
diff --git a/examples/DrawIntoPainter/mainwindow.cpp b/examples/DrawIntoPainter/mainwindow.cpp
index 0dd6258..a4d0e58 100644
--- a/examples/DrawIntoPainter/mainwindow.cpp
+++ b/examples/DrawIntoPainter/mainwindow.cpp
@@ -92,8 +92,8 @@ MainWindow::MainWindow( QWidget* parent ) :
#ifdef USE_FRAME_WIDGET
chartFrameWidget->setChart( m_chart );
// make sure, we re-draw after changing one of the chart's properties
- connect( m_chart, SIGNAL( propertiesChanged() ),
- chartFrameWidget, SLOT( update() ) ) ;
+ connect( m_chart, SIGNAL(propertiesChanged()),
+ chartFrameWidget, SLOT(update()) ) ;
#else
chartLayout->addWidget( m_chart );
#endif
diff --git a/examples/Gantt/legend_example/entrydialog.cpp b/examples/Gantt/legend_example/entrydialog.cpp
index 939a95b..08c3096 100644
--- a/examples/Gantt/legend_example/entrydialog.cpp
+++ b/examples/Gantt/legend_example/entrydialog.cpp
@@ -49,9 +49,9 @@ void EntryDialog::init()
for (int row = 0; row < model->rowCount(); ++row )
addDependItem( model, model->index( row, 0 ) );

- connect( ui->startDate, SIGNAL( dateTimeChanged( const QDateTime& ) ), this, SLOT( updateEndDate( const QDateTime& ) ) );
- connect( ui->readOnly, SIGNAL( toggled( bool ) ), this, SLOT( disableEditing( bool ) ) );
- connect( ui->type, SIGNAL( currentIndexChanged( int ) ), this, SLOT( typeChanged( int ) ) );
+ connect( ui->startDate, SIGNAL(dateTimeChanged(QDateTime)), this, SLOT(updateEndDate(QDateTime)) );
+ connect( ui->readOnly, SIGNAL(toggled(bool)), this, SLOT(disableEditing(bool)) );
+ connect( ui->type, SIGNAL(currentIndexChanged(int)), this, SLOT(typeChanged(int)) );

ui->startDate->setDateTime( QDateTime::currentDateTime() );
typeChanged( 0 );
diff --git a/examples/Gantt/legend_example/mainwindow.cpp b/examples/Gantt/legend_example/mainwindow.cpp
index 0364a86..3a42068 100644
--- a/examples/Gantt/legend_example/mainwindow.cpp
+++ b/examples/Gantt/legend_example/mainwindow.cpp
@@ -72,10 +72,10 @@ MainWindow::MainWindow( QWidget* parent, Qt::WindowFlags flags )
leftView->setColumnHidden( 5, true );
leftView->header()->setStretchLastSection( true );

- connect( ui->ganttView->leftView(), SIGNAL( customContextMenuRequested( const QPoint& ) ),
- this, SLOT( showContextMenu( const QPoint& ) ) );
- connect( ui->ganttView->selectionModel(), SIGNAL( selectionChanged( const QItemSelection&, const QItemSelection& ) ),
- this, SLOT( enableActions( const QItemSelection& ) ) );
+ connect( ui->ganttView->leftView(), SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(showContextMenu(QPoint)) );
+ connect( ui->ganttView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
+ this, SLOT(enableActions(QItemSelection)) );
}

MainWindow::~MainWindow()
@@ -136,22 +136,22 @@ void MainWindow::initActions()
{
newEntryAction = new QAction( tr( "New entry" ), this );
newEntryAction->setShortcut( QKeySequence::New );
- connect( newEntryAction, SIGNAL( triggered() ), this, SLOT( addNewEntry() ) );
+ connect( newEntryAction, SIGNAL(triggered()), this, SLOT(addNewEntry()) );

removeEntryAction = new QAction( tr( "Remove entry" ), this );
removeEntryAction->setShortcut( QKeySequence::Delete );
- connect( removeEntryAction, SIGNAL( triggered() ), this, SLOT( removeEntry() ) );
+ connect( removeEntryAction, SIGNAL(triggered()), this, SLOT(removeEntry()) );

zoomInAction = new QAction( tr( "Zoom In" ), this );
zoomInAction->setShortcut( QKeySequence::ZoomIn );
- connect( zoomInAction, SIGNAL( triggered() ), this, SLOT( zoomIn() ) );
+ connect( zoomInAction, SIGNAL(triggered()), this, SLOT(zoomIn()) );

zoomOutAction = new QAction( tr( "Zoom Out" ), this );
zoomOutAction->setShortcut( QKeySequence::ZoomOut );
- connect( zoomOutAction, SIGNAL( triggered() ), this, SLOT( zoomOut() ) );
+ connect( zoomOutAction, SIGNAL(triggered()), this, SLOT(zoomOut()) );

zoomFitAction = new QAction( tr( "Zoom to Fit" ), this );
- connect( zoomFitAction, SIGNAL( triggered() ), this, SLOT( zoomFit() ) );
+ connect( zoomFitAction, SIGNAL(triggered()), this, SLOT(zoomFit()) );

ui->ganttView->leftView()->setContextMenuPolicy( Qt::CustomContextMenu );
ui->ganttView->leftView()->addAction( newEntryAction );
diff --git a/examples/Gantt/project/mainwindow.cpp b/examples/Gantt/project/mainwindow.cpp
index 4ae115b..d408fc4 100644
--- a/examples/Gantt/project/mainwindow.cpp
+++ b/examples/Gantt/project/mainwindow.cpp
@@ -271,28 +271,28 @@ MainWindow::MainWindow( QWidget* parent )
QMenu* fileMenu = new QMenu( tr( "&File" ) );

#ifndef QT_NO_PRINTER
- fileMenu->addAction( tr( "&Save as PDF..." ), this, SLOT( slotFileSavePdf() ) );
- fileMenu->addAction( tr( "&Print..." ), this, SLOT( slotFilePrint() ) );
+ fileMenu->addAction( tr( "&Save as PDF..." ), this, SLOT(slotFileSavePdf()) );
+ fileMenu->addAction( tr( "&Print..." ), this, SLOT(slotFilePrint()) );
#endif

fileMenu->addSeparator();
- fileMenu->addAction( tr( "&Quit" ), this, SLOT( slotFileQuit() ) );
+ fileMenu->addAction( tr( "&Quit" ), this, SLOT(slotFileQuit()) );

mb->addMenu( fileMenu );

QMenu* toolsMenu = new QMenu( tr( "&Tools" ) );

- toolsMenu->addAction( tr( "&New Item" ), this, SLOT( slotToolsNewItem() ) );
- toolsMenu->addAction( tr( "&Add Item" ), this, SLOT( slotToolsAppendItem() ) );
+ toolsMenu->addAction( tr( "&New Item" ), this, SLOT(slotToolsNewItem()) );
+ toolsMenu->addAction( tr( "&Add Item" ), this, SLOT(slotToolsAppendItem()) );
toolsMenu->addSeparator();
QMenu *alignMenu = toolsMenu->addMenu( tr( "Ali&gn" ) );
- alignMenu->addAction( tr( "&Left" ), this, SLOT( slotAlignLeft() ) );
- alignMenu->addAction( tr( "&Center" ), this, SLOT( slotAlignCenter() ) );
- alignMenu->addAction( tr( "&Right" ), this, SLOT( slotAlignRight() ) );
- alignMenu->addAction( tr( "&Hidden" ), this, SLOT( slotAlignHidden() ) );
+ alignMenu->addAction( tr( "&Left" ), this, SLOT(slotAlignLeft()) );
+ alignMenu->addAction( tr( "&Center" ), this, SLOT(slotAlignCenter()) );
+ alignMenu->addAction( tr( "&Right" ), this, SLOT(slotAlignRight()) );
+ alignMenu->addAction( tr( "&Hidden" ), this, SLOT(slotAlignHidden()) );
toolsMenu->addSeparator();
- toolsMenu->addAction( tr( "&Collapse All" ), this, SLOT( slotCollapseAll() ) );
- toolsMenu->addAction( tr( "&Expand All" ), this, SLOT( slotExpandAll() ) );
+ toolsMenu->addAction( tr( "&Collapse All" ), this, SLOT(slotCollapseAll()) );
+ toolsMenu->addAction( tr( "&Expand All" ), this, SLOT(slotExpandAll()) );

mb->addMenu( toolsMenu );

diff --git a/examples/LeveyJennings/Simple/main.cpp b/examples/LeveyJennings/Simple/main.cpp
index 79732da..6067ca7 100644
--- a/examples/LeveyJennings/Simple/main.cpp
+++ b/examples/LeveyJennings/Simple/main.cpp
@@ -40,7 +40,7 @@ public:
view( view )
{
QTimer* const t = new QTimer( this );
- connect( t, SIGNAL( timeout() ), this, SLOT( animate() ) );
+ connect( t, SIGNAL(timeout()), this, SLOT(animate()) );
t->start( 1000 );
}

diff --git a/examples/Lines/Advanced/mainwindow.cpp b/examples/Lines/Advanced/mainwindow.cpp
index ec1ae88..be8dacd 100644
--- a/examples/Lines/Advanced/mainwindow.cpp
+++ b/examples/Lines/Advanced/mainwindow.cpp
@@ -60,7 +60,7 @@ MainWindow::MainWindow( QWidget* parent ) :
m_chart->setGlobalLeading( 20, 20, 20, 20 );
// Instantiate the timer
QTimer* timer = new QTimer( this );
- connect( timer, SIGNAL( timeout() ), this, SLOT( slot_timerFired() ) );
+ connect( timer, SIGNAL(timeout()), this, SLOT(slot_timerFired()) );
timer->start( 30 );

//Change the cursor to IBeamCursor inside Chart widget.
diff --git a/examples/ModelView/TableView/mainwindow.cpp b/examples/ModelView/TableView/mainwindow.cpp
index 4ea66d2..048c21d 100644
--- a/examples/ModelView/TableView/mainwindow.cpp
+++ b/examples/ModelView/TableView/mainwindow.cpp
@@ -59,10 +59,10 @@ MainWindow::MainWindow()
connect( saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
connect( quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));

- connect( m_selectionModel, SIGNAL( selectionChanged( const QItemSelection &, const QItemSelection & ) ),
- this, SLOT( selectionChanged( const QItemSelection &, const QItemSelection & ) ) );
+ connect( m_selectionModel, SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
+ this, SLOT(selectionChanged(QItemSelection,QItemSelection)) );

- connect( m_diagramView, SIGNAL( clicked( const QModelIndex& ) ), SLOT( itemClicked( const QModelIndex& ) ) );
+ connect( m_diagramView, SIGNAL(clicked(QModelIndex)), SLOT(itemClicked(QModelIndex)) );

menuBar()->addMenu( fileMenu );
statusBar();
diff --git a/examples/Pie/Advanced/mainwindow.cpp b/examples/Pie/Advanced/mainwindow.cpp
index a31a2e9..67666e2 100644
--- a/examples/Pie/Advanced/mainwindow.cpp
+++ b/examples/Pie/Advanced/mainwindow.cpp
@@ -54,7 +54,7 @@ MainWindow::MainWindow( QWidget* parent ) :
m_chart->coordinatePlane()->replaceDiagram( m_pie );

m_timer = new QTimer( this );
- connect( m_timer, SIGNAL( timeout() ), this, SLOT( slotNextFrame() ) );
+ connect( m_timer, SIGNAL(timeout()), this, SLOT(slotNextFrame()) );
}

void MainWindow::on_startPositionSB_valueChanged( double pos )
diff --git a/examples/Plotter/BigDataset/MainWidget.cpp b/examples/Plotter/BigDataset/MainWidget.cpp
index 39f2ccc..31e869a 100644
--- a/examples/Plotter/BigDataset/MainWidget.cpp
+++ b/examples/Plotter/BigDataset/MainWidget.cpp
@@ -66,16 +66,16 @@ MainWidget::MainWidget()
<< m_controls.noiseRadio << m_controls.oneDivSineRadio
<< m_controls.sineOneDivRadio;
foreach ( QRadioButton* r, m_functionSelector ) {
- connect( r, SIGNAL( toggled( bool ) ), SLOT( functionToggled( bool ) ) );
+ connect( r, SIGNAL(toggled(bool)), SLOT(functionToggled(bool)) );
}

- connect( m_controls.runButton, SIGNAL( toggled( bool ) ),
- &m_model, SLOT( setRunning( bool ) ) );
+ connect( m_controls.runButton, SIGNAL(toggled(bool)),
+ &m_model, SLOT(setRunning(bool)) );

// order matters again
m_addPointsButtons << m_controls.add1kButton << m_controls.add10kButton << m_controls.add100kButton;
foreach ( QPushButton* b, m_addPointsButtons ) {
- connect( b, SIGNAL( clicked( bool ) ), SLOT( addPointsButtonClicked() ) );
+ connect( b, SIGNAL(clicked(bool)), SLOT(addPointsButtonClicked()) );
}
}

diff --git a/examples/Plotter/BigDataset/Model.cpp b/examples/Plotter/BigDataset/Model.cpp
index 20b07cf..85c36a7 100644
--- a/examples/Plotter/BigDataset/Model.cpp
+++ b/examples/Plotter/BigDataset/Model.cpp
@@ -31,7 +31,7 @@ Model::Model()
m_function( SineFunction )
{
m_appendTimer.setInterval( 3 );
- connect( &m_appendTimer, SIGNAL( timeout() ), SLOT( appendPoint() ) );
+ connect( &m_appendTimer, SIGNAL(timeout()), SLOT(appendPoint()) );
// pre-fill some values
appendPoints( 100 );
}
diff --git a/examples/Plotter/BubbleChart/mainwindow.cpp b/examples/Plotter/BubbleChart/mainwindow.cpp
index d4d7f00..153d998 100644
--- a/examples/Plotter/BubbleChart/mainwindow.cpp
+++ b/examples/Plotter/BubbleChart/mainwindow.cpp
@@ -92,7 +92,7 @@ MainWindow::MainWindow( QWidget* parent ) :
m_plotter->addAxis( xAxis2 );
m_plotter->addAxis( yAxis );
m_plotter->addAxis( yAxis2 );
- connect( threeDEnabled, SIGNAL( toggled(bool) ), this, SLOT( setMarkerAttributes() ) );
+ connect( threeDEnabled, SIGNAL(toggled(bool)), this, SLOT(setMarkerAttributes()) );

m_chart->coordinatePlane()->replaceDiagram( m_plotter );
m_chart->setGlobalLeading( 20, 20, 20, 20 );
diff --git a/examples/Plotter/Logarithmic/main.cpp b/examples/Plotter/Logarithmic/main.cpp
index 0f4ff5f..39978af 100644
--- a/examples/Plotter/Logarithmic/main.cpp
+++ b/examples/Plotter/Logarithmic/main.cpp
@@ -29,7 +29,6 @@
#include <KChartCartesianAxis>
#include <KChartCartesianCoordinatePlane>
#include <KChartLegend>
-#include <QStandardItemModel>

#include <QApplication>

diff --git a/examples/Plotter/Timeline/main.cpp b/examples/Plotter/Timeline/main.cpp
index 0de09b8..99c4824 100644
--- a/examples/Plotter/Timeline/main.cpp
+++ b/examples/Plotter/Timeline/main.cpp
@@ -80,17 +80,17 @@ public:

plotter->setModel( proxy );

- connect( proxy, SIGNAL( rowsInserted( QModelIndex, int, int ) ),
- m_chart->coordinatePlane(), SLOT( adjustRangesToData() ) );
- connect( proxy, SIGNAL( rowsRemoved( QModelIndex, int, int ) ),
- m_chart->coordinatePlane(), SLOT( adjustRangesToData() ) );
+ connect( proxy, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ m_chart->coordinatePlane(), SLOT(adjustRangesToData()) );
+ connect( proxy, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ m_chart->coordinatePlane(), SLOT(adjustRangesToData()) );

proxy->setVisibleRange( QDateTime( QDate( 2010, 3, 15 ), QTime() ),
QDateTime( QDate( 2010, 5, 18 ), QTime() ) );
qobject_cast< KChart::CartesianCoordinatePlane* >( m_chart->coordinatePlane() )->adjustRangesToData();

m_timer = new QTimer(this);
- connect( m_timer, SIGNAL( timeout() ), this, SLOT( slotTimeout() ) );
+ connect( m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout()) );
}
private slots:
void slotTimeout() {
diff --git a/examples/Plotter/Timeline/timeaxis.cpp b/examples/Plotter/Timeline/timeaxis.cpp
index b24e9e4..b2c3c0c 100644
--- a/examples/Plotter/Timeline/timeaxis.cpp
+++ b/examples/Plotter/Timeline/timeaxis.cpp
@@ -19,7 +19,7 @@

#include "timeaxis.h"

-#include <QtCore/QDateTime>
+#include <QDateTime>

TimeAxis::TimeAxis( KChart::AbstractCartesianDiagram* parent )
: KChart::CartesianAxis( parent )
diff --git a/examples/RealTime/main.cpp b/examples/RealTime/main.cpp
index af3202c..104b44e 100644
--- a/examples/RealTime/main.cpp
+++ b/examples/RealTime/main.cpp
@@ -50,8 +50,8 @@ public:
l->addWidget(&m_chart);
setLayout(l);
m_timer = new QTimer(this);
- connect( m_timer, SIGNAL( timeout() ),
- this, SLOT( slotTimeout() ) );
+ connect( m_timer, SIGNAL(timeout()),
+ this, SLOT(slotTimeout()) );
m_timer->start( 200 );
}

diff --git a/examples/Stock/Advanced/mainwindow.cpp b/examples/Stock/Advanced/mainwindow.cpp
index d9af76c..ebfd0f4 100644
--- a/examples/Stock/Advanced/mainwindow.cpp
+++ b/examples/Stock/Advanced/mainwindow.cpp
@@ -60,7 +60,7 @@ MainWindow::MainWindow( QWidget *parent )
m_diagram.addAxis( bottomAxis );
m_diagram.addAxis( bottomAxis );
applyColor( QColor( "chartreuse" ) );
- const bool connected = connect( colorChooser, SIGNAL( clicked() ), SLOT( chooseColor() ) );
+ const bool connected = connect( colorChooser, SIGNAL(clicked()), SLOT(chooseColor()) );
Q_ASSERT( connected );
Q_UNUSED( connected );

diff --git a/examples/TernaryCharts/Advanced/mainwindow.cpp b/examples/TernaryCharts/Advanced/mainwindow.cpp
index 1f6e900..64a62d4 100644
--- a/examples/TernaryCharts/Advanced/mainwindow.cpp
+++ b/examples/TernaryCharts/Advanced/mainwindow.cpp
@@ -59,8 +59,8 @@ MainWindow::MainWindow( QWidget* parent )

setupModel();
m_diagram->setModel( &m_model );
- connect( m_diagram, SIGNAL( clicked( QModelIndex ) ),
- SLOT( indexClicked( QModelIndex ) ) );
+ connect( m_diagram, SIGNAL(clicked(QModelIndex)),
+ SLOT(indexClicked(QModelIndex)) );
}

void MainWindow::setupModel()
diff --git a/examples/Widget/Advanced/mainwindow.cpp b/examples/Widget/Advanced/mainwindow.cpp
index 1d39d1c..9137f8d 100644
--- a/examples/Widget/Advanced/mainwindow.cpp
+++ b/examples/Widget/Advanced/mainwindow.cpp
@@ -37,12 +37,12 @@ MainWindow::MainWindow( QWidget* parent )

typeSelector->setCurrentIndex(1); // we start by LineDiagram

- connect( typeSelector, SIGNAL( activated( int ) ), SLOT( changeType() ) );
+ connect( typeSelector, SIGNAL(activated(int)), SLOT(changeType()) );

- connect( btnAddDataset, SIGNAL( clicked() ), SLOT( addDataset() ) );
+ connect( btnAddDataset, SIGNAL(clicked()), SLOT(addDataset()) );

- connect( leadingSelector, SIGNAL( valueChanged( int ) ),
- this, SLOT( changeLeading( int ) ) );
+ connect( leadingSelector, SIGNAL(valueChanged(int)),
+ this, SLOT(changeLeading(int)) );
}

void MainWindow::changeType()
diff --git a/examples/Zoom/ScrollBars/mainwindow.cpp b/examples/Zoom/ScrollBars/mainwindow.cpp
index 275b977..c856b55 100644
--- a/examples/Zoom/ScrollBars/mainwindow.cpp
+++ b/examples/Zoom/ScrollBars/mainwindow.cpp
@@ -60,7 +60,7 @@ MainWindow::MainWindow( QWidget* parent ) :
m_lines->addAxis( yAxis );
m_chart->coordinatePlane()->replaceDiagram( m_lines );

- connect( m_chart, SIGNAL( propertiesChanged() ), SLOT( applyNewZoomParameters() ) );
+ connect( m_chart, SIGNAL(propertiesChanged()), SLOT(applyNewZoomParameters()) );

// Set up the legend
m_legend = new Legend( m_lines, m_chart );
diff --git a/examples/demo/axissettings.cpp b/examples/demo/axissettings.cpp
index 26b8db9..5f8d88e 100644
--- a/examples/demo/axissettings.cpp
+++ b/examples/demo/axissettings.cpp
@@ -21,8 +21,8 @@

#include "ui_axissettings.h"

-#include <QtCore/QHash>
-#include <QtCore/QVector>
+#include <QHash>
+#include <QVector>

#include <QComboBox>

@@ -69,10 +69,10 @@ void AxisSettings::Private::init()
ui.axisSelection->addItem( QIcon(), tr( "Right Y-Axis" ), CartesianAxis::Right );
ui.axisSelection->addItem( QIcon(), tr( "Bottom X-Axis" ), CartesianAxis::Bottom );
ui.axisSelection->addItem( QIcon(), tr( "Top X-Axis" ), CartesianAxis::Top );
- connect( ui.axisSelection, SIGNAL( currentIndexChanged( int ) ), this, SLOT( currentIndexChanged( int ) ) );
- connect( ui.axisVisibility, SIGNAL( toggled( bool ) ), this, SLOT( setVisible( bool ) ) );
- connect( ui.majorTicks, SIGNAL( toggled( bool ) ), this, SLOT( setShowMajorTickMarks( bool ) ) );
- connect( ui.minorTicks, SIGNAL( toggled( bool ) ), this, SLOT( setShowMinorTickMarks( bool ) ) );
+ connect( ui.axisSelection, SIGNAL(currentIndexChanged(int)), this, SLOT(currentIndexChanged(int)) );
+ connect( ui.axisVisibility, SIGNAL(toggled(bool)), this, SLOT(setVisible(bool)) );
+ connect( ui.majorTicks, SIGNAL(toggled(bool)), this, SLOT(setShowMajorTickMarks(bool)) );
+ connect( ui.minorTicks, SIGNAL(toggled(bool)), this, SLOT(setShowMinorTickMarks(bool)) );
ui.axisSelection->setCurrentIndex( 0 );
}

diff --git a/examples/demo/colorslider.cpp b/examples/demo/colorslider.cpp
index 8991761..6bfff10 100644
--- a/examples/demo/colorslider.cpp
+++ b/examples/demo/colorslider.cpp
@@ -19,9 +19,9 @@

#include "colorslider.h"

-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QMouseEvent>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QMouseEvent>

#include <QDebug>

diff --git a/examples/demo/datasetsettings.cpp b/examples/demo/datasetsettings.cpp
index 98eaa41..6eaca1b 100644
--- a/examples/demo/datasetsettings.cpp
+++ b/examples/demo/datasetsettings.cpp
@@ -28,11 +28,11 @@

#include <QStyleFactory>

-#include <QtGui/QImage>
+#include <QImage>

-#include <QtCore/QObject>
+#include <QObject>

-#include <QtCore/QDebug>
+#include <QDebug>

#include "gradientdialog.h"

@@ -144,9 +144,9 @@ DatasetSettings::DatasetSettings( Chart *chart, QWidget *parent )
d->ui->colorDisplay->setStyle( QStyleFactory::create( QStringLiteral( "cleanlooks" ) ) );
d->ui->outlineBtn->setStyle( QStyleFactory::create( QStringLiteral( "cleanlooks" ) ) );
#endif
- connect( d->ui->datasetSelector, SIGNAL( currentIndexChanged( int ) ), this, SLOT( indexChanged( int ) ) );
- connect( d->ui->colorDisplay, SIGNAL( clicked() ), d, SLOT( changeColor() ) );
- connect( d->ui->outlineBtn, SIGNAL( clicked() ), d, SLOT( changeOutline() ) );
+ connect( d->ui->datasetSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(indexChanged(int)) );
+ connect( d->ui->colorDisplay, SIGNAL(clicked()), d, SLOT(changeColor()) );
+ connect( d->ui->outlineBtn, SIGNAL(clicked()), d, SLOT(changeOutline()) );
}

DatasetSettings::~DatasetSettings()
diff --git a/examples/demo/datavaluesettings.cpp b/examples/demo/datavaluesettings.cpp
index 15fb8aa..ee4669a 100644
--- a/examples/demo/datavaluesettings.cpp
+++ b/examples/demo/datavaluesettings.cpp
@@ -103,28 +103,28 @@ void DataValueSettings::Private::init()

void DataValueSettings::Private::connectWidgets()
{
- connect( ui->scopeBarDatasetSB, SIGNAL( valueChanged( int ) ), this, SLOT( on_scopeBarDatasetSB_valueChanged( int ) ) );
- connect( ui->scopeBarItemSB, SIGNAL( valueChanged( int ) ), this, SLOT( on_scopeBarItemSB_valueChanged( int ) ) );
- connect( ui->scopeDatasetSB, SIGNAL( valueChanged( int ) ), this, SLOT( on_scopeDatasetSB_valueChanged( int ) ) );
- connect( ui->scopeOneBarRB, SIGNAL( toggled( bool ) ), this, SLOT( on_scopeOneBarRB_toggled( bool ) ) );
- connect( ui->scopeDatasetRB, SIGNAL( toggled( bool ) ), this, SLOT( on_scopeDatasetRB_toggled( bool ) ) );
- connect( ui->scopeCommonRB, SIGNAL( toggled( bool ) ), this, SLOT( on_scopeCommonRB_toggled( bool ) ) );
- connect( ui->paintValuesCB, SIGNAL( toggled( bool ) ), this, SLOT( on_paintValuesCB_toggled( bool ) ) );
- connect( ui->fontCombo, SIGNAL( currentIndexChanged( QString ) ), this , SLOT( on_fontCombo_currentIndexChanged( QString ) ) );
- connect( ui->relativeSizeSB, SIGNAL( valueChanged( int ) ), this, SLOT( on_relativeSizeSB_valueChanged( int ) ) );
- connect( ui->minimumSizeSB, SIGNAL( valueChanged( int ) ), this, SLOT( on_minimumSizeSB_valueChanged( int ) ) );
- connect( ui->rotationSB, SIGNAL( valueChanged( int ) ), this, SLOT( on_rotationSB_valueChanged( int ) ) );
- connect( ui->posPosCombo, SIGNAL( currentIndexChanged( QString ) ), this, SLOT( on_posPosCombo_currentIndexChanged( QString ) ) );
- connect( ui->posAlignCombo, SIGNAL( currentIndexChanged( QString ) ), this, SLOT( on_posAlignCombo_currentIndexChanged( QString ) ) );
- connect( ui->posPadHoriSB, SIGNAL( valueChanged(int) ), this, SLOT( on_posPadHoriSB_valueChanged(int) ) );
- connect( ui->posPadVertSB, SIGNAL( valueChanged(int) ), this, SLOT( on_posPadVertSB_valueChanged(int) ) );
- connect( ui->negPosCombo, SIGNAL( currentIndexChanged( QString ) ), this, SLOT( on_negPosCombo_currentIndexChanged( QString ) ) );
- connect( ui->negAlignCombo, SIGNAL( currentIndexChanged( QString ) ), this, SLOT( on_negAlignCombo_currentIndexChanged( QString ) ) );
- connect( ui->negPadHoriSB, SIGNAL( valueChanged( int ) ), this, SLOT( on_negPadHoriSB_valueChanged( int ) ) );
- connect( ui->negPadVertSB, SIGNAL( valueChanged( int ) ), this, SLOT( on_negPadVertSB_valueChanged( int ) ) );
- connect( ui->labelLE, SIGNAL( textEdited( QString ) ), this, SLOT( on_labelLE_textEdited( QString ) ) );
- connect( ui->prefixLE, SIGNAL( textEdited( QString ) ), this, SLOT( on_prefixLE_textEdited( QString ) ) );
- connect( ui->suffixLE, SIGNAL( textEdited( QString ) ), this, SLOT( on_suffixLE_textEdited( QString ) ) );
+ connect( ui->scopeBarDatasetSB, SIGNAL(valueChanged(int)), this, SLOT(on_scopeBarDatasetSB_valueChanged(int)) );
+ connect( ui->scopeBarItemSB, SIGNAL(valueChanged(int)), this, SLOT(on_scopeBarItemSB_valueChanged(int)) );
+ connect( ui->scopeDatasetSB, SIGNAL(valueChanged(int)), this, SLOT(on_scopeDatasetSB_valueChanged(int)) );
+ connect( ui->scopeOneBarRB, SIGNAL(toggled(bool)), this, SLOT(on_scopeOneBarRB_toggled(bool)) );
+ connect( ui->scopeDatasetRB, SIGNAL(toggled(bool)), this, SLOT(on_scopeDatasetRB_toggled(bool)) );
+ connect( ui->scopeCommonRB, SIGNAL(toggled(bool)), this, SLOT(on_scopeCommonRB_toggled(bool)) );
+ connect( ui->paintValuesCB, SIGNAL(toggled(bool)), this, SLOT(on_paintValuesCB_toggled(bool)) );
+ connect( ui->fontCombo, SIGNAL(currentIndexChanged(QString)), this , SLOT(on_fontCombo_currentIndexChanged(QString)) );
+ connect( ui->relativeSizeSB, SIGNAL(valueChanged(int)), this, SLOT(on_relativeSizeSB_valueChanged(int)) );
+ connect( ui->minimumSizeSB, SIGNAL(valueChanged(int)), this, SLOT(on_minimumSizeSB_valueChanged(int)) );
+ connect( ui->rotationSB, SIGNAL(valueChanged(int)), this, SLOT(on_rotationSB_valueChanged(int)) );
+ connect( ui->posPosCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(on_posPosCombo_currentIndexChanged(QString)) );
+ connect( ui->posAlignCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(on_posAlignCombo_currentIndexChanged(QString)) );
+ connect( ui->posPadHoriSB, SIGNAL(valueChanged(int)), this, SLOT(on_posPadHoriSB_valueChanged(int)) );
+ connect( ui->posPadVertSB, SIGNAL(valueChanged(int)), this, SLOT(on_posPadVertSB_valueChanged(int)) );
+ connect( ui->negPosCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(on_negPosCombo_currentIndexChanged(QString)) );
+ connect( ui->negAlignCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(on_negAlignCombo_currentIndexChanged(QString)) );
+ connect( ui->negPadHoriSB, SIGNAL(valueChanged(int)), this, SLOT(on_negPadHoriSB_valueChanged(int)) );
+ connect( ui->negPadVertSB, SIGNAL(valueChanged(int)), this, SLOT(on_negPadVertSB_valueChanged(int)) );
+ connect( ui->labelLE, SIGNAL(textEdited(QString)), this, SLOT(on_labelLE_textEdited(QString)) );
+ connect( ui->prefixLE, SIGNAL(textEdited(QString)), this, SLOT(on_prefixLE_textEdited(QString)) );
+ connect( ui->suffixLE, SIGNAL(textEdited(QString)), this, SLOT(on_suffixLE_textEdited(QString)) );
}

DataValueSettings::DataValueSettings( KChart::Chart *chart, QWidget* parent )
diff --git a/examples/demo/diagramsettings.cpp b/examples/demo/diagramsettings.cpp
index 720fd57..03a7ff3 100644
--- a/examples/demo/diagramsettings.cpp
+++ b/examples/demo/diagramsettings.cpp
@@ -192,11 +192,11 @@ void DiagramSettings::Private::init()
ui->diagramBackground->setStyle( QStyleFactory::create( QStringLiteral( "cleanlooks" ) ) );
#endif

- connect( ui->threeDSelector, SIGNAL( toggled( bool ) ), this, SLOT( changeThreeD() ) );
- connect( ui->diagramBackground, SIGNAL( clicked() ), this, SLOT( changeBackgroundColor() ) );
- connect( ui->visibleBtn, SIGNAL( toggled( bool ) ), this, SLOT( changeBackgroundVisibility() ) );
- connect( ui->barHeightInput, SIGNAL( valueChanged( int ) ), this, SLOT( changeThreeD() ) );
- connect( ui->autoGradient, SIGNAL( toggled( bool ) ), this, SLOT( changeAutoGradient() ) );
+ connect( ui->threeDSelector, SIGNAL(toggled(bool)), this, SLOT(changeThreeD()) );
+ connect( ui->diagramBackground, SIGNAL(clicked()), this, SLOT(changeBackgroundColor()) );
+ connect( ui->visibleBtn, SIGNAL(toggled(bool)), this, SLOT(changeBackgroundVisibility()) );
+ connect( ui->barHeightInput, SIGNAL(valueChanged(int)), this, SLOT(changeThreeD()) );
+ connect( ui->autoGradient, SIGNAL(toggled(bool)), this, SLOT(changeAutoGradient()) );

qq->refreshSettings();
}
diff --git a/examples/demo/diagramtypedialog.cpp b/examples/demo/diagramtypedialog.cpp
index 4f69bff..fd1450f 100644
--- a/examples/demo/diagramtypedialog.cpp
+++ b/examples/demo/diagramtypedialog.cpp
@@ -85,8 +85,8 @@ void DiagramTypeDialog::Private::init()
m_typemap[ DiagramTypeDialog::Line ] = DiagramTypeDialog::Normal;
m_typemap[ DiagramTypeDialog::Plotter ] = DiagramTypeDialog::Normal;

- connect( ui.typeSelector, SIGNAL( currentIndexChanged( int ) ), this, SLOT( typeChanged( int ) ) );
- connect( ui.subtypeSelector, SIGNAL( currentIndexChanged( int ) ), this, SLOT( subtypeChanged( int ) ) );
+ connect( ui.typeSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(typeChanged(int)) );
+ connect( ui.subtypeSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(subtypeChanged(int)) );
}

void DiagramTypeDialog::Private::createPlanes()
diff --git a/examples/demo/diagramtypedialog.h b/examples/demo/diagramtypedialog.h
index 5202e2a..9a1a936 100644
--- a/examples/demo/diagramtypedialog.h
+++ b/examples/demo/diagramtypedialog.h
@@ -21,7 +21,7 @@
#define DIAGRAMTYPEDIALOG_H

#include <QDialog>
-#include <QtCore/QHash>
+#include <QHash>

class QAbstractItemModel;
namespace KChart
diff --git a/examples/demo/gradientdialog.cpp b/examples/demo/gradientdialog.cpp
index c45d64c..82c2f61 100644
--- a/examples/demo/gradientdialog.cpp
+++ b/examples/demo/gradientdialog.cpp
@@ -141,8 +141,8 @@ void GradientDialog::Private::init()
redSpin->setMaximum( 255 );
redSpin->setAccelerated( true );
redSpin->setValue( redSlider->value() );
- connect( redSpin, SIGNAL( valueChanged( int ) ), redSlider, SLOT( setValue( int ) ) );
- connect( redSlider, SIGNAL( valueChanged( int ) ), redSpin, SLOT( setValue( int ) ) );
+ connect( redSpin, SIGNAL(valueChanged(int)), redSlider, SLOT(setValue(int)) );
+ connect( redSlider, SIGNAL(valueChanged(int)), redSpin, SLOT(setValue(int)) );
redLayout->addWidget( redSlider );
redLayout->addWidget( redSpin );

@@ -161,8 +161,8 @@ void GradientDialog::Private::init()
greenSpin->setMaximum( 255 );
greenSpin->setAccelerated( true );
greenSpin->setValue( greenSlider->value() );
- connect( greenSpin, SIGNAL( valueChanged( int ) ), greenSlider, SLOT( setValue( int ) ) );
- connect( greenSlider, SIGNAL( valueChanged( int ) ), greenSpin, SLOT( setValue( int ) ) );
+ connect( greenSpin, SIGNAL(valueChanged(int)), greenSlider, SLOT(setValue(int)) );
+ connect( greenSlider, SIGNAL(valueChanged(int)), greenSpin, SLOT(setValue(int)) );
greenLayout->addWidget( greenSlider );
greenLayout->addWidget( greenSpin );

@@ -181,22 +181,22 @@ void GradientDialog::Private::init()
blueSpin->setMaximum( 255 );
blueSpin->setAccelerated( true );
blueSpin->setValue( blueSlider->value() );
- connect( blueSpin, SIGNAL( valueChanged( int ) ), blueSlider, SLOT( setValue( int ) ) );
- connect( blueSlider, SIGNAL( valueChanged( int ) ), blueSpin, SLOT( setValue( int ) ) );
+ connect( blueSpin, SIGNAL(valueChanged(int)), blueSlider, SLOT(setValue(int)) );
+ connect( blueSlider, SIGNAL(valueChanged(int)), blueSpin, SLOT(setValue(int)) );
blueLayout->addWidget( blueSlider );
blueLayout->addWidget( blueSpin );

updateGradientDisplay();

- connect( redSlider, SIGNAL( valueChanged( int ) ), this, SLOT( resetColors() ) );
- connect( greenSlider, SIGNAL( valueChanged( int ) ), this, SLOT( resetColors() ) );
- connect( blueSlider, SIGNAL( valueChanged( int ) ), this, SLOT( resetColors() ) );
+ connect( redSlider, SIGNAL(valueChanged(int)), this, SLOT(resetColors()) );
+ connect( greenSlider, SIGNAL(valueChanged(int)), this, SLOT(resetColors()) );
+ connect( blueSlider, SIGNAL(valueChanged(int)), this, SLOT(resetColors()) );

- connect( ui->newStop, SIGNAL( clicked() ), this, SLOT( insertItem() ) );
- connect( ui->deleteStop, SIGNAL( clicked() ), this, SLOT( deleteItem() ) );
- connect( ui->stopSelector, SIGNAL( currentIndexChanged( int ) ), this, SLOT( changedIndex( int ) ) );
+ connect( ui->newStop, SIGNAL(clicked()), this, SLOT(insertItem()) );
+ connect( ui->deleteStop, SIGNAL(clicked()), this, SLOT(deleteItem()) );
+ connect( ui->stopSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(changedIndex(int)) );

- connect( ui->stopPosition, SIGNAL( valueChanged( double ) ), this, SLOT( changeStopPosition( double ) ) );
+ connect( ui->stopPosition, SIGNAL(valueChanged(double)), this, SLOT(changeStopPosition(double)) );
}

GradientDialog::GradientDialog( QWidget *parent )
diff --git a/examples/demo/main.cpp b/examples/demo/main.cpp
index 78db7c0..242fe5c 100644
--- a/examples/demo/main.cpp
+++ b/examples/demo/main.cpp
@@ -47,8 +47,8 @@
// l->addWidget(&m_chart);
// setLayout(l);
// m_timer = new QTimer(this);
-// connect( m_timer, SIGNAL( timeout() ),
-// this, SLOT( slotTimeout() ) );
+// connect( m_timer, SIGNAL(timeout()),
+// this, SLOT(slotTimeout()) );
// m_timer->start( 200 );
// }

diff --git a/examples/demo/mainwindow.cpp b/examples/demo/mainwindow.cpp
index a7fa379..bee7c8a 100644
--- a/examples/demo/mainwindow.cpp
+++ b/examples/demo/mainwindow.cpp
@@ -98,7 +98,7 @@ MainWindow::Private::Private( MainWindow *q )
QDockWidget *diagramTypeSettingsDock = new QDockWidget( tr( "DiagramType" ), qq );
diagramTypeSettingsDock->setWidget( diagramTypeSettings );
diagramTypeSettingsDock->setFloating( false );
- connect( diagramTypeSettings, SIGNAL( diagramTypeChanged( DiagramType, Subtype ) ), this, SLOT( changedChartType() ) );
+ connect( diagramTypeSettings, SIGNAL(diagramTypeChanged(DiagramType,Subtype)), this, SLOT(changedChartType()) );
q->addDockWidget( Qt::LeftDockWidgetArea, diagramTypeSettingsDock );

AxisSettings *axisSettings = new AxisSettings( m_chartWin, qq );
@@ -106,15 +106,15 @@ MainWindow::Private::Private( MainWindow *q )
axisSettingsDock->setWidget( axisSettings );
axisSettingsDock->setFloating( false );
q->addDockWidget( Qt::LeftDockWidgetArea, axisSettingsDock );
- connect( diagramTypeSettings, SIGNAL( diagramTypeChanged( DiagramType, Subtype ) ), axisSettings, SLOT( diagramTypeChanged() ) );
+ connect( diagramTypeSettings, SIGNAL(diagramTypeChanged(DiagramType,Subtype)), axisSettings, SLOT(diagramTypeChanged()) );

DatasetSettings *setSettings = new DatasetSettings( m_chartWin, qq );
QDockWidget *setSettingsDock = new QDockWidget( tr( "DatasetSettings" ), qq );
setSettingsDock->setWidget( setSettings );
setSettingsDock->setFloating( false );
q->addDockWidget( Qt::LeftDockWidgetArea, setSettingsDock );
- connect( this, SIGNAL( datasetCountChanged( int ) ), setSettings, SLOT( setDatasetCount( int ) ) );
- connect( diagramTypeSettings, SIGNAL( diagramTypeChanged( DiagramType, Subtype ) ), setSettings, SLOT( diagramTypeChanged() ) );
+ connect( this, SIGNAL(datasetCountChanged(int)), setSettings, SLOT(setDatasetCount(int)) );
+ connect( diagramTypeSettings, SIGNAL(diagramTypeChanged(DiagramType,Subtype)), setSettings, SLOT(diagramTypeChanged()) );
setSettings->setDatasetCount( m_model->columnCount() );

DiagramSettings *diagSettings = new DiagramSettings( m_chartWin, qq );
@@ -122,14 +122,14 @@ MainWindow::Private::Private( MainWindow *q )
diagSettingsDock->setWidget( diagSettings );
diagSettingsDock->setFloating( false );
q->addDockWidget( Qt::LeftDockWidgetArea, diagSettingsDock );
- connect( diagramTypeSettings, SIGNAL( diagramTypeChanged( DiagramType, Subtype ) ), diagSettings, SLOT( refreshSettings() ) );
+ connect( diagramTypeSettings, SIGNAL(diagramTypeChanged(DiagramType,Subtype)), diagSettings, SLOT(refreshSettings()) );

DataValueSettings *dataValueSettings = new DataValueSettings( m_chartWin, qq );
QDockWidget *dataValueSettingsDock = new QDockWidget( tr( "DataValueSettings" ), qq );
dataValueSettingsDock->setWidget( dataValueSettings );
dataValueSettingsDock->setFloating( false );
q->addDockWidget( Qt::RightDockWidgetArea, dataValueSettingsDock );
- connect( diagramTypeSettings, SIGNAL( diagramTypeChanged( DiagramType, Subtype ) ), dataValueSettings, SLOT( refresh() ) );
+ connect( diagramTypeSettings, SIGNAL(diagramTypeChanged(DiagramType,Subtype)), dataValueSettings, SLOT(refresh()) );

}

diff --git a/qtests/DrawIntoPainter/framewidget.cpp b/qtests/DrawIntoPainter/framewidget.cpp
index c473fa2..0c353d7 100644
--- a/qtests/DrawIntoPainter/framewidget.cpp
+++ b/qtests/DrawIntoPainter/framewidget.cpp
@@ -36,7 +36,7 @@ void FrameWidget::setChart( KChart::Chart* chart )
mChart = chart;
// This is necessary because Chart can't automatically schedule somebody else (this object) to
// call its custom paint method.
- connect( mChart, SIGNAL( propertiesChanged() ), SLOT( update() ) );
+ connect( mChart, SIGNAL(propertiesChanged()), SLOT(update()) );
}

void FrameWidget::paintEvent( QPaintEvent* e )
diff --git a/qtests/DrawIntoPainter/mainwindow.cpp b/qtests/DrawIntoPainter/mainwindow.cpp
index f5b6508..6ffd500 100644
--- a/qtests/DrawIntoPainter/mainwindow.cpp
+++ b/qtests/DrawIntoPainter/mainwindow.cpp
@@ -93,8 +93,8 @@ MainWindow::MainWindow( QWidget* parent ) :
#ifdef USE_FRAME_WIDGET
chartFrameWidget->setChart( m_chart );
// make sure, we re-draw after changing one of the chart's properties
- connect( m_chart, SIGNAL( propertiesChanged() ),
- chartFrameWidget, SLOT( update() ) ) ;
+ connect( m_chart, SIGNAL(propertiesChanged()),
+ chartFrameWidget, SLOT(update()) ) ;
#else
chartLayout->addWidget( m_chart );
#endif
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.cpp
index 6663eff..a9c1cf0 100644
--- a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.cpp
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.cpp
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#include "KChartNormalLineDiagram_p.h"
#include <limits>

#include <QAbstractItemModel>
@@ -26,7 +27,6 @@
#include "KChartTextAttributes.h"
#include "KChartAttributesModel.h"
#include "KChartAbstractCartesianDiagram.h"
-#include "KChartNormalLineDiagram_p.h"
#include "PaintingHelpers_p.h"

using namespace KChart;
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.cpp
index 9928a8d..86f3dd9 100644
--- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.cpp
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.cpp
@@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#include "KChartStackedBarDiagram_p.h"
#include <QModelIndex>

#include "KChartBarDiagram.h"
#include "KChartTextAttributes.h"
#include "KChartAttributesModel.h"
#include "KChartAbstractCartesianDiagram.h"
-#include "KChartStackedBarDiagram_p.h"

using namespace KChart;

diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
index 1a5b003..495c6e9 100644
--- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
@@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#include "KChartStackedLyingBarDiagram_p.h"
#include <QModelIndex>

#include "KChartBarDiagram.h"
#include "KChartTextAttributes.h"
#include "KChartAttributesModel.h"
#include "KChartAbstractCartesianDiagram.h"
-#include "KChartStackedLyingBarDiagram_p.h"

using namespace KChart;

diff --git a/src/KChart/Cartesian/KChartAbstractCartesianDiagram.cpp b/src/KChart/Cartesian/KChartAbstractCartesianDiagram.cpp
index 3e3a786..32b959e 100644
--- a/src/KChart/Cartesian/KChartAbstractCartesianDiagram.cpp
+++ b/src/KChart/Cartesian/KChartAbstractCartesianDiagram.cpp
@@ -67,14 +67,14 @@ KChart::AbstractCartesianDiagram::~AbstractCartesianDiagram()
void AbstractCartesianDiagram::init()
{
d->compressor.setModel( attributesModel() );
- connect( this, SIGNAL( layoutChanged( AbstractDiagram* ) ),
- &d->compressor, SLOT( slotDiagramLayoutChanged( AbstractDiagram* ) ) );
- connect( this, SIGNAL( attributesModelAboutToChange( AttributesModel*, AttributesModel* ) ),
- this, SLOT( connectAttributesModel( AttributesModel* ) ) );
+ connect( this, SIGNAL(layoutChanged(AbstractDiagram*)),
+ &d->compressor, SLOT(slotDiagramLayoutChanged(AbstractDiagram*)) );
+ connect( this, SIGNAL(attributesModelAboutToChange(AttributesModel*,AttributesModel*)),
+ this, SLOT(connectAttributesModel(AttributesModel*)) );

if ( d->plane ) {
- connect( d->plane, SIGNAL( viewportCoordinateSystemChanged() ),
- this, SIGNAL( viewportCoordinateSystemChanged() ) );
+ connect( d->plane, SIGNAL(viewportCoordinateSystemChanged()),
+ this, SIGNAL(viewportCoordinateSystemChanged()) );
}
}

@@ -113,31 +113,31 @@ void KChart::AbstractCartesianDiagram::layoutPlanes()
void KChart::AbstractCartesianDiagram::setCoordinatePlane( AbstractCoordinatePlane* plane )
{
if ( coordinatePlane() ) {
- disconnect( attributesModel(), SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ),
- coordinatePlane(), SLOT( relayout() ) );
- disconnect( attributesModel(), SIGNAL( rowsInserted( const QModelIndex&, int, int ) ),
- coordinatePlane(), SLOT( relayout() ) );
- disconnect( attributesModel(), SIGNAL( columnsRemoved( const QModelIndex&, int, int ) ),
- coordinatePlane(), SLOT( relayout() ) );
- disconnect( attributesModel(), SIGNAL( columnsInserted( const QModelIndex&, int, int ) ),
- coordinatePlane(), SLOT( relayout() ) );
+ disconnect( attributesModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ coordinatePlane(), SLOT(relayout()) );
+ disconnect( attributesModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ coordinatePlane(), SLOT(relayout()) );
+ disconnect( attributesModel(), SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ coordinatePlane(), SLOT(relayout()) );
+ disconnect( attributesModel(), SIGNAL(columnsInserted(QModelIndex,int,int)),
+ coordinatePlane(), SLOT(relayout()) );
disconnect( coordinatePlane() );
}

AbstractDiagram::setCoordinatePlane(plane);
if ( plane ) {
// Readjust the layout when the dataset count changes
- connect( attributesModel(), SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ),
- plane, SLOT( relayout() ) );
- connect( attributesModel(), SIGNAL( rowsInserted( const QModelIndex&, int, int ) ),
- plane, SLOT( relayout() ) );
- connect( attributesModel(), SIGNAL( columnsRemoved( const QModelIndex&, int, int ) ),
- plane, SLOT( relayout() ) );
- connect( attributesModel(), SIGNAL( columnsInserted( const QModelIndex&, int, int ) ),
- plane, SLOT( relayout() ) );
- connect( plane, SIGNAL( viewportCoordinateSystemChanged() ),
- this, SIGNAL( viewportCoordinateSystemChanged() ) );
- connect( plane, SIGNAL( viewportCoordinateSystemChanged() ), this, SLOT( update() ) );
+ connect( attributesModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ plane, SLOT(relayout()) );
+ connect( attributesModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ plane, SLOT(relayout()) );
+ connect( attributesModel(), SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ plane, SLOT(relayout()) );
+ connect( attributesModel(), SIGNAL(columnsInserted(QModelIndex,int,int)),
+ plane, SLOT(relayout()) );
+ connect( plane, SIGNAL(viewportCoordinateSystemChanged()),
+ this, SIGNAL(viewportCoordinateSystemChanged()) );
+ connect( plane, SIGNAL(viewportCoordinateSystemChanged()), this, SLOT(update()) );
}
}

diff --git a/src/KChart/Cartesian/KChartCartesianAxis.cpp b/src/KChart/Cartesian/KChartCartesianAxis.cpp
index 2ba8e45..1ba6237 100644
--- a/src/KChart/Cartesian/KChartCartesianAxis.cpp
+++ b/src/KChart/Cartesian/KChartCartesianAxis.cpp
@@ -405,7 +405,7 @@ void CartesianAxis::init()
d->customTickLength = 3;
d->position = Bottom;
setCachedSizeDirty();
- connect( this, SIGNAL( coordinateSystemChanged() ), SLOT( coordinateSystemChanged() ) );
+ connect( this, SIGNAL(coordinateSystemChanged()), SLOT(coordinateSystemChanged()) );
}


diff --git a/src/KChart/Cartesian/KChartCartesianCoordinatePlane.cpp b/src/KChart/Cartesian/KChartCartesianCoordinatePlane.cpp
index 629029f..056875d 100644
--- a/src/KChart/Cartesian/KChartCartesianCoordinatePlane.cpp
+++ b/src/KChart/Cartesian/KChartCartesianCoordinatePlane.cpp
@@ -85,10 +85,10 @@ void CartesianCoordinatePlane::addDiagram( AbstractDiagram* diagram )
"CartesianCoordinatePlane::addDiagram", "Only cartesian "
"diagrams can be added to a cartesian coordinate plane!" );
AbstractCoordinatePlane::addDiagram( diagram );
- connect( diagram, SIGNAL( layoutChanged ( AbstractDiagram* ) ),
- SLOT( slotLayoutChanged( AbstractDiagram* ) ) );
+ connect( diagram, SIGNAL(layoutChanged(AbstractDiagram*)),
+ SLOT(slotLayoutChanged(AbstractDiagram*)) );

- connect( diagram, SIGNAL( propertiesChanged() ), this, SIGNAL( propertiesChanged() ) );
+ connect( diagram, SIGNAL(propertiesChanged()), this, SIGNAL(propertiesChanged()) );
}


diff --git a/src/KChart/Cartesian/KChartCartesianDiagramDataCompressor_p.cpp b/src/KChart/Cartesian/KChartCartesianDiagramDataCompressor_p.cpp
index 735483a..2644e12 100644
--- a/src/KChart/Cartesian/KChartCartesianDiagramDataCompressor_p.cpp
+++ b/src/KChart/Cartesian/KChartCartesianDiagramDataCompressor_p.cpp
@@ -300,30 +300,30 @@ void CartesianDiagramDataCompressor::setModel( QAbstractItemModel* model )
}

if ( m_model != 0 ) {
- disconnect( m_model, SIGNAL( headerDataChanged( Qt::Orientation, int, int ) ),
- this, SLOT( slotModelHeaderDataChanged( Qt::Orientation, int, int ) ) );
- disconnect( m_model, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ),
- this, SLOT( slotModelDataChanged( QModelIndex, QModelIndex ) ) );
- disconnect( m_model, SIGNAL( layoutChanged() ),
- this, SLOT( slotModelLayoutChanged() ) );
- disconnect( m_model, SIGNAL( rowsAboutToBeInserted( QModelIndex, int, int ) ),
- this, SLOT( slotRowsAboutToBeInserted( QModelIndex, int, int ) ) );
- disconnect( m_model, SIGNAL( rowsInserted( QModelIndex, int, int ) ),
- this, SLOT( slotRowsInserted( QModelIndex, int, int ) ) );
- disconnect( m_model, SIGNAL( rowsAboutToBeRemoved( QModelIndex, int, int ) ),
- this, SLOT( slotRowsAboutToBeRemoved( QModelIndex, int, int ) ) );
- disconnect( m_model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ),
- this, SLOT( slotRowsRemoved( QModelIndex, int, int ) ) );
- disconnect( m_model, SIGNAL( columnsAboutToBeInserted( QModelIndex, int, int ) ),
- this, SLOT( slotColumnsAboutToBeInserted( QModelIndex, int, int ) ) );
- disconnect( m_model, SIGNAL( columnsInserted( QModelIndex, int, int ) ),
- this, SLOT( slotColumnsInserted( QModelIndex, int, int ) ) );
- disconnect( m_model, SIGNAL( columnsRemoved( QModelIndex, int, int ) ),
- this, SLOT( slotColumnsRemoved( QModelIndex, int, int ) ) );
- disconnect( m_model, SIGNAL( columnsAboutToBeRemoved( QModelIndex, int, int ) ),
- this, SLOT( slotColumnsAboutToBeRemoved( QModelIndex, int, int ) ) );
- disconnect( m_model, SIGNAL( modelReset() ),
- this, SLOT( rebuildCache() ) );
+ disconnect( m_model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
+ this, SLOT(slotModelHeaderDataChanged(Qt::Orientation,int,int)) );
+ disconnect( m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotModelDataChanged(QModelIndex,QModelIndex)) );
+ disconnect( m_model, SIGNAL(layoutChanged()),
+ this, SLOT(slotModelLayoutChanged()) );
+ disconnect( m_model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+ this, SLOT(slotRowsAboutToBeInserted(QModelIndex,int,int)) );
+ disconnect( m_model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(slotRowsInserted(QModelIndex,int,int)) );
+ disconnect( m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(slotRowsAboutToBeRemoved(QModelIndex,int,int)) );
+ disconnect( m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(slotRowsRemoved(QModelIndex,int,int)) );
+ disconnect( m_model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
+ this, SLOT(slotColumnsAboutToBeInserted(QModelIndex,int,int)) );
+ disconnect( m_model, SIGNAL(columnsInserted(QModelIndex,int,int)),
+ this, SLOT(slotColumnsInserted(QModelIndex,int,int)) );
+ disconnect( m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ this, SLOT(slotColumnsRemoved(QModelIndex,int,int)) );
+ disconnect( m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(slotColumnsAboutToBeRemoved(QModelIndex,int,int)) );
+ disconnect( m_model, SIGNAL(modelReset()),
+ this, SLOT(rebuildCache()) );
m_model = 0;
}

@@ -331,29 +331,29 @@ void CartesianDiagramDataCompressor::setModel( QAbstractItemModel* model )

if ( model != 0 ) {
m_model = model;
- connect( m_model, SIGNAL( headerDataChanged( Qt::Orientation, int, int ) ),
- SLOT( slotModelHeaderDataChanged( Qt::Orientation, int, int ) ) );
- connect( m_model, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ),
- SLOT( slotModelDataChanged( QModelIndex, QModelIndex ) ) );
- connect( m_model, SIGNAL( layoutChanged() ),
- SLOT( slotModelLayoutChanged() ) );
- connect( m_model, SIGNAL( rowsAboutToBeInserted( QModelIndex, int, int ) ),
- SLOT( slotRowsAboutToBeInserted( QModelIndex, int, int ) ) );
- connect( m_model, SIGNAL( rowsInserted( QModelIndex, int, int ) ),
- SLOT( slotRowsInserted( QModelIndex, int, int ) ) );
- connect( m_model, SIGNAL( rowsAboutToBeRemoved( QModelIndex, int, int ) ),
- SLOT( slotRowsAboutToBeRemoved( QModelIndex, int, int ) ) );
- connect( m_model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ),
- SLOT( slotRowsRemoved( QModelIndex, int, int ) ) );
- connect( m_model, SIGNAL( columnsAboutToBeInserted( QModelIndex, int, int ) ),
- SLOT( slotColumnsAboutToBeInserted( QModelIndex, int, int ) ) );
- connect( m_model, SIGNAL( columnsInserted( QModelIndex, int, int ) ),
- SLOT( slotColumnsInserted( QModelIndex, int, int ) ) );
- connect( m_model, SIGNAL( columnsRemoved( QModelIndex, int, int ) ),
- SLOT( slotColumnsRemoved( QModelIndex, int, int ) ) );
- connect( m_model, SIGNAL( columnsAboutToBeRemoved( QModelIndex, int, int ) ),
- SLOT( slotColumnsAboutToBeRemoved( QModelIndex, int, int ) ) );
- connect( m_model, SIGNAL( modelReset() ), SLOT( rebuildCache() ) );
+ connect( m_model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
+ SLOT(slotModelHeaderDataChanged(Qt::Orientation,int,int)) );
+ connect( m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ SLOT(slotModelDataChanged(QModelIndex,QModelIndex)) );
+ connect( m_model, SIGNAL(layoutChanged()),
+ SLOT(slotModelLayoutChanged()) );
+ connect( m_model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+ SLOT(slotRowsAboutToBeInserted(QModelIndex,int,int)) );
+ connect( m_model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ SLOT(slotRowsInserted(QModelIndex,int,int)) );
+ connect( m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+ SLOT(slotRowsAboutToBeRemoved(QModelIndex,int,int)) );
+ connect( m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ SLOT(slotRowsRemoved(QModelIndex,int,int)) );
+ connect( m_model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
+ SLOT(slotColumnsAboutToBeInserted(QModelIndex,int,int)) );
+ connect( m_model, SIGNAL(columnsInserted(QModelIndex,int,int)),
+ SLOT(slotColumnsInserted(QModelIndex,int,int)) );
+ connect( m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ SLOT(slotColumnsRemoved(QModelIndex,int,int)) );
+ connect( m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
+ SLOT(slotColumnsAboutToBeRemoved(QModelIndex,int,int)) );
+ connect( m_model, SIGNAL(modelReset()), SLOT(rebuildCache()) );
}
rebuildCache();
calculateSampleStepWidth();
diff --git a/src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp b/src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp
index 6f9fa5b..a481d29 100644
--- a/src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp
+++ b/src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp
@@ -310,38 +310,38 @@ void LeveyJenningsDiagram::setModel( QAbstractItemModel* model )
{
if ( this->model() != 0 )
{
- disconnect( this->model(), SIGNAL( dataChanged( const QModelIndex&, const QModelIndex& ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- disconnect( this->model(), SIGNAL( rowsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- disconnect( this->model(), SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- disconnect( this->model(), SIGNAL( columnsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- disconnect( this->model(), SIGNAL( columnsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- disconnect( this->model(), SIGNAL( modelReset() ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- disconnect( this->model(), SIGNAL( layoutChanged() ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
+ disconnect( this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ disconnect( this->model(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ disconnect( this->model(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ disconnect( this->model(), SIGNAL(columnsInserted(QModelIndex,int,int)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ disconnect( this->model(), SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ disconnect( this->model(), SIGNAL(modelReset()),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ disconnect( this->model(), SIGNAL(layoutChanged()),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
}
LineDiagram::setModel( model );
if ( this->model() != 0 )
{
- connect( this->model(), SIGNAL( dataChanged( const QModelIndex&, const QModelIndex& ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- connect( this->model(), SIGNAL( rowsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- connect( this->model(), SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- connect( this->model(), SIGNAL( columnsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- connect( this->model(), SIGNAL( columnsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- connect( this->model(), SIGNAL( modelReset() ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
- connect( this->model(), SIGNAL( layoutChanged() ),
- this, SLOT( calculateMeanAndStandardDeviation() ) );
+ connect( this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ connect( this->model(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ connect( this->model(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ connect( this->model(), SIGNAL(columnsInserted(QModelIndex,int,int)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ connect( this->model(), SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ connect( this->model(), SIGNAL(modelReset()),
+ this, SLOT(calculateMeanAndStandardDeviation()) );
+ connect( this->model(), SIGNAL(layoutChanged()),
+ this, SLOT(calculateMeanAndStandardDeviation()) );

calculateMeanAndStandardDeviation();
}
diff --git a/src/KChart/Cartesian/KChartLeveyJenningsDiagram_p.cpp b/src/KChart/Cartesian/KChartLeveyJenningsDiagram_p.cpp
index 32ac78d..df6748c 100644
--- a/src/KChart/Cartesian/KChartLeveyJenningsDiagram_p.cpp
+++ b/src/KChart/Cartesian/KChartLeveyJenningsDiagram_p.cpp
@@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#include "KChartLeveyJenningsDiagram_p.h"
+
#include "KChartLeveyJenningsDiagram.h"
#include "KChartDataValueAttributes.h"

-#include "KChartLeveyJenningsDiagram_p.h"
-
using namespace KChart;

LeveyJenningsDiagram::Private::Private( const Private& rhs )
diff --git a/src/KChart/Cartesian/KChartLineDiagram_p.cpp b/src/KChart/Cartesian/KChartLineDiagram_p.cpp
index f33e48d..81e6c44 100644
--- a/src/KChart/Cartesian/KChartLineDiagram_p.cpp
+++ b/src/KChart/Cartesian/KChartLineDiagram_p.cpp
@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

+#include "KChartLineDiagram_p.h"
#include "KChartLineDiagram.h"
#include "KChartDataValueAttributes.h"

-#include "KChartLineDiagram_p.h"
#include "KChartPainterSaver_p.h"
#include "PaintingHelpers_p.h"

diff --git a/src/KChart/Cartesian/KChartPlotter.cpp b/src/KChart/Cartesian/KChartPlotter.cpp
index 64a2268..8c2709d 100644
--- a/src/KChart/Cartesian/KChartPlotter.cpp
+++ b/src/KChart/Cartesian/KChartPlotter.cpp
@@ -63,13 +63,13 @@ void Plotter::init()
d->stackedPlotter = new StackedPlotter( this );
d->implementor = d->normalPlotter;
QObject* test = d->implementor->plotterPrivate();
- connect( this, SIGNAL( boundariesChanged() ), test, SLOT( changedProperties() ) );
+ connect( this, SIGNAL(boundariesChanged()), test, SLOT(changedProperties()) );
// The signal is connected to the superclass's slot at this point because the connection happened
// in its constructor when "its type was not Plotter yet".
- disconnect( this, SIGNAL( attributesModelAboutToChange( AttributesModel*, AttributesModel* ) ),
- this, SLOT( connectAttributesModel( AttributesModel* ) ) );
- connect( this, SIGNAL( attributesModelAboutToChange( AttributesModel*, AttributesModel* ) ),
- this, SLOT( connectAttributesModel( AttributesModel* ) ) );
+ disconnect( this, SIGNAL(attributesModelAboutToChange(AttributesModel*,AttributesModel*)),
+ this, SLOT(connectAttributesModel(AttributesModel*)) );
+ connect( this, SIGNAL(attributesModelAboutToChange(AttributesModel*,AttributesModel*)),
+ this, SLOT(connectAttributesModel(AttributesModel*)) );
setDatasetDimensionInternal( 2 );
}

@@ -116,13 +116,13 @@ void Plotter::connectAttributesModel( AttributesModel* newModel )
if ( attributesModel() != d->plotterCompressor.model() )
{
d->plotterCompressor.setModel( attributesModel() );
- connect( &d->plotterCompressor, SIGNAL( boundariesChanged() ), this, SLOT(setDataBoundariesDirty() ) );
+ connect( &d->plotterCompressor, SIGNAL(boundariesChanged()), this, SLOT(setDataBoundariesDirty()) );
if ( useDataCompression() != Plotter::SLOPE )
{
- connect( coordinatePlane(), SIGNAL( internal_geometryChanged( QRect,QRect ) ),
- this, SLOT( setDataBoundariesDirty() ) );
- connect( coordinatePlane(), SIGNAL( geometryChanged( QRect,QRect ) ),
- this, SLOT( setDataBoundariesDirty() ) );
+ connect( coordinatePlane(), SIGNAL(internal_geometryChanged(QRect,QRect)),
+ this, SLOT(setDataBoundariesDirty()) );
+ connect( coordinatePlane(), SIGNAL(geometryChanged(QRect,QRect)),
+ this, SLOT(setDataBoundariesDirty()) );
calcMergeRadius();
}
}
@@ -199,8 +199,8 @@ void Plotter::setType( const PlotType type )
default:
Q_ASSERT_X( false, "Plotter::setType", "unknown plotter subtype" );
}
- bool connection = connect( this, SIGNAL( boundariesChanged() ),
- d->implementor->plotterPrivate(), SLOT( changedProperties() ) );
+ bool connection = connect( this, SIGNAL(boundariesChanged()),
+ d->implementor->plotterPrivate(), SLOT(changedProperties()) );
Q_ASSERT( connection );
Q_UNUSED( connection );

diff --git a/src/KChart/Cartesian/KChartPlotterDiagramCompressor.cpp b/src/KChart/Cartesian/KChartPlotterDiagramCompressor.cpp
index fea8871..a4ef678 100644
--- a/src/KChart/Cartesian/KChartPlotterDiagramCompressor.cpp
+++ b/src/KChart/Cartesian/KChartPlotterDiagramCompressor.cpp
@@ -22,7 +22,7 @@
#include "KChartPlotterDiagramCompressor_p.h"
#include "KChartMath_p.h"

-#include <QtCore/QPointF>
+#include <QPointF>

using namespace KChart;

@@ -828,9 +828,9 @@ void PlotterDiagramCompressor::setModel( QAbstractItemModel *model )
d->m_bufferlist.resize( datasetCount() );
d->m_accumulatedDistances.resize( datasetCount() );
d->calculateDataBoundaries();
- connect( d->m_model, SIGNAL( rowsInserted ( QModelIndex, int, int ) ), d, SLOT( rowsInserted( QModelIndex, int, int ) ) );
- connect( d->m_model, SIGNAL( modelReset() ), d, SLOT( clearBuffer() ) );
- connect( d->m_model, SIGNAL( destroyed( QObject* ) ), d, SLOT( setModelToZero() ) );
+ connect( d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(rowsInserted(QModelIndex,int,int)) );
+ connect( d->m_model, SIGNAL(modelReset()), d, SLOT(clearBuffer()) );
+ connect( d->m_model, SIGNAL(destroyed(QObject*)), d, SLOT(setModelToZero()) );
}
}

diff --git a/src/KChart/Cartesian/KChartPlotterDiagramCompressor.h b/src/KChart/Cartesian/KChartPlotterDiagramCompressor.h
index a41ee2a..d6850db 100644
--- a/src/KChart/Cartesian/KChartPlotterDiagramCompressor.h
+++ b/src/KChart/Cartesian/KChartPlotterDiagramCompressor.h
@@ -20,11 +20,11 @@
#ifndef PLOTTERDIAGRAMCOMPRESSOR_H
#define PLOTTERDIAGRAMCOMPRESSOR_H

-#include <QtCore/QObject>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QPointer>
-#include <QtCore/QVector>
-#include <QtCore/QDateTime>
+#include <QObject>
+#include <QAbstractItemModel>
+#include <QPointer>
+#include <QVector>
+#include <QDateTime>

#include <cmath>
#include <limits>
diff --git a/src/KChart/Cartesian/KChartPlotterDiagramCompressor_p.h b/src/KChart/Cartesian/KChartPlotterDiagramCompressor_p.h
index 6dc96ce..870b5a2 100644
--- a/src/KChart/Cartesian/KChartPlotterDiagramCompressor_p.h
+++ b/src/KChart/Cartesian/KChartPlotterDiagramCompressor_p.h
@@ -22,8 +22,8 @@

#include "KChartPlotterDiagramCompressor.h"

-#include <QtCore/QPointF>
-#include <QtCore/QDateTime>
+#include <QPointF>
+#include <QDateTime>

typedef QPair< QPointF, QPointF > Boundaries;

diff --git a/src/KChart/KChartAbstractAxis.cpp b/src/KChart/KChartAbstractAxis.cpp
index c5430d4..2380d21 100644
--- a/src/KChart/KChartAbstractAxis.cpp
+++ b/src/KChart/KChartAbstractAxis.cpp
@@ -62,8 +62,8 @@ bool AbstractAxis::Private::setDiagram( AbstractDiagram* diagram_, bool delayedI
delete observer;
if ( mDiagram ) {
observer = new DiagramObserver( mDiagram, mAxis );
- const bool con = connect( observer, SIGNAL( diagramDataChanged( AbstractDiagram *) ),
- mAxis, SIGNAL( coordinateSystemChanged() ) );
+ const bool con = connect( observer, SIGNAL(diagramDataChanged(AbstractDiagram*)),
+ mAxis, SIGNAL(coordinateSystemChanged()) );
Q_UNUSED( con )
Q_ASSERT( con );
bNewDiagramStored = true;
@@ -174,8 +174,8 @@ void AbstractAxis::deleteObserver( AbstractDiagram* diagram )
void AbstractAxis::connectSignals()
{
if ( d->observer ) {
- const bool con = connect( d->observer, SIGNAL( diagramDataChanged( AbstractDiagram *) ),
- this, SIGNAL( coordinateSystemChanged() ) );
+ const bool con = connect( d->observer, SIGNAL(diagramDataChanged(AbstractDiagram*)),
+ this, SIGNAL(coordinateSystemChanged()) );
Q_UNUSED( con );
Q_ASSERT( con );
}
diff --git a/src/KChart/KChartAbstractAxis_p.h b/src/KChart/KChartAbstractAxis_p.h
index cdc917e..598b4e6 100644
--- a/src/KChart/KChartAbstractAxis_p.h
+++ b/src/KChart/KChartAbstractAxis_p.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef KCHARTAXIS_P_H
-#define KCHARTAXIS_P_H
+#ifndef KCHARTABSTRACTAXIS_P_H
+#define KCHARTABSTRACTAXIS_P_H

//
// W A R N I N G
@@ -94,5 +94,5 @@ inline const AbstractAxis::Private * AbstractAxis::d_func() const
{ return static_cast<const Private*>( AbstractArea::d_func() ); }

}
-#endif /* KCHARTAREA_P_H */
+#endif /* KCHARTABSTRACTAXIS_P_H */

diff --git a/src/KChart/KChartAbstractCoordinatePlane.cpp b/src/KChart/KChartAbstractCoordinatePlane.cpp
index 1b638d6..94d556e 100644
--- a/src/KChart/KChartAbstractCoordinatePlane.cpp
+++ b/src/KChart/KChartAbstractCoordinatePlane.cpp
@@ -26,7 +26,7 @@
#include <QGridLayout>
#include <QRubberBand>
#include <QMouseEvent>
-#include <QtCore/qmath.h>
+#include <qmath.h>

using namespace KChart;

@@ -60,8 +60,8 @@ AbstractCoordinatePlane::~AbstractCoordinatePlane()
void AbstractCoordinatePlane::init()
{
d->initialize(); // virtual method to init the correct grid: cartesian, polar, ...
- connect( this, SIGNAL(internal_geometryChanged( QRect, QRect )),
- this, SIGNAL(geometryChanged( QRect, QRect )),
+ connect( this, SIGNAL(internal_geometryChanged(QRect,QRect)),
+ this, SIGNAL(geometryChanged(QRect,QRect)),
Qt::QueuedConnection );
}

@@ -75,10 +75,10 @@ void AbstractCoordinatePlane::addDiagram ( AbstractDiagram* diagram )
diagram->setCoordinatePlane( this );
layoutDiagrams();
layoutPlanes(); // there might be new axes, etc
- connect( diagram, SIGNAL( modelsChanged() ), this, SLOT( layoutPlanes() ) );
- connect( diagram, SIGNAL( modelDataChanged() ), this, SLOT( update()) );
- connect( diagram, SIGNAL( modelDataChanged() ), this, SLOT( relayout()) );
- connect( this, SIGNAL( boundariesChanged() ), diagram, SIGNAL( boundariesChanged() ) );
+ connect( diagram, SIGNAL(modelsChanged()), this, SLOT(layoutPlanes()) );
+ connect( diagram, SIGNAL(modelDataChanged()), this, SLOT(update()) );
+ connect( diagram, SIGNAL(modelDataChanged()), this, SLOT(relayout()) );
+ connect( this, SIGNAL(boundariesChanged()), diagram, SIGNAL(boundariesChanged()) );

update();
emit boundariesChanged();
@@ -113,9 +113,9 @@ void AbstractCoordinatePlane::takeDiagram ( AbstractDiagram* diagram )
d->diagrams.removeAt( idx );
diagram->setParent( 0 );
diagram->setCoordinatePlane( 0 );
- disconnect( diagram, SIGNAL( modelsChanged() ), this, SLOT( layoutPlanes() ) );
- disconnect( diagram, SIGNAL( modelDataChanged() ), this, SLOT( update()) );
- disconnect( diagram, SIGNAL( modelDataChanged() ), this, SLOT( relayout()) );
+ disconnect( diagram, SIGNAL(modelsChanged()), this, SLOT(layoutPlanes()) );
+ disconnect( diagram, SIGNAL(modelDataChanged()), this, SLOT(update()) );
+ disconnect( diagram, SIGNAL(modelDataChanged()), this, SLOT(relayout()) );
layoutDiagrams();
update();
}
diff --git a/src/KChart/KChartAbstractCoordinatePlane_p.h b/src/KChart/KChartAbstractCoordinatePlane_p.h
index 7196cc7..65bdb77 100644
--- a/src/KChart/KChartAbstractCoordinatePlane_p.h
+++ b/src/KChart/KChartAbstractCoordinatePlane_p.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef KCHARTABSTRCOORDINATEPLANE_P_H
-#define KCHARTABSTRCOORDINATEPLANE_P_H
+#ifndef KCHARTABSTRACTCOORDINATEPLANE_P_H
+#define KCHARTABSTRACTCOORDINATEPLANE_P_H

//
// W A R N I N G
diff --git a/src/KChart/KChartAbstractDiagram.cpp b/src/KChart/KChartAbstractDiagram.cpp
index df54cbd..693a382 100644
--- a/src/KChart/KChartAbstractDiagram.cpp
+++ b/src/KChart/KChartAbstractDiagram.cpp
@@ -150,14 +150,14 @@ void AbstractDiagram::setSelectionModel( QItemSelectionModel* newSelectionModel
{
if ( selectionModel() )
{
- disconnect( selectionModel(), SIGNAL( currentChanged( QModelIndex, QModelIndex ) ), this, SIGNAL( modelsChanged() ) );
- disconnect( selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), this, SIGNAL( modelsChanged() ) );
+ disconnect( selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SIGNAL(modelsChanged()) );
+ disconnect( selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SIGNAL(modelsChanged()) );
}
QAbstractItemView::setSelectionModel( newSelectionModel );
if ( selectionModel() )
{
- connect( selectionModel(), SIGNAL( currentChanged( QModelIndex, QModelIndex ) ), this, SIGNAL( modelsChanged() ) );
- connect( selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), this, SIGNAL( modelsChanged() ) );
+ connect( selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SIGNAL(modelsChanged()) );
+ connect( selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SIGNAL(modelsChanged()) );
}
emit modelsChanged();
}
diff --git a/src/KChart/KChartAbstractDiagram_p.cpp b/src/KChart/KChartAbstractDiagram_p.cpp
index 3bce0e7..ccef30b 100644
--- a/src/KChart/KChartAbstractDiagram_p.cpp
+++ b/src/KChart/KChartAbstractDiagram_p.cpp
@@ -113,39 +113,39 @@ void AbstractDiagram::Private::setAttributesModel( AttributesModel* amodel )
if ( qobject_cast< PrivateAttributesModel* >( attributesModel ) ) {
delete attributesModel;
} else {
- disconnect( attributesModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- disconnect( attributesModel, SIGNAL( columnsInserted( QModelIndex, int, int ) ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- disconnect( attributesModel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- disconnect( attributesModel, SIGNAL( columnsRemoved( QModelIndex, int, int ) ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- disconnect( attributesModel, SIGNAL( modelReset() ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- disconnect( attributesModel, SIGNAL( layoutChanged() ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- disconnect( attributesModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ),
- diagram, SIGNAL( modelDataChanged() ));
+ disconnect( attributesModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ disconnect( attributesModel, SIGNAL(columnsInserted(QModelIndex,int,int)),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ disconnect( attributesModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ disconnect( attributesModel, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ disconnect( attributesModel, SIGNAL(modelReset()),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ disconnect( attributesModel, SIGNAL(layoutChanged()),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ disconnect( attributesModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ diagram, SIGNAL(modelDataChanged()));
}
}

emit diagram->attributesModelAboutToChange( amodel, attributesModel );

- connect( amodel, SIGNAL( rowsInserted( QModelIndex, int, int ) ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- connect( amodel, SIGNAL( columnsInserted( QModelIndex, int, int ) ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- connect( amodel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- connect( amodel, SIGNAL( columnsRemoved( QModelIndex, int, int ) ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- connect( amodel, SIGNAL( modelReset() ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- connect( amodel, SIGNAL( layoutChanged() ),
- diagram, SLOT( setDataBoundariesDirty() ) );
- connect( amodel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ),
- diagram, SIGNAL( modelDataChanged() ));
+ connect( amodel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ connect( amodel, SIGNAL(columnsInserted(QModelIndex,int,int)),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ connect( amodel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ connect( amodel, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ connect( amodel, SIGNAL(modelReset()),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ connect( amodel, SIGNAL(layoutChanged()),
+ diagram, SLOT(setDataBoundariesDirty()) );
+ connect( amodel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ diagram, SIGNAL(modelDataChanged()));

attributesModel = amodel;
}
diff --git a/src/KChart/KChartAttributesModel.cpp b/src/KChart/KChartAttributesModel.cpp
index e642fd8..09f712d 100644
--- a/src/KChart/KChartAttributesModel.cpp
+++ b/src/KChart/KChartAttributesModel.cpp
@@ -517,54 +517,54 @@ void AttributesModel::setSourceModel( QAbstractItemModel* sourceModel )
{
if ( this->sourceModel() != 0 )
{
- disconnect( this->sourceModel(), SIGNAL( dataChanged( const QModelIndex&, const QModelIndex&)),
- this, SLOT( slotDataChanged( const QModelIndex&, const QModelIndex&)));
- disconnect( this->sourceModel(), SIGNAL( rowsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsInserted( const QModelIndex&, int, int ) ) );
- disconnect( this->sourceModel(), SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsRemoved( const QModelIndex&, int, int ) ) );
- disconnect( this->sourceModel(), SIGNAL( rowsAboutToBeInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsAboutToBeInserted( const QModelIndex&, int, int ) ) );
- disconnect( this->sourceModel(), SIGNAL( rowsAboutToBeRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsAboutToBeRemoved( const QModelIndex&, int, int ) ) );
- disconnect( this->sourceModel(), SIGNAL( columnsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsInserted( const QModelIndex&, int, int ) ) );
- disconnect( this->sourceModel(), SIGNAL( columnsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsRemoved( const QModelIndex&, int, int ) ) );
- disconnect( this->sourceModel(), SIGNAL( columnsAboutToBeInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsAboutToBeInserted( const QModelIndex&, int, int ) ) );
- disconnect( this->sourceModel(), SIGNAL( columnsAboutToBeRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsAboutToBeRemoved( const QModelIndex&, int, int ) ) );
- disconnect( this->sourceModel(), SIGNAL( modelReset() ),
- this, SIGNAL( modelReset() ) );
- disconnect( this->sourceModel(), SIGNAL( layoutChanged() ),
- this, SIGNAL( layoutChanged() ) );
+ disconnect( this->sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotDataChanged(QModelIndex,QModelIndex)));
+ disconnect( this->sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(slotRowsInserted(QModelIndex,int,int)) );
+ disconnect( this->sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(slotRowsRemoved(QModelIndex,int,int)) );
+ disconnect( this->sourceModel(), SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+ this, SLOT(slotRowsAboutToBeInserted(QModelIndex,int,int)) );
+ disconnect( this->sourceModel(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(slotRowsAboutToBeRemoved(QModelIndex,int,int)) );
+ disconnect( this->sourceModel(), SIGNAL(columnsInserted(QModelIndex,int,int)),
+ this, SLOT(slotColumnsInserted(QModelIndex,int,int)) );
+ disconnect( this->sourceModel(), SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ this, SLOT(slotColumnsRemoved(QModelIndex,int,int)) );
+ disconnect( this->sourceModel(), SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
+ this, SLOT(slotColumnsAboutToBeInserted(QModelIndex,int,int)) );
+ disconnect( this->sourceModel(), SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(slotColumnsAboutToBeRemoved(QModelIndex,int,int)) );
+ disconnect( this->sourceModel(), SIGNAL(modelReset()),
+ this, SIGNAL(modelReset()) );
+ disconnect( this->sourceModel(), SIGNAL(layoutChanged()),
+ this, SIGNAL(layoutChanged()) );
}
QAbstractProxyModel::setSourceModel( sourceModel );
if ( this->sourceModel() != NULL )
{
- connect( this->sourceModel(), SIGNAL( dataChanged( const QModelIndex&, const QModelIndex&)),
- this, SLOT( slotDataChanged( const QModelIndex&, const QModelIndex&)));
- connect( this->sourceModel(), SIGNAL( rowsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsInserted( const QModelIndex&, int, int ) ) );
- connect( this->sourceModel(), SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsRemoved( const QModelIndex&, int, int ) ) );
- connect( this->sourceModel(), SIGNAL( rowsAboutToBeInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsAboutToBeInserted( const QModelIndex&, int, int ) ) );
- connect( this->sourceModel(), SIGNAL( rowsAboutToBeRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsAboutToBeRemoved( const QModelIndex&, int, int ) ) );
- connect( this->sourceModel(), SIGNAL( columnsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsInserted( const QModelIndex&, int, int ) ) );
- connect( this->sourceModel(), SIGNAL( columnsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsRemoved( const QModelIndex&, int, int ) ) );
- connect( this->sourceModel(), SIGNAL( columnsAboutToBeInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsAboutToBeInserted( const QModelIndex&, int, int ) ) );
- connect( this->sourceModel(), SIGNAL( columnsAboutToBeRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsAboutToBeRemoved( const QModelIndex&, int, int ) ) );
- connect( this->sourceModel(), SIGNAL( modelReset() ),
- this, SIGNAL( modelReset() ) );
- connect( this->sourceModel(), SIGNAL( layoutChanged() ),
- this, SIGNAL( layoutChanged() ) );
+ connect( this->sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotDataChanged(QModelIndex,QModelIndex)));
+ connect( this->sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(slotRowsInserted(QModelIndex,int,int)) );
+ connect( this->sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(slotRowsRemoved(QModelIndex,int,int)) );
+ connect( this->sourceModel(), SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+ this, SLOT(slotRowsAboutToBeInserted(QModelIndex,int,int)) );
+ connect( this->sourceModel(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(slotRowsAboutToBeRemoved(QModelIndex,int,int)) );
+ connect( this->sourceModel(), SIGNAL(columnsInserted(QModelIndex,int,int)),
+ this, SLOT(slotColumnsInserted(QModelIndex,int,int)) );
+ connect( this->sourceModel(), SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ this, SLOT(slotColumnsRemoved(QModelIndex,int,int)) );
+ connect( this->sourceModel(), SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
+ this, SLOT(slotColumnsAboutToBeInserted(QModelIndex,int,int)) );
+ connect( this->sourceModel(), SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(slotColumnsAboutToBeRemoved(QModelIndex,int,int)) );
+ connect( this->sourceModel(), SIGNAL(modelReset()),
+ this, SIGNAL(modelReset()) );
+ connect( this->sourceModel(), SIGNAL(layoutChanged()),
+ this, SIGNAL(layoutChanged()) );
}
}

diff --git a/src/KChart/KChartChart.cpp b/src/KChart/KChartChart.cpp
index 15af35a..e14a823 100644
--- a/src/KChart/KChartChart.cpp
+++ b/src/KChart/KChartChart.cpp
@@ -1242,12 +1242,12 @@ void Chart::insertCoordinatePlane( int index, AbstractCoordinatePlane* plane )
return;
}

- connect( plane, SIGNAL( destroyedCoordinatePlane( AbstractCoordinatePlane* ) ),
- d, SLOT( slotUnregisterDestroyedPlane( AbstractCoordinatePlane* ) ) );
- connect( plane, SIGNAL( needUpdate() ), this, SLOT( update() ) );
- connect( plane, SIGNAL( needRelayout() ), d, SLOT( slotResizePlanes() ) ) ;
- connect( plane, SIGNAL( needLayoutPlanes() ), d, SLOT( slotLayoutPlanes() ) ) ;
- connect( plane, SIGNAL( propertiesChanged() ),this, SIGNAL( propertiesChanged() ) );
+ connect( plane, SIGNAL(destroyedCoordinatePlane(AbstractCoordinatePlane*)),
+ d, SLOT(slotUnregisterDestroyedPlane(AbstractCoordinatePlane*)) );
+ connect( plane, SIGNAL(needUpdate()), this, SLOT(update()) );
+ connect( plane, SIGNAL(needRelayout()), d, SLOT(slotResizePlanes()) ) ;
+ connect( plane, SIGNAL(needLayoutPlanes()), d, SLOT(slotLayoutPlanes()) ) ;
+ connect( plane, SIGNAL(propertiesChanged()),this, SIGNAL(propertiesChanged()) );
d->coordinatePlanes.insert( index, plane );
plane->setParent( this );
d->slotLayoutPlanes();
@@ -1465,10 +1465,10 @@ void Chart::addHeaderFooter( HeaderFooter* hf )

d->headerFooters.append( hf );
d->textLayoutItems.append( hf );
- connect( hf, SIGNAL( destroyedHeaderFooter( HeaderFooter* ) ),
- d, SLOT( slotUnregisterDestroyedHeaderFooter( HeaderFooter* ) ) );
- connect( hf, SIGNAL( positionChanged( HeaderFooter* ) ),
- d, SLOT( slotHeaderFooterPositionChanged( HeaderFooter* ) ) );
+ connect( hf, SIGNAL(destroyedHeaderFooter(HeaderFooter*)),
+ d, SLOT(slotUnregisterDestroyedHeaderFooter(HeaderFooter*)) );
+ connect( hf, SIGNAL(positionChanged(HeaderFooter*)),
+ d, SLOT(slotHeaderFooterPositionChanged(HeaderFooter*)) );

// set the text attributes (why?)

@@ -1515,8 +1515,8 @@ void Chart::takeHeaderFooter( HeaderFooter* headerFooter )
if ( idx == -1 ) {
return;
}
- disconnect( headerFooter, SIGNAL( destroyedHeaderFooter( HeaderFooter* ) ),
- d, SLOT( slotUnregisterDestroyedHeaderFooter( HeaderFooter* ) ) );
+ disconnect( headerFooter, SIGNAL(destroyedHeaderFooter(HeaderFooter*)),
+ d, SLOT(slotUnregisterDestroyedHeaderFooter(HeaderFooter*)) );

d->headerFooters.takeAt( idx );
headerFooter->removeFromParentLayout();
@@ -1647,11 +1647,11 @@ void Chart::addLegendInternal( Legend* legend, bool setMeasures )
sameAlignmentLayout->addItem( new MyWidgetItem( legend, legend->alignment() ) );
}

- connect( legend, SIGNAL( destroyedLegend( Legend* ) ),
- d, SLOT( slotUnregisterDestroyedLegend( Legend* ) ) );
- connect( legend, SIGNAL( positionChanged( AbstractAreaWidget* ) ),
- d, SLOT( slotLegendPositionChanged( AbstractAreaWidget* ) ) );
- connect( legend, SIGNAL( propertiesChanged() ), this, SIGNAL( propertiesChanged() ) );
+ connect( legend, SIGNAL(destroyedLegend(Legend*)),
+ d, SLOT(slotUnregisterDestroyedLegend(Legend*)) );
+ connect( legend, SIGNAL(positionChanged(AbstractAreaWidget*)),
+ d, SLOT(slotLegendPositionChanged(AbstractAreaWidget*)) );
+ connect( legend, SIGNAL(propertiesChanged()), this, SIGNAL(propertiesChanged()) );

d->slotResizePlanes();
}
diff --git a/src/KChart/KChartDatasetProxyModel.cpp b/src/KChart/KChartDatasetProxyModel.cpp
index abb6a90..d98b4fd 100644
--- a/src/KChart/KChartDatasetProxyModel.cpp
+++ b/src/KChart/KChartDatasetProxyModel.cpp
@@ -273,15 +273,15 @@ void DatasetProxyModel::initializeDatasetDecriptors(
void DatasetProxyModel::setSourceModel(QAbstractItemModel *m)
{
if ( sourceModel() ) {
- disconnect( sourceModel(), SIGNAL( layoutChanged() ),
- this, SLOT( resetDatasetDescriptions() ) );
+ disconnect( sourceModel(), SIGNAL(layoutChanged()),
+ this, SLOT(resetDatasetDescriptions()) );
}
QSortFilterProxyModel::setSourceModel( m );
mRootIndex = QModelIndex();
if ( m ) {
- connect( m, SIGNAL( layoutChanged() ),
- this, SLOT( resetDatasetDescriptions() ) );
- connect( m, SIGNAL( layoutChanged() ), this, SIGNAL( layoutChanged() ) );
+ connect( m, SIGNAL(layoutChanged()),
+ this, SLOT(resetDatasetDescriptions()) );
+ connect( m, SIGNAL(layoutChanged()), this, SIGNAL(layoutChanged()) );
}
resetDatasetDescriptions();
}
diff --git a/src/KChart/KChartDiagramObserver.cpp b/src/KChart/KChartDiagramObserver.cpp
index 27e7c53..7dd169c 100644
--- a/src/KChart/KChartDiagramObserver.cpp
+++ b/src/KChart/KChartDiagramObserver.cpp
@@ -64,7 +64,7 @@ void DiagramObserver::init()
if ( m_attributesmodel )
disconnect(m_attributesmodel);

- const bool con = connect( m_diagram, SIGNAL( viewportCoordinateSystemChanged() ), this, SLOT( slotDataChanged() ) );
+ const bool con = connect( m_diagram, SIGNAL(viewportCoordinateSystemChanged()), this, SLOT(slotDataChanged()) );
Q_ASSERT( con );
Q_UNUSED( con )
connect( m_diagram, SIGNAL(dataHidden()), SLOT(slotDataHidden()) );
diff --git a/src/KChart/KChartLegend.cpp b/src/KChart/KChartLegend.cpp
index 1f13864..a964f47 100644
--- a/src/KChart/KChartLegend.cpp
+++ b/src/KChart/KChartLegend.cpp
@@ -323,14 +323,14 @@ void Legend::addDiagram( AbstractDiagram* newDiagram )
} else {
d->observers.append( observer );
}
- connect( observer, SIGNAL( diagramAboutToBeDestroyed(AbstractDiagram*) ),
- SLOT( resetDiagram(AbstractDiagram*) ));
- connect( observer, SIGNAL( diagramDataChanged(AbstractDiagram*) ),
- SLOT( setNeedRebuild() ));
- connect( observer, SIGNAL( diagramDataHidden(AbstractDiagram*) ),
- SLOT( setNeedRebuild() ));
- connect( observer, SIGNAL( diagramAttributesChanged(AbstractDiagram*) ),
- SLOT( setNeedRebuild() ));
+ connect( observer, SIGNAL(diagramAboutToBeDestroyed(AbstractDiagram*)),
+ SLOT(resetDiagram(AbstractDiagram*)));
+ connect( observer, SIGNAL(diagramDataChanged(AbstractDiagram*)),
+ SLOT(setNeedRebuild()));
+ connect( observer, SIGNAL(diagramDataHidden(AbstractDiagram*)),
+ SLOT(setNeedRebuild()));
+ connect( observer, SIGNAL(diagramAttributesChanged(AbstractDiagram*)),
+ SLOT(setNeedRebuild()));
setNeedRebuild();
}
}
diff --git a/src/KChart/KChartMath_p.h b/src/KChart/KChartMath_p.h
index 9e75479..9801d01 100644
--- a/src/KChart/KChartMath_p.h
+++ b/src/KChart/KChartMath_p.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef KDAB_LIB_FAKES_H
-#define KDAB_LIB_FAKES_H
+#ifndef KCHARTMATH_P_H
+#define KCHARTMATH_P_H

#if defined Q_OS_DARWIN
#include <math.h>
diff --git a/src/KChart/KChartModelDataCache_p.cpp b/src/KChart/KChartModelDataCache_p.cpp
index 2de3e1e..9779d91 100644
--- a/src/KChart/KChartModelDataCache_p.cpp
+++ b/src/KChart/KChartModelDataCache_p.cpp
@@ -35,26 +35,26 @@ ModelSignalMapperConnector::~ModelSignalMapperConnector()

void ModelSignalMapperConnector::connectSignals( QAbstractItemModel* model )
{
- connect( model, SIGNAL( destroyed() ), this, SLOT( resetModel() ) );
- connect( model, SIGNAL( columnsInserted( QModelIndex, int, int ) ), this, SLOT( columnsInserted( QModelIndex, int, int ) ) );
- connect( model, SIGNAL( columnsRemoved( QModelIndex, int, int ) ), this, SLOT( columnsRemoved( QModelIndex, int, int ) ) );
- connect( model, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SLOT( dataChanged( QModelIndex, QModelIndex ) ) );
- connect( model, SIGNAL( layoutChanged() ), this, SLOT( layoutChanged() ) );
- connect( model, SIGNAL( modelReset() ), this, SLOT( modelReset() ) );
- connect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SLOT( rowsInserted( QModelIndex, int, int )) );
- connect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( rowsRemoved( QModelIndex, int, int ) ) );
+ connect( model, SIGNAL(destroyed()), this, SLOT(resetModel()) );
+ connect( model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(columnsInserted(QModelIndex,int,int)) );
+ connect( model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(columnsRemoved(QModelIndex,int,int)) );
+ connect( model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(dataChanged(QModelIndex,QModelIndex)) );
+ connect( model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()) );
+ connect( model, SIGNAL(modelReset()), this, SLOT(modelReset()) );
+ connect( model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(rowsInserted(QModelIndex,int,int)) );
+ connect( model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(rowsRemoved(QModelIndex,int,int)) );
}

void ModelSignalMapperConnector::disconnectSignals( QAbstractItemModel* model )
{
- disconnect( model, SIGNAL( destroyed() ), this, SLOT( resetModel() ) );
- disconnect( model, SIGNAL( columnsInserted( QModelIndex, int, int ) ), this, SLOT( columnsInserted( QModelIndex, int, int ) ) );
- disconnect( model, SIGNAL( columnsRemoved( QModelIndex, int, int ) ), this, SLOT( columnsRemoved( QModelIndex, int, int ) ) );
- disconnect( model, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SLOT( dataChanged( QModelIndex, QModelIndex ) ) );
- disconnect( model, SIGNAL( layoutChanged() ), this, SLOT( layoutChanged() ) );
- disconnect( model, SIGNAL( modelReset() ), this, SLOT( modelReset() ) );
- disconnect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SLOT( rowsInserted( QModelIndex, int, int )) );
- disconnect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( rowsRemoved( QModelIndex, int, int ) ) );
+ disconnect( model, SIGNAL(destroyed()), this, SLOT(resetModel()) );
+ disconnect( model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(columnsInserted(QModelIndex,int,int)) );
+ disconnect( model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(columnsRemoved(QModelIndex,int,int)) );
+ disconnect( model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(dataChanged(QModelIndex,QModelIndex)) );
+ disconnect( model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()) );
+ disconnect( model, SIGNAL(modelReset()), this, SLOT(modelReset()) );
+ disconnect( model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(rowsInserted(QModelIndex,int,int)) );
+ disconnect( model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(rowsRemoved(QModelIndex,int,int)) );
}

void ModelSignalMapperConnector::resetModel()
diff --git a/src/KChart/KChartThreeDLineAttributes_p.h b/src/KChart/KChartThreeDLineAttributes_p.h
index d335f78..0541839 100644
--- a/src/KChart/KChartThreeDLineAttributes_p.h
+++ b/src/KChart/KChartThreeDLineAttributes_p.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef KCHARTTHREEDLINESATTRIBUTES_P_H
-#define KCHARTTHREEDLINESATTRIBUTES_P_H
+#ifndef KCHARTTHREEDLINEATTRIBUTES_P_H
+#define KCHARTTHREEDLINEATTRIBUTES_P_H

//
// W A R N I N G
@@ -58,4 +58,4 @@ KCHART_DERIVED_PRIVATE_FOOTER(ThreeDLineAttributes, AbstractThreeDAttributes)
}


-#endif // KCHARTTHREEDLINESATTRIBUTES_P_H
+#endif // KCHARTTHREEDLINEATTRIBUTES_P_H
diff --git a/src/KChart/KTextDocument.h b/src/KChart/KTextDocument.h
index 67e9971..0c483ec 100644
--- a/src/KChart/KTextDocument.h
+++ b/src/KChart/KTextDocument.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

-#ifndef KDTEXTDOCUMENT_H
-#define KDTEXTDOCUMENT_H
+#ifndef KTEXTDOCUMENT_H
+#define KTEXTDOCUMENT_H

//
// W A R N I N G
@@ -60,5 +60,5 @@ private:
};


-#endif /* KDTEXTDOCUMENT_H */
+#endif /* KTEXTDOCUMENT_H */

diff --git a/src/KChart/Polar/KChartPolarCoordinatePlane.cpp b/src/KChart/Polar/KChartPolarCoordinatePlane.cpp
index 948bada..ded8aca 100644
--- a/src/KChart/Polar/KChartPolarCoordinatePlane.cpp
+++ b/src/KChart/Polar/KChartPolarCoordinatePlane.cpp
@@ -61,8 +61,8 @@ void PolarCoordinatePlane::addDiagram ( AbstractDiagram* diagram )
"PolarCoordinatePlane::addDiagram", "Only polar"
"diagrams can be added to a polar coordinate plane!" );
AbstractCoordinatePlane::addDiagram ( diagram );
- connect ( diagram, SIGNAL ( layoutChanged ( AbstractDiagram* ) ),
- SLOT ( slotLayoutChanged ( AbstractDiagram* ) ) );
+ connect ( diagram, SIGNAL (layoutChanged(AbstractDiagram*)),
+ SLOT (slotLayoutChanged(AbstractDiagram*)) );

}

diff --git a/src/KGantt/kganttconstraintmodel.h b/src/KGantt/kganttconstraintmodel.h
index a9e23e3..75c8368 100644
--- a/src/KGantt/kganttconstraintmodel.h
+++ b/src/KGantt/kganttconstraintmodel.h
@@ -69,7 +69,6 @@ namespace KGantt {
}

#ifndef QT_NO_DEBUG_STREAM
-#include <QDebug>

QDebug KGANTT_EXPORT operator<<( QDebug dbg, const KGantt::ConstraintModel& model );
inline QDebug operator<<( QDebug dbg, KGantt::ConstraintModel* model )
diff --git a/src/KGantt/kganttconstraintproxy.cpp b/src/KGantt/kganttconstraintproxy.cpp
index a8779eb..b4d9532 100644
--- a/src/KGantt/kganttconstraintproxy.cpp
+++ b/src/KGantt/kganttconstraintproxy.cpp
@@ -44,10 +44,10 @@ void ConstraintProxy::setSourceModel( ConstraintModel* src )

copyFromSource();

- connect( m_source, SIGNAL( constraintAdded( const KGantt::Constraint& ) ),
- this, SLOT( slotSourceConstraintAdded( const KGantt::Constraint& ) ) );
- connect( m_source, SIGNAL( constraintRemoved( const KGantt::Constraint& ) ),
- this, SLOT( slotSourceConstraintRemoved( const KGantt::Constraint& ) ) );
+ connect( m_source, SIGNAL(constraintAdded(KGantt::Constraint)),
+ this, SLOT(slotSourceConstraintAdded(KGantt::Constraint)) );
+ connect( m_source, SIGNAL(constraintRemoved(KGantt::Constraint)),
+ this, SLOT(slotSourceConstraintRemoved(KGantt::Constraint)) );
}

void ConstraintProxy::setDestinationModel( ConstraintModel* dest )
@@ -57,10 +57,10 @@ void ConstraintProxy::setDestinationModel( ConstraintModel* dest )

copyFromSource();

- connect( m_destination, SIGNAL( constraintAdded( const KGantt::Constraint& ) ),
- this, SLOT( slotDestinationConstraintAdded( const KGantt::Constraint& ) ) );
- connect( m_destination, SIGNAL( constraintRemoved( const KGantt::Constraint& ) ),
- this, SLOT( slotDestinationConstraintRemoved( const KGantt::Constraint& ) ) );
+ connect( m_destination, SIGNAL(constraintAdded(KGantt::Constraint)),
+ this, SLOT(slotDestinationConstraintAdded(KGantt::Constraint)) );
+ connect( m_destination, SIGNAL(constraintRemoved(KGantt::Constraint)),
+ this, SLOT(slotDestinationConstraintRemoved(KGantt::Constraint)) );
}

void ConstraintProxy::setProxyModel( QAbstractProxyModel* proxy )
@@ -69,8 +69,8 @@ void ConstraintProxy::setProxyModel( QAbstractProxyModel* proxy )
if ( m_proxy ) m_proxy->disconnect( this );
m_proxy = proxy;
if ( m_proxy ) {
- connect( m_proxy, SIGNAL( layoutChanged() ), this, SLOT( slotLayoutChanged() ) );
- connect( m_proxy, SIGNAL( modelReset() ), this, SLOT( slotLayoutChanged() ) );
+ connect( m_proxy, SIGNAL(layoutChanged()), this, SLOT(slotLayoutChanged()) );
+ connect( m_proxy, SIGNAL(modelReset()), this, SLOT(slotLayoutChanged()) );
}
}

diff --git a/src/KGantt/kganttforwardingproxymodel.cpp b/src/KGantt/kganttforwardingproxymodel.cpp
index e9865f5..605432c 100644
--- a/src/KGantt/kganttforwardingproxymodel.cpp
+++ b/src/KGantt/kganttforwardingproxymodel.cpp
@@ -99,27 +99,27 @@ void ForwardingProxyModel::setSourceModel( QAbstractItemModel* model )
connect( model, SIGNAL(layoutAboutToBeChanged()), this, SLOT(sourceLayoutAboutToBeChanged()) );
connect( model, SIGNAL(layoutChanged()), this, SLOT(sourceLayoutChanged()) );

- connect( model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)),
- this, SLOT(sourceDataChanged(const QModelIndex&,const QModelIndex&)) );
-
-
- connect( model, SIGNAL(columnsAboutToBeInserted(const QModelIndex&, int,int)),
- this, SLOT(sourceColumnsAboutToBeInserted(const QModelIndex&,int,int)) );
- connect( model, SIGNAL(columnsInserted(const QModelIndex&, int,int)),
- this, SLOT(sourceColumnsInserted(const QModelIndex&,int,int)) );
- connect( model, SIGNAL(columnsAboutToBeRemoved(const QModelIndex&, int,int)),
- this, SLOT(sourceColumnsAboutToBeRemoved(const QModelIndex&,int,int)) );
- connect( model, SIGNAL(columnsRemoved(const QModelIndex&, int,int)),
- this, SLOT(sourceColumnsRemoved(const QModelIndex&,int,int)) );
-
- connect( model, SIGNAL(rowsAboutToBeInserted(const QModelIndex&, int,int)),
- this, SLOT(sourceRowsAboutToBeInserted(const QModelIndex&,int,int)) );
- connect( model, SIGNAL(rowsInserted(const QModelIndex&, int,int)),
- this, SLOT(sourceRowsInserted(const QModelIndex&,int,int)) );
- connect( model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex&, int,int)),
- this, SLOT(sourceRowsAboutToBeRemoved(const QModelIndex&,int,int)) );
- connect( model, SIGNAL(rowsRemoved(const QModelIndex&, int,int)),
- this, SLOT(sourceRowsRemoved(const QModelIndex&,int,int)) );
+ connect( model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(sourceDataChanged(QModelIndex,QModelIndex)) );
+
+
+ connect( model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
+ this, SLOT(sourceColumnsAboutToBeInserted(QModelIndex,int,int)) );
+ connect( model, SIGNAL(columnsInserted(QModelIndex,int,int)),
+ this, SLOT(sourceColumnsInserted(QModelIndex,int,int)) );
+ connect( model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceColumnsAboutToBeRemoved(QModelIndex,int,int)) );
+ connect( model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceColumnsRemoved(QModelIndex,int,int)) );
+
+ connect( model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+ this, SLOT(sourceRowsAboutToBeInserted(QModelIndex,int,int)) );
+ connect( model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(sourceRowsInserted(QModelIndex,int,int)) );
+ connect( model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceRowsAboutToBeRemoved(QModelIndex,int,int)) );
+ connect( model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex,int,int)) );
}

/*! Called when the source model is about to be reset.
diff --git a/src/KGantt/kganttgraphicsscene.cpp b/src/KGantt/kganttgraphicsscene.cpp
index 8e639ef..f231422 100644
--- a/src/KGantt/kganttgraphicsscene.cpp
+++ b/src/KGantt/kganttgraphicsscene.cpp
@@ -197,7 +197,7 @@ void GraphicsScene::init()
{
setItemIndexMethod( QGraphicsScene::NoIndex );
setConstraintModel( new ConstraintModel( this ) );
- connect( d->grid, SIGNAL( gridChanged() ), this, SLOT( slotGridChanged() ) );
+ connect( d->grid, SIGNAL(gridChanged()), this, SLOT(slotGridChanged()) );
}

/* NOTE: The delegate should really be a property
@@ -264,10 +264,10 @@ void GraphicsScene::setConstraintModel( ConstraintModel* cm )
}
d->constraintModel = cm;

- connect( cm, SIGNAL( constraintAdded( const KGantt::Constraint& ) ),
- this, SLOT( slotConstraintAdded( const KGantt::Constraint& ) ) );
- connect( cm, SIGNAL( constraintRemoved( const KGantt::Constraint& ) ),
- this, SLOT( slotConstraintRemoved( const KGantt::Constraint& ) ) );
+ connect( cm, SIGNAL(constraintAdded(KGantt::Constraint)),
+ this, SLOT(slotConstraintAdded(KGantt::Constraint)) );
+ connect( cm, SIGNAL(constraintRemoved(KGantt::Constraint)),
+ this, SLOT(slotConstraintRemoved(KGantt::Constraint)) );
d->resetConstraintItems();
}

@@ -301,7 +301,7 @@ void GraphicsScene::setGrid( AbstractGrid* grid )
model = d->grid->model();
}
d->grid = grid;
- connect( d->grid, SIGNAL( gridChanged() ), this, SLOT( slotGridChanged() ) );
+ connect( d->grid, SIGNAL(gridChanged()), this, SLOT(slotGridChanged()) );
d->grid->setModel( model );
slotGridChanged();
}
diff --git a/src/KGantt/kganttgraphicsview.cpp b/src/KGantt/kganttgraphicsview.cpp
index 69f614c..5d920e5 100644
--- a/src/KGantt/kganttgraphicsview.cpp
+++ b/src/KGantt/kganttgraphicsview.cpp
@@ -355,22 +355,22 @@ GraphicsView::GraphicsView( QWidget* parent )
#if defined KDAB_EVAL
EvalDialog::checkEvalLicense( "KD Gantt" );
#endif
- connect( horizontalScrollBar(), SIGNAL( valueChanged( int ) ),
- this, SLOT( slotHorizontalScrollValueChanged( int ) ) );
- connect( &_d->scene, SIGNAL( gridChanged() ),
- this, SLOT( slotGridChanged() ) );
- connect( &_d->scene, SIGNAL( entered( const QModelIndex& ) ),
- this, SIGNAL( entered( const QModelIndex& ) ) );
- connect( &_d->scene, SIGNAL( pressed( const QModelIndex& ) ),
- this, SIGNAL( pressed( const QModelIndex& ) ) );
- connect( &_d->scene, SIGNAL( clicked( const QModelIndex& ) ),
- this, SLOT( slotItemClicked( const QModelIndex& ) ) );
- connect( &_d->scene, SIGNAL( qrealClicked( const QModelIndex& ) ),
- this, SLOT( slotItemDoubleClicked( const QModelIndex& ) ) );
- connect( &_d->scene, SIGNAL( sceneRectChanged( const QRectF& ) ),
- this, SLOT( updateSceneRect() ) );
- connect( &_d->headerwidget, SIGNAL( customContextMenuRequested( const QPoint& ) ),
- this, SLOT( slotHeaderContextMenuRequested( const QPoint& ) ) );
+ connect( horizontalScrollBar(), SIGNAL(valueChanged(int)),
+ this, SLOT(slotHorizontalScrollValueChanged(int)) );
+ connect( &_d->scene, SIGNAL(gridChanged()),
+ this, SLOT(slotGridChanged()) );
+ connect( &_d->scene, SIGNAL(entered(QModelIndex)),
+ this, SIGNAL(entered(QModelIndex)) );
+ connect( &_d->scene, SIGNAL(pressed(QModelIndex)),
+ this, SIGNAL(pressed(QModelIndex)) );
+ connect( &_d->scene, SIGNAL(clicked(QModelIndex)),
+ this, SLOT(slotItemClicked(QModelIndex)) );
+ connect( &_d->scene, SIGNAL(qrealClicked(QModelIndex)),
+ this, SLOT(slotItemDoubleClicked(QModelIndex)) );
+ connect( &_d->scene, SIGNAL(sceneRectChanged(QRectF)),
+ this, SLOT(updateSceneRect()) );
+ connect( &_d->headerwidget, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(slotHeaderContextMenuRequested(QPoint)) );
setScene( &_d->scene );

// HACK!
@@ -415,8 +415,8 @@ void GraphicsView::setModel( QAbstractItemModel* model )
}

d->scene.setModel( model );
- connect( model, SIGNAL( dataChanged( const QModelIndex&, const QModelIndex& ) ),
- this, SLOT( updateSceneRect() ) );
+ connect( model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(updateSceneRect()) );
updateScene();
}

@@ -439,22 +439,22 @@ void GraphicsView::setSummaryHandlingModel( QAbstractProxyModel* proxyModel )
/* Connections. We have to rely on the treeview
* to receive the signals before we do(!)
*/
- connect( proxyModel, SIGNAL( columnsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsInserted( const QModelIndex&, int, int ) ) );
- connect( proxyModel, SIGNAL( columnsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotColumnsRemoved( const QModelIndex&, int, int ) ) );
- connect( proxyModel, SIGNAL( dataChanged( const QModelIndex&, const QModelIndex& ) ),
- this, SLOT( slotDataChanged( const QModelIndex&, const QModelIndex& ) ) );
- connect( proxyModel, SIGNAL( layoutChanged() ),
- this, SLOT( slotLayoutChanged() ) );
- connect( proxyModel, SIGNAL( modelReset() ),
- this, SLOT( slotModelReset() ) );
- connect( proxyModel, SIGNAL( rowsInserted( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsInserted( const QModelIndex&, int, int ) ) );
- connect( proxyModel, SIGNAL( rowsAboutToBeRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsAboutToBeRemoved( const QModelIndex&, int, int ) ) );
- connect( proxyModel, SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ),
- this, SLOT( slotRowsRemoved( const QModelIndex&, int, int ) ) );
+ connect( proxyModel, SIGNAL(columnsInserted(QModelIndex,int,int)),
+ this, SLOT(slotColumnsInserted(QModelIndex,int,int)) );
+ connect( proxyModel, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+ this, SLOT(slotColumnsRemoved(QModelIndex,int,int)) );
+ connect( proxyModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotDataChanged(QModelIndex,QModelIndex)) );
+ connect( proxyModel, SIGNAL(layoutChanged()),
+ this, SLOT(slotLayoutChanged()) );
+ connect( proxyModel, SIGNAL(modelReset()),
+ this, SLOT(slotModelReset()) );
+ connect( proxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(slotRowsInserted(QModelIndex,int,int)) );
+ connect( proxyModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(slotRowsAboutToBeRemoved(QModelIndex,int,int)) );
+ connect( proxyModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(slotRowsRemoved(QModelIndex,int,int)) );

updateScene();
}
diff --git a/src/KGantt/kganttlegend.cpp b/src/KGantt/kganttlegend.cpp
index 87d178c..127c9d7 100644
--- a/src/KGantt/kganttlegend.cpp
+++ b/src/KGantt/kganttlegend.cpp
@@ -81,9 +81,9 @@ void Legend::setModel( QAbstractItemModel* model )
{
if ( this->model() != 0 )
{
- disconnect( this->model(), SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SLOT( modelDataChanged() ) );
- disconnect( this->model(), SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( modelDataChanged() ) );
- disconnect( this->model(), SIGNAL( columnsRemoved( QModelIndex, int, int ) ), this, SLOT( modelDataChanged() ) );
+ disconnect( this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelDataChanged()) );
+ disconnect( this->model(), SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelDataChanged()) );
+ disconnect( this->model(), SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelDataChanged()) );
}

QAbstractItemView::setModel( model );
@@ -91,9 +91,9 @@ void Legend::setModel( QAbstractItemModel* model )

if ( this->model() != 0 )
{
- connect( this->model(), SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SLOT( modelDataChanged() ) );
- connect( this->model(), SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( modelDataChanged() ) );
- connect( this->model(), SIGNAL( columnsRemoved( QModelIndex, int, int ) ), this, SLOT( modelDataChanged() ) );
+ connect( this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelDataChanged()) );
+ connect( this->model(), SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelDataChanged()) );
+ connect( this->model(), SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelDataChanged()) );
}

}
diff --git a/src/KGantt/kganttview.cpp b/src/KGantt/kganttview.cpp
index c7d843f..c9edab4 100644
--- a/src/KGantt/kganttview.cpp
+++ b/src/KGantt/kganttview.cpp
@@ -285,20 +285,20 @@ void View::setLeftView( QAbstractItemView* aiv )
d->splitter.insertWidget( 0, d->leftWidget );

if ( qobject_cast<QTreeView*>(d->leftWidget) ) {
- connect( d->leftWidget, SIGNAL( collapsed( const QModelIndex& ) ),
- this, SLOT( slotCollapsed( const QModelIndex& ) ) );
- connect( d->leftWidget, SIGNAL( expanded( const QModelIndex& ) ),
- this, SLOT( slotExpanded( const QModelIndex& ) ) );
+ connect( d->leftWidget, SIGNAL(collapsed(QModelIndex)),
+ this, SLOT(slotCollapsed(QModelIndex)) );
+ connect( d->leftWidget, SIGNAL(expanded(QModelIndex)),
+ this, SLOT(slotExpanded(QModelIndex)) );
}

- connect( d->gfxview->verticalScrollBar(), SIGNAL( valueChanged( int ) ),
- d->leftWidget->verticalScrollBar(), SLOT( setValue( int ) ) );
- connect( d->leftWidget->verticalScrollBar(), SIGNAL( valueChanged( int ) ),
- d->gfxview->verticalScrollBar(), SLOT( setValue( int ) ) );
- connect( d->leftWidget->verticalScrollBar(), SIGNAL( rangeChanged( int, int ) ),
- this, SLOT( slotLeftWidgetVerticalRangeChanged( int, int ) ) );
- connect( d->gfxview->verticalScrollBar(), SIGNAL( rangeChanged( int, int ) ),
- this, SLOT( slotGfxViewVerticalRangeChanged( int, int ) ) );
+ connect( d->gfxview->verticalScrollBar(), SIGNAL(valueChanged(int)),
+ d->leftWidget->verticalScrollBar(), SLOT(setValue(int)) );
+ connect( d->leftWidget->verticalScrollBar(), SIGNAL(valueChanged(int)),
+ d->gfxview->verticalScrollBar(), SLOT(setValue(int)) );
+ connect( d->leftWidget->verticalScrollBar(), SIGNAL(rangeChanged(int,int)),
+ this, SLOT(slotLeftWidgetVerticalRangeChanged(int,int)) );
+ connect( d->gfxview->verticalScrollBar(), SIGNAL(rangeChanged(int,int)),
+ this, SLOT(slotGfxViewVerticalRangeChanged(int,int)) );
}

/*! Sets \a ctrl to be the rowcontroller used by this View.
@@ -637,7 +637,7 @@ void View::print( QPainter* painter, qreal start, qreal end, const QRectF& targe
KDAB_SCOPED_UNITTEST_SIMPLE( KGantt, View, "test" ) {
View view( 0 );
#if 0 // GUI tests do not work well on the server
- QTimer::singleShot( 1000, qApp, SLOT( quit() ) );
+ QTimer::singleShot( 1000, qApp, SLOT(quit()) );
view.show();

qApp->exec();
@@ -647,7 +647,7 @@ KDAB_SCOPED_UNITTEST_SIMPLE( KGantt, View, "test" ) {
view.setLeftView( tv );
view.setRowController( new TreeViewRowController(tv,view.ganttProxyModel()) );

- QTimer::singleShot( 1000, qApp, SLOT( quit() ) );
+ QTimer::singleShot( 1000, qApp, SLOT(quit()) );

qApp->exec();
QPixmap screenshot2 = QPixmap::grabWidget( &view );
@@ -658,7 +658,7 @@ KDAB_SCOPED_UNITTEST_SIMPLE( KGantt, View, "test" ) {
view.setLeftView(lv);
view.setRowController( new ListViewRowController(lv,view.ganttProxyModel()));
view.show();
- QTimer::singleShot( 1000, qApp, SLOT( quit() ) );
+ QTimer::singleShot( 1000, qApp, SLOT(quit()) );
qApp->exec();
#endif
}
diff --git a/src/KGantt/test/TestKGanttConstraint.h b/src/KGantt/test/TestKGanttConstraint.h
index 29bcc1e..5f1b6c9 100644
--- a/src/KGantt/test/TestKGanttConstraint.h
+++ b/src/KGantt/test/TestKGanttConstraint.h
@@ -18,6 +18,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
+#ifndef TESTGANTTCONSTRAINT_H
+#define TESTGANTTCONSTRAINT_H

#include <QtTest>

@@ -31,3 +33,4 @@ private Q_SLOTS:
void cleanupTestCase();
void test();
};
+#endif
diff --git a/src/KGantt/test/TestKGanttConstraintModel.h b/src/KGantt/test/TestKGanttConstraintModel.h
index c39269e..c288d81 100644
--- a/src/KGantt/test/TestKGanttConstraintModel.h
+++ b/src/KGantt/test/TestKGanttConstraintModel.h
@@ -18,6 +18,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
+#ifndef TESTKGANTTCONSTRAINTMODEL_H
+#define TESTKGANTTCONSTRAINTMODEL_H

#include <QtTest>
#include <QStandardItemModel>
@@ -34,3 +36,4 @@ private Q_SLOTS:
void cleanupTestCase();
void testModel();
};
+#endif
diff --git a/src/KGantt/test/TestKGanttView.h b/src/KGantt/test/TestKGanttView.h
index a9103e0..531f4ac 100644
--- a/src/KGantt/test/TestKGanttView.h
+++ b/src/KGantt/test/TestKGanttView.h
@@ -18,6 +18,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
+#ifndef TESTKGANTTVIEW_H
+#define TESTKGANTTVIEW_H

#include <QtTest>
#include <QStandardItemModel>
@@ -54,3 +56,4 @@ private Q_SLOTS:

void testConstraints();
};
+#endif
diff --git a/tests/Gantt/apireview/entrydialog.cpp b/tests/Gantt/apireview/entrydialog.cpp
index 9860e24..ecc2d41 100644
--- a/tests/Gantt/apireview/entrydialog.cpp
+++ b/tests/Gantt/apireview/entrydialog.cpp
@@ -49,8 +49,8 @@ void EntryDialog::init()
for (int row = 0; row < model->rowCount(); ++row )
addDependItem( model, model->index( row, 0 ) );

- connect( ui->startDate, SIGNAL( dateTimeChanged( const QDateTime& ) ), this, SLOT( updateEndDate( const QDateTime& ) ) );
- connect( ui->readOnly, SIGNAL( toggled( bool ) ), this, SLOT( disableEditing( bool ) ) );
+ connect( ui->startDate, SIGNAL(dateTimeChanged(QDateTime)), this, SLOT(updateEndDate(QDateTime)) );
+ connect( ui->readOnly, SIGNAL(toggled(bool)), this, SLOT(disableEditing(bool)) );

ui->startDate->setDateTime( QDateTime::currentDateTime() );
}
diff --git a/tests/Gantt/apireview/mainwindow.cpp b/tests/Gantt/apireview/mainwindow.cpp
index 0222698..eaf9401 100644
--- a/tests/Gantt/apireview/mainwindow.cpp
+++ b/tests/Gantt/apireview/mainwindow.cpp
@@ -57,15 +57,15 @@ MainWindow::MainWindow( QWidget* parent, Qt::WindowFlags flags )
leftView->setColumnHidden( 5, true );
leftView->header()->setStretchLastSection( true );

- connect( ui->ganttView->leftView(), SIGNAL( customContextMenuRequested( const QPoint& ) ),
- this, SLOT( showContextMenu( const QPoint& ) ) );
- connect( ui->ganttView->selectionModel(), SIGNAL( selectionChanged( const QItemSelection&, const QItemSelection& ) ),
- this, SLOT( enableActions( const QItemSelection& ) ) );
-
- connect( ui->ganttView->graphicsView(), SIGNAL( clicked( const QModelIndex& ) ),
- this, SLOT( slotClicked( const QModelIndex& ) ) );
- connect( ui->ganttView->graphicsView(), SIGNAL( qrealClicked( const QModelIndex& ) ),
- this, SLOT( slotDoubleClicked( const QModelIndex& ) ) );
+ connect( ui->ganttView->leftView(), SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(showContextMenu(QPoint)) );
+ connect( ui->ganttView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
+ this, SLOT(enableActions(QItemSelection)) );
+
+ connect( ui->ganttView->graphicsView(), SIGNAL(clicked(QModelIndex)),
+ this, SLOT(slotClicked(QModelIndex)) );
+ connect( ui->ganttView->graphicsView(), SIGNAL(qrealClicked(QModelIndex)),
+ this, SLOT(slotDoubleClicked(QModelIndex)) );
}

void MainWindow::initModel()
@@ -87,25 +87,25 @@ void MainWindow::initActions()
{
newEntryAction = new QAction( tr( "New entry" ), this );
newEntryAction->setShortcut( QKeySequence::New );
- connect( newEntryAction, SIGNAL( triggered() ), this, SLOT( addNewEntry() ) );
+ connect( newEntryAction, SIGNAL(triggered()), this, SLOT(addNewEntry()) );

removeEntryAction = new QAction( tr( "Remove entry" ), this );
removeEntryAction->setShortcut( QKeySequence::Delete );
- connect( removeEntryAction, SIGNAL( triggered() ), this, SLOT( removeEntry() ) );
+ connect( removeEntryAction, SIGNAL(triggered()), this, SLOT(removeEntry()) );

demoAction = new QAction( tr( "Demo entry" ), this );
- connect( demoAction, SIGNAL( triggered() ), this, SLOT( addDemoEntry() ) );
+ connect( demoAction, SIGNAL(triggered()), this, SLOT(addDemoEntry()) );

printAction = new QAction( tr( "Print Preview..." ), this );
- connect( printAction, SIGNAL( triggered() ), this, SLOT( printPreview() ) );
+ connect( printAction, SIGNAL(triggered()), this, SLOT(printPreview()) );

zoomInAction = new QAction( tr( "Zoom In" ), this );
zoomInAction->setShortcut( QKeySequence::ZoomIn );
- connect( zoomInAction, SIGNAL( triggered() ), this, SLOT( zoomIn() ) );
+ connect( zoomInAction, SIGNAL(triggered()), this, SLOT(zoomIn()) );

zoomOutAction = new QAction( tr( "Zoom Out" ), this );
zoomOutAction->setShortcut( QKeySequence::ZoomOut );
- connect( zoomOutAction, SIGNAL( triggered() ), this, SLOT( zoomOut() ) );
+ connect( zoomOutAction, SIGNAL(triggered()), this, SLOT(zoomOut()) );

ui->ganttView->leftView()->setContextMenuPolicy( Qt::CustomContextMenu );
ui->ganttView->leftView()->addAction( newEntryAction );
diff --git a/tests/Gantt/customconstraints/main.cpp b/tests/Gantt/customconstraints/main.cpp
index a37005e..ce3ad2f 100644
--- a/tests/Gantt/customconstraints/main.cpp
+++ b/tests/Gantt/customconstraints/main.cpp
@@ -106,8 +106,8 @@ public:
view.setGrid( &grid );
view.setModel(&model);

- connect( &slider, SIGNAL( valueChanged( int ) ),
- this, SLOT( slotZoom( int ) ) );
+ connect( &slider, SIGNAL(valueChanged(int)),
+ this, SLOT(slotZoom(int)) );
}

public slots:
diff --git a/tests/Gantt/gfxview/main.cpp b/tests/Gantt/gfxview/main.cpp
index 3a49cfc..184b4e8 100644
--- a/tests/Gantt/gfxview/main.cpp
+++ b/tests/Gantt/gfxview/main.cpp
@@ -142,8 +142,8 @@ int main( int argc, char** argv ) {
view->setModel( &model );
#if 0
QPushButton* pb = new QPushButton( QObject::tr( "Reset" ) );
- QObject::connect( pb, SIGNAL( clicked() ),
- &model, SIGNAL( modelReset() ) );
+ QObject::connect( pb, SIGNAL(clicked()),
+ &model, SIGNAL(modelReset()) );
pb->show();
#endif
return app.exec();
diff --git a/tests/Gantt/listview/main.cpp b/tests/Gantt/listview/main.cpp
index c415160..c5118b6 100644
--- a/tests/Gantt/listview/main.cpp
+++ b/tests/Gantt/listview/main.cpp
@@ -112,8 +112,8 @@ public:
view.setGrid( &grid );
view.setModel(&model);
//view.setConstraintModel( &cmodel );
- connect( &slider, SIGNAL( valueChanged( int ) ),
- this, SLOT( slotZoom( int ) ) );
+ connect( &slider, SIGNAL(valueChanged(int)),
+ this, SLOT(slotZoom(int)) );
}

public slots:
diff --git a/tests/Gantt/reorder/main.cpp b/tests/Gantt/reorder/main.cpp
index 4d4ed10..27fa7dd 100644
--- a/tests/Gantt/reorder/main.cpp
+++ b/tests/Gantt/reorder/main.cpp
@@ -167,7 +167,7 @@ int main( int argc, char** argv )
view->show();

/* After 5 seconds, move row 1 to pos 0: */
- QTimer::singleShot( 5000, new MoveHelper( &model, &constraints, view, 1, 0 ), SLOT( deleteLater() ) );
+ QTimer::singleShot( 5000, new MoveHelper( &model, &constraints, view, 1, 0 ), SLOT(deleteLater()) );

return app.exec();
}
diff --git a/tests/Gantt/view/main.cpp b/tests/Gantt/view/main.cpp
index 7729d4d..ccad291 100644
--- a/tests/Gantt/view/main.cpp
+++ b/tests/Gantt/view/main.cpp
@@ -121,8 +121,8 @@ public:
view.setGrid( &grid );
view.setModel(&model);
//view.setConstraintModel( &cmodel );
- connect( &slider, SIGNAL( valueChanged( int ) ),
- this, SLOT( slotZoom( int ) ) );
+ connect( &slider, SIGNAL(valueChanged(int)),
+ this, SLOT(slotZoom(int)) );


QPushButton* pb1 = new QPushButton( tr("Print Preview..."));
@@ -133,8 +133,8 @@ public:
connect(pb2,SIGNAL(clicked()),this,SLOT(slotPrint()));

view.graphicsView()->setHeaderContextMenuPolicy( Qt::CustomContextMenu );
- connect( view.graphicsView(), SIGNAL( headerContextMenuRequested( const QPoint& ) ),
- this, SLOT( slotHeaderMenu( const QPoint& ) ) );
+ connect( view.graphicsView(), SIGNAL(headerContextMenuRequested(QPoint)),
+ this, SLOT(slotHeaderMenu(QPoint)) );
}

public slots:

[Yuri Chornoivan]

Git commit 7ce3c771afcabfb08fbd6c11ed15db8a31a0d64c by Yuri Chornoivan.
Committed on 25/09/2018 at 17:05.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 analitza/abstractexpressiontransformer.cpp
M +1 -1 analitza/abstractlexer.h
M +1 -1 analitza/analyzer.cpp
M +1 -1 analitza/builtinmethods.h
M +1 -1 analitza/commands/eigencommands.cpp
M +1 -1 analitza/commands/eigencommands.h
M +1 -1 analitza/explexer.h
M +1 -1 analitza/expression.h
M +1 -2 analitza/expressionparser.cpp
M +1 -1 analitza/expressionstream.h
M +1 -1 analitza/expressiontypechecker.h
M +1 -1 analitza/htmlexpressionwriter.h
M +3 -3 analitza/importqobjectmetatype.h
M +1 -1 analitza/mathmlpresentationexpressionwriter.h
M +1 -1 analitza/mathmlpresentationlexer.h
M +1 -1 analitza/matrix.h
M +1 -1 analitza/polynomial.h
M +1 -1 analitza/providederivative.h
M +1 -1 analitza/stringexpressionwriter.h
M +1 -1 analitza/tests/commandstest.cpp
M +3 -3 analitza/tests/commandstest.h
M +1 -1 analitza/vector.h
M +4 -4 analitzaplot/planecurve.h
M +1 -1 analitzaplot/plotsdictionarymodel.h
M +1 -1 analitzaplot/plotsmodel.h
M +1 -1 analitzaplot/plotter2d.h
M +1 -1 analitzaplot/plotter3d_es.h
M +2 -2 analitzaplot/private/abstractfunctiongraph.h
M +1 -1 analitzaplot/private/abstractplanecurve.cpp
M +3 -3 analitzaplot/private/abstractplotitem.h
M +1 -1 analitzaplot/private/abstractspacecurve.cpp
M +1 -1 analitzaplot/private/abstractspacecurve.h
M +4 -0 analitzaplot/private/export3d.h
M +2 -2 analitzaplot/private/utils/marchingsquares.h
M +4 -4 analitzaplot/private/utils/quadtree.h
M +1 -1 analitzaplot/spacecurve.h
M +1 -1 analitzaplot/surface.h
M +2 -2 analitzaplot/tests/planecurvetest.h
M +2 -2 analitzaplot/tests/plotsdictionarymodeltest.h
M +2 -2 analitzaplot/tests/plotsmodeltest.h
M +2 -2 analitzaplot/tests/spacecurvetest.h
M +2 -2 analitzaplot/tests/surfacetest.h
M +3 -3 analitzawidgets/plotsview2d.h
M +1 -1 analitzawidgets/plotsview3d.h
M +1 -1 analitzawidgets/plotsview3d_es.h
M +1 -1 declarative/analitzawrapper.h
M +1 -1 declarative/graph2dmobile.h
M +2 -2 declarative/graph3ditem.h

https://commits.kde.org/analitza/7ce3c771afcabfb08fbd6c11ed15db8a31a0d64c

diff --git a/analitza/abstractexpressiontransformer.cpp b/analitza/abstractexpressiontransformer.cpp
index 404ef405..5d07898b 100644
--- a/analitza/abstractexpressiontransformer.cpp
+++ b/analitza/abstractexpressiontransformer.cpp
@@ -110,4 +110,4 @@ Object* AbstractExpressionTransformer::walkMatrix(const Matrix* pattern)
ret->appendBranch(static_cast<MatrixRow*>(walk(*it)));
}
return ret;
-}
\ No newline at end of file
+}
diff --git a/analitza/abstractlexer.h b/analitza/abstractlexer.h
index e71e60b4..a64215e4 100644
--- a/analitza/abstractlexer.h
+++ b/analitza/abstractlexer.h
@@ -39,7 +39,7 @@ class ANALITZA_EXPORT AbstractLexer
uint pos;
};

- AbstractLexer(const QString &source);
+ explicit AbstractLexer(const QString &source);
virtual ~AbstractLexer();
int lex();
int lineNumber() const { return m_lines; }
diff --git a/analitza/analyzer.cpp b/analitza/analyzer.cpp
index dd2c50d1..853e3b41 100644
--- a/analitza/analyzer.cpp
+++ b/analitza/analyzer.cpp
@@ -43,7 +43,7 @@
#include "commands/blockmatrixcommands.h"
#include "commands/matrixqueries.h"

-#include "config-analitza.h"
+#include <config-analitza.h>
#ifdef HAVE_EIGEN3
#include "commands/eigencommands.h"
#endif
diff --git a/analitza/builtinmethods.h b/analitza/builtinmethods.h
index 9d67d5db..86f13a04 100644
--- a/analitza/builtinmethods.h
+++ b/analitza/builtinmethods.h
@@ -50,7 +50,7 @@ class PointerFunctionDefinition : public FunctionDefinition
public:
typedef Expression (*func)(const QList<Expression>& args);

- PointerFunctionDefinition(func call);
+ explicit PointerFunctionDefinition(func call);
virtual Expression operator()(const QList<Expression>& args) override;
private:
func m_function;
diff --git a/analitza/commands/eigencommands.cpp b/analitza/commands/eigencommands.cpp
index c03e6ab3..c8f85f73 100644
--- a/analitza/commands/eigencommands.cpp
+++ b/analitza/commands/eigencommands.cpp
@@ -141,7 +141,7 @@ Expression EigenvaluesCommand::operator()(const QList< Analitza::Expression >& a
isonlyreal = false;
}

- Analitza::Cn * eigenvalueobj = 0;
+ Analitza::Cn * eigenvalueobj = nullptr;

if (isonlyreal) {
eigenvalueobj = new Analitza::Cn(realpart);
diff --git a/analitza/commands/eigencommands.h b/analitza/commands/eigencommands.h
index a8d9b86c..003ca61c 100644
--- a/analitza/commands/eigencommands.h
+++ b/analitza/commands/eigencommands.h
@@ -20,7 +20,7 @@
#define EIGENCOMMANDS_H

#include "builtinmethods.h"
-#include "config-analitza.h"
+#include <config-analitza.h>

namespace Analitza {
class Expression;
diff --git a/analitza/explexer.h b/analitza/explexer.h
index fd294a3b..cc7e474d 100644
--- a/analitza/explexer.h
+++ b/analitza/explexer.h
@@ -28,7 +28,7 @@ class ANALITZA_EXPORT ExpLexer : public AbstractLexer
{
public:

- ExpLexer(const QString &source);
+ explicit ExpLexer(const QString &source);

static QString escape(const QString& str);

diff --git a/analitza/expression.h b/analitza/expression.h
index 357a0cd6..dce67bda 100644
--- a/analitza/expression.h
+++ b/analitza/expression.h
@@ -60,7 +60,7 @@ class ANALITZA_EXPORT Expression
/**
* Creates an expression from a value
*/
- Expression(const Cn& e);
+ explicit Expression(const Cn& e);

explicit Expression(Object* o);

diff --git a/analitza/expressionparser.cpp b/analitza/expressionparser.cpp
index a5ff8c69..7009180b 100644
--- a/analitza/expressionparser.cpp
+++ b/analitza/expressionparser.cpp
@@ -20,9 +20,8 @@
*************************************************************************************/


-
-#include <QtCore/QDebug>
#include "expressionparser.h"
+#include <QDebug>
#include "abstractlexer.h"
#include "operator.h"
#include <QCoreApplication>
diff --git a/analitza/expressionstream.h b/analitza/expressionstream.h
index 494169e8..363cea9a 100644
--- a/analitza/expressionstream.h
+++ b/analitza/expressionstream.h
@@ -28,7 +28,7 @@ namespace Analitza
class ANALITZA_EXPORT ExpressionStream
{
public:
- ExpressionStream(QTextStream* dev);
+ explicit ExpressionStream(QTextStream* dev);

bool atEnd() const;
bool isInterrupted() const;
diff --git a/analitza/expressiontypechecker.h b/analitza/expressiontypechecker.h
index c5acccf6..59f2052f 100644
--- a/analitza/expressiontypechecker.h
+++ b/analitza/expressiontypechecker.h
@@ -34,7 +34,7 @@ class Expression;
class ANALITZA_EXPORT ExpressionTypeChecker : public AbstractExpressionVisitor
{
public:
- ExpressionTypeChecker(Variables* v);
+ explicit ExpressionTypeChecker(Variables* v);

ExpressionType check(const Expression& exp);

diff --git a/analitza/htmlexpressionwriter.h b/analitza/htmlexpressionwriter.h
index 2b79c6c7..4225ffb9 100644
--- a/analitza/htmlexpressionwriter.h
+++ b/analitza/htmlexpressionwriter.h
@@ -35,7 +35,7 @@ namespace Analitza
class HtmlExpressionWriter : public AbstractExpressionVisitor
{
public:
- HtmlExpressionWriter(const Object* o);
+ explicit HtmlExpressionWriter(const Object* o);

virtual QVariant visit(const None* var) override;
virtual QVariant visit(const Ci* var) override;
diff --git a/analitza/importqobjectmetatype.h b/analitza/importqobjectmetatype.h
index 98bb19d4..d58615e6 100644
--- a/analitza/importqobjectmetatype.h
+++ b/analitza/importqobjectmetatype.h
@@ -17,8 +17,8 @@
*************************************************************************************/


-#ifndef IMPORTQMETAOBJECT_H
-#define IMPORTQMETAOBJECT_H
+#ifndef IMPORTQOBJECTMETATYPE_H
+#define IMPORTQOBJECTMETATYPE_H
#include <QMetaObject>
#include <analitza/analitzaexport.h>

@@ -29,7 +29,7 @@ class Analyzer;
class ANALITZA_EXPORT ImportQMetaObject
{
public:
- ImportQMetaObject(Analitza::Analyzer* a);
+ explicit ImportQMetaObject(Analitza::Analyzer* a);

void import(const QMetaObject& t);

diff --git a/analitza/mathmlpresentationexpressionwriter.h b/analitza/mathmlpresentationexpressionwriter.h
index f913470a..176fdde5 100644
--- a/analitza/mathmlpresentationexpressionwriter.h
+++ b/analitza/mathmlpresentationexpressionwriter.h
@@ -38,7 +38,7 @@ class MathMLPresentationExpressionWriter : public AbstractExpressionVisitor
{
public:
typedef QString (*operatorToString)(const Apply* o, MathMLPresentationExpressionWriter* w);
- MathMLPresentationExpressionWriter(const Object* o);
+ explicit MathMLPresentationExpressionWriter(const Object* o);

virtual QVariant visit(const None* var) override;
virtual QVariant visit(const Ci* var) override;
diff --git a/analitza/mathmlpresentationlexer.h b/analitza/mathmlpresentationlexer.h
index 7e3109a1..d70a5b6c 100644
--- a/analitza/mathmlpresentationlexer.h
+++ b/analitza/mathmlpresentationlexer.h
@@ -30,7 +30,7 @@ class ANALITZA_EXPORT MathMLPresentationLexer : public AbstractLexer
{
public:

- MathMLPresentationLexer(const QString &source);
+ explicit MathMLPresentationLexer(const QString &source);

private:
void getToken() override;
diff --git a/analitza/matrix.h b/analitza/matrix.h
index 6baf654e..c9257aed 100644
--- a/analitza/matrix.h
+++ b/analitza/matrix.h
@@ -32,7 +32,7 @@ class Vector;
class ANALITZA_EXPORT MatrixRow : public Vector
{
public:
- MatrixRow(int size=0);
+ explicit MatrixRow(int size=0);
virtual QVariant accept(AbstractExpressionVisitor* e) const override;

MatrixRow* copy() const override;
diff --git a/analitza/polynomial.h b/analitza/polynomial.h
index 08dfdd40..2a76adba 100644
--- a/analitza/polynomial.h
+++ b/analitza/polynomial.h
@@ -77,7 +77,7 @@ class Monomial
class Polynomial : public QList<Monomial>
{
public:
- Polynomial(Apply* c);
+ explicit Polynomial(Apply* c);

Analitza::Object* toObject();
void negate(int i);
diff --git a/analitza/providederivative.h b/analitza/providederivative.h
index d7be83fa..d1b190ac 100644
--- a/analitza/providederivative.h
+++ b/analitza/providederivative.h
@@ -29,7 +29,7 @@ namespace Analitza
class ProvideDerivative : public AbstractExpressionTransformer
{
public:
- ProvideDerivative(const QString& var);
+ explicit ProvideDerivative(const QString& var);
Object* run(const Object* o);

bool isCorrect() const { return m_errors.isEmpty(); }
diff --git a/analitza/stringexpressionwriter.h b/analitza/stringexpressionwriter.h
index f244061c..b03df818 100644
--- a/analitza/stringexpressionwriter.h
+++ b/analitza/stringexpressionwriter.h
@@ -36,7 +36,7 @@ namespace Analitza
class StringExpressionWriter : public AbstractExpressionVisitor
{
public:
- StringExpressionWriter(const Object* o);
+ explicit StringExpressionWriter(const Object* o);

virtual QVariant visit(const None* var) override;
virtual QVariant visit(const Ci* var) override;
diff --git a/analitza/tests/commandstest.cpp b/analitza/tests/commandstest.cpp
index 1f6c494e..5cec87d1 100644
--- a/analitza/tests/commandstest.cpp
+++ b/analitza/tests/commandstest.cpp
@@ -21,7 +21,7 @@
#include <QtTest/QTest>

#include "analyzer.h"
-#include "config-analitza.h"
+#include <config-analitza.h>

using Analitza::Expression;

diff --git a/analitza/tests/commandstest.h b/analitza/tests/commandstest.h
index 98145cdf..fad5e8b8 100644
--- a/analitza/tests/commandstest.h
+++ b/analitza/tests/commandstest.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef MATRIXTEST_H
-#define MATRIXTEST_H
+#ifndef COMMANDTEST_H
+#define COMMANDTEST_H

#include <QObject>

@@ -50,4 +50,4 @@ Q_OBJECT
Analitza::Analyzer *a;
};

-#endif // MATRIXTEST_H
+#endif // COMMANDTEST_H
diff --git a/analitza/vector.h b/analitza/vector.h
index 6e9cdf45..3fd94c08 100644
--- a/analitza/vector.h
+++ b/analitza/vector.h
@@ -40,7 +40,7 @@ class ANALITZA_EXPORT Vector : public Object
typedef QList<Object*>::const_iterator const_iterator;

Vector(const Vector& v);
- Vector(int size);
+ explicit Vector(int size);
/** Fills the vector with a fixed numeric @p value */
Vector(int size, const Cn *value);
virtual ~Vector();
diff --git a/analitzaplot/planecurve.h b/analitzaplot/planecurve.h
index 5b79e9c0..9b0781af 100644
--- a/analitzaplot/planecurve.h
+++ b/analitzaplot/planecurve.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef ANALITZAPLOT_FUNCTION_H
-#define ANALITZAPLOT_FUNCTION_H
+#ifndef ANALITZAPLOT_PLANECURVE_H
+#define ANALITZAPLOT_PLANECURVE_H

#include "functiongraph.h"

@@ -48,7 +48,7 @@ class AbstractSurface;
class ANALITZAPLOT_EXPORT PlaneCurve : public FunctionGraph
{
public:
- PlaneCurve(AbstractFunctionGraph* g);
+ explicit PlaneCurve(AbstractFunctionGraph* g);
virtual ~PlaneCurve();

QVector<int> jumps() const;
@@ -60,4 +60,4 @@ public:

}

-#endif // ANALITZAPLOT_FUNCTION_H
+#endif // ANALITZAPLOT_PLANECURVE_H
diff --git a/analitzaplot/plotsdictionarymodel.h b/analitzaplot/plotsdictionarymodel.h
index 69ce7cf9..5d551015 100644
--- a/analitzaplot/plotsdictionarymodel.h
+++ b/analitzaplot/plotsdictionarymodel.h
@@ -36,7 +36,7 @@ class ANALITZAPLOT_EXPORT PlotsDictionaryModel : public QStandardItemModel
Q_OBJECT
public:
enum Roles { ExpressionRole = Qt::UserRole+1, FileRole };
- PlotsDictionaryModel(QObject* parent = nullptr);
+ explicit PlotsDictionaryModel(QObject* parent = nullptr);
~PlotsDictionaryModel();

int currentRow() const;
diff --git a/analitzaplot/plotsmodel.h b/analitzaplot/plotsmodel.h
index c00eb1c4..07fdea6d 100644
--- a/analitzaplot/plotsmodel.h
+++ b/analitzaplot/plotsmodel.h
@@ -52,7 +52,7 @@ public:
DescriptionRole
};

- PlotsModel(QObject * parent = nullptr);
+ explicit PlotsModel(QObject * parent = nullptr);
virtual ~PlotsModel();

virtual Qt::ItemFlags flags(const QModelIndex & index) const override;
diff --git a/analitzaplot/plotter2d.h b/analitzaplot/plotter2d.h
index dffc5033..e6f7bf55 100644
--- a/analitzaplot/plotter2d.h
+++ b/analitzaplot/plotter2d.h
@@ -58,7 +58,7 @@ class ANALITZAPLOT_EXPORT Plotter2D
struct GridInfo; // interval structure for carry current grid state information across interval methods

public:
- Plotter2D(const QSizeF& size);
+ explicit Plotter2D(const QSizeF& size);
virtual ~Plotter2D();

/** Sets whether we will draw the grid. */
diff --git a/analitzaplot/plotter3d_es.h b/analitzaplot/plotter3d_es.h
index 9b8e33fe..f51ca51c 100644
--- a/analitzaplot/plotter3d_es.h
+++ b/analitzaplot/plotter3d_es.h
@@ -59,7 +59,7 @@ class ANALITZAPLOT_EXPORT Plotter3DES : private QOpenGLFunctions
//TODO transparency effect when select current item
// enum FocusEffect {};

- Plotter3DES(QAbstractItemModel* model = nullptr);
+ explicit Plotter3DES(QAbstractItemModel* model = nullptr);
virtual ~Plotter3DES();

virtual void initGL();
diff --git a/analitzaplot/private/abstractfunctiongraph.h b/analitzaplot/private/abstractfunctiongraph.h
index 8ad8592e..c337e1c2 100644
--- a/analitzaplot/private/abstractfunctiongraph.h
+++ b/analitzaplot/private/abstractfunctiongraph.h
@@ -108,12 +108,12 @@ class EndPoint
public:
EndPoint() {}

- EndPoint(double value)
+ explicit EndPoint(double value)
{
setValue(value);
}

- EndPoint(const Analitza::Expression &expression)
+ explicit EndPoint(const Analitza::Expression &expression)
{
if (!setValue(expression))
setValue(0.0);
diff --git a/analitzaplot/private/abstractplanecurve.cpp b/analitzaplot/private/abstractplanecurve.cpp
index 4573db6a..52b30bb0 100644
--- a/analitzaplot/private/abstractplanecurve.cpp
+++ b/analitzaplot/private/abstractplanecurve.cpp
@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

+#include "abstractplanecurve.h"
#include "functiongraph.h"

#include <cmath>
@@ -24,7 +25,6 @@
#include "analitza/analyzer.h"
#include "analitza/value.h"
#include "analitza/variable.h"
-#include "abstractplanecurve.h"
#include "utils/mathutils.h"

using namespace Analitza;
diff --git a/analitzaplot/private/abstractplotitem.h b/analitzaplot/private/abstractplotitem.h
index 69d7d1c8..b6742398 100644
--- a/analitzaplot/private/abstractplotitem.h
+++ b/analitzaplot/private/abstractplotitem.h
@@ -18,8 +18,8 @@
*************************************************************************************/


-#ifndef ABSTRACTMAPPINGGRAPH_H
-#define ABSTRACTMAPPINGGRAPH_H
+#ifndef ABSTRACTPLOTITEM_H
+#define ABSTRACTPLOTITEM_H

#include <plottingenums.h>

@@ -42,4 +42,4 @@ protected:

}

-#endif // ABSTRACTMAPPINGGRAPH_H
+#endif // ABSTRACTPLOTITEM_H
diff --git a/analitzaplot/private/abstractspacecurve.cpp b/analitzaplot/private/abstractspacecurve.cpp
index bf062047..e840d579 100644
--- a/analitzaplot/private/abstractspacecurve.cpp
+++ b/analitzaplot/private/abstractspacecurve.cpp
@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

+#include "abstractspacecurve.h"
#include "functiongraph.h"

#include <cmath>
@@ -26,7 +27,6 @@
#include "analitza/value.h"
#include "analitza/variable.h"

-#include "abstractspacecurve.h"
#include "utils/mathutils.h"

using namespace Analitza;
diff --git a/analitzaplot/private/abstractspacecurve.h b/analitzaplot/private/abstractspacecurve.h
index b778c31a..54299e0e 100644
--- a/analitzaplot/private/abstractspacecurve.h
+++ b/analitzaplot/private/abstractspacecurve.h
@@ -30,7 +30,7 @@ class Variables;
class AbstractSpaceCurve : public AbstractFunctionGraph
{
public:
- AbstractSpaceCurve(const Analitza::Expression& e, const QSharedPointer<Analitza::Variables>& v = {});
+ explicit AbstractSpaceCurve(const Analitza::Expression& e, const QSharedPointer<Analitza::Variables>& v = {});
virtual ~AbstractSpaceCurve();

//Curve ... los expongo como publicos tanto para planecurve como para los backend (
diff --git a/analitzaplot/private/export3d.h b/analitzaplot/private/export3d.h
index c87601f7..6f3bcbfe 100644
--- a/analitzaplot/private/export3d.h
+++ b/analitzaplot/private/export3d.h
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

+#ifndef EXPORT3D_H
+#define EXPORT3D_H
+
#include <QString>

/*
@@ -29,3 +32,4 @@ namespace Export3D
void exportX3D(const QString &path, QAbstractItemModel* model);
void exportSTL(const QString &path, QAbstractItemModel* model);
}
+#endif
diff --git a/analitzaplot/private/utils/marchingsquares.h b/analitzaplot/private/utils/marchingsquares.h
index ade938ed..0512aa19 100644
--- a/analitzaplot/private/utils/marchingsquares.h
+++ b/analitzaplot/private/utils/marchingsquares.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef FUNCTIONGRAPH2_H_mc
-#define FUNCTIONGRAPH2_H_mc
+#ifndef MARCHINGSQUARES_H
+#define MARCHINGSQUARES_H

#include "quadtree.h"

diff --git a/analitzaplot/private/utils/quadtree.h b/analitzaplot/private/utils/quadtree.h
index 5ef0435d..d05d3c1e 100644
--- a/analitzaplot/private/utils/quadtree.h
+++ b/analitzaplot/private/utils/quadtree.h
@@ -17,8 +17,8 @@
*************************************************************************************/


-#ifndef FUNCTIONGRAPH2_H__oct_q
-#define FUNCTIONGRAPH2_H__oct_q
+#ifndef QUADTREE_H
+#define QUADTREE_H

#include <QRectF>

@@ -67,8 +67,8 @@ private:
void crear_rec(QNode* nodo, unsigned int nivel_actual, unsigned int nivel_max);

public:
- Quadtree(double largo_mundo);
- Quadtree(Square cubo);
+ explicit Quadtree(double largo_mundo);
+ explicit Quadtree(Square cubo);
~Quadtree();

QNode* get_raiz();
diff --git a/analitzaplot/spacecurve.h b/analitzaplot/spacecurve.h
index 3e043b6e..d8c39b45 100644
--- a/analitzaplot/spacecurve.h
+++ b/analitzaplot/spacecurve.h
@@ -38,7 +38,7 @@ namespace Analitza {
class ANALITZAPLOT_EXPORT SpaceCurve : public FunctionGraph
{
public:
- SpaceCurve(AbstractFunctionGraph* g);
+ explicit SpaceCurve(AbstractFunctionGraph* g);
virtual ~SpaceCurve();

QVector<int> jumps() const;
diff --git a/analitzaplot/surface.h b/analitzaplot/surface.h
index 6cfb9f50..3c6457db 100644
--- a/analitzaplot/surface.h
+++ b/analitzaplot/surface.h
@@ -38,7 +38,7 @@ namespace Analitza {
class ANALITZAPLOT_EXPORT Surface : public FunctionGraph
{
public:
- Surface(AbstractFunctionGraph* g);
+ explicit Surface(AbstractFunctionGraph* g);

virtual ~Surface();

diff --git a/analitzaplot/tests/planecurvetest.h b/analitzaplot/tests/planecurvetest.h
index 6b397c9d..3aa01e3b 100644
--- a/analitzaplot/tests/planecurvetest.h
+++ b/analitzaplot/tests/planecurvetest.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef ANALITZATEST_H
-#define ANALITZATEST_H
+#ifndef PLANECURVETEST_H
+#define PLANECURVETEST_H

#include <QObject>
#include <QSharedPointer>
diff --git a/analitzaplot/tests/plotsdictionarymodeltest.h b/analitzaplot/tests/plotsdictionarymodeltest.h
index f09d5f3a..24ba2f7e 100644
--- a/analitzaplot/tests/plotsdictionarymodeltest.h
+++ b/analitzaplot/tests/plotsdictionarymodeltest.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef ANALITZATEST_H
-#define ANALITZATEST_H
+#ifndef PLOTSDICTIONARYMODELTEST_H
+#define PLOTSDICTIONARYMODELTEST_H

#include <QObject>

diff --git a/analitzaplot/tests/plotsmodeltest.h b/analitzaplot/tests/plotsmodeltest.h
index 6468af05..5b9738bb 100644
--- a/analitzaplot/tests/plotsmodeltest.h
+++ b/analitzaplot/tests/plotsmodeltest.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef ANALITZATEST_H
-#define ANALITZATEST_H
+#ifndef PLOTSMODELTEST_H
+#define PLOTSMODELTEST_H

#include <QObject>

diff --git a/analitzaplot/tests/spacecurvetest.h b/analitzaplot/tests/spacecurvetest.h
index fde0bd0f..b96b4a12 100644
--- a/analitzaplot/tests/spacecurvetest.h
+++ b/analitzaplot/tests/spacecurvetest.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef ANALITZATEST_H
-#define ANALITZATEST_H
+#ifndef SPACECURVETEST_H
+#define SPACECURVETEST_H

#include <QObject>

diff --git a/analitzaplot/tests/surfacetest.h b/analitzaplot/tests/surfacetest.h
index 7bb541c6..131b0a83 100644
--- a/analitzaplot/tests/surfacetest.h
+++ b/analitzaplot/tests/surfacetest.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef ANALITZATEST_H
-#define ANALITZATEST_H
+#ifndef SURFACETEST_H
+#define SURFACETEST_H

#include <QObject>

diff --git a/analitzawidgets/plotsview2d.h b/analitzawidgets/plotsview2d.h
index 6b086b88..ae21a70a 100644
--- a/analitzawidgets/plotsview2d.h
+++ b/analitzawidgets/plotsview2d.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef GRAPH2D_H
-#define GRAPH2D_H
+#ifndef PLOTSVIEW2D_H
+#define PLOTSVIEW2D_H

#include <QResizeEvent>
#include <QWheelEvent>
@@ -69,7 +69,7 @@ public:
enum Format { PNG, SVG };

/** Constructor. Constructs a new Graph2D. */
- PlotsView2D(QWidget* parent = nullptr);
+ explicit PlotsView2D(QWidget* parent = nullptr);

~PlotsView2D();

diff --git a/analitzawidgets/plotsview3d.h b/analitzawidgets/plotsview3d.h
index 440d24bc..c83a06fb 100644
--- a/analitzawidgets/plotsview3d.h
+++ b/analitzawidgets/plotsview3d.h
@@ -51,7 +51,7 @@ class ANALITZAWIDGETS_DEPRECATED_EXPORT PlotsView3D : public QGLWidget, public
Q_OBJECT

public:
- PlotsView3D(QWidget* parent = 0);
+ explicit PlotsView3D(QWidget* parent = 0);
virtual ~PlotsView3D();

void setSelectionModel(QItemSelectionModel* selection);
diff --git a/analitzawidgets/plotsview3d_es.h b/analitzawidgets/plotsview3d_es.h
index 5f0f946b..710f61ff 100644
--- a/analitzawidgets/plotsview3d_es.h
+++ b/analitzawidgets/plotsview3d_es.h
@@ -51,7 +51,7 @@ class ANALITZAWIDGETS_EXPORT PlotsView3DES : public QOpenGLWidget, public Plotte
Q_OBJECT

public:
- PlotsView3DES(QWidget* parent = nullptr);
+ explicit PlotsView3DES(QWidget* parent = nullptr);
virtual ~PlotsView3DES();

void setSelectionModel(QItemSelectionModel* selection);
diff --git a/declarative/analitzawrapper.h b/declarative/analitzawrapper.h
index 783a470d..9f105a75 100644
--- a/declarative/analitzawrapper.h
+++ b/declarative/analitzawrapper.h
@@ -35,7 +35,7 @@ class ExpressionWrapper : public QObject
Q_PROPERTY(QString expression READ toString CONSTANT)
Q_PROPERTY(bool isCorrect READ isCorrect CONSTANT)
public:
- ExpressionWrapper(QObject* parent=nullptr);
+ explicit ExpressionWrapper(QObject* parent=nullptr);
explicit ExpressionWrapper(const Analitza::Expression & e, QObject* parent = nullptr);

bool isCorrect() const;
diff --git a/declarative/graph2dmobile.h b/declarative/graph2dmobile.h
index 90628067..d7cf19e7 100644
--- a/declarative/graph2dmobile.h
+++ b/declarative/graph2dmobile.h
@@ -41,7 +41,7 @@ class Graph2DMobile : public QQuickItem, public Analitza::Plotter2D
Q_PROPERTY(bool minorTicksShown READ minorTicksShown WRITE setShowMinorTicks)
Q_PROPERTY(QStringList filters READ filters CONSTANT)
public:
- Graph2DMobile(QQuickItem* parent = nullptr);
+ explicit Graph2DMobile(QQuickItem* parent = nullptr);

virtual void forceRepaint() override;
virtual void viewportChanged() override {}
diff --git a/declarative/graph3ditem.h b/declarative/graph3ditem.h
index 2bb5f0a2..a28c3264 100644
--- a/declarative/graph3ditem.h
+++ b/declarative/graph3ditem.h
@@ -27,7 +27,7 @@ class Graph3DItem;
class Plotter3DRenderer : public QObject, public Analitza::Plotter3DES
{
public:
- Plotter3DRenderer(Graph3DItem* item);
+ explicit Plotter3DRenderer(Graph3DItem* item);

int currentPlot() const override { return 0; }
void modelChanged() override {}
@@ -46,7 +46,7 @@ class Graph3DItem : public QQuickFramebufferObject
Q_PROPERTY(QStringList filters READ filters CONSTANT)
Q_PROPERTY(QAbstractItemModel* model READ model WRITE setModel NOTIFY modelChanged)
public:
- Graph3DItem(QQuickItem* parent = Q_NULLPTR);
+ explicit Graph3DItem(QQuickItem* parent = Q_NULLPTR);
~Graph3DItem();

QAbstractItemModel* model() const;

[Yuri Chornoivan]

Git commit 2e3d80f62cc5c19587d45155576fe395e0c367d0 by Yuri Chornoivan.
Committed on 25/09/2018 at 17:43.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 liblearnerprofile/src/learner.cpp
M +1 -1 liblearnerprofile/src/storage.h
M +1 -1 libsound/src/CMakeLists.txt
M +1 -1 libsound/src/capturedevicecontroller.cpp
M +1 -1 libsound/src/capturedevicecontroller.h
M +1 -1 libsound/src/outputdevicecontroller.cpp
M +1 -1 libsound/src/outputdevicecontroller.h
M +1 -1 libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp
M +1 -1 src/core/language.cpp
M +1 -1 src/core/phrase.h
M +1 -1 src/core/resourcemanager.h
M +1 -1 src/models/coursefiltermodel.cpp
M +1 -1 src/models/learningprogressmodel.cpp
M +1 -1 src/ui/exportghnsdialog.h

https://commits.kde.org/artikulate/2e3d80f62cc5c19587d45155576fe395e0c367d0

diff --git a/liblearnerprofile/src/learner.cpp b/liblearnerprofile/src/learner.cpp
index cf1282a..145d526 100644
--- a/liblearnerprofile/src/learner.cpp
+++ b/liblearnerprofile/src/learner.cpp
@@ -198,7 +198,7 @@ LearningGoal * Learner::activeGoal(Learner::Category categoryLearner) const
return goal;
}
}
- qCWarning(LIBLEARNER_LOG) << "No learning goals of catagory " << category << " registered";
+ qCWarning(LIBLEARNER_LOG) << "No learning goals of category " << category << " registered";
return nullptr;
}
return d->m_activeGoal[category];
diff --git a/liblearnerprofile/src/storage.h b/liblearnerprofile/src/storage.h
index 51e35e4..80cf255 100644
--- a/liblearnerprofile/src/storage.h
+++ b/liblearnerprofile/src/storage.h
@@ -50,7 +50,7 @@ public:
/**
* \note this constructor is tailored for unit tests
*/
- Storage(const QString databasePath, QObject* parent = nullptr);
+ explicit Storage(const QString databasePath, QObject* parent = nullptr);
QString errorMessage() const;

/**
diff --git a/libsound/src/CMakeLists.txt b/libsound/src/CMakeLists.txt
index 612fbba..1ad39ea 100644
--- a/libsound/src/CMakeLists.txt
+++ b/libsound/src/CMakeLists.txt
@@ -63,4 +63,4 @@ if (BUILD_GSTREAMER_PLUGIN)
endif()
if (BUILD_QTMULTIMEDIA_PLUGIN)
ecm_optional_add_subdirectory(qtmultimediabackend)
-endif()
\ No newline at end of file
+endif()
diff --git a/libsound/src/capturedevicecontroller.cpp b/libsound/src/capturedevicecontroller.cpp
index 3fa1077..63d5f43 100644
--- a/libsound/src/capturedevicecontroller.cpp
+++ b/libsound/src/capturedevicecontroller.cpp
@@ -33,7 +33,7 @@
* \internal
*
* This is the private data class for \see CaptureDeviceController.
- * Note that -- even if the CaptureDeviceController is contructed before its first call -- all
+ * Note that -- even if the CaptureDeviceController is constructed before its first call -- all
* devices get only configured by first instantiation of CaptureDeviceController with a call
* to CaptureDeviceControllerPrivate::lazyInit(), called in CaptureDeviceController::self().
*/
diff --git a/libsound/src/capturedevicecontroller.h b/libsound/src/capturedevicecontroller.h
index f9d4713..ba70662 100644
--- a/libsound/src/capturedevicecontroller.h
+++ b/libsound/src/capturedevicecontroller.h
@@ -28,7 +28,7 @@ class QUrl;
/**
* \class CaptureDeviceController
*
- * This singelton class provides a controller for the sound capture device.
+ * This singleton class provides a controller for the sound capture device.
*/
class LIBSOUND_EXPORT CaptureDeviceController : public QObject
{
diff --git a/libsound/src/outputdevicecontroller.cpp b/libsound/src/outputdevicecontroller.cpp
index 8efb722..82de17c 100644
--- a/libsound/src/outputdevicecontroller.cpp
+++ b/libsound/src/outputdevicecontroller.cpp
@@ -34,7 +34,7 @@
* \internal
*
* This is the private data class for \see OutputDeviceController.
- * Note that -- even if the OutputDeviceController is contructed before its first call -- all
+ * Note that -- even if the OutputDeviceController is constructed before its first call -- all
* devices get only configured by first instantiation of OutputDeviceController with a call
* to OutputDeviceControllerPrivate::lazyInit(), called in OutputDeviceController::self().
*/
diff --git a/libsound/src/outputdevicecontroller.h b/libsound/src/outputdevicecontroller.h
index f7caa04..1c013ea 100644
--- a/libsound/src/outputdevicecontroller.h
+++ b/libsound/src/outputdevicecontroller.h
@@ -27,7 +27,7 @@ class QUrl;
/**
* \class OutputDeviceController
*
- * This singelton class provides a controller for the sound output device.
+ * This singleton class provides a controller for the sound output device.
*/
class LIBSOUND_EXPORT OutputDeviceController : public QObject
{
diff --git a/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp b/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp
index aa06b88..37c3782 100644
--- a/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp
+++ b/libsound/src/qtgstreamerbackend/qtgstreameroutputbackend.cpp
@@ -176,7 +176,7 @@ void QtGStreamerOutputBackend::stop()
}
//TODO this is a temporary fix:
// the pipeline should not be cleared after every stop, but only when the backend is destructed
- // or specifically resetted. Cause of the problem, both QtGStreamerOutputBackend is globally static
+ // or specifically reset. Cause of the problem, both QtGStreamerOutputBackend is globally static
// object and can be destructed _after_ the also globally static object QGlib::Private::ConnectionsStore
// is destroyed. With calling QGst::Pipeline destructor by destructing QtGStreamerOutputBackend,
// we get a crash.
diff --git a/src/core/language.cpp b/src/core/language.cpp
index b490f39..7cee087 100644
--- a/src/core/language.cpp
+++ b/src/core/language.cpp
@@ -104,7 +104,7 @@ PhonemeGroup * Language::addPhonemeGroup(const QString &identifier, const QStrin
QList<PhonemeGroup *>::ConstIterator iter = m_phonemeGroups.constBegin();
while (iter != m_phonemeGroups.constEnd()) {
if (QString::compare((*iter)->id(), identifier) == 0) {
- qCWarning(ARTIKULATE_LOG) << "Prononciation Group identifier already registered, aborting";
+ qCWarning(ARTIKULATE_LOG) << "Pronunciation Group identifier already registered, aborting";
return 0;
}
++iter;
diff --git a/src/core/phrase.h b/src/core/phrase.h
index 1d9156d..def458a 100644
--- a/src/core/phrase.h
+++ b/src/core/phrase.h
@@ -130,7 +130,7 @@ private:
EditState m_editState;
Unit *m_unit;
unsigned m_trainingProgress;
- int m_skipCounter; // count how many skips occured since last progress update
+ int m_skipCounter; // count how many skips occurred since last progress update
bool m_excludedFromUnit;
QList<Phoneme *> m_phonemes;
QUrl m_nativeSoundFile;
diff --git a/src/core/resourcemanager.h b/src/core/resourcemanager.h
index 6e9bf3a..5b937ad 100644
--- a/src/core/resourcemanager.h
+++ b/src/core/resourcemanager.h
@@ -58,7 +58,7 @@ public:
/**
* Load all course resources.
* This loading is very fast, since course files are only partly (~20 top lines) parsed and
- * the complete parsing is postproned until first access.
+ * the complete parsing is postponed until first access.
*/
void loadCourseResources();

diff --git a/src/models/coursefiltermodel.cpp b/src/models/coursefiltermodel.cpp
index 2862879..e0b50e2 100644
--- a/src/models/coursefiltermodel.cpp
+++ b/src/models/coursefiltermodel.cpp
@@ -106,4 +106,4 @@ bool CourseFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourc
QVariant CourseFilterModel::course(int row) const
{
return m_courseModel->data(m_courseModel->index(row, 0), CourseModel::DataRole);
-}
\ No newline at end of file
+}
diff --git a/src/models/learningprogressmodel.cpp b/src/models/learningprogressmodel.cpp
index ee8eabc..c21bad8 100644
--- a/src/models/learningprogressmodel.cpp
+++ b/src/models/learningprogressmodel.cpp
@@ -107,7 +107,7 @@ QVariant LearningProgressModel::data(const QModelIndex &index, int role) const
return QVariant(index.row());
}

- // otherwise we only suppert displayrole
+ // otherwise we only support displayrole
if (role != Qt::DisplayRole) {
return QVariant();
}
diff --git a/src/ui/exportghnsdialog.h b/src/ui/exportghnsdialog.h
index afe4964..ae4d8ea 100644
--- a/src/ui/exportghnsdialog.h
+++ b/src/ui/exportghnsdialog.h
@@ -33,7 +33,7 @@ class ExportGhnsDialog :
Q_OBJECT

public:
- ExportGhnsDialog(ResourceManager *manager);
+ explicit ExportGhnsDialog(ResourceManager *manager);
~ExportGhnsDialog();

public Q_SLOTS:

[Yuri Chornoivan]

Git commit 0b60e8ed79189c7543ab69bab5fed68cab279289 by Yuri Chornoivan.
Committed on 25/09/2018 at 18:35.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 gemini/qml/components/CategorySwitcher.qml
M +1 -1 gemini/qml/components/DropShadow.qml
M +1 -1 gemini/qml/panels/ImageToolsPanel.qml
M +1 -1 gemini/qml/panels/TextStylePanel.qml
M +1 -1 karbon/.krazy
M +1 -1 libs/widgetutils/KoProgressUpdater.cpp
M +3 -3 plan/src/libs/models/kcalendar/kdatepicker.h
M +3 -3 plan/src/libs/models/kcalendar/kdatetable.h
M +1 -1 plan/src/libs/widgetutils/KoProgressUpdater.cpp
M +0 -1 plugins/textshape/TextTool.h

https://commits.kde.org/calligra/0b60e8ed79189c7543ab69bab5fed68cab279289

diff --git a/gemini/qml/components/CategorySwitcher.qml b/gemini/qml/components/CategorySwitcher.qml
index 4457637a7e3..106292d0545 100644
--- a/gemini/qml/components/CategorySwitcher.qml
+++ b/gemini/qml/components/CategorySwitcher.qml
@@ -72,4 +72,4 @@ Row {

initialPage: categories[0].page;
}
-}
\ No newline at end of file
+}
diff --git a/gemini/qml/components/DropShadow.qml b/gemini/qml/components/DropShadow.qml
index 689c0e62fe6..aa0b87957ee 100644
--- a/gemini/qml/components/DropShadow.qml
+++ b/gemini/qml/components/DropShadow.qml
@@ -126,4 +126,4 @@ Item {
source: "../images/shadow-lc.png";
fillMode: Image.Stretch;
}
-}
\ No newline at end of file
+}
diff --git a/gemini/qml/panels/ImageToolsPanel.qml b/gemini/qml/panels/ImageToolsPanel.qml
index 09ce22f77b8..19acad53d03 100644
--- a/gemini/qml/panels/ImageToolsPanel.qml
+++ b/gemini/qml/panels/ImageToolsPanel.qml
@@ -288,4 +288,4 @@ Item {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/gemini/qml/panels/TextStylePanel.qml b/gemini/qml/panels/TextStylePanel.qml
index d9b8046635d..3a80bab954e 100644
--- a/gemini/qml/panels/TextStylePanel.qml
+++ b/gemini/qml/panels/TextStylePanel.qml
@@ -130,4 +130,4 @@ Item {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/karbon/.krazy b/karbon/.krazy
index 4449a99bf46..1ac67d67fd3 100644
--- a/karbon/.krazy
+++ b/karbon/.krazy
@@ -1,3 +1,3 @@
# should only skip [validate], but that fine-grained control seems not possible, so just skip desktop files completely
-SKIP stencils/.*/.*\.desktop$
+SKIP /stencils/

diff --git a/libs/widgetutils/KoProgressUpdater.cpp b/libs/widgetutils/KoProgressUpdater.cpp
index f7055526f6e..ac6d618ca48 100644
--- a/libs/widgetutils/KoProgressUpdater.cpp
+++ b/libs/widgetutils/KoProgressUpdater.cpp
@@ -57,7 +57,7 @@ public:
int currentProgress;
bool updated; // is true whenever the progress needs to be recomputed
QTextStream *output;
- QTimer updateGuiTimer; // fires regularily to update the progress bar widget
+ QTimer updateGuiTimer; // fires regularly to update the progress bar widget
QList<QPointer<KoUpdaterPrivate> > subtasks;
QList<QPointer<KoUpdater> > subTaskWrappers; // We delete these
QTime referenceTime;
diff --git a/plan/src/libs/models/kcalendar/kdatepicker.h b/plan/src/libs/models/kcalendar/kdatepicker.h
index b2e8f9624b6..251e1902cab 100644
--- a/plan/src/libs/models/kcalendar/kdatepicker.h
+++ b/plan/src/libs/models/kcalendar/kdatepicker.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef KPTDATEPICKER_H
-#define KPTDATEPICKER_H
+#ifndef KP_KDATEPICKER_H
+#define KP_KDATEPICKER_H

#include "kplatomodels_export.h"

@@ -184,4 +184,4 @@ private:

} //namespace KPlato

-#endif // KDATEPICKER_H
+#endif // KP_KDATEPICKER_H
diff --git a/plan/src/libs/models/kcalendar/kdatetable.h b/plan/src/libs/models/kcalendar/kdatetable.h
index 4630a9552ae..63a0f11405b 100644
--- a/plan/src/libs/models/kcalendar/kdatetable.h
+++ b/plan/src/libs/models/kcalendar/kdatetable.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/

-#ifndef KPTDATETBL_H
-#define KPTDATETBL_H
+#ifndef KP_KDATETABLE_H
+#define KP_KDATETABLE_H

#include "kplatomodels_export.h"

@@ -336,4 +336,4 @@ public:

} //namespace KPlato

-#endif // KDATETBL_H
+#endif // KP_KDATETABLE_H
diff --git a/plan/src/libs/widgetutils/KoProgressUpdater.cpp b/plan/src/libs/widgetutils/KoProgressUpdater.cpp
index 6ce0241ef0b..5ac7a84b350 100644
--- a/plan/src/libs/widgetutils/KoProgressUpdater.cpp
+++ b/plan/src/libs/widgetutils/KoProgressUpdater.cpp
@@ -57,7 +57,7 @@ public:
int currentProgress;
bool updated; // is true whenever the progress needs to be recomputed
QTextStream *output;
- QTimer updateGuiTimer; // fires regularily to update the progress bar widget
+ QTimer updateGuiTimer; // fires regularly to update the progress bar widget
QList<QPointer<KoUpdaterPrivate> > subtasks;
QList<QPointer<KoUpdater> > subTaskWrappers; // We delete these
QTime referenceTime;
diff --git a/plugins/textshape/TextTool.h b/plugins/textshape/TextTool.h
index 9989f20cac1..27581d57e07 100644
--- a/plugins/textshape/TextTool.h
+++ b/plugins/textshape/TextTool.h
@@ -41,7 +41,6 @@
#include <QTimer>
#include <QPointer>
#include <QRectF>
-#include <QPointer>

#include <TextEditingPluginContainer.h>

[Yuri Chornoivan]

Git commit a5dbd25fb3325c89d9f76568cf3554ef7495f80b by Yuri Chornoivan.
Committed on 29/09/2018 at 09:11.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +4 -4 analitza/operations.cpp
M +3 -3 analitza/tests/commandstest.h
M +11 -11 analitzaplot/private/backends/cartesiansurface.cpp
M +1 -1 analitzaplot/private/utils/lookuptable.h
M +3 -3 analitzaplot/private/utils/marchingcubes.h

https://commits.kde.org/analitza/a5dbd25fb3325c89d9f76568cf3554ef7495f80b

diff --git a/analitza/operations.cpp b/analitza/operations.cpp
index 8d84c856..aa5b5d95 100644
--- a/analitza/operations.cpp
+++ b/analitza/operations.cpp
@@ -836,9 +836,9 @@ Object* Operations::reduceMatrixValue(Operator::OperatorType op, Matrix* matrix,
products[1] = static_cast<Matrix*>(reduceMatrixMatrix(Operator::times, matrix, matrix, correct));

//NOTE see http://rosettacode.org/wiki/Addition-chain_exponentiation#C for more details
- for (i = 2; i <= len; i++)
- for (j = i - 1; j; j--)
- for (k = j; k >= 0; k--)
+ for (i = 2; i <= len; ++i)
+ for (j = i - 1; j; --j)
+ for (k = j; k >= 0; --k)
{
if (additionChains[exp][k+1] + additionChains[exp][j+1] < additionChains[exp][i+1]) break;
if (additionChains[exp][k+1] + additionChains[exp][j+1] > additionChains[exp][i+1]) continue;
@@ -849,7 +849,7 @@ Object* Operations::reduceMatrixValue(Operator::OperatorType op, Matrix* matrix,
ret = products[len];

//NOTE free the memory, except products[len]
- for (i = 0; i < len; i++)
+ for (i = 0; i < len; ++i)
delete products[i];
} else { // else: use Exponentiation by squaring
Matrix *product = Matrix::identity(base->rowCount());
diff --git a/analitza/tests/commandstest.h b/analitza/tests/commandstest.h
index fad5e8b8..15d4bee3 100644
--- a/analitza/tests/commandstest.h
+++ b/analitza/tests/commandstest.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
*************************************************************************************/

-#ifndef COMMANDTEST_H
-#define COMMANDTEST_H
+#ifndef COMMANDSTEST_H
+#define COMMANDSTEST_H

#include <QObject>

@@ -50,4 +50,4 @@ Q_OBJECT
Analitza::Analyzer *a;
};

-#endif // COMMANDTEST_H
+#endif // COMMANDSTEST_H
diff --git a/analitzaplot/private/backends/cartesiansurface.cpp b/analitzaplot/private/backends/cartesiansurface.cpp
index f4d3c8ab..589ffe67 100644
--- a/analitzaplot/private/backends/cartesiansurface.cpp
+++ b/analitzaplot/private/backends/cartesiansurface.cpp
@@ -27,20 +27,20 @@

using namespace Analitza;

-//TODO macros para las prop e abajo
+//TODO below is a macros for the prop e

//NOTE
//FUTURE
-//TODO GSOC Equipotential Curve -> Contour Plot : se puede lograr separando el tipo de superfcie
-//por ejemplo una suprficies generada por un f(a,b) posee isolines ...
-//de esta manera es posible tener una funcion f(a,b,c,d) y dibujar sus contourplot3d
-//esta es la propuesta:
-// class SurfaceByFunctionOfTwoVars // cambiar el nombre obviamente
+//TODO GSOC Equipotential Curve -> Contour Plot: can be achieved by separating the type
+// of surface e.g. a surface generated by a f (a, b) contains isolines ...
+// in this way, it is possible to have a function f (a, b, c, d) and draw their
+// contourplot3d. This is the proposal:
+// class SurfaceByFunctionOfTwoVars change the name as appropriate
// {
// ...
// public:
-// setISOCONTOURSValues(lista de valores constantes)
-// setISOCONTOURSVale(un solo valor constante) -- un solo valor al que todos los cntornos son equipotenciales
+// setISOCONTOURSValues(list of const values)
+// setISOCONTOURSVale(const value) -- a single value to which all the environments are equipotential
// ...
// }
//
@@ -80,9 +80,9 @@ void Fxy::update(const QVector3D & /*oppositecorner1*/, const QVector3D & /*oppo
// normals.clear();
// indices.clear();
//
-// vertices << 0 << 0 << 0 << 0 << 0 << 1 << 1 << 0 << 0; // 3 por cada index
-// normals << 0 << 1 << 0; // 1 por primitiva = 1 por face (tri-face)-1por cada 3 indx
-// indices << 0 << 1 << 2; // enumeracion empieza desde cero
+// vertices << 0 << 0 << 0 << 0 << 0 << 1 << 1 << 0 << 0; // 3 for each index
+// normals << 0 << 1 << 0; // 1 by primitive = 1 by face (tri-face) -1 by every 3 index
+// indices << 0 << 1 << 2; // enumeration starts from scratch
}

REGISTER_SURFACE(Fxy)
diff --git a/analitzaplot/private/utils/lookuptable.h b/analitzaplot/private/utils/lookuptable.h
index cad24cc7..0b52b90f 100644
--- a/analitzaplot/private/utils/lookuptable.h
+++ b/analitzaplot/private/utils/lookuptable.h
@@ -15,7 +15,7 @@
//
// You should have received a copy of the GNU General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA



diff --git a/analitzaplot/private/utils/marchingcubes.h b/analitzaplot/private/utils/marchingcubes.h
index 0c7c65c0..47d115ad 100644
--- a/analitzaplot/private/utils/marchingcubes.h
+++ b/analitzaplot/private/utils/marchingcubes.h
@@ -15,7 +15,7 @@
//
// You should have received a copy of the GNU General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA

/** \file
\brief MarchingCubes Algorithm
@@ -27,8 +27,8 @@

// Minor modifications for KDE-Edu/Analitza Library: Copyright (C) 2014 by Percy Camilo T. Aucahuasi <***@gmail.com>

-#ifndef FUNCTIONGRAPH2_H_mcub
-#define FUNCTIONGRAPH2_H_mcub
+#ifndef MARCHINGCUBES_H
+#define MARCHINGCUBES_H

#include <QVector>

[Yuri Chornoivan]

Git commit dd361812924219be031c4baaa28fec7126c688cf by Yuri Chornoivan.
Committed on 29/09/2018 at 15:51.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 CMakeLists.txt
M +0 -1 compoundviewer/kalziumglwidget.cpp
M +3 -3 libscience/chemicaldataobject.h
M +2 -2 libscience/element.h
M +3 -2 libscience/elementparser.h
M +3 -2 libscience/isotopeparser.h
M +2 -2 libscience/moleculeparser.h
M +1 -1 libscience/parser.h
M +1 -1 libscience/spectrum.h
M +3 -2 libscience/spectrumparser.h
M +1 -1 libscience/tests/xmlreadingtest.cpp
M +1 -1 plasmoid/applet/psePlasmoid/Molmasscalculator.cpp
M +19 -0 qml/Cell2.qml
M +19 -0 qml/CenterInformation.qml
M +19 -0 qml/detailview.qml
M +1 -1 src/calculator/titrationCalculator.cpp
M +18 -2 src/detailedQmlView.cpp
M +18 -0 src/detailedQmlView.h
M +1 -2 src/detailinfodlg.cpp
M +1 -1 src/gradientwidget_impl.h
M +1 -0 src/kalziumdataobject.cpp
M +2 -2 src/molcalcwidget.cpp
M +2 -2 src/psetable/elementitem.cpp
M +2 -2 src/psetable/elementitem.h
M +2 -2 src/psetable/numerationitem.cpp
M +2 -2 src/psetable/numerationitem.h
M +1 -1 src/psetable/periodictablescene.cpp
M +1 -1 src/psetable/periodictablescene.h
M +2 -2 src/psetable/periodictablestates.h
M +1 -1 src/psetable/periodictableview.cpp
M +2 -2 src/psetable/periodictableview.h
M +1 -1 src/psetable/statemachine.cpp
M +6 -1 src/psetable/statemachine.h
M +3 -3 src/tools/obconverter.cpp

https://commits.kde.org/kalzium/dd361812924219be031c4baaa28fec7126c688cf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0371e0f3..609aa8f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)


set(QT_MIN_VERSION "5.9.0")
-set(KF5_VERSION "5.46.0")
+set(KF5_VERSION "5.42.0")

find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${kalzium_SOURCE_DIR}/cmake/modules)
diff --git a/compoundviewer/kalziumglwidget.cpp b/compoundviewer/kalziumglwidget.cpp
index 065d8c33..a4d31cd8 100644
--- a/compoundviewer/kalziumglwidget.cpp
+++ b/compoundviewer/kalziumglwidget.cpp
@@ -18,7 +18,6 @@

#include <avogadro/qtgui/molecule.h>
#include <avogadro/qtgui/sceneplugin.h>
-#include <avogadro/qtgui/sceneplugin.h>
#include <avogadro/qtgui/toolplugin.h>
#include <avogadro/qtopengl/glwidget.h>
#include <avogadro/qtplugins/pluginmanager.h>
diff --git a/libscience/chemicaldataobject.h b/libscience/chemicaldataobject.h
index 55a40dce..d55e3bd9 100644
--- a/libscience/chemicaldataobject.h
+++ b/libscience/chemicaldataobject.h
@@ -20,9 +20,9 @@
#ifndef CHEMICALDATAOBJECT_H
#define CHEMICALDATAOBJECT_H

-#include <QtCore/QSharedData>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QVariant>
+#include <QSharedData>
+#include <QSharedDataPointer>
+#include <QVariant>

#include "libkdeedu_science_export.h"

diff --git a/libscience/element.h b/libscience/element.h
index 43979d9a..06bd748f 100644
--- a/libscience/element.h
+++ b/libscience/element.h
@@ -22,8 +22,8 @@
#define ELEMENT_H

#include "libkdeedu_science_export.h"
-#include <QtCore/QList>
-#include <QtCore/QVariant>
+#include <QList>
+#include <QVariant>

#include "chemicaldataobject.h"

diff --git a/libscience/elementparser.h b/libscience/elementparser.h
index f3a8130f..f7cf8946 100644
--- a/libscience/elementparser.h
+++ b/libscience/elementparser.h
@@ -14,11 +14,12 @@
#ifndef ELEMENTPARSER_H
#define ELEMENTPARSER_H

-#include <QtCore/QList>
+#include <QList>

#include "libkdeedu_science_export.h"

-#include <QtXml/QtXml>
+#include <QXmlAttributes>
+#include <QXmlDefaultHandler>

class Element;

diff --git a/libscience/isotopeparser.h b/libscience/isotopeparser.h
index c59aff4c..f4e4e141 100644
--- a/libscience/isotopeparser.h
+++ b/libscience/isotopeparser.h
@@ -14,11 +14,12 @@
#ifndef ISOTOPEPARSER_H
#define ISOTOPEPARSER_H

-#include <QtCore/QList>
+#include <QList>

#include "libkdeedu_science_export.h"

-#include <QtXml/QtXml>
+#include <QXmlAttributes>
+#include <QXmlDefaultHandler>

class Isotope;

diff --git a/libscience/moleculeparser.h b/libscience/moleculeparser.h
index ef6ee7c3..cf484465 100644
--- a/libscience/moleculeparser.h
+++ b/libscience/moleculeparser.h
@@ -19,8 +19,8 @@
#include "element.h"
#include "parser.h"

-#include <QtCore/QMap>
-#include <QtCore/QList>
+#include <QMap>
+#include <QList>


/**
diff --git a/libscience/parser.h b/libscience/parser.h
index 9c9e2090..b84ee32e 100644
--- a/libscience/parser.h
+++ b/libscience/parser.h
@@ -16,7 +16,7 @@

#include "libkdeedu_science_export.h"

-#include <QtCore/QString>
+#include <QString>


/**
diff --git a/libscience/spectrum.h b/libscience/spectrum.h
index 3d43d6f5..8fc9bb07 100644
--- a/libscience/spectrum.h
+++ b/libscience/spectrum.h
@@ -22,7 +22,7 @@

#include "libkdeedu_science_export.h"

-#include <QtCore/QList>
+#include <QList>

class Element;

diff --git a/libscience/spectrumparser.h b/libscience/spectrumparser.h
index 1e60a1c6..ebdc5151 100644
--- a/libscience/spectrumparser.h
+++ b/libscience/spectrumparser.h
@@ -16,8 +16,9 @@

#include "libkdeedu_science_export.h"

-#include <QtCore/QFile>
-#include <QtXml/QtXml>
+#include <QFile>
+#include <QXmlDefaultHandler>
+#include <QXmlAttributes>

#include "spectrum.h"

diff --git a/libscience/tests/xmlreadingtest.cpp b/libscience/tests/xmlreadingtest.cpp
index 90a0e25c..d3ab6a62 100644
--- a/libscience/tests/xmlreadingtest.cpp
+++ b/libscience/tests/xmlreadingtest.cpp
@@ -20,7 +20,7 @@
#include "elementparser.h"
#include "element.h"
#include "chemicaldataobject.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include <iostream>

int main(int argc, char *argv[])
diff --git a/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp b/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp
index 9f876d99..555bd7dd 100644
--- a/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp
+++ b/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp
@@ -21,7 +21,7 @@
#include "Molmasscalculator.h"

// Qt
-#include <QtGui/QApplication>
+#include <QApplication>
#include <QGraphicsLinearLayout>
#include <QClipboard>

diff --git a/qml/Cell2.qml b/qml/Cell2.qml
index 5777b578..da6fe0e8 100644
--- a/qml/Cell2.qml
+++ b/qml/Cell2.qml
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Etienne Rebetez ***@oberwallis.ch *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
import Qt 4.7

Item {
diff --git a/qml/CenterInformation.qml b/qml/CenterInformation.qml
index 0678feea..502a541d 100644
--- a/qml/CenterInformation.qml
+++ b/qml/CenterInformation.qml
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Etienne Rebetez ***@oberwallis.ch *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
import Qt 4.7

Rectangle {
diff --git a/qml/detailview.qml b/qml/detailview.qml
index 50a80dbe..d6b1e222 100644
--- a/qml/detailview.qml
+++ b/qml/detailview.qml
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Etienne Rebetez ***@oberwallis.ch *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
import Qt 4.7

Rectangle {
diff --git a/src/calculator/titrationCalculator.cpp b/src/calculator/titrationCalculator.cpp
index 6ea9ac9b..87f5b76d 100644
--- a/src/calculator/titrationCalculator.cpp
+++ b/src/calculator/titrationCalculator.cpp
@@ -107,7 +107,7 @@ void titrationCalculator::plot()
}
QString mreporto;
int iter = 0;
- if (uid.xaxis->text() == "" || uid.xaxis->text() == " ") {
+ if (uid.xaxis->text().isEmpty() || uid.xaxis->text() == " ") {
uid.xaxis->setText(i18n("nothing"));
}
if (tmpy == 0) {
diff --git a/src/detailedQmlView.cpp b/src/detailedQmlView.cpp
index a7463430..2bb645af 100644
--- a/src/detailedQmlView.cpp
+++ b/src/detailedQmlView.cpp
@@ -1,5 +1,21 @@
-
-
+/***************************************************************************
+ * Copyright (C) 2011 by Etienne Rebetez ***@oberwallis.ch *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/

#include "detailedQmlView.h"

diff --git a/src/detailedQmlView.h b/src/detailedQmlView.h
index 6c30912b..8e832cef 100644
--- a/src/detailedQmlView.h
+++ b/src/detailedQmlView.h
@@ -1,3 +1,21 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Etienne Rebetez ***@oberwallis.ch *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/

#ifndef DETAILEDQMLVIEW_H
#define DETAILEDQMLVIEW_H
diff --git a/src/detailinfodlg.cpp b/src/detailinfodlg.cpp
index 295d19e8..094d1ae3 100644
--- a/src/detailinfodlg.cpp
+++ b/src/detailinfodlg.cpp
@@ -41,7 +41,6 @@
#include <QImage>
#include <QStackedWidget>
#include <QStandardPaths>
-#include <QLocale>
#include "element.h"
#include "orbitswidget.h"
#include "detailedgraphicaloverview.h"
@@ -319,7 +318,7 @@ QString DetailedInfoDlg::getHtml(DATATYPE type)
html.append ("<tr><td>");
html.append ("<a href=\"http://"); // http://
html.append ("www.webelements.com/");
- if (QLocale().uiLanguages().first().startsWith("en")) {
+ if (QLocale().uiLanguages().first().startsWith(QLatin1String("en"))) {
html.append (m_element->dataAsString(ChemicalDataObject::name).toLower()); // hydrogen
}
html.append ("\" target=\"_blank\" >");
diff --git a/src/gradientwidget_impl.h b/src/gradientwidget_impl.h
index 1fff182b..685095e9 100644
--- a/src/gradientwidget_impl.h
+++ b/src/gradientwidget_impl.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * copyright (C) 2006 by Carsten Niehau *
+ * copyright (C) 2006 by Carsten Niehaus ***@kde.org *
* Copyright (C) 2010 by Etienne Rebetez ***@oberwallis.ch *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/kalziumdataobject.cpp b/src/kalziumdataobject.cpp
index 2b310564..a140360b 100644
--- a/src/kalziumdataobject.cpp
+++ b/src/kalziumdataobject.cpp
@@ -29,6 +29,7 @@
#include <QFileInfo>
#include <QSvgRenderer>
#include <QPainter>
+#include <QCoreApplication>
#include <QGlobalStatic>
#include <QLocale>
#include <QDebug>
diff --git a/src/molcalcwidget.cpp b/src/molcalcwidget.cpp
index d635412e..0a477f65 100644
--- a/src/molcalcwidget.cpp
+++ b/src/molcalcwidget.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2003-2005, 2006 by Carsten Niehaus, ***@kde.org *
- * Copyright (C) 2005 by Inge Wallin, ***@lysator.liu.se *
- * Copyright (C) 2009 by Kashyap. R. Puranik *
+ * Copyright (C) 2005 by Inge Wallin, ***@lysator.liu.se *
+ * Copyright (C) 2009 by Kashyap. R. Puranik, ***@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
diff --git a/src/psetable/elementitem.cpp b/src/psetable/elementitem.cpp
index 42e18c49..1b4f8a27 100644
--- a/src/psetable/elementitem.cpp
+++ b/src/psetable/elementitem.cpp
@@ -2,9 +2,9 @@
ElementItem - Element Item, part of the Periodic Table Graphics View for
Avogadro

- Copyright (C) 2007-2009 by Marcus D. Hanwell
+ Copyright (C) 2007-2009 by Marcus D. Hanwell ***@cryos.org
Some portions (C) 2010 by Konstantin Tokarev
- Copyright (C) 2010 by Etienne Rebetez
+ Copyright (C) 2010 by Etienne Rebetez ***@oberwallis.ch

This file is part of the Avogadro molecular editor project.
For more information, see <http://avogadro.openmolecules.net/>
diff --git a/src/psetable/elementitem.h b/src/psetable/elementitem.h
index beb60411..026dea37 100644
--- a/src/psetable/elementitem.h
+++ b/src/psetable/elementitem.h
@@ -2,8 +2,8 @@
ElementItem - Element Item, part of the Periodic Table Graphics View for
Kalzium

- Copyright (C) 2007-2009 by Marcus D. Hanwell
- Copyright (C) 2010 by Etienne Rebetez
+ Copyright (C) 2007-2009 by Marcus D. Hanwell ***@cryos.org
+ Copyright (C) 2010 by Etienne Rebetez ***@oberwallis.ch

This file is part of the Avogadro molecular editor project.
For more information, see <http://avogadro.openmolecules.net/>
diff --git a/src/psetable/numerationitem.cpp b/src/psetable/numerationitem.cpp
index 6dafb745..f9044077 100644
--- a/src/psetable/numerationitem.cpp
+++ b/src/psetable/numerationitem.cpp
@@ -2,9 +2,9 @@
NumerationItem - Numeration Item, part of the Periodic Table Graphics View
for Kalzium

- Copyright (C) 2007-2009 by Marcus D. Hanwell
+ Copyright (C) 2007-2009 by Marcus D. Hanwell ***@cryos.org
Some portions (C) 2010 by Konstantin Tokarev
- Copyright (C) 2010 by Etienne Rebetez
+ Copyright (C) 2010 by Etienne Rebetez ***@oberwallis.ch

This file is part of the Avogadro molecular editor project.
For more information, see <http://avogadro.openmolecules.net/>
diff --git a/src/psetable/numerationitem.h b/src/psetable/numerationitem.h
index 4905805c..8c08543a 100644
--- a/src/psetable/numerationitem.h
+++ b/src/psetable/numerationitem.h
@@ -2,8 +2,8 @@
NumerationItem - Numeration Item, part of the Periodic Table Graphics View
for Kalzium

- Copyright (C) 2007-2009 by Marcus D. Hanwell
- Copyright (C) 2010 by Etienne Rebetez
+ Copyright (C) 2007-2009 by Marcus D. Hanwell ***@cryos.org
+ Copyright (C) 2010 by Etienne Rebetez ***@oberwallis.ch

This file is part of the Avogadro molecular editor project.
For more information, see <http://avogadro.openmolecules.net/>
diff --git a/src/psetable/periodictablescene.cpp b/src/psetable/periodictablescene.cpp
index d1376217..37e6cc35 100644
--- a/src/psetable/periodictablescene.cpp
+++ b/src/psetable/periodictablescene.cpp
@@ -3,7 +3,7 @@

Copyright (C) 2005-2006 by Pino Toscano, ***@tiscali.it
Copyright (C) 2003-2006 by Carsten Niehaus, ***@kde.org
- Copyright (C) 2007-2009 by Marcus D. Hanwell
+ Copyright (C) 2007-2009 by Marcus D. Hanwell, ***@cryos.org
Copyright (C) 2010 by Etienne Rebetez, ***@oberwallis.ch

This file is part of the Kalzium molecular editor project.
diff --git a/src/psetable/periodictablescene.h b/src/psetable/periodictablescene.h
index 68c8587f..0bfd80d0 100644
--- a/src/psetable/periodictablescene.h
+++ b/src/psetable/periodictablescene.h
@@ -3,7 +3,7 @@

Copyright (C) 2005-2006 by Pino Toscano, ***@tiscali.it
Copyright (C) 2003-2006 by Carsten Niehaus, ***@kde.org
- Copyright (C) 2007-2009 by Marcus D. Hanwell
+ Copyright (C) 2007-2009 by Marcus D. Hanwell, ***@cryos.org
Copyright (C) 2010 by Etienne Rebetez, ***@oberwallis.ch

Kalzium is free software; you can redistribute it and/or modify
diff --git a/src/psetable/periodictablestates.h b/src/psetable/periodictablestates.h
index f8258c39..0c12117e 100644
--- a/src/psetable/periodictablestates.h
+++ b/src/psetable/periodictablestates.h
@@ -18,8 +18,8 @@
#ifndef PERIODICTABLESTATES_H
#define PERIODICTABLESTATES_H

-#include <QtCore/QStateMachine>
-#include <QtCore/QParallelAnimationGroup>
+#include <QStateMachine>
+#include <QParallelAnimationGroup>

#include "kalziumelementproperty.h"

diff --git a/src/psetable/periodictableview.cpp b/src/psetable/periodictableview.cpp
index af574fb8..af6418ae 100644
--- a/src/psetable/periodictableview.cpp
+++ b/src/psetable/periodictableview.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2005-2006 by Pino Toscano, ***@tiscali.it *
* Copyright (C) 2003-2006 by Carsten Niehaus, ***@kde.org *
- * Copyright (C) 2007-2009 by Marcus D. Hanwell *
+ * Copyright (C) 2007-2009 by Marcus D. Hanwell, ***@cryos.org *
* Copyright (C) 2010 by Etienne Rebetez, ***@oberwallis.ch *
* *
* *
diff --git a/src/psetable/periodictableview.h b/src/psetable/periodictableview.h
index f4412dc7..74529f16 100644
--- a/src/psetable/periodictableview.h
+++ b/src/psetable/periodictableview.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2005-2006 by Pino Toscano, ***@tiscali.it *
* Copyright (C) 2003-2006 by Carsten Niehaus, ***@kde.org *
- * Copyright (C) 2007-2009 by Marcus D. Hanwell *
+ * Copyright (C) 2007-2009 by Marcus D. Hanwell, ***@cryos.org *
* Copyright (C) 2010-2011 by Etienne Rebetez, ***@oberwallis.ch *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -33,7 +33,7 @@
#include "numerationitem.h"
#include "periodictablescene.h"
#include "periodictablestates.h"
-#include <QtSvg/QSvgGenerator>
+#include <QSvgGenerator>


/**
diff --git a/src/psetable/statemachine.cpp b/src/psetable/statemachine.cpp
index 9ce8d58e..711e3055 100644
--- a/src/psetable/statemachine.cpp
+++ b/src/psetable/statemachine.cpp
@@ -1,7 +1,7 @@
/**********************************************************************
Statemachine

- Copyrigth (C) 2010 by Etienne Rebetez
+ Copyrigth (C) 2010 by Etienne Rebetez, ***@oberwallis.ch

This is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/psetable/statemachine.h b/src/psetable/statemachine.h
index 552591a1..8e9ddad6 100644
--- a/src/psetable/statemachine.h
+++ b/src/psetable/statemachine.h
@@ -41,7 +41,12 @@
#ifndef STATEMACHINE_H
#define STATEMACHINE_H

-#include <QtCore>
+#include <QAbstractAnimation>
+#include <QAbstractTransition>
+#include <QEvent>
+#include <QPropertyAnimation>
+#include <QState>
+#include <QStateMachine>

class StateSwitchEvent: public QEvent
{
diff --git a/src/tools/obconverter.cpp b/src/tools/obconverter.cpp
index 9c6e2820..69d996b1 100644
--- a/src/tools/obconverter.cpp
+++ b/src/tools/obconverter.cpp
@@ -25,9 +25,9 @@
#include <QRegExp>
#include <QProcess>
#include <QLinkedList>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QPushButton>
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
+#include <QPushButton>


// KDE includes

[Yuri Chornoivan]

Git commit b5a70e23e47684495185f1b038b64b7b9f4f4669 by Yuri Chornoivan.
Committed on 01/10/2018 at 18:27.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

A +1 -0 .krazy
M +1 -1 scripts_test/translationscript.h
M +1 -1 src/collection/collection.h
M +1 -1 src/collection/containerview.h
M +1 -1 src/collection/entryfilterdialog.h
M +1 -1 src/collection/testentry.h
M +1 -1 src/collection/vocabularyfilter.h
M +1 -1 src/collection/vocabularymodel.h
M +1 -1 src/dashboard/barwidget.cpp
M +3 -3 src/dashboard/barwidget.h
M +1 -1 src/dashboard/collectionwidget.cpp
M +1 -1 src/dashboard/collectionwidget.h
M +1 -1 src/dashboard/dashboard.h
M +1 -1 src/dashboard/gradereferencewidget.cpp
M +2 -2 src/dashboard/gradereferencewidget.h
M +1 -1 src/editor/comparisonwidget.h
M +1 -1 src/editor/editor.h
M +1 -1 src/editor/latexwidget.h
M +1 -1 src/editor/lessonview.h
M +1 -1 src/editor/summarywordwidget.h
M +1 -1 src/editor/vocabularydelegate.h
M +1 -1 src/editor/vocabularyview.h
M +1 -1 src/editor/wordtypeview.h
M +1 -1 src/exportdialog.h
M +1 -1 src/parleydocument.h
M +1 -1 src/practice/abstractfrontend.h
M +1 -1 src/practice/abstractwidget.h
M +1 -1 src/practice/audiobutton.h
M +1 -1 src/practice/boxeswidget.cpp
M +1 -1 src/practice/boxeswidget.h
M +1 -1 src/practice/comparisonmodewidget.h
M +1 -1 src/practice/configure/blockoptions.h
M +1 -1 src/practice/configure/generalpracticeoptions.h
M +1 -1 src/practice/configure/specificpracticeoptions.h
M +1 -1 src/practice/conjugationmodewidget.cpp
M +1 -1 src/practice/conjugationmodewidget.h
M +1 -1 src/practice/flashcardmodewidget.h
M +1 -1 src/practice/guifrontend.h
M +1 -1 src/practice/imagewidget.h
M +1 -1 src/practice/latexrenderer.h
M +1 -1 src/practice/mixedlettersmodewidget.h
M +1 -1 src/practice/multiplechoicemodewidget.h
M +1 -1 src/practice/practicemainwindow.h
M +1 -1 src/practice/statustoggle.h
M +1 -1 src/practice/summarybarwidget.h
M +6 -6 src/practice/themedbackgroundrenderer.cpp
M +1 -1 src/practice/writtenpracticewidget.h
M +1 -1 src/scripts/script.h
M +1 -1 src/scripts/scriptdialog.h
M +1 -1 src/scripts/scripting/container.h
M +2 -2 src/scripts/scripting/document.h
M +3 -3 src/scripts/scripting/expression.h
M +2 -2 src/scripts/scripting/identifier.h
M +3 -3 src/scripts/scripting/lesson.h
M +1 -1 src/scripts/scripting/parley.h
M +3 -3 src/scripts/scripting/text.h
M +2 -2 src/scripts/scripting/translation.h
M +1 -1 src/scripts/scriptmanager.h
M +1 -1 src/scripts/translator.h
M +1 -1 src/settings/documentproperties.cpp
M +1 -1 src/settings/generaloptions.h
M +1 -1 src/settings/kgametheme/kgametheme.h
M +1 -1 src/settings/viewoptions.h
M +1 -1 src/statistics/lessonstatisticsview.h
M +1 -1 src/statistics/statisticslegendwidget.cpp
M +2 -2 src/statistics/statisticslegendwidget.h
M +1 -1 src/utils.cpp
M +1 -1 src/utils.h

https://commits.kde.org/parley/b5a70e23e47684495185f1b038b64b7b9f4f4669

diff --git a/.krazy b/.krazy
new file mode 100644
index 00000000..96bee23d
--- /dev/null
+++ b/.krazy
@@ -0,0 +1 @@
+SKIP /mwclient/
\ No newline at end of file
diff --git a/scripts_test/translationscript.h b/scripts_test/translationscript.h
index bf4e0c01..0c4e05e6 100644
--- a/scripts_test/translationscript.h
+++ b/scripts_test/translationscript.h
@@ -30,7 +30,7 @@ class TranslationScript : public QObject
{
Kross::Action* action;
public:
- TranslationScript(QString filename);
+ explicit TranslationScript(QString filename);
void getLanguagePairs();
QStringList translateWord(QString word, QString from, QString to);

diff --git a/src/collection/collection.h b/src/collection/collection.h
index 76915641..a9e7bf80 100644
--- a/src/collection/collection.h
+++ b/src/collection/collection.h
@@ -35,7 +35,7 @@ class Collection : public QObject
Q_OBJECT

public:
- Collection(QUrl *url, QObject* parent = 0);
+ explicit Collection(QUrl *url, QObject* parent = 0);
~Collection();

KEduVocDocument *eduVocDocument();
diff --git a/src/collection/containerview.h b/src/collection/containerview.h
index de288ef1..50c9b705 100644
--- a/src/collection/containerview.h
+++ b/src/collection/containerview.h
@@ -35,7 +35,7 @@ public:
/** Set up the lesson list widget.
* Also creates the menu to manipulate the lessons.
* @param parent parent widget */
- ContainerView(QWidget *parent = 0);
+ explicit ContainerView(QWidget *parent = 0);
/** Set the model for the view.
* @param model the model */
virtual void setModel(ContainerModel *model);
diff --git a/src/collection/entryfilterdialog.h b/src/collection/entryfilterdialog.h
index 57cbd2f5..e809ee77 100644
--- a/src/collection/entryfilterdialog.h
+++ b/src/collection/entryfilterdialog.h
@@ -28,7 +28,7 @@ class EntryFilterDialog : public QDialog
{
Q_OBJECT
public:
- EntryFilterDialog(EntryFilter &entryFilter);
+ explicit EntryFilterDialog(EntryFilter &entryFilter);
~EntryFilterDialog();

bool ignoreBlocked() const;
diff --git a/src/collection/testentry.h b/src/collection/testentry.h
index a43eb6ff..658250a7 100644
--- a/src/collection/testentry.h
+++ b/src/collection/testentry.h
@@ -40,7 +40,7 @@ public:

Q_DECLARE_FLAGS(ErrorTypes, ErrorType)

- TestEntry(KEduVocExpression *entry);
+ explicit TestEntry(KEduVocExpression *entry);

/// update the internal statistics for this practice with a right result
void updateStatisticsRightAnswer(grade_t currentPreGrade, grade_t currentGrade);
diff --git a/src/collection/vocabularyfilter.h b/src/collection/vocabularyfilter.h
index a7b58afd..3a668a3d 100644
--- a/src/collection/vocabularyfilter.h
+++ b/src/collection/vocabularyfilter.h
@@ -27,7 +27,7 @@ class VocabularyFilter : public QSortFilterProxyModel
{
Q_OBJECT
public:
- VocabularyFilter(QObject *parent = 0);
+ explicit VocabularyFilter(QObject *parent = 0);

void setSourceModel(VocabularyModel* model);

diff --git a/src/collection/vocabularymodel.h b/src/collection/vocabularymodel.h
index 1ba12514..d1baba37 100644
--- a/src/collection/vocabularymodel.h
+++ b/src/collection/vocabularymodel.h
@@ -53,7 +53,7 @@ public:
ImageRole
};

- VocabularyModel(QObject *parent = 0);
+ explicit VocabularyModel(QObject *parent = 0);

~VocabularyModel();

diff --git a/src/dashboard/barwidget.cpp b/src/dashboard/barwidget.cpp
index db1db849..735f36e7 100755
--- a/src/dashboard/barwidget.cpp
+++ b/src/dashboard/barwidget.cpp
@@ -1,6 +1,6 @@
/***************************************************************************
Copyright 2014 Andreas Xavier
- Copyright 2014 Inge Wallin
+ Copyright 2014 Inge Wallin <***@lysator.liu.se>
***************************************************************************/

/***************************************************************************
diff --git a/src/dashboard/barwidget.h b/src/dashboard/barwidget.h
index a444dffd..2324fbcc 100644
--- a/src/dashboard/barwidget.h
+++ b/src/dashboard/barwidget.h
@@ -1,6 +1,6 @@
/***************************************************************************
Copyright 2014 Andreas Xavier
- Copyright 2014 Inge Wallin
+ Copyright 2014 Inge Wallin <***@lysator.liu.se>
***************************************************************************/

/***************************************************************************
@@ -31,8 +31,8 @@ extern ConfidenceColors globalColors;
class BarWidget : public QWidget
{
public:
- BarWidget(QWidget *parent = 0);
- BarWidget(WordCount *dueWords, QWidget *parent = 0);
+ explicit BarWidget(QWidget *parent = 0);
+ explicit BarWidget(WordCount *dueWords, QWidget *parent = 0);

void setDue(WordCount &wc);

diff --git a/src/dashboard/collectionwidget.cpp b/src/dashboard/collectionwidget.cpp
index 92db9389..ec249017 100755
--- a/src/dashboard/collectionwidget.cpp
+++ b/src/dashboard/collectionwidget.cpp
@@ -1,6 +1,6 @@
/***************************************************************************
Copyright 2014 Andreas Xavier
- Copyright 2014 Inge Wallin
+ Copyright 2014 Inge Wallin <***@lysator.liu.se>
***************************************************************************/

/***************************************************************************
diff --git a/src/dashboard/collectionwidget.h b/src/dashboard/collectionwidget.h
index 4572ff44..3ed5a2a9 100644
--- a/src/dashboard/collectionwidget.h
+++ b/src/dashboard/collectionwidget.h
@@ -1,6 +1,6 @@
/***************************************************************************
Copyright 2014 Andreas Xavier
- Copyright 2014 Inge Wallin
+ Copyright 2014 Inge Wallin <***@lysator.liu.se>
***************************************************************************/

/***************************************************************************
diff --git a/src/dashboard/dashboard.h b/src/dashboard/dashboard.h
index 8c319db1..adaa1c06 100644
--- a/src/dashboard/dashboard.h
+++ b/src/dashboard/dashboard.h
@@ -40,7 +40,7 @@ class Dashboard : public KXmlGuiWindow
{
Q_OBJECT
public:
- Dashboard(ParleyMainWindow *parent);
+ explicit Dashboard(ParleyMainWindow *parent);
~Dashboard();

public slots:
diff --git a/src/dashboard/gradereferencewidget.cpp b/src/dashboard/gradereferencewidget.cpp
index 7154f2e2..5717bfbe 100644
--- a/src/dashboard/gradereferencewidget.cpp
+++ b/src/dashboard/gradereferencewidget.cpp
@@ -1,6 +1,6 @@
/***************************************************************************
Copyright 2014 Andreas Xavier
- Copyright 2014 Inge Wallin
+ Copyright 2014 Inge Wallin <***@lysator.liu.se>
***************************************************************************/

/***************************************************************************
diff --git a/src/dashboard/gradereferencewidget.h b/src/dashboard/gradereferencewidget.h
index e0ec96fa..60460839 100644
--- a/src/dashboard/gradereferencewidget.h
+++ b/src/dashboard/gradereferencewidget.h
@@ -1,6 +1,6 @@
/***************************************************************************
Copyright 2014 Andreas Xavier
- Copyright 2014 Inge Wallin
+ Copyright 2014 Inge Wallin <***@lysator.liu.se>
***************************************************************************/

/***************************************************************************
@@ -21,7 +21,7 @@
class GradeReferenceWidget : public QWidget
{
public:
- GradeReferenceWidget(QWidget *parent = 0);
+ explicit GradeReferenceWidget(QWidget *parent = 0);

protected:
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
diff --git a/src/editor/comparisonwidget.h b/src/editor/comparisonwidget.h
index c60c53b6..63ffc573 100644
--- a/src/editor/comparisonwidget.h
+++ b/src/editor/comparisonwidget.h
@@ -41,7 +41,7 @@ class ComparisonWidget : public QWidget, public Ui::comparisonWidget
Q_OBJECT

public:
- ComparisonWidget(QWidget *parent = 0);
+ explicit ComparisonWidget(QWidget *parent = 0);

public slots:
/**
diff --git a/src/editor/editor.h b/src/editor/editor.h
index 3813ef7d..78fd4bc2 100644
--- a/src/editor/editor.h
+++ b/src/editor/editor.h
@@ -52,7 +52,7 @@ class EditorWindow : public KXmlGuiWindow
Q_OBJECT

public:
- EditorWindow(ParleyMainWindow* parent);
+ explicit EditorWindow(ParleyMainWindow* parent);
~EditorWindow();

/**
diff --git a/src/editor/latexwidget.h b/src/editor/latexwidget.h
index 39dc4234..002b48d6 100644
--- a/src/editor/latexwidget.h
+++ b/src/editor/latexwidget.h
@@ -75,7 +75,7 @@ class LatexDelegate : public QItemDelegate
{
Q_OBJECT
public:
- LatexDelegate(QObject *parent = 0);
+ explicit LatexDelegate(QObject *parent = 0);

void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;
void setModelData(QWidget * editor, QAbstractItemModel * model, const QModelIndex & index) const Q_DECL_OVERRIDE;
diff --git a/src/editor/lessonview.h b/src/editor/lessonview.h
index 4590c089..8c409d78 100644
--- a/src/editor/lessonview.h
+++ b/src/editor/lessonview.h
@@ -32,7 +32,7 @@ class LessonView : public ContainerView
Q_OBJECT

public:
- LessonView(EditorWindow *parent);
+ explicit LessonView(EditorWindow *parent);

/** Set the model for the view.
* @param model the model */
diff --git a/src/editor/summarywordwidget.h b/src/editor/summarywordwidget.h
index c0f201c4..9f01af11 100644
--- a/src/editor/summarywordwidget.h
+++ b/src/editor/summarywordwidget.h
@@ -99,7 +99,7 @@ class SummaryWordDelegate : public QItemDelegate
{
Q_OBJECT
public:
- SummaryWordDelegate(QObject *parent = 0);
+ explicit SummaryWordDelegate(QObject *parent = 0);

void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;
};
diff --git a/src/editor/vocabularydelegate.h b/src/editor/vocabularydelegate.h
index 7b1b720f..b986db30 100644
--- a/src/editor/vocabularydelegate.h
+++ b/src/editor/vocabularydelegate.h
@@ -46,7 +46,7 @@ public:
EntryColumnsMAX
};

- VocabularyDelegate(QObject *parent = 0);
+ explicit VocabularyDelegate(QObject *parent = 0);

QWidget * createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;

diff --git a/src/editor/vocabularyview.h b/src/editor/vocabularyview.h
index ba44f523..8f93b9cd 100644
--- a/src/editor/vocabularyview.h
+++ b/src/editor/vocabularyview.h
@@ -47,7 +47,7 @@ class VocabularyView : public QTableView
{
Q_OBJECT
public:
- VocabularyView(EditorWindow *parent);
+ explicit VocabularyView(EditorWindow *parent);
virtual ~VocabularyView() {}

KActionMenu* columnsActionMenu();
diff --git a/src/editor/wordtypeview.h b/src/editor/wordtypeview.h
index a2c8b8d0..d0d0a7c4 100644
--- a/src/editor/wordtypeview.h
+++ b/src/editor/wordtypeview.h
@@ -32,7 +32,7 @@ class WordTypeView : public ContainerView
Q_OBJECT

public:
- WordTypeView(EditorWindow *parent);
+ explicit WordTypeView(EditorWindow *parent);

public slots:
/** Append a word type to the model and automatically set an edit up so the user can change "New lesson" into something meaningfull.*/
diff --git a/src/exportdialog.h b/src/exportdialog.h
index 1b41c085..243aea1a 100644
--- a/src/exportdialog.h
+++ b/src/exportdialog.h
@@ -25,7 +25,7 @@ class ExportDialog : public QDialog
{
Q_OBJECT
public:
- ExportDialog(ParleyDocument *doc, QWidget *parent = 0);
+ explicit ExportDialog(ParleyDocument *doc, QWidget *parent = 0);

private slots:
void accept() Q_DECL_OVERRIDE;
diff --git a/src/parleydocument.h b/src/parleydocument.h
index af791776..7d2c002b 100644
--- a/src/parleydocument.h
+++ b/src/parleydocument.h
@@ -30,7 +30,7 @@ class ParleyDocument : public QObject
{
Q_OBJECT
public:
- ParleyDocument(ParleyMainWindow* parleyMainWindow);
+ explicit ParleyDocument(ParleyMainWindow* parleyMainWindow);
~ParleyDocument();


diff --git a/src/practice/abstractfrontend.h b/src/practice/abstractfrontend.h
index 01ac7581..80749fab 100644
--- a/src/practice/abstractfrontend.h
+++ b/src/practice/abstractfrontend.h
@@ -45,7 +45,7 @@ public:
AnswerWrong
};

- AbstractFrontend(QObject* parent = 0);
+ explicit AbstractFrontend(QObject* parent = 0);
virtual ~AbstractFrontend() {}

/**
diff --git a/src/practice/abstractwidget.h b/src/practice/abstractwidget.h
index 19ce671a..8e53f29c 100644
--- a/src/practice/abstractwidget.h
+++ b/src/practice/abstractwidget.h
@@ -29,7 +29,7 @@ class AbstractModeWidget : public QWidget
Q_OBJECT

public:
- AbstractModeWidget(GuiFrontend *frontend, QWidget* parent = 0);
+ explicit AbstractModeWidget(GuiFrontend *frontend, QWidget* parent = 0);
virtual ~AbstractModeWidget() {}

virtual void setQuestion(const QVariant& question) = 0;
diff --git a/src/practice/audiobutton.h b/src/practice/audiobutton.h
index 9e578e7a..4465dd87 100644
--- a/src/practice/audiobutton.h
+++ b/src/practice/audiobutton.h
@@ -27,7 +27,7 @@ class AudioButton : public QToolButton
{
Q_OBJECT
public:
- AudioButton(QWidget *parent);
+ explicit AudioButton(QWidget *parent);
void setSoundFile(QUrl url);

private Q_SLOTS:
diff --git a/src/practice/boxeswidget.cpp b/src/practice/boxeswidget.cpp
index 51ce764b..e4edc21c 100644
--- a/src/practice/boxeswidget.cpp
+++ b/src/practice/boxeswidget.cpp
@@ -88,7 +88,7 @@ void BoxesWidget::updatePixmap()
drawElement(&p, id);
}
if (m_lastBox != -1 && m_currentBox != -1 && m_lastBox != m_currentBox) {
- drawElement(&p, "arrow-" + QString::number(m_lastBox) + "-" + QString::number(m_currentBox));
+ drawElement(&p, "arrow-" + QString::number(m_lastBox) + '-' + QString::number(m_currentBox));
}
setPixmap(QPixmap::fromImage(image));
}
diff --git a/src/practice/boxeswidget.h b/src/practice/boxeswidget.h
index 29f96a88..fff24572 100644
--- a/src/practice/boxeswidget.h
+++ b/src/practice/boxeswidget.h
@@ -26,7 +26,7 @@ class BoxesWidget : public ImageWidget
Q_OBJECT

public:
- BoxesWidget(QWidget* parent = 0);
+ explicit BoxesWidget(QWidget* parent = 0);
QSize minimumSizeHint() const Q_DECL_OVERRIDE;

void setRenderer(ThemedBackgroundRenderer *renderer);
diff --git a/src/practice/comparisonmodewidget.h b/src/practice/comparisonmodewidget.h
index 993f5d65..aa5f9366 100644
--- a/src/practice/comparisonmodewidget.h
+++ b/src/practice/comparisonmodewidget.h
@@ -31,7 +31,7 @@ class ComparisonModeWidget: public AbstractModeWidget
Q_OBJECT

public:
- ComparisonModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
+ explicit ComparisonModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
QVariant userInput() Q_DECL_OVERRIDE;

void setQuestion(const QVariant& question) Q_DECL_OVERRIDE;
diff --git a/src/practice/configure/blockoptions.h b/src/practice/configure/blockoptions.h
index 8ed10ad2..57bf0134 100644
--- a/src/practice/configure/blockoptions.h
+++ b/src/practice/configure/blockoptions.h
@@ -35,7 +35,7 @@ class BlockOptions : public QWidget, public Ui::BlockOptionsBase
{
Q_OBJECT
public:
- BlockOptions(QWidget* parent = 0);
+ explicit BlockOptions(QWidget* parent = 0);
void updateWidgets();
bool hasChanged();
bool isDefault();
diff --git a/src/practice/configure/generalpracticeoptions.h b/src/practice/configure/generalpracticeoptions.h
index 81d71a9a..7f3094af 100644
--- a/src/practice/configure/generalpracticeoptions.h
+++ b/src/practice/configure/generalpracticeoptions.h
@@ -32,7 +32,7 @@ class GeneralPracticeOptions : public QWidget, public Ui::GeneralPracticeOptions
{
Q_OBJECT
public:
- GeneralPracticeOptions(QWidget* parent = 0);
+ explicit GeneralPracticeOptions(QWidget* parent = 0);
};

#endif
diff --git a/src/practice/configure/specificpracticeoptions.h b/src/practice/configure/specificpracticeoptions.h
index c1d96831..e3c9a781 100644
--- a/src/practice/configure/specificpracticeoptions.h
+++ b/src/practice/configure/specificpracticeoptions.h
@@ -31,7 +31,7 @@ class SpecificPracticeOptions : public QWidget, public Ui::SpecificPracticeOptio
{
Q_OBJECT
public:
- SpecificPracticeOptions(QWidget* parent = 0);
+ explicit SpecificPracticeOptions(QWidget* parent = 0);
};

#endif
diff --git a/src/practice/conjugationmodewidget.cpp b/src/practice/conjugationmodewidget.cpp
index 075c67c6..ce935cbc 100644
--- a/src/practice/conjugationmodewidget.cpp
+++ b/src/practice/conjugationmodewidget.cpp
@@ -96,7 +96,7 @@ void ConjugationModeWidget::setQuestion(const QVariant& question)
int i = 0;
foreach(QString pp, data.personalPronouns) {
if (data.personalPronouns.size() == 1) {
- pp += " (" + data.tense + ")";
+ pp += " (" + data.tense + ')';
}
m_personWidgets.at(i)->person->setText(pp);
m_personWidgets.at(i)->person->setFont(m_solutionFont);
diff --git a/src/practice/conjugationmodewidget.h b/src/practice/conjugationmodewidget.h
index 30a4a37a..67270a8c 100644
--- a/src/practice/conjugationmodewidget.h
+++ b/src/practice/conjugationmodewidget.h
@@ -32,7 +32,7 @@ class ConjugationModeWidget: public AbstractModeWidget
Q_OBJECT

public:
- ConjugationModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
+ explicit ConjugationModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
virtual ~ConjugationModeWidget();
QVariant userInput() Q_DECL_OVERRIDE;

diff --git a/src/practice/flashcardmodewidget.h b/src/practice/flashcardmodewidget.h
index aae6a65f..de562660 100644
--- a/src/practice/flashcardmodewidget.h
+++ b/src/practice/flashcardmodewidget.h
@@ -35,7 +35,7 @@ class FlashCardModeWidget: public AbstractModeWidget
Q_OBJECT

public:
- FlashCardModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
+ explicit FlashCardModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
QVariant userInput() Q_DECL_OVERRIDE;

void setQuestion(const QVariant& question) Q_DECL_OVERRIDE;
diff --git a/src/practice/guifrontend.h b/src/practice/guifrontend.h
index 9c3dfb68..057929f0 100644
--- a/src/practice/guifrontend.h
+++ b/src/practice/guifrontend.h
@@ -39,7 +39,7 @@ class GuiFrontend : public AbstractFrontend
Q_OBJECT

public:
- GuiFrontend(QWidget *parent = 0);
+ explicit GuiFrontend(QWidget *parent = 0);
virtual ~GuiFrontend();

QVariant userInput() Q_DECL_OVERRIDE;
diff --git a/src/practice/imagewidget.h b/src/practice/imagewidget.h
index d3ffe7d9..6fa26c9e 100644
--- a/src/practice/imagewidget.h
+++ b/src/practice/imagewidget.h
@@ -26,7 +26,7 @@ class ImageWidget : public QWidget
Q_OBJECT

public:
- ImageWidget(QWidget *parent = 0);
+ explicit ImageWidget(QWidget *parent = 0);

void setPixmap(const QPixmap& pixmap);
void setScalingEnabled(bool scaling, bool onlyDownscaling = true);
diff --git a/src/practice/latexrenderer.h b/src/practice/latexrenderer.h
index ef1b8b63..d44f05c8 100644
--- a/src/practice/latexrenderer.h
+++ b/src/practice/latexrenderer.h
@@ -29,7 +29,7 @@ class LatexRenderer : public QObject
Q_OBJECT

public:
- LatexRenderer(QObject* parent = 0);
+ explicit LatexRenderer(QObject* parent = 0);
void setResultLabel(QLabel *label) {
m_label = label;
}
diff --git a/src/practice/mixedlettersmodewidget.h b/src/practice/mixedlettersmodewidget.h
index 97b72de4..1f182ac7 100644
--- a/src/practice/mixedlettersmodewidget.h
+++ b/src/practice/mixedlettersmodewidget.h
@@ -37,7 +37,7 @@ class MixedLettersModeWidget : public Practice::WrittenPracticeWidget
Q_OBJECT

public:
- MixedLettersModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
+ explicit MixedLettersModeWidget(GuiFrontend *frontend, QWidget *parent = 0);

void setQuestion(const QVariant& question) Q_DECL_OVERRIDE;
void setSolution(const QVariant& solution) Q_DECL_OVERRIDE;
diff --git a/src/practice/multiplechoicemodewidget.h b/src/practice/multiplechoicemodewidget.h
index 08dae28e..4b6293aa 100644
--- a/src/practice/multiplechoicemodewidget.h
+++ b/src/practice/multiplechoicemodewidget.h
@@ -33,7 +33,7 @@ class MultiplechoiceModeWidget: public AbstractModeWidget
Q_OBJECT

public:
- MultiplechoiceModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
+ explicit MultiplechoiceModeWidget(GuiFrontend *frontend, QWidget *parent = 0);
QVariant userInput() Q_DECL_OVERRIDE;

void setQuestion(const QVariant& question) Q_DECL_OVERRIDE;
diff --git a/src/practice/practicemainwindow.h b/src/practice/practicemainwindow.h
index 91e7f777..cd2015c5 100644
--- a/src/practice/practicemainwindow.h
+++ b/src/practice/practicemainwindow.h
@@ -32,7 +32,7 @@ class PracticeMainWindow : public KXmlGuiWindow
{
Q_OBJECT
public:
- PracticeMainWindow(SessionManagerBase* sessionManager, ParleyMainWindow* mainWindow = 0);
+ explicit PracticeMainWindow(SessionManagerBase* sessionManager, ParleyMainWindow* mainWindow = 0);
~PracticeMainWindow();

void startPractice();
diff --git a/src/practice/statustoggle.h b/src/practice/statustoggle.h
index 93b6513e..c3726837 100644
--- a/src/practice/statustoggle.h
+++ b/src/practice/statustoggle.h
@@ -29,7 +29,7 @@ class StatusToggle : public ImageWidget
Q_OBJECT

public:
- StatusToggle(QWidget* parent = 0);
+ explicit StatusToggle(QWidget* parent = 0);
QSize minimumSizeHint() const Q_DECL_OVERRIDE;

void setRenderer(ThemedBackgroundRenderer *renderer);
diff --git a/src/practice/summarybarwidget.h b/src/practice/summarybarwidget.h
index 890fb867..15eca7b3 100644
--- a/src/practice/summarybarwidget.h
+++ b/src/practice/summarybarwidget.h
@@ -28,7 +28,7 @@ class SummaryBarWidget : public QWidget
Q_OBJECT

public:
- SummaryBarWidget(QWidget *parent = 0);
+ explicit SummaryBarWidget(QWidget *parent = 0);

void setStatistics(int correct, int wrong, int notAnswered);

diff --git a/src/practice/themedbackgroundrenderer.cpp b/src/practice/themedbackgroundrenderer.cpp
index a2d4eaf7..e27b9b60 100644
--- a/src/practice/themedbackgroundrenderer.cpp
+++ b/src/practice/themedbackgroundrenderer.cpp
@@ -258,12 +258,12 @@ void ThemedBackgroundRenderer::renderRect(const QString& name, const QRect& rect
scaleBase = Vertical;
}
for (int inside = 1; inside >= 0; inside--) {
- renderItem(name, QString(inside ? "inside" : "border") + "-" + edge, rect, p, fastScale, scaleBase, Qt::IgnoreAspectRatio, alignEdge, Centered, inside);
- renderItem(name, QString(inside ? "inside" : "border") + "-" + edge + "-ratio", rect, p, fastScale, scaleBase, Qt::KeepAspectRatio, alignEdge, Centered, inside);
- renderItem(name, QString(inside ? "inside" : "border") + "-" + edge + "-noscale", rect, p, fastScale, NoScale, Qt::IgnoreAspectRatio, alignEdge, Centered, inside);
- renderItem(name, QString(inside ? "inside" : "border") + "-" + edge + "-repeat", rect, p, fastScale, scaleBase, Qt::IgnoreAspectRatio, alignEdge, Repeated, inside);
- renderItem(name, QString(inside ? "inside" : "border") + "-" + edge + "-" + (scaleBase == Vertical ? "top" : "left"), rect, p, fastScale, NoScale, Qt::IgnoreAspectRatio, alignEdge, LeftTop, inside);
- renderItem(name, QString(inside ? "inside" : "border") + "-" + edge + "-" + (scaleBase == Vertical ? "bottom" : "right"), rect, p, fastScale, NoScale, Qt::IgnoreAspectRatio, alignEdge, RightBottom, inside);
+ renderItem(name, QString(inside ? "inside" : "border") + '-' + edge, rect, p, fastScale, scaleBase, Qt::IgnoreAspectRatio, alignEdge, Centered, inside);
+ renderItem(name, QString(inside ? "inside" : "border") + '-' + edge + "-ratio", rect, p, fastScale, scaleBase, Qt::KeepAspectRatio, alignEdge, Centered, inside);
+ renderItem(name, QString(inside ? "inside" : "border") + '-' + edge + "-noscale", rect, p, fastScale, NoScale, Qt::IgnoreAspectRatio, alignEdge, Centered, inside);
+ renderItem(name, QString(inside ? "inside" : "border") + '-' + edge + "-repeat", rect, p, fastScale, scaleBase, Qt::IgnoreAspectRatio, alignEdge, Repeated, inside);
+ renderItem(name, QString(inside ? "inside" : "border") + '-' + edge + '-' + (scaleBase == Vertical ? "top" : "left"), rect, p, fastScale, NoScale, Qt::IgnoreAspectRatio, alignEdge, LeftTop, inside);
+ renderItem(name, QString(inside ? "inside" : "border") + '-' + edge + '-' + (scaleBase == Vertical ? "bottom" : "right"), rect, p, fastScale, NoScale, Qt::IgnoreAspectRatio, alignEdge, RightBottom, inside);
}
}
}
diff --git a/src/practice/writtenpracticewidget.h b/src/practice/writtenpracticewidget.h
index 1dc48b41..2ee58a38 100644
--- a/src/practice/writtenpracticewidget.h
+++ b/src/practice/writtenpracticewidget.h
@@ -31,7 +31,7 @@ class WrittenPracticeWidget : public Practice::AbstractModeWidget
Q_OBJECT

public:
- WrittenPracticeWidget(GuiFrontend *frontend, QWidget *parent = 0, bool isExampleSentenceMode = false);
+ explicit WrittenPracticeWidget(GuiFrontend *frontend, QWidget *parent = 0, bool isExampleSentenceMode = false);
QVariant userInput() Q_DECL_OVERRIDE;

void setQuestion(const QVariant& question) Q_DECL_OVERRIDE;
diff --git a/src/scripts/script.h b/src/scripts/script.h
index 4524e67a..e48a08b7 100644
--- a/src/scripts/script.h
+++ b/src/scripts/script.h
@@ -37,7 +37,7 @@ public:
*
* @param file The path to the script file to be activated (executed)
*/
- Script(QString file);
+ explicit Script(QString file);
~Script();
/**
* Returns true if the script was successfully activated; false otherwise
diff --git a/src/scripts/scriptdialog.h b/src/scripts/scriptdialog.h
index c605329a..89620e6b 100644
--- a/src/scripts/scriptdialog.h
+++ b/src/scripts/scriptdialog.h
@@ -26,7 +26,7 @@
class ScriptDialog : public QDialog
{
public:
- ScriptDialog(ScriptManager* scriptManager);
+ explicit ScriptDialog(ScriptManager* scriptManager);
~ScriptDialog();
/**
* Executed when user clicks OK button.
diff --git a/src/scripts/scripting/container.h b/src/scripts/scripting/container.h
index 97dfba55..938e7a15 100644
--- a/src/scripts/scripting/container.h
+++ b/src/scripts/scripting/container.h
@@ -43,7 +43,7 @@ class Container : public QObject
// Q_PROPERTY ( QVariantList childContainers READ childContainers )
public:

- Container(KEduVocContainer * container = 0);
+ explicit Container(KEduVocContainer * container = 0);

/* copy constructor for d-pointer safe copying */
// Container ( const Container &other );
diff --git a/src/scripts/scripting/document.h b/src/scripts/scripting/document.h
index 6a5a5c8d..f7e91476 100644
--- a/src/scripts/scripting/document.h
+++ b/src/scripts/scripting/document.h
@@ -130,9 +130,9 @@ public:
DeleteEntriesAndLesson
};

- Document(QObject* parent = 0);
+ explicit Document(QObject* parent = 0);

- Document(KEduVocDocument * doc);
+ explicit Document(KEduVocDocument * doc);

~Document();

diff --git a/src/scripts/scripting/expression.h b/src/scripts/scripting/expression.h
index 6720be05..b2c20ffd 100644
--- a/src/scripts/scripting/expression.h
+++ b/src/scripts/scripting/expression.h
@@ -49,13 +49,13 @@ public:
*
* @param expression translation
*/
- Expression(const QString & expression);
+ explicit Expression(const QString & expression);

/*
* Constructor for vocabulary expression with more than one translation
* @param translations
*/
- Expression(const QStringList & translations);
+ explicit Expression(const QStringList & translations);

Expression(const Expression & other);

@@ -63,7 +63,7 @@ public:
* Constructor from a KEduVocExpression (doesn't exist in KEduVocExpression)
* @param expression KEduVocExpression object
*/
- Expression(KEduVocExpression * expression);
+ explicit Expression(KEduVocExpression * expression);

~Expression();

diff --git a/src/scripts/scripting/identifier.h b/src/scripts/scripting/identifier.h
index f13d04dc..b3d86f4f 100644
--- a/src/scripts/scripting/identifier.h
+++ b/src/scripts/scripting/identifier.h
@@ -60,9 +60,9 @@ public:

Identifier();

- Identifier(KEduVocIdentifier * identifier);
+ explicit Identifier(KEduVocIdentifier * identifier);

- Identifier(KEduVocIdentifier & identifier);
+ explicit Identifier(KEduVocIdentifier & identifier);

~Identifier();

diff --git a/src/scripts/scripting/lesson.h b/src/scripts/scripting/lesson.h
index 3424c5fc..55179d4d 100644
--- a/src/scripts/scripting/lesson.h
+++ b/src/scripts/scripting/lesson.h
@@ -47,11 +47,11 @@ class Lesson : public Container
Q_OBJECT
public:

- Lesson(KEduVocLesson * lesson);
+ explicit Lesson(KEduVocLesson * lesson);

- Lesson(KEduVocContainer * container);
+ explicit Lesson(KEduVocContainer * container);

- Lesson(const QString& name);
+ explicit Lesson(const QString& name);

~Lesson();

diff --git a/src/scripts/scripting/parley.h b/src/scripts/scripting/parley.h
index 6d76eadb..b4709d08 100644
--- a/src/scripts/scripting/parley.h
+++ b/src/scripts/scripting/parley.h
@@ -209,7 +209,7 @@ public:
Irregular = 0x20000000
};

- Parley(Editor::EditorWindow * editor);
+ explicit Parley(Editor::EditorWindow * editor);

~Parley();

diff --git a/src/scripts/scripting/text.h b/src/scripts/scripting/text.h
index 96c50605..b591aed0 100644
--- a/src/scripts/scripting/text.h
+++ b/src/scripts/scripting/text.h
@@ -60,7 +60,7 @@ class Text : public QObject

public:
/* default constructor */
- Text(const QString& text = QString());
+ explicit Text(const QString& text = QString());

/* copy constructor
* provides safe copy of d pointer
@@ -72,9 +72,9 @@ public:
* Constructor from KEduVocText (not used by scripts)
* @param text KEduVocText to initialize Scripting::Text
*/
- Text(KEduVocText * text);
+ explicit Text(KEduVocText * text);

- Text(const KEduVocText & text);
+ explicit Text(const KEduVocText & text);

~Text();

diff --git a/src/scripts/scripting/translation.h b/src/scripts/scripting/translation.h
index 8448f698..83b89527 100644
--- a/src/scripts/scripting/translation.h
+++ b/src/scripts/scripting/translation.h
@@ -58,7 +58,7 @@ public:
/*
* Default constructor for an empty translation.
*/
- Translation(Expression * entry);
+ explicit Translation(Expression * entry);

/*
* Constructor
@@ -70,7 +70,7 @@ public:
* Constructor from KEduVocTranslation (not used by scripts)
* @param translation KEduVocTranslation to initialize Scripting::Translation
*/
- Translation(KEduVocTranslation * translation);
+ explicit Translation(KEduVocTranslation * translation);

~Translation();

diff --git a/src/scripts/scriptmanager.h b/src/scripts/scriptmanager.h
index 9576f721..cae46f95 100644
--- a/src/scripts/scriptmanager.h
+++ b/src/scripts/scriptmanager.h
@@ -30,7 +30,7 @@
class ScriptManager : public QObject
{
public:
- ScriptManager(Editor::EditorWindow * editor);
+ explicit ScriptManager(Editor::EditorWindow * editor);

~ScriptManager();

diff --git a/src/scripts/translator.h b/src/scripts/translator.h
index c319c399..aa64f886 100644
--- a/src/scripts/translator.h
+++ b/src/scripts/translator.h
@@ -75,7 +75,7 @@ class Translator
{
public:
Translator();
- Translator(QObject * parent);
+ explicit Translator(QObject * parent);

~Translator();

diff --git a/src/settings/documentproperties.cpp b/src/settings/documentproperties.cpp
index b9ff6214..36d97cd4 100644
--- a/src/settings/documentproperties.cpp
+++ b/src/settings/documentproperties.cpp
@@ -116,7 +116,7 @@ QMap<QString, QString> DocumentProperties::localeLangsMap()

foreach (const QLocale & myLocale, allLocales) {
if(!myLocale.nativeLanguageName().isEmpty() && !myLocale.nativeCountryName().isEmpty()) {
- languageCodeMap[ myLocale.nativeLanguageName() + " (" + myLocale.nativeCountryName() + ")" ] = myLocale.name();
+ languageCodeMap[ myLocale.nativeLanguageName() + " (" + myLocale.nativeCountryName() + ')' ] = myLocale.name();
}
}
return languageCodeMap;
diff --git a/src/settings/generaloptions.h b/src/settings/generaloptions.h
index 50c9047b..a94be21f 100644
--- a/src/settings/generaloptions.h
+++ b/src/settings/generaloptions.h
@@ -30,7 +30,7 @@ class GeneralOptions : public QWidget, public Ui::GeneralOptionsBase
{
Q_OBJECT
public:
- GeneralOptions(QWidget* parent = 0);
+ explicit GeneralOptions(QWidget* parent = 0);

void updateWidgets();
bool hasChanged();
diff --git a/src/settings/kgametheme/kgametheme.h b/src/settings/kgametheme/kgametheme.h
index 6519a340..a349104b 100644
--- a/src/settings/kgametheme/kgametheme.h
+++ b/src/settings/kgametheme/kgametheme.h
@@ -42,7 +42,7 @@ class QPixmap;
class KGameTheme
{
public:
- KGameTheme(const QString &themeGroup = QStringLiteral("KGameTheme"));
+ explicit KGameTheme(const QString &themeGroup = QStringLiteral("KGameTheme"));
virtual ~KGameTheme();

/**
diff --git a/src/settings/viewoptions.h b/src/settings/viewoptions.h
index 7def32ba..7c1ee226 100644
--- a/src/settings/viewoptions.h
+++ b/src/settings/viewoptions.h
@@ -30,7 +30,7 @@ class ViewOptions : public QWidget, public Ui::ViewOptionsBase
{
Q_OBJECT
public:
- ViewOptions(QWidget* parent = 0);
+ explicit ViewOptions(QWidget* parent = 0);
};

#endif
diff --git a/src/statistics/lessonstatisticsview.h b/src/statistics/lessonstatisticsview.h
index 4b0f1fd1..ca26b357 100644
--- a/src/statistics/lessonstatisticsview.h
+++ b/src/statistics/lessonstatisticsview.h
@@ -27,7 +27,7 @@ class LessonStatisticsView : public ContainerView
Q_OBJECT

public:
- LessonStatisticsView(QWidget *parent);
+ explicit LessonStatisticsView(QWidget *parent);
~LessonStatisticsView();
void setModel(ContainerModel *model) Q_DECL_OVERRIDE;
void saveExpandedStatus() const;
diff --git a/src/statistics/statisticslegendwidget.cpp b/src/statistics/statisticslegendwidget.cpp
index ad0e2bc5..d54625be 100644
--- a/src/statistics/statisticslegendwidget.cpp
+++ b/src/statistics/statisticslegendwidget.cpp
@@ -1,6 +1,6 @@
/*
* Copyright 2014 Andreas Xavier <andxav at zoho dot com>
- * Copyright 2014 Inge Wallin
+ * Copyright 2014 Inge Wallin <***@lysator.liu.se>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/src/statistics/statisticslegendwidget.h b/src/statistics/statisticslegendwidget.h
index 56ddf97b..27232fa1 100644
--- a/src/statistics/statisticslegendwidget.h
+++ b/src/statistics/statisticslegendwidget.h
@@ -1,6 +1,6 @@
/*
* Copyright 2014 Andreas Xavier <andxav at zoho dot com>
- * Copyright 2014 Inge Wallin
+ * Copyright 2014 Inge Wallin <***@lysator.liu.se>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -36,7 +36,7 @@ class StatisticsLegendWidget : public QWidget
Q_OBJECT
public:
/// constructor
- StatisticsLegendWidget(QWidget * parent = 0);
+ explicit StatisticsLegendWidget(QWidget * parent = 0);


protected:
diff --git a/src/utils.cpp b/src/utils.cpp
index 97126e03..be873a06 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- Copyright 2015 Inge Wallin
+ Copyright 2015 Inge Wallin <***@lysator.liu.se>
***************************************************************************/

/***************************************************************************
diff --git a/src/utils.h b/src/utils.h
index c075d6d4..08ea11dc 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,5 +1,5 @@
/***************************************************************************
- Copyright 2015 Inge Wallin
+ Copyright 2015 Inge Wallin <***@lysator.liu.se>
***************************************************************************/

/***************************************************************************

[Yuri Chornoivan]

Git commit b99509e2de8f482c0bc6950236cfb1dc720ad19d by Yuri Chornoivan.
Committed on 05/10/2018 at 06:05.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +1 -1 step/choicesmodel.h
M +1 -1 step/clipboard.h
M +1 -1 step/propertiesbrowser.h
M +1 -1 step/simulationthread.h
M +1 -1 step/toolgraphics.h
M +1 -1 stepcore/body.h
M +2 -2 stepcore/coulombforce.h
M +1 -1 stepcore/force.h
M +2 -2 stepcore/gas.h
M +4 -4 stepcore/gravitation.h
M +1 -1 stepcore/gslsolver.h
M +1 -1 stepcore/item.h
M +1 -1 stepcore/itemgroup.h
M +1 -1 stepcore/material.h
M +1 -1 stepcore/objecterrors.h
M +2 -2 stepcore/particle.h
M +1 -1 stepcore/rigidbody.h
M +1 -1 stepcore/solver.h
M +1 -1 stepcore/spring.h
M +1 -1 stepcore/xmlfile.h

https://commits.kde.org/step/b99509e2de8f482c0bc6950236cfb1dc720ad19d

diff --git a/step/choicesmodel.h b/step/choicesmodel.h
index 916df0b..15fcee9 100644
--- a/step/choicesmodel.h
+++ b/step/choicesmodel.h
@@ -26,7 +26,7 @@ class ChoicesModel: public QStandardItemModel
Q_OBJECT

public:
- ChoicesModel(QObject* parent = 0): QStandardItemModel(parent) {}
+ explicit ChoicesModel(QObject* parent = 0): QStandardItemModel(parent) {}
};

Q_DECLARE_METATYPE(ChoicesModel*)
diff --git a/step/clipboard.h b/step/clipboard.h
index 7822745..b63e510 100644
--- a/step/clipboard.h
+++ b/step/clipboard.h
@@ -31,7 +31,7 @@ namespace StepCore
class Clipboard : public QObject
{
public:
- Clipboard(QObject* parent = 0);
+ explicit Clipboard(QObject* parent = 0);

void copy(const QList<StepCore::Item*>& items);
QList<StepCore::Item*> paste(const StepCore::Factory* factory);
diff --git a/step/propertiesbrowser.h b/step/propertiesbrowser.h
index fdd207d..be3d34c 100644
--- a/step/propertiesbrowser.h
+++ b/step/propertiesbrowser.h
@@ -34,7 +34,7 @@ class PropertiesBrowserDelegate: public QItemDelegate
{
Q_OBJECT
public:
- PropertiesBrowserDelegate(QObject* parent = 0):
+ explicit PropertiesBrowserDelegate(QObject* parent = 0):
QItemDelegate(parent), _editor(NULL), _updating(false) {}
QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option,
const QModelIndex& index) const Q_DECL_OVERRIDE;
diff --git a/step/simulationthread.h b/step/simulationthread.h
index ea4e96e..735ff58 100644
--- a/step/simulationthread.h
+++ b/step/simulationthread.h
@@ -39,7 +39,7 @@ class SimulationThread: public QThread
Q_OBJECT

public:
- SimulationThread(StepCore::World** world)
+ explicit SimulationThread(StepCore::World** world)
: _world(world), _stopThread(0), _delta(0) {}
~SimulationThread();

diff --git a/step/toolgraphics.h b/step/toolgraphics.h
index 9329fb2..be82fcf 100644
--- a/step/toolgraphics.h
+++ b/step/toolgraphics.h
@@ -186,7 +186,7 @@ class DataSourceWidget: public QWidget
Q_OBJECT

public:
- DataSourceWidget(QWidget* parent = 0);
+ explicit DataSourceWidget(QWidget* parent = 0);

void setSkipReadOnly(bool skipReadOnly) { _skipReadOnly = skipReadOnly; }
void setDataSource(WorldModel* worldModel, StepCore::Object* object = NULL,
diff --git a/stepcore/body.h b/stepcore/body.h
index ca20cd3..f8d0526 100644
--- a/stepcore/body.h
+++ b/stepcore/body.h
@@ -47,7 +47,7 @@ class Body : public Item
STEPCORE_OBJECT(Body)

public:
- Body(const QString& name = QString())
+ explicit Body(const QString& name = QString())
: Item(name)
, _material(&GenericMaterial)
, _variablesOffset(0)
diff --git a/stepcore/coulombforce.h b/stepcore/coulombforce.h
index 6374a38..ae63b8e 100644
--- a/stepcore/coulombforce.h
+++ b/stepcore/coulombforce.h
@@ -42,7 +42,7 @@ class CoulombForceErrors: public ObjectErrors

public:
/** Constructs CoulombForceErrors */
- CoulombForceErrors(Item* owner = NULL)
+ explicit CoulombForceErrors(Item* owner = NULL)
: ObjectErrors(owner), _coulombConstVariance(0) {}

/** Get owner as CoulombForce */
@@ -86,7 +86,7 @@ class CoulombForce : public Force

public:
/** Constructs CoulombForce */
- CoulombForce(double coulombConst = Constants::Coulomb);
+ explicit CoulombForce(double coulombConst = Constants::Coulomb);

void calcForce(bool calcVariances) Q_DECL_OVERRIDE;

diff --git a/stepcore/force.h b/stepcore/force.h
index 685fae9..98f0e40 100644
--- a/stepcore/force.h
+++ b/stepcore/force.h
@@ -45,7 +45,7 @@ class Force : public Item
STEPCORE_OBJECT(Force)

public:
- Force(const QString& name = QString())
+ explicit Force(const QString& name = QString())
: Item(name)
{}
virtual ~Force() {}
diff --git a/stepcore/gas.h b/stepcore/gas.h
index bd1e45d..8b638fb 100644
--- a/stepcore/gas.h
+++ b/stepcore/gas.h
@@ -55,7 +55,7 @@ class GasLJForceErrors: public ObjectErrors

public:
/** Constructs GasLJForceErrors */
- GasLJForceErrors(Item* owner = 0)
+ explicit GasLJForceErrors(Item* owner = 0)
: ObjectErrors(owner), _depthVariance(0), _rminVariance(0) {}

/** Get owner as GasLJForce */
@@ -147,7 +147,7 @@ class GasErrors: public ObjectErrors

public:
/** Constructs GasErrors */
- GasErrors(Item* owner = 0)
+ explicit GasErrors(Item* owner = 0)
: ObjectErrors(owner) {}

/** Get owner as Gas */
diff --git a/stepcore/gravitation.h b/stepcore/gravitation.h
index b31b9c0..3d91010 100644
--- a/stepcore/gravitation.h
+++ b/stepcore/gravitation.h
@@ -42,7 +42,7 @@ class GravitationForceErrors: public ObjectErrors

public:
/** Constructs GravitationForceErrors */
- GravitationForceErrors(Item* owner = NULL)
+ explicit GravitationForceErrors(Item* owner = NULL)
: ObjectErrors(owner), _gravitationConstVariance(0) {}

/** Get owner as GravitationForce */
@@ -83,7 +83,7 @@ class GravitationForce : public Force

public:
/** Constructs GravitationForce */
- GravitationForce(double gravitationConst = Constants::Gravitational);
+ explicit GravitationForce(double gravitationConst = Constants::Gravitational);

void calcForce(bool calcVariances) Q_DECL_OVERRIDE;

@@ -111,7 +111,7 @@ class WeightForceErrors: public ObjectErrors

public:
/** Constructs WeightForceErrors */
- WeightForceErrors(Item* owner = NULL)
+ explicit WeightForceErrors(Item* owner = NULL)
: ObjectErrors(owner), _weightConstVariance(0) {}

/** Get owner as WeightForce */
@@ -148,7 +148,7 @@ class WeightForce : public Force

public:
/** Constructs WeightForce */
- WeightForce(double weightConst = Constants::WeightAccel);
+ explicit WeightForce(double weightConst = Constants::WeightAccel);

void calcForce(bool calcVariances) Q_DECL_OVERRIDE;

diff --git a/stepcore/gslsolver.h b/stepcore/gslsolver.h
index 8cf6baa..191162d 100644
--- a/stepcore/gslsolver.h
+++ b/stepcore/gslsolver.h
@@ -113,7 +113,7 @@ class GslAdaptiveSolver: public GslGenericSolver
{
STEPCORE_OBJECT(GslAdaptiveSolver)
public:
- GslAdaptiveSolver(const gsl_odeiv_step_type* gslStepType):
+ explicit GslAdaptiveSolver(const gsl_odeiv_step_type* gslStepType):
GslGenericSolver(1, true, gslStepType) {}
GslAdaptiveSolver(int dimension, Function function, void* params,
const gsl_odeiv_step_type* gslStepType)
diff --git a/stepcore/item.h b/stepcore/item.h
index 4545c13..8e8fcfa 100644
--- a/stepcore/item.h
+++ b/stepcore/item.h
@@ -48,7 +48,7 @@ class Item : public Object

public:
/** Constructs Item */
- Item(const QString& name = QString())
+ explicit Item(const QString& name = QString())
: Object(name)
, _world(NULL)
, _group(NULL)
diff --git a/stepcore/itemgroup.h b/stepcore/itemgroup.h
index ef7f55e..d7899cd 100644
--- a/stepcore/itemgroup.h
+++ b/stepcore/itemgroup.h
@@ -44,7 +44,7 @@ class ItemGroup : public Item

public:
/** Constructs empty group */
- ItemGroup(const QString& name = QString()) : Item(name) {}
+ explicit ItemGroup(const QString& name = QString()) : Item(name) {}
/** Constructs a copy of the group (deep copy) */
ItemGroup(const ItemGroup& group);
/** Destroys the group and all its subitems */
diff --git a/stepcore/material.h b/stepcore/material.h
index 1e780ed..d29625a 100644
--- a/stepcore/material.h
+++ b/stepcore/material.h
@@ -45,7 +45,7 @@ class Material
//STEPCORE_OBJECT(Material)

public:
- Material(const QString& name = QString())
+ explicit Material(const QString& name = QString())
: _name(name)
, _color(0xff000000)
, _density(1.0)
diff --git a/stepcore/objecterrors.h b/stepcore/objecterrors.h
index 1c3ad39..b135aac 100644
--- a/stepcore/objecterrors.h
+++ b/stepcore/objecterrors.h
@@ -47,7 +47,7 @@ class ObjectErrors: public Object

public:
/** Constructs ObjectErrors */
- ObjectErrors(Item* owner = NULL): _owner(owner) {}
+ explicit ObjectErrors(Item* owner = NULL): _owner(owner) {}

/** Get the owner of ObjectErrors */
Item* owner() const { return _owner; }
diff --git a/stepcore/particle.h b/stepcore/particle.h
index c196ddd..f63ce43 100644
--- a/stepcore/particle.h
+++ b/stepcore/particle.h
@@ -41,7 +41,7 @@ class ParticleErrors: public ObjectErrors

public:
/** Constructs ParticleErrors */
- ParticleErrors(Item* owner = 0)
+ explicit ParticleErrors(Item* owner = 0)
: ObjectErrors(owner), _positionVariance(0,0), _velocityVariance(0,0),
_forceVariance(0,0), _massVariance(0) {}

@@ -182,7 +182,7 @@ class ChargedParticleErrors: public ParticleErrors

public:
/** Constructs ChargedParticleErrors */
- ChargedParticleErrors(Item* owner = 0)
+ explicit ChargedParticleErrors(Item* owner = 0)
: ParticleErrors(owner), _chargeVariance(0) {}

/** Get owner as ChargedParticle */
diff --git a/stepcore/rigidbody.h b/stepcore/rigidbody.h
index 5e8b13c..ef5c982 100644
--- a/stepcore/rigidbody.h
+++ b/stepcore/rigidbody.h
@@ -40,7 +40,7 @@ class RigidBodyErrors: public ObjectErrors

public:
/** Constructs RigidBodyErrors */
- RigidBodyErrors(Item* owner = 0)
+ explicit RigidBodyErrors(Item* owner = 0)
: ObjectErrors(owner), _positionVariance(0,0), _angleVariance(0), _velocityVariance(0,0),
_angularVelocityVariance(0), _forceVariance(0,0), _torqueVariance(0),
_massVariance(0), _inertiaVariance(0) {}
diff --git a/stepcore/solver.h b/stepcore/solver.h
index ca3dd41..6916314 100644
--- a/stepcore/solver.h
+++ b/stepcore/solver.h
@@ -81,7 +81,7 @@ public:
explicit Solver(int dimension = 0, Function function = NULL,
void* params = NULL, double stepSize = 0.001);
/** Cunstructs a solver */
- Solver(double stepSize);
+ explicit Solver(double stepSize);

virtual ~Solver() {}

diff --git a/stepcore/spring.h b/stepcore/spring.h
index 2302c32..f221148 100644
--- a/stepcore/spring.h
+++ b/stepcore/spring.h
@@ -46,7 +46,7 @@ class SpringErrors: public ObjectErrors

public:
/** Constructs SpringErrors */
- SpringErrors(Item* owner = NULL)
+ explicit SpringErrors(Item* owner = NULL)
: ObjectErrors(owner), _restLengthVariance(0), _stiffnessVariance(0),
_dampingVariance(0), _localPosition1Variance(0,0), _localPosition2Variance(0,0) {}

diff --git a/stepcore/xmlfile.h b/stepcore/xmlfile.h
index 20f313d..cf6ea73 100644
--- a/stepcore/xmlfile.h
+++ b/stepcore/xmlfile.h
@@ -40,7 +40,7 @@ public:
* \param device QIODevice to save or load file
* \todo TODO don't pass factory here !
*/
- XmlFile(QIODevice* device): _device(device) {}
+ explicit XmlFile(QIODevice* device): _device(device) {}

/** Save world to XML file
* \param world World to save

[Yuri Chornoivan]

Git commit 771daae4de6c643ae7846c9af456307a71be7e17 by Yuri Chornoivan.
Committed on 06/10/2018 at 09:44.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +2 -2 kopete/addaccountwizard/addaccountwizard.cpp
M +3 -3 kopete/chatwindow/chatmessagepart.cpp
M +6 -6 kopete/chatwindow/chattexteditpart.cpp
M +15 -15 kopete/chatwindow/chatview.cpp
M +4 -4 kopete/chatwindow/emoticonselector.cpp
M +18 -18 kopete/chatwindow/kopetechatwindow.cpp
M +1 -1 kopete/chatwindow/kopetechatwindowsettings.kcfg
M +4 -4 kopete/chatwindow/kopeteemailwindow.cpp
M +7 -7 kopete/config/accounts/kopeteaccountconfig.cpp
M +1 -1 kopete/config/appearance/contactlistlayouteditwidget.cpp
M +26 -26 kopete/contactlist/contactlistmodel.cpp
M +2 -2 kopete/contactlist/kabcexport.cpp
M +6 -6 kopete/contactlist/kopetecontactlistview.cpp
M +3 -3 kopete/contactlist/kopetegrouplistaction.cpp
M +2 -2 kopete/contactlist/kopetelviprops.cpp
M +5 -5 kopete/identity/accountidentitydialog.cpp
M +20 -20 kopete/identity/identitystatuswidget.cpp
M +1 -1 kopete/infoeventwidget.cpp
M +1 -1 kopete/kopeteaccountstatusbaricon.cpp
M +10 -10 kopete/kopetedbusinterface_p.cpp
M +2 -2 kopete/kopeteidentitystatusbaricon.cpp
M +25 -25 kopete/kopetewindow.cpp
M +4 -4 kopete/statusmenu/kopetestatusgroupaction.cpp
M +8 -8 kopete/statusmenu/kopetestatusrootaction.cpp
M +4 -4 kopete/systemtray.cpp
M +9 -9 libkopete/chatsessionmemberslistmodel.cpp
M +4 -4 libkopete/contactlist/xmlcontactstorage.cpp
M +7 -7 libkopete/kopeteaccount.cpp
M +3 -3 libkopete/kopeteaccountmanager.cpp
M +2 -1 libkopete/kopeteappearancesettings.kcfg
M +19 -19 libkopete/kopetechatsession.cpp
M +9 -9 libkopete/kopetechatsessionmanager.cpp
M +1 -1 libkopete/kopetecommand.cpp
M +14 -14 libkopete/kopetecommandhandler.cpp
M +5 -5 libkopete/kopetecontact.cpp
M +10 -10 libkopete/kopetecontactlist.cpp
M +2 -2 libkopete/kopetegroup.cpp
M +9 -9 libkopete/kopeteidentity.cpp
M +3 -3 libkopete/kopeteidentitymanager.cpp
M +1 -1 libkopete/kopeteidletimer.cpp
M +2 -2 libkopete/kopeteinfoeventmanager.cpp
M +1 -1 libkopete/kopetemessageevent.cpp
M +2 -2 libkopete/kopetemessagehandler.cpp
M +1 -1 libkopete/kopetemessagehandlerchain.cpp
M +21 -21 libkopete/kopetemetacontact.cpp
M +1 -1 libkopete/kopetepassword.cpp
M +2 -2 libkopete/kopetepluginmanager.cpp
M +2 -2 libkopete/kopeteprotocol.cpp
M +1 -1 libkopete/kopetestatusitems.cpp
M +3 -3 libkopete/kopetestatusmanager.cpp
M +5 -5 libkopete/kopetetransfermanager.cpp
M +1 -1 libkopete/kopetewalletmanager.cpp
M +7 -7 libkopete/private/kopeteviewmanager.cpp
M +2 -2 libkopete/ui/accountselector.cpp
M +1 -1 libkopete/ui/addressbookselectordialog.cpp
M +6 -6 libkopete/ui/addressbookselectorwidget.cpp
M +3 -3 libkopete/ui/avatarselectorwidget.cpp
M +4 -4 libkopete/ui/kopetelistview.cpp
M +8 -8 libkopete/ui/metacontactselectorwidget.cpp
M +2 -2 plugins/addbookmarks/addbookmarksplugin.cpp
M +2 -2 plugins/alias/aliaspreferences.cpp
M +1 -1 plugins/cryptography/cryptographymessagehandler.cpp
M +3 -3 plugins/cryptography/cryptographyplugin.cpp
M +2 -2 plugins/highlight/highlightpreferences.cpp
M +1 -1 plugins/history/historydialog.cpp
M +2 -2 plugins/history/historylogger.cpp
M +8 -8 plugins/history/historyplugin.cpp
M +1 -1 plugins/history2/history2dialog.cpp
M +8 -8 plugins/history2/history2plugin.cpp
M +2 -2 plugins/latex/latexplugin.cpp
M +1 -1 plugins/nowlistening/nowlisteningplugin.cpp
M +4 -2 plugins/otr/kopete_otr.kcfg
M +5 -5 plugins/otr/otrguiclient.cpp
M +1 -1 plugins/otr/otrlchatinterface.cpp
M +2 -2 plugins/otr/otrplugin.cpp
M +1 -1 plugins/otr/otrpreferences.cpp
M +1 -1 plugins/privacy/privacymessagehandler.cpp
M +5 -5 plugins/privacy/privacyplugin.cpp
M +2 -2 plugins/statistics/statisticsplugin.cpp
M +1 -1 plugins/translator/translatorguiclient.cpp
M +8 -8 plugins/translator/translatorplugin.cpp
M +4 -2 plugins/urlpicpreview/urlpicpreview.kcfg
M +4 -4 protocols/bonjour/bonjouraccount.cpp
M +3 -3 protocols/bonjour/bonjourcontact.cpp
M +4 -4 protocols/gadu/gaduaccount.cpp
M +2 -2 protocols/gadu/gaducontact.cpp
M +1 -1 protocols/gadu/gadudcc.cpp
M +2 -2 protocols/gadu/gadudcctransaction.cpp
M +2 -2 protocols/gadu/gadueditcontact.cpp
M +4 -4 protocols/jabber/jabberfiletransfer.cpp
M +4 -4 protocols/jabber/jingle/jinglecallsmanager.cpp
M +3 -3 protocols/sms/services/smsclient.cpp
M +2 -2 protocols/sms/services/smssendprovider.cpp
M +1 -1 protocols/sms/smscontact.cpp
M +2 -2 protocols/winpopup/wpcontact.cpp

https://commits.kde.org/kopete/771daae4de6c643ae7846c9af456307a71be7e17

diff --git a/kopete/addaccountwizard/addaccountwizard.cpp b/kopete/addaccountwizard/addaccountwizard.cpp
index cafe34607..0d1e80b41 100644
--- a/kopete/addaccountwizard/addaccountwizard.cpp
+++ b/kopete/addaccountwizard/addaccountwizard.cpp
@@ -112,11 +112,11 @@ AddAccountWizard::AddAccountWizard(QWidget *parent, bool firstRun)
protocol_list->setFocus();

// hook up the user input
- connect(d->uiSelectService.protocolListView, SIGNAL(itemClicked(QTreeWidgetItem *,int)),
+ connect(d->uiSelectService.protocolListView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
this, SLOT(slotProtocolListClicked()));
connect(d->uiSelectService.protocolListView, SIGNAL(itemSelectionChanged()),
this, SLOT(slotProtocolListClicked()));
- connect(d->uiSelectService.protocolListView, SIGNAL(itemDoubleClicked(QTreeWidgetItem *,int)),
+ connect(d->uiSelectService.protocolListView, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
this, SLOT(slotProtocolListDoubleClicked()));
//FIXME : KDialog::setHelp(QString(),"kopete");
}
diff --git a/kopete/chatwindow/chatmessagepart.cpp b/kopete/chatwindow/chatmessagepart.cpp
index 0e4bff14c..65f5cfae6 100644
--- a/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/chatwindow/chatmessagepart.cpp
@@ -226,7 +226,7 @@ ChatMessagePart::ChatMessagePart(Kopete::ChatSession *mgr, QWidget *parent)
d->manager = mgr;
d->currentChatStyle = ChatWindowStyleManager::self()->getValidStyleFromPool(KopeteChatWindowSettings::self()->styleName());
if (d->currentChatStyle) {
- connect(d->currentChatStyle, SIGNAL(destroyed(QObject *)), this, SLOT(clearStyle()));
+ connect(d->currentChatStyle, SIGNAL(destroyed(QObject*)), this, SLOT(clearStyle()));
}

connect(this, SIGNAL(completed()), this, SLOT(slotRenderingFinished()));
@@ -423,12 +423,12 @@ void ChatMessagePart::setStyle(ChatWindowStyle *style)
{
// Change the current style
if (d->currentChatStyle) {
- disconnect(d->currentChatStyle, SIGNAL(destroyed(QObject *)), this, SLOT(clearStyle()));
+ disconnect(d->currentChatStyle, SIGNAL(destroyed(QObject*)), this, SLOT(clearStyle()));
}

d->currentChatStyle = style;
if (d->currentChatStyle) {
- connect(d->currentChatStyle, SIGNAL(destroyed(QObject *)), this, SLOT(clearStyle()));
+ connect(d->currentChatStyle, SIGNAL(destroyed(QObject*)), this, SLOT(clearStyle()));
}

// Do the actual style switch
diff --git a/kopete/chatwindow/chattexteditpart.cpp b/kopete/chatwindow/chattexteditpart.cpp
index 03511de05..d5538ae22 100644
--- a/kopete/chatwindow/chattexteditpart.cpp
+++ b/kopete/chatwindow/chattexteditpart.cpp
@@ -98,12 +98,12 @@ void ChatTextEditPart::init(Kopete::ChatSession *session, QWidget *parent)
connect(m_typingRepeatTimer, &QTimer::timeout, this, &ChatTextEditPart::slotRepeatTypingTimer);
connect(m_typingStopTimer, SIGNAL(timeout()), this, SLOT(slotStoppedTypingTimer()));

- connect(session, SIGNAL(contactAdded(const Kopete::Contact *,bool)),
- this, SLOT(slotContactAdded(const Kopete::Contact *)));
- connect(session, SIGNAL(contactRemoved(const Kopete::Contact *,QString,Qt::TextFormat,bool)),
- this, SLOT(slotContactRemoved(const Kopete::Contact *)));
- connect(session, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotContactStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ connect(session, SIGNAL(contactAdded(const Kopete::Contact*,bool)),
+ this, SLOT(slotContactAdded(const Kopete::Contact*)));
+ connect(session, SIGNAL(contactRemoved(const Kopete::Contact*,QString,Qt::TextFormat,bool)),
+ this, SLOT(slotContactRemoved(const Kopete::Contact*)));
+ connect(session, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotContactStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));

connect(Kopete::AppearanceSettings::self(), SIGNAL(appearanceChanged()),
this, SLOT(slotAppearanceChanged()));
diff --git a/kopete/chatwindow/chatview.cpp b/kopete/chatwindow/chatview.cpp
index 9ebe7101f..85bf8a8e0 100644
--- a/kopete/chatwindow/chatview.cpp
+++ b/kopete/chatwindow/chatview.cpp
@@ -139,24 +139,24 @@ ChatView::ChatView(Kopete::ChatSession *mgr, ChatWindowPlugin *parent)
//Manager signals
connect(mgr, SIGNAL(displayNameChanged()),
this, SLOT(slotChatDisplayNameChanged()));
- connect(mgr, SIGNAL(statusMessageChanged(Kopete::Contact *)),
- this, SLOT(slotStatusMessageChanged(Kopete::Contact *)));
- connect(mgr, SIGNAL(contactAdded(const Kopete::Contact *,bool)),
- this, SLOT(slotContactAdded(const Kopete::Contact *,bool)));
- connect(mgr, SIGNAL(contactRemoved(const Kopete::Contact *,QString,Qt::TextFormat,bool)),
- this, SLOT(slotContactRemoved(const Kopete::Contact *,QString,Qt::TextFormat,bool)));
- connect(mgr, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotContactStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
- connect(mgr, SIGNAL(remoteTyping(const Kopete::Contact *,bool)),
- this, SLOT(remoteTyping(const Kopete::Contact *,bool)));
+ connect(mgr, SIGNAL(statusMessageChanged(Kopete::Contact*)),
+ this, SLOT(slotStatusMessageChanged(Kopete::Contact*)));
+ connect(mgr, SIGNAL(contactAdded(const Kopete::Contact*,bool)),
+ this, SLOT(slotContactAdded(const Kopete::Contact*,bool)));
+ connect(mgr, SIGNAL(contactRemoved(const Kopete::Contact*,QString,Qt::TextFormat,bool)),
+ this, SLOT(slotContactRemoved(const Kopete::Contact*,QString,Qt::TextFormat,bool)));
+ connect(mgr, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotContactStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ connect(mgr, SIGNAL(remoteTyping(const Kopete::Contact*,bool)),
+ this, SLOT(remoteTyping(const Kopete::Contact*,bool)));
connect(mgr, SIGNAL(eventNotification(QString)),
this, SLOT(setStatusText(QString)));

//Connections to the manager and the ViewManager that every view should have
- connect(this, SIGNAL(closing(KopeteView *)),
- KopeteViewManager::viewManager(), SLOT(slotViewDestroyed(KopeteView *)));
- connect(this, SIGNAL(activated(KopeteView *)),
- KopeteViewManager::viewManager(), SLOT(slotViewActivated(KopeteView *)));
+ connect(this, SIGNAL(closing(KopeteView*)),
+ KopeteViewManager::viewManager(), SLOT(slotViewDestroyed(KopeteView*)));
+ connect(this, SIGNAL(activated(KopeteView*)),
+ KopeteViewManager::viewManager(), SLOT(slotViewActivated(KopeteView*)));
connect(this, SIGNAL(messageSent(Kopete::Message&)),
mgr, SLOT(sendMessage(Kopete::Message&)));
connect(mgr, SIGNAL(messageSuccess()),
@@ -979,7 +979,7 @@ void ChatView::dropEvent(QDropEvent *event)
void ChatView::registerContextMenuHandler(QObject *target, const char *slot)
{
connect(m_messagePart,
- SIGNAL(contextMenuEvent(Kopete::Message&,QString,QMenu *)),
+ SIGNAL(contextMenuEvent(Kopete::Message&,QString,QMenu*)),
target,
slot
);
diff --git a/kopete/chatwindow/emoticonselector.cpp b/kopete/chatwindow/emoticonselector.cpp
index 0f1f15f70..a68410c98 100644
--- a/kopete/chatwindow/emoticonselector.cpp
+++ b/kopete/chatwindow/emoticonselector.cpp
@@ -83,12 +83,12 @@ EmoticonSelector::EmoticonSelector(QWidget *parent)
m_currentMovie = new QMovie(this);
m_currentEmoticon->setMovie(m_currentMovie);

- connect(m_emoticonList, SIGNAL(itemEntered(QListWidgetItem *)),
- this, SLOT(mouseOverItem(QListWidgetItem *)));
+ connect(m_emoticonList, SIGNAL(itemEntered(QListWidgetItem*)),
+ this, SLOT(mouseOverItem(QListWidgetItem*)));
connect(m_emoticonList, SIGNAL(itemSelectionChanged()),
this, SLOT(currentChanged()));
- connect(m_emoticonList, SIGNAL(itemClicked(QListWidgetItem *)),
- this, SLOT(emoticonClicked(QListWidgetItem *)));
+ connect(m_emoticonList, SIGNAL(itemClicked(QListWidgetItem*)),
+ this, SLOT(emoticonClicked(QListWidgetItem*)));
}

void EmoticonSelector::prepareList(void)
diff --git a/kopete/chatwindow/kopetechatwindow.cpp b/kopete/chatwindow/kopetechatwindow.cpp
index a70343f22..c7fa9e9e5 100644
--- a/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/chatwindow/kopetechatwindow.cpp
@@ -215,7 +215,7 @@ KopeteChatWindow::KopeteChatWindow(Kopete::ChatSession::Form form, QWidget *pare

ChatSessionMembersListModel *members_model = new ChatSessionMembersListModel(this);

- connect(this, SIGNAL(chatSessionChanged(Kopete::ChatSession *)), members_model, SLOT(setChatSession(Kopete::ChatSession *)));
+ connect(this, SIGNAL(chatSessionChanged(Kopete::ChatSession*)), members_model, SLOT(setChatSession(Kopete::ChatSession*)));

ChatMembersListView *chatmembers = new ChatMembersListView(m_participantsWidget);
chatmembers->setModel(members_model);
@@ -434,12 +434,12 @@ void KopeteChatWindow::initActions(void)
actionDetachMenu->setDelayed(false);

connect(actionDetachMenu->menu(), SIGNAL(aboutToShow()), this, SLOT(slotPrepareDetachMenu()));
- connect(actionDetachMenu->menu(), SIGNAL(triggered(QAction *)), this, SLOT(slotDetachChat(QAction *)));
+ connect(actionDetachMenu->menu(), SIGNAL(triggered(QAction*)), this, SLOT(slotDetachChat(QAction*)));

actionTabPlacementMenu = new KActionMenu(i18n("&Tab Placement"), coll);
coll->addAction(QStringLiteral("tabs_placement"), actionTabPlacementMenu);
connect(actionTabPlacementMenu->menu(), SIGNAL(aboutToShow()), this, SLOT(slotPreparePlacementMenu()));
- connect(actionTabPlacementMenu->menu(), SIGNAL(triggered(QAction *)), this, SLOT(slotPlaceTabs(QAction *)));
+ connect(actionTabPlacementMenu->menu(), SIGNAL(triggered(QAction*)), this, SLOT(slotPlaceTabs(QAction*)));

coll->setDefaultShortcut(tabDetach, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B));

@@ -673,7 +673,7 @@ void KopeteChatWindow::createTabBar()
m_tabBar->setTabsClosable(cg.readEntry(QStringLiteral("HoverClose"), true));
m_tabBar->setMovable(true);
m_tabBar->setAutomaticResizeTabs(true);
- connect(m_tabBar, SIGNAL(closeRequest(QWidget *)), this, SLOT(slotCloseChat(QWidget *)));
+ connect(m_tabBar, SIGNAL(closeRequest(QWidget*)), this, SLOT(slotCloseChat(QWidget*)));

m_UpdateChatLabel = cg.readEntry(QStringLiteral("ShowContactName"), true);

@@ -691,10 +691,10 @@ void KopeteChatWindow::createTabBar()
addTab(*it);
}

- connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent *,bool&)), this, SLOT(testCanDecode(const QDragMoveEvent *,bool&)));
- connect(m_tabBar, SIGNAL(receivedDropEvent(QWidget *,QDropEvent *)), this, SLOT(receivedDropEvent(QWidget *,QDropEvent *)));
- connect(m_tabBar, SIGNAL(currentChanged(QWidget *)), this, SLOT(setActiveView(QWidget *)));
- connect(m_tabBar, SIGNAL(contextMenu(QWidget *,QPoint)), this, SLOT(slotTabContextMenu(QWidget *,QPoint)));
+ connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*,bool&)), this, SLOT(testCanDecode(const QDragMoveEvent*,bool&)));
+ connect(m_tabBar, SIGNAL(receivedDropEvent(QWidget*,QDropEvent*)), this, SLOT(receivedDropEvent(QWidget*,QDropEvent*)));
+ connect(m_tabBar, SIGNAL(currentChanged(QWidget*)), this, SLOT(setActiveView(QWidget*)));
+ connect(m_tabBar, SIGNAL(contextMenu(QWidget*,QPoint)), this, SLOT(slotTabContextMenu(QWidget*,QPoint)));

if (m_activeView) {
m_tabBar->setCurrentWidget(m_activeView);
@@ -735,7 +735,7 @@ void KopeteChatWindow::addTab(ChatView *view)

m_tabBar->addTab(view, pluginIcon, QLatin1String(""));
view->setVisible(view == m_activeView);
- connect(view, SIGNAL(updateStatusIcon(ChatView *)), this, SLOT(slotUpdateCaptionIcons(ChatView *)));
+ connect(view, SIGNAL(updateStatusIcon(ChatView*)), this, SLOT(slotUpdateCaptionIcons(ChatView*)));

if (m_UpdateChatLabel) {
connect(view, SIGNAL(captionChanged(bool)), this, SLOT(updateChatLabel()));
@@ -759,8 +759,8 @@ void KopeteChatWindow::setPrimaryChatView(ChatView *view)
void KopeteChatWindow::deleteTabBar()
{
if (m_tabBar) {
- disconnect(m_tabBar, SIGNAL(currentChanged(QWidget *)), this, SLOT(setActiveView(QWidget *)));
- disconnect(m_tabBar, SIGNAL(contextMenu(QWidget *,QPoint)), this, SLOT(slotTabContextMenu(QWidget *,QPoint)));
+ disconnect(m_tabBar, SIGNAL(currentChanged(QWidget*)), this, SLOT(setActiveView(QWidget*)));
+ disconnect(m_tabBar, SIGNAL(contextMenu(QWidget*,QPoint)), this, SLOT(slotTabContextMenu(QWidget*,QPoint)));

if (!chatViewList.isEmpty()) {
setPrimaryChatView(chatViewList.first());
@@ -791,17 +791,17 @@ void KopeteChatWindow::attachChatView(ChatView *newView)

KCursor::setAutoHideCursor(newView->editWidget(), true, true);
connect(newView, SIGNAL(captionChanged(bool)), this, SLOT(slotSetCaption(bool)));
- connect(newView, SIGNAL(messageSuccess(ChatView *)), this, SLOT(slotStopAnimation(ChatView *)));
- connect(newView, SIGNAL(updateStatusIcon(ChatView *)), this, SLOT(slotUpdateCaptionIcons(ChatView *)));
+ connect(newView, SIGNAL(messageSuccess(ChatView*)), this, SLOT(slotStopAnimation(ChatView*)));
+ connect(newView, SIGNAL(updateStatusIcon(ChatView*)), this, SLOT(slotUpdateCaptionIcons(ChatView*)));

if (m_UpdateChatLabel) {
- connect(newView, SIGNAL(updateChatState(ChatView *,int)), this, SLOT(updateChatState(ChatView *,int)));
+ connect(newView, SIGNAL(updateChatState(ChatView*,int)), this, SLOT(updateChatState(ChatView*,int)));
}

updateActions();
checkDetachEnable();
- connect(newView, SIGNAL(autoSpellCheckEnabled(ChatView *,bool)),
- this, SLOT(slotAutoSpellCheckEnabled(ChatView *,bool)));
+ connect(newView, SIGNAL(autoSpellCheckEnabled(ChatView*,bool)),
+ this, SLOT(slotAutoSpellCheckEnabled(ChatView*,bool)));
}

void KopeteChatWindow::checkDetachEnable()
@@ -823,8 +823,8 @@ void KopeteChatWindow::detachChatView(ChatView *view)
chatViewList.removeAt(chatViewList.indexOf(view));

disconnect(view, SIGNAL(captionChanged(bool)), this, SLOT(slotSetCaption(bool)));
- disconnect(view, SIGNAL(updateStatusIcon(ChatView *)), this, SLOT(slotUpdateCaptionIcons(ChatView *)));
- disconnect(view, SIGNAL(updateChatState(ChatView *,int)), this, SLOT(updateChatState(ChatView *,int)));
+ disconnect(view, SIGNAL(updateStatusIcon(ChatView*)), this, SLOT(slotUpdateCaptionIcons(ChatView*)));
+ disconnect(view, SIGNAL(updateChatState(ChatView*,int)), this, SLOT(updateChatState(ChatView*,int)));
view->editWidget()->removeEventFilter(this);

if (m_tabBar) {
diff --git a/kopete/chatwindow/kopetechatwindowsettings.kcfg b/kopete/chatwindow/kopetechatwindowsettings.kcfg
index 806c6140e..2cc57d6a4 100644
--- a/kopete/chatwindow/kopetechatwindowsettings.kcfg
+++ b/kopete/chatwindow/kopetechatwindowsettings.kcfg
@@ -5,9 +5,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kopeterc"/>
<include>kglobalsettings.h</include>
<include>kcolorscheme.h</include>
+ <kcfgfile name="kopeterc"/>

<!-- Define the available signals to emit -->
<signal name="chatwindowAppearanceChanged">
diff --git a/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/chatwindow/kopeteemailwindow.cpp
index ec32b361f..e9adf4797 100644
--- a/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/chatwindow/kopeteemailwindow.cpp
@@ -150,10 +150,10 @@ KopeteEmailWindow::KopeteEmailWindow(Kopete::ChatSession *manager, EmailWindowPl
manager, SLOT(typing(bool)));

//Connections to the manager and the ViewManager that every view should have
- connect(this, SIGNAL(closing(KopeteView *)),
- KopeteViewManager::viewManager(), SLOT(slotViewDestroyed(KopeteView *)));
- connect(this, SIGNAL(activated(KopeteView *)),
- KopeteViewManager::viewManager(), SLOT(slotViewActivated(KopeteView *)));
+ connect(this, SIGNAL(closing(KopeteView*)),
+ KopeteViewManager::viewManager(), SLOT(slotViewDestroyed(KopeteView*)));
+ connect(this, SIGNAL(activated(KopeteView*)),
+ KopeteViewManager::viewManager(), SLOT(slotViewActivated(KopeteView*)));
connect(this, SIGNAL(messageSent(Kopete::Message&)),
manager, SLOT(sendMessage(Kopete::Message&)));
connect(manager, SIGNAL(messageSuccess()),
diff --git a/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/config/accounts/kopeteaccountconfig.cpp
index 036b46945..e4446a49a 100644
--- a/kopete/config/accounts/kopeteaccountconfig.cpp
+++ b/kopete/config/accounts/kopeteaccountconfig.cpp
@@ -69,13 +69,13 @@ KopeteAccountConfig::KopeteAccountConfig(QWidget *parent, const QVariantList &ar

connect(mAccountList, SIGNAL(itemPositionChanged()), this, SLOT(changed()));
connect(mAccountList, SIGNAL(itemSelectionChanged()), this, SLOT(slotItemSelected()));
- connect(mAccountList, SIGNAL(itemDoubleClicked(QTreeWidgetItem *,int)), this, SLOT(slotModify()));
- connect(mAccountList, SIGNAL(itemChanged(QTreeWidgetItem *,int)), this, SLOT(slotItemChanged(QTreeWidgetItem *)));
- connect(mAccountList, SIGNAL(itemClicked(QTreeWidgetItem *,int)), this, SLOT(slotItemClicked(QTreeWidgetItem *,int)));
+ connect(mAccountList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(slotModify()));
+ connect(mAccountList, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemChanged(QTreeWidgetItem*)));
+ connect(mAccountList, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(slotItemClicked(QTreeWidgetItem*,int)));

// this ensures that newly created accounts are assigned to the selected identity
- connect(Kopete::AccountManager::self(), SIGNAL(accountRegistered(Kopete::Account *)), this, SLOT(slotAccountAdded(Kopete::Account *)));
- connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account *)), this, SLOT(slotAccountRemoved(const Kopete::Account *)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountRegistered(Kopete::Account*)), this, SLOT(slotAccountAdded(Kopete::Account*)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account*)), this, SLOT(slotAccountRemoved(const Kopete::Account*)));

mAccountList->installEventFilter(this);

@@ -197,8 +197,8 @@ void KopeteAccountConfig::load()
lvi->setFlags((lvi->flags() & ~Qt::ItemIsDropEnabled) | Qt::ItemIsUserCheckable);
lvi->setCheckState(0, account->excludeConnect() ? Qt::Unchecked : Qt::Checked);

- connect(account->myself(), SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotOnlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ connect(account->myself(), SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotOnlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));
}

changed(false);
diff --git a/kopete/config/appearance/contactlistlayouteditwidget.cpp b/kopete/config/appearance/contactlistlayouteditwidget.cpp
index 37653eac8..1e2282322 100644
--- a/kopete/config/appearance/contactlistlayouteditwidget.cpp
+++ b/kopete/config/appearance/contactlistlayouteditwidget.cpp
@@ -38,7 +38,7 @@ LayoutEditWidget::LayoutEditWidget(QWidget *parent)
m_tokenFactory = new ContactListTokenFactory;
m_tokenDropTarget = new TokenDropTarget(QStringLiteral("application/x-kopete-contactlist-token"), this);
m_tokenDropTarget->setCustomTokenFactory(m_tokenFactory);
- connect(m_tokenDropTarget, SIGNAL(focussed(QWidget *)), this, SIGNAL(focussed(QWidget *)));
+ connect(m_tokenDropTarget, SIGNAL(focussed(QWidget*)), this, SIGNAL(focussed(QWidget*)));
connect(m_tokenDropTarget, SIGNAL(changed()), this, SIGNAL(changed()));

m_showIconCheckBox = new QCheckBox(i18n("Show Icon"), this);
diff --git a/kopete/contactlist/contactlistmodel.cpp b/kopete/contactlist/contactlistmodel.cpp
index 82ef718c8..9d1869935 100644
--- a/kopete/contactlist/contactlistmodel.cpp
+++ b/kopete/contactlist/contactlistmodel.cpp
@@ -59,8 +59,8 @@ ContactListModel::ContactListModel(QObject *parent)
m_manualMetaContactSorting = (as->contactListMetaContactSorting() == AppearanceSettings::EnumContactListMetaContactSorting::Manual);
connect(AppearanceSettings::self(), SIGNAL(configChanged()), this, SLOT(appearanceConfigChanged()));

- connect(Kopete::ChatSessionManager::self(), SIGNAL(newEvent(Kopete::MessageEvent *)),
- this, SLOT(newMessageEvent(Kopete::MessageEvent *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(newEvent(Kopete::MessageEvent*)),
+ this, SLOT(newMessageEvent(Kopete::MessageEvent*)));
}

// Can't be in constructor because we can't call virtual method loadContactList from constructor
@@ -262,10 +262,10 @@ bool ContactListModel::saveModelSettings(const QString &modelType)

void ContactListModel::addMetaContact(Kopete::MetaContact *contact)
{
- connect(contact, SIGNAL(onlineStatusChanged(Kopete::MetaContact *,Kopete::OnlineStatus::StatusType)),
- this, SLOT(handleContactDataChange(Kopete::MetaContact *)));
- connect(contact, SIGNAL(statusMessageChanged(Kopete::MetaContact *)),
- this, SLOT(handleContactDataChange(Kopete::MetaContact *)));
+ connect(contact, SIGNAL(onlineStatusChanged(Kopete::MetaContact*,Kopete::OnlineStatus::StatusType)),
+ this, SLOT(handleContactDataChange(Kopete::MetaContact*)));
+ connect(contact, SIGNAL(statusMessageChanged(Kopete::MetaContact*)),
+ this, SLOT(handleContactDataChange(Kopete::MetaContact*)));
connect(contact, SIGNAL(displayNameChanged(QString,QString)),
this, SLOT(handleContactDataChange()));
connect(contact, SIGNAL(photoChanged()),
@@ -274,10 +274,10 @@ void ContactListModel::addMetaContact(Kopete::MetaContact *contact)

void ContactListModel::removeMetaContact(Kopete::MetaContact *contact)
{
- disconnect(contact, SIGNAL(onlineStatusChanged(Kopete::MetaContact *,Kopete::OnlineStatus::StatusType)),
- this, SLOT(handleContactDataChange(Kopete::MetaContact *)));
- disconnect(contact, SIGNAL(statusMessageChanged(Kopete::MetaContact *)),
- this, SLOT(handleContactDataChange(Kopete::MetaContact *)));
+ disconnect(contact, SIGNAL(onlineStatusChanged(Kopete::MetaContact*,Kopete::OnlineStatus::StatusType)),
+ this, SLOT(handleContactDataChange(Kopete::MetaContact*)));
+ disconnect(contact, SIGNAL(statusMessageChanged(Kopete::MetaContact*)),
+ this, SLOT(handleContactDataChange(Kopete::MetaContact*)));
disconnect(contact, SIGNAL(displayNameChanged(QString,QString)),
this, SLOT(handleContactDataChange()));
disconnect(contact, SIGNAL(photoChanged()),
@@ -320,24 +320,24 @@ void ContactListModel::loadContactList()
disconnect(kcl, SIGNAL(contactListLoaded()), this, SLOT(loadContactList()));

// MetaContact related
- connect(kcl, SIGNAL(metaContactAdded(Kopete::MetaContact *)),
- this, SLOT(addMetaContact(Kopete::MetaContact *)));
- connect(kcl, SIGNAL(metaContactRemoved(Kopete::MetaContact *)),
- this, SLOT(removeMetaContact(Kopete::MetaContact *)));
+ connect(kcl, SIGNAL(metaContactAdded(Kopete::MetaContact*)),
+ this, SLOT(addMetaContact(Kopete::MetaContact*)));
+ connect(kcl, SIGNAL(metaContactRemoved(Kopete::MetaContact*)),
+ this, SLOT(removeMetaContact(Kopete::MetaContact*)));

// Group related
- connect(kcl, SIGNAL(groupAdded(Kopete::Group *)),
- this, SLOT(addGroup(Kopete::Group *)));
- connect(kcl, SIGNAL(groupRemoved(Kopete::Group *)),
- this, SLOT(removeGroup(Kopete::Group *)));
+ connect(kcl, SIGNAL(groupAdded(Kopete::Group*)),
+ this, SLOT(addGroup(Kopete::Group*)));
+ connect(kcl, SIGNAL(groupRemoved(Kopete::Group*)),
+ this, SLOT(removeGroup(Kopete::Group*)));

// MetaContact and Group related
- connect(kcl, SIGNAL(metaContactAddedToGroup(Kopete::MetaContact *,Kopete::Group *)),
- this, SLOT(addMetaContactToGroup(Kopete::MetaContact *,Kopete::Group *)));
- connect(kcl, SIGNAL(metaContactRemovedFromGroup(Kopete::MetaContact *,Kopete::Group *)),
- this, SLOT(removeMetaContactFromGroup(Kopete::MetaContact *,Kopete::Group *)));
- connect(kcl, SIGNAL(metaContactMovedToGroup(Kopete::MetaContact *,Kopete::Group *,Kopete::Group *)),
- this, SLOT(moveMetaContactToGroup(Kopete::MetaContact *,Kopete::Group *,Kopete::Group *)));
+ connect(kcl, SIGNAL(metaContactAddedToGroup(Kopete::MetaContact*,Kopete::Group*)),
+ this, SLOT(addMetaContactToGroup(Kopete::MetaContact*,Kopete::Group*)));
+ connect(kcl, SIGNAL(metaContactRemovedFromGroup(Kopete::MetaContact*,Kopete::Group*)),
+ this, SLOT(removeMetaContactFromGroup(Kopete::MetaContact*,Kopete::Group*)));
+ connect(kcl, SIGNAL(metaContactMovedToGroup(Kopete::MetaContact*,Kopete::Group*,Kopete::Group*)),
+ this, SLOT(moveMetaContactToGroup(Kopete::MetaContact*,Kopete::Group*,Kopete::Group*)));
}

void ContactListModel::handleContactDataChange()
@@ -359,8 +359,8 @@ void ContactListModel::newMessageEvent(Kopete::MessageEvent *event)
return;
}

- connect(event, SIGNAL(done(Kopete::MessageEvent *)),
- this, SLOT(newMessageEventDone(Kopete::MessageEvent *)));
+ connect(event, SIGNAL(done(Kopete::MessageEvent*)),
+ this, SLOT(newMessageEventDone(Kopete::MessageEvent*)));

bool firstEvent = m_newMessageMetaContactSet[mc].isEmpty();
m_newMessageMetaContactSet[mc].insert(event);
diff --git a/kopete/contactlist/kabcexport.cpp b/kopete/contactlist/kabcexport.cpp
index f3f7eb39d..f98c6fe3d 100644
--- a/kopete/contactlist/kabcexport.cpp
+++ b/kopete/contactlist/kabcexport.cpp
@@ -61,8 +61,8 @@ KabcExportWizard::KabcExportWizard(QWidget *parent)
m_page2.setupUi(page2Widget);
m_page2WidgetItem = addPage(page2Widget, i18n("Select Contact"));

- connect(m_page1.addrBooks, SIGNAL(currentItemChanged(QListWidgetItem *,QListWidgetItem *)),
- SLOT(slotResourceSelectionChanged(QListWidgetItem *)));
+ connect(m_page1.addrBooks, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+ SLOT(slotResourceSelectionChanged(QListWidgetItem*)));

connect(m_page2.btnSelectAll, SIGNAL(clicked()), SLOT(slotSelectAll()));
connect(m_page2.btnDeselectAll, SIGNAL(clicked()), SLOT(slotDeselectAll()));
diff --git a/kopete/contactlist/kopetecontactlistview.cpp b/kopete/contactlist/kopetecontactlistview.cpp
index d9d57de06..912f3e28e 100644
--- a/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/contactlist/kopetecontactlistview.cpp
@@ -207,10 +207,10 @@ void KopeteContactListView::initActions(KActionCollection *ac)

// connect( Kopete::ContactList::self(), SIGNAL(metaContactSelected(bool)), this, SLOT(slotMetaContactSelected(bool)) );

- connect(Kopete::AccountManager::self(), SIGNAL(accountRegistered(Kopete::Account *)),
- this, SLOT(addToAddContactMenu(Kopete::Account *)));
- connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account *)),
- this, SLOT(removeToAddContactMenu(const Kopete::Account *)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountRegistered(Kopete::Account*)),
+ this, SLOT(addToAddContactMenu(Kopete::Account*)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account*)),
+ this, SLOT(removeToAddContactMenu(const Kopete::Account*)));

d->actionProperties = new QAction(QIcon::fromTheme(QStringLiteral("user-properties")), i18n("&Properties"), ac);
ac->addAction(QStringLiteral("contactProperties"), d->actionProperties);
@@ -767,14 +767,14 @@ void KopeteContactListView::selectionChanged(const QItemSelection &selected, con
updateActions();

if (d->selectedMetaContact) { // Delete previous connection
- disconnect(d->selectedMetaContact, SIGNAL(onlineStatusChanged(Kopete::MetaContact *,Kopete::OnlineStatus::StatusType)),
+ disconnect(d->selectedMetaContact, SIGNAL(onlineStatusChanged(Kopete::MetaContact*,Kopete::OnlineStatus::StatusType)),
this, SLOT(updateMetaContactActions()));
d->selectedMetaContact = 0;
}

if (contacts.count() == 1 && groups.empty()) {
d->selectedMetaContact = contacts.values().first();
- connect(d->selectedMetaContact, SIGNAL(onlineStatusChanged(Kopete::MetaContact *,Kopete::OnlineStatus::StatusType)),
+ connect(d->selectedMetaContact, SIGNAL(onlineStatusChanged(Kopete::MetaContact*,Kopete::OnlineStatus::StatusType)),
this, SLOT(updateMetaContactActions()));
}

diff --git a/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/contactlist/kopetegrouplistaction.cpp
index f8e7bd4e0..56cae8cec 100644
--- a/kopete/contactlist/kopetegrouplistaction.cpp
+++ b/kopete/contactlist/kopetegrouplistaction.cpp
@@ -36,9 +36,9 @@ KopeteGroupListAction::KopeteGroupListAction(const QString &text, const QString
connect(this, SIGNAL(triggered(int)), receiver, slot);
}

- connect(Kopete::ContactList::self(), SIGNAL(groupAdded(Kopete::Group *)), this, SLOT(slotUpdateList()));
- connect(Kopete::ContactList::self(), SIGNAL(groupRemoved(Kopete::Group *)), this, SLOT(slotUpdateList()));
- connect(Kopete::ContactList::self(), SIGNAL(groupRenamed(Kopete::Group *,QString)), this, SLOT(slotUpdateList()));
+ connect(Kopete::ContactList::self(), SIGNAL(groupAdded(Kopete::Group*)), this, SLOT(slotUpdateList()));
+ connect(Kopete::ContactList::self(), SIGNAL(groupRemoved(Kopete::Group*)), this, SLOT(slotUpdateList()));
+ connect(Kopete::ContactList::self(), SIGNAL(groupRenamed(Kopete::Group*,QString)), this, SLOT(slotUpdateList()));
slotUpdateList();
}

diff --git a/kopete/contactlist/kopetelviprops.cpp b/kopete/contactlist/kopetelviprops.cpp
index 20b194f0a..882c40629 100644
--- a/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/contactlist/kopetelviprops.cpp
@@ -597,8 +597,8 @@ void KopeteMetaLVIProps::slotOpenSoundDialog(KUrlRequester *requester)
{
// taken from kdelibs/kio/kfile/knotifydialog.cpp
// only need to init this once
- requester->disconnect(SIGNAL(openFileDialog(KUrlRequester *)),
- this, SLOT(slotOpenSoundDialog(KUrlRequester *)));
+ requester->disconnect(SIGNAL(openFileDialog(KUrlRequester*)),
+ this, SLOT(slotOpenSoundDialog(KUrlRequester*)));

QFileDialog *fileDialog = requester->fileDialog();
fileDialog->setWindowTitle(i18n("Select Sound File"));
diff --git a/kopete/identity/accountidentitydialog.cpp b/kopete/identity/accountidentitydialog.cpp
index c309b870b..13fc88f03 100644
--- a/kopete/identity/accountidentitydialog.cpp
+++ b/kopete/identity/accountidentitydialog.cpp
@@ -62,21 +62,21 @@ AccountIdentityDialog::AccountIdentityDialog(QWidget *parent)
header->setVisible(false);

// hook up the user input
- connect(d->ui.identityList, SIGNAL(itemClicked(QTreeWidgetItem *,int)),
+ connect(d->ui.identityList, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
this, SLOT(slotValidate()));
connect(d->ui.identityList, SIGNAL(itemSelectionChanged()),
this, SLOT(slotValidate()));
- connect(d->ui.identityList, SIGNAL(itemDoubleClicked(QTreeWidgetItem *,int)),
+ connect(d->ui.identityList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
this, SLOT(slotIdentityListDoubleClicked()));

// identity manager signals
Kopete::IdentityManager *manager = Kopete::IdentityManager::self();
- connect(manager, SIGNAL(identityRegistered(Kopete::Identity *)), this, SLOT(slotLoadIdentities()));
- connect(manager, SIGNAL(identityUnregistered(const Kopete::Identity *)), this, SLOT(slotLoadIdentities()));
+ connect(manager, SIGNAL(identityRegistered(Kopete::Identity*)), this, SLOT(slotLoadIdentities()));
+ connect(manager, SIGNAL(identityUnregistered(const Kopete::Identity*)), this, SLOT(slotLoadIdentities()));

// account manager signals
Kopete::AccountManager *acmanager = Kopete::AccountManager::self();
- connect(acmanager, SIGNAL(accountOnlineStatusChanged(Kopete::Account *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ connect(acmanager, SIGNAL(accountOnlineStatusChanged(Kopete::Account*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
this, SLOT(slotLoadAccounts()));
slotLoadIdentities();
slotValidate();
diff --git a/kopete/identity/identitystatuswidget.cpp b/kopete/identity/identitystatuswidget.cpp
index 6a921535d..ce3fcffa3 100644
--- a/kopete/identity/identitystatuswidget.cpp
+++ b/kopete/identity/identitystatuswidget.cpp
@@ -74,20 +74,20 @@ IdentityStatusWidget::IdentityStatusWidget(Kopete::Identity *identity, QWidget *
// user input signals
connect(d->ui.accounts, SIGNAL(customContextMenuRequested(QPoint)),
this, SLOT(showAccountContextMenu(QPoint)));
- connect(d->ui.accounts, SIGNAL(itemClicked(QListWidgetItem *)),
- this, SLOT(slotAccountClicked(QListWidgetItem *)));
- connect(d->ui.accounts, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
- this, SLOT(slotAccountDoubleClicked(QListWidgetItem *)));
+ connect(d->ui.accounts, SIGNAL(itemClicked(QListWidgetItem*)),
+ this, SLOT(slotAccountClicked(QListWidgetItem*)));
+ connect(d->ui.accounts, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
+ this, SLOT(slotAccountDoubleClicked(QListWidgetItem*)));
connect(d->ui.photo, SIGNAL(clicked()),
this, SLOT(slotPhotoClicked()));

- connect(Kopete::AccountManager::self(), SIGNAL(accountRegistered(Kopete::Account *)),
- this, SLOT(slotAccountRegistered(Kopete::Account *)));
- connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account *)),
- this, SLOT(slotAccountUnregistered(const Kopete::Account *)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountRegistered(Kopete::Account*)),
+ this, SLOT(slotAccountRegistered(Kopete::Account*)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account*)),
+ this, SLOT(slotAccountUnregistered(const Kopete::Account*)));

- connect(Kopete::IdentityManager::self(), SIGNAL(identityUnregistered(const Kopete::Identity *)),
- this, SLOT(slotIdentityUnregistered(const Kopete::Identity *)));
+ connect(Kopete::IdentityManager::self(), SIGNAL(identityUnregistered(const Kopete::Identity*)),
+ this, SLOT(slotIdentityUnregistered(const Kopete::Identity*)));

d->ui.accounts->viewport()->installEventFilter(this);
}
@@ -105,20 +105,20 @@ void IdentityStatusWidget::setIdentity(Kopete::Identity *identity)

if (d->identity) {
// if we were showing an identity before, disconnect the signal to handle updates
- disconnect(d->identity, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- this, SLOT(slotIdentityPropertyChanged(Kopete::PropertyContainer *)));
- disconnect(d->identity, SIGNAL(identityChanged(Kopete::Identity *)),
- this, SLOT(slotIdentityChanged(Kopete::Identity *)));
+ disconnect(d->identity, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ this, SLOT(slotIdentityPropertyChanged(Kopete::PropertyContainer*)));
+ disconnect(d->identity, SIGNAL(identityChanged(Kopete::Identity*)),
+ this, SLOT(slotIdentityChanged(Kopete::Identity*)));
}
d->identity = identity;
load();

if (d->identity) {
// Handle identity changes
- connect(d->identity, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- this, SLOT(slotIdentityPropertyChanged(Kopete::PropertyContainer *)));
- connect(d->identity, SIGNAL(identityChanged(Kopete::Identity *)),
- this, SLOT(slotIdentityChanged(Kopete::Identity *)));
+ connect(d->identity, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ this, SLOT(slotIdentityPropertyChanged(Kopete::PropertyContainer*)));
+ connect(d->identity, SIGNAL(identityChanged(Kopete::Identity*)),
+ this, SLOT(slotIdentityChanged(Kopete::Identity*)));
}
}

@@ -255,8 +255,8 @@ void IdentityStatusWidget::addAccountItem(Kopete::Account *account)
}

connect(account->myself(),
- SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotAccountStatusIconChanged(Kopete::Contact *)));
+ SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotAccountStatusIconChanged(Kopete::Contact*)));

QListWidgetItem *item = new QListWidgetItem(account->accountIcon(), account->accountLabel(), d->ui.accounts);
d->accountHash.insert(item, account);
diff --git a/kopete/infoeventwidget.cpp b/kopete/infoeventwidget.cpp
index d70d953c4..fb53bd883 100644
--- a/kopete/infoeventwidget.cpp
+++ b/kopete/infoeventwidget.cpp
@@ -60,7 +60,7 @@ InfoEventWidget::InfoEventWidget(QWidget *parent)
d->currentEventIndex = 0;
d->enableUpdates = false;
connect(Kopete::InfoEventManager::self(), SIGNAL(changed()), this, SLOT(updateInfo()));
- connect(Kopete::InfoEventManager::self(), SIGNAL(eventAdded(Kopete::InfoEvent *)), this, SLOT(eventAdded(Kopete::InfoEvent *)));
+ connect(Kopete::InfoEventManager::self(), SIGNAL(eventAdded(Kopete::InfoEvent*)), this, SLOT(eventAdded(Kopete::InfoEvent*)));
connect(d->ui.lblActions, SIGNAL(linkActivated(QString)), this, SLOT(linkClicked(QString)));
connect(d->ui.buttonPrev, SIGNAL(clicked(bool)), this, SLOT(prevInfoEvent()));
connect(d->ui.buttonNext, SIGNAL(clicked(bool)), this, SLOT(nextInfoEvent()));
diff --git a/kopete/kopeteaccountstatusbaricon.cpp b/kopete/kopeteaccountstatusbaricon.cpp
index 7e853778c..fdda40c73 100644
--- a/kopete/kopeteaccountstatusbaricon.cpp
+++ b/kopete/kopeteaccountstatusbaricon.cpp
@@ -37,7 +37,7 @@ KopeteAccountStatusBarIcon::KopeteAccountStatusBarIcon(Kopete::Account *account,
setCursor(QCursor(Qt::PointingHandCursor));

connect(account, SIGNAL(colorChanged(QColor)), this, SLOT(statusIconChanged()));
- connect(account->myself(), SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ connect(account->myself(), SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
this, SLOT(statusIconChanged()));

statusIconChanged();
diff --git a/kopete/kopetedbusinterface_p.cpp b/kopete/kopetedbusinterface_p.cpp
index ed01ce2f8..7f825133f 100644
--- a/kopete/kopetedbusinterface_p.cpp
+++ b/kopete/kopetedbusinterface_p.cpp
@@ -30,22 +30,22 @@ ContactStalker::ContactStalker(Kopete::MetaContact *contact)
{
m_contact = contact;
QObject::connect(Kopete::ContactList::self(),
- SIGNAL(metaContactRemoved(Kopete::MetaContact *)),
- this, SLOT(slotMetaContactRemoved(Kopete::MetaContact *)));
- QObject::connect(contact, SIGNAL(onlineStatusChanged(Kopete::MetaContact *,Kopete::OnlineStatus::StatusType)),
+ SIGNAL(metaContactRemoved(Kopete::MetaContact*)),
+ this, SLOT(slotMetaContactRemoved(Kopete::MetaContact*)));
+ QObject::connect(contact, SIGNAL(onlineStatusChanged(Kopete::MetaContact*,Kopete::OnlineStatus::StatusType)),
this, SLOT(slotEmitSignalDelayed()));
QObject::connect(contact, SIGNAL(displayNameChanged(QString,QString)),
this, SLOT(slotEmitSignalDelayed()));
QObject::connect(contact, SIGNAL(photoChanged()),
this, SLOT(slotEmitSignalDelayed()));
- QObject::connect(contact, SIGNAL(contactAdded(Kopete::Contact *)),
+ QObject::connect(contact, SIGNAL(contactAdded(Kopete::Contact*)),
this, SLOT(slotEmitSignalDelayed()));
- QObject::connect(contact, SIGNAL(contactRemoved(Kopete::Contact *)),
+ QObject::connect(contact, SIGNAL(contactRemoved(Kopete::Contact*)),
this, SLOT(slotEmitSignalDelayed()));

QObject::connect(Kopete::ChatSessionManager::self(),
- SIGNAL(display(Kopete::Message&,Kopete::ChatSession *)),
- this, SLOT(messageAppended(Kopete::Message&,Kopete::ChatSession *)));
+ SIGNAL(display(Kopete::Message&,Kopete::ChatSession*)),
+ this, SLOT(messageAppended(Kopete::Message&,Kopete::ChatSession*)));

m_lastChange = QTime::currentTime();
slotEmitSignal();
@@ -81,7 +81,7 @@ void ContactStalker::messageAppended(Kopete::Message &message, Kopete::ChatSessi
foreach (Kopete::Contact *subContact, m_contact->contacts()) {
QList<Kopete::MessageEvent *> pendingMessages = KopeteViewManager::viewManager()->pendingMessages(subContact);
foreach (Kopete::MessageEvent *event, pendingMessages) {
- connect(event, SIGNAL(done(Kopete::MessageEvent *)), this, SLOT(slotEmitSignalDelayed()));
+ connect(event, SIGNAL(done(Kopete::MessageEvent*)), this, SLOT(slotEmitSignalDelayed()));
}
}

@@ -101,8 +101,8 @@ void ContactStalker::slotMetaContactRemoved(Kopete::MetaContact *contact)
KopeteDBusInterfacePrivate::KopeteDBusInterfacePrivate()
{
QObject::connect(Kopete::ContactList::self(),
- SIGNAL(metaContactAdded(Kopete::MetaContact *)),
- this, SLOT(slotMetaContactAdded(Kopete::MetaContact *)));
+ SIGNAL(metaContactAdded(Kopete::MetaContact*)),
+ this, SLOT(slotMetaContactAdded(Kopete::MetaContact*)));

foreach (Kopete::MetaContact *contact, Kopete::ContactList::self()->metaContacts()) {
this->slotMetaContactAdded(contact);
diff --git a/kopete/kopeteidentitystatusbaricon.cpp b/kopete/kopeteidentitystatusbaricon.cpp
index a89b5991f..032548478 100644
--- a/kopete/kopeteidentitystatusbaricon.cpp
+++ b/kopete/kopeteidentitystatusbaricon.cpp
@@ -51,8 +51,8 @@ void KopeteIdentityStatusBarIcon::mousePressEvent(QMouseEvent *me)

connect(statusAction, SIGNAL(changeStatus(uint,Kopete::StatusMessage)),
m_identity, SLOT(setOnlineStatus(uint,Kopete::StatusMessage)));
- connect(statusAction, SIGNAL(updateMessage(Kopete::StatusRootAction *)),
- this, SLOT(updateMessage(Kopete::StatusRootAction *)));
+ connect(statusAction, SIGNAL(updateMessage(Kopete::StatusRootAction*)),
+ this, SLOT(updateMessage(Kopete::StatusRootAction*)));
connect(statusAction, SIGNAL(changeMessage(Kopete::StatusMessage)),
m_identity, SLOT(setStatusMessage(Kopete::StatusMessage)));

diff --git a/kopete/kopetewindow.cpp b/kopete/kopetewindow.cpp
index 4bce39632..959a5028f 100644
--- a/kopete/kopetewindow.cpp
+++ b/kopete/kopetewindow.cpp
@@ -314,7 +314,7 @@ KopeteWindow::KopeteWindow (QWidget *parent)
connect(infoLabel, SIGNAL(clicked()), this, SLOT(slotInfoIconClicked()));
statusBarMessageLayout->addWidget(infoLabel);
statusBarMessageLayout->addSpacing(1);
- connect(Kopete::InfoEventManager::self(), SIGNAL(eventAdded(Kopete::InfoEvent *)), this, SLOT(slotNewInfoEvent()));
+ connect(Kopete::InfoEventManager::self(), SIGNAL(eventAdded(Kopete::InfoEvent*)), this, SLOT(slotNewInfoEvent()));

d->globalStatusMessage = new KSqueezedTextLabel(statusBarMessage);
connect(Kopete::StatusManager::self(), SIGNAL(globalStatusChanged()),
@@ -334,16 +334,16 @@ KopeteWindow::KopeteWindow (QWidget *parent)
// --------------------------------------------------------------------------------

// Trap all loaded plugins, so we can add their status bar icons accordingly , also used to add XMLGUIClient
- connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin *)),
- this, SLOT(slotPluginLoaded(Kopete::Plugin *)));
+ connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin*)),
+ this, SLOT(slotPluginLoaded(Kopete::Plugin*)));
connect(Kopete::PluginManager::self(), SIGNAL(allPluginsLoaded()),
this, SLOT(slotAllPluginsLoaded()));

// Connect all identity signals
- connect(Kopete::IdentityManager::self(), SIGNAL(identityRegistered(Kopete::Identity *)),
- this, SLOT(slotIdentityRegistered(Kopete::Identity *)));
- connect(Kopete::IdentityManager::self(), SIGNAL(identityUnregistered(const Kopete::Identity *)),
- this, SLOT(slotIdentityUnregistered(const Kopete::Identity *)));
+ connect(Kopete::IdentityManager::self(), SIGNAL(identityRegistered(Kopete::Identity*)),
+ this, SLOT(slotIdentityRegistered(Kopete::Identity*)));
+ connect(Kopete::IdentityManager::self(), SIGNAL(identityUnregistered(const Kopete::Identity*)),
+ this, SLOT(slotIdentityUnregistered(const Kopete::Identity*)));

connect(d->autoHideTimer, SIGNAL(timeout()), this, SLOT(slotAutoHide()));
connect(d->contactlist, SIGNAL(visibleContentHeightChanged()), this, SLOT(slotStartAutoResizeTimer()));
@@ -458,8 +458,8 @@ void KopeteWindow::initActions()

connect(statusAction, SIGNAL(changeStatus(uint,Kopete::StatusMessage)),
this, SLOT(setOnlineStatus(uint,Kopete::StatusMessage)));
- connect(statusAction, SIGNAL(updateMessage(Kopete::StatusRootAction *)),
- this, SLOT(updateStatusMenuMessage(Kopete::StatusRootAction *)));
+ connect(statusAction, SIGNAL(updateMessage(Kopete::StatusRootAction*)),
+ this, SLOT(updateStatusMenuMessage(Kopete::StatusRootAction*)));
connect(statusAction, SIGNAL(changeMessage(Kopete::StatusMessage)),
this, SLOT(setStatusMessage(Kopete::StatusMessage)));

@@ -586,8 +586,8 @@ void KopeteWindow::initSystray()
if (Kopete::BehaviorSettings::self()->showSystemTray()) {
d->tray = KopeteSystemTray::systemTray(this);

- QObject::connect(d->tray, SIGNAL(aboutToShowMenu(QMenu *)),
- this, SLOT(slotTrayAboutToShowMenu(QMenu *)));
+ QObject::connect(d->tray, SIGNAL(aboutToShowMenu(QMenu*)),
+ this, SLOT(slotTrayAboutToShowMenu(QMenu*)));
d->tray->setStandardActionsEnabled(true);
QObject::connect(d->tray, SIGNAL(quit()), this, SLOT(slotQuit()));
}
@@ -751,8 +751,8 @@ void KopeteWindow::slotConfigChanged()
Kopete::Identity::List identityList = Kopete::IdentityManager::self()->identities();
foreach (Kopete::Identity *identity, identityList) {
KopeteIdentityStatusBarIcon *sbIcon = new KopeteIdentityStatusBarIcon(identity, d->statusBarWidget);
- connect(sbIcon, SIGNAL(leftClicked(Kopete::Identity *,QPoint)), this,
- SLOT(slotIdentityStatusIconLeftClicked(Kopete::Identity *,QPoint)));
+ connect(sbIcon, SIGNAL(leftClicked(Kopete::Identity*,QPoint)), this,
+ SLOT(slotIdentityStatusIconLeftClicked(Kopete::Identity*,QPoint)));

d->identityStatusBarIcons.insert(identity, sbIcon);
slotIdentityStatusIconChanged(identity);
@@ -958,10 +958,10 @@ void KopeteWindow::slotAllPluginsLoaded()
//Connect the appropriate account signals
/* Please note that I tried to put this in the slotAllPluginsLoaded() function
* but it seemed to break the account icons in the statusbar --Matt */
- connect(Kopete::AccountManager::self(), SIGNAL(accountRegistered(Kopete::Account *)),
- this, SLOT(slotAccountRegistered(Kopete::Account *)));
- connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account *)),
- this, SLOT(slotAccountUnregistered(const Kopete::Account *)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountRegistered(Kopete::Account*)),
+ this, SLOT(slotAccountRegistered(Kopete::Account*)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account*)),
+ this, SLOT(slotAccountUnregistered(const Kopete::Account*)));

if (d->showIdentityIcons) {
QString identityId = cg.readEntry("ShownIdentityId", Kopete::IdentityManager::self()->defaultIdentity()->id());
@@ -980,17 +980,17 @@ void KopeteWindow::slotIdentityRegistered(Kopete::Identity *identity)
return;
}

- connect(identity, SIGNAL(onlineStatusChanged(Kopete::Identity *)),
- this, SLOT(slotIdentityStatusIconChanged(Kopete::Identity *)));
- connect(identity, SIGNAL(identityChanged(Kopete::Identity *)),
- this, SLOT(slotIdentityStatusIconChanged(Kopete::Identity *)));
- connect(identity, SIGNAL(toolTipChanged(Kopete::Identity *)),
- this, SLOT(slotIdentityToolTipChanged(Kopete::Identity *)));
+ connect(identity, SIGNAL(onlineStatusChanged(Kopete::Identity*)),
+ this, SLOT(slotIdentityStatusIconChanged(Kopete::Identity*)));
+ connect(identity, SIGNAL(identityChanged(Kopete::Identity*)),
+ this, SLOT(slotIdentityStatusIconChanged(Kopete::Identity*)));
+ connect(identity, SIGNAL(toolTipChanged(Kopete::Identity*)),
+ this, SLOT(slotIdentityToolTipChanged(Kopete::Identity*)));

if (d->showIdentityIcons) {
KopeteIdentityStatusBarIcon *sbIcon = new KopeteIdentityStatusBarIcon(identity, d->statusBarWidget);
- connect(sbIcon, SIGNAL(leftClicked(Kopete::Identity *,QPoint)),
- SLOT(slotIdentityStatusIconLeftClicked(Kopete::Identity *,QPoint)));
+ connect(sbIcon, SIGNAL(leftClicked(Kopete::Identity*,QPoint)),
+ SLOT(slotIdentityStatusIconLeftClicked(Kopete::Identity*,QPoint)));

d->identityStatusBarIcons.insert(identity, sbIcon);
}
diff --git a/kopete/statusmenu/kopetestatusgroupaction.cpp b/kopete/statusmenu/kopetestatusgroupaction.cpp
index c5c160bbc..5dc61b60e 100644
--- a/kopete/statusmenu/kopetestatusgroupaction.cpp
+++ b/kopete/statusmenu/kopetestatusgroupaction.cpp
@@ -30,10 +30,10 @@ StatusGroupAction::StatusGroupAction(Status::StatusGroup *group, StatusRootActio
init();

connect(mStatusGroup, SIGNAL(changed()), this, SLOT(changed()));
- connect(mStatusGroup, SIGNAL(childRemoved(Kopete::Status::StatusItem *)),
- this, SLOT(childRemoved(Kopete::Status::StatusItem *)));
- connect(mStatusGroup, SIGNAL(childInserted(int,Kopete::Status::StatusItem *)),
- this, SLOT(childInserted(int,Kopete::Status::StatusItem *)));
+ connect(mStatusGroup, SIGNAL(childRemoved(Kopete::Status::StatusItem*)),
+ this, SLOT(childRemoved(Kopete::Status::StatusItem*)));
+ connect(mStatusGroup, SIGNAL(childInserted(int,Kopete::Status::StatusItem*)),
+ this, SLOT(childInserted(int,Kopete::Status::StatusItem*)));

foreach (Kopete::Status::StatusItem *child, mStatusGroup->childList()) {
insertChild(0, child);
diff --git a/kopete/statusmenu/kopetestatusrootaction.cpp b/kopete/statusmenu/kopetestatusrootaction.cpp
index de16fa5c9..e9eb154e2 100644
--- a/kopete/statusmenu/kopetestatusrootaction.cpp
+++ b/kopete/statusmenu/kopetestatusrootaction.cpp
@@ -150,10 +150,10 @@ void StatusRootAction::init()
connect(statusManager, SIGNAL(changed()), this, SLOT(rootChanged()));
d->group = statusManager->getRootGroup();

- connect(d->group, SIGNAL(childRemoved(Kopete::Status::StatusItem *)),
- this, SLOT(childRemoved(Kopete::Status::StatusItem *)));
- connect(d->group, SIGNAL(childInserted(int,Kopete::Status::StatusItem *)),
- this, SLOT(childInserted(int,Kopete::Status::StatusItem *)));
+ connect(d->group, SIGNAL(childRemoved(Kopete::Status::StatusItem*)),
+ this, SLOT(childRemoved(Kopete::Status::StatusItem*)));
+ connect(d->group, SIGNAL(childInserted(int,Kopete::Status::StatusItem*)),
+ this, SLOT(childInserted(int,Kopete::Status::StatusItem*)));

foreach (Kopete::Status::StatusItem *child, d->group->childList()) {
insertChild(d->insertBefore, child);
@@ -294,10 +294,10 @@ void StatusRootAction::rootChanged()
Kopete::StatusManager *statusManager = Kopete::StatusManager::self();
d->group = statusManager->getRootGroup();

- connect(d->group, SIGNAL(childRemoved(Kopete::Status::StatusItem *)),
- this, SLOT(childRemoved(Kopete::Status::StatusItem *)));
- connect(d->group, SIGNAL(childInserted(int,Kopete::Status::StatusItem *)),
- this, SLOT(childInserted(int,Kopete::Status::StatusItem *)));
+ connect(d->group, SIGNAL(childRemoved(Kopete::Status::StatusItem*)),
+ this, SLOT(childRemoved(Kopete::Status::StatusItem*)));
+ connect(d->group, SIGNAL(childInserted(int,Kopete::Status::StatusItem*)),
+ this, SLOT(childInserted(int,Kopete::Status::StatusItem*)));

foreach (Kopete::Status::StatusItem *child, d->group->childList()) {
insertChild(d->statusSeparator, child);
diff --git a/kopete/systemtray.cpp b/kopete/systemtray.cpp
index 6608b7d93..8f5ae1fd2 100644
--- a/kopete/systemtray.cpp
+++ b/kopete/systemtray.cpp
@@ -66,8 +66,8 @@ KopeteSystemTray::KopeteSystemTray(QWidget *parent)
connect(contextMenu(), SIGNAL(aboutToShow()), this, SLOT(slotAboutToShowMenu()));

connect(mBlinkTimer, SIGNAL(timeout()), this, SLOT(slotBlink()));
- connect(Kopete::ChatSessionManager::self(), SIGNAL(newEvent(Kopete::MessageEvent *)),
- this, SLOT(slotNewEvent(Kopete::MessageEvent *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(newEvent(Kopete::MessageEvent*)),
+ this, SLOT(slotNewEvent(Kopete::MessageEvent*)));
connect(Kopete::BehaviorSettings::self(), SIGNAL(configChanged()), this, SLOT(slotConfigChanged()));

connect(Kopete::AccountManager::self(),
@@ -164,8 +164,8 @@ void KopeteSystemTray::slotNewEvent(Kopete::MessageEvent *event)
{
mEventList.append(event);

- connect(event, SIGNAL(done(Kopete::MessageEvent *)),
- this, SLOT(slotEventDone(Kopete::MessageEvent *)));
+ connect(event, SIGNAL(done(Kopete::MessageEvent*)),
+ this, SLOT(slotEventDone(Kopete::MessageEvent*)));

// tray animation
if (Kopete::BehaviorSettings::self()->trayflashNotify()) {
diff --git a/libkopete/chatsessionmemberslistmodel.cpp b/libkopete/chatsessionmemberslistmodel.cpp
index 8e8a89f64..dce63bdb1 100644
--- a/libkopete/chatsessionmemberslistmodel.cpp
+++ b/libkopete/chatsessionmemberslistmodel.cpp
@@ -124,20 +124,20 @@ void ChatSessionMembersListModel::setChatSession(ChatSession *session)

d->session = session;

- connect(session, SIGNAL(closing(Kopete::ChatSession *)),
+ connect(session, SIGNAL(closing(Kopete::ChatSession*)),
this, SLOT(slotSessionClosed()));
- connect(session, SIGNAL(contactAdded(const Kopete::Contact *,bool)),
- this, SLOT(slotContactAdded(const Kopete::Contact *)));
- connect(session, SIGNAL(contactRemoved(const Kopete::Contact *,QString,Qt::TextFormat,bool)),
- this, SLOT(slotContactRemoved(const Kopete::Contact *)));
- connect(session, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotContactStatusChanged(Kopete::Contact *,Kopete::OnlineStatus)));
+ connect(session, SIGNAL(contactAdded(const Kopete::Contact*,bool)),
+ this, SLOT(slotContactAdded(const Kopete::Contact*)));
+ connect(session, SIGNAL(contactRemoved(const Kopete::Contact*,QString,Qt::TextFormat,bool)),
+ this, SLOT(slotContactRemoved(const Kopete::Contact*)));
+ connect(session, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotContactStatusChanged(Kopete::Contact*,Kopete::OnlineStatus)));
connect(session, SIGNAL(displayNameChanged()),
this, SLOT(slotSessionChanged()));
connect(session, SIGNAL(photoChanged()),
this, SLOT(slotSessionChanged()));
- connect(session, SIGNAL(nickNameChanged(Kopete::Contact *,QString)),
- this, SLOT(slotContactNickNameChanged(Kopete::Contact *)));
+ connect(session, SIGNAL(nickNameChanged(Kopete::Contact*,QString)),
+ this, SLOT(slotContactNickNameChanged(Kopete::Contact*)));

d->contacts.clear();
d->insertMultiple(d->session->members());
diff --git a/libkopete/contactlist/xmlcontactstorage.cpp b/libkopete/contactlist/xmlcontactstorage.cpp
index f70d6b029..3b261cbde 100644
--- a/libkopete/contactlist/xmlcontactstorage.cpp
+++ b/libkopete/contactlist/xmlcontactstorage.cpp
@@ -433,10 +433,10 @@ bool XmlContactStorage::parseMetaContact(Kopete::MetaContact *metaContact, const
metaContact->setDisplayNameSource(nameSourcePID, nameSourceAID, nameSourceCID);

// If a plugin is loaded, load data cached
- QObject::connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin *)),
- metaContact, SLOT(slotPluginLoaded(Kopete::Plugin *)));
- QObject::connect(Kopete::PluginManager::self(), SIGNAL(protocolLoaded(Kopete::Protocol *)),
- metaContact, SLOT(slotProtocolLoaded(Kopete::Protocol *)));
+ QObject::connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin*)),
+ metaContact, SLOT(slotPluginLoaded(Kopete::Plugin*)));
+ QObject::connect(Kopete::PluginManager::self(), SIGNAL(protocolLoaded(Kopete::Protocol*)),
+ metaContact, SLOT(slotProtocolLoaded(Kopete::Protocol*)));

// All plugins are already loaded, call manually the contact setting slot.
if (Kopete::PluginManager::self()->isAllPluginsLoaded()) {
diff --git a/libkopete/kopeteaccount.cpp b/libkopete/kopeteaccount.cpp
index 5bce0c7c8..e5843d7d0 100644
--- a/libkopete/kopeteaccount.cpp
+++ b/libkopete/kopeteaccount.cpp
@@ -138,7 +138,7 @@ Account::~Account()
{
// Delete all registered child contacts first
foreach (Contact *c, d->contacts) {
- QObject::disconnect(c, SIGNAL(contactDestroyed(Kopete::Contact *)), this, 0);
+ QObject::disconnect(c, SIGNAL(contactDestroyed(Kopete::Contact*)), this, 0);
}
qDeleteAll(d->contacts);
d->contacts.clear();
@@ -323,8 +323,8 @@ bool Account::registerContact(Contact *c)
}

d->contacts.insert(c->contactId(), c);
- QObject::connect(c, SIGNAL(contactDestroyed(Kopete::Contact *)),
- SLOT(contactDestroyed(Kopete::Contact *)));
+ QObject::connect(c, SIGNAL(contactDestroyed(Kopete::Contact*)),
+ SLOT(contactDestroyed(Kopete::Contact*)));

return true;
}
@@ -527,10 +527,10 @@ void Account::setMyself(Contact *myself)

d->myself = myself;

- QObject::connect(d->myself, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotOnlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
- QObject::connect(d->myself, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- this, SLOT(slotContactPropertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)));
+ QObject::connect(d->myself, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotOnlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ QObject::connect(d->myself, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ this, SLOT(slotContactPropertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)));

if (isConnected()) {
emit isConnectedChanged();
diff --git a/libkopete/kopeteaccountmanager.cpp b/libkopete/kopeteaccountmanager.cpp
index 96ab1ee13..d4d5c318b 100644
--- a/libkopete/kopeteaccountmanager.cpp
+++ b/libkopete/kopeteaccountmanager.cpp
@@ -277,7 +277,7 @@ Account *AccountManager::registerAccount(Account *account)
this, SLOT(slotAccountOnlineStatusChanged(Kopete::Contact *,
const Kopete::OnlineStatus&,const Kopete::OnlineStatus&)));

- connect(account, SIGNAL(accountDestroyed(const Kopete::Account *)), this, SLOT(unregisterAccount(const Kopete::Account *)));
+ connect(account, SIGNAL(accountDestroyed(const Kopete::Account*)), this, SLOT(unregisterAccount(const Kopete::Account*)));

if (!account->identity()) {
// the account's Identity must be set here instead of in the Kopete::Account ctor, because there the
@@ -364,8 +364,8 @@ void AccountManager::save()

void AccountManager::load()
{
- connect(PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin *)),
- this, SLOT(slotPluginLoaded(Kopete::Plugin *)));
+ connect(PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin*)),
+ this, SLOT(slotPluginLoaded(Kopete::Plugin*)));

// Iterate over all groups that start with "Account_" as those are accounts
// and load the required protocols if the account is enabled.
diff --git a/libkopete/kopeteappearancesettings.kcfg b/libkopete/kopeteappearancesettings.kcfg
index d5114ad97..c71310e49 100644
--- a/libkopete/kopeteappearancesettings.kcfg
+++ b/libkopete/kopeteappearancesettings.kcfg
@@ -4,10 +4,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kopeterc"/>
<include>kstandarddirs.h</include>
<include>kglobalsettings.h</include>
<include>kcolorscheme.h</include>
+ <kcfgfile name="kopeterc"/>
+

<!-- Define the available signals to emit -->
<signal name="appearanceChanged">
diff --git a/libkopete/kopetechatsession.cpp b/libkopete/kopetechatsession.cpp
index cd8d75b01..27eff1f06 100644
--- a/libkopete/kopetechatsession.cpp
+++ b/libkopete/kopetechatsession.cpp
@@ -98,12 +98,12 @@ Kopete::ChatSession::ChatSession(const Kopete::Contact *user, Kopete::ContactPtr
addContact(others[i], true);
}

- connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin *)), this, SLOT(clearChains()));
+ connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin*)), this, SLOT(clearChains()));
connect(Kopete::PluginManager::self(), SIGNAL(pluginUnloaded(QString)), this, SLOT(clearChains()));

- connect(user, SIGNAL(contactDestroyed(Kopete::Contact *)), this, SLOT(slotMyselfDestroyed(Kopete::Contact *)));
- connect(user, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)), this,
- SLOT(slotOnlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ connect(user, SIGNAL(contactDestroyed(Kopete::Contact*)), this, SLOT(slotMyselfDestroyed(Kopete::Contact*)));
+ connect(user, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)), this,
+ SLOT(slotOnlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));

if (user->metaContact()) {
connect(user->metaContact(), SIGNAL(photoChanged()), this, SIGNAL(photoChanged()));
@@ -136,8 +136,8 @@ void Kopete::ChatSession::setContactOnlineStatus(const Kopete::Contact *contact,
{
Kopete::OnlineStatus oldStatus = d->contactStatus[ contact ];
d->contactStatus[ contact ] = status;
- disconnect(contact, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ disconnect(contact, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));
emit onlineStatusChanged((Kopete::Contact *)contact, status, oldStatus);
}

@@ -458,9 +458,9 @@ void Kopete::ChatSession::addContact(const Kopete::Contact *c, bool suppress)
d->contacts.removeAll(old);
d->contacts.append((Kopete::Contact *)c);

- disconnect(old, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotOnlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
- disconnect(old, SIGNAL(statusMessageChanged(Kopete::Contact *)), this, SIGNAL(statusMessageChanged(Kopete::Contact *)));
+ disconnect(old, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotOnlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ disconnect(old, SIGNAL(statusMessageChanged(Kopete::Contact*)), this, SIGNAL(statusMessageChanged(Kopete::Contact*)));

if (old->metaContact()) {
disconnect(old->metaContact(), SIGNAL(displayNameChanged(QString,QString)), this, SLOT(slotUpdateDisplayName()));
@@ -478,9 +478,9 @@ void Kopete::ChatSession::addContact(const Kopete::Contact *c, bool suppress)
emit contactAdded(c, suppress);
}

- connect(c, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotOnlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
- connect(c, SIGNAL(statusMessageChanged(Kopete::Contact *)), this, SIGNAL(statusMessageChanged(Kopete::Contact *)));
+ connect(c, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotOnlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ connect(c, SIGNAL(statusMessageChanged(Kopete::Contact*)), this, SIGNAL(statusMessageChanged(Kopete::Contact*)));

if (c->metaContact()) {
connect(c->metaContact(), SIGNAL(displayNameChanged(QString,QString)), this, SLOT(slotUpdateDisplayName()));
@@ -488,7 +488,7 @@ void Kopete::ChatSession::addContact(const Kopete::Contact *c, bool suppress)
} else {
connect(c, SIGNAL(displayNameChanged(QString,QString)), this, SLOT(slotUpdateDisplayName()));
}
- connect(c, SIGNAL(contactDestroyed(Kopete::Contact *)), this, SLOT(slotContactDestroyed(Kopete::Contact *)));
+ connect(c, SIGNAL(contactDestroyed(Kopete::Contact*)), this, SLOT(slotContactDestroyed(Kopete::Contact*)));
connect(c, SIGNAL(displayNameChanged(QString,QString)), this, SLOT(slotDisplayNameChanged(QString,QString)));

slotUpdateDisplayName();
@@ -509,8 +509,8 @@ void Kopete::ChatSession::removeContact(const Kopete::Contact *c, const QString
} else {
d->contacts.removeAll((Kopete::Contact *)c);

- disconnect(c, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotOnlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ disconnect(c, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotOnlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));

if (c->metaContact()) {
disconnect(c->metaContact(), SIGNAL(displayNameChanged(QString,QString)), this, SLOT(slotUpdateDisplayName()));
@@ -518,7 +518,7 @@ void Kopete::ChatSession::removeContact(const Kopete::Contact *c, const QString
} else {
disconnect(c, SIGNAL(displayNameChanged(QString,QString)), this, SLOT(slotUpdateDisplayName()));
}
- disconnect(c, SIGNAL(contactDestroyed(Kopete::Contact *)), this, SLOT(slotContactDestroyed(Kopete::Contact *)));
+ disconnect(c, SIGNAL(contactDestroyed(Kopete::Contact*)), this, SLOT(slotContactDestroyed(Kopete::Contact*)));

disconnect(c, SIGNAL(displayNameChanged(QString,QString)), this, SLOT(slotDisplayNameChanged(QString,QString)));

@@ -576,7 +576,7 @@ void Kopete::ChatSession::receivedTypingMsg(const Kopete::Contact *c, bool t)
}
connect(notification, SIGNAL(activated(uint)), c, SLOT(execute()));
// User don't need this notification when view is activate
- connect(this, SIGNAL(viewActivated(KopeteView *)), notification, SLOT(close()));
+ connect(this, SIGNAL(viewActivated(KopeteView*)), notification, SLOT(close()));

notification->sendEvent();
}
@@ -636,8 +636,8 @@ KopeteView *Kopete::ChatSession::view(bool canCreate, const QString &requestedPl
if (!d->view && canCreate) {
d->view = Kopete::ChatSessionManager::self()->createView(this, requestedPlugin);
if (d->view) {
- connect(d->view->mainWidget(), SIGNAL(activated(KopeteView *)), this, SIGNAL(viewActivated(KopeteView *)));
- connect(d->view->mainWidget(), SIGNAL(closing(KopeteView *)), this, SLOT(slotViewDestroyed()));
+ connect(d->view->mainWidget(), SIGNAL(activated(KopeteView*)), this, SIGNAL(viewActivated(KopeteView*)));
+ connect(d->view->mainWidget(), SIGNAL(closing(KopeteView*)), this, SLOT(slotViewDestroyed()));
} else {
KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error,
i18n("<qt>An error has occurred while creating a new chat window. The chat window has not been created.</qt>"),
diff --git a/libkopete/kopetechatsessionmanager.cpp b/libkopete/kopetechatsessionmanager.cpp
index 5948c6e87..78e27dcbf 100644
--- a/libkopete/kopetechatsessionmanager.cpp
+++ b/libkopete/kopetechatsessionmanager.cpp
@@ -123,15 +123,15 @@ void ChatSessionManager::registerChatSession(ChatSession *result)
* There's no need for a slot here... just add a public remove()
* method and call from KMM's destructor
*/
- connect(result, SIGNAL(messageAppended(Kopete::Message&,Kopete::ChatSession *)),
+ connect(result, SIGNAL(messageAppended(Kopete::Message&,Kopete::ChatSession*)),
SIGNAL(aboutToDisplay(Kopete::Message&)));
- connect(result, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession *)),
+ connect(result, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession*)),
SIGNAL(aboutToSend(Kopete::Message&)));
- connect(result, SIGNAL(messageReceived(Kopete::Message&,Kopete::ChatSession *)),
+ connect(result, SIGNAL(messageReceived(Kopete::Message&,Kopete::ChatSession*)),
SIGNAL(aboutToReceive(Kopete::Message&)));

- connect(result, SIGNAL(messageAppended(Kopete::Message&,Kopete::ChatSession *)),
- SIGNAL(display(Kopete::Message&,Kopete::ChatSession *)));
+ connect(result, SIGNAL(messageAppended(Kopete::Message&,Kopete::ChatSession*)),
+ SIGNAL(display(Kopete::Message&,Kopete::ChatSession*)));

emit chatSessionCreated(result);
}
@@ -157,10 +157,10 @@ KopeteView *ChatSessionManager::createView(ChatSession *kmm, const QString &requ

QObject *viewObject = dynamic_cast<QObject *>(newView);
if (viewObject) {
- connect(viewObject, SIGNAL(activated(KopeteView *)),
- this, SIGNAL(viewActivated(KopeteView *)));
- connect(viewObject, SIGNAL(closing(KopeteView *)),
- this, SIGNAL(viewClosing(KopeteView *)));
+ connect(viewObject, SIGNAL(activated(KopeteView*)),
+ this, SIGNAL(viewActivated(KopeteView*)));
+ connect(viewObject, SIGNAL(closing(KopeteView*)),
+ this, SIGNAL(viewClosing(KopeteView*)));
} else {
qCWarning(LIBKOPETE_LOG) << "Failed to cast view to QObject *";
}
diff --git a/libkopete/kopetecommand.cpp b/libkopete/kopetecommand.cpp
index 25f9d5ad9..0758a3587 100644
--- a/libkopete/kopetecommand.cpp
+++ b/libkopete/kopetecommand.cpp
@@ -73,7 +73,7 @@ void Kopete::Command::init(const QString &command, const char *slot, const QStri
m_processing = false;

if (m_type == Kopete::CommandHandler::Normal) {
- QObject::connect(this, SIGNAL(handleCommand(QString,Kopete::ChatSession *)),
+ QObject::connect(this, SIGNAL(handleCommand(QString,Kopete::ChatSession*)),
d->parent, slot);
}
}
diff --git a/libkopete/kopetecommandhandler.cpp b/libkopete/kopetecommandhandler.cpp
index d27a77521..413deba7d 100644
--- a/libkopete/kopetecommandhandler.cpp
+++ b/libkopete/kopetecommandhandler.cpp
@@ -104,44 +104,44 @@ Kopete::CommandHandler::CommandHandler() : QObject(qApp)
mCommands.reserve(31);
p->pluginCommands.insert(this, mCommands);

- registerCommand(this, QStringLiteral("help"), SLOT(slotHelpCommand(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("help"), SLOT(slotHelpCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /help [<command>] - Used to list available commands, or show help for a specified command."), 0, 1);

- registerCommand(this, QStringLiteral("url"), SLOT(slotOpenLastUrl(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("url"), SLOT(slotOpenLastUrl(QString,Kopete::ChatSession*)),
i18n("USAGE: /url - Opens last URL for current chat in default browser."));

- registerCommand(this, QStringLiteral("close"), SLOT(slotCloseCommand(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("close"), SLOT(slotCloseCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /close - Closes the current view."));

// FIXME: What's the difference with /close? The help doesn't explain it - Martijn
- registerCommand(this, QStringLiteral("part"), SLOT(slotPartCommand(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("part"), SLOT(slotPartCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /part - Closes the current view."));

- registerCommand(this, QStringLiteral("clear"), SLOT(slotClearCommand(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("clear"), SLOT(slotClearCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /clear - Clears the active view's chat buffer."));

//registerCommand( this, QString::fromLatin1("me"), SLOT(slotMeCommand(QString,Kopete::ChatSession*)),
// i18n( "USAGE: /me <text> - Formats message as in '<nickname> went to the store'." ) );

- registerCommand(this, QStringLiteral("away"), SLOT(slotAwayCommand(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("away"), SLOT(slotAwayCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /away [<reason>] - Marks you as away/back for the current account only."));

- registerCommand(this, QStringLiteral("awayall"), SLOT(slotAwayAllCommand(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("awayall"), SLOT(slotAwayAllCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /awayall [<reason>] - Marks you as away/back for all accounts."));

- registerCommand(this, QStringLiteral("say"), SLOT(slotSayCommand(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("say"), SLOT(slotSayCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /say <text> - Say text in this chat. This is the same as just typing a message, but is very "
"useful for scripts."), 1);

- registerCommand(this, QStringLiteral("exec"), SLOT(slotExecCommand(QString,Kopete::ChatSession *)),
+ registerCommand(this, QStringLiteral("exec"), SLOT(slotExecCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /exec [-o] <command> - Executes the specified command and displays the output in the chat buffer. "
"If -o is specified, the output is sent to all members of the chat."), 1);

- connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin *)),
- this, SLOT(slotPluginLoaded(Kopete::Plugin *)));
+ connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin*)),
+ this, SLOT(slotPluginLoaded(Kopete::Plugin*)));

- connect(Kopete::ChatSessionManager::self(), SIGNAL(viewCreated(KopeteView *)),
- this, SLOT(slotViewCreated(KopeteView *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(viewCreated(KopeteView*)),
+ this, SLOT(slotViewCreated(KopeteView*)));
}

Kopete::CommandHandler::~CommandHandler()
@@ -523,7 +523,7 @@ void Kopete::CommandHandler::slotViewCreated(KopeteView *view)

void Kopete::CommandHandler::slotPluginLoaded(Kopete::Plugin *plugin)
{
- connect(plugin, SIGNAL(destroyed(QObject *)), this, SLOT(slotPluginDestroyed(QObject *)));
+ connect(plugin, SIGNAL(destroyed(QObject*)), this, SLOT(slotPluginDestroyed(QObject*)));
if (!p->pluginCommands.contains(plugin)) {
//Create a QDict optomized for a larger # of commands, and case insensitive
CommandList mCommands;
diff --git a/libkopete/kopetecontact.cpp b/libkopete/kopetecontact.cpp
index 733292685..9e9559577 100644
--- a/libkopete/kopetecontact.cpp
+++ b/libkopete/kopetecontact.cpp
@@ -118,7 +118,7 @@ Contact::Contact(Account *account, const QString &contactId, MetaContact *parent

d->contactId = contactId;
d->metaContact = parent;
- connect(d->metaContact, SIGNAL(destroyed(QObject *)), this, SLOT(slotMetaContactDestroyed(QObject *)));
+ connect(d->metaContact, SIGNAL(destroyed(QObject*)), this, SLOT(slotMetaContactDestroyed(QObject*)));

d->fileCapable = false;
d->account = account;
@@ -127,8 +127,8 @@ Contact::Contact(Account *account, const QString &contactId, MetaContact *parent
d->preferredNameType = Kopete::Contact::CustomName;
d->oldName = displayName();

- connect(this, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- this, SLOT(slotPropertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)));
+ connect(this, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ this, SLOT(slotPropertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)));

bool duplicate = false;
// If can happend that a MetaContact may be used without a account
@@ -435,7 +435,7 @@ void Contact::setMetaContact(MetaContact *m)

if (old) {
old->removeContact(this);
- disconnect(old, SIGNAL(destroyed(QObject *)), this, SLOT(slotMetaContactDestroyed(QObject *)));
+ disconnect(old, SIGNAL(destroyed(QObject*)), this, SLOT(slotMetaContactDestroyed(QObject*)));

if (old->contacts().isEmpty()) {
//remove the old metacontact. (this delete the MC)
@@ -452,7 +452,7 @@ void Contact::setMetaContact(MetaContact *m)

if (m) {
m->addContact(this);
- connect(m, SIGNAL(destroyed(QObject *)), this, SLOT(slotMetaContactDestroyed(QObject *)));
+ connect(m, SIGNAL(destroyed(QObject*)), this, SLOT(slotMetaContactDestroyed(QObject*)));
// it is necessary to call this write here, because MetaContact::addContact() does not differentiate
// between adding completely new contacts (which should be written to kabc) and restoring upon restart
// (where no write is needed).
diff --git a/libkopete/kopetecontactlist.cpp b/libkopete/kopetecontactlist.cpp
index 8ce5714a1..28b7b176c 100644
--- a/libkopete/kopetecontactlist.cpp
+++ b/libkopete/kopetecontactlist.cpp
@@ -94,11 +94,11 @@ ContactList::ContactList()
d->saveTimer->setSingleShot(true);
connect(d->saveTimer, SIGNAL(timeout()), SLOT(save()));

- connect(this, SIGNAL(metaContactAdded(Kopete::MetaContact *)), SLOT(slotSaveLater()));
- connect(this, SIGNAL(metaContactRemoved(Kopete::MetaContact *)), SLOT(slotSaveLater()));
- connect(this, SIGNAL(groupAdded(Kopete::Group *)), SLOT(slotSaveLater()));
- connect(this, SIGNAL(groupRemoved(Kopete::Group *)), SLOT(slotSaveLater()));
- connect(this, SIGNAL(groupRenamed(Kopete::Group *,QString)), SLOT(slotSaveLater()));
+ connect(this, SIGNAL(metaContactAdded(Kopete::MetaContact*)), SLOT(slotSaveLater()));
+ connect(this, SIGNAL(metaContactRemoved(Kopete::MetaContact*)), SLOT(slotSaveLater()));
+ connect(this, SIGNAL(groupAdded(Kopete::Group*)), SLOT(slotSaveLater()));
+ connect(this, SIGNAL(groupRemoved(Kopete::Group*)), SLOT(slotSaveLater()));
+ connect(this, SIGNAL(groupRenamed(Kopete::Group*,QString)), SLOT(slotSaveLater()));
}

ContactList::~ContactList()
@@ -238,10 +238,10 @@ void ContactList::addMetaContact(MetaContact *mc)

emit metaContactAdded(mc);
connect(mc, SIGNAL(persistentDataChanged()), SLOT(slotSaveLater()));
- connect(mc, SIGNAL(addedToGroup(Kopete::MetaContact *,Kopete::Group *)), SIGNAL(metaContactAddedToGroup(Kopete::MetaContact *,Kopete::Group *)));
- connect(mc, SIGNAL(removedFromGroup(Kopete::MetaContact *,Kopete::Group *)), SIGNAL(metaContactRemovedFromGroup(Kopete::MetaContact *,Kopete::Group *)));
- connect(mc, SIGNAL(movedToGroup(Kopete::MetaContact *,Kopete::Group *,Kopete::Group *)),
- SIGNAL(metaContactMovedToGroup(Kopete::MetaContact *,Kopete::Group *,Kopete::Group *)));
+ connect(mc, SIGNAL(addedToGroup(Kopete::MetaContact*,Kopete::Group*)), SIGNAL(metaContactAddedToGroup(Kopete::MetaContact*,Kopete::Group*)));
+ connect(mc, SIGNAL(removedFromGroup(Kopete::MetaContact*,Kopete::Group*)), SIGNAL(metaContactRemovedFromGroup(Kopete::MetaContact*,Kopete::Group*)));
+ connect(mc, SIGNAL(movedToGroup(Kopete::MetaContact*,Kopete::Group*,Kopete::Group*)),
+ SIGNAL(metaContactMovedToGroup(Kopete::MetaContact*,Kopete::Group*,Kopete::Group*)));
}

void ContactList::removeMetaContact(MetaContact *m)
@@ -298,7 +298,7 @@ void ContactList::addGroup(Group *g)
if (!d->groups.contains(g)) {
d->groups.append(g);
emit groupAdded(g);
- connect(g, SIGNAL(displayNameChanged(Kopete::Group *,QString)), this, SIGNAL(groupRenamed(Kopete::Group *,QString)));
+ connect(g, SIGNAL(displayNameChanged(Kopete::Group*,QString)), this, SIGNAL(groupRenamed(Kopete::Group*,QString)));
}
}

diff --git a/libkopete/kopetegroup.cpp b/libkopete/kopetegroup.cpp
index 54522402b..8d382ad96 100644
--- a/libkopete/kopetegroup.cpp
+++ b/libkopete/kopetegroup.cpp
@@ -180,7 +180,7 @@ void Group::sendMessage()
c = onlineMembers().first()->preferredContact();
c->sendMessage();
if (c->manager(Contact::CanCreate)) {
- connect(c->manager(), SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession *)), this, SLOT(sendMessage(Kopete::Message&)));
+ connect(c->manager(), SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession*)), this, SLOT(sendMessage(Kopete::Message&)));
}
}

@@ -189,7 +189,7 @@ void Group::sendMessage(Message &msg)
QList<MetaContact *> list = onlineMembers();
ChatSession *cs = msg.manager();
if (cs) {
- disconnect(cs, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession *)), this, SLOT(sendMessage(Kopete::Message&)));
+ disconnect(cs, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession*)), this, SLOT(sendMessage(Kopete::Message&)));
} else {
return;
}
diff --git a/libkopete/kopeteidentity.cpp b/libkopete/kopeteidentity.cpp
index 993cbcf9e..0aab38451 100644
--- a/libkopete/kopeteidentity.cpp
+++ b/libkopete/kopeteidentity.cpp
@@ -53,15 +53,15 @@ Identity::Identity(const QString &id, const QString &label)
: d(new Private(id, label))
{
load();
- connect(this, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- this, SLOT(slotSaveProperty(Kopete::PropertyContainer *,QString,QVariant,QVariant)));
+ connect(this, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ this, SLOT(slotSaveProperty(Kopete::PropertyContainer*,QString,QVariant,QVariant)));
}

Identity::Identity(const QString &label)
: d(new Private(KRandom::randomString(10), label))
{
- connect(this, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- this, SLOT(slotSaveProperty(Kopete::PropertyContainer *,QString,QVariant,QVariant)));
+ connect(this, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ this, SLOT(slotSaveProperty(Kopete::PropertyContainer*,QString,QVariant,QVariant)));
}

Identity *Identity::clone() const
@@ -71,8 +71,8 @@ Identity *Identity::clone() const
serializeProperties(props);
id->deserializeProperties(props);

- connect(id, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- id, SLOT(slotSaveProperty(Kopete::PropertyContainer *,QString,QVariant,QVariant)));
+ connect(id, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ id, SLOT(slotSaveProperty(Kopete::PropertyContainer*,QString,QVariant,QVariant)));
return id;
}

@@ -194,11 +194,11 @@ void Identity::addAccount(Kopete::Account *account)

if (account->myself()) {
connect(account->myself(),
- SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
this, SLOT(updateOnlineStatus()));
}
- connect(account, SIGNAL(accountDestroyed(const Kopete::Account *)),
- this, SLOT(removeAccount(const Kopete::Account *)));
+ connect(account, SIGNAL(accountDestroyed(const Kopete::Account*)),
+ this, SLOT(removeAccount(const Kopete::Account*)));

updateOnlineStatus();
emit identityChanged(this);
diff --git a/libkopete/kopeteidentitymanager.cpp b/libkopete/kopeteidentitymanager.cpp
index 8f1010581..a35246d6b 100644
--- a/libkopete/kopeteidentitymanager.cpp
+++ b/libkopete/kopeteidentitymanager.cpp
@@ -91,10 +91,10 @@ Identity *IdentityManager::registerIdentity(Identity *identity)
d->identities.append(identity);

// Connect to the identity's status changed signal
- connect(identity, SIGNAL(onlineStatusChanged(Kopete::Identity *)),
- this, SLOT(slotIdentityOnlineStatusChanged(Kopete::Identity *)));
+ connect(identity, SIGNAL(onlineStatusChanged(Kopete::Identity*)),
+ this, SLOT(slotIdentityOnlineStatusChanged(Kopete::Identity*)));

- connect(identity, SIGNAL(identityDestroyed(const Kopete::Identity *)), this, SLOT(unregisterIdentity(const Kopete::Identity *)));
+ connect(identity, SIGNAL(identityDestroyed(const Kopete::Identity*)), this, SLOT(unregisterIdentity(const Kopete::Identity*)));

emit identityRegistered(identity);

diff --git a/libkopete/kopeteidletimer.cpp b/libkopete/kopeteidletimer.cpp
index 7a7f6954c..ca0d4a5a9 100644
--- a/libkopete/kopeteidletimer.cpp
+++ b/libkopete/kopeteidletimer.cpp
@@ -109,7 +109,7 @@ void Kopete::IdleTimer::registerTimeout(int idleSeconds, QObject *receiver, cons
{
Private::TimeoutReceiver item = { true, idleSeconds * 1000, receiver, memberActive, memberIdle };
d->receiverList.append(item);
- connect(receiver, SIGNAL(destroyed(QObject *)), this, SLOT(unregisterTimeout(QObject *)));
+ connect(receiver, SIGNAL(destroyed(QObject*)), this, SLOT(unregisterTimeout(QObject*)));
}

void Kopete::IdleTimer::unregisterTimeout(QObject *receiver)
diff --git a/libkopete/kopeteinfoeventmanager.cpp b/libkopete/kopeteinfoeventmanager.cpp
index 1a1575811..489599ff2 100644
--- a/libkopete/kopeteinfoeventmanager.cpp
+++ b/libkopete/kopeteinfoeventmanager.cpp
@@ -53,8 +53,8 @@ void InfoEventManager::addEvent(Kopete::InfoEvent *event)
emit eventAboutToBeAdded(event);

if (!event->isClosed()) {
- connect(event, SIGNAL(eventClosed(Kopete::InfoEvent *)),
- this, SLOT(eventClosed(Kopete::InfoEvent *)));
+ connect(event, SIGNAL(eventClosed(Kopete::InfoEvent*)),
+ this, SLOT(eventClosed(Kopete::InfoEvent*)));

d->eventList.append(event);
emit eventAdded(event);
diff --git a/libkopete/kopetemessageevent.cpp b/libkopete/kopetemessageevent.cpp
index 0a61ed7fe..487411315 100644
--- a/libkopete/kopetemessageevent.cpp
+++ b/libkopete/kopetemessageevent.cpp
@@ -44,7 +44,7 @@ MessageEvent::MessageEvent(const Message &m, QObject *parent)
d->state = Nothing;
const Contact *c = m.from();
if (c) {
- connect(c, SIGNAL(contactDestroyed(Kopete::Contact *)), this, SLOT(discard()));
+ connect(c, SIGNAL(contactDestroyed(Kopete::Contact*)), this, SLOT(discard()));
}
}

diff --git a/libkopete/kopetemessagehandler.cpp b/libkopete/kopetemessagehandler.cpp
index 83f60cbc5..3f7210bc3 100644
--- a/libkopete/kopetemessagehandler.cpp
+++ b/libkopete/kopetemessagehandler.cpp
@@ -58,7 +58,7 @@ int MessageHandler::capabilities()

void MessageHandler::handleMessageInternal(MessageEvent *event)
{
- connect(event, SIGNAL(accepted(Kopete::MessageEvent *)), this, SLOT(messageAccepted(Kopete::MessageEvent *)));
+ connect(event, SIGNAL(accepted(Kopete::MessageEvent*)), this, SLOT(messageAccepted(Kopete::MessageEvent*)));
handleMessage(event);
}

@@ -69,7 +69,7 @@ void MessageHandler::handleMessage(MessageEvent *event)

void MessageHandler::messageAccepted(MessageEvent *event)
{
- disconnect(event, SIGNAL(accepted(Kopete::MessageEvent *)), this, SLOT(messageAccepted(Kopete::MessageEvent *)));
+ disconnect(event, SIGNAL(accepted(Kopete::MessageEvent*)), this, SLOT(messageAccepted(Kopete::MessageEvent*)));
d->next->handleMessageInternal(event);
}

diff --git a/libkopete/kopetemessagehandlerchain.cpp b/libkopete/kopetemessagehandlerchain.cpp
index 248d31448..c509cea85 100644
--- a/libkopete/kopetemessagehandlerchain.cpp
+++ b/libkopete/kopetemessagehandlerchain.cpp
@@ -157,7 +157,7 @@ ProcessMessageTask::ProcessMessageTask(MessageHandlerChain::Ptr chain, MessageEv
: d(new Private(chain, event))
{
QTimer::singleShot(0, this, SLOT(start()));
- connect(event, SIGNAL(done(Kopete::MessageEvent *)), this, SLOT(slotDone()));
+ connect(event, SIGNAL(done(Kopete::MessageEvent*)), this, SLOT(slotDone()));
event->message().manager()->ref();
}

diff --git a/libkopete/kopetemetacontact.cpp b/libkopete/kopetemetacontact.cpp
index ddc4ba388..d346b91e5 100644
--- a/libkopete/kopetemetacontact.cpp
+++ b/libkopete/kopetemetacontact.cpp
@@ -55,11 +55,11 @@ MetaContact::MetaContact()
connect(this, SIGNAL(iconChanged(Kopete::ContactListElement::IconState,QString)), SIGNAL(persistentDataChanged()));
connect(this, SIGNAL(useCustomIconChanged(bool)), SIGNAL(persistentDataChanged()));
connect(this, SIGNAL(displayNameChanged(QString,QString)), SIGNAL(persistentDataChanged()));
- connect(this, SIGNAL(movedToGroup(Kopete::MetaContact *,Kopete::Group *,Kopete::Group *)), SIGNAL(persistentDataChanged()));
- connect(this, SIGNAL(removedFromGroup(Kopete::MetaContact *,Kopete::Group *)), SIGNAL(persistentDataChanged()));
- connect(this, SIGNAL(addedToGroup(Kopete::MetaContact *,Kopete::Group *)), SIGNAL(persistentDataChanged()));
- connect(this, SIGNAL(contactAdded(Kopete::Contact *)), SIGNAL(persistentDataChanged()));
- connect(this, SIGNAL(contactRemoved(Kopete::Contact *)), SIGNAL(persistentDataChanged()));
+ connect(this, SIGNAL(movedToGroup(Kopete::MetaContact*,Kopete::Group*,Kopete::Group*)), SIGNAL(persistentDataChanged()));
+ connect(this, SIGNAL(removedFromGroup(Kopete::MetaContact*,Kopete::Group*)), SIGNAL(persistentDataChanged()));
+ connect(this, SIGNAL(addedToGroup(Kopete::MetaContact*,Kopete::Group*)), SIGNAL(persistentDataChanged()));
+ connect(this, SIGNAL(contactAdded(Kopete::Contact*)), SIGNAL(persistentDataChanged()));
+ connect(this, SIGNAL(contactRemoved(Kopete::Contact*)), SIGNAL(persistentDataChanged()));

// TODO: speed up: this slot is called when any kabc contact is changed and is called in *every* metacontact instance. also slot is slow because it finding kabc id
// Update the KABC picture when the KDE Address book change.
@@ -94,20 +94,20 @@ void MetaContact::addContact(Contact *c)
const QString oldDisplayName = displayName();

d->contacts.append(c);
- connect(c, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- SLOT(slotContactStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ connect(c, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ SLOT(slotContactStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));

- connect(c, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- this, SLOT(slotPropertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)));
+ connect(c, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ this, SLOT(slotPropertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)));

connect(c, SIGNAL(displayNameChanged(QString,QString)),
this, SLOT(slotContactDisplayNameChanged(QString,QString)));

- connect(c, SIGNAL(contactDestroyed(Kopete::Contact *)),
- this, SLOT(slotContactDestroyed(Kopete::Contact *)));
+ connect(c, SIGNAL(contactDestroyed(Kopete::Contact*)),
+ this, SLOT(slotContactDestroyed(Kopete::Contact*)));

- connect(c, SIGNAL(idleStateChanged(Kopete::Contact *)),
- this, SIGNAL(contactIdleStateChanged(Kopete::Contact *)));
+ connect(c, SIGNAL(idleStateChanged(Kopete::Contact*)),
+ this, SIGNAL(contactIdleStateChanged(Kopete::Contact*)));

emit contactAdded(c);

@@ -211,16 +211,16 @@ void MetaContact::removeContact(Contact *c, bool deleted)
}

if (!deleted) { //If this function is tell by slotContactRemoved, c is maybe just a QObject
- disconnect(c, SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotContactStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)));
- disconnect(c, SIGNAL(propertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)),
- this, SLOT(slotPropertyChanged(Kopete::PropertyContainer *,QString,QVariant,QVariant)));
+ disconnect(c, SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotContactStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)));
+ disconnect(c, SIGNAL(propertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)),
+ this, SLOT(slotPropertyChanged(Kopete::PropertyContainer*,QString,QVariant,QVariant)));
disconnect(c, SIGNAL(displayNameChanged(QString,QString)),
this, SLOT(slotContactDisplayNameChanged(QString,QString)));
- disconnect(c, SIGNAL(contactDestroyed(Kopete::Contact *)),
- this, SLOT(slotContactDestroyed(Kopete::Contact *)));
- disconnect(c, SIGNAL(idleStateChanged(Kopete::Contact *)),
- this, SIGNAL(contactIdleStateChanged(Kopete::Contact *)));
+ disconnect(c, SIGNAL(contactDestroyed(Kopete::Contact*)),
+ this, SLOT(slotContactDestroyed(Kopete::Contact*)));
+ disconnect(c, SIGNAL(idleStateChanged(Kopete::Contact*)),
+ this, SIGNAL(contactIdleStateChanged(Kopete::Contact*)));

qCDebug(LIBKOPETE_LOG) << "Contact disconnected";

diff --git a/libkopete/kopetepassword.cpp b/libkopete/kopetepassword.cpp
index e869277a3..d6e5cc214 100644
--- a/libkopete/kopetepassword.cpp
+++ b/libkopete/kopetepassword.cpp
@@ -96,7 +96,7 @@ public:
{
qCDebug(LIBKOPETE_LOG);

- Kopete::WalletManager::self()->openWallet(this, SLOT(walletReceived(KWallet::Wallet *)));
+ Kopete::WalletManager::self()->openWallet(this, SLOT(walletReceived(KWallet::Wallet*)));
}

void walletReceived(KWallet::Wallet *wallet) Q_DECL_OVERRIDE
diff --git a/libkopete/kopetepluginmanager.cpp b/libkopete/kopetepluginmanager.cpp
index 249d48390..ab93a22f3 100644
--- a/libkopete/kopetepluginmanager.cpp
+++ b/libkopete/kopetepluginmanager.cpp
@@ -67,7 +67,7 @@ public:
KPluginInfo info = it.key();
Plugin *plugin = it.value();
loadedPlugins.remove(info);
- plugin->disconnect(&instance, SLOT(slotPluginDestroyed(QObject *)));
+ plugin->disconnect(&instance, SLOT(slotPluginDestroyed(QObject*)));
delete plugin;
}
}
@@ -364,7 +364,7 @@ Plugin *PluginManager::loadPluginInternal(const QString &pluginId)
_kpmp->loadedPlugins.insert(info, plugin);
info.setPluginEnabled(true);

- connect(plugin, SIGNAL(destroyed(QObject *)), this, SLOT(slotPluginDestroyed(QObject *)));
+ connect(plugin, SIGNAL(destroyed(QObject*)), this, SLOT(slotPluginDestroyed(QObject*)));
connect(plugin, SIGNAL(readyForUnload()), this, SLOT(slotPluginReadyForUnload()));

qCDebug(LIBKOPETE_LOG) << "Successfully loaded plugin '" << pluginId << "'";
diff --git a/libkopete/kopeteprotocol.cpp b/libkopete/kopeteprotocol.cpp
index caff1e6fb..577f3404a 100644
--- a/libkopete/kopeteprotocol.cpp
+++ b/libkopete/kopeteprotocol.cpp
@@ -138,8 +138,8 @@ void Protocol::aboutToUnload()
<<" is still connected, disconnecting..." << endl;

QObject::connect(a->myself(),
- SIGNAL(onlineStatusChanged(Kopete::Contact *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
- this, SLOT(slotAccountOnlineStatusChanged(Kopete::Contact *)));
+ SIGNAL(onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ this, SLOT(slotAccountOnlineStatusChanged(Kopete::Contact*)));
a->disconnect();
} else {
// Remove account, it's already disconnected
diff --git a/libkopete/kopetestatusitems.cpp b/libkopete/kopetestatusitems.cpp
index a278fb131..3a0719904 100644
--- a/libkopete/kopetestatusitems.cpp
+++ b/libkopete/kopetestatusitems.cpp
@@ -74,7 +74,7 @@ StatusGroup::StatusGroup(const QString &uid)
void StatusGroup::insertChild(int i, StatusItem *item)
{
item->setParent(this);
- connect(item, SIGNAL(destroyed(QObject *)), this, SLOT(childDestroyed(QObject *)));
+ connect(item, SIGNAL(destroyed(QObject*)), this, SLOT(childDestroyed(QObject*)));
mChildItems.insert(i, item);
emit childInserted(i, item);
}
diff --git a/libkopete/kopetestatusmanager.cpp b/libkopete/kopetestatusmanager.cpp
index 74ab1575a..5847c9202 100644
--- a/libkopete/kopetestatusmanager.cpp
+++ b/libkopete/kopetestatusmanager.cpp
@@ -80,10 +80,10 @@ StatusManager::StatusManager()
connect(Kopete::BehaviorSettings::self(), SIGNAL(configChanged()),
this, SLOT(loadBehaviorSettings()));

- connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account *)),
- this, SLOT(accountUnregistered(const Kopete::Account *)));
+ connect(Kopete::AccountManager::self(), SIGNAL(accountUnregistered(const Kopete::Account*)),
+ this, SLOT(accountUnregistered(const Kopete::Account*)));

- connect(Kopete::AccountManager::self(), SIGNAL(accountOnlineStatusChanged(Kopete::Account *,Kopete::OnlineStatus,Kopete::OnlineStatus)),
+ connect(Kopete::AccountManager::self(), SIGNAL(accountOnlineStatusChanged(Kopete::Account*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
this, SLOT(checkIdleTimer()));
}

diff --git a/libkopete/kopetetransfermanager.cpp b/libkopete/kopetetransfermanager.cpp
index 04f355051..5df24f1fa 100644
--- a/libkopete/kopetetransfermanager.cpp
+++ b/libkopete/kopetetransfermanager.cpp
@@ -96,7 +96,7 @@ Kopete::Transfer::Transfer(const Kopete::FileTransferInfo &kfti, const QString &
: KIO::Job()
, d(new Private(kfti))
{
- connect(kfti.contact(), SIGNAL(destroyed(QObject *)), this, SLOT(slotContactDestroyed()));
+ connect(kfti.contact(), SIGNAL(destroyed(QObject*)), this, SLOT(slotContactDestroyed()));
this->setUiDelegate(new KIO::JobUiDelegate());
if (showProgressInfo) {
KIO::getJobTracker()->registerJob(this);
@@ -112,7 +112,7 @@ Kopete::Transfer::Transfer(const Kopete::FileTransferInfo &kfti, bool showProgre
: KIO::Job()
, d(new Private(kfti))
{
- connect(kfti.contact(), SIGNAL(destroyed(QObject *)), this, SLOT(slotContactDestroyed()));
+ connect(kfti.contact(), SIGNAL(destroyed(QObject*)), this, SLOT(slotContactDestroyed()));
this->setUiDelegate(new KIO::JobUiDelegate());
if (showProgressInfo) {
KIO::getJobTracker()->registerJob(this);
@@ -134,7 +134,7 @@ void Kopete::Transfer::init(const QUrl &target, bool showProgressInfo)
emitCopying(sourceURL(), destinationURL());
}

- connect(this, SIGNAL(result(KJob *)), SLOT(slotResultEmitted()));
+ connect(this, SIGNAL(result(KJob*)), SLOT(slotResultEmitted()));

ui()->setAutoErrorHandlingEnabled(false);
}
@@ -380,7 +380,7 @@ Kopete::Transfer *Kopete::TransferManager::addTransfer(Kopete::Contact *contact,
uint id = Kopete::Message::nextId();
Kopete::FileTransferInfo info(contact, files, size, recipient, di, id);
Kopete::Transfer *trans = new Kopete::Transfer(info);
- connect(trans, SIGNAL(result(KJob *)), this, SLOT(slotComplete(KJob *)));
+ connect(trans, SIGNAL(result(KJob*)), this, SLOT(slotComplete(KJob*)));
mTransfersMap.insert(id, trans);
return trans;
}
@@ -465,7 +465,7 @@ void Kopete::TransferManager::saveIncomingTransfer(unsigned int id)
}

Kopete::Transfer *trans = new Kopete::Transfer(info, url.toLocalFile());
- connect(trans, SIGNAL(result(KJob *)), this, SLOT(slotComplete(KJob *)));
+ connect(trans, SIGNAL(result(KJob*)), this, SLOT(slotComplete(KJob*)));
mTransfersMap.insert(info.transferId(), trans);
emit askIncomingDone(id);
emit accepted(trans, url.toLocalFile());
diff --git a/libkopete/kopetewalletmanager.cpp b/libkopete/kopetewalletmanager.cpp
index fb739cbb4..e891b04fe 100644
--- a/libkopete/kopetewalletmanager.cpp
+++ b/libkopete/kopetewalletmanager.cpp
@@ -80,7 +80,7 @@ void Kopete::WalletManager::openWallet(QObject *object, const char *slot)
d->signal = new KopeteWalletSignal;
}
// allow connecting to protected slots by calling object->connect
- connect(d->signal, SIGNAL(walletOpened(KWallet::Wallet *)), object, slot);
+ connect(d->signal, SIGNAL(walletOpened(KWallet::Wallet*)), object, slot);
//object->connect( d->signal, SIGNAL(walletOpened(KWallet::Wallet*)), slot );
openWalletInner();
}
diff --git a/libkopete/private/kopeteviewmanager.cpp b/libkopete/private/kopeteviewmanager.cpp
index 22ed98655..9eb69a3ea 100644
--- a/libkopete/private/kopeteviewmanager.cpp
+++ b/libkopete/private/kopeteviewmanager.cpp
@@ -140,8 +140,8 @@ KopeteViewManager::KopeteViewManager()

connect(Kopete::BehaviorSettings::self(), SIGNAL(configChanged()), this, SLOT(slotPrefsChanged()));

- connect(Kopete::ChatSessionManager::self(), SIGNAL(display(Kopete::Message&,Kopete::ChatSession *)),
- this, SLOT(messageAppended(Kopete::Message&,Kopete::ChatSession *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(display(Kopete::Message&,Kopete::ChatSession*)),
+ this, SLOT(messageAppended(Kopete::Message&,Kopete::ChatSession*)));

connect(Kopete::ChatSessionManager::self(), SIGNAL(readMessage()),
this, SLOT(nextEvent()));
@@ -207,8 +207,8 @@ KopeteView *KopeteViewManager::view(Kopete::ChatSession *session, const QString
d->foreignMessage = false;
d->sessionMap.insert(session, newView);

- connect(session, SIGNAL(closing(Kopete::ChatSession *)),
- this, SLOT(slotChatSessionDestroyed(Kopete::ChatSession *)));
+ connect(session, SIGNAL(closing(Kopete::ChatSession*)),
+ this, SLOT(slotChatSessionDestroyed(Kopete::ChatSession*)));

return newView;
} else {
@@ -295,8 +295,8 @@ void KopeteViewManager::messageAppended(Kopete::Message &msg, Kopete::ChatSessio

// Don't call readMessages twice. We call it later in this method. Fixes bug 168978.
if (d->useQueue) {
- connect(event, SIGNAL(done(Kopete::MessageEvent *)),
- this, SLOT(slotEventDeleted(Kopete::MessageEvent *)));
+ connect(event, SIGNAL(done(Kopete::MessageEvent*)),
+ this, SLOT(slotEventDeleted(Kopete::MessageEvent*)));
}
}
}
@@ -411,7 +411,7 @@ void KopeteViewManager::createNotification(Kopete::Message &msg, const QString &
connect(notify, SIGNAL(activated()), session, SLOT(raiseView()));
connect(notify, SIGNAL(action1Activated()), session, SLOT(raiseView()));
connect(notify, SIGNAL(action2Activated()), event, SLOT(discard()));
- connect(event, SIGNAL(done(Kopete::MessageEvent *)), notify, SLOT(close()));
+ connect(event, SIGNAL(done(Kopete::MessageEvent*)), notify, SLOT(close()));
notify->sendEvent();
}

diff --git a/libkopete/ui/accountselector.cpp b/libkopete/ui/accountselector.cpp
index a3c4087f0..23e87bf81 100644
--- a/libkopete/ui/accountselector.cpp
+++ b/libkopete/ui/accountselector.cpp
@@ -102,8 +102,8 @@ void AccountSelector::initUI()
}
}

- connect(d->lv, SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),
- this, SLOT(slotSelectionChanged(QTreeWidgetItem *)));
+ connect(d->lv, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+ this, SLOT(slotSelectionChanged(QTreeWidgetItem*)));
}

void AccountSelector::setSelected(Kopete::Account *account)
diff --git a/libkopete/ui/addressbookselectordialog.cpp b/libkopete/ui/addressbookselectordialog.cpp
index 306617af6..96ad04d27 100644
--- a/libkopete/ui/addressbookselectordialog.cpp
+++ b/libkopete/ui/addressbookselectordialog.cpp
@@ -64,7 +64,7 @@ AddressBookSelectorDialog::AddressBookSelectorDialog(const QString &title, const
okButton->setEnabled(false);
//setHelp("linkaddressbook");
//setHelp(QString(), "kopete");
- connect(m_addressBookSelectorWidget, SIGNAL(addresseeListClicked(QTreeWidgetItem *)), SLOT(slotWidgetAddresseeListClicked(QTreeWidgetItem *)));
+ connect(m_addressBookSelectorWidget, SIGNAL(addresseeListClicked(QTreeWidgetItem*)), SLOT(slotWidgetAddresseeListClicked(QTreeWidgetItem*)));

if (!preSelectUid.isEmpty()) {
m_addressBookSelectorWidget->selectAddressee(preSelectUid);
diff --git a/libkopete/ui/addressbookselectorwidget.cpp b/libkopete/ui/addressbookselectorwidget.cpp
index ec1d5e130..c2511596b 100644
--- a/libkopete/ui/addressbookselectorwidget.cpp
+++ b/libkopete/ui/addressbookselectorwidget.cpp
@@ -60,13 +60,13 @@ AddressBookSelectorWidget::AddressBookSelectorWidget(QWidget *parent, const char
connect(addAddresseeButton, SIGNAL(clicked()), SLOT(slotAddAddresseeClicked()));
connect(addAddresseeButton, SIGNAL(clicked()), SIGNAL(addAddresseeClicked()));

- connect(addresseeListView, SIGNAL(itemClicked(QTreeWidgetItem *,int)),
- SIGNAL(addresseeListClicked(QTreeWidgetItem *)));
- connect(addresseeListView, SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),
- SIGNAL(addresseeListClicked(QTreeWidgetItem *)));
+ connect(addresseeListView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
+ SIGNAL(addresseeListClicked(QTreeWidgetItem*)));
+ connect(addresseeListView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+ SIGNAL(addresseeListClicked(QTreeWidgetItem*)));
//FIXME: Find the correct replacement for Q3ListView::spacePressed(Q3ListViewItem*)
- connect(addresseeListView, SIGNAL(itemPressed(QTreeWidgetItem *,int)),
- SIGNAL(addresseeListClicked(QTreeWidgetItem *)));
+ connect(addresseeListView, SIGNAL(itemPressed(QTreeWidgetItem*,int)),
+ SIGNAL(addresseeListClicked(QTreeWidgetItem*)));

//connect( m_addressBook, SIGNAL(addressBookChanged(AddressBook*)), this, SLOT(slotLoadAddressees()) );

diff --git a/libkopete/ui/avatarselectorwidget.cpp b/libkopete/ui/avatarselectorwidget.cpp
index 8a65bcb4f..5c0e287de 100644
--- a/libkopete/ui/avatarselectorwidget.cpp
+++ b/libkopete/ui/avatarselectorwidget.cpp
@@ -127,8 +127,8 @@ AvatarSelectorWidget::AvatarSelectorWidget(QWidget *parent)
connect(d->mainWidget.buttonAddAvatar, SIGNAL(clicked()), this, SLOT(buttonAddAvatarClicked()));
connect(d->mainWidget.buttonRemoveAvatar, SIGNAL(clicked()), this, SLOT(buttonRemoveAvatarClicked()));
connect(d->mainWidget.buttonFromWebcam, SIGNAL(clicked()), this, SLOT(buttonFromWebcamClicked()));
- connect(d->mainWidget.listUserAvatar, SIGNAL(itemClicked(QListWidgetItem *)),
- this, SLOT(listSelectionChanged(QListWidgetItem *)));
+ connect(d->mainWidget.listUserAvatar, SIGNAL(itemClicked(QListWidgetItem*)),
+ this, SLOT(listSelectionChanged(QListWidgetItem*)));
connect(Kopete::AvatarManager::self(), SIGNAL(avatarAdded(Kopete::AvatarManager::AvatarEntry)),
this, SLOT(avatarAdded(Kopete::AvatarManager::AvatarEntry)));
connect(Kopete::AvatarManager::self(), SIGNAL(avatarRemoved(Kopete::AvatarManager::AvatarEntry)),
@@ -143,7 +143,7 @@ AvatarSelectorWidget::AvatarSelectorWidget(QWidget *parent)

// List avatars of User category
Kopete::AvatarQueryJob *queryJob = new Kopete::AvatarQueryJob(this);
- connect(queryJob, SIGNAL(result(KJob *)), this, SLOT(queryJobFinished(KJob *)));
+ connect(queryJob, SIGNAL(result(KJob*)), this, SLOT(queryJobFinished(KJob*)));
queryJob->setQueryFilter(Kopete::AvatarManager::User);

queryJob->start();
diff --git a/libkopete/ui/kopetelistview.cpp b/libkopete/ui/kopetelistview.cpp
index f7b487dc9..fbd82b93d 100644
--- a/libkopete/ui/kopetelistview.cpp
+++ b/libkopete/ui/kopetelistview.cpp
@@ -152,8 +152,8 @@ ListView::ListView(QWidget *parent)

connect(this, SIGNAL(customContextMenuRequested(QPoint)),
SLOT(slotContextMenu(QPoint)));
- connect(this, SIGNAL(itemDoubleClicked(QTreeWidgetItem *,int)),
- SLOT(slotDoubleClicked(QTreeWidgetItem *)));
+ connect(this, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
+ SLOT(slotDoubleClicked(QTreeWidgetItem*)));

// set up flags for nicer painting
setAttribute(Qt::WA_StaticContents, false);
@@ -274,7 +274,7 @@ void ListView::setSmoothScrolling(bool b)
// Install the timer
d->smoothScrollingTimer = startTimer((int)d->smoothScrollingTimerInterval);
// If we want to enable smooth scrolling when item has changed with keypresses etc, we need this
- connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)), this, SLOT(slotCurrentChanged(QTreeWidgetItem *)));
+ connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(slotCurrentChanged(QTreeWidgetItem*)));
// Disable autoscroll, we will do it the smooth way.
d->smoothScrollDragAutoScroll = hasAutoScroll();
setAutoScroll(false);
@@ -290,7 +290,7 @@ void ListView::setSmoothScrolling(bool b)
killTimer((int)d->smoothScrollingTimer);
d->smoothScrollingTimer = 0;
// We don't need to list currentChanged anymore
- disconnect(this, SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)), this, SLOT(slotCurrentChanged(QTreeWidgetItem *)));
+ disconnect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(slotCurrentChanged(QTreeWidgetItem*)));
// Restore the autoscroll
setAutoScroll(d->smoothScrollDragAutoScroll);
// Kill the continuous press timers
diff --git a/libkopete/ui/metacontactselectorwidget.cpp b/libkopete/ui/metacontactselectorwidget.cpp
index 96cbef719..cb5a4fedb 100644
--- a/libkopete/ui/metacontactselectorwidget.cpp
+++ b/libkopete/ui/metacontactselectorwidget.cpp
@@ -194,15 +194,15 @@ MetaContactSelectorWidget::MetaContactSelectorWidget(QWidget *parent, const char
d->widget->setupUi(w);
l->addWidget(w);

- connect(d->widget->metaContactListView, SIGNAL(itemClicked(QTreeWidgetItem *,int)),
- SIGNAL(metaContactListClicked(QTreeWidgetItem *)));
- connect(d->widget->metaContactListView, SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),
- SIGNAL(metaContactListClicked(QTreeWidgetItem *)));
+ connect(d->widget->metaContactListView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
+ SIGNAL(metaContactListClicked(QTreeWidgetItem*)));
+ connect(d->widget->metaContactListView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+ SIGNAL(metaContactListClicked(QTreeWidgetItem*)));
//FIXME: Find the correct replacement for Q3ListView::spacePressed(Q3ListViewItem*)
- connect(d->widget->metaContactListView, SIGNAL(itemPressed(QTreeWidgetItem *,int)),
- SIGNAL(metaContactListClicked(QTreeWidgetItem *)));
+ connect(d->widget->metaContactListView, SIGNAL(itemPressed(QTreeWidgetItem*,int)),
+ SIGNAL(metaContactListClicked(QTreeWidgetItem*)));

- connect(Kopete::ContactList::self(), SIGNAL(metaContactAdded(Kopete::MetaContact *)), this, SLOT(slotLoadMetaContacts()));
+ connect(Kopete::ContactList::self(), SIGNAL(metaContactAdded(Kopete::MetaContact*)), this, SLOT(slotLoadMetaContacts()));

d->widget->kListViewSearchLine->setTreeWidget(d->widget->metaContactListView);
d->widget->kListViewSearchLine->setFocus();
@@ -214,7 +214,7 @@ MetaContactSelectorWidget::MetaContactSelectorWidget(QWidget *parent, const char

MetaContactSelectorWidget::~MetaContactSelectorWidget()
{
- disconnect(Kopete::ContactList::self(), SIGNAL(metaContactAdded(Kopete::MetaContact *)), this, SLOT(slotLoadMetaContacts()));
+ disconnect(Kopete::ContactList::self(), SIGNAL(metaContactAdded(Kopete::MetaContact*)), this, SLOT(slotLoadMetaContacts()));
delete d->widget;
delete d;
}
diff --git a/plugins/addbookmarks/addbookmarksplugin.cpp b/plugins/addbookmarks/addbookmarksplugin.cpp
index 7e650aa55..4f50560c6 100644
--- a/plugins/addbookmarks/addbookmarksplugin.cpp
+++ b/plugins/addbookmarks/addbookmarksplugin.cpp
@@ -122,8 +122,8 @@ void BookmarksPlugin::addKopeteBookmark(const QUrl &url, const QString &sender)
KIO::TransferJob *transfer;
// make asynchronous transfer to avoid GUI freezing due to overloaded web servers
transfer = KIO::get(url, KIO::NoReload, KIO::HideProgressInfo);
- connect(transfer, SIGNAL(data(KIO::Job *,QByteArray)),
- this, SLOT(slotAddKopeteBookmark(KIO::Job *,QByteArray)));
+ connect(transfer, SIGNAL(data(KIO::Job*,QByteArray)),
+ this, SLOT(slotAddKopeteBookmark(KIO::Job*,QByteArray)));
m_map[transfer].url = url;
m_map[transfer].sender = sender;
}
diff --git a/plugins/alias/aliaspreferences.cpp b/plugins/alias/aliaspreferences.cpp
index d28c35bfd..da405635e 100644
--- a/plugins/alias/aliaspreferences.cpp
+++ b/plugins/alias/aliaspreferences.cpp
@@ -133,8 +133,8 @@ AliasPreferences::AliasPreferences(QWidget *parent, const QVariantList &args)
connect(preferencesDialog->addButton, SIGNAL(clicked()), this, SLOT(slotAddAlias()));
connect(preferencesDialog->editButton, SIGNAL(clicked()), this, SLOT(slotEditAlias()));
connect(preferencesDialog->deleteButton, SIGNAL(clicked()), this, SLOT(slotDeleteAliases()));
- connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin *)),
- this, SLOT(slotPluginLoaded(Kopete::Plugin *)));
+ connect(Kopete::PluginManager::self(), SIGNAL(pluginLoaded(Kopete::Plugin*)),
+ this, SLOT(slotPluginLoaded(Kopete::Plugin*)));

connect(preferencesDialog->aliasList, SIGNAL(selectionChanged()),
this, SLOT(slotCheckAliasSelected()));
diff --git a/plugins/cryptography/cryptographymessagehandler.cpp b/plugins/cryptography/cryptographymessagehandler.cpp
index f9ff53c08..149800789 100644
--- a/plugins/cryptography/cryptographymessagehandler.cpp
+++ b/plugins/cryptography/cryptographymessagehandler.cpp
@@ -52,7 +52,7 @@ MessageHandler *CryptographyMessageHandlerFactory::create(ChatSession *manager,
return 0;
}
MessageHandler *handler = new CryptographyMessageHandler;
- QObject::connect(handler, SIGNAL(handle(Kopete::MessageEvent *)), d->target, d->slot);
+ QObject::connect(handler, SIGNAL(handle(Kopete::MessageEvent*)), d->target, d->slot);
return handler;
}

diff --git a/plugins/cryptography/cryptographyplugin.cpp b/plugins/cryptography/cryptographyplugin.cpp
index 30254db67..6b4d7b026 100644
--- a/plugins/cryptography/cryptographyplugin.cpp
+++ b/plugins/cryptography/cryptographyplugin.cpp
@@ -84,7 +84,7 @@ CryptographyPlugin::CryptographyPlugin (QObject *parent, const QVariantList & /*

// set up slots to handle incoming and outgoing messages
mInboundHandler = new CryptographyMessageHandlerFactory(Kopete::Message::Inbound,
- Kopete::MessageHandlerFactory::InStageToSent, this, SLOT(slotIncomingMessage(Kopete::MessageEvent *)));
+ Kopete::MessageHandlerFactory::InStageToSent, this, SLOT(slotIncomingMessage(Kopete::MessageEvent*)));
connect(Kopete::ChatSessionManager::self(),
SIGNAL(aboutToSend(Kopete::Message&)),
SLOT(slotOutgoingMessage(Kopete::Message&)));
@@ -105,7 +105,7 @@ CryptographyPlugin::CryptographyPlugin (QObject *parent, const QVariantList & /*
setXMLFile("cryptographyui.rc");

// add functionality to chat window when one opens
- connect(Kopete::ChatSessionManager::self(), SIGNAL(chatSessionCreated(Kopete::ChatSession *)), SLOT(slotNewKMM(Kopete::ChatSession *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(chatSessionCreated(Kopete::ChatSession*)), SLOT(slotNewKMM(Kopete::ChatSession*)));

//Add GUI action to all already existing kmm (if the plugin is launched when kopete already running)
QList<Kopete::ChatSession *> sessions = Kopete::ChatSessionManager::self()->sessions();
@@ -366,7 +366,7 @@ void CryptographyPlugin::slotSelectContactKey()
void CryptographyPlugin::slotNewKMM(Kopete::ChatSession *KMM)
{
CryptographyGUIClient *gui = new CryptographyGUIClient(KMM);
- connect(this, SIGNAL(destroyed(QObject *)), gui, SLOT(deleteLater()));
+ connect(this, SIGNAL(destroyed(QObject*)), gui, SLOT(deleteLater()));

// warn about unfriendly protocols
if (KMM->protocol()) {
diff --git a/plugins/highlight/highlightpreferences.cpp b/plugins/highlight/highlightpreferences.cpp
index aa4ea626b..0ccb20924 100644
--- a/plugins/highlight/highlightpreferences.cpp
+++ b/plugins/highlight/highlightpreferences.cpp
@@ -51,8 +51,8 @@ HighlightPreferences::HighlightPreferences(QWidget *parent, const QVariantList &

m_config = new HighlightConfig;

- connect(preferencesDialog.m_list, SIGNAL(currentItemChanged(QListWidgetItem *,QListWidgetItem *)), this, SLOT(slotCurrentFilterChanged()));
- connect(preferencesDialog.m_list, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(slotRenameFilter()));
+ connect(preferencesDialog.m_list, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(slotCurrentFilterChanged()));
+ connect(preferencesDialog.m_list, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(slotRenameFilter()));
connect(preferencesDialog.m_add, SIGNAL(pressed()), this, SLOT(slotAddFilter()));
connect(preferencesDialog.m_remove, SIGNAL(pressed()), this, SLOT(slotRemoveFilter()));
connect(preferencesDialog.m_rename, SIGNAL(pressed()), this, SLOT(slotRenameFilter()));
diff --git a/plugins/history/historydialog.cpp b/plugins/history/historydialog.cpp
index f31194688..aadef87b0 100644
--- a/plugins/history/historydialog.cpp
+++ b/plugins/history/historydialog.cpp
@@ -170,7 +170,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, QWidget *parent)

connect(mHtmlPart->browserExtension(), SIGNAL(openUrlRequestDelayed(QUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)),
this, SLOT(slotOpenURLRequest(QUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)));
- connect(mMainWidget->dateTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem *,int)), this, SLOT(dateSelected(QTreeWidgetItem *)));
+ connect(mMainWidget->dateTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(dateSelected(QTreeWidgetItem*)));
connect(mMainWidget->searchButton, SIGNAL(clicked()), this, SLOT(slotSearch()));
connect(mMainWidget->searchLine, SIGNAL(returnPressed()), this, SLOT(slotSearch()));
connect(mMainWidget->searchLine, SIGNAL(textChanged(QString)), this, SLOT(slotSearchTextChanged(QString)));
diff --git a/plugins/history/historylogger.cpp b/plugins/history/historylogger.cpp
index 11a411e33..e7e57d3f8 100644
--- a/plugins/history/historylogger.cpp
+++ b/plugins/history/historylogger.cpp
@@ -68,7 +68,7 @@ HistoryLogger::HistoryLogger(Kopete::MetaContact *m, QObject *parent)
m_filterRegExp = false;

//the contact may be destroyed, for example, if the contact changes its metacontact
- connect(m_metaContact, SIGNAL(destroyed(QObject *)), this, SLOT(slotMCDeleted()));
+ connect(m_metaContact, SIGNAL(destroyed(QObject*)), this, SLOT(slotMCDeleted()));

setPositionToLast();
}
@@ -87,7 +87,7 @@ HistoryLogger::HistoryLogger(Kopete::Contact *c, QObject *parent)
m_filterRegExp = false;

//the contact may be destroyed, for example, if the contact changes its metacontact
- connect(m_metaContact, SIGNAL(destroyed(QObject *)), this, SLOT(slotMCDeleted()));
+ connect(m_metaContact, SIGNAL(destroyed(QObject*)), this, SLOT(slotMCDeleted()));

setPositionToLast();
}
diff --git a/plugins/history/historyplugin.cpp b/plugins/history/historyplugin.cpp
index 1d064df1a..5641ad859 100644
--- a/plugins/history/historyplugin.cpp
+++ b/plugins/history/historyplugin.cpp
@@ -61,8 +61,8 @@ HistoryPlugin::HistoryPlugin(QObject *parent, const QVariantList & /* args */)
connect(Kopete::ContactList::self(), SIGNAL(metaContactSelected(bool)),
viewMetaContactHistory, SLOT(setEnabled(bool)));

- connect(Kopete::ChatSessionManager::self(), SIGNAL(viewCreated(KopeteView *)),
- this, SLOT(slotViewCreated(KopeteView *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(viewCreated(KopeteView*)),
+ this, SLOT(slotViewCreated(KopeteView*)));

connect(this, SIGNAL(settingsChanged()), this, SLOT(slotSettingsChanged()));

@@ -83,8 +83,8 @@ HistoryPlugin::HistoryPlugin(QObject *parent, const QVariantList & /* args */)
for (QList<Kopete::ChatSession *>::Iterator it = sessions.begin(); it != sessions.end(); ++it) {
if (!m_loggers.contains(*it)) {
m_loggers.insert(*it, new HistoryGUIClient(*it));
- connect(*it, SIGNAL(closing(Kopete::ChatSession *)),
- this, SLOT(slotKMMClosed(Kopete::ChatSession *)));
+ connect(*it, SIGNAL(closing(Kopete::ChatSession*)),
+ this, SLOT(slotKMMClosed(Kopete::ChatSession*)));
}
}
}
@@ -111,8 +111,8 @@ void HistoryPlugin::messageDisplayed(const Kopete::Message &m)

if (!m_loggers.contains(m.manager())) {
m_loggers.insert(m.manager(), new HistoryGUIClient(m.manager()));
- connect(m.manager(), SIGNAL(closing(Kopete::ChatSession *)),
- this, SLOT(slotKMMClosed(Kopete::ChatSession *)));
+ connect(m.manager(), SIGNAL(closing(Kopete::ChatSession*)),
+ this, SLOT(slotKMMClosed(Kopete::ChatSession*)));
}

HistoryLogger *l = m_loggers[m.manager()]->logger();
@@ -155,8 +155,8 @@ void HistoryPlugin::slotViewCreated(KopeteView *v)

if (!m_loggers.contains(m_currentChatSession)) {
m_loggers.insert(m_currentChatSession, new HistoryGUIClient(m_currentChatSession));
- connect(m_currentChatSession, SIGNAL(closing(Kopete::ChatSession *)),
- this, SLOT(slotKMMClosed(Kopete::ChatSession *)));
+ connect(m_currentChatSession, SIGNAL(closing(Kopete::ChatSession*)),
+ this, SLOT(slotKMMClosed(Kopete::ChatSession*)));
}

if (!autoChatWindow || nbAutoChatWindow == 0) {
diff --git a/plugins/history2/history2dialog.cpp b/plugins/history2/history2dialog.cpp
index 4a970cbb6..8a79c9ca3 100644
--- a/plugins/history2/history2dialog.cpp
+++ b/plugins/history2/history2dialog.cpp
@@ -167,7 +167,7 @@ History2Dialog::History2Dialog(Kopete::MetaContact *mc, QWidget *parent)

connect(mHtmlPart->browserExtension(), SIGNAL(openUrlRequestDelayed(KUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)),
this, SLOT(slotOpenURLRequest(KUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)));
- connect(mMainWidget->dateTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem *,int)), this, SLOT(dateSelected(QTreeWidgetItem *)));
+ connect(mMainWidget->dateTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(dateSelected(QTreeWidgetItem*)));
connect(mMainWidget->searchButton, SIGNAL(clicked()), this, SLOT(slotSearch()));
connect(mMainWidget->searchLine, SIGNAL(returnPressed()), this, SLOT(slotSearch()));
connect(mMainWidget->searchLine, SIGNAL(textChanged(QString)), this, SLOT(slotSearchTextChanged(QString)));
diff --git a/plugins/history2/history2plugin.cpp b/plugins/history2/history2plugin.cpp
index 5da820fa6..4ccf8ac28 100644
--- a/plugins/history2/history2plugin.cpp
+++ b/plugins/history2/history2plugin.cpp
@@ -61,8 +61,8 @@ History2Plugin::History2Plugin(QObject *parent, const QStringList & /* args */)
connect(Kopete::ContactList::self(), SIGNAL(metaContactSelected(bool)),
viewMetaContactHistory, SLOT(setEnabled(bool)));

- connect(Kopete::ChatSessionManager::self(), SIGNAL(viewCreated(KopeteView *)),
- this, SLOT(slotViewCreated(KopeteView *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(viewCreated(KopeteView*)),
+ this, SLOT(slotViewCreated(KopeteView*)));

connect(this, SIGNAL(settingsChanged()), this, SLOT(slotSettingsChanged()));

@@ -74,8 +74,8 @@ History2Plugin::History2Plugin(QObject *parent, const QStringList & /* args */)
for (QList<Kopete::ChatSession *>::Iterator it = sessions.begin(); it != sessions.end(); ++it) {
if (!m_loggers.contains(*it)) {
m_loggers.insert(*it, new History2GUIClient(*it));
- connect(*it, SIGNAL(closing(Kopete::ChatSession *)),
- this, SLOT(slotKMMClosed(Kopete::ChatSession *)));
+ connect(*it, SIGNAL(closing(Kopete::ChatSession*)),
+ this, SLOT(slotKMMClosed(Kopete::ChatSession*)));
}
}
}
@@ -102,8 +102,8 @@ void History2Plugin::messageDisplayed(const Kopete::Message &m)

if (!m_loggers.contains(m.manager())) {
m_loggers.insert(m.manager(), new History2GUIClient(m.manager()));
- connect(m.manager(), SIGNAL(closing(Kopete::ChatSession *)),
- this, SLOT(slotKMMClosed(Kopete::ChatSession *)));
+ connect(m.manager(), SIGNAL(closing(Kopete::ChatSession*)),
+ this, SLOT(slotKMMClosed(Kopete::ChatSession*)));
}

QList<Kopete::Contact *> mb = m.manager()->members();
@@ -143,8 +143,8 @@ void History2Plugin::slotViewCreated(KopeteView *v)

if (!m_loggers.contains(m_currentChatSession)) {
m_loggers.insert(m_currentChatSession, new History2GUIClient(m_currentChatSession));
- connect(m_currentChatSession, SIGNAL(closing(Kopete::ChatSession *)),
- this, SLOT(slotKMMClosed(Kopete::ChatSession *)));
+ connect(m_currentChatSession, SIGNAL(closing(Kopete::ChatSession*)),
+ this, SLOT(slotKMMClosed(Kopete::ChatSession*)));
}

if (!autoChatWindow || nbAutoChatWindow == 0) {
diff --git a/plugins/latex/latexplugin.cpp b/plugins/latex/latexplugin.cpp
index 3a9989ccb..5a7176752 100644
--- a/plugins/latex/latexplugin.cpp
+++ b/plugins/latex/latexplugin.cpp
@@ -54,8 +54,8 @@ LatexPlugin::LatexPlugin(QObject *parent, const QVariantList & /*args*/)
mMagickNotFoundShown = false;
connect(Kopete::ChatSessionManager::self(), SIGNAL(aboutToDisplay(Kopete::Message&)), SLOT(slotMessageAboutToShow(Kopete::Message&)));
connect(Kopete::ChatSessionManager::self(), SIGNAL(aboutToSend(Kopete::Message&)), this, SLOT(slotMessageAboutToSend(Kopete::Message&)));
- connect(Kopete::ChatSessionManager::self(), SIGNAL(chatSessionCreated(Kopete::ChatSession *)),
- this, SLOT(slotNewChatSession(Kopete::ChatSession *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(chatSessionCreated(Kopete::ChatSession*)),
+ this, SLOT(slotNewChatSession(Kopete::ChatSession*)));

m_convScript = QStandardPaths::findExecutable(QStringLiteral("kopete_latexconvert.sh"));

diff --git a/plugins/nowlistening/nowlisteningplugin.cpp b/plugins/nowlistening/nowlisteningplugin.cpp
index f068e6be4..8018ceecc 100644
--- a/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/plugins/nowlistening/nowlisteningplugin.cpp
@@ -136,7 +136,7 @@ NowListeningPlugin::NowListeningPlugin(QObject *parent, const QVariantList & /*a
Kopete::CommandHandler::commandHandler()->registerCommand(
this,
"media",
- SLOT(slotMediaCommand(QString,Kopete::ChatSession *)),
+ SLOT(slotMediaCommand(QString,Kopete::ChatSession*)),
i18n("USAGE: /media - Displays information on current song"),
0
);
diff --git a/plugins/otr/kopete_otr.kcfg b/plugins/otr/kopete_otr.kcfg
index a11b8b637..e0192d50f 100644
--- a/plugins/otr/kopete_otr.kcfg
+++ b/plugins/otr/kopete_otr.kcfg
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kopete_otr"/>
<group name="Policy">
<entry name="rbAlways" type="Bool">
diff --git a/plugins/otr/otrguiclient.cpp b/plugins/otr/otrguiclient.cpp
index 863698ede..11ed84566 100644
--- a/plugins/otr/otrguiclient.cpp
+++ b/plugins/otr/otrguiclient.cpp
@@ -45,17 +45,17 @@ OtrGUIClient::OtrGUIClient(Kopete::ChatSession *parent)
{
setComponentName(QStringLiteral("kopete_otr"), i18n("Kopete"));
connect(OTRPlugin::plugin(),
- SIGNAL(destroyed(QObject *)), this,
+ SIGNAL(destroyed(QObject*)), this,
SLOT(deleteLater())

);

- connect(this, SIGNAL(signalOtrChatsession(Kopete::ChatSession *,bool)), OTRPlugin::plugin(), SLOT(slotEnableOtr(Kopete::ChatSession *,bool)));
+ connect(this, SIGNAL(signalOtrChatsession(Kopete::ChatSession*,bool)), OTRPlugin::plugin(), SLOT(slotEnableOtr(Kopete::ChatSession*,bool)));

- connect(OtrlChatInterface::self(), SIGNAL(goneSecure(Kopete::ChatSession *,int)),
- this, SLOT(encryptionEnabled(Kopete::ChatSession *,int)));
+ connect(OtrlChatInterface::self(), SIGNAL(goneSecure(Kopete::ChatSession*,int)),
+ this, SLOT(encryptionEnabled(Kopete::ChatSession*,int)));

- connect(this, SIGNAL(signalVerifyFingerprint(Kopete::ChatSession *)), OTRPlugin::plugin(), SLOT(slotVerifyFingerprint(Kopete::ChatSession *)));
+ connect(this, SIGNAL(signalVerifyFingerprint(Kopete::ChatSession*)), OTRPlugin::plugin(), SLOT(slotVerifyFingerprint(Kopete::ChatSession*)));

m_manager = parent;

diff --git a/plugins/otr/otrlchatinterface.cpp b/plugins/otr/otrlchatinterface.cpp
index 318f1272c..8b0643621 100644
--- a/plugins/otr/otrlchatinterface.cpp
+++ b/plugins/otr/otrlchatinterface.cpp
@@ -608,7 +608,7 @@ int OtrlChatInterface::decryptMessage(Kopete::Message &message)

if (otrl_proto_message_type(body.toLatin1()) == OTRL_MSGTYPE_DATA) {
// an OTR message while we are generating the key... cache the message and replay once the key is generated...
- connect(message.manager(), SIGNAL(closing(Kopete::ChatSession *)), SLOT(chatSessionDestroyed(Kopete::ChatSession *)));
+ connect(message.manager(), SIGNAL(closing(Kopete::ChatSession*)), SLOT(chatSessionDestroyed(Kopete::ChatSession*)));
m_storedMessages.append(message);
}
return 1;
diff --git a/plugins/otr/otrplugin.cpp b/plugins/otr/otrplugin.cpp
index 93d3843e9..a4f6c4027 100644
--- a/plugins/otr/otrplugin.cpp
+++ b/plugins/otr/otrplugin.cpp
@@ -74,8 +74,8 @@ OTRPlugin::OTRPlugin (QObject *parent, const QVariantList & /*args*/)
connect(Kopete::ChatSessionManager::self(), SIGNAL(aboutToSend(Kopete::Message&)),
SLOT(slotOutgoingMessage(Kopete::Message&)));

- connect(Kopete::ChatSessionManager::self(), SIGNAL(chatSessionCreated(Kopete::ChatSession *)),
- this, SLOT(slotNewChatSessionWindow(Kopete::ChatSession *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(chatSessionCreated(Kopete::ChatSession*)),
+ this, SLOT(slotNewChatSessionWindow(Kopete::ChatSession*)));

connect(this, SIGNAL(settingsChanged()), this, SLOT(slotSettingsChanged()));

diff --git a/plugins/otr/otrpreferences.cpp b/plugins/otr/otrpreferences.cpp
index 5cee36297..06267192e 100644
--- a/plugins/otr/otrpreferences.cpp
+++ b/plugins/otr/otrpreferences.cpp
@@ -72,7 +72,7 @@ OTRPreferences::OTRPreferences(QWidget *parent, const QVariantList &args)
connect(preferencesDialog->twSettings, SIGNAL(currentChanged(int)), SLOT(fillFingerprints()));
connect(preferencesDialog->tbFingerprints, SIGNAL(currentCellChanged(int,int,int,int)), SLOT(updateButtons(int,int,int,int)));
connect(preferencesDialog->btForget, &QAbstractButton::clicked, this, &OTRPreferences::forgetFingerprint);
- connect(OtrlChatInterface::self(), SIGNAL(goneSecure(Kopete::ChatSession *,int)), this, SLOT(fillFingerprints()));
+ connect(OtrlChatInterface::self(), SIGNAL(goneSecure(Kopete::ChatSession*,int)), this, SLOT(fillFingerprints()));

int index = 0;
int accountnr = 0;
diff --git a/plugins/privacy/privacymessagehandler.cpp b/plugins/privacy/privacymessagehandler.cpp
index 790d0ff5c..0f32d83c4 100644
--- a/plugins/privacy/privacymessagehandler.cpp
+++ b/plugins/privacy/privacymessagehandler.cpp
@@ -50,7 +50,7 @@ MessageHandler *PrivacyMessageHandlerFactory::create(ChatSession *manager, Messa
return 0;
}
MessageHandler *handler = new PrivacyMessageHandler;
- QObject::connect(handler, SIGNAL(handle(Kopete::MessageEvent *)), d->target, d->slot);
+ QObject::connect(handler, SIGNAL(handle(Kopete::MessageEvent*)), d->target, d->slot);
return handler;
}

diff --git a/plugins/privacy/privacyplugin.cpp b/plugins/privacy/privacyplugin.cpp
index 50e36c3a7..fba984637 100644
--- a/plugins/privacy/privacyplugin.cpp
+++ b/plugins/privacy/privacyplugin.cpp
@@ -65,10 +65,10 @@ PrivacyPlugin::PrivacyPlugin(QObject *parent, const QVariantList &)
setXMLFile(QStringLiteral("privacyui.rc"));

m_inboundHandler = new PrivacyMessageHandlerFactory(Kopete::Message::Inbound,
- Kopete::MessageHandlerFactory::InStageStart, this, SLOT(slotIncomingMessage(Kopete::MessageEvent *)));
+ Kopete::MessageHandlerFactory::InStageStart, this, SLOT(slotIncomingMessage(Kopete::MessageEvent*)));

- connect(Kopete::ChatSessionManager::self(), SIGNAL(viewCreated(KopeteView *)),
- this, SLOT(slotViewCreated(KopeteView *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(viewCreated(KopeteView*)),
+ this, SLOT(slotViewCreated(KopeteView*)));

connect(this, SIGNAL(settingsChanged()), this, SLOT(slotSettingsChanged()));
}
@@ -237,8 +237,8 @@ void PrivacyPlugin::slotViewCreated(KopeteView *view)

if (!m_guiClients.contains(session)) {
m_guiClients.insert(session, new PrivacyGUIClient(session));
- connect(session, SIGNAL(closing(Kopete::ChatSession *)),
- this, SLOT(slotChatSessionClosed(Kopete::ChatSession *)));
+ connect(session, SIGNAL(closing(Kopete::ChatSession*)),
+ this, SLOT(slotChatSessionClosed(Kopete::ChatSession*)));
}
}

diff --git a/plugins/statistics/statisticsplugin.cpp b/plugins/statistics/statisticsplugin.cpp
index b25a09474..3ad7f6cbe 100644
--- a/plugins/statistics/statisticsplugin.cpp
+++ b/plugins/statistics/statisticsplugin.cpp
@@ -94,7 +94,7 @@ void StatisticsPlugin::slotInitialize()
slotMetaContactAdded(metaContact);
slotOnlineStatusChanged(metaContact, metaContact->status());
} else {
- connect(metaContact, SIGNAL(onlineStatusChanged(Kopete::MetaContact *,Kopete::OnlineStatus::StatusType)), this, SLOT(slotDelayedMetaContactAdded(Kopete::MetaContact *,Kopete::OnlineStatus::StatusType)));
+ connect(metaContact, SIGNAL(onlineStatusChanged(Kopete::MetaContact*,Kopete::OnlineStatus::StatusType)), this, SLOT(slotDelayedMetaContactAdded(Kopete::MetaContact*,Kopete::OnlineStatus::StatusType)));
}
}
}
@@ -131,7 +131,7 @@ void StatisticsPlugin::slotAboutToReceive(Kopete::Message &m)

void StatisticsPlugin::slotViewCreated(Kopete::ChatSession *session)
{
- connect(session, SIGNAL(closing(Kopete::ChatSession *)), this, SLOT(slotViewClosed(Kopete::ChatSession *)));
+ connect(session, SIGNAL(closing(Kopete::ChatSession*)), this, SLOT(slotViewClosed(Kopete::ChatSession*)));
}

void StatisticsPlugin::slotViewClosed(Kopete::ChatSession *session)
diff --git a/plugins/translator/translatorguiclient.cpp b/plugins/translator/translatorguiclient.cpp
index b378b7e49..533ac72f1 100644
--- a/plugins/translator/translatorguiclient.cpp
+++ b/plugins/translator/translatorguiclient.cpp
@@ -42,7 +42,7 @@ TranslatorGUIClient::TranslatorGUIClient(Kopete::ChatSession *parent)
setComponentName(QStringLiteral("kopete_translator"), i18n("Kopete"));

//setComponentData( TranslatorPlugin::plugin()->componentData() );
- connect(TranslatorPlugin::plugin(), SIGNAL(destroyed(QObject *)), this, SLOT(deleteLater()));
+ connect(TranslatorPlugin::plugin(), SIGNAL(destroyed(QObject*)), this, SLOT(deleteLater()));

m_manager = parent;

diff --git a/plugins/translator/translatorplugin.cpp b/plugins/translator/translatorplugin.cpp
index f196c5b08..58cd255b4 100644
--- a/plugins/translator/translatorplugin.cpp
+++ b/plugins/translator/translatorplugin.cpp
@@ -70,8 +70,8 @@ TranslatorPlugin::TranslatorPlugin(QObject *parent, const QVariantList & /* args
this, SLOT(slotIncomingMessage(Kopete::Message&)));
connect(Kopete::ChatSessionManager::self(), SIGNAL(aboutToSend(Kopete::Message&)),
this, SLOT(slotOutgoingMessage(Kopete::Message&)));
- connect(Kopete::ChatSessionManager::self(), SIGNAL(chatSessionCreated(Kopete::ChatSession *)),
- this, SLOT(slotNewKMM(Kopete::ChatSession *)));
+ connect(Kopete::ChatSessionManager::self(), SIGNAL(chatSessionCreated(Kopete::ChatSession*)),
+ this, SLOT(slotNewKMM(Kopete::ChatSession*)));

m_actionLanguage = new KSelectAction(QIcon::fromTheme("preferences-desktop-locale"), i18n("Set &Language"), this);
actionCollection()->addAction("contactLanguage", m_actionLanguage);
@@ -275,8 +275,8 @@ QString TranslatorPlugin::googleTranslateMessage(const QString &msg, const QStri
//job->addMetaData( "content-type", "application/x-www-form-urlencoded" );
//job->addMetaData( "referrer", "http://www.google.com" );

- QObject::connect(job, SIGNAL(data(KIO::Job *,QByteArray)), this, SLOT(slotDataReceived(KIO::Job *,QByteArray)));
- QObject::connect(job, SIGNAL(result(KJob *)), this, SLOT(slotJobDone(KJob *)));
+ QObject::connect(job, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(slotDataReceived(KIO::Job*,QByteArray)));
+ QObject::connect(job, SIGNAL(result(KJob*)), this, SLOT(slotJobDone(KJob*)));

// KIO is async and we use a sync API, so use the processEvents hack to work around that
// FIXME: We need to make the libkopete API async to get rid of this processEvents.
@@ -317,8 +317,8 @@ QString TranslatorPlugin::babelTranslateMessage(const QString &msg, const QStrin
job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded");
job->addMetaData("referrer", "http://babelfish.yahoo.com/translate_txt");

- QObject::connect(job, SIGNAL(data(KIO::Job *,QByteArray)), this, SLOT(slotDataReceived(KIO::Job *,QByteArray)));
- QObject::connect(job, SIGNAL(result(KJob *)), this, SLOT(slotJobDone(KJob *)));
+ QObject::connect(job, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(slotDataReceived(KIO::Job*,QByteArray)));
+ QObject::connect(job, SIGNAL(result(KJob*)), this, SLOT(slotJobDone(KJob*)));

// KIO is async and we use a sync API, so use the processEvents hack to work around that
// FIXME: We need to make the libkopete API async to get rid of this processEvents.
@@ -405,8 +405,8 @@ void TranslatorPlugin::slotJobDone(KJob *job)
{
KIO::Job *kioJob = static_cast<KIO::Job *>(job);
m_completed[ kioJob ] = true;
- QObject::disconnect(kioJob, SIGNAL(data(KIO::Job *,QByteArray)), this, SLOT(slotDataReceived(KIO::Job *,QByteArray)));
- QObject::disconnect(kioJob, SIGNAL(result(KJob *)), this, SLOT(slotJobDone(KJob *)));
+ QObject::disconnect(kioJob, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(slotDataReceived(KIO::Job*,QByteArray)));
+ QObject::disconnect(kioJob, SIGNAL(result(KJob*)), this, SLOT(slotJobDone(KJob*)));
}

void TranslatorPlugin::slotSetLanguage()
diff --git a/plugins/urlpicpreview/urlpicpreview.kcfg b/plugins/urlpicpreview/urlpicpreview.kcfg
index 58322b35b..32da81e2d 100644
--- a/plugins/urlpicpreview/urlpicpreview.kcfg
+++ b/plugins/urlpicpreview/urlpicpreview.kcfg
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kopeterc"/>
<group name="URLPicPreview Plugin">
<entry name="PreviewAmount" type="UInt">
diff --git a/protocols/bonjour/bonjouraccount.cpp b/protocols/bonjour/bonjouraccount.cpp
index 0ea32aca3..1706d2c7e 100644
--- a/protocols/bonjour/bonjouraccount.cpp
+++ b/protocols/bonjour/bonjouraccount.cpp
@@ -451,10 +451,10 @@ void BonjourAccount::newIncomingConnection()
QTcpSocket *sock = localServer->nextPendingConnection();

BonjourContactConnection *bcc = new BonjourContactConnection(sock);
- QObject::connect(bcc, SIGNAL(discoveredUserName(BonjourContactConnection *,QString)),
- this, SLOT(discoveredUserName(BonjourContactConnection *,QString)));
- QObject::connect(bcc, SIGNAL(usernameNotInStream(BonjourContactConnection *)),
- this, SLOT(usernameNotInStream(BonjourContactConnection *)));
+ QObject::connect(bcc, SIGNAL(discoveredUserName(BonjourContactConnection*,QString)),
+ this, SLOT(discoveredUserName(BonjourContactConnection*,QString)));
+ QObject::connect(bcc, SIGNAL(usernameNotInStream(BonjourContactConnection*)),
+ this, SLOT(usernameNotInStream(BonjourContactConnection*)));

unknownConnections << bcc;
}
diff --git a/protocols/bonjour/bonjourcontact.cpp b/protocols/bonjour/bonjourcontact.cpp
index 0bb91e703..74b1ecb21 100644
--- a/protocols/bonjour/bonjourcontact.cpp
+++ b/protocols/bonjour/bonjourcontact.cpp
@@ -75,7 +75,7 @@ Kopete::ChatSession *BonjourContact::manager(CanCreateFlags canCreateFlags)
Kopete::ChatSession::Form form = (Kopete::ChatSession::Small);
m_msgManager = Kopete::ChatSessionManager::self()->create(
account()->myself(), contacts, protocol(), form);
- connect(m_msgManager, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession *)),
+ connect(m_msgManager, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession*)),
this, SLOT(sendMessage(Kopete::Message&)));
connect(m_msgManager, SIGNAL(destroyed()), this, SLOT(slotChatSessionDestroyed()));
return m_msgManager;
@@ -197,8 +197,8 @@ void BonjourContact::setConnection(BonjourContactConnection *c)
// can delete the connection (and the socket hence)
connection->setParent(this);

- connect(connection, SIGNAL(disconnected(BonjourContactConnection *)),
- this, SLOT(connectionDisconnected(BonjourContactConnection *)));
+ connect(connection, SIGNAL(disconnected(BonjourContactConnection*)),
+ this, SLOT(connectionDisconnected(BonjourContactConnection*)));

connect(connection, SIGNAL(messageReceived(Kopete::Message)),
this, SLOT(receivedMessage(Kopete::Message)));
diff --git a/protocols/gadu/gaduaccount.cpp b/protocols/gadu/gaduaccount.cpp
index 20824d600..f65c714c6 100644
--- a/protocols/gadu/gaduaccount.cpp
+++ b/protocols/gadu/gaduaccount.cpp
@@ -234,10 +234,10 @@ GaduAccount::initConnections()
{
QObject::connect(p->session_, SIGNAL(error(QString,QString)),
SLOT(error(QString,QString)));
- QObject::connect(p->session_, SIGNAL(messageReceived(KGaduMessage *)),
- SLOT(messageReceived(KGaduMessage *)));
- QObject::connect(p->session_, SIGNAL(contactStatusChanged(KGaduNotify *)),
- SLOT(contactStatusChanged(KGaduNotify *)));
+ QObject::connect(p->session_, SIGNAL(messageReceived(KGaduMessage*)),
+ SLOT(messageReceived(KGaduMessage*)));
+ QObject::connect(p->session_, SIGNAL(contactStatusChanged(KGaduNotify*)),
+ SLOT(contactStatusChanged(KGaduNotify*)));
QObject::connect(p->session_, SIGNAL(connectionFailed(gg_failure_t)),
SLOT(connectionFailed(gg_failure_t)));
QObject::connect(p->session_, SIGNAL(connectionSucceed()),
diff --git a/protocols/gadu/gaducontact.cpp b/protocols/gadu/gaducontact.cpp
index 3ebb270bb..d09dab467 100644
--- a/protocols/gadu/gaducontact.cpp
+++ b/protocols/gadu/gaducontact.cpp
@@ -143,8 +143,8 @@ GaduContact::manager(Kopete::Contact::CanCreateFlags canCreate)
if (!msgManager_ && canCreate) {
msgManager_ = Kopete::ChatSessionManager::self()->create(account_->myself(), thisContact_,
GaduProtocol::protocol());
- connect(msgManager_, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession *)),
- this, SLOT(messageSend(Kopete::Message&,Kopete::ChatSession *)));
+ connect(msgManager_, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession*)),
+ this, SLOT(messageSend(Kopete::Message&,Kopete::ChatSession*)));
connect(msgManager_, SIGNAL(destroyed()), this, SLOT(slotChatSessionDestroyed()));
}
kDebug(14100) << "GaduContact::manager returning: " << msgManager_;
diff --git a/protocols/gadu/gadudcc.cpp b/protocols/gadu/gadudcc.cpp
index 19bef1a4d..fdf88fca5 100644
--- a/protocols/gadu/gadudcc.cpp
+++ b/protocols/gadu/gadudcc.cpp
@@ -133,7 +133,7 @@ GaduDCC::registerAccount(GaduAccount *account)
dccServer = new GaduDCCServer();
}

- connect(dccServer, SIGNAL(incoming(gg_dcc *,bool&)), SLOT(slotIncoming(gg_dcc *,bool&)));
+ connect(dccServer, SIGNAL(incoming(gg_dcc*,bool&)), SLOT(slotIncoming(gg_dcc*,bool&)));

initmutex.unlock();

diff --git a/protocols/gadu/gadudcctransaction.cpp b/protocols/gadu/gadudcctransaction.cpp
index 27d501867..517829f48 100644
--- a/protocols/gadu/gadudcctransaction.cpp
+++ b/protocols/gadu/gadudcctransaction.cpp
@@ -156,7 +156,7 @@ GaduDCCTransaction::setupIncoming(gg_dcc *dccS)

connect(Kopete::TransferManager::transferManager(), SIGNAL(accepted(Kopete::Transfer *,
QString)),
- this, SLOT(slotIncomingTransferAccepted(Kopete::Transfer *,QString)));
+ this, SLOT(slotIncomingTransferAccepted(Kopete::Transfer*,QString)));
connect(Kopete::TransferManager::transferManager(), SIGNAL(refused(Kopete::FileTransferInfo)),
this, SLOT(slotTransferRefused(Kopete::FileTransferInfo)));

@@ -287,7 +287,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted(Kopete::Transfer *transfer, con
dccSock_->file_fd = localFile_.handle();
}

- connect(transfer, SIGNAL(result(KJob *)), this, SLOT(slotTransferResult()));
+ connect(transfer, SIGNAL(result(KJob*)), this, SLOT(slotTransferResult()));

// reenable notifiers
enableNotifiers(dccSock_->check);
diff --git a/protocols/gadu/gadueditcontact.cpp b/protocols/gadu/gadueditcontact.cpp
index 691acb1e6..1e96f603b 100644
--- a/protocols/gadu/gadueditcontact.cpp
+++ b/protocols/gadu/gadueditcontact.cpp
@@ -130,8 +130,8 @@ GaduEditContact::init()

show();
connect(this, SIGNAL(okClicked()), SLOT(slotApply()));
- connect(ui_->groups, SIGNAL(itemClicked(QTreeWidgetItem *,0)),
- SLOT(listClicked(QTreeWidgetItem *)));
+ connect(ui_->groups, SIGNAL(itemClicked(QTreeWidgetItem*,0)),
+ SLOT(listClicked(QTreeWidgetItem*)));
}

void
diff --git a/protocols/jabber/jabberfiletransfer.cpp b/protocols/jabber/jabberfiletransfer.cpp
index db47cc701..2038edae7 100644
--- a/protocols/jabber/jabberfiletransfer.cpp
+++ b/protocols/jabber/jabberfiletransfer.cpp
@@ -65,8 +65,8 @@ JabberFileTransfer::JabberFileTransfer (JabberAccount *account, XMPP::FileTransf
Kopete::ContactList::self()->addMetaContact(metaContact);
}

- connect(Kopete::TransferManager::transferManager(), SIGNAL(accepted(Kopete::Transfer *,QString)),
- this, SLOT(slotIncomingTransferAccepted(Kopete::Transfer *,QString)));
+ connect(Kopete::TransferManager::transferManager(), SIGNAL(accepted(Kopete::Transfer*,QString)),
+ this, SLOT(slotIncomingTransferAccepted(Kopete::Transfer*,QString)));
connect(Kopete::TransferManager::transferManager(), SIGNAL(refused(Kopete::FileTransferInfo)),
this, SLOT(slotTransferRefused(Kopete::FileTransferInfo)));

@@ -123,7 +123,7 @@ JabberFileTransfer::JabberFileTransfer (JabberAccount *account, JabberBaseContac
contact->contactId(),
Kopete::FileTransferInfo::Outgoing);

- connect(mKopeteTransfer, SIGNAL(result(KJob *)), this, SLOT(slotTransferResult()));
+ connect(mKopeteTransfer, SIGNAL(result(KJob*)), this, SLOT(slotTransferResult()));

mXMPPTransfer = mAccount->client()->fileTransferManager()->createTransfer();

@@ -224,7 +224,7 @@ void JabberFileTransfer::slotIncomingTransferAccepted(Kopete::Transfer *transfer

deleteLater();
} else {
- connect(mKopeteTransfer, SIGNAL(result(KJob *)), this, SLOT(slotTransferResult()));
+ connect(mKopeteTransfer, SIGNAL(result(KJob*)), this, SLOT(slotTransferResult()));
connect(mXMPPTransfer, SIGNAL(readyRead(QByteArray)), this, SLOT(slotIncomingDataReady(QByteArray)));
connect(mXMPPTransfer, SIGNAL(error(int)), this, SLOT(slotTransferError(int)));
mXMPPTransfer->accept(offset, length);
diff --git a/protocols/jabber/jingle/jinglecallsmanager.cpp b/protocols/jabber/jingle/jinglecallsmanager.cpp
index 42c044f70..ca6d99ee2 100644
--- a/protocols/jabber/jingle/jinglecallsmanager.cpp
+++ b/protocols/jabber/jingle/jinglecallsmanager.cpp
@@ -149,10 +149,10 @@ void JingleCallsManager::init()
d->mediaManager = new MediaManager(inputDev, outputDev);

d->client->jingleSessionManager()->setSupportedVideoPayloads(d->videoPayloads);
- connect((const QObject *)d->client->jingleSessionManager(), SIGNAL(newJingleSession(XMPP::JingleSession *)),
- this, SLOT(slotNewSession(XMPP::JingleSession *)));
- connect((const QObject *)d->client->jingleSessionManager(), SIGNAL(sessionTerminate(XMPP::JingleSession *)),
- this, SLOT(slotSessionTerminate(XMPP::JingleSession *)));
+ connect((const QObject *)d->client->jingleSessionManager(), SIGNAL(newJingleSession(XMPP::JingleSession*)),
+ this, SLOT(slotNewSession(XMPP::JingleSession*)));
+ connect((const QObject *)d->client->jingleSessionManager(), SIGNAL(sessionTerminate(XMPP::JingleSession*)),
+ this, SLOT(slotSessionTerminate(XMPP::JingleSession*)));
}

bool JingleCallsManager::startNewSession(const XMPP::Jid &toJid)
diff --git a/protocols/sms/services/smsclient.cpp b/protocols/sms/services/smsclient.cpp
index 09a29efbe..ed85e5185 100644
--- a/protocols/sms/services/smsclient.cpp
+++ b/protocols/sms/services/smsclient.cpp
@@ -84,9 +84,9 @@ void SMSClient::send(const Kopete::Message &msg)
*p << provider + ':' + nr;
*p << message;

- QObject::connect(p, SIGNAL(processExited(K3Process *)), this, SLOT(slotSendFinished(K3Process *)));
- QObject::connect(p, SIGNAL(receivedStdout(K3Process *,char *,int)), this, SLOT(slotReceivedOutput(K3Process *,char *,int)));
- QObject::connect(p, SIGNAL(receivedStderr(K3Process *,char *,int)), this, SLOT(slotReceivedOutput(K3Process *,char *,int)));
+ QObject::connect(p, SIGNAL(processExited(K3Process*)), this, SLOT(slotSendFinished(K3Process*)));
+ QObject::connect(p, SIGNAL(receivedStdout(K3Process*,char*,int)), this, SLOT(slotReceivedOutput(K3Process*,char*,int)));
+ QObject::connect(p, SIGNAL(receivedStderr(K3Process*,char*,int)), this, SLOT(slotReceivedOutput(K3Process*,char*,int)));

p->start(K3Process::Block, K3Process::AllOutput);
}
diff --git a/protocols/sms/services/smssendprovider.cpp b/protocols/sms/services/smssendprovider.cpp
index 1ff3a9ee7..fd056735d 100644
--- a/protocols/sms/services/smssendprovider.cpp
+++ b/protocols/sms/services/smssendprovider.cpp
@@ -234,8 +234,8 @@ void SMSSendProvider::send(const Kopete::Message &msg)
*p << QString("%1/bin/smssend").arg(prefix) << provider << values;

output = "";
- connect(p, SIGNAL(processExited(K3Process *)), this, SLOT(slotSendFinished(K3Process *)));
- connect(p, SIGNAL(receivedStdout(K3Process *,char *,int)), this, SLOT(slotReceivedOutput(K3Process *,char *,int)));
+ connect(p, SIGNAL(processExited(K3Process*)), this, SLOT(slotSendFinished(K3Process*)));
+ connect(p, SIGNAL(receivedStdout(K3Process*,char*,int)), this, SLOT(slotReceivedOutput(K3Process*,char*,int)));
// connect( p, SIGNAL(receivedStderr(K3Process*,char*,int)), this, SLOT(slotReceivedOutput(K3Process*,char*,int)));

p->start(K3Process::NotifyOnExit, K3Process::AllOutput);
diff --git a/protocols/sms/smscontact.cpp b/protocols/sms/smscontact.cpp
index 9645b73b8..2ccc8b43f 100644
--- a/protocols/sms/smscontact.cpp
+++ b/protocols/sms/smscontact.cpp
@@ -78,7 +78,7 @@ Kopete::ChatSession *SMSContact::manager(Kopete::Contact::CanCreateFlags canCrea
QList<Kopete::Contact *> contacts;
contacts.append(this);
m_msgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), contacts, protocol());
- connect(m_msgManager, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession *)),
+ connect(m_msgManager, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession*)),
account(), SLOT(slotSendMessage(Kopete::Message&)));
connect(m_msgManager, SIGNAL(destroyed()), this, SLOT(slotChatSessionDestroyed()));
return m_msgManager;
diff --git a/protocols/winpopup/wpcontact.cpp b/protocols/winpopup/wpcontact.cpp
index d946bf9e1..5bb0684b3 100644
--- a/protocols/winpopup/wpcontact.cpp
+++ b/protocols/winpopup/wpcontact.cpp
@@ -79,8 +79,8 @@ Kopete::ChatSession *WPContact::manager(Kopete::Contact::CanCreateFlags /*canCre

m_manager = Kopete::ChatSessionManager::self()->create(account()->myself(), singleContact, protocol());

- connect(m_manager, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession *)), this, SLOT(slotSendMessage(Kopete::Message&)));
- connect(m_manager, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession *)), m_manager, SLOT(appendMessage(Kopete::Message&)));
+ connect(m_manager, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession*)), this, SLOT(slotSendMessage(Kopete::Message&)));
+ connect(m_manager, SIGNAL(messageSent(Kopete::Message&,Kopete::ChatSession*)), m_manager, SLOT(appendMessage(Kopete::Message&)));
connect(m_manager, SIGNAL(destroyed()), this, SLOT(slotChatSessionDestroyed()));
}

[Yuri Chornoivan]

Git commit 1a04ec890396eb9b10868673cab17d639d91d53b by Yuri Chornoivan.
Committed on 07/10/2018 at 10:24.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M +8 -9 ksirk/Dialogs/InvasionSlider.cpp
M +1 -2 ksirk/Dialogs/tcpconnectwidget.h
M +1 -1 ksirk/GameLogic/KMessageParts.h
M +1 -1 ksirk/Jabber/jabberbookmarks.h
M +1 -1 ksirk/Jabber/jabbergroupcontact.cpp
M +4 -4 ksirk/Jabber/kmessagejabber.h
M +2 -1 ksirk/Jabber/privacylist.cpp
M +2 -1 ksirk/Jabber/privacylist.h
M +2 -1 ksirk/Jabber/privacylistitem.cpp
M +2 -1 ksirk/Jabber/privacylistitem.h
M +2 -1 ksirk/Jabber/privacymanager.cpp
M +2 -1 ksirk/Jabber/privacymanager.h
M +12 -14 ksirk/kgamewin.cpp
M +4 -2 ksirk/ksirksettings.kcfg
M +4 -5 ksirkskineditor/mainwindow.cpp

https://commits.kde.org/ksirk/1a04ec890396eb9b10868673cab17d639d91d53b

diff --git a/ksirk/Dialogs/InvasionSlider.cpp b/ksirk/Dialogs/InvasionSlider.cpp
index f02c3f9..6c96145 100644
--- a/ksirk/Dialogs/InvasionSlider.cpp
+++ b/ksirk/Dialogs/InvasionSlider.cpp
@@ -50,15 +50,18 @@


//include files for QT
+#include <QAction>
+#include <QDialog>
#include <QDockWidget>
-#include <QTreeView>
-#include <QPushButton>
#include <QGridLayout>
-#include <QString>
-#include <QVBoxLayout>
+#include <QHostInfo>
#include <QMovie>
+#include <QPushButton>
+#include <QString>
+#include <QSvgRenderer>
+#include <QTreeView>
#include <QUuid>
-#include <QHostInfo>
+#include <QVBoxLayout>

// include files for KDE
#include <kiconloader.h>
@@ -70,12 +73,8 @@
#include <kactioncollection.h>
#include "ksirk_debug.h"
#include <phonon/mediaobject.h>
-#include <QPushButton>
#include <kgamepopupitem.h>
#include <KToolBar>
-#include <QAction>
-#include <QSvgRenderer>
-#include <QDialog>
#include <KAboutData>

#include <sys/utsname.h>
diff --git a/ksirk/Dialogs/tcpconnectwidget.h b/ksirk/Dialogs/tcpconnectwidget.h
index 127e5c1..f155346 100644
--- a/ksirk/Dialogs/tcpconnectwidget.h
+++ b/ksirk/Dialogs/tcpconnectwidget.h
@@ -25,8 +25,7 @@
#include "ui_tcpconnectwidget.h"

#include <QWidget>
-
-#include <QtCore/QMap>
+#include <QMap>

namespace Ksirk
{
diff --git a/ksirk/GameLogic/KMessageParts.h b/ksirk/GameLogic/KMessageParts.h
index ff24845..b3c5397 100644
--- a/ksirk/GameLogic/KMessageParts.h
+++ b/ksirk/GameLogic/KMessageParts.h
@@ -32,7 +32,7 @@ namespace Ksirk {
namespace GameLogic {

/**
- * This class holds a serie of strings and pixmaps that have to be transfered
+ * This class holds a serie of strings and pixmaps that have to be transferred
* on the network and displayed in a specified order.
*
* It stores one collection of strings and one collection of pixmaps, each of
diff --git a/ksirk/Jabber/jabberbookmarks.h b/ksirk/Jabber/jabberbookmarks.h
index 9efc3ef..0e78233 100644
--- a/ksirk/Jabber/jabberbookmarks.h
+++ b/ksirk/Jabber/jabberbookmarks.h
@@ -45,7 +45,7 @@ class JabberBookmarks : public QObject

/**
* update or create en entry with the given jid.
- * the jid ressource is the nickname
+ * the jid resource is the nickname
*/
void insertGroupChat(const XMPP::Jid &jid);

diff --git a/ksirk/Jabber/jabbergroupcontact.cpp b/ksirk/Jabber/jabbergroupcontact.cpp
index 606ee58..3e9df87 100644
--- a/ksirk/Jabber/jabbergroupcontact.cpp
+++ b/ksirk/Jabber/jabbergroupcontact.cpp
@@ -331,7 +331,7 @@ void JabberGroupContact::slotChatSessionDeleted ()
account()->client()->leaveGroupChat ( mRosterItem.jid().host (), mRosterItem.jid().user () );
}

- //deleteLater(); //we will be deleted later when the the account will know we have left
+ //deleteLater(); //we will be deleted later when the account will know we have left

}

diff --git a/ksirk/Jabber/kmessagejabber.h b/ksirk/Jabber/kmessagejabber.h
index 9382fd1..fed1ed8 100644
--- a/ksirk/Jabber/kmessagejabber.h
+++ b/ksirk/Jabber/kmessagejabber.h
@@ -25,10 +25,10 @@
#ifndef KMESSAGEJABBER_H
#define KMESSAGEJABBER_H

-#include <QtCore/QObject>
-#include <QtCore/QProcess>
-#include <QtCore/QString>
-#include <QtNetwork/QHostAddress>
+#include <QObject>
+#include <QProcess>
+#include <QString>
+#include <QHostAddress>
#include "jabber_protocol_debug.h"

#define USE_UNSTABLE_LIBKDEGAMESPRIVATE_API
diff --git a/ksirk/Jabber/privacylist.cpp b/ksirk/Jabber/privacylist.cpp
index 4d617a6..db0c64e 100644
--- a/ksirk/Jabber/privacylist.cpp
+++ b/ksirk/Jabber/privacylist.cpp
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
*/

diff --git a/ksirk/Jabber/privacylist.h b/ksirk/Jabber/privacylist.h
index aa9ea60..a7a545a 100644
--- a/ksirk/Jabber/privacylist.h
+++ b/ksirk/Jabber/privacylist.h
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
*/

diff --git a/ksirk/Jabber/privacylistitem.cpp b/ksirk/Jabber/privacylistitem.cpp
index 2e80bbf..41848c3 100644
--- a/ksirk/Jabber/privacylistitem.cpp
+++ b/ksirk/Jabber/privacylistitem.cpp
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
*/

diff --git a/ksirk/Jabber/privacylistitem.h b/ksirk/Jabber/privacylistitem.h
index f5b3a5c..a9a9790 100644
--- a/ksirk/Jabber/privacylistitem.h
+++ b/ksirk/Jabber/privacylistitem.h
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
*/

diff --git a/ksirk/Jabber/privacymanager.cpp b/ksirk/Jabber/privacymanager.cpp
index dfc5c14..d86a18f 100644
--- a/ksirk/Jabber/privacymanager.cpp
+++ b/ksirk/Jabber/privacymanager.cpp
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
*/
#include "xmpp_xmlcommon.h"
diff --git a/ksirk/Jabber/privacymanager.h b/ksirk/Jabber/privacymanager.h
index 31efab4..01606a4 100644
--- a/ksirk/Jabber/privacymanager.h
+++ b/ksirk/Jabber/privacymanager.h
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*
*/

diff --git a/ksirk/kgamewin.cpp b/ksirk/kgamewin.cpp
index dd87314..19e547a 100644
--- a/ksirk/kgamewin.cpp
+++ b/ksirk/kgamewin.cpp
@@ -52,17 +52,22 @@


//include files for QT
+#include <QAction>
+#include <QDialog>
#include <QDockWidget>
-#include <QTreeView>
-#include <QPushButton>
+#include <QFileDialog>
#include <QGridLayout>
-#include <QString>
-#include <QVBoxLayout>
-#include <QMovie>
-#include <QUuid>
#include <QHostInfo>
-#include <QFileDialog>
+#include <QIcon>
#include <QMenuBar>
+#include <QMovie>
+#include <QPushButton>
+#include <QStatusBar>
+#include <QString>
+#include <QSvgRenderer>
+#include <QTreeView>
+#include <QUuid>
+#include <QVBoxLayout>

// include files for KDE
#include <kiconloader.h>
@@ -74,16 +79,9 @@
#include <kactioncollection.h>
#include "ksirk_debug.h"
#include <phonon/mediaobject.h>
-#include <QPushButton>
#include <kgamepopupitem.h>
-#include <QStatusBar>
#include <KToolBar>
-#include <QAction>
-#include <QSvgRenderer>
-#include <QDialog>
-#include <QVBoxLayout>
#include <KAboutData>
-#include <QIcon>
#define USE_UNSTABLE_LIBKDEGAMESPRIVATE_API
#include <libkdegamesprivate/kgame/kgamechat.h>
#include <sys/utsname.h>
diff --git a/ksirk/ksirksettings.kcfg b/ksirk/ksirksettings.kcfg
index 593a4b0..fc26078 100644
--- a/ksirk/ksirksettings.kcfg
+++ b/ksirk/ksirksettings.kcfg
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="ksirkrc"/>
<group name="General">
<entry name="spritesSpeed" type="Int">
diff --git a/ksirkskineditor/mainwindow.cpp b/ksirkskineditor/mainwindow.cpp
index d6f5550..1821bc9 100644
--- a/ksirkskineditor/mainwindow.cpp
+++ b/ksirkskineditor/mainwindow.cpp
@@ -35,7 +35,9 @@
#include "goal.h"

//include files for QT
+#include <QAction>
#include <QDockWidget>
+#include <QFileDialog>
#include <QTreeView>
#include <QPushButton>
#include <QGridLayout>
@@ -49,11 +51,12 @@
#include <QBitmap>
#include <QInputDialog>
#include <QMenuBar>
+#include <QStatusBar>
+#include <QSvgRenderer>

// include files for KDE
#include <kiconloader.h>
#include <kmessagebox.h>
-#include <QFileDialog>
#include <KLocalizedString>
#include <kconfig.h>
#include <kstandardgameaction.h>
@@ -61,11 +64,7 @@
#include <kactioncollection.h>
#include "ksirkskineditor_debug.h"
#include <phonon/mediaobject.h>
-#include <QPushButton>
-#include <QStatusBar>
#include <KToolBar>
-#include <QAction>
-#include <QSvgRenderer>
#include <KAboutApplicationDialog>
#include <KRecentFilesAction>