Subject: [digikam] digikam/main: polish - msg#00347

Previous Message by Date:

Re: [kdelibs/frameworks] kparts: Only include nepomuk stuff inside HAVE_NEPOMUK

On Wednesday 01 February 2012 18:12:59 Stephen Kelly wrote: > Git commit f15571f7fed58aa1275ec94f820040758ac23bed by Stephen Kelly. > Committed on 01/02/2012 at 17:43. > Pushed by skelly into branch 'frameworks'. > > Only include nepomuk stuff inside HAVE_NEPOMUK > > M +1 -2 kparts/browserrun_p.h > > http://commits.kde.org/kdelibs/f15571f7fed58aa1275ec94f820040758ac23bed > > diff --git a/kparts/browserrun_p.h b/kparts/browserrun_p.h > index 00ce065..2724dcb 100644 > --- a/kparts/browserrun_p.h > +++ b/kparts/browserrun_p.h > @@ -24,11 +24,10 @@ > #include <kio/copyjob.h> > #include <kdebug.h> > > -#include "config-nepomuk.h" > - > #include <QtCore/QDateTime> > > #ifdef HAVE_NEPOMUK > +#include "config-nepomuk.h" > #include "../nepomuk/utils/utils.h" > #endif This makes no sense. config-nepomuk.h is the header defining HAVE_NEPOMUK. If you move its inclusion inside the ifdef, it will never be set. -- David Faure, faure@xxxxxxx, http://www.davidfaure.fr Sponsored by Nokia to work on KDE, incl. KDE Frameworks 5

Next Message by Date:

Re: [kdelibs/frameworks] kparts: Only include nepomuk stuff inside HAVE_NEPOMUK

On Thursday 02 February 2012 11:26:55 David Faure wrote: > On Wednesday 01 February 2012 18:12:59 Stephen Kelly wrote: > > Git commit f15571f7fed58aa1275ec94f820040758ac23bed by Stephen Kelly. > > Committed on 01/02/2012 at 17:43. > > Pushed by skelly into branch 'frameworks'. > > > > Only include nepomuk stuff inside HAVE_NEPOMUK > > > > M +1 -2 kparts/browserrun_p.h > > > > http://commits.kde.org/kdelibs/f15571f7fed58aa1275ec94f820040758ac23bed > > > > diff --git a/kparts/browserrun_p.h b/kparts/browserrun_p.h > > index 00ce065..2724dcb 100644 > > --- a/kparts/browserrun_p.h > > +++ b/kparts/browserrun_p.h > > @@ -24,11 +24,10 @@ > > > > #include <kio/copyjob.h> > > #include <kdebug.h> > > > > -#include "config-nepomuk.h" > > - > > > > #include <QtCore/QDateTime> > > > > #ifdef HAVE_NEPOMUK > > > > +#include "config-nepomuk.h" > > > > #include "../nepomuk/utils/utils.h" > > #endif > > This makes no sense. config-nepomuk.h is the header defining HAVE_NEPOMUK. > > If you move its inclusion inside the ifdef, it will never be set. Ah but you removed the file altogether... OK, then this is really "for later" stuff. I'll do the same in kio/kio/kfilemetainfoitem.cpp then -- David Faure, faure@xxxxxxx, http://www.davidfaure.fr Sponsored by Nokia to work on KDE, incl. KDE Frameworks 5

Previous Message by Thread:

[digikam] digikam/views: update welcome page view

Git commit 7f5d5f34091254295e88efda4b7c15e8e911feec by Gilles Caulier. Committed on 02/02/2012 at 11:21. Pushed by cgilles into branch 'master'. update welcome page view M +3 -1 digikam/views/welcomepageview.cpp M +1 -1 digikam/views/welcomepageview.h http://commits.kde.org/digikam/7f5d5f34091254295e88efda4b7c15e8e911feec diff --git a/digikam/views/welcomepageview.cpp b/digikam/views/welcomepageview.cpp index 1ecc465..6ec8668 100644 --- a/digikam/views/welcomepageview.cpp +++ b/digikam/views/welcomepageview.cpp @@ -7,7 +7,7 @@ * Description : a widget to display a welcome page * on root album. * - * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> + * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at googlemail dot com> * * This program is free software; you can redistribute it @@ -111,6 +111,8 @@ QString WelcomePageView::infoPage() const newFeatures << i18n("New option to setup a collection as default download place with camera device;"); newFeatures << i18n("New option to filter camera icon-view;"); newFeatures << i18n("New option to download items from camera in just one-click;"); + newFeatures << i18n("New progress manager to manage easily all parallelized process;"); + newFeatures << i18n("New tool to run all maintenance process in background;"); newFeatures << i18n("Speed-up improvements to be connected to camera device;"); newFeatures << i18n("Support for the latest camera RAW files using <a href=\"http://www.libraw.org\">LibRaw</a>, " "including Foveon-sensor-based cameras, Nikon D7000 and D5100, Canon 600D and 1100D, Pentax K5, Olympus E5 and Sony Alpha/Nex " diff --git a/digikam/views/welcomepageview.h b/digikam/views/welcomepageview.h index 43199f8..90523b5 100644 --- a/digikam/views/welcomepageview.h +++ b/digikam/views/welcomepageview.h @@ -7,7 +7,7 @@ * Description : a widget to display a welcome page * on root album. * - * Copyright (C) 2006-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> + * Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at googlemail dot com> * * This program is free software; you can redistribute it

Next Message by Thread:

[kdelibs/frameworks] kio/kio: Fix compilation, this header is gone for now

Git commit 90a914fc2a2ebe8918c8e647ff1c49665a95253e by David Faure. Committed on 02/02/2012 at 12:06. Pushed by dfaure into branch 'frameworks'. Fix compilation, this header is gone for now M +2 -0 kio/kio/kfilemetainfoitem.cpp http://commits.kde.org/kdelibs/90a914fc2a2ebe8918c8e647ff1c49665a95253e diff --git a/kio/kio/kfilemetainfoitem.cpp b/kio/kio/kfilemetainfoitem.cpp index 1cab458..72e4ff4 100644 --- a/kio/kio/kfilemetainfoitem.cpp +++ b/kio/kio/kfilemetainfoitem.cpp @@ -21,7 +21,9 @@ #include "kfilemetainfoitem.h" #include "kfilemetainfoitem_p.h" +#ifdef HAVE_NEPOMUK #include <config-nepomuk.h> +#endif KFileMetaInfoItem::KFileMetaInfoItem() : d(new KFileMetaInfoItemPrivate()) { }