Hello community,
here is the log from the commit of package libkipi for openSUSE:Factory checked in at 2012-01-27 15:21:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkipi (Old)
and /work/SRC/openSUSE:Factory/.libkipi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkipi", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkipi/libkipi.changes 2011-12-08 12:12:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libkipi.new/libkipi.changes 2012-01-27 15:21:42.000000000 +0100
@@ -1,0 +2,16 @@
+Wed Jan 18 21:00:05 CET 2012 - dmueller@suse.de
+
+- update to 4.8.0
+ * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
+Tue Jan 10 18:47:06 CET 2012 - dmueller@suse.de
+
+- update to 4.7.98
+ * RC2+ milestone release of KDE 4.8
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
Old:
----
libkipi-4.7.4.tar.bz2
New:
----
libkipi-4.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkipi.spec ++++++
--- /var/tmp/diff_new_pack.PCglI5/_old 2012-01-27 15:21:43.000000000 +0100
+++ /var/tmp/diff_new_pack.PCglI5/_new 2012-01-27 15:21:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libkipi
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,7 +39,7 @@
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT
Group: Development/Libraries/KDE
Url: http://www.kde.org
-Version: 4.7.4
+Version: 4.8.0
Release: 0
Source0: %{name}-%version.tar.bz2
Patch0: 4_6_BRANCH.diff
@@ -69,6 +69,7 @@
%package -n libkipi8
Summary: KDE Image Plug-In Interface
+Group: Development/Libraries/KDE
%requires_ge libqt4-x11
%description -n libkipi8
@@ -89,6 +90,7 @@
%package devel
Summary: KDE Image Plugin Interface
+Group: Development/Libraries/KDE
Provides: libkipi6-devel = %version
Obsoletes: libkipi6-devel <= 4.1.87
Requires: libkipi8 = %version
++++++ libkipi-4.7.4.tar.bz2 -> libkipi-4.8.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/CMakeLists.txt new/libkipi-4.8.0/CMakeLists.txt
--- old/libkipi-4.7.4/CMakeLists.txt 2011-06-22 16:55:00.000000000 +0200
+++ new/libkipi-4.8.0/CMakeLists.txt 2011-09-26 11:45:45.000000000 +0200
@@ -60,10 +60,11 @@
# 1.0.0 => 7.0.0 (released with KDE 4.4.0)
# 1.1.0 => 7.1.0 (released with KDE 4.5.0)
# 1.2.0 => 8.0.0 (released with KDE 4.6.0)
+# 1.3.0 => 8.0.1 (released with KDE 4.7.1 - Set deprecated ImageInfo::title() and ImageInfo::setTitle(). Add ImageInfo::name() and ImageInfo::setName().
# Library API version
SET(KIPI_LIB_MAJOR_VERSION "1")
-SET(KIPI_LIB_MINOR_VERSION "2")
+SET(KIPI_LIB_MINOR_VERSION "3")
SET(KIPI_LIB_PATCH_VERSION "0")
# Suffix to add at end of version string. Usual values are:
@@ -79,7 +80,7 @@
# For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-inf...
SET(KIPI_LIB_SO_CUR_VERSION "8")
SET(KIPI_LIB_SO_REV_VERSION "0")
-SET(KIPI_LIB_SO_AGE_VERSION "0")
+SET(KIPI_LIB_SO_AGE_VERSION "1")
# =======================================================
# Set env. variables accordinly.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/exportinterface.h new/libkipi-4.8.0/libkipi/exportinterface.h
--- old/libkipi-4.7.4/libkipi/exportinterface.h 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/exportinterface.h 2011-10-11 16:46:41.000000000 +0200
@@ -28,7 +28,7 @@
// Qt includes
-#include <QtPlugin>
+#include
// KDE includes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/imagecollectionshared.cpp new/libkipi-4.8.0/libkipi/imagecollectionshared.cpp
--- old/libkipi-4.7.4/libkipi/imagecollectionshared.cpp 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/imagecollectionshared.cpp 2011-10-11 16:46:41.000000000 +0200
@@ -43,6 +43,10 @@
{
}
+ImageCollectionShared::~ImageCollectionShared()
+{
+}
+
void ImageCollectionShared::addRef()
{
m_count++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/imagecollectionshared.h new/libkipi-4.8.0/libkipi/imagecollectionshared.h
--- old/libkipi-4.7.4/libkipi/imagecollectionshared.h 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/imagecollectionshared.h 2011-10-11 16:46:41.000000000 +0200
@@ -55,7 +55,7 @@
public:
ImageCollectionShared();
- virtual ~ImageCollectionShared() {}
+ virtual ~ImageCollectionShared();
virtual QString comment();
virtual QString category();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/imageinfo.cpp new/libkipi-4.8.0/libkipi/imageinfo.cpp
--- old/libkipi-4.7.4/libkipi/imageinfo.cpp 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/imageinfo.cpp 2011-09-26 11:45:45.000000000 +0200
@@ -7,7 +7,7 @@
* @date 2004-07-22
* @brief image info
*
- * @author Copyright (C) 2004-2010 by Gilles Caulier
+ * @author Copyright (C) 2004-2011 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2004-2005 by Renchi Raju
* <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a>
@@ -46,60 +46,31 @@
return string;
}
-/**
- PENDING(blackie) document
-*/
-QString ImageInfo::title() const
+QString ImageInfo::name() const
{
- return d->title();
+ return d->name();
+}
+
+void ImageInfo::setName( const QString& name )
+{
+ d->setName( name );
}
-/**
- PENDING(blackie) document
-*/
KUrl ImageInfo::path() const
{
return d->path();
}
-/**
- PENDING(blackie) document
-*/
QString ImageInfo::description() const
{
return d->description();
}
-/**
- Returns the time of the image.
- In case the host application supports time range, the spec argument
- specifies if it is the start or end time that should be returned.
-*/
QDateTime ImageInfo::time( TimeSpec spec ) const
{
return d->time( spec );
}
-/**
- Returns a Map of attributes of the image
- In case the host application supports some special attributes of the image
- this function can be used to return them. following attribes are supported by this feature:
-
- QString("tagspath") :: QStringList() with tags path list formated as "Country/France/City/Paris" for ex.
- QString("tags") :: QStringList() with tags name list.
- QString("rating") :: integer value (ususally 0 <= rate <= 5).
- QString("latitude") :: double value in degrees (-90.0 >= lat <=90.0).
- QString("longitude") :: double value in degrees (-180.0 >= lat <=180.0).
- QString("altitude") :: double value in meters.
-*/
-QMap ImageInfo::attributes() const
-{
- return d->attributes();
-}
-
-/**
- PENDING(blackie) document
-*/
int ImageInfo::size() const
{
return d->size();
@@ -121,69 +92,41 @@
d->removeRef();
}
-void ImageInfo::setTitle( const QString& name )
-{
- d->setTitle( name );
-}
-
void ImageInfo::setDescription( const QString& description )
{
d->setDescription( description );
}
-/** Remove all attribute from the image. See delAttributes() for list of all attributes removed.
-*/
-void ImageInfo::clearAttributes()
+QMap ImageInfo::attributes() const
{
- d->clearAttributes();
+ return d->attributes();
}
-/** Set the attributes defined from the map to the image. Following keys/values can be used:
- QString("tagspath") :: QStringList() with tags path list formated as "Country/France/City/Paris" for ex.
- QString("rating") :: integer value (ususally 0 <= rate <= 5).
- QString("latitude") :: double value in degrees (-90.0 >= lat <=90.0).
- QString("longitude") :: double value in degrees (-180.0 >= lat <=180.0).
- QString("altitude") :: double value in meters.
-*/
void ImageInfo::addAttributes( const QMap& attributes )
{
d->addAttributes( attributes );
}
-/** Remove attributes listed from the image. Following values can be used:
- "tags" : remove all tags.
- "rating" : remove rating.
- "gpslocation" : remove latitude, longitude, and altitude values.
-*/
void ImageInfo::delAttributes( const QStringList& attributes )
{
d->delAttributes( attributes );
}
-/**
- Returns the angle the application rotates the image with when displaying it.
- Certain host applications may choose to rotate the image on disk, and will always return 0,
- while other host application will rotate the image when displaying it, and will thus not rotate
- the image on disk.
-*/
+void ImageInfo::clearAttributes()
+{
+ d->clearAttributes();
+}
+
int ImageInfo::angle() const
{
return d->angle();
}
-/**
- See \ref angle
-*/
void ImageInfo::setAngle( int angle )
{
d->setAngle( angle );
}
-/**
- In the case the application supports time ranges (like this image is
- from 1998-2000), this method will return true if the time is an exact
- specification, and thus not a range.
-*/
bool ImageInfo::isTimeExact() const
{
return d->isTimeExact();
@@ -194,12 +137,21 @@
d->setTime( time, spec );
}
-/**
- Copies all the attibutes, description etc from the other imageinfo
-*/
void ImageInfo::cloneData( const ImageInfo& other )
{
d->cloneData( other.d );
}
+// Deprecated methods.
+
+QString ImageInfo::title() const
+{
+ return d->name();
+}
+
+void ImageInfo::setTitle( const QString& name )
+{
+ d->setName( name );
+}
+
} // namespace KIPI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/imageinfo.h new/libkipi-4.8.0/libkipi/imageinfo.h
--- old/libkipi-4.7.4/libkipi/imageinfo.h 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/imageinfo.h 2011-09-26 11:45:45.000000000 +0200
@@ -7,7 +7,7 @@
* @date 2004-07-22
* @brief image info
*
- * @author Copyright (C) 2004-2010 by Gilles Caulier
+ * @author Copyright (C) 2004-2011 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2004-2005 by Renchi Raju
* <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a>
@@ -44,6 +44,7 @@
// KDE includes.
#include
+#include
// Local includes.
@@ -68,33 +69,115 @@
public:
- QString title() const;
- void setTitle( const QString& name );
+ /** Use name() instead */
+ KDE_DEPRECATED QString title() const;
+ /** Use setName() instead */
+ KDE_DEPRECATED void setTitle( const QString& name );
+
+ QString name() const;
+ void setName( const QString& name );
QString description() const;
void setDescription( const QString& description);
- QMap attributes() const;
- void clearAttributes();
- void addAttributes( const QMap& );
+ /**
+ Returns a Map of attributes of the image
+ In case the host application supports some special attributes of the image
+ this function can be used to return them. following attribes are supported by this feature:
+
+ QString("comment") :: QString() with default comment [same than description()].
+ QString("date") :: QDateTime() with date [same than time()].
+ QString("angle") :: integer value [same than angle()].
+ QString("title") :: QString() with default title.
+ QString("tagspath") :: QStringList() with tags path list formated as "Country/France/City/Paris" for ex.
+ QString("tags") :: QStringList() with tags name list.
+ QString("rating") :: integer value (ususally 0 <= rate <= 5).
+ QString("colorlabel"):: integer value (ususally 0 <= colorlabel <= 9).
+ QString("picklabel") :: integer value (ususally 0 <= picklabel <= 4).
+ QString("latitude") :: double value in degrees (-90.0 >= lat <=90.0).
+ QString("longitude") :: double value in degrees (-180.0 >= long <=180.0).
+ QString("altitude") :: double value in meters.
+ */
+ QMap attributes() const;
+
+ /** Set the attributes defined from the map to the image. Following keys/values can be used:
+ QString("comment") :: QString() with default comment [same than setDescription()].
+ QString("date") :: QDateTime() with date [same than setTime()].
+ QString("angle") :: integer value [same than setAngle()].
+ QString("title") :: QString() with default title.
+ QString("tagspath") :: QStringList() with tags path list formated as "Country/France/City/Paris" for ex.
+ QString("rating") :: integer value (ususally 0 <= rate <= 5).
+ QString("colorlabel"):: integer value (ususally 0 <= colorlabel <= 9).
+ QString("picklabel") :: integer value (ususally 0 <= picklabel <= 4).
+ QString("latitude") :: double value in degrees (-90.0 >= lat <=90.0).
+ QString("longitude") :: double value in degrees (-180.0 >= long <=180.0).
+ QString("altitude") :: double value in meters.
+ */
+ void addAttributes(const QMap&);
+
+ /** Remove attributes listed from the image. Following values can be used:
+ QString("comment") :: Remove all comments.
+ QString("date") :: Remove date info.
+ QString("angle") :: Remove angle info.
+ QString("title") :: Remove all titles.
+ QString("tags") :: Remove all tags.
+ QString("rating") :: Remove rating info.
+ QString("colorlabel") :: Remove color labels info.
+ QString("picklabel") :: Remove pick labels info.
+ QString("gpslocation"):: Remove latitude, longitude, and altitude values.
+ */
void delAttributes( const QStringList& );
+ /** Remove all attribute from the image. See delAttributes() for list of all attributes removed.
+ */
+ void clearAttributes();
+
KUrl path() const;
+
+ /**
+ Returns the time of the image.
+ In case the host application supports time range, the spec argument
+ specifies if it is the start or end time that should be returned.
+ */
QDateTime time( TimeSpec spec = FromInfo ) const;
- void setTime( const QDateTime& time, TimeSpec spec = FromInfo );
+
+ /**
+ See \ref time
+ */
+ void setTime( const QDateTime& time, TimeSpec spec = FromInfo );
+
+ /**
+ In the case the application supports time ranges (like this image is
+ from 1998-2000), this method will return true if the time is an exact
+ specification, and thus not a range.
+ */
bool isTimeExact() const;
+
int size() const;
+ /**
+ Returns the angle the application rotates the image with when displaying it.
+ Certain host applications may choose to rotate the image on disk, and will always return 0,
+ while other host application will rotate the image when displaying it, and will thus not rotate
+ the image on disk.
+ */
int angle() const;
- void setAngle( int );
+
+ /**
+ See \ref angle
+ */
+ void setAngle(int);
QString toString( const QVariant& ) const;
+ /**
+ Copies all the attibutes, description etc from the other imageinfo
+ */
void cloneData( const ImageInfo& other );
/** constructor
Interface for host application + general stuff
- */
+ */
ImageInfo( ImageInfoShared* const );
ImageInfo( const ImageInfo& );
~ImageInfo();
@@ -112,4 +195,3 @@
} // namespace KIPI
#endif /* KIPI_IMAGEINFO_H */
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/imageinfoshared.cpp new/libkipi-4.8.0/libkipi/imageinfoshared.cpp
--- old/libkipi-4.7.4/libkipi/imageinfoshared.cpp 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/imageinfoshared.cpp 2011-10-11 16:46:41.000000000 +0200
@@ -7,7 +7,7 @@
* @date 2004-02-19
* @brief image info shared
*
- * @author Copyright (C) 2004-2010 by Gilles Caulier
+ * @author Copyright (C) 2004-2011 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2004-2005 by Renchi Raju
* <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a>
@@ -47,7 +47,11 @@
{
ImageInfoShared::ImageInfoShared( Interface* const interface, const KUrl& url )
- : _url( url ), m_count(1), m_interface( interface )
+ : _url( url ), m_count(1), m_interface( interface )
+{
+}
+
+ImageInfoShared::~ImageInfoShared()
{
}
@@ -114,7 +118,7 @@
{
}
-void ImageInfoShared::setTitle( const QString& )
+void ImageInfoShared::setName( const QString& )
{
kWarning() << "This method should only be invoked if the host application "
"supports the KIPI::ImagesHasTitlesWritable\n"
@@ -122,10 +126,15 @@
"have been overridden in the host application.";
}
+QString ImageInfoShared::name()
+{
+ return QString::null;
+}
+
void ImageInfoShared::cloneData( ImageInfoShared* const other )
{
if ( m_interface->hasFeature( ImagesHasTitlesWritable ) )
- setTitle( other->title() );
+ setName( other->name() );
if ( m_interface->hasFeature( ImagesHasComments ) )
setDescription( other->description() );
@@ -140,4 +149,11 @@
setAngle( other->angle() );
}
+// Deprecated methods
+
+void ImageInfoShared::setTitle( const QString& )
+{
+ setName(QString());
+}
+
} // namespace KIPI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/imageinfoshared.h new/libkipi-4.8.0/libkipi/imageinfoshared.h
--- old/libkipi-4.7.4/libkipi/imageinfoshared.h 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/imageinfoshared.h 2011-10-11 16:46:41.000000000 +0200
@@ -7,7 +7,7 @@
* @date 2004-02-19
* @brief image info shared
*
- * @author Copyright (C) 2004-2010 by Gilles Caulier
+ * @author Copyright (C) 2004-2011 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2004-2005 by Renchi Raju
* <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a>
@@ -42,6 +42,7 @@
// KDE includes.
#include
+#include
// Local includes.
@@ -59,32 +60,37 @@
public:
ImageInfoShared( KIPI::Interface* const interface, const KUrl& url );
- virtual ~ImageInfoShared() {}
- virtual QString title() {return QString::null;}
- virtual void setTitle( const QString& );
+ virtual ~ImageInfoShared();
+
+ /** Use name() instead */
+ virtual KDE_DEPRECATED QString title() { return QString::null; }
+ /** Use setName() instead */
+ virtual KDE_DEPRECATED void setTitle(const QString&);
+
+ virtual QString name();
+ virtual void setName(const QString&);
virtual QString description() = 0;
- virtual void setDescription( const QString& ) = 0;
+ virtual void setDescription(const QString&) = 0;
- virtual QMap attributes() = 0;
+ virtual QMap attributes() = 0;
virtual void clearAttributes() = 0;
- virtual void addAttributes( const QMap& ) = 0;
- virtual void delAttributes( const QStringList& ) = 0;
+ virtual void addAttributes(const QMap&) = 0;
+ virtual void delAttributes(const QStringList& ) = 0;
- virtual KUrl path();
- virtual QDateTime time( KIPI::TimeSpec spec );
- virtual void setTime( const QDateTime& time, TimeSpec spec = FromInfo );
+ virtual QDateTime time(KIPI::TimeSpec spec);
+ virtual void setTime(const QDateTime& time, TimeSpec spec = FromInfo);
- virtual bool isTimeExact();
+ virtual int angle();
+ virtual void setAngle(int);
- virtual int size();
-
- virtual int angle();
- virtual void setAngle( int );
+ virtual bool isTimeExact();
+ virtual int size();
+ virtual KUrl path();
- QString toString( const QVariant& );
+ QString toString(const QVariant&);
- virtual void cloneData( ImageInfoShared* const other );
+ virtual void cloneData(ImageInfoShared* const other);
protected:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/interface.cpp new/libkipi-4.8.0/libkipi/interface.cpp
--- old/libkipi-4.7.4/libkipi/interface.cpp 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/interface.cpp 2011-12-02 22:31:59.000000000 +0100
@@ -7,7 +7,7 @@
* @date 2004-02-01
* @brief main kipi host application interface
*
- * @author Copyright (C) 2004-2010 by Gilles Caulier
+ * @author Copyright (C) 2004-2011 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2004-2005 by Renchi Raju
* <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a>
@@ -39,6 +39,7 @@
// KDE includes.
+#include
#include
#include
#include
@@ -156,13 +157,23 @@
void Interface::thumbnails( const KUrl::List& list, int size )
{
- KIO::PreviewJob* job = KIO::filePreview(list, size);
+#if KDE_IS_VERSION(4,7,0)
+ KFileItemList items;
+ for (KUrl::List::ConstIterator it = list.begin() ; it != list.end() ; ++it)
+ {
+ if ((*it).isValid())
+ items.append(KFileItem(KFileItem::Unknown, KFileItem::Unknown, *it, true));
+ }
+ KIO::PreviewJob* job = KIO::filePreview(items, QSize(size, size));
+#else
+ KIO::PreviewJob *job = KIO::filePreview(list, size);
+#endif
- connect(job, SIGNAL(gotPreview(const KFileItem &, const QPixmap &)),
- this, SLOT(gotKDEPreview(const KFileItem &, const QPixmap &)));
+ connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
+ this, SLOT(gotKDEPreview(KFileItem,QPixmap)));
- connect(job, SIGNAL(failed(const KFileItem &)),
- this, SLOT(failedKDEPreview(const KFileItem &)));
+ connect(job, SIGNAL(failed(KFileItem)),
+ this, SLOT(failedKDEPreview(KFileItem)));
}
void Interface::gotKDEPreview(const KFileItem& item, const QPixmap& pix)
@@ -202,7 +213,7 @@
{
QStringList KDEImagetypes = KImageIO::mimeTypes( KImageIO::Reading );
QString imagesFileFilter = KDEImagetypes.join(" ");
- return ( imagesFileFilter.toLower() + " " + imagesFileFilter.toUpper() );
+ return ( imagesFileFilter.toLower() + ' ' + imagesFileFilter.toUpper() );
}
} // namespace KIPI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/interface.h new/libkipi-4.8.0/libkipi/interface.h
--- old/libkipi-4.7.4/libkipi/interface.h 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/interface.h 2011-12-02 22:31:59.000000000 +0100
@@ -7,7 +7,7 @@
* @date 2004-02-01
* @brief main kipi host application interface
*
- * @author Copyright (C) 2004-2010 by Gilles Caulier
+ * @author Copyright (C) 2004-2011 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2004-2005 by Renchi Raju
* <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a>
@@ -160,7 +160,7 @@
public:
- Interface(QObject* parent, const char* name=0);
+ explicit Interface(QObject* parent, const char* name=0);
virtual ~Interface();
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/pluginloader.cpp new/libkipi-4.8.0/libkipi/pluginloader.cpp
--- old/libkipi-4.7.4/libkipi/pluginloader.cpp 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/pluginloader.cpp 2011-11-04 15:35:50.000000000 +0100
@@ -12,7 +12,7 @@
* @author Copyright (C) 2004-2005 by Renchi Raju
* <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a>
* @author Copyright (C) 2009 by Andi Clemens
- * <a href="mailto:andi dot clemens at gmx dot net">andi dot clemens at gmx dot net</a>
+ * <a href="mailto:andi dot clemens at googlemail dot com">andi dot clemens at googlemail dot com</a>
* @author Copyright (C) 2009 by Aleix Pol Gonzalez
* <a href="mailto:aleixpol at kde dot org">aleixpol at kde dot org</a>
*
@@ -432,7 +432,7 @@
{
KSharedConfigPtr config = KGlobal::config();
KConfigGroup group = config->group( QString::fromLatin1( "KIPI/EnabledPlugin" ) );
- bool changes = false;
+// bool changes = false;
for( QList::Iterator it = d->boxes.begin(); it != d->boxes.end(); ++it )
{
@@ -441,7 +441,7 @@
if ( orig != load )
{
- changes = true;
+// changes = true;
group.writeEntry( (*it)->info->name(), load );
(*it)->info->setShouldLoad(load);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.7.4/libkipi/pluginloader.h new/libkipi-4.8.0/libkipi/pluginloader.h
--- old/libkipi-4.7.4/libkipi/pluginloader.h 2011-05-20 22:36:11.000000000 +0200
+++ new/libkipi-4.8.0/libkipi/pluginloader.h 2011-11-04 15:35:50.000000000 +0100
@@ -12,7 +12,7 @@
* @author Copyright (C) 2004-2005 by Renchi Raju
* <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a>
* @author Copyright (C) 2009 by Andi Clemens
- * <a href="mailto:andi dot clemens at gmx dot net">andi dot clemens at gmx dot net</a>
+ * <a href="mailto:andi dot clemens at googlemail dot com">andi dot clemens at googlemail dot com</a>
* @author Copyright (C) 2009 by Aleix Pol Gonzalez
* <a href="mailto:aleixpol at kde dot org">aleixpol at kde dot org</a>
*
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org