| Revision | 270ee6f3182b93a48a3e9e2a63430990009393fc (tree) |
|---|---|
| Time | 2023-01-02 05:03:54 |
| Author | Ivailo Monev <xakepa10@gmai...> |
| Commiter | Ivailo Monev |
okular: deprecation warning fix
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
okular/generators/poppler/generator_pdf.cpp (diff)| @@ -26,6 +26,14 @@ | ||
| 26 | 26 | #include <poppler/cpp/poppler-page-renderer.h> |
| 27 | 27 | #include <poppler/cpp/poppler-embedded-file.h> |
| 28 | 28 | #include <poppler/cpp/poppler-page-transition.h> |
| 29 | +#include <poppler/cpp/poppler-version.h> | |
| 30 | +#include <sys/types.h> | |
| 31 | + | |
| 32 | +#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 | |
| 33 | +typedef time_t popplertimetype; | |
| 34 | +#else | |
| 35 | +typedef poppler::time_type popplertimetype; | |
| 36 | +#endif | |
| 29 | 37 | |
| 30 | 38 | static QByteArray okularBytes(const poppler::byte_array &popplerbytes) |
| 31 | 39 | { |
| @@ -38,13 +46,13 @@ static QString okularString(const poppler::ustring &popplerstring) | ||
| 38 | 46 | return QString::fromUtf8(popplerbytes.data(), popplerbytes.size()); |
| 39 | 47 | } |
| 40 | 48 | |
| 41 | -static QString okularTime(const poppler::time_type &popplertime) | |
| 49 | +static QString okularTime(const popplertimetype &popplertime) | |
| 42 | 50 | { |
| 43 | 51 | const KDateTime kdatetime(QDateTime::fromTime_t(popplertime)); |
| 44 | 52 | return KGlobal::locale()->formatDateTime(kdatetime, KLocale::FancyLongDate); |
| 45 | 53 | } |
| 46 | 54 | |
| 47 | -static QDateTime okularDateTime(const poppler::time_type &popplertime) | |
| 55 | +static QDateTime okularDateTime(const popplertimetype &popplertime) | |
| 48 | 56 | { |
| 49 | 57 | return QDateTime::fromTime_t(popplertime); |
| 50 | 58 | } |
| @@ -293,7 +301,11 @@ Okular::Document::OpenResult PDFGenerator::loadDocumentWithPassword(const QStrin | ||
| 293 | 301 | const poppler::page_transition *popplerpagetransition = popplerpage->transition(); |
| 294 | 302 | if (popplerpagetransition) { |
| 295 | 303 | Okular::PageTransition* okulartransition = new Okular::PageTransition(); |
| 304 | +#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 | |
| 305 | + okulartransition->setDuration(qRound(popplerpagetransition->durationReal())); | |
| 306 | +#else | |
| 296 | 307 | okulartransition->setDuration(popplerpagetransition->duration()); |
| 308 | +#endif | |
| 297 | 309 | okulartransition->setAngle(popplerpagetransition->angle()); |
| 298 | 310 | okulartransition->setScale(popplerpagetransition->scale()); |
| 299 | 311 | okulartransition->setIsRectangular(popplerpagetransition->is_rectangular()); |
| @@ -403,8 +415,13 @@ const Okular::DocumentInfo* PDFGenerator::generateDocumentInfo() | ||
| 403 | 415 | m_documentinfo->set(Okular::DocumentInfo::Creator, okularString(m_popplerdocument->get_creator())); |
| 404 | 416 | m_documentinfo->set(Okular::DocumentInfo::Producer, okularString(m_popplerdocument->get_producer())); |
| 405 | 417 | m_documentinfo->set(Okular::DocumentInfo::Keywords, okularString(m_popplerdocument->get_keywords())); |
| 418 | +#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 | |
| 419 | + m_documentinfo->set(Okular::DocumentInfo::CreationDate, okularTime(m_popplerdocument->get_creation_date_t())); | |
| 420 | + m_documentinfo->set(Okular::DocumentInfo::ModificationDate, okularTime(m_popplerdocument->get_modification_date_t())); | |
| 421 | +#else | |
| 406 | 422 | m_documentinfo->set(Okular::DocumentInfo::CreationDate, okularTime(m_popplerdocument->get_creation_date())); |
| 407 | 423 | m_documentinfo->set(Okular::DocumentInfo::ModificationDate, okularTime(m_popplerdocument->get_modification_date())); |
| 424 | +#endif | |
| 408 | 425 | |
| 409 | 426 | return m_documentinfo; |
| 410 | 427 | } |
| @@ -470,8 +487,13 @@ const QList<Okular::EmbeddedFile*>* PDFGenerator::embeddedFiles() const | ||
| 470 | 487 | pdfembeddedfile->m_description = okularString(popplerembeddedfile->description()); |
| 471 | 488 | pdfembeddedfile->m_data = okularBytes(popplerembeddedfile->data()); |
| 472 | 489 | pdfembeddedfile->m_size = popplerembeddedfile->size(); |
| 490 | +#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 | |
| 491 | + pdfembeddedfile->m_modificationdate = okularDateTime(popplerembeddedfile->modification_date_t()); | |
| 492 | + pdfembeddedfile->m_creationdate = okularDateTime(popplerembeddedfile->creation_date_t()); | |
| 493 | +#else | |
| 473 | 494 | pdfembeddedfile->m_modificationdate = okularDateTime(popplerembeddedfile->modification_date()); |
| 474 | 495 | pdfembeddedfile->m_creationdate = okularDateTime(popplerembeddedfile->creation_date()); |
| 496 | +#endif | |
| 475 | 497 | // qDebug() << Q_FUNC_INFO << pdfembeddedfile->m_name; |
| 476 | 498 | okularembeddedfiles->append(pdfembeddedfile); |
| 477 | 499 | } |
Fork