cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch build from C++14 to C++17 (in some parts)

Browse Source 
Add patches from upstream; stolen from FreeBSD/ArchLinux.
This should hopefully avoid the countless build errors.

Issues reported by naddy and tb. Thanks
This commit is contained in:
rsadowski 2022-02-20 13:27:47 +00:00
parent e2196a4c32
commit 589fcd1a25
17 changed files with 722 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/calligra/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2021/12/17 11:00:26 namn Exp $
# $OpenBSD: Makefile,v 1.50 2022/02/20 13:27:47 rsadowski Exp $
COMMENT = K Desktop Environment, office suite
HOMEPAGE = https://www.calligra.org
@ -69,7 +69,7 @@ WANTLIB += poppler-qt5 qca-qt5 z
MODULES = devel/kf5
# c++-14
# c++-17
COMPILER = base-clang ports-gcc
BUILD_DEPENDS = devel/boost \

29
editors/calligra/patches/patch-CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.4 2021/12/17 11:00:26 namn Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.5 2022/02/20 13:27:47 rsadowski Exp $
Fix build with OpenEXR>=3
@ -7,13 +7,29 @@ From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
Date: Sun, 6 Jun 2021 08:41:05 +0000
Subject: [PATCH] Update Cmake and deps, Fix Freetype and FontConfig Linkage
Enforce -std=c++14 *after* -std=c++0x to let it build with poppler.
From sthen@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -391,8 +391,14 @@ endif ()
@@ -105,11 +105,12 @@ endif()
message(STATUS "Release build: ${RELEASE_BUILD}")
# use CPP-11
-if (CMAKE_VERSION VERSION_LESS "3.1")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-else ()
- set (CMAKE_CXX_STANDARD 11)
-endif ()
+#if (CMAKE_VERSION VERSION_LESS "3.1")
+# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+#else ()
+# set (CMAKE_CXX_STANDARD 11)
+#endif ()
+set (CMAKE_CXX_STANDARD 11)
############
#############
@@ -391,8 +392,14 @@ endif ()
## Check for OpenEXR
##
@ -30,7 +46,7 @@ Index: CMakeLists.txt
##
## Test for GNU Scientific Library
@@ -641,8 +647,8 @@ if(NOT WIN32 AND NOT APPLE)
@@ -641,8 +648,8 @@ if(NOT WIN32 AND NOT APPLE)
)
endif()
@ -41,13 +57,12 @@ Index: CMakeLists.txt
set(FREETYPE_INCLUDE_DIRS "")
else()
add_definitions( -DSHOULD_BUILD_FONT_CONVERSION )
@@ -912,6 +918,9 @@ set(KOPAGEAPP_INCLUDES ${TEXTLAYOUT_INCLUDES}
@@ -912,6 +919,8 @@ set(KOPAGEAPP_INCLUDES ${TEXTLAYOUT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/pageapp
${CMAKE_SOURCE_DIR}/libs/pageapp/commands
${CMAKE_BINARY_DIR}/libs/pageapp )
+
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
#############################################
#### filter libraries ####

17
editors/calligra/patches/patch-filters_libmsooxml_CMakeLists_txt Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-filters_libmsooxml_CMakeLists_txt,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/libmsooxml/CMakeLists.txt
--- filters/libmsooxml/CMakeLists.txt.orig
+++ filters/libmsooxml/CMakeLists.txt
@@ -2,11 +2,6 @@ if(Qca-qt5_FOUND)
add_definitions( -DHAVE_QCA2 )
endif()
-# TEMPORARY: for std::auto_ptr deprecation warnings are only annoying noise
-if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC)
- add_definitions(-Wno-deprecated-declarations)
-endif ()
-
include_directories(
${KOMAIN_INCLUDES}
${KOODF2_INCLUDES} # For charts

16
editors/calligra/patches/patch-filters_libmsooxml_MsooXmlImport_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-filters_libmsooxml_MsooXmlImport_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/libmsooxml/MsooXmlImport.cpp
--- filters/libmsooxml/MsooXmlImport.cpp.orig
+++ filters/libmsooxml/MsooXmlImport.cpp
@@ -594,8 +594,8 @@ KoFilter::ConversionStatus MsooXmlImport::imageFromFil
QString errorMessage;
KoFilter::ConversionStatus status = KoFilter::OK;
- std::auto_ptr<QIODevice> inputDevice(Utils::openDeviceForFile(m_zip, errorMessage, sourceName, status));
- if (!inputDevice.get()) {
+ std::unique_ptr<QIODevice> inputDevice(Utils::openDeviceForFile(m_zip, errorMessage, sourceName, status));
+ if (!inputDevice) {
return status;
}
QImageReader r(inputDevice.get(), QFileInfo(sourceName).suffix().toLatin1());

48
editors/calligra/patches/patch-filters_libmsooxml_MsooXmlThemesReader_cpp Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-filters_libmsooxml_MsooXmlThemesReader_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/libmsooxml/MsooXmlThemesReader.cpp
--- filters/libmsooxml/MsooXmlThemesReader.cpp.orig
+++ filters/libmsooxml/MsooXmlThemesReader.cpp
@@ -736,14 +736,14 @@ KoFilter::ConversionStatus MsooXmlThemesReader::read_c
*/
KoFilter::ConversionStatus MsooXmlThemesReader::read_srgbClr_local()
{
- std::auto_ptr<DrawingMLColorSchemeItem> color(new DrawingMLColorSchemeItem);
+ std::unique_ptr<DrawingMLColorSchemeItem> color(new DrawingMLColorSchemeItem);
m_currentColor_local = 0;
READ_PROLOGUE
const QXmlStreamAttributes attrs(attributes());
READ_ATTR_WITHOUT_NS(val)
- color.get()->color = Utils::ST_HexColorRGB_to_QColor(val);
- //debugMsooXml << color.get()->color;
+ color->color = Utils::ST_HexColorRGB_to_QColor(val);
+ //debugMsooXml << color->color;
readNext();
READ_EPILOGUE_WITHOUT_RETURN
@@ -841,19 +841,19 @@ KoFilter::ConversionStatus MsooXmlThemesReader::read_s
*/
KoFilter::ConversionStatus MsooXmlThemesReader::read_sysClr_local()
{
- std::auto_ptr<DrawingMLColorSchemeSystemItem> color(new DrawingMLColorSchemeSystemItem);
+ std::unique_ptr<DrawingMLColorSchemeSystemItem> color(new DrawingMLColorSchemeSystemItem);
m_currentColor_local = 0;
READ_PROLOGUE
const QXmlStreamAttributes attrs(attributes());
READ_ATTR_WITHOUT_NS(lastClr)
- color.get()->lastColor = Utils::ST_HexColorRGB_to_QColor(lastClr);
-// debugMsooXml << "lastClr:" << color.get()->lastColor.name();
+ color->lastColor = Utils::ST_HexColorRGB_to_QColor(lastClr);
+// debugMsooXml << "lastClr:" << color->lastColor.name();
// System color value. This color is based upon the value that this color
// currently has within the system on which the document is being viewed.
- READ_ATTR_WITHOUT_NS_INTO(val, color.get()->systemColor)
-// debugMsooXml << "val:" << color.get()->systemColor;
+ READ_ATTR_WITHOUT_NS_INTO(val, color->systemColor)
+// debugMsooXml << "val:" << color->systemColor;
readNext();
READ_EPILOGUE_WITHOUT_RETURN

50
editors/calligra/patches/patch-filters_libmsooxml_MsooXmlUtils_cpp Normal file
View File

@ -0,0 +1,50 @@
$OpenBSD: patch-filters_libmsooxml_MsooXmlUtils_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/libmsooxml/MsooXmlUtils.cpp
--- filters/libmsooxml/MsooXmlUtils.cpp.orig
+++ filters/libmsooxml/MsooXmlUtils.cpp
@@ -189,8 +189,8 @@ KoFilter::ConversionStatus Utils::loadAndParse(KoXmlDo
{
errorMessage.clear();
KoFilter::ConversionStatus status;
- std::auto_ptr<QIODevice> device(openDeviceForFile(zip, errorMessage, fileName, status));
- if (!device.get())
+ std::unique_ptr<QIODevice> device(openDeviceForFile(zip, errorMessage, fileName, status));
+ if (!device)
return status;
return loadAndParse(device.get(), doc, errorMessage, fileName);
}
@@ -205,8 +205,8 @@ KoFilter::ConversionStatus Utils::loadAndParseDocument
Q_UNUSED(writers)
errorMessage.clear();
KoFilter::ConversionStatus status;
- std::auto_ptr<QIODevice> device(openDeviceForFile(zip, errorMessage, fileName, status));
- if (!device.get())
+ std::unique_ptr<QIODevice> device(openDeviceForFile(zip, errorMessage, fileName, status));
+ if (!device)
return status;
reader->setDevice(device.get());
reader->setFileName(fileName); // for error reporting
@@ -389,9 +389,9 @@ KoFilter::ConversionStatus Utils::copyFile(const KZip*
return status;
}
- std::auto_ptr<QIODevice> inputDevice = std::auto_ptr<QIODevice>(Utils::openDeviceForFile(zip, errorMessage, sourceName, status));
+ std::unique_ptr<QIODevice> inputDevice(Utils::openDeviceForFile(zip, errorMessage, sourceName, status));
- if (!inputDevice.get()) {
+ if (!inputDevice) {
return status;
}
@@ -423,8 +423,8 @@ KoFilter::ConversionStatus Utils::imageSize(const KZip
{
Q_ASSERT(size);
KoFilter::ConversionStatus status;
- std::auto_ptr<QIODevice> inputDevice(Utils::openDeviceForFile(zip, errorMessage, sourceName, status));
- if (!inputDevice.get()) {
+ std::unique_ptr<QIODevice> inputDevice(Utils::openDeviceForFile(zip, errorMessage, sourceName, status));
+ if (!inputDevice) {
return status;
}
QImageReader r(inputDevice.get(), QFileInfo(sourceName).suffix().toLatin1());

25
editors/calligra/patches/patch-filters_sheets_xlsx_XlsxXmlCommentsReader_cpp Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-filters_sheets_xlsx_XlsxXmlCommentsReader_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/sheets/xlsx/XlsxXmlCommentsReader.cpp
--- filters/sheets/xlsx/XlsxXmlCommentsReader.cpp.orig
+++ filters/sheets/xlsx/XlsxXmlCommentsReader.cpp
@@ -259,7 +259,7 @@ KoFilter::ConversionStatus XlsxXmlCommentsReader::read
READ_ATTR_WITHOUT_NS(authorId)
int authorIdInt = -1;
STRING_TO_INT(authorId, authorIdInt, "comment@authorId")
- std::auto_ptr<XlsxComment> comment(authorIdInt < 0 ? 0 : new XlsxComment(authorIdInt));
+ std::unique_ptr<XlsxComment> comment(authorIdInt < 0 ? 0 : new XlsxComment(authorIdInt));
while (!atEnd()) {
readNext();
BREAK_IF_END_OF(CURRENT_EL)
@@ -269,8 +269,8 @@ KoFilter::ConversionStatus XlsxXmlCommentsReader::read
ELSE_WRONG_FORMAT
}
}
- if (comment.get()) {
- comment.get()->texts = m_currentCommentText;
+ if (comment) {
+ comment->texts = m_currentCommentText;
m_context->comments->insert(ref, comment.release());
qCDebug(lcXlsxImport) << "Added comment for" << ref;
}

30
editors/calligra/patches/patch-filters_words_msword-odf_wv2_src_styles_cpp Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-filters_words_msword-odf_wv2_src_styles_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/words/msword-odf/wv2/src/styles.cpp
--- filters/words/msword-odf/wv2/src/styles.cpp.orig
+++ filters/words/msword-odf/wv2/src/styles.cpp
@@ -42,7 +42,6 @@ STD::STD()
}
STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos )
-throw(InvalidFormatException)
{
clearInternal();
if (!read( baseSize, totalSize, stream, preservePos )) {
@@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs )
}
bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos )
-throw(InvalidFormatException)
{
U16 shifterU16;
S32 startOffset=stream->tell(); // address where the STD starts
@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, Wo
}
-StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException)
+StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf )
: m_udsNum(0)
{
WordVersion version = Word8;

39
editors/calligra/patches/patch-filters_words_msword-odf_wv2_src_styles_h Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-filters_words_msword-odf_wv2_src_styles_h,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/words/msword-odf/wv2/src/styles.h
--- filters/words/msword-odf/wv2/src/styles.h.orig
+++ filters/words/msword-odf/wv2/src/styles.h
@@ -58,8 +58,9 @@ struct STD
STD();
/**
* Simply calls read(...)
+ * @throw InvalidFormatException
*/
- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
+ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false );
/**
* Attention: This struct allocates memory on the heap
*/
@@ -74,8 +75,9 @@ struct STD
* false the state of stream will be changed!
*
* @return true - success, false - failed
+ * @throw InvalidFormatException
*/
- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
+ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false );
/**
* Same as reading :)
@@ -365,7 +367,10 @@ class WV2_EXPORT Style (private)
class WV2_EXPORT StyleSheet
{
public:
- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException);
+ /**
+ * @throw InvalidFormatException
+ */
+ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf );
~StyleSheet();
/**

44
editors/calligra/patches/patch-filters_words_msword-odf_wv2_src_word97_helper_cpp Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-filters_words_msword-odf_wv2_src_word97_helper_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/words/msword-odf/wv2/src/word97_helper.cpp
--- filters/words/msword-odf/wv2/src/word97_helper.cpp.orig
+++ filters/words/msword-odf/wv2/src/word97_helper.cpp
@@ -30,7 +30,7 @@
#include <string.h> // memcpy
#include <algorithm>
-#include <functional> // std::bind2nd for gcc 2.9x
+#include <functional>
#include <cstdlib>
#include "wvlog.h"
@@ -921,7 +921,8 @@ S16 PAP::applyPAPSPRM( const U8* ptr, const Style* sty
std::vector<TabDescriptor>::iterator newEnd = rgdxaTab.end();
for ( U8 i = 0; i < itbdDelMax; ++i ) {
newEnd = std::remove_if ( rgdxaTab.begin(), newEnd,
- std::bind2nd( InZone(), Zone( myPtr, i, itbdDelMax ) ) );
+ [z=Zone(myPtr, i, itbdDelMax ), f=InZone()](const TabDescriptor& t){ return f(t, z); }
+ );
}
rgdxaTab.erase( newEnd, rgdxaTab.end() ); // really get rid of them
myPtr += itbdDelMax * 4;
@@ -2361,7 +2362,8 @@ S16 TAP::applyTAPSPRM( const U8* ptr, const Style* sty
// Adjust all successive items (+= ctc * dxaCol)
std::transform( rgdxaCenter.begin() + itcFirst + ctc, rgdxaCenter.end(),
rgdxaCenter.begin() + itcFirst + ctc,
- std::bind1st( std::plus<S16>(), ctc * dxaCol ) );
+ [x = ctc * dxaCol, f=std::plus<S16>()](S16 y){ return f(x, y); }
+ );
}
break;
}
@@ -2400,7 +2402,8 @@ S16 TAP::applyTAPSPRM( const U8* ptr, const Style* sty
++itcFirst;
std::transform( rgdxaCenter.begin() + itcFirst, rgdxaCenter.end(),
rgdxaCenter.begin() + itcFirst,
- std::bind2nd( std::minus<S16>(), shift ) );
+ [y=shift, f=std::minus<S16>()](S16 x){ return f(x, y); }
+ );
break;
}
case SPRM::sprmTMerge:

27
editors/calligra/patches/patch-filters_words_msword-odf_wv2_src_word_helper_h Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-filters_words_msword-odf_wv2_src_word_helper_h,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: filters/words/msword-odf/wv2/src/word_helper.h
--- filters/words/msword-odf/wv2/src/word_helper.h.orig
+++ filters/words/msword-odf/wv2/src/word_helper.h
@@ -322,6 +322,11 @@ namespace wvWare
{
friend PLCFIterator<T> PLCF<T>::at( unsigned int ) const;
public:
+ PLCFIterator(PLCFIterator &&other)
+ : m_plcf(std::move(other.m_plcf)),
+ m_itemIt(std::move(other.m_itemIt)),
+ m_indexIt(std::move(other.m_indexIt)) {}
+
PLCFIterator( const PLCF<T>& plcf ) : m_plcf( plcf )
{
m_itemIt = m_plcf.m_items.begin();
@@ -345,7 +350,8 @@ namespace wvWare
private:
// don't assign it
- PLCFIterator<T>& operator=( const PLCFIterator<T>& rhs );
+ PLCFIterator( const PLCFIterator<T> &other) = delete;
+ PLCFIterator<T>& operator=( const PLCFIterator<T>& rhs ) = delete;
const PLCF<T>& m_plcf;
typename std::vector<T*>::const_iterator m_itemIt;

68
editors/calligra/patches/patch-sheets_part_CanvasBase_cpp Normal file
View File

@ -0,0 +1,68 @@
$OpenBSD: patch-sheets_part_CanvasBase_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: sheets/part/CanvasBase.cpp
--- sheets/part/CanvasBase.cpp.orig
+++ sheets/part/CanvasBase.cpp
@@ -230,7 +230,7 @@ bool CanvasBase::eventFilter(QObject *o, QEvent *e)
void CanvasBase::validateSelection()
{
- register Sheet * const sheet = activeSheet();
+ Sheet * const sheet = activeSheet();
if (!sheet)
return;
#if 0
@@ -443,7 +443,7 @@ void CanvasBase::paint(QPainter* painter, const QRectF
if (doc()->map()->isLoading() || isViewLoading())
return;
- register Sheet * const sheet = activeSheet();
+ Sheet * const sheet = activeSheet();
if (!sheet)
return;
@@ -513,7 +513,7 @@ bool CanvasBase::dragEnter(const QMimeData* mimeData)
bool CanvasBase::dragMove(const QMimeData* mimeData, const QPointF& eventPos, const QObject *source)
{
- register Sheet * const sheet = activeSheet();
+ Sheet * const sheet = activeSheet();
if (!sheet) {
return false;
}
@@ -596,7 +596,7 @@ void CanvasBase::dragLeave()
bool CanvasBase::drop(const QMimeData* mimeData, const QPointF& eventPos, const QObject *source)
{
- register Sheet * const sheet = activeSheet();
+ Sheet * const sheet = activeSheet();
// FIXME Sheet protection: Not all cells have to be protected.
if (!sheet || sheet->isProtected()) {
return false;
@@ -656,7 +656,7 @@ bool CanvasBase::drop(const QMimeData* mimeData, const
QRect CanvasBase::viewToCellCoordinates(const QRectF& viewRect) const
{
- register Sheet * const sheet = activeSheet();
+ Sheet * const sheet = activeSheet();
if (!sheet)
return QRect();
@@ -685,7 +685,7 @@ QRect CanvasBase::visibleCells() const
QRectF CanvasBase::cellCoordinatesToView(const QRect& cellRange) const
{
- register Sheet * const sheet = activeSheet();
+ Sheet * const sheet = activeSheet();
if (!sheet)
return QRectF();
@@ -706,7 +706,7 @@ QRectF CanvasBase::cellCoordinatesToView(const QRect&
void CanvasBase::showToolTip(const QPoint& p)
{
- register Sheet * const sheet = activeSheet();
+ Sheet * const sheet = activeSheet();
if (!sheet)
return;
SheetView * const sheetView = this->sheetView(sheet);

44
editors/calligra/patches/patch-sheets_part_Digest_cpp Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-sheets_part_Digest_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: sheets/part/Digest.cpp
--- sheets/part/Digest.cpp.orig
+++ sheets/part/Digest.cpp
@@ -250,8 +250,8 @@ typedef struct digest_impl_st {
*/
static void __rtl_digest_swapLong(sal_uInt32 *pData, sal_uInt32 nDatLen)
{
- register sal_uInt32 *X;
- register int i, n;
+ sal_uInt32 *X;
+ int i, n;
X = pData;
n = nDatLen;
@@ -465,10 +465,10 @@ static void __rtl_digest_initSHA(
*/
static void __rtl_digest_updateSHA(DigestContextSHA *ctx)
{
- register sal_uInt32 A, B, C, D, E, T;
- register sal_uInt32 *X;
+ sal_uInt32 A, B, C, D, E, T;
+ sal_uInt32 *X;
- register DigestSHA_update_t *U;
+ DigestSHA_update_t *U;
U = ctx->m_update;
A = ctx->m_nA;
@@ -577,10 +577,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx)
static const sal_uInt8 end[4] = {
0x80, 0x00, 0x00, 0x00
};
- register const sal_uInt8 *p = end;
+ const sal_uInt8 *p = end;
- register sal_uInt32 *X;
- register int i;
+ sal_uInt32 *X;
+ int i;
X = ctx->m_pData;
i = (ctx->m_nDatLen >> 2);

74
editors/calligra/patches/patch-sheets_part_HeaderItems_cpp Normal file
View File

@ -0,0 +1,74 @@
$OpenBSD: patch-sheets_part_HeaderItems_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: sheets/part/HeaderItems.cpp
--- sheets/part/HeaderItems.cpp.orig
+++ sheets/part/HeaderItems.cpp
@@ -96,8 +96,8 @@ RowHeaderItem::RowHeaderItem(QGraphicsItem *_parent, C
//connect(m_pView, SIGNAL(autoScroll(QPoint)),
//this, SLOT(slotAutoScroll(QPoint)));
- connect(m_pCanvas->toolProxy(), SIGNAL(toolChanged(QString)),
- this, SLOT(toolChanged(QString)));
+ connect(m_pCanvas->toolProxy(), &KoToolProxy::toolChanged,
+ this, &RowHeaderItem::toolChanged);
setFlag(ItemClipsToShape, true);
}
@@ -161,7 +161,7 @@ void RowHeaderItem::wheelEvent(QGraphicsSceneWheelEven
void RowHeaderItem::paintSizeIndicator(int mouseY)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -216,7 +216,7 @@ void RowHeaderItem::removeSizeIndicator()
void RowHeaderItem::updateRows(int from, int to)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -256,8 +256,8 @@ ColumnHeaderItem::ColumnHeaderItem(QGraphicsItem *_par
//connect(_view, SIGNAL(autoScroll(QPoint)),
//this, SLOT(slotAutoScroll(QPoint)));
- connect(_canvas->toolProxy(), SIGNAL(toolChanged(QString)),
- this, SLOT(toolChanged(QString)));
+ connect(_canvas->toolProxy(), &KoToolProxy::toolChanged,
+ this, &ColumnHeaderItem::toolChanged);
setFlag(ItemClipsToShape, true);
}
@@ -324,7 +324,7 @@ void ColumnHeaderItem::resizeEvent(QGraphicsSceneResiz
void ColumnHeaderItem::paintSizeIndicator(int mouseX)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -389,7 +389,7 @@ void ColumnHeaderItem::removeSizeIndicator()
void ColumnHeaderItem::updateColumns(int from, int to)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -434,8 +434,8 @@ SelectAllButtonItem::SelectAllButtonItem(QGraphicsItem
: QGraphicsWidget(_parent)
, SelectAllButton(canvasBase)
{
- connect(canvasBase->toolProxy(), SIGNAL(toolChanged(QString)),
- this, SLOT(toolChanged(QString)));
+ connect(canvasBase->toolProxy(), &KoToolProxy::toolChanged,
+ this, &SelectAllButtonItem::toolChanged);
}
SelectAllButtonItem::~SelectAllButtonItem()

82
editors/calligra/patches/patch-sheets_part_HeaderWidgets_cpp Normal file
View File

@ -0,0 +1,82 @@
$OpenBSD: patch-sheets_part_HeaderWidgets_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: sheets/part/HeaderWidgets.cpp
--- sheets/part/HeaderWidgets.cpp.orig
+++ sheets/part/HeaderWidgets.cpp
@@ -93,10 +93,10 @@ RowHeaderWidget::RowHeaderWidget(QWidget *_parent, Can
setAttribute(Qt::WA_StaticContents);
setMouseTracking(true);
- connect(_view, SIGNAL(autoScroll(QPoint)),
- this, SLOT(slotAutoScroll(QPoint)));
- connect(m_pCanvas->toolProxy(), SIGNAL(toolChanged(QString)),
- this, SLOT(toolChanged(QString)));
+ connect(_view, &View::autoScroll,
+ this, &RowHeaderWidget::slotAutoScroll);
+ connect(m_pCanvas->toolProxy(), &KoToolProxy::toolChanged,
+ this, &RowHeaderWidget::toolChanged);
}
@@ -155,7 +155,7 @@ void RowHeaderWidget::wheelEvent(QWheelEvent* _ev)
void RowHeaderWidget::paintSizeIndicator(int mouseY)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -209,7 +209,7 @@ void RowHeaderWidget::removeSizeIndicator()
void RowHeaderWidget::updateRows(int from, int to)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -247,10 +247,10 @@ ColumnHeaderWidget::ColumnHeaderWidget(QWidget *_paren
setAttribute(Qt::WA_StaticContents);
setMouseTracking(true);
- connect(_view, SIGNAL(autoScroll(QPoint)),
- this, SLOT(slotAutoScroll(QPoint)));
- connect(m_pCanvas->toolProxy(), SIGNAL(toolChanged(QString)),
- this, SLOT(toolChanged(QString)));
+ connect(_view, &View::autoScroll,
+ this, &ColumnHeaderWidget::slotAutoScroll);
+ connect(m_pCanvas->toolProxy(), &KoToolProxy::toolChanged,
+ this, &ColumnHeaderWidget::toolChanged);
}
@@ -314,7 +314,7 @@ void ColumnHeaderWidget::resizeEvent(QResizeEvent* _ev
void ColumnHeaderWidget::paintSizeIndicator(int mouseX)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -379,7 +379,7 @@ void ColumnHeaderWidget::removeSizeIndicator()
void ColumnHeaderWidget::updateColumns(int from, int to)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -416,8 +416,8 @@ SelectAllButtonWidget::SelectAllButtonWidget(CanvasBas
: QWidget(canvasBase->canvasWidget())
, SelectAllButton(canvasBase)
{
- connect(canvasBase->toolProxy(), SIGNAL(toolChanged(QString)),
- this, SLOT(toolChanged(QString)));
+ connect(canvasBase->toolProxy(), &KoToolProxy::toolChanged,
+ this, &SelectAllButtonWidget::toolChanged);
}
SelectAllButtonWidget::~SelectAllButtonWidget()

104
editors/calligra/patches/patch-sheets_part_Headers_cpp Normal file
View File

@ -0,0 +1,104 @@
$OpenBSD: patch-sheets_part_Headers_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: sheets/part/Headers.cpp
--- sheets/part/Headers.cpp.orig
+++ sheets/part/Headers.cpp
@@ -102,7 +102,7 @@ void RowHeader::mousePress(KoPointerEvent * _ev)
if (!m_cellToolIsActive)
return;
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -192,7 +192,7 @@ void RowHeader::mouseRelease(KoPointerEvent * _ev)
m_bMousePressed = false;
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -295,7 +295,7 @@ void RowHeader::mouseDoubleClick(KoPointerEvent*)
{
if (!m_cellToolIsActive)
return;
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -317,7 +317,7 @@ void RowHeader::mouseMove(KoPointerEvent* _ev)
return;
}
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -379,7 +379,7 @@ void RowHeader::mouseMove(KoPointerEvent* _ev)
void RowHeader::paint(QPainter* painter, const QRectF& painterRect)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -545,7 +545,7 @@ void ColumnHeader::mousePress(KoPointerEvent * _ev)
m_pCanvas->enableAutoScroll();
}
- const register Sheet * const sheet = m_pCanvas->activeSheet();
+ const Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -682,7 +682,7 @@ void ColumnHeader::mouseRelease(KoPointerEvent * _ev)
m_bMousePressed = false;
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -794,7 +794,7 @@ void ColumnHeader::mouseDoubleClick(KoPointerEvent*)
{
if (!m_cellToolIsActive)
return;
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -813,7 +813,7 @@ void ColumnHeader::mouseMove(KoPointerEvent* _ev)
if (!m_cellToolIsActive)
return;
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -911,7 +911,7 @@ void ColumnHeader::mouseMove(KoPointerEvent* _ev)
void ColumnHeader::resize(const QSizeF& size, const QSizeF& oldSize)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;
@@ -929,7 +929,7 @@ void ColumnHeader::resize(const QSizeF& size, const QS
void ColumnHeader::paint(QPainter* painter, const QRectF& painterRect)
{
- register Sheet * const sheet = m_pCanvas->activeSheet();
+ Sheet * const sheet = m_pCanvas->activeSheet();
if (!sheet)
return;

30
editors/calligra/patches/patch-sheets_plugins_solver_Solver_cpp Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-sheets_plugins_solver_Solver_cpp,v 1.1 2022/02/20 13:27:47 rsadowski Exp $
Index: sheets/plugins/solver/Solver.cpp
--- sheets/plugins/solver/Solver.cpp.orig
+++ sheets/plugins/solver/Solver.cpp
@@ -70,7 +70,7 @@ Solver::Solver(QObject* parent, const QVariantList& ar
QAction* solver = actionCollection()->addAction("sheetssolver");
solver->setText(i18n("Function Optimizer..."));
- connect(solver, SIGNAL(triggered(bool)), this, SLOT(showDialog()));
+ connect(solver, &QAction::triggered, this, &Solver::showDialog);
}
Solver::~Solver()
@@ -81,13 +81,13 @@ Solver::~Solver()
void Solver::showDialog()
{
d->dialog = new SolverDialog(d->view->selection(), d->view);
- connect(d->dialog, SIGNAL(okClicked()), this, SLOT(optimize()));
+ connect(d->dialog, &KoDialog::okClicked, this, &Solver::optimize);
d->dialog->show();
}
void Solver::optimize()
{
- register Sheet * const sheet = d->view->activeSheet();
+ Sheet * const sheet = d->view->activeSheet();
if (!sheet)
return;