diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /kde-apps/calendarsupport/files | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'kde-apps/calendarsupport/files')
-rw-r--r-- | kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch | 229 |
1 files changed, 0 insertions, 229 deletions
diff --git a/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch b/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch deleted file mode 100644 index af94c2e7a0de..000000000000 --- a/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch +++ /dev/null @@ -1,229 +0,0 @@ -From b4193facb223bd5b73a65318dec8ced51b66adf7 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Wed, 9 Sep 2020 17:26:46 +0200 -Subject: [PATCH] Port away from deprecated QPrinter functions - -This implies changing from QPrinter::Orientation to QPageLayout::Orientation. The actual values are the same tough. ---- - src/printing/calprintdefaultplugins.cpp | 14 +++++++------- - src/printing/calprintdefaultplugins.h | 10 +++++----- - src/printing/calprinter.cpp | 6 +++--- - src/printing/calprintpluginbase.cpp | 8 ++++---- - src/printing/calprintpluginbase.h | 2 +- - src/printing/printplugin.h | 4 ++-- - src/printing/yearprint.cpp | 6 +++--- - src/printing/yearprint.h | 2 +- - 8 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/src/printing/calprintdefaultplugins.cpp b/src/printing/calprintdefaultplugins.cpp -index 862b74d..e3d802d 100644 ---- a/src/printing/calprintdefaultplugins.cpp -+++ b/src/printing/calprintdefaultplugins.cpp -@@ -805,7 +805,7 @@ void CalPrintDay::print(QPainter &p, int width, int height) - QString line1 = local.toString(mFromDate, QLocale::ShortFormat); - QString line2 = local.toString(mToDate, QLocale::ShortFormat); - QString title; -- if (orientation() == QPrinter::Landscape) { -+ if (orientation() == QPageLayout::Landscape) { - title = i18nc("date from-to", "%1 - %2", line1, line2); - } else { - title = i18nc("date from-\nto", "%1 -\n%2", line1, line2); -@@ -1050,14 +1050,14 @@ void CalPrintWeek::saveConfig() - } - } - --QPrinter::Orientation CalPrintWeek::defaultOrientation() const -+QPageLayout::Orientation CalPrintWeek::defaultOrientation() const - { - if (mWeekPrintType == Filofax) { -- return QPrinter::Portrait; -+ return QPageLayout::Portrait; - } else if (mWeekPrintType == SplitWeek) { -- return QPrinter::Portrait; -+ return QPageLayout::Portrait; - } else { -- return QPrinter::Landscape; -+ return QPageLayout::Landscape; - } - } - -@@ -1099,7 +1099,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height) - do { - line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat); - line2 = local.toString(curWeek, QLocale::ShortFormat); -- if (orientation() == QPrinter::Landscape) { -+ if (orientation() == QPageLayout::Landscape) { - title = i18nc("date from-to", "%1 - %2", line1, line2); - } else { - title = i18nc("date from-\nto", "%1 -\n%2", line1, line2); -@@ -1126,7 +1126,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height) - do { - line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat); - line2 = local.toString(curWeek, QLocale::ShortFormat); -- if (orientation() == QPrinter::Landscape) { -+ if (orientation() == QPageLayout::Landscape) { - title = i18nc("date from - to (week number)", "%1 - %2 (Week %3)", - line1, line2, curWeek.weekNumber()); - } else { -diff --git a/src/printing/calprintdefaultplugins.h b/src/printing/calprintdefaultplugins.h -index 4df72f6..3f62d0b 100644 ---- a/src/printing/calprintdefaultplugins.h -+++ b/src/printing/calprintdefaultplugins.h -@@ -53,9 +53,9 @@ public: - } - - QWidget *createConfigWidget(QWidget *) override; -- Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override -+ Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override - { -- return QPrinter::Portrait; -+ return QPageLayout::Portrait; - } - - public: -@@ -166,7 +166,7 @@ public: - /** - Returns the default orientation for the eWeekPrintType. - */ -- QPrinter::Orientation defaultOrientation() const override; -+ QPageLayout::Orientation defaultOrientation() const override; - - public: - void print(QPainter &p, int width, int height) override; -@@ -222,9 +222,9 @@ public: - } - - QWidget *createConfigWidget(QWidget *) override; -- QPrinter::Orientation defaultOrientation() const override -+ QPageLayout::Orientation defaultOrientation() const override - { -- return QPrinter::Landscape; -+ return QPageLayout::Landscape; - } - - public: -diff --git a/src/printing/calprinter.cpp b/src/printing/calprinter.cpp -index 182e0e3..10e9db6 100644 ---- a/src/printing/calprinter.cpp -+++ b/src/printing/calprinter.cpp -@@ -126,13 +126,13 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, CalPrinter::ePrintOrientati - QPrinter printer; - switch (dlgorientation) { - case eOrientPlugin: -- printer.setOrientation(selectedStyle->defaultOrientation()); -+ printer.setPageOrientation(selectedStyle->defaultOrientation()); - break; - case eOrientPortrait: -- printer.setOrientation(QPrinter::Portrait); -+ printer.setPageOrientation(QPageLayout::Portrait); - break; - case eOrientLandscape: -- printer.setOrientation(QPrinter::Landscape); -+ printer.setPageOrientation(QPageLayout::Landscape); - break; - case eOrientPrinter: - break; -diff --git a/src/printing/calprintpluginbase.cpp b/src/printing/calprintpluginbase.cpp -index e96f3b2..9db198e 100644 ---- a/src/printing/calprintpluginbase.cpp -+++ b/src/printing/calprintpluginbase.cpp -@@ -232,9 +232,9 @@ void CalPrintPluginBase::setPrintFooter(bool printFooter) - mPrintFooter = printFooter; - } - --QPrinter::Orientation CalPrintPluginBase::orientation() const -+QPageLayout::Orientation CalPrintPluginBase::orientation() const - { -- return mPrinter ? mPrinter->orientation() : QPrinter::Portrait; -+ return mPrinter ? mPrinter->pageLayout().orientation() : QPageLayout::Portrait; - } - - QColor CalPrintPluginBase::getTextColor(const QColor &c) const -@@ -326,7 +326,7 @@ int CalPrintPluginBase::headerHeight() const - { - if (mHeaderHeight >= 0) { - return mHeaderHeight; -- } else if (orientation() == QPrinter::Portrait) { -+ } else if (orientation() == QPageLayout::Portrait) { - return PORTRAIT_HEADER_HEIGHT; - } else { - return LANDSCAPE_HEADER_HEIGHT; -@@ -356,7 +356,7 @@ int CalPrintPluginBase::footerHeight() const - - if (mFooterHeight >= 0) { - return mFooterHeight; -- } else if (orientation() == QPrinter::Portrait) { -+ } else if (orientation() == QPageLayout::Portrait) { - return PORTRAIT_FOOTER_HEIGHT; - } else { - return LANDSCAPE_FOOTER_HEIGHT; -diff --git a/src/printing/calprintpluginbase.h b/src/printing/calprintpluginbase.h -index ff1113c..b3d41ac 100644 ---- a/src/printing/calprintpluginbase.h -+++ b/src/printing/calprintpluginbase.h -@@ -108,7 +108,7 @@ public: - */ - static int weekdayColumn(int weekday); - -- QPrinter::Orientation orientation() const; -+ QPageLayout::Orientation orientation() const; - - /** Returns the height of the page header. If the height was explicitly - set using setHeaderHeight, that value is returned, otherwise a -diff --git a/src/printing/printplugin.h b/src/printing/printplugin.h -index 57afdfe..73bf467 100644 ---- a/src/printing/printplugin.h -+++ b/src/printing/printplugin.h -@@ -140,9 +140,9 @@ public: - config settings), implement this function in your subclass and - return the desired orientation. - */ -- virtual QPrinter::Orientation defaultOrientation() const -+ virtual QPageLayout::Orientation defaultOrientation() const - { -- return QPrinter::Portrait; -+ return QPageLayout::Portrait; - } - - /** -diff --git a/src/printing/yearprint.cpp b/src/printing/yearprint.cpp -index 3287ca6..e57a1c4 100644 ---- a/src/printing/yearprint.cpp -+++ b/src/printing/yearprint.cpp -@@ -82,9 +82,9 @@ void CalPrintYear::saveConfig() - } - } - --QPrinter::Orientation CalPrintYear::defaultOrientation() const -+QPageLayout::Orientation CalPrintYear::defaultOrientation() const - { -- return (mPages == 1) ? QPrinter::Landscape : QPrinter::Portrait; -+ return (mPages == 1) ? QPageLayout::Landscape : QPageLayout::Portrait; - } - - void CalPrintYear::setDateRange(const QDate &from, const QDate &to) -@@ -131,7 +131,7 @@ void CalPrintYear::print(QPainter &p, int width, int height) - QString stdate = locale.toString(start, QLocale::ShortFormat); - QString endate = locale.toString(end, QLocale::ShortFormat); - QString title; -- if (orientation() == QPrinter::Landscape) { -+ if (orientation() == QPageLayout::Landscape) { - title = i18nc("date from - to", "%1 - %2", stdate, endate); - } else { - title = i18nc("date from -\nto", "%1 -\n%2", stdate, endate); -diff --git a/src/printing/yearprint.h b/src/printing/yearprint.h -index e59bf87..cd46a50 100644 ---- a/src/printing/yearprint.h -+++ b/src/printing/yearprint.h -@@ -48,7 +48,7 @@ public: - } - - QWidget *createConfigWidget(QWidget *) override; -- Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override; -+ Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override; - - public: - void print(QPainter &p, int width, int height) override; --- -GitLab - |