Commit 15c144c0 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix minor EBN issues and typos

parent 952b36f4
......@@ -16,8 +16,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef NylasMailImportData_H
#define NylasMailImportData_H
#ifndef NYLASMAILDATA_H
#define NYLASMAILDATA_H
#include <ImportWizard/AbstractImporter>
......@@ -37,4 +37,4 @@ public:
QString name() const override;
};
#endif /* NylasMailImportData_H */
#endif /* NYLASMAILDATA_H */
......@@ -26,8 +26,8 @@
#include <kpluginfactory.h>
#include <QtCore/QFile>
#include <QtCore/QTextStream>
#include <QFile>
#include <QTextStream>
K_PLUGIN_FACTORY(CoisceimPartFactory, registerPlugin<CoisceimPart>();
)
......
......@@ -32,7 +32,6 @@
#include <KSharedConfig>
#include <AkonadiCore/Monitor>
#include <KSharedConfig>
#include "createfoldercontentswidget.h"
#include "eventselectorwidget.h"
......
......@@ -367,7 +367,7 @@ void CSVImportDialog::initGUI()
mDelimiterGroup->addButton(button, 3);
delimiterLayout->addWidget(button, 1, 1);
button = new QRadioButton(i18nc("@option:radio Custum field separator", "Other"));
button = new QRadioButton(i18nc("@option:radio Custom field separator", "Other"));
button->setToolTip(
i18nc("@info:tooltip", "Set the field separator to a custom character"));
button->setWhatsThis(
......
......@@ -645,7 +645,7 @@ void GMXImportExportPluginInterface::importGMX()
addresseeIt != addresseeMap.end(); ++addresseeIt) {
KContacts::Addressee *addressee = addresseeIt.value();
// Add categories
// catgories is a bitfield with max 31 defined categories
// categories is a bitfield with max 31 defined categories
int categories = categoriesOfAddressee[ addresseeIt.key() ].toInt();
for (int i = 32; i >= 0; --i) {
// convert category index to bitfield value for comparison
......
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef MERGECONTACTTEST_H
#define MERGECONTACTTEST_H
#ifndef MERGECONTACTSTEST_H
#define MERGECONTACTSTEST_H
#include <QObject>
......@@ -98,4 +98,4 @@ private Q_SLOTS:
void checkNeedManualSelectionWithBirthday();
};
#endif // MERGECONTACTTEST_H
#endif // MERGECONTACTSTEST_H
......@@ -149,7 +149,7 @@ void MergeContactWidgetTest::shouldEmitSignalsWhenThereIsElementSelected()
QCOMPARE(spy.count(), 1);
listWidget->item(1)->setCheckState(Qt::Unchecked);
QTest::mouseClick(button, Qt::LeftButton);
QCOMPARE(spy.count(), 1); //No new signal emited when we are not 2 items checked
QCOMPARE(spy.count(), 1); //No new signal emitted when we are not 2 items checked
#endif
}
......
......@@ -23,7 +23,6 @@
#include "job/mergecontactsjob.h"
#include "widgets/mergecontacterrorlabel.h"
#include "widgets/mergecontactselectinformationscrollarea.h"
#include <widgets/mergecontactselectinformationscrollarea.h>
#include <AkonadiCore/Item>
......
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef CONFIRMADDRESSCONFIGUREWIDGET_H
#define CONFIRMADDRESSCONFIGUREWIDGET_H
#ifndef EXTERNALCOMPOSERCONFIGUREWIDGET_H
#define EXTERNALCOMPOSERCONFIGUREWIDGET_H
#include <QWidget>
#include <MessageComposer/PluginEditorInitConfigureWidget>
......@@ -39,4 +39,4 @@ private:
KUrlRequester *mEditorRequester = nullptr;
};
#endif // CONFIRMADDRESSCONFIGUREWIDGET_H
#endif // EXTERNALCOMPOSERCONFIGUREWIDGET_H
......@@ -24,7 +24,6 @@
#include <KLocalizedString>
#include <KActionCollection>
#include <KSharedConfig>
#include <KSharedConfig>
#include <KConfigGroup>
#include <QAction>
#include <QNetworkConfigurationManager>
......
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef ISGDSHORTURLENGINEPLUGIN_H
#define ISGDSHORTURLENGINEPLUGIN_H
#ifndef TRIOPABSHORTURLENGINEPLUGIN_H
#define TRIOPABSHORTURLENGINEPLUGIN_H
#include "../shorturlengineplugin.h"
......@@ -35,4 +35,4 @@ public:
QString engineName() const override;
};
#endif // ISGDSHORTURLENGINEPLUGIN_H
#endif // TRIOPABSHORTURLENGINEPLUGIN_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef ISGDSHORTURLENGINEPLUGIN_H
#define ISGDSHORTURLENGINEPLUGIN_H
#ifndef TRIOPABSHORTURLENGINEPLUGIN_H
#define TRIOPABSHORTURLENGINEPLUGIN_H
#include "../shorturlengineplugin.h"
......@@ -35,4 +35,4 @@ public:
QString engineName() const override;
};
#endif // ISGDSHORTURLENGINEPLUGIN_H
#endif // TRIOPABSHORTURLENGINEPLUGIN_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef CONFIRMADDRESSCONFIGUREWIDGET_H
#define CONFIRMADDRESSCONFIGUREWIDGET_H
#ifndef AUTOMATICADDCONTACTSCONFIGUREWIDGET_H
#define AUTOMATICADDCONTACTSCONFIGUREWIDGET_H
#include <QWidget>
#include <MessageComposer/PluginEditorCheckBeforeSendConfigureWidget>
......@@ -37,4 +37,4 @@ private:
AutomaticAddContactsConfigureTab *mConfigureTab = nullptr;
};
#endif // CONFIRMADDRESSCONFIGUREWIDGET_H
#endif // AUTOMATICADDCONTACTSCONFIGUREWIDGET_H
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef CHECKBEFORESENDINTERFACE_H
#define CHECKBEFORESENDINTERFACE_H
#ifndef AUTOMATICADDCONTACTSINTERFACE_H
#define AUTOMATICADDCONTACTSINTERFACE_H
#include <MessageComposer/PluginEditorCheckBeforeSendInterface>
#include <AkonadiCore/Collection>
......@@ -47,4 +47,4 @@ private:
QHash<uint, AutomaticAddContactsSettings> mHashSettings;
};
#endif // CHECKBEFORESENDINTERFACE_H
#endif // AUTOMATICADDCONTACTSINTERFACE_H
......@@ -456,7 +456,7 @@ void AntiSpamWizard::accept()
/* Now that all the filters have been added to the list, tell
* the filter manager about it. That will Q_EMIT filterListUpdate
* which will result in the filter list in kmmainwidget being
* initialized. This should happend only once. */
* initialized. This should happened only once. */
if (!filterList.isEmpty()) {
MailCommon::FilterManager::instance()->appendFilters(filterList, replaceExistingFilters);
}
......@@ -619,7 +619,7 @@ void AntiSpamWizard::slotBuildSummary()
}
sortFilterOnExistance(i18n("Spam Handling"), newFilters, replaceFilters);
// The need for a andling of status "probably spam" depends on the tools chosen
// The need for a handling of status "probably spam" depends on the tools chosen
if (mSpamRulesPage->moveUnsureSelected()) {
bool atLeastOneUnsurePattern = false;
end = mToolList.constEnd();
......
......@@ -58,7 +58,7 @@ class ASWizSummaryPage;
The wizard helps to create filter rules to let KMail operate
with external anti-spam tools. The wizard tries to detect the
tools, but the user can overide the preselections.
tools, but the user can override the preselections.
Then the user can decide what functionality shall be supported
by the created filter rules.
The wizard will append the created filter rules after the
......@@ -165,7 +165,7 @@ protected:
bool isVirusTool() const;
private:
// used to identifiy configs for the same tool
// used to identify configs for the same tool
QString mId;
// The version of the config data, used for merging and
// detecting newer configs
......
......@@ -17,8 +17,8 @@
02110-1301, USA.
*/
#ifndef MAILTRANSPORT_SENDMAILTRANSPORTCONFIGDIALOG_H
#define MAILTRANSPORT_SENDMAILTRANSPORTCONFIGDIALOG_H
#ifndef MAILTRANSPORT_SENDMAILCONFIGDIALOG_H
#define MAILTRANSPORT_SENDMAILCONFIGDIALOG_H
#include <QDialog>
namespace MailTransport {
......
......@@ -26,7 +26,7 @@
#include <mailtransport/transportjob.h>
#include <QtCore/QProcess>
#include <QProcess>
namespace MailTransport {
/**
......
......@@ -18,8 +18,8 @@
02110-1301, USA.
*/
#ifndef MESSAGECORE_TESTS_UTIL_H
#define MESSAGECORE_TESTS_UTIL_H
#ifndef TESTOBJECTTREESOURCE_H
#define TESTOBJECTTREESOURCE_H
#include <MessageViewer/ObjectTreeEmptySource>
#include <MessageViewer/CSSHelperBase>
......
......@@ -81,7 +81,6 @@ using namespace KCalCore;
#include <QTemporaryFile>
#include <QIcon>
#include <QFileDialog>
#include <QMimeDatabase>
#include <QDesktopServices>
#include <QInputDialog>
#include <QMenu>
......@@ -196,7 +195,7 @@ public:
return false;
}
/** Formating is async now because we need to fetch incidences from akonadi.
/** Formatting is async now because we need to fetch incidences from akonadi.
Basically this method (format()) will be called twice. The first time
it creates the memento that fetches incidences and returns.
......@@ -1098,7 +1097,7 @@ public:
bool ensureKorganizerRunning(bool switchTo) const
{
// FIXME: this function should be inside a QObject, and async,
// and Q_EMIT a signal when korg registered itself successfuly
// and Q_EMIT a signal when korg registered itself successfully
// Or better, use DBus activation in all cases.
......@@ -1393,7 +1392,7 @@ public:
if (path.startsWith(QLatin1String("ATTACH:"))) {
name = QString::fromUtf8(QByteArray::fromBase64(path.mid(7).toUtf8()));
} else {
return false; //because it isn't an attachment inviation
return false; //because it isn't an attachment invitation
}
QString iCal;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment