Hello community,
here is the log from the commit of package kdevelop5-pg-qt for
openSUSE:Leap:15.2 checked in at 2020-02-19 18:35:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/kdevelop5-pg-qt (Old)
and /work/SRC/openSUSE:Leap:15.2/.kdevelop5-pg-qt.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdevelop5-pg-qt"
Wed Feb 19 18:35:32 2020 rev:12 rq:770511 version:2.2.1
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/kdevelop5-pg-qt/kdevelop5-pg-qt.changes
2020-01-15 15:15:22.302240339 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.kdevelop5-pg-qt.new.26092/kdevelop5-pg-qt.changes
2020-02-19 18:35:56.273632540 +0100
@@ -1,0 +2,22 @@
+Mon Feb 3 06:04:02 UTC 2020 - [email protected]
+
+- Update to 2.2.1
+ * Fix build with Qt 5.14
+ * New flag ENFORCE_COMPATIBLE_ERROR_AWARE_CODE for the
+ kdevpgqt_generate() CMake macro
+- Drop Fix-build-with-Qt-5.14.patch, merged upstream
+
+-------------------------------------------------------------------
+Fri Dec 27 06:42:44 UTC 2019 - [email protected]
+
+- Add Fix-build-with-Qt-5.14.patch to make it compile with Qt 5.14
+
+-------------------------------------------------------------------
+Fri May 24 09:59:16 UTC 2019 - [email protected]
+
+- Update to 2.2.0
+ * Fix compiler warnings in generated code (adding nullptr &
+ override)
+- Run spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
kdevelop-pg-qt-2.1.0.tar.xz
New:
----
kdevelop-pg-qt-2.2.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdevelop5-pg-qt.spec ++++++
--- /var/tmp/diff_new_pack.7TRjA5/_old 2020-02-19 18:35:56.649633327 +0100
+++ /var/tmp/diff_new_pack.7TRjA5/_new 2020-02-19 18:35:56.649633327 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kdevelop5-pg-qt
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define rname kdevelop-pg-qt
Name: kdevelop5-pg-qt
-Version: 2.1.0
+Version: 2.2.1
Release: 0
Summary: Supporting package for the additional plugins for Kdevelop5
-License: LGPL-2.0+ and GPL-2.0+
+License: LGPL-2.0-or-later AND GPL-2.0-or-later
Group: Development/Tools/IDE
-Url: http://www.kdevelop.org
-Source0:
http://download.kde.org/stable/kdevelop-pg-qt/%{version}/src/%{rname}-%{version}.tar.xz
+URL: https://www.kdevelop.org/
+Source0:
https://download.kde.org/stable/kdevelop-pg-qt/%{version}/src/%{rname}-%{version}.tar.xz
BuildRequires: bison
BuildRequires: extra-cmake-modules
BuildRequires: flex
@@ -33,7 +33,6 @@
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Test)
Conflicts: kdevelop4-pg-qt
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Supporting package for the additional plugins for Kdevelop5 Integrated
Development Environment
@@ -52,8 +51,7 @@
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
%{_kf5_bindir}/kdev-pg-qt
%{_kf5_prefix}/include/kdevelop-pg-qt/
%{_kf5_libdir}/cmake/KDevelop-PG-Qt
++++++ kdevelop-pg-qt-2.1.0.tar.xz -> kdevelop-pg-qt-2.2.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/CMakeLists.txt
new/kdevelop-pg-qt-2.2.1/CMakeLists.txt
--- old/kdevelop-pg-qt-2.1.0/CMakeLists.txt 2017-07-27 00:47:39.000000000
+0200
+++ new/kdevelop-pg-qt-2.2.1/CMakeLists.txt 2020-02-02 21:02:00.000000000
+0100
@@ -1,35 +1,27 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
-# KDEVELOP_PG_QT version
-set(KDEVELOP_PG_QT_VERSION_MAJOR 2)
-set(KDEVELOP_PG_QT_VERSION_MINOR 1)
-set(KDEVELOP_PG_QT_VERSION_PATCH 0)
-set(KDEVELOP_PG_QT_VERSION
"${KDEVELOP_PG_QT_VERSION_MAJOR}.${KDEVELOP_PG_QT_VERSION_MINOR}.${KDEVELOP_PG_QT_VERSION_PATCH}")
+project(kdevelop-pg-qt VERSION 2.2.1)
-project(kdevelop-pg-qt)
-
-enable_testing()
-
-find_package(ECM 1.1.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+find_package(ECM 5.14.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+include(KDEInstallDirs)
+include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMAddTests)
include(ECMMarkNonGuiExecutable)
-include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
-include(KDEInstallDirs)
-include(KDECMakeSettings)
include(FeatureSummary)
include(WriteBasicConfigVersionFile)
+include(CMakePackageConfigHelpers)
set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDevelop-PG-Qt)
-ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KDevelop-PG-QtConfig.cmake.in"
-
"${CMAKE_CURRENT_BINARY_DIR}/KDevelop-PG-QtConfig.cmake"
- INSTALL_DESTINATION
${CMAKECONFIG_INSTALL_DIR}
+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KDevelop-PG-QtConfig.cmake.in"
+
"${CMAKE_CURRENT_BINARY_DIR}/KDevelop-PG-QtConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
-ecm_setup_version(${KDEVELOP_PG_QT_VERSION_MAJOR}.${KDEVELOP_PG_QT_VERSION_MINOR}.${KDEVELOP_PG_QT_VERSION_PATCH}
+ecm_setup_version(${kdevelop-pg-qt_VERSION_MAJOR}.${kdevelop-pg-qt_VERSION_MINOR}.${kdevelop-pg-qt_VERSION_PATCH}
VARIABLE_PREFIX KDEVELOP_PG_QT
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kdevelop-pg-qt_version.h"
PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KDevelop-PG-QtConfigVersion.cmake"
@@ -43,8 +35,15 @@
"${CMAKE_CURRENT_BINARY_DIR}/KDevelop-PG-QtConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}" )
-set(REQUIRED_QT_VERSION 5.2.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Test)
+if(BUILD_TESTING)
+ set(REQUIRED_QT_TESTCOMPONENTS Test)
+endif()
+set(REQUIRED_QT_VERSION 5.5.0)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED
+ COMPONENTS
+ Core
+ ${REQUIRED_QT_TESTCOMPONENTS}
+)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -58,8 +57,16 @@
PATHS /usr/bin
DOC "bison executable")
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS
-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_DEPRECATED_WARNINGS
-DQT_DISABLE_DEPRECATED_BEFORE=0x050400)
+add_definitions(
+ -DQT_DEPRECATED_WARNINGS
+ -DQT_DISABLE_DEPRECATED_BEFORE=0x050500
+ -DQT_NO_SIGNALS_SLOTS_KEYWORDS
+ -DQT_STRICT_ITERATORS
+ -DQT_USE_QSTRINGBUILDER
+ -DQT_NO_URL_CAST_FROM_STRING
+ -DQT_NO_CAST_FROM_BYTEARRAY
+ -DQT_NO_CAST_TO_ASCII
+)
# Silence a few warnings
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -69,7 +76,10 @@
add_subdirectory(include)
add_subdirectory(kdev-pg)
add_subdirectory(examples EXCLUDE_FROM_ALL)
-add_subdirectory(tests)
+
+if(BUILD_TESTING)
+ add_subdirectory(tests)
+endif()
include(CTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/KDevelop-PG-QtConfig.cmake.in
new/kdevelop-pg-qt-2.2.1/KDevelop-PG-QtConfig.cmake.in
--- old/kdevelop-pg-qt-2.1.0/KDevelop-PG-QtConfig.cmake.in 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/KDevelop-PG-QtConfig.cmake.in 2020-02-02
21:02:00.000000000 +0100
@@ -23,6 +23,8 @@
# function that returns a readable name of a token
# DUMP_INFO will tell kdevelop-pg to dump extra information about symbols,
terminals and rules
# into files in the binary dir
+# ENFORCE_COMPATIBLE_ERROR_AWARE_CODE will ensure that
--compatible-error-aware-code is also
+# passed in case of GCC. By default it only is set for non-GNU
compilers.
# Note: The macro only exists when KDEVPG was found
#
# Copyright (c) 2007 Andreas Pakulat <[email protected]>
@@ -139,6 +141,9 @@
elseif( ${_arg} STREQUAL "BEAUTIFUL_CODE" )
list(REMOVE_AT _depList 0)
set(_beautifulCode --beautiful-code)
+ elseif( ${_arg} STREQUAL "ENFORCE_COMPATIBLE_ERROR_AWARE_CODE" )
+ list(REMOVE_AT _depList 0)
+ set(_beautifulCode --compatible-error-aware-code)
elseif( ${_arg} STREQUAL "STRICT_CONFLICTS" )
list(REMOVE_AT _depList 0)
set(_conflicts --strict-conflicts)
@@ -172,7 +177,10 @@
${_dbgVisit} ${_dumpInfo} ${_beautifulCode} ${_conflicts}
"${_grammarFile}"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
- set_source_files_properties("${_outputList}" GENERATED)
+ set_source_files_properties(${_outputList} PROPERTIES
+ GENERATED TRUE
+ SKIP_AUTOMOC ON
+ )
set( ${_srcVar}
"${_outputList}"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cc/CMakeLists.txt
new/kdevelop-pg-qt-2.2.1/examples/cc/CMakeLists.txt
--- old/kdevelop-pg-qt-2.1.0/examples/cc/CMakeLists.txt 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cc/CMakeLists.txt 2020-02-02
21:02:00.000000000 +0100
@@ -36,7 +36,9 @@
SET_SOURCE_FILES_PROPERTIES(
${CMAKE_CURRENT_SOURCE_DIR}/cclexer.cpp
- GENERATED
+ PROPERTIES
+ GENERATED TUE
+ SKIP_AUTOMOC ON
)
ELSE(FLEX_EXECUTABLE)
MESSAGE("--- Assuming existence of the generated lexer file cclexer.cpp")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cc/cc.g
new/kdevelop-pg-qt-2.2.1/examples/cc/cc.g
--- old/kdevelop-pg-qt-2.1.0/examples/cc/cc.g 2017-07-27 00:47:39.000000000
+0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cc/cc.g 2020-02-02 21:02:00.000000000
+0100
@@ -17,8 +17,8 @@
-- Boston, MA 02111-1307, USA.
[:
-#include <QtCore/QString>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QDebug>
:]
%parserclass (protected declaration)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cc/cc.ll
new/kdevelop-pg-qt-2.2.1/examples/cc/cc.ll
--- old/kdevelop-pg-qt-2.1.0/examples/cc/cc.ll 2017-07-27 00:47:39.000000000
+0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cc/cc.ll 2020-02-02 21:02:00.000000000
+0100
@@ -27,7 +27,7 @@
#define DONT_INCLUDE_FLEXLEXER
#include "lexer.h"
-#include <QtCore/QDebug>
+#include <QDebug>
%}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cc/cclexer.cpp
new/kdevelop-pg-qt-2.2.1/examples/cc/cclexer.cpp
--- old/kdevelop-pg-qt-2.1.0/examples/cc/cclexer.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cc/cclexer.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -2659,7 +2659,7 @@
#define DONT_INCLUDE_FLEXLEXER
#include "lexer.h"
-#include <QtCore/QDebug>
+#include <QDebug>
/* UTF-8 sequences, generated with the Unicode.hs script from
* http://lists.gnu.org/archive/html/help-flex/2005-01/msg00043.html */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cc/dumptree.cpp
new/kdevelop-pg-qt-2.2.1/examples/cc/dumptree.cpp
--- old/kdevelop-pg-qt-2.1.0/examples/cc/dumptree.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cc/dumptree.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -21,7 +21,7 @@
#include "ccast.h"
#include "kdev-pg-token-stream.h"
-#include <QtCore/QString>
+#include <QString>
#include <iostream>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cc/main.cpp
new/kdevelop-pg-qt-2.2.1/examples/cc/main.cpp
--- old/kdevelop-pg-qt-2.1.0/examples/cc/main.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cc/main.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -20,7 +20,7 @@
#include <iostream>
#include <fstream>
#include <climits>
-#include <qdebug.h>
+#include <QDebug>
#include "dumptree.h"
#include "ccparser.h"
#include "lexer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cool/CMakeLists.txt
new/kdevelop-pg-qt-2.2.1/examples/cool/CMakeLists.txt
--- old/kdevelop-pg-qt-2.1.0/examples/cool/CMakeLists.txt 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cool/CMakeLists.txt 2020-02-02
21:02:00.000000000 +0100
@@ -32,7 +32,9 @@
SET_SOURCE_FILES_PROPERTIES(
${CMAKE_CURRENT_SOURCE_DIR}/cool_lexer.cpp
- GENERATED
+ PROPERTIES
+ GENERATED TRUE
+ SKIP_AUTOMOC ON
)
ELSE(FLEX_EXECUTABLE)
MESSAGE("--- Assuming existence of the generated lexer file
cool_lexer.cpp")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cool/cool.g
new/kdevelop-pg-qt-2.2.1/examples/cool/cool.g
--- old/kdevelop-pg-qt-2.1.0/examples/cool/cool.g 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cool/cool.g 2020-02-02
21:02:00.000000000 +0100
@@ -1,5 +1,5 @@
[:
-#include <QtCore/QString>
+#include <QString>
:]
------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/cool/cool_lexer.h
new/kdevelop-pg-qt-2.2.1/examples/cool/cool_lexer.h
--- old/kdevelop-pg-qt-2.1.0/examples/cool/cool_lexer.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/cool/cool_lexer.h 2020-02-02
21:02:00.000000000 +0100
@@ -22,7 +22,7 @@
#include <iostream>
-#include <QtCore/QString>
+#include <QString>
#include <string>
#ifndef DONT_INCLUDE_FLEXLEXER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/fact/fact.g
new/kdevelop-pg-qt-2.2.1/examples/fact/fact.g
--- old/kdevelop-pg-qt-2.1.0/examples/fact/fact.g 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/fact/fact.g 2020-02-02
21:02:00.000000000 +0100
@@ -5,7 +5,7 @@
[:
-#include <QtCore/QString>
+#include <QString>
namespace fact
{
@@ -138,7 +138,7 @@
[:
#include "factlexer.h"
-#include <QtCore/QString>
+#include <QString>
#include <QDebug>
namespace fact
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/fact/factast.h
new/kdevelop-pg-qt-2.2.1/examples/fact/factast.h
--- old/kdevelop-pg-qt-2.1.0/examples/fact/factast.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/fact/factast.h 2020-02-02
21:02:00.000000000 +0100
@@ -4,12 +4,12 @@
#ifndef FACT_AST_H_INCLUDED
#define FACT_AST_H_INCLUDED
-#include <QtCore/QList>
+#include <QList>
#include <kdev-pg-list.h>
-#include <QtCore/QString>
+#include <QString>
namespace fact
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/fact/factlexer.cpp
new/kdevelop-pg-qt-2.2.1/examples/fact/factlexer.cpp
--- old/kdevelop-pg-qt-2.1.0/examples/fact/factlexer.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/fact/factlexer.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -20,9 +20,9 @@
#include "factlexer.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QStringList>
+#include <QDebug>
#include "factparser.h"
#include <kdev-pg-location-table.h>
#include <kdev-pg-token-stream.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/fact/factlexer.h
new/kdevelop-pg-qt-2.2.1/examples/fact/factlexer.h
--- old/kdevelop-pg-qt-2.1.0/examples/fact/factlexer.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/fact/factlexer.h 2020-02-02
21:02:00.000000000 +0100
@@ -21,8 +21,8 @@
#include "factparser.h"
-#include <QtCore/QStack>
-#include <QtCore/QString>
+#include <QStack>
+#include <QString>
namespace fact
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/fact/factparser.cpp
new/kdevelop-pg-qt-2.2.1/examples/fact/factparser.cpp
--- old/kdevelop-pg-qt-2.1.0/examples/fact/factparser.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/examples/fact/factparser.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -5,7 +5,7 @@
#include "factlexer.h"
-#include <QtCore/QString>
+#include <QString>
#include <QDebug>
namespace fact
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/examples/php/php.g
new/kdevelop-pg-qt-2.2.1/examples/php/php.g
--- old/kdevelop-pg-qt-2.1.0/examples/php/php.g 2017-07-27 00:47:39.000000000
+0200
+++ new/kdevelop-pg-qt-2.2.1/examples/php/php.g 2020-02-02 21:02:00.000000000
+0100
@@ -1074,7 +1074,7 @@
[:
-#include <QtCore/QDebug>
+#include <QDebug>
namespace Php
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/include/kdev-pg-allocator.h
new/kdevelop-pg-qt-2.2.1/include/kdev-pg-allocator.h
--- old/kdevelop-pg-qt-2.1.0/include/kdev-pg-allocator.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/include/kdev-pg-allocator.h 2020-02-02
21:02:00.000000000 +0100
@@ -26,7 +26,7 @@
#include <cstdlib>
#include <cstring>
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/include/kdev-pg-char-sets.h
new/kdevelop-pg-qt-2.2.1/include/kdev-pg-char-sets.h
--- old/kdevelop-pg-qt-2.1.0/include/kdev-pg-char-sets.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/include/kdev-pg-char-sets.h 2020-02-02
21:02:00.000000000 +0100
@@ -31,11 +31,11 @@
using namespace std;
-#include <QtCore/QString>
-#include <QtCore/QByteArray>
-#include <QtCore/QVector>
-#include <QtCore/QTextStream>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QByteArray>
+#include <QVector>
+#include <QTextStream>
+#include <QStringList>
/**
* @FILE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/include/kdev-pg-location-table.h
new/kdevelop-pg-qt-2.2.1/include/kdev-pg-location-table.h
--- old/kdevelop-pg-qt-2.1.0/include/kdev-pg-location-table.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/include/kdev-pg-location-table.h 2020-02-02
21:02:00.000000000 +0100
@@ -24,9 +24,8 @@
#ifndef KDEV_PG_LOCATION_TABLE_H
#define KDEV_PG_LOCATION_TABLE_H
-#include <QtCore/QtGlobal>
-
-#include <QtCore/qalgorithms.h> // krazy:exclude=includes
+#include <QtGlobal>
+#include <QtAlgorithms>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/include/kdev-pg-memory-pool.h
new/kdevelop-pg-qt-2.2.1/include/kdev-pg-memory-pool.h
--- old/kdevelop-pg-qt-2.1.0/include/kdev-pg-memory-pool.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/include/kdev-pg-memory-pool.h 2020-02-02
21:02:00.000000000 +0100
@@ -22,7 +22,7 @@
#ifndef KDEV_PG_MEMORY_POOL
#define KDEV_PG_MEMORY_POOL
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
#include <string.h>
#include <stdlib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/CMakeLists.txt
new/kdevelop-pg-qt-2.2.1/kdev-pg/CMakeLists.txt
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/CMakeLists.txt 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/CMakeLists.txt 2020-02-02
21:02:00.000000000 +0100
@@ -55,7 +55,9 @@
SET_SOURCE_FILES_PROPERTIES(
${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-parser.cc
${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-parser.hh
- GENERATED
+ PROPERTIES
+ GENERATED TRUE
+ SKIP_AUTOMOC ON
)
SET(OPTIONAL_PARSER_HEADER_DEPENDENCY
"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-parser.hh")
ELSE(BISON_EXECUTABLE)
@@ -79,7 +81,9 @@
SET(lexer_src ${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc)
SET_SOURCE_FILES_PROPERTIES(
${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc
- GENERATED
+ PROPERTIES
+ GENERATED TRUE
+ SKIP_AUTOMOC ON
)
ELSE(FLEX_EXECUTABLE)
MESSAGE("'flex' was not found!")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-ast-gen.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-ast-gen.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-ast-gen.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-ast-gen.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -22,7 +22,7 @@
#include "kdev-pg-code-gen.h"
#include "kdev-pg.h"
-#include <QtCore/QMap>
+#include <QMap>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-ast-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-ast-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-ast-gen.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-ast-gen.h 2020-02-02
21:02:00.000000000 +0100
@@ -23,11 +23,11 @@
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QTextStream>
-#include <QtCore/QSet>
-#include <QtCore/QPair>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QTextStream>
+#include <QSet>
+#include <QPair>
+#include <QList>
+#include <QString>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-ast.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-ast.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-ast.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-ast.h 2020-02-02
21:02:00.000000000 +0100
@@ -31,9 +31,9 @@
using std::pair;
using std::make_pair;
-#include <QtCore/QString>
+#include <QString>
-#include <QtCore/QDebug>
+#include <QDebug>
#define PG_NODE(k) \
enum { NodeKind = NodeKind##k };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-beautifier.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-beautifier.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-beautifier.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-beautifier.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -19,8 +19,8 @@
#include "kdev-pg-beautifier.h"
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QFileInfo>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-beautifier.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-beautifier.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-beautifier.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-beautifier.h 2020-02-02
21:02:00.000000000 +0100
@@ -20,7 +20,7 @@
#ifndef KDEV_PG_BEAUTIFIER_H
#define KDEV_PG_BEAUTIFIER_H
-#include <QtCore/QTextStream>
+#include <QTextStream>
#include "astyle.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-checker.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-checker.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-checker.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-checker.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -23,7 +23,7 @@
#include "kdev-pg-pretty-printer.h"
#include "kdev-pg-bnf-visitor.h"
-#include <QtCore/QDebug>
+#include <QDebug>
//uncomment this to see debug output for follow checker
// #define FOLLOW_CHECKER_DEBUG
@@ -171,8 +171,8 @@
mVisited.insert(node);
World::FollowDep &D = globalSystem.followDep(node);
- QList<Model::Node*> FD = D.first.toList();
- QList<Model::Node*> FLD = D.second.toList();
+ QList<Model::Node*> FD = D.first.values();
+ QList<Model::Node*> FLD = D.second.values();
QTextStream& str( checkOut );
PrettyPrinter p(str);
#ifdef FOLLOW_CHECKER_DEBUG
@@ -193,7 +193,7 @@
for(auto jt = set2.begin(); jt != set2.end(); ++jt)
if(!BnfVisitor::isInternal(*jt))
FD.append(*jt);
- FD.append(set.toList());
+ FD.append(set.values());
}
else
{
@@ -227,7 +227,7 @@
World::NodeSet set = globalSystem.followDep(FLD[i]).second;
for(auto jt = FLD.begin(); jt != FLD.end(); ++jt)
set.remove(*jt);
- FLD.append(set.toList());
+ FLD.append(set.values());
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-clone-tree.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-clone-tree.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-clone-tree.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-clone-tree.h 2020-02-02
21:02:00.000000000 +0100
@@ -21,7 +21,7 @@
#define KDEV_PG_CLONE_TREE_H
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QStack>
+#include <QStack>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-code-gen.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-code-gen.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-code-gen.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-code-gen.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -21,10 +21,10 @@
#include "kdev-pg-code-gen.h"
-#include <QtCore/QList>
-#include <QtCore/QDebug>
-#include <QtCore/QStack>
-#include <QtCore/QStringList>
+#include <QList>
+#include <QDebug>
+#include <QStack>
+#include <QStringList>
#include "kdev-pg-pretty-printer.h"
namespace KDevPG
@@ -101,7 +101,7 @@
sprintf(__var, "__node_%d", __id);
++__id;
- out << capSymbolName << "Ast *" << __var << " = 0;" << endl
+ out << capSymbolName << "Ast *" << __var << " = nullptr;" << endl
<< "if (!parse" << capSymbolName << "(&" << __var;
if (!node->mArguments.isEmpty())
@@ -586,7 +586,7 @@
out << " && " << i->op.mCond;
out << ") { const unsigned int priority = " << i->priority << ";";
out << i->op.mCode;
- out << "AstNode *last = 0; bool br = false;";
+ out << "AstNode *last = nullptr; bool br = false;";
out << "while(priority < opStack.last().p + " << i->left << ") {";
out << "if(opStack.size() == 1) {"
"if(last)\n"
@@ -620,7 +620,7 @@
out << " && " << i->op.mCond;
out << ") { const unsigned int priority = " << i->priority << ";";
out << i->op.mCode;
- out << "AstNode *last = 0; bool br = false;";
+ out << "AstNode *last = nullptr; bool br = false;";
out << "while(priority < opStack.last().p + " << i->left << ") {";
out << "if(opStack.size() == 1) {"
"if(last)\n"
@@ -660,7 +660,7 @@
out << " && " << i->first.mCond;
out << ") { const unsigned int priority = " << i->priority << ";";
out << i->first.mCode;
- out << "AstNode *last = 0; bool br = false;";
+ out << "AstNode *last = nullptr; bool br = false;";
out << "while(priority < opStack.last().p + " << i->left << ") {";
out << "if(opStack.size() == 1) {"
"if(last)\n"
@@ -719,9 +719,9 @@
"else"
"{\n"
"void *last = opStack.last().n;"
- "if(reinterpret_cast<Prefix" << nodeType << "*>(last)->first ==
0)\n"
+ "if(reinterpret_cast<Prefix" << nodeType << "*>(last)->first ==
nullptr)\n"
"reinterpret_cast<Prefix" << nodeType << "*>(last)->first = node;"
- "else if(reinterpret_cast<Binary" << nodeType << "*>(last)->second
== 0)\n"
+ "else if(reinterpret_cast<Binary" << nodeType << "*>(last)->second
== nullptr)\n"
"reinterpret_cast<Binary" << nodeType << "*>(last)->second = node;"
"else\n"
"reinterpret_cast<Ternary" << nodeType << "*>(last)->third = node;"
@@ -760,9 +760,9 @@
if(!opStack.isEmpty())\
{\
void *last = opStack.last().n;\
- if(reinterpret_cast<Prefix" << nodeType << "*>(last)->first == 0)\n\
+ if(reinterpret_cast<Prefix" << nodeType << "*>(last)->first == nullptr)\n\
reinterpret_cast<Prefix" << nodeType << "*>(last)->first = " << __var <<
";" << endl; \
- out << "else if(reinterpret_cast<Binary" << nodeType << "*>(last)->second ==
0)\n\
+ out << "else if(reinterpret_cast<Binary" << nodeType << "*>(last)->second ==
nullptr)\n\
reinterpret_cast<Binary" << nodeType << "*>(last)->second = " << __var << ";\
else\nreinterpret_cast<Ternary" << nodeType << "*>(last)->third = " << __var
<< ";}\
else\n\
@@ -866,7 +866,7 @@
{
if(isOperatorSymbol(sym))
{
- out << "AstNode *olast, *last = 0;"
+ out << "AstNode *olast, *last = nullptr;"
"while(!opStack.empty())\n"
"{"
"olast = last;"
@@ -1167,10 +1167,10 @@
out << "Parser() {" << endl;
if (globalSystem.generateAst)
{
- out << "memoryPool = 0;" << endl;
+ out << "memoryPool = nullptr;" << endl;
}
- out << "tokenStream = 0;" << endl
+ out << "tokenStream = nullptr;" << endl
<< "yytoken = Token_EOF;" << endl
<< "mBlockErrors = false;" << endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-debug-visitor-gen.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-debug-visitor-gen.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-debug-visitor-gen.cpp
2017-07-27 00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-debug-visitor-gen.cpp
2020-02-02 21:02:00.000000000 +0100
@@ -103,9 +103,9 @@
hms(sym);
#define O1(name) \
- out << "virtual void visit" << name \
+ out << "void visit" << name \
<< "(" << name << "Ast *" << "node" \
- << ") {" << endl;
+ << ") override {" << endl;
#define O2(name) \
out << "printToken(node, QStringLiteral(\"" << name << "\"));" << endl;
#define O3(name) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-debug-visitor-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-debug-visitor-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-debug-visitor-gen.h
2017-07-27 00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-debug-visitor-gen.h
2020-02-02 21:02:00.000000000 +0100
@@ -23,10 +23,10 @@
#include "kdev-pg-default-visitor.h"
#include "kdev-pg-default-visitor-bits-gen.h" // for the HasMemberNodes class
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
+#include <QSet>
+#include <QList>
+#include <QString>
+#include <QTextStream>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-default-visitor-bits-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-default-visitor-bits-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-default-visitor-bits-gen.h
2017-07-27 00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-default-visitor-bits-gen.h
2020-02-02 21:02:00.000000000 +0100
@@ -23,9 +23,9 @@
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QTextStream>
+#include <QSet>
+#include <QList>
+#include <QTextStream>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-default-visitor-gen.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-default-visitor-gen.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-default-visitor-gen.cpp
2017-07-27 00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-default-visitor-gen.cpp
2020-02-02 21:02:00.000000000 +0100
@@ -47,7 +47,7 @@
Model::SymbolItem *sym = __it.second;
#define O(name) \
- out << "virtual void visit" << name << "(" << name << "Ast *node);" << endl;
+ out << "void visit" << name << "(" << name << "Ast *node) override;" << endl;
if(isOperatorSymbol(sym))
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-default-visitor-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-default-visitor-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-default-visitor-gen.h
2017-07-27 00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-default-visitor-gen.h
2020-02-02 21:02:00.000000000 +0100
@@ -23,10 +23,10 @@
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
+#include <QSet>
+#include <QList>
+#include <QString>
+#include <QTextStream>
namespace KDevPG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-follow.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-follow.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-follow.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-follow.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -23,7 +23,7 @@
#include "kdev-pg-follow.h"
#include "kdev-pg-pretty-printer.h"
-#include <QtCore/QTextStream>
+#include <QTextStream>
//uncomment this to see debug output for follow dependency calculation
// #define followDepsEP_DEBUG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-generate.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-generate.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-generate.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-generate.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -34,8 +34,8 @@
#include "kdev-pg-beautifier.h"
#include "kdev-pg-regexp.h"
-#include <QtCore/QTextStream>
-#include <QtCore/QFile>
+#include <QTextStream>
+#include <QFile>
#include "kdev-pg-token-type-gen.h"
namespace KDevPG
@@ -74,7 +74,7 @@
foreach (const QString& header, globalSystem.astHeaders)
s << "#include \"" << header << "\"\n";
- s << "#include <QtCore/QList>" << endl
+ s << "#include <QList>" << endl
<< "#include <kdev-pg-list.h>" << endl
<< endl;
@@ -210,7 +210,7 @@
<< endl;
if (globalSystem.needOperatorStack)
- s << "#include <QtCore/QVector>" << endl;
+ s << "#include <QVector>" << endl;
if (!globalSystem.decl.isEmpty() && !globalSystem.generateAst)
s << globalSystem.decl << endl;
@@ -329,8 +329,8 @@
s << "#include \"" << globalSystem.exportMacroHeader << "\""
<< endl;
- s << "#include <QtCore/QTextStream>" << endl
- << "#include <QtCore/QFile>" << endl
+ s << "#include <QTextStream>" << endl
+ << "#include <QFile>" << endl
<< endl
<< "namespace " << globalSystem.ns << "{" << endl
@@ -373,8 +373,8 @@
s << "#include <kdev-pg-token-stream.h>" << endl;
- s << "#include <QtCore/QTextStream>" << endl
- << "#include <QtCore/QDebug>" << endl
+ s << "#include <QTextStream>" << endl
+ << "#include <QDebug>" << endl
<< endl
<< "namespace " << globalSystem.ns << "{" << endl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-lexer.cc
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-lexer.cc
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-lexer.cc 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-lexer.cc 2020-02-02
21:02:00.000000000 +0100
@@ -1191,14 +1191,14 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtCore/QDebug>
+#include <QDebug>
#include "kdev-pg.h"
#include "kdev-pg-parser.hh"
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
int inp();
void appendLineBuffer();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-lexer.ll
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-lexer.ll
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-lexer.ll 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-lexer.ll 2020-02-02
21:02:00.000000000 +0100
@@ -18,14 +18,14 @@
Boston, MA 02110-1301, USA.
*/
-#include <QtCore/QDebug>
+#include <QDebug>
#include "kdev-pg.h"
#include "kdev-pg-parser.hh"
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
int inp();
void appendLineBuffer();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-main.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-main.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-main.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-main.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -31,10 +31,10 @@
#include "kdev-pg-generate.h"
#include "kdev-pg-regexp.h"
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QStringList>
+#include <QCoreApplication>
+#include <QFileInfo>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-new-visitor-bits-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-new-visitor-bits-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-new-visitor-bits-gen.h
2017-07-27 00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-new-visitor-bits-gen.h
2020-02-02 21:02:00.000000000 +0100
@@ -23,8 +23,8 @@
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QPair>
-#include <QtCore/QTextStream>
+#include <QPair>
+#include <QTextStream>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-new-visitor-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-new-visitor-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-new-visitor-gen.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-new-visitor-gen.h 2020-02-02
21:02:00.000000000 +0100
@@ -23,10 +23,10 @@
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
+#include <QSet>
+#include <QList>
+#include <QString>
+#include <QTextStream>
namespace KDevPG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-parser.cc
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-parser.cc
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-parser.cc 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-parser.cc 2020-02-02
21:02:00.000000000 +0100
@@ -94,7 +94,7 @@
#include "kdev-pg-unicode-loader.h"
#include "kdev-pg-checker.h"
-#include <QtCore/QFile>
+#include <QFile>
#include <cassert>
extern int yylex();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-parser.yy
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-parser.yy
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-parser.yy 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-parser.yy 2020-02-02
21:02:00.000000000 +0100
@@ -26,7 +26,7 @@
#include "kdev-pg-unicode-loader.h"
#include "kdev-pg-checker.h"
-#include <QtCore/QFile>
+#include <QFile>
#include <cassert>
extern int yylex();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-pretty-printer.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-pretty-printer.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-pretty-printer.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-pretty-printer.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -20,8 +20,8 @@
#include "kdev-pg-pretty-printer.h"
-#include <QtCore/QList>
-#include <QtCore/QStack>
+#include <QList>
+#include <QStack>
#include <iostream>
#include <cassert>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-pretty-printer.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-pretty-printer.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-pretty-printer.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-pretty-printer.h 2020-02-02
21:02:00.000000000 +0100
@@ -22,7 +22,7 @@
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QTextStream>
+#include <QTextStream>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-regexp.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-regexp.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-regexp.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-regexp.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -50,7 +50,10 @@
}; \
}
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+// Qt >= 5.14 already has std::hash for QBitArray
q_Hash_to_tr1_hash(QBitArray)
+#endif
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-serialize-visitor-gen.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-serialize-visitor-gen.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-serialize-visitor-gen.cpp
2017-07-27 00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-serialize-visitor-gen.cpp
2020-02-02 21:02:00.000000000 +0100
@@ -159,9 +159,9 @@
HasMemberNodes hms(has_members);
hms(sym);
- out << "virtual void visit" << sym->mCapitalizedName
+ out << "void visit" << sym->mCapitalizedName
<< "(" << sym->mCapitalizedName << "Ast *" << "node"
- << ") {" << endl;
+ << ") override {" << endl;
Model::EvolveItem *e = globalSystem.searchRule(sym);
visitNode(e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-serialize-visitor-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-serialize-visitor-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-serialize-visitor-gen.h
2017-07-27 00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-serialize-visitor-gen.h
2020-02-02 21:02:00.000000000 +0100
@@ -25,10 +25,10 @@
#include "kdev-pg-default-visitor.h"
#include "kdev-pg-default-visitor-bits-gen.h" // for the HasMemberNodes class
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
+#include <QSet>
+#include <QList>
+#include <QString>
+#include <QTextStream>
namespace KDevPG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-token-type-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-token-type-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-token-type-gen.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-token-type-gen.h 2020-02-02
21:02:00.000000000 +0100
@@ -20,7 +20,7 @@
#ifndef KDEVPG_KDEV_PG_TOKEN_TYPE_GEN_H
#define KDEVPG_KDEV_PG_TOKEN_TYPE_GEN_H
-#include <QtCore/QTextStream>
+#include <QTextStream>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-visitor-bits-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-visitor-bits-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-visitor-bits-gen.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-visitor-bits-gen.h 2020-02-02
21:02:00.000000000 +0100
@@ -22,10 +22,10 @@
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
+#include <QSet>
+#include <QList>
+#include <QString>
+#include <QTextStream>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-visitor-gen.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-visitor-gen.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg-visitor-gen.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-visitor-gen.h 2020-02-02
21:02:00.000000000 +0100
@@ -22,10 +22,10 @@
#include "kdev-pg-default-visitor.h"
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
+#include <QSet>
+#include <QList>
+#include <QString>
+#include <QTextStream>
namespace KDevPG
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg.h
new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg.h
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/kdev-pg.h 2017-07-27 00:47:39.000000000
+0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg.h 2020-02-02 21:02:00.000000000
+0100
@@ -24,15 +24,15 @@
#include "kdev-pg-ast.h"
-#include <QtCore/QSet>
-#include <QtCore/QMap>
-#include <QtCore/QList>
-#include <QtCore/QFile>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QMultiMap>
-#include <QtCore/QtGlobal>
-#include <QtCore/QTextStream>
+#include <QSet>
+#include <QMap>
+#include <QList>
+#include <QFile>
+#include <QString>
+#include <QStringList>
+#include <QMultiMap>
+#include <QtGlobal>
+#include <QTextStream>
#include <vector>
#include <algorithm>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/test/Op2main.cpp
new/kdevelop-pg-qt-2.2.1/kdev-pg/test/Op2main.cpp
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/test/Op2main.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/test/Op2main.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -2,7 +2,7 @@
#include "Op2debugvisitor.h"
#include "Op2tokenstream.h"
-#include <qfile.h>
+#include <QFile>
#include <kdebug.h>
using namespace Op2;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/test/op.g
new/kdevelop-pg-qt-2.2.1/kdev-pg/test/op.g
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/test/op.g 2017-07-27 00:47:39.000000000
+0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/test/op.g 2020-02-02 21:02:00.000000000
+0100
@@ -1,5 +1,5 @@
[:
-#include <QtCore/QString>
+#include <QString>
#include <kdebug.h>
:]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/kdev-pg/test/op2.g
new/kdevelop-pg-qt-2.2.1/kdev-pg/test/op2.g
--- old/kdevelop-pg-qt-2.1.0/kdev-pg/test/op2.g 2017-07-27 00:47:39.000000000
+0200
+++ new/kdevelop-pg-qt-2.2.1/kdev-pg/test/op2.g 2020-02-02 21:02:00.000000000
+0100
@@ -1,5 +1,5 @@
[:
-#include <QtCore/QString>
+#include <QString>
#include <kdebug.h>
:]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/tests/benchmarks.cpp
new/kdevelop-pg-qt-2.2.1/tests/benchmarks.cpp
--- old/kdevelop-pg-qt-2.1.0/tests/benchmarks.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/tests/benchmarks.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -23,12 +23,12 @@
#include <ctime>
#include <algorithm>
-#include <qalgorithms.h>
+#include <QtAlgorithms>
#include "../include/kdev-pg-location-table.h"
-#include <QtTest/QTest>
-#include <QtCore/QDebug>
+#include <QTest>
+#include <QDebug>
using namespace std;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/tests/benchmarks.h
new/kdevelop-pg-qt-2.2.1/tests/benchmarks.h
--- old/kdevelop-pg-qt-2.1.0/tests/benchmarks.h 2017-07-27 00:47:39.000000000
+0200
+++ new/kdevelop-pg-qt-2.2.1/tests/benchmarks.h 2020-02-02 21:02:00.000000000
+0100
@@ -18,7 +18,7 @@
#ifndef BENCHMARKS_H
#define BENCHMARKS_H
-#include <QtCore/QObject>
+#include <QObject>
namespace KDevPG
{
@@ -26,10 +26,10 @@
{
Q_OBJECT
-public slots:
+public Q_SLOTS:
void initTestCase();
-private slots:
+private Q_SLOTS:
/// benchmarks on of the PositionAtAlgorithms
void positionAt();
void positionAt_data();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/tests/testlocationtable.cpp
new/kdevelop-pg-qt-2.2.1/tests/testlocationtable.cpp
--- old/kdevelop-pg-qt-2.1.0/tests/testlocationtable.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/tests/testlocationtable.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -21,8 +21,8 @@
#include "testlocationtable.h"
#include <cstdlib>
-#include <QtTest/QTest>
-#include <QtCore/QDebug>
+#include <QTest>
+#include <QDebug>
#include "../include/kdev-pg-location-table.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/tests/testlocationtable.h
new/kdevelop-pg-qt-2.2.1/tests/testlocationtable.h
--- old/kdevelop-pg-qt-2.1.0/tests/testlocationtable.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/tests/testlocationtable.h 2020-02-02
21:02:00.000000000 +0100
@@ -21,7 +21,7 @@
#ifndef TESTLOCATIONTABLE_H
#define TESTLOCATIONTABLE_H
-#include <QtCore/qobject.h>
+#include <QObject>
namespace KDevPG
{
@@ -30,7 +30,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void underflow();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/tests/testmemorypool.cpp
new/kdevelop-pg-qt-2.2.1/tests/testmemorypool.cpp
--- old/kdevelop-pg-qt-2.1.0/tests/testmemorypool.cpp 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/tests/testmemorypool.cpp 2020-02-02
21:02:00.000000000 +0100
@@ -21,8 +21,8 @@
#include "testmemorypool.h"
#include <cstdlib>
-#include <QtTest/QTest>
-#include <QtCore/QDebug>
+#include <QTest>
+#include <QDebug>
#include "../include/kdev-pg-memory-pool.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdevelop-pg-qt-2.1.0/tests/testmemorypool.h
new/kdevelop-pg-qt-2.2.1/tests/testmemorypool.h
--- old/kdevelop-pg-qt-2.1.0/tests/testmemorypool.h 2017-07-27
00:47:39.000000000 +0200
+++ new/kdevelop-pg-qt-2.2.1/tests/testmemorypool.h 2020-02-02
21:02:00.000000000 +0100
@@ -21,7 +21,7 @@
#ifndef TESTMEMORYPOOL_H
#define TESTMEMORYPOOL_H
-#include <QtCore/qobject.h>
+#include <QObject>
namespace KDevPG
{
@@ -30,7 +30,7 @@
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void bigAlloc();
