From kde-commits Tue Aug 30 18:14:08 2016 From: Tobias Leupold Date: Tue, 30 Aug 2016 18:14:08 +0000 To: kde-commits Subject: [kphotoalbum] /: Fixed some build errors without kde4libssupport. Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=147258086023127 Git commit 3a4ec2108aba7466b91ea9d22816a0c6e8c79baa by Tobias Leupold. Committed on 30/08/2016 at 18:13. Pushed by tleupold into branch 'master'. Fixed some build errors without kde4libssupport. M +2 -1 CMakeLists.txt M +1 -1 Exif/InfoDialog.cpp M +1 -1 Settings/ExifPage.cpp M +1 -1 Settings/FaceManagementPage.cpp M +2 -1 Utilities/Process.cpp M +5 -5 Utilities/Util.cpp http://commits.kde.org/kphotoalbum/3a4ec2108aba7466b91ea9d22816a0c6e8c79baa diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c6d104..fa1e2f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ include(FeatureSummary) find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network) find_package(Phonon4Qt5 REQUIRED) find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO DocTools WidgetsA= ddons Config IconThemes KDELibs4Support Archive Parts JobWidgets) +find_package(KF5WidgetsAddons) = # enable exceptions: kde_enable_exceptions() @@ -444,7 +445,7 @@ add_executable(kphotoalbum ${kphotoalbum_SRCS}) # External components target_link_libraries(kphotoalbum ${JPEG_LIBRARY}) target_link_libraries(kphotoalbum Qt5::Network) -target_link_libraries(kphotoalbum KF5::KIOCore KF5::CoreAddons KF5::Widget= sAddons KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::IconThemes KF5::Archi= ve KF5::Parts KF5::JobWidgets) +target_link_libraries(kphotoalbum KF5::KIOCore KF5::CoreAddons KF5::Widget= sAddons KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::IconThemes KF5::Archi= ve KF5::Parts KF5::JobWidgets KF5::WidgetsAddons) target_link_libraries(kphotoalbum Phonon::phonon4qt5) # for now: target_link_libraries(kphotoalbum KF5::KDELibs4Support) diff --git a/Exif/InfoDialog.cpp b/Exif/InfoDialog.cpp index 9db72ca..5cfe7b5 100644 --- a/Exif/InfoDialog.cpp +++ b/Exif/InfoDialog.cpp @@ -83,7 +83,7 @@ Exif::InfoDialog::InfoDialog(const DB::FileName& fileName= , QWidget* parent) : QD for (QList::const_iterator it =3D charsetsBA.constBegin();= it !=3D charsetsBA.constEnd(); ++it ) charsets << QLatin1String(*it); m_iptcCharset->insertItems( 0, charsets ); - m_iptcCharset->setCurrentIndex( qMax( 0, QTextCodec::availableCodecs()= .indexOf( Settings::SettingsData::instance()->iptcCharset().toAscii() ) ) ); + m_iptcCharset->setCurrentIndex( qMax( 0, QTextCodec::availableCodecs()= .indexOf( Settings::SettingsData::instance()->iptcCharset().toLatin1() ) ) = ); hlay->addWidget( iptcLabel ); hlay->addWidget( m_iptcCharset ); = diff --git a/Settings/ExifPage.cpp b/Settings/ExifPage.cpp index 962b4fc..c8d2e9c 100644 --- a/Settings/ExifPage.cpp +++ b/Settings/ExifPage.cpp @@ -73,6 +73,6 @@ void Settings::ExifPage::loadSettings( Settings::Settings= Data* opt ) m_exifForDialog->reload(); m_exifForViewer->setSelectedExif( Settings::SettingsData::instance()->= exifForViewer() ); m_exifForDialog->setSelectedExif( Settings::SettingsData::instance()->= exifForDialog() ); - m_iptcCharset->setCurrentIndex( qMax( 0, QTextCodec::availableCodecs()= .indexOf( opt->iptcCharset().toAscii() ) ) ); + m_iptcCharset->setCurrentIndex( qMax( 0, QTextCodec::availableCodecs()= .indexOf( opt->iptcCharset().toLatin1() ) ) ); } // vi:expandtab:tabstop=3D4 shiftwidth=3D4: diff --git a/Settings/FaceManagementPage.cpp b/Settings/FaceManagementPage.= cpp index e11ff0f..f591498 100644 --- a/Settings/FaceManagementPage.cpp +++ b/Settings/FaceManagementPage.cpp @@ -30,7 +30,7 @@ // KDE includes #include #include -#include +#include = // Local includes #include "SettingsData.h" diff --git a/Utilities/Process.cpp b/Utilities/Process.cpp index cbbb245..d31699c 100644 --- a/Utilities/Process.cpp +++ b/Utilities/Process.cpp @@ -25,8 +25,9 @@ #undef stderr #endif = +#include + #include "Process.h" -#include = /** \class Utilities::Process diff --git a/Utilities/Util.cpp b/Utilities/Util.cpp index be0edd9..16e8c04 100644 --- a/Utilities/Util.cpp +++ b/Utilities/Util.cpp @@ -201,7 +201,7 @@ QString Utilities::createInfoText( DB::ImageInfoPtr inf= o, QMap< int,QPairinfoForViewer( info->f= ileName(), Settings::SettingsData::instance()->iptcCharset() ); = for( ExifMapIterator exifIt =3D exifMap.constBegin(); exifIt !=3D = exifMap.constEnd(); ++exifIt ) { - if ( exifIt.key().startsWith( QString::fromAscii( "Exif." ) ) ) + if ( exifIt.key().startsWith( QString::fromLatin1( "Exif." ) )= ) for ( QStringList::const_iterator valuesIt =3D exifIt.valu= e().constBegin(); valuesIt !=3D exifIt.value().constEnd(); ++valuesIt ) { QString exifName =3D exifIt.key().split( QChar::fromLa= tin1('.') ).last(); AddNonEmptyInfo(QString::fromLatin1( "%1: ").a= rg(exifName), @@ -588,7 +588,7 @@ bool Utilities::loadJPEG(QImage *img, FILE* inputFile, = QSize* fullSize, int dim cinfo.output_width, cinfo.output_height, QImage::Format_Indexe= d8); if (img->isNull()) return false; - img->setNumColors(256); + img->setColorCount(256); for (int i=3D0; i<256; i++) img->setColor(i, qRgb(i,i,i)); break; @@ -698,9 +698,9 @@ QString Utilities::imageFileNameToAbsolute( const QStri= ng& fileName ) { if ( fileName.startsWith( Settings::SettingsData::instance()->imageDir= ectory() ) ) return fileName; - else if ( fileName.startsWith( QString::fromAscii("file://") ) ) + else if ( fileName.startsWith( QString::fromLatin1("file://") ) ) return imageFileNameToAbsolute( fileName.mid( 7 ) ); // 7 =3D=3D l= ength("file://") - else if ( fileName.startsWith( QString::fromAscii("/") ) ) + else if ( fileName.startsWith( QString::fromLatin1("/") ) ) return QString(); // Not within our image root else return absoluteImageFileName( fileName ); @@ -776,7 +776,7 @@ QImage Utilities::scaleImage(const QImage &image, const= QSize& s, Qt::AspectRati = QString Utilities::cStringWithEncoding( const char *c_str, const QString& = charset ) { - QTextCodec* codec =3D QTextCodec::codecForName( charset.toAscii() ); + QTextCodec* codec =3D QTextCodec::codecForName( charset.toLatin1() ); if (!codec) codec =3D QTextCodec::codecForLocale(); return codec->toUnicode( c_str );