Hello community, here is the log from the commit of package kdelibs4support for openSUSE:Factory checked in at 2015-07-14 17:23:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4support (Old) and /work/SRC/openSUSE:Factory/.kdelibs4support.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4support" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4support/kdelibs4support.changes 2015-06-23 12:07:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4support.new/kdelibs4support.changes 2015-07-14 17:23:15.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Jul 5 18:44:56 UTC 2015 - [email protected] + +- Update to 5.12.0 + * Fix KMimeType::Ptr::isNull implementation. + * Reenable support for KDateTime streaming to kDebug/qDebug, + for more SC + * Load correct translation catalog for kdebugdialog + * Don't skip documenting deprecated methods, so that people can + read the porting hints + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.12.0.php + +------------------------------------------------------------------- Old: ---- kdelibs4support-5.11.0.tar.xz New: ---- kdelibs4support-5.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4support.spec ++++++ --- /var/tmp/diff_new_pack.wU3o7b/_old 2015-07-14 17:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.wU3o7b/_new 2015-07-14 17:23:16.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5KDELibs4Support5 -%define _tar_path 5.11 +%define _tar_path 5.12 Name: kdelibs4support -Version: 5.11.0 +Version: 5.12.0 Release: 0 %define kf5_version %{version} BuildRequires: NetworkManager-devel ++++++ kdelibs4support-5.11.0.tar.xz -> kdelibs4support-5.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/CMakeLists.txt new/kdelibs4support-5.12.0/CMakeLists.txt --- old/kdelibs4support-5.11.0/CMakeLists.txt 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/CMakeLists.txt 2015-07-05 10:57:10.000000000 +0200 @@ -3,7 +3,7 @@ project(KDELibs4Support) include(FeatureSummary) -find_package(ECM 5.11.0 NO_MODULE) +find_package(ECM 5.12.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -17,8 +17,8 @@ include(GenerateExportHeader) include(CMakeFindFrameworks) -set(KF5_VERSION "5.11.0") # handled by release scripts -set(KF5_DEP_VERSION "5.11.0") # handled by release scripts +set(KF5_VERSION "5.12.0") # handled by release scripts +set(KF5_DEP_VERSION "5.12.0") # handled by release scripts set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/autotests/kmimetypetest.cpp new/kdelibs4support-5.12.0/autotests/kmimetypetest.cpp --- old/kdelibs4support-5.11.0/autotests/kmimetypetest.cpp 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/autotests/kmimetypetest.cpp 2015-07-05 10:57:10.000000000 +0200 @@ -894,3 +894,10 @@ #endif } +void KMimeTypeTest::testIsNull() +{ + KMimeType::Ptr ptr; + QVERIFY(ptr.isNull()); + ptr = KMimeType::mimeType(QStringLiteral("image/jpeg")); + QVERIFY(!ptr.isNull()); +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/autotests/kmimetypetest.h new/kdelibs4support-5.12.0/autotests/kmimetypetest.h --- old/kdelibs4support-5.11.0/autotests/kmimetypetest.h 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/autotests/kmimetypetest.h 2015-07-05 10:57:10.000000000 +0200 @@ -59,6 +59,7 @@ void testFromThread(); void testThreads(); void testProperties(); + void testIsNull(); private: QString m_nonKdeApp; QString m_textPlainApp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/data/currency/pen.desktop new/kdelibs4support-5.12.0/data/currency/pen.desktop --- old/kdelibs4support-5.11.0/data/currency/pen.desktop 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/data/currency/pen.desktop 2015-07-05 10:57:10.000000000 +0200 @@ -7,7 +7,7 @@ Name[bg]=Нов перуански сол Name[bn]=পেরুর নুয়েভো সোল Name[bs]=peruanski novi sol -Name[ca]=Nuevo Sol de Perú +Name[ca]=Nuevo Sol del Perú Name[ca@valencia]=Nuevo Sol de Perú Name[cs]=Peruánské Nuevo Sol Name[da]=Peruviansk nuevo sol diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/docs/CMakeLists.txt new/kdelibs4support-5.12.0/docs/CMakeLists.txt --- old/kdelibs4support-5.11.0/docs/CMakeLists.txt 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/docs/CMakeLists.txt 2015-07-05 10:57:10.000000000 +0200 @@ -1,2 +1,3 @@ add_subdirectory(kf5-config) add_subdirectory(kdebugdialog5) +add_subdirectory(kcm_ssl) Files old/kdelibs4support-5.11.0/docs/kcm_ssl/details.png and new/kdelibs4support-5.12.0/docs/kcm_ssl/details.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/docs/kcm_ssl/index.docbook new/kdelibs4support-5.12.0/docs/kcm_ssl/index.docbook --- old/kdelibs4support-5.11.0/docs/kcm_ssl/index.docbook 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/docs/kcm_ssl/index.docbook 2015-07-05 10:57:10.000000000 +0200 @@ -13,8 +13,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2013-12-05</date> -<releaseinfo>&kde; 4.12</releaseinfo> +<date>2015-04-09</date> +<releaseinfo>Frameworks 5.9</releaseinfo> <keywordset> <keyword>KDE</keyword> Files old/kdelibs4support-5.11.0/docs/kcm_ssl/module.png and new/kdelibs4support-5.12.0/docs/kcm_ssl/module.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/po/ca/kdelibs4support.po new/kdelibs4support-5.12.0/po/ca/kdelibs4support.po --- old/kdelibs4support-5.11.0/po/ca/kdelibs4support.po 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/po/ca/kdelibs4support.po 2015-07-05 10:57:10.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdelibs4support\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-05-03 08:52+0000\n" -"PO-Revision-Date: 2015-06-01 22:02+0200\n" +"PO-Revision-Date: 2015-06-14 11:41+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" @@ -18,6 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" "X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" @@ -5980,7 +5981,7 @@ "enabled" msgstr "" "Informació del depurador QML JS. L'aplicació s'ha d'haver\n" -"construït amb -DQT_DECLARATIVE_DEBUG per a que es pugui\n" +"construït amb -DQT_DECLARATIVE_DEBUG perquè es pugui\n" "activar el depurador" #: kdecore/kcmdlineargs.cpp:308 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/po/ko/kdelibs4support.po new/kdelibs4support-5.12.0/po/ko/kdelibs4support.po --- old/kdelibs4support-5.11.0/po/ko/kdelibs4support.po 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/po/ko/kdelibs4support.po 2015-07-05 10:57:10.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-05-03 08:52+0000\n" -"PO-Revision-Date: 2015-04-26 17:55+0200\n" +"PO-Revision-Date: 2015-06-27 12:00+0200\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -6510,7 +6510,7 @@ #, kde-format msgctxt "@info:shell %1 is cmdoption name" msgid "'%1' missing." -msgstr "'%1'이(가) 없습니다.|/|'$[이가 %1]' 없습니다." +msgstr "'%1'이(가) 없습니다.|/|'%1'$[이가 %1] 없습니다." #: kdecore/kcmdlineargs.cpp:895 #, kde-format @@ -10368,8 +10368,8 @@ #, kde-format msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "" -"<qt><b>%1</b>을 종료하시겠습니까?</qt>|/|<qt><b>$[을를 %1]</b> 종료하시겠습니" -"까?</qt>" +"<qt><b>%1</b>을 종료하시겠습니까?</qt>|/|<qt><b>%1</b>$[을를 %1] 종료하시겠습" +"니까?</qt>" #: kdeui/ksystemtrayicon.cpp:229 msgid "Confirm Quit From System Tray" @@ -10439,8 +10439,8 @@ #, kde-format msgid "A file or folder named %1 already exists." msgstr "" -"파일이나 폴더 %1이(가) 이미 존재합니다.|/|파일이나 폴더 $[이가 %1] 이미 존재" -"합니다." +"파일이나 폴더 %1이(가) 이미 존재합니다.|/|파일이나 폴더 %1$[이가 %1] 이미 존" +"재합니다." #: kio/kdirselectdialog.cpp:174 msgid "You do not have permission to create that folder." @@ -10980,7 +10980,8 @@ #: kio/netaccess.cpp:103 #, kde-format msgid "File '%1' is not readable" -msgstr "파일 '%1'을(를) 읽을 수 없습니다|/|파일 $[을를 %1 \"] 읽을 수 없습니다" +msgstr "" +"파일 '%1'을(를) 읽을 수 없습니다|/|파일 '%1'$[을를 %1] 읽을 수 없습니다" #: kio/netaccess.cpp:437 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/src/kdebugdialog/main.cpp new/kdelibs4support-5.12.0/src/kdebugdialog/main.cpp --- old/kdelibs4support-5.11.0/src/kdebugdialog/main.cpp 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/src/kdebugdialog/main.cpp 2015-07-05 10:57:10.000000000 +0200 @@ -101,7 +101,7 @@ migrate.setConfigFiles(QStringList() << QStringLiteral("kdebugrc")); migrate.migrate(); - K4AboutData data( "kdebugdialog5", 0, ki18n( "KDebugDialog"), + K4AboutData data( "kdebugdialog5", "kdelibs4support", ki18n( "KDebugDialog"), "1.0", ki18n("A dialog box for setting preferences for debug output"), K4AboutData::License_GPL, ki18n("Copyright 1999-2009, David Faure <[email protected]>")); data.addAuthor(ki18n("David Faure"), ki18n("Maintainer"), "[email protected]"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/src/kdecore/all_languages.desktop new/kdelibs4support-5.12.0/src/kdecore/all_languages.desktop --- old/kdelibs4support-5.11.0/src/kdecore/all_languages.desktop 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/src/kdecore/all_languages.desktop 2015-07-05 10:57:10.000000000 +0200 @@ -775,7 +775,7 @@ Name[bn_IN]=আয়মারা Name[br]=Aymara Name[bs]=ajmarski -Name[ca]=Aymara +Name[ca]=Aimara Name[ca@valencia]=Aymara Name[cs]=Aymara Name[csb]=Aymara @@ -2875,7 +2875,7 @@ Name[bn_IN]=চুভাশ Name[br]=Tchuvasheg Name[bs]=Čuvaški -Name[ca]=Chuvash +Name[ca]=Txuvaix Name[ca@valencia]=Chuvash Name[cs]=Čuvašský Name[csb]=Czuwasczi @@ -6675,7 +6675,7 @@ Name[bn_IN]=ইনুপিয়াক Name[br]=Inupiak Name[bs]=Inupijski -Name[ca]=Inupiaq +Name[ca]=Inupiak Name[ca@valencia]=Inupiaq Name[cs]=Inupiaq Name[csb]=Inupiaq @@ -7465,7 +7465,7 @@ Name[bn_IN]=কিকুয়ু Name[br]=Kikuyu Name[bs]=Kikuju -Name[ca]=Kikuyu +Name[ca]=Kikuiu Name[ca@valencia]=Kikuyu Name[cs]=Kikuyu Name[csb]=Kikuyu @@ -7663,7 +7663,7 @@ Name[bn_IN]=কালালিসুট Name[br]=Kalaallisut Name[bs]=Kalalisut -Name[ca]=Kalaallisut +Name[ca]=Grenlandès Name[ca@valencia]=Kalaallisut Name[cs]=Kalaallisut Name[csb]=Kalaallisut @@ -10510,7 +10510,7 @@ Name[bn_IN]=নরওয়েজিয়ান বোকমাল Name[br]=Norvegeg Bokmål Name[bs]=Norveški(Bukmol) -Name[ca]=Noruec Bokmal +Name[ca]=Noruec bokmål Name[ca@valencia]=Noruec Bokmal Name[cs]=Norský (Bokmål) Name[csb]=Norwesczi Bokmål @@ -10608,7 +10608,7 @@ Name[bn_IN]=এন্ডেবিলি, উত্তর Name[br]=Ndebele, Norzh Name[bs]=Ndebele, sjeverni -Name[ca]=Ndebele Nord +Name[ca]=Ndebele septentrional Name[ca@valencia]=Ndebele Nord Name[cs]=Ndebele, Severní Name[csb]=Ndebele, Norda @@ -11095,7 +11095,7 @@ Name[bn_IN]=নরওয়েজিয়ান নিনোরস্ক Name[br]=Norvegeg Nynorsk Name[bs]=Norveški (Ninorsk) -Name[ca]=Noruec Nynorsk +Name[ca]=Noruec nynorsk Name[ca@valencia]=Noruec Nynorsk Name[cs]=Norský (Nynorsk) Name[csb]=Norwesczi Nynorsk @@ -11193,7 +11193,7 @@ Name[bn_IN]=এন্ডেবিলি, দক্ষিণ Name[br]=Ndebele, Su Name[bs]=Ndebele, južni -Name[ca]=Ndebele Sud +Name[ca]=Ndebele meridional Name[ca@valencia]=Ndebele Sud Name[cs]=Ndebele, Jižní Name[csb]=Ndebele, Pôłnie @@ -11290,7 +11290,7 @@ Name[bn_IN]=উত্তর সোথো Name[br]=Soto, Norzh Name[bs]=Soto(sjeverni) -Name[ca]=Sotho nord +Name[ca]=Sotho septentrional Name[ca@valencia]=Sotho nord Name[cs]=Severní Sotho Name[csb]=Nordowé Sotho @@ -12659,7 +12659,7 @@ Name[bn_IN]=রুন্ডি Name[br]=Rundi Name[bs]=Rundi -Name[ca]=Rundi +Name[ca]=Kirundi Name[ca@valencia]=Rundi Name[cs]=Rundi Name[csb]=Rundi @@ -12855,7 +12855,7 @@ Name[bn_IN]=রোমেনি Name[br]=Jipsianek Name[bs]=Romski -Name[ca]=Caló +Name[ca]=Romaní Name[ca@valencia]=Caló Name[cs]=Romský Name[csb]=Rumùńsczi @@ -13443,7 +13443,7 @@ Name[bn_IN]=উত্তর সামি Name[br]=Sami, Norzh Name[bs]=Sjeverni sami -Name[ca]=Sami nord +Name[ca]=Sami septentrional Name[ca@valencia]=Sami nord Name[cs]=Severní Sami Name[csb]=Nordowi Sami @@ -14112,7 +14112,7 @@ Name[bn_IN]=সোমালি Name[br]=Somalieg Name[bs]=Somalijski -Name[ca]=Somalí +Name[ca]=Somali Name[ca@valencia]=Somalí Name[cs]=Somálský Name[csb]=Somalijsczi @@ -14646,7 +14646,7 @@ Name[bn_IN]=সোয়াতি Name[br]=Swati Name[bs]=Svati -Name[ca]=Swati +Name[ca]=Siswati Name[ca@valencia]=Swati Name[cs]=Swati Name[csb]=Swati @@ -14842,7 +14842,7 @@ Name[bn_IN]=সুদানিজ Name[br]=Soudaneg Name[bs]=Sundski -Name[ca]=Sondanès +Name[ca]=Sundanès Name[ca@valencia]=Sundanés Name[cs]=Sundanský Name[csb]=Sudańsczi @@ -15039,7 +15039,7 @@ Name[bn_IN]=সোয়াহিলি Name[br]=Swahili Name[bs]=Svahili -Name[ca]=Suahili +Name[ca]=Swahili Name[ca@valencia]=Suahili Name[cs]=Svahilský Name[csb]=Swahili @@ -16690,7 +16690,7 @@ Name[bn_IN]=উজবেক Name[br]=Ouzbeg Name[bs]=Uzbečki -Name[ca]=Usbec +Name[ca]=Uzbek Name[ca@valencia]=Usbec Name[cs]=Uzbecký Name[csb]=Ùzbecczi @@ -16786,7 +16786,7 @@ Name[bn]=উজবেক (কিরিলিক) Name[bn_IN]=উজবেক (সিরিলিক) Name[bs]=Uzbečki (ćirilica) -Name[ca]=Usbec (ciríl·lic) +Name[ca]=Uzbek (ciríl·lic) Name[ca@valencia]=Usbec (ciríl·lic) Name[cs]=Uzbecký (azbuka) Name[csb]=Ùzbecczi (cërëlica) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/src/kdecore/kdebug.cpp new/kdelibs4support-5.12.0/src/kdecore/kdebug.cpp --- old/kdelibs4support-5.11.0/src/kdecore/kdebug.cpp 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/src/kdecore/kdebug.cpp 2015-07-05 10:57:10.000000000 +0200 @@ -58,7 +58,7 @@ #include <time.h> #endif -//#include "kdatetime.h" +#include "kdatetime.h" #include <kmessage.h> #include <klocalizedstring.h> @@ -829,7 +829,6 @@ return s << QString::fromLocal8Bit(strerror(errno)); } -#if 0 QDebug operator<<(QDebug s, const KDateTime &time) { if (time.isDateOnly()) { @@ -839,7 +838,6 @@ } return s.space(); } -#endif void kClearDebugConfig() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/src/kdecore/kdebug.h new/kdelibs4support-5.12.0/src/kdecore/kdebug.h --- old/kdelibs4support-5.11.0/src/kdecore/kdebug.h 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/src/kdecore/kdebug.h 2015-07-05 10:57:10.000000000 +0200 @@ -252,9 +252,9 @@ // operators for KDE types class QUrl; -//class KDateTime; +class KDateTime; class QObject; -//KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug operator<<(QDebug s, const KDateTime &time); +KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug operator<<(QDebug s, const KDateTime &time); #if 1 || defined(KDE3_SUPPORT) #ifndef KDELIBS4SUPPORT_NO_DEPRECATED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/src/kdecore/kmimetype.h new/kdelibs4support-5.12.0/src/kdecore/kmimetype.h --- old/kdelibs4support-5.11.0/src/kdecore/kmimetype.h 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/src/kdecore/kmimetype.h 2015-07-05 10:57:10.000000000 +0200 @@ -55,7 +55,7 @@ Ptr(KMimeType *ptr = 0) : QExplicitlySharedDataPointer<KMimeType>(ptr) {} bool isNull() const { - return *this; + return !constData(); } }; typedef QList<Ptr> List; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/src/kdeui/kglobalsettings.h new/kdelibs4support-5.12.0/src/kdeui/kglobalsettings.h --- old/kdelibs4support-5.11.0/src/kdeui/kglobalsettings.h 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/src/kdeui/kglobalsettings.h 2015-07-05 10:57:10.000000000 +0200 @@ -321,8 +321,9 @@ /** * Returns the default fixed font. * @return the default fixed font. + * @deprecated since 5.0, use QFontDatabase::systemFont(QFontDatabase::FixedFont) */ - static QFont fixedFont(); + static KDELIBS4SUPPORT_DEPRECATED QFont fixedFont(); /** * Returns the default toolbar font. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.11.0/src/kio/kimageio.h new/kdelibs4support-5.12.0/src/kio/kimageio.h --- old/kdelibs4support-5.11.0/src/kio/kimageio.h 2015-06-06 23:13:20.000000000 +0200 +++ new/kdelibs4support-5.12.0/src/kio/kimageio.h 2015-07-05 10:57:10.000000000 +0200 @@ -52,7 +52,7 @@ **/ enum Mode { Reading, Writing }; -#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS) +#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) /** * Returns a list of patterns of all KImageIO supported formats. * @@ -62,52 +62,52 @@ * @param mode Tells whether to retrieve modes that can be read or written. * @return a space-separated list of file globs that describe the * supported formats - * @deprecated Use QIMageReader/QImageWriter::supportedMimeTypes() and + * @deprecated since 5.0, use QIMageReader/QImageWriter::supportedMimeTypes() and * QFileDialog::setMimeTypeFilters() instead. */ KDELIBS4SUPPORT_DEPRECATED_EXPORT QString pattern(Mode mode = Reading); #endif -#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS) +#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) /** * Returns the type of a MIME type. * @param mimeType the MIME type to search * @return type id(s) of the MIME type or QStringList() if the MIME type * is not supported - * @deprecated Use QMimeType::name() instead(). + * @deprecated since 5.0, use QMimeType::suffixes() instead(). */ KDELIBS4SUPPORT_DEPRECATED_EXPORT QStringList typeForMime(const QString &mimeType); #endif -#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS) +#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) /** * Returns a list of all KImageIO supported formats. * * @param mode Tells whether to retrieve modes that can be read or written. * @return a list of the type ids - * @deprecated Use QImageReader/QImageWriter::supportedImageFormats() instead. + * @deprecated since 5.0, use QImageReader/QImageWriter::supportedImageFormats() instead. */ KDELIBS4SUPPORT_DEPRECATED_EXPORT QStringList types(Mode mode = Writing); #endif -#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS) +#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) /** * Returns a list of MIME types for all KImageIO supported formats. * * @param mode Tells whether to retrieve modes that can be read or written. * @return a list if MIME types of the supported formats - * @deprecated Use QImageReader/QImageWriter::supportedMimeTypes() instead. + * @deprecated since 5.0, use QImageReader/QImageWriter::supportedMimeTypes() instead. */ KDELIBS4SUPPORT_DEPRECATED_EXPORT QStringList mimeTypes(Mode mode = Writing); #endif -#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS) +#if !defined(KDELIBS4SUPPORT_NO_DEPRECATED) /** * Test to see whether a MIME type is supported to reading/writing. * @param _mimeType the MIME type to check * @param _mode Tells whether to check for reading or writing capabilities * @return true if the type is supported - * @deprecated Use QImageReader/QImageWriter::supportedMimeTypes() instead. + * @deprecated since 5.0, use QImageReader/QImageWriter::supportedMimeTypes() instead. **/ KDELIBS4SUPPORT_DEPRECATED_EXPORT bool isSupported(const QString &mimeType, Mode mode = Writing); #endif
