[Kde-imaging] KDE/kdegraphics/libs/libksane/libksane

[Andi Clemens]

fixed in trunk...
On Tuesday 29 September 2009 09:46:12 Andi Clemens wrote:
> Does not compile, suffix1() seems not to be implemented (linking error).
> 
> Andi
> 
> On Tuesday 29 September 2009 09:39:30 Andrius Štikonas wrote:
> > SVN commit 1029164 by stikonas:
> >
> > Add KDE 4.2 compatibility hacks.
> > Digikam people want trunk libksane compatible with KDE 4.2 for at least a
> >  few more months until KDE 4.3+ becomes most popular releases.
> >
> >
> >  M  +5 -0      options/ksane_opt_slider.cpp
> >  M  +5 -0      widgets/labeled_slider.cpp
> >  M  +4 -0      widgets/labeled_slider.h
> >
> >
> > ---
> > 
> > trunk/KDE/kdegraphics/libs/libksane/libksane/options/ksane_opt_slider.cpp
> > #1029163:1029164 @@ -108,7 +108,12 @@
> >          m_slider->setRange(KSW_INT_MIN, KSW_INT_MAX);
> >          m_slider->setStep(1);
> >      }
> > +/** Remove #if tags when KDE 4.2 becomes unpopular**/
> > +#if KDE_IS_VERSION(4, 2, 80)
> >      m_slider->setSuffix(unitString());
> > +#else
> > +    m_slider->setSuffix1(unitDoubleString());
> > +#endif
> >      m_slider->setLabelText(i18n(m_optDesc->title));
> >  }
> >
> > ---
> > trunk/KDE/kdegraphics/libs/libksane/libksane/widgets/labeled_slider.cpp
> > #1029163:1029164 @@ -89,7 +89,12 @@
> >      m_label->setText(text);
> >  }
> >
> > +/** Remove #if tags when KDE 4.2 becomes unpopular**/
> > +#if KDE_IS_VERSION(4, 2, 80)
> >  void LabeledSlider::setSuffix(const KLocalizedString &text)
> > +#else
> > +void LabeledSlider::setSuffix1(const QString &text)
> > +#endif
> >  {
> >      m_spinb->setSuffix(text);
> >  }
> > --- trunk/KDE/kdegraphics/libs/libksane/libksane/widgets/labeled_slider.h
> >  #1029163:1029164 @@ -34,6 +34,9 @@
> >  #include <QSlider>
> >  #include <QGridLayout>
> >
> > +/** Remove #if tags when KDE 4.2 becomes unpopular**/
> > +#include <kdeversion.h>
> > +
> >  /**
> >    *@author Kåre Särs
> >    */
> > @@ -86,6 +89,7 @@
> >      void setStep(int);
> >      /** Set the unit */
> >      void setSuffix(const KLocalizedString &text);
> > +    void setSuffix1(const QString &text); /** Remove this compatibility
> >  hack when KDE 4.2 becomes unpopular **/
> >
> >  private Q_SLOTS:
> 
> _______________________________________________
> Kde-imaging mailing list
> Kde-imaging at kde.org
> https://mail.kde.org/mailman/listinfo/kde-imaging
>