[KPhotoAlbum] A couple of minor patches

[Miika Turkia]

On Fri, Aug 31, 2012 at 5:42 AM, Robert Krawitz <rlk at speakeasy.net> wrote:
> This fixes a couple of compile issues.  The first is a warning I'm
> getting with KDE 4.9; the second is an error I'm getting with the upload
> widget.
>
> diff --git a/DB/GpsCoordinates.h b/DB/GpsCoordinates.h
> index 0e39b1f..1a3fd62 100644
> --- a/DB/GpsCoordinates.h
> +++ b/DB/GpsCoordinates.h
> @@ -22,7 +22,7 @@
>  #include "config-kpa-marble.h"
>  #ifdef HAVE_MARBLE
>    #include <marble/GeoDataCoordinates.h>
> -  #include <marble/global.h>
> +  #include <marble/MarbleGlobal.h>
>  #endif

This will require a test for KDE version. I do not have the
MarbleGlobal.h at all on KDE 4.8.

>  #ifdef HAVE_MARBLE
> diff --git a/Plugins/UploadWidget.h b/Plugins/UploadWidget.h
> index 64ae72a..f87b18f 100644
> --- a/Plugins/UploadWidget.h
> +++ b/Plugins/UploadWidget.h
> @@ -20,6 +20,7 @@
>  #ifndef PLUGINS_UPLOADWIDGET_H
>  #define PLUGINS_UPLOADWIDGET_H
>
> +#include <libkipi/imagecollection.h>
>  #include <libkipi/uploadwidget.h>
>  class QFileSystemModel;
>  class QModelIndex;

This fixes my compile error from the last commit (Upload widget is now
implerement...). Again there is probably some version dependency here.
I have been told that stock Ubuntu 12.04 works fine, but my version
with newer KIPI from a PPA did not compile without this addition. Can
someone with older KIPI verify they have the libkipi/imagecollection.h
or do we need version check here also?

miika