Commit f82241ff authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix minor EBN issues

parent 9219b4a2
......@@ -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()
......
......@@ -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 {
......
......@@ -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
......@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef UNIFIEDBOXMANAGER_H
#define UNIFIEDBOXMANAGER_H
#ifndef UNIFIEDMAILBOXMANAGER_H
#define UNIFIEDMAILBOXMANAGER_H
#include "utils.h"
......
......@@ -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;
}
......
......@@ -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 */
......@@ -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);
......
......@@ -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>
......
......@@ -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());
......
......@@ -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);
......
......@@ -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;
......
......@@ -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) {
......
......@@ -99,7 +99,7 @@ using KMail::MailServiceImpl;
#include <QDir>
#include <QWidget>
#include <QFileInfo>
#include <QtDBus/QtDBus>
#include <QtDBus>
#include <MailCommon/ResourceReadConfigFile>
......
......@@ -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"
......
......@@ -32,7 +32,6 @@
#include <KConfigGui>
#include <QMenuBar>
#include <KConfigGui>
#include <KLocalizedString>
#include <kedittoolbar.h>
#include <kconfig.h>
......
......@@ -21,8 +21,8 @@
*
*/
#include "incompleteindexdialog.h"
#include "searchwindow.h"
#include "incompleteindexdialog.h"
#include "MailCommon/FolderRequester"
#include "kmcommands.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 */
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