[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmail-account-wizard] src: Fix minor EBN issues
From:       Yuri Chornoivan <null () kde ! org>
Date:       2018-09-13 17:36:09
Message-ID: E1g0VXF-0004r4-VW () code ! kde ! org
[Download RAW message or body]

Git commit 9b655eb1b3b70fe398e0e34c7976e4c3103178a4 by Yuri Chornoivan.
Committed on 13/09/2018 at 17:35.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M  +0    -1    src/global.cpp
M  +1    -1    src/inprocess-main.cpp
M  +5    -0    src/inprocess-main.h
M  +0    -1    src/ispdb/autoconfigkolabldap.cpp
M  +1    -1    src/ispdb/ispdb.h
M  +1    -1    src/personaldatapage.cpp
M  +2    -2    src/resource.cpp
M  +1    -1    src/setupispdb.cpp
M  +1    -1    src/setupmanager.cpp

https://commits.kde.org/kmail-account-wizard/9b655eb1b3b70fe398e0e34c7976e4c3103178a4

diff --git a/src/global.cpp b/src/global.cpp
index 24e6155..734e144 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -23,7 +23,6 @@
 #include <qfileinfo.h>
 #include <QDir>
 #include <kio/copyjob.h>
-#include <QDir>
 #include <QStandardPaths>
 
 class GlobalPrivate
diff --git a/src/inprocess-main.cpp b/src/inprocess-main.cpp
index 19744b2..dc89b84 100644
--- a/src/inprocess-main.cpp
+++ b/src/inprocess-main.cpp
@@ -17,8 +17,8 @@
     02110-1301, USA.
 */
 
-#include "dialog.h"
 #include "inprocess-main.h"
+#include "dialog.h"
 #include "global.h"
 
 #include <QObject>
diff --git a/src/inprocess-main.h b/src/inprocess-main.h
index c570251..7b9fd3f 100644
--- a/src/inprocess-main.h
+++ b/src/inprocess-main.h
@@ -17,6 +17,9 @@
     02110-1301, USA.
 */
 
+#ifndef INPROCESS_MAIN_H
+#define INPROCESS_MAIN_H
+
 #include "dialog.h"
 #include "global.h"
 
@@ -34,3 +37,5 @@ public:
 public Q_SLOTS:
     void run(const QStringList &types, QWidget *parent);
 };
+
+#endif
diff --git a/src/ispdb/autoconfigkolabldap.cpp b/src/ispdb/autoconfigkolabldap.cpp
index 37521c1..15056a8 100644
--- a/src/ispdb/autoconfigkolabldap.cpp
+++ b/src/ispdb/autoconfigkolabldap.cpp
@@ -3,7 +3,6 @@
  *
  * 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 cense as published by
  * the Free Software Foundation, either version 2: of the License, or
  * (at your option) any later version.
  *
diff --git a/src/ispdb/ispdb.h b/src/ispdb/ispdb.h
index bc86dba..b3fff33 100644
--- a/src/ispdb/ispdb.h
+++ b/src/ispdb/ispdb.h
@@ -141,7 +141,7 @@ protected:
         @return the standard url for autoconfig depends on serverType
         @param type of request (ex. "mail")
         @param version of the file (example for mail "1.1")
-        @param auth use authentification with username & password to access \
autoconfig file +        @param auth use authentication with username & password to \
access autoconfig file  (username is the emailaddress)
         @param crypt use https
      */
diff --git a/src/personaldatapage.cpp b/src/personaldatapage.cpp
index 3963cae..0d0842f 100644
--- a/src/personaldatapage.cpp
+++ b/src/personaldatapage.cpp
@@ -21,7 +21,7 @@
 
 #include "personaldatapage.h"
 
-#include "config-enterprise.h"
+#include <config-enterprise.h>
 #include "global.h"
 #include "dialog.h"
 #include "transport.h"
diff --git a/src/resource.cpp b/src/resource.cpp
index 07ff210..7fcf63a 100644
--- a/src/resource.cpp
+++ b/src/resource.cpp
@@ -28,8 +28,8 @@
 
 #include <QMetaMethod>
 #include <QVariant>
-#include <QtDBus/qdbusinterface.h>
-#include <QtDBus/qdbusreply.h>
+#include <QDBusInterface>
+#include <QDBusReply>
 
 using namespace Akonadi;
 
diff --git a/src/setupispdb.cpp b/src/setupispdb.cpp
index b6d5314..403ee9d 100644
--- a/src/setupispdb.cpp
+++ b/src/setupispdb.cpp
@@ -84,7 +84,7 @@ void SetupIspdb::fillImapServer(int i, QObject *o) const
     imapRes->setOption(QStringLiteral("ImapServer"), isp.hostname);
     imapRes->setOption(QStringLiteral("UserName"), isp.username);
     imapRes->setOption(QStringLiteral("ImapPort"), isp.port);
-    imapRes->setOption(QStringLiteral("Authentication"), isp.authentication);  \
//TODO: setup with right authentification +    \
imapRes->setOption(QStringLiteral("Authentication"), isp.authentication);  //TODO: \
setup with right authentication  if (isp.socketType == Ispdb::None) {
         imapRes->setOption(QStringLiteral("Safety"), QStringLiteral("NONE"));
     } else if (isp.socketType == Ispdb::SSL) {
diff --git a/src/setupmanager.cpp b/src/setupmanager.cpp
index af784fa..050d1a4 100644
--- a/src/setupmanager.cpp
+++ b/src/setupmanager.cpp
@@ -174,7 +174,7 @@ void SetupManager::setupInfo(const QString &msg)
 
 void SetupManager::setupNext()
 {
-    // user canceld during the previous setup step
+    // user canceled during the previous setup step
     if (m_rollbackRequested) {
         rollback();
         return;


[prev in list] [next in list] [prev in thread] [next in thread]