2005-05-04 Kristian Høgsberg <krh@redhat.com>

        Patches from Albert Astals Cid:

        * qt/poppler-page.cc (getText): Use QString::fromUtf8() instead of
        implicit latin1 cast constructor.

        * qt/test-poppler-qt.cpp (main): Use a QLabel for showing text
        instead of qDebug.

ChangeLog

+2005-05-04  Kristian Høgsberg  <krh@redhat.com>
+
+	Patches from Albert Astals Cid:
+	
+	* qt/poppler-page.cc (getText): Use QString::fromUtf8() instead of
+	implicit latin1 cast constructor.
+	
+	* qt/test-poppler-qt.cpp (main): Use a QLabel for showing text
+	instead of qDebug.
+
 Wed May  4 02:31:05 2005  Jonathan Blandford  <jrb@redhat.com>
 
 	* glib/poppler-document.cc:

qt/poppler-page.cc

@@ -98,9 +98,8 @@ QString Page::getText(const Rectangle &r) const
     s = output_dev->getText(r.m_x1, y1, r.m_x2, y2);
   }
 
-  // TODO look if QString::fromUTF8 yields better results
-  result = s->getCString();
-  
+  result = QString::fromUtf8(s->getCString());
+
   delete output_dev;
   delete s;
   return result;

qt/test-poppler-qt.cpp

@@ -76,8 +76,12 @@ int main( int argc, char **argv )
   else
   {
     Poppler::Page *page = doc->getPage(0);
-    qDebug(page->getText(Poppler::Rectangle()));
+
+    QLabel *l = new QLabel(page->getText(Poppler::Rectangle()), 0);
+    l->show();
+    a.setMainWidget(l);                // set main widget
     delete page;
     delete doc;
+    return a.exec();
   }
 }