[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kphotoalbum] /: Fixed some build errors without kde4libssupport.
From: Tobias Leupold <tobias.leupold () web ! de>
Date: 2016-08-30 18:14:08
Message-ID: E1benY0-0004JR-Qo () code ! kde ! org
[Download RAW message or body]
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 \
WidgetsAddons 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::WidgetsAddons KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::IconThemes \
KF5::Archive KF5::Parts KF5::JobWidgets) +target_link_libraries(kphotoalbum \
KF5::KIOCore KF5::CoreAddons KF5::WidgetsAddons KF5::I18n KF5::ConfigCore \
KF5::ConfigGui KF5::IconThemes KF5::Archive 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<QByteArray>::const_iterator it = charsetsBA.constBegin(); \
it != 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::SettingsData* 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=4 shiftwidth=4:
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 <KLocalizedString>
#include <KMessageBox>
-#include <KPageWidgetItem>
+#include <KPageWidget>
// 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 <QTextStream>
+
#include "Process.h"
-#include <KDebug>
/**
\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 \
info, QMap< int,QPair<QStrin
ExifMap exifMap = Exif::Info::instance()->infoForViewer( \
info->fileName(), Settings::SettingsData::instance()->iptcCharset() );
for( ExifMapIterator exifIt = exifMap.constBegin(); exifIt != \
exifMap.constEnd(); ++exifIt ) {
- if ( exifIt.key().startsWith( QString::fromAscii( "Exif." ) ) \
) + if ( exifIt.key().startsWith( QString::fromLatin1( "Exif." ) \
) )
for ( QStringList::const_iterator valuesIt = \
exifIt.value().constBegin(); valuesIt != exifIt.value().constEnd(); \
++valuesIt ) {
QString exifName = exifIt.key().split( \
QChar::fromLatin1('.') ).last();
AddNonEmptyInfo(QString::fromLatin1( "<b>%1: </b> \
").arg(exifName), @@ -588,7 +588,7 @@ bool Utilities::loadJPEG(QImage *img, \
FILE* inputFile, QSize* fullSize, int dim
cinfo.output_width, cinfo.output_height, \
QImage::Format_Indexed8); if (img->isNull())
return false;
- img->setNumColors(256);
+ img->setColorCount(256);
for (int i=0; i<256; i++)
img->setColor(i, qRgb(i,i,i));
break;
@@ -698,9 +698,9 @@ QString Utilities::imageFileNameToAbsolute( const \
QString& fileName ) {
if ( fileName.startsWith( \
Settings::SettingsData::instance()->imageDirectory() ) ) return fileName;
- else if ( fileName.startsWith( QString::fromAscii("file://") ) )
+ else if ( fileName.startsWith( QString::fromLatin1("file://") ) )
return imageFileNameToAbsolute( fileName.mid( 7 ) ); // 7 == \
length("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 = QTextCodec::codecForName( charset.toAscii() );
+ QTextCodec* codec = QTextCodec::codecForName( charset.toLatin1() );
if (!codec)
codec = QTextCodec::codecForLocale();
return codec->toUnicode( c_str );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic