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

List:       kde-commits
Subject:    [khtml] /: remove kdewin dependency
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2015-12-16 8:06:57
Message-ID: E1a976v-0007ID-3m () scm ! kde ! org
[Download RAW message or body]

Git commit 8c26b8cda03327ec5d49203cd4144d3e35debaf9 by Patrick Spendrin.
Committed on 16/12/2015 at 08:06.
Pushed by sengels into branch 'master'.

remove kdewin dependency

This removes the direct kdewin dependency by replacing problematic
function calls (uname, snprintf) with their Qt counterparts.
Some leftover unix header includes removed too.

REVIEW: 126339

M  +0    -7    CMakeLists.txt
M  +2    -2    src/ecma/kjs_binding.cpp
M  +4    -17   src/ecma/kjs_navigator.cpp
M  +0    -1    src/ecma/kjs_proxy.cpp
M  +0    -1    src/ecma/kjs_proxy.h
M  +0    -2    src/khtml_pagecache.cpp
M  +0    -1    src/khtml_part.cpp
M  +0    -1    src/kmultipart/kmultipart.cpp

http://commits.kde.org/khtml/8c26b8cda03327ec5d49203cd4144d3e35debaf9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30831d3..4c2fe17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,13 +88,6 @@ if(NOT WIN32 AND NOT APPLE AND X11_FOUND)
     find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
 endif()
 
-if(WIN32)
-    find_package(KDEWin REQUIRED)
-    INCLUDE_DIRECTORIES(${KDEWIN_INCLUDES})
-    LINK_LIBRARIES(${KDEWIN_LIBRARIES})
-    ADD_DEFINITIONS(${KDEWIN_DEFINITIONS})
-endif()
-
 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
 remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
 
diff --git a/src/ecma/kjs_binding.cpp b/src/ecma/kjs_binding.cpp
index 5e122f0..916dcb1 100644
--- a/src/ecma/kjs_binding.cpp
+++ b/src/ecma/kjs_binding.cpp
@@ -345,9 +345,9 @@ void setDOMException(ExecState *exec, int internalCode)
         char buffer[100];
 
         if (!name.isEmpty()) {
-            snprintf(buffer, 99, "%s: %s Exception %d", \
name.string().toLatin1().data(), type, code); +            qsnprintf(buffer, 99, "%s: \
%s Exception %d", name.string().toLatin1().data(), type, code);  } else {
-            snprintf(buffer, 99, "%s Exception %d", type, code);
+            qsnprintf(buffer, 99, "%s Exception %d", type, code);
         }
         errorObject = throwError(exec, GeneralError, buffer);
     } else {
diff --git a/src/ecma/kjs_navigator.cpp b/src/ecma/kjs_navigator.cpp
index 2f7be8d..2bd3ff9 100644
--- a/src/ecma/kjs_navigator.cpp
+++ b/src/ecma/kjs_navigator.cpp
@@ -36,7 +36,7 @@
 #include <kjs/lookup.h>
 #include <kjs_binding.h>
 #include <khtml_part.h>
-#include <sys/utsname.h>
+#include <qsysinfo.h>
 #include <qstandardpaths.h>
 
 using namespace KJS;
@@ -292,23 +292,10 @@ JSValue *Navigator::getValueProperty(ExecState *exec, int \
                token) const
                    (userAgent.indexOf(QLatin1String("Mac_PowerPC"), 0, \
Qt::CaseInsensitive) >= 0)) {  return jsString("MacPPC");
         } else {
-            struct utsname name;
-            int ret = uname(&name);
-            if (ret >= 0) {
-                return jsString(QString::fromLatin1("%1 \
                %2").arg(name.sysname).arg(name.machine));
-            } else { // can't happen
-                return jsString("Unix X11");
-            }
-        }
-    case CpuClass: {
-        struct utsname name;
-        int ret = uname(&name);
-        if (ret >= 0) {
-            return jsString(name.machine);
-        } else { // can't happen
-            return jsString("unknown");
+            return jsString(QString::fromLatin1("%1 \
%2").arg(QSysInfo::kernelType()).arg(QSysInfo::currentCpuArchitecture()));  }
-    }
+    case CpuClass:
+            return jsString(QSysInfo::currentCpuArchitecture());
     case _Plugins:
         return new Plugins(exec, m_part->pluginsEnabled());
     case _MimeTypes:
diff --git a/src/ecma/kjs_proxy.cpp b/src/ecma/kjs_proxy.cpp
index 20430f4..ebe28b8 100644
--- a/src/ecma/kjs_proxy.cpp
+++ b/src/ecma/kjs_proxy.cpp
@@ -32,7 +32,6 @@
 #include <kprotocolmanager.h>
 #include <QDebug>
 #include <klocalizedstring.h>
-#include <unistd.h>
 #include <assert.h>
 #include <kjs/function.h>
 #include <kjs/JSLock.h>
diff --git a/src/ecma/kjs_proxy.h b/src/ecma/kjs_proxy.h
index 24abd1e..a73e446 100644
--- a/src/ecma/kjs_proxy.h
+++ b/src/ecma/kjs_proxy.h
@@ -23,7 +23,6 @@
 
 #include <QtCore/QVariant>
 #include <QtCore/QString>
-#include <sys/time.h>
 #include <wtf/RefPtr.h>
 
 class KHTMLPart;
diff --git a/src/khtml_pagecache.cpp b/src/khtml_pagecache.cpp
index 8e1841f..96fb473 100644
--- a/src/khtml_pagecache.cpp
+++ b/src/khtml_pagecache.cpp
@@ -31,8 +31,6 @@
 #include <QtCore/QFile>
 #include <QtCore/QDir>
 #include <QtCore/QDataStream>
-#include <sys/types.h>
-#include <unistd.h>
 #include <assert.h>
 
 // We keep 12 pages in memory.
diff --git a/src/khtml_part.cpp b/src/khtml_part.cpp
index adbcd80..d5f8d7f 100644
--- a/src/khtml_part.cpp
+++ b/src/khtml_part.cpp
@@ -76,7 +76,6 @@ using namespace DOM;
 
 #include <sys/types.h>
 #include <assert.h>
-#include <unistd.h>
 
 #include <kstringhandler.h>
 #include <kio/job.h>
diff --git a/src/kmultipart/kmultipart.cpp b/src/kmultipart/kmultipart.cpp
index 1ad3bbb..854f6e1 100644
--- a/src/kmultipart/kmultipart.cpp
+++ b/src/kmultipart/kmultipart.cpp
@@ -29,7 +29,6 @@
 #include <kmimetypetrader.h>
 #include <kpluginfactory.h>
 #include <khtml_part.h>
-#include <unistd.h>
 #include <kxmlguifactory.h>
 #include <QtCore/QTimer>
 #include <QVBoxLayout>


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