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

List:       kde-commits
Subject:    [kdialog] src: Fix minor EBN issues
From:       Yuri Chornoivan <null () kde ! org>
Date:       2018-09-19 19:26:00
Message-ID: E1g2i6q-0002lG-GY () code ! kde ! org
[Download RAW message or body]

Git commit 54c14f49bd8ac0e6c874fe87639b98a517173f8a by Yuri Chornoivan.
Committed on 19/09/2018 at 19:25.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M  +3    -7    src/kdialog.cpp
M  +1    -1    src/utils.cpp
M  +1    -1    src/widgets.cpp

https://commits.kde.org/kdialog/54c14f49bd8ac0e6c874fe87639b98a517173f8a

diff --git a/src/kdialog.cpp b/src/kdialog.cpp
index 4e699a72d..316b13530 100644
--- a/src/kdialog.cpp
+++ b/src/kdialog.cpp
@@ -57,15 +57,11 @@
 #include <X11/Xutil.h>
 #endif
 
-#include "config-kdialog.h"
 #ifdef Qt5DBus_FOUND
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #endif
 
-#ifdef Q_WS_WIN
-#include <QFileDialog>
-#endif
 #include <unistd.h>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
@@ -139,7 +135,7 @@ static bool sendVisualNotification(const QString &text, const \
QString &title, co  args.append(text); // body
   args.append(QStringList()); // actions - unused for plain passive popups
   args.append(QVariantMap()); // hints - unused atm
-  args.append(timeout); // expire timout
+  args.append(timeout); // expire timeout
 
   m.setArguments(args);
 
@@ -357,7 +353,7 @@ int main(int argc, char *argv[])
 #endif
     } else if(parser.isSet(QStringLiteral("embed"))) {
         /* KDialog originally used --embed for attaching the dialog box.  However \
                this is misleading and so we changed to --attach.
-         * For consistancy, we silently map --embed to --attach */
+         * For consistency, we silently map --embed to --attach */
         attach = true;
 #ifdef Q_WS_WIN
         winid = reinterpret_cast<WId>(parser.value(QStringLiteral("embed")).toLong(&attach, \
0));  //C style parsing.  If the string begins with "0x", base 16 is used; if the \
string begins with "0", base 8 is used; otherwise, base 10 is used. @@ -969,7 +965,7 \
@@ int main(int argc, char *argv[])  cout << result.toLocal8Bit().data() << endl;
             return 0;
         }
-        return 1; // cancelled
+        return 1; // canceled
     }
     if (parser.isSet(QStringLiteral("slider")))
     {
diff --git a/src/utils.cpp b/src/utils.cpp
index e7ddb6777..cf8647df6 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -19,7 +19,7 @@
 #include <QApplication>
 #include <QDebug>
 #include <QDesktopWidget>
-#include "config-kdialog.h"
+#include <config-kdialog.h>
 
 #if defined HAVE_X11 && ! defined K_WS_QTONLY
 #include <X11/Xlib.h>
diff --git a/src/widgets.cpp b/src/widgets.cpp
index 8841fdef4..2fc34ae86 100644
--- a/src/widgets.cpp
+++ b/src/widgets.cpp
@@ -19,7 +19,7 @@
 
 
 // Own
-#include "config-kdialog.h"
+#include <config-kdialog.h>
 #include "widgets.h"
 #include "utils.h"
 


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