utf8 kapi import fix

1 files changed, 4 insertions, 5 deletions

diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 84d3116..b6e053f 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -875,146 +875,145 @@ bool CardView::isSelected(CardViewItem *item) const
   return (item && item->isSelected());
 }
 
 CardViewItem *CardView::selectedItem() const
 {
   // find the first selected item
   QPtrListIterator<CardViewItem> iter(d->mItemList);
   for (iter.toFirst(); iter.current(); ++iter)
   {
     if ((*iter)->isSelected())
       return *iter;
   }
 
   return 0;
 }
 
 CardViewItem *CardView::firstItem() const
 {
   return d->mItemList.first();
 }
 
 int CardView::childCount() const
 {
   return d->mItemList.count();
 }
 /*US
 CardViewItem *CardView::findItem(const QString &text, const QString &label,
                                  Qt::StringComparisonMode compare)
 {
   // IF the text is empty, we will return null, since empty text will
   // match anything!
   if (text.isEmpty())
     return 0;
 
   QPtrListIterator<CardViewItem> iter(d->mItemList);
   if (compare & Qt::BeginsWith)
   {
     QString value;
     for (iter.toFirst(); iter.current(); ++iter)
     {
       value = (*iter)->fieldValue(label).upper();
       if (value.startsWith(text.upper()))
         return *iter;
     }
   }
   else
   {
     kdDebug(5720) << "CardView::findItem: search method not implemented" << endl;
   }
 
   return 0;
 }
 */
 
 uint CardView::columnWidth()
 {
   return d->mDrawSeparators ?
     d->mItemWidth + ( 2 * d->mItemSpacing ) + d->mSepWidth :
     d->mItemWidth + d->mItemSpacing;
 }
 
 void CardView::drawContents(QPainter *p, int clipx, int clipy,
                             int clipw, int cliph)
 {
-  QScrollView::drawContents(p, clipx, clipy, clipw, cliph);
-
+    //QScrollView::drawContents(p, clipx, clipy, clipw, cliph);
  if (d->mLayoutDirty)
    calcLayout();
 
   //kdDebug() << "CardView::drawContents: " << clipx << ", " << clipy
   //          << ", " << clipw << ", " << cliph << endl;
 
   QColorGroup cg = viewport()->palette().active(); // allow setting costum colors in the viewport pale
-
+  int cX, cY;
+  contentsToViewport ( clipx, clipy, cX, cY ); 
   QRect clipRect(clipx, clipy, clipw, cliph);
   QRect cardRect;
   QRect sepRect;
   CardViewItem *item;
   CardViewSeparator *sep;
-
   // make sure the viewport is a pure background
-  viewport()->erase(clipRect);
+  viewport()->erase( QRect ( cX, cY , clipw, cliph ) );
 
   // Now tell the cards to draw, if they are in the clip region
   QPtrListIterator<CardViewItem> iter(d->mItemList);
   for (iter.toFirst(); iter.current(); ++iter)
   {
     item = *iter;
     cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
 
     if (clipRect.intersects(cardRect) || clipRect.contains(cardRect))
     {
       //kdDebug() << "\trepainting card at: " << cardRect.x() << ", "
       //          << cardRect.y() << endl;
 
       // Tell the card to paint
       p->save();
       p->translate(cardRect.x(), cardRect.y());
       item->paintCard(p, cg);
       p->restore();
     }
   }
 
   // Followed by the separators if they are in the clip region
   QPtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
   for (sepIter.toFirst(); sepIter.current(); ++sepIter)
   {
     sep = *sepIter;
     sepRect = sep->mRect;
 
     if (clipRect.intersects(sepRect) || clipRect.contains(sepRect))
     {
       p->save();
       p->translate(sepRect.x(), sepRect.y());
       sep->paintSeparator(p, cg);
       p->restore();
     }
   }
 }
 
 void CardView::resizeEvent(QResizeEvent *e)
 {
   QScrollView::resizeEvent(e);
 
   setLayoutDirty(true);
 }
 
 void CardView::calcLayout()
 {
   //kdDebug() << "CardView::calcLayout:" << endl;
 
   // Start in the upper left corner and layout all the
   // cars using their height and width
   int maxWidth = 0;
   int maxHeight = 0;
   int xPos = 0;
   int yPos = 0;
   int cardSpacing = d->mItemSpacing;
 
   // delete the old separators
   d->mSeparatorList.clear();
 
   QPtrListIterator<CardViewItem> iter(d->mItemList);
   CardViewItem *item = 0;
   CardViewSeparator *sep = 0;
   xPos += cardSpacing;