From fedf49f0898459f84c682dfcd415cfea5aeada3a Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Mon, 29 May 2006 11:35:30 +0000
Subject: [PATCH] less deprecated

svn path=/branches/work/kde4/playground/graphics/okular/; revision=546170
---
 generators/ghostview/generator_ghostview.cpp     |  2 +-
 generators/ghostview/gvlogwindow.cpp             |  2 +-
 generators/ghostview/internaldocument.cpp        |  2 +-
 generators/ghostview/interpreter.h               |  6 +++---
 generators/ghostview/interpreter_cmd.cpp         | 10 +++++-----
 generators/ghostview/kpdflibgsasyncgenerator.cpp |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/generators/ghostview/generator_ghostview.cpp b/generators/ghostview/generator_ghostview.cpp
index 01890877e..9cbd440d4 100644
--- a/generators/ghostview/generator_ghostview.cpp
+++ b/generators/ghostview/generator_ghostview.cpp
@@ -274,7 +274,7 @@ void GSGenerator::setupGUI(KActionCollection  * ac , QToolBox * tBox )
     }
     m_actionCollection = ac;
 
-    m_paperSize = new KSelectAction (i18n( "Paper Size" ), "viewmag", ac, "papersize");
+    m_paperSize = new KSelectAction( KIcon("viewmag"), i18n( "Paper Size" ), ac, "papersize");
     m_paperSize->setItems (GSInternalDocument::paperSizes());
     connect( m_paperSize , SIGNAL( activated( const QString & ) ),
          this , SLOT( slotPaperSize ( const QString & ) ) );
diff --git a/generators/ghostview/gvlogwindow.cpp b/generators/ghostview/gvlogwindow.cpp
index 14c44f05d..343810e2e 100644
--- a/generators/ghostview/gvlogwindow.cpp
+++ b/generators/ghostview/gvlogwindow.cpp
@@ -61,7 +61,7 @@ void GSLogWindow::append( GSInterpreterLib::MessageType t, const QString &text)
 {
     //kDebug() << "Appending: " << text <<endl;
     kDebug() << "last int: " << m_lastInt << endl;
-    QStringList l=QStringList::split("\n",text.stripWhiteSpace());
+    QStringList l=text.trimmed().split("\n",QString::SkipEmptyParts);
     QStringList::Iterator it=l.begin(), end=l.end();
     while (it!=end)
     {
diff --git a/generators/ghostview/internaldocument.cpp b/generators/ghostview/internaldocument.cpp
index b291af2f7..b1006e358 100644
--- a/generators/ghostview/internaldocument.cpp
+++ b/generators/ghostview/internaldocument.cpp
@@ -48,7 +48,7 @@ void GSInternalDocument::scanDSC()
     m_dsc->fixup();
 }
 
-GSInternalDocument::GSInternalDocument(QString fname, Format form) : m_format (form), m_fileName(fname), m_error(false)
+GSInternalDocument::GSInternalDocument(QString fname, Format form) : m_error(false), m_fileName(fname), m_format (form)
 {
     m_internalFile = fopen(QFile::encodeName(fname),"r");
     if( m_internalFile == 0 )
diff --git a/generators/ghostview/interpreter.h b/generators/ghostview/interpreter.h
index 900da8634..84fc48de0 100644
--- a/generators/ghostview/interpreter.h
+++ b/generators/ghostview/interpreter.h
@@ -1,12 +1,12 @@
 #ifndef _KPDF_INTERPETER_H_
 #define _KPDF_INTERPETER_H_
-#include <qpaintdevice.h>
 #include <qgs.h>
+#include <QX11Info>
 
 namespace DPIMod
 {
-        const float X = QPaintDevice::x11AppDpiX()/72.0;
-        const float Y = QPaintDevice::x11AppDpiY()/72.0;
+        const float X = QX11Info::appDpiX()/72.0;
+        const float Y = QX11Info::appDpiY()/72.0;
 }
 
 #endif
diff --git a/generators/ghostview/interpreter_cmd.cpp b/generators/ghostview/interpreter_cmd.cpp
index 0301e721c..3096c9811 100644
--- a/generators/ghostview/interpreter_cmd.cpp
+++ b/generators/ghostview/interpreter_cmd.cpp
@@ -70,11 +70,11 @@ GSInterpreterCMD::GSInterpreterCMD( const QString & fileName ) :
     m_process         ( 0 ),
     m_structurePending( false ),
     m_magnify         ( 1 ),
-    m_orientation     ( CDSC_PORTRAIT ),
-    m_name            ( fileName ),
-    m_aaGfx            (1),
     m_aaText           (1),
-    m_pfonts            (false)
+    m_aaGfx            (1),
+    m_pfonts            (false),
+    m_orientation     ( CDSC_PORTRAIT ),
+    m_name            ( fileName )
 {
     kDebug(4655) << "Constructing async interpreter!" << endl;
     m_pixmap=0;
@@ -202,7 +202,7 @@ bool GSInterpreterCMD::startInterpreter()
     list << m_name
         << m_processData->names[0]
         << m_processData->names[1]
-        << m_media.lower()
+        << m_media.toLower()
         << QString::number ( m_magnify )
         << QString::number ( m_orientation )
         << QString::number ( m_width )
diff --git a/generators/ghostview/kpdflibgsasyncgenerator.cpp b/generators/ghostview/kpdflibgsasyncgenerator.cpp
index 226bfac23..3aff8a43c 100644
--- a/generators/ghostview/kpdflibgsasyncgenerator.cpp
+++ b/generators/ghostview/kpdflibgsasyncgenerator.cpp
@@ -54,7 +54,7 @@ void PixHandler::slotPixmap(const QImage* img)
         (QX11Info::display(),
         pix->handle(),
         pData.handle,
-        kde_xget_temp_gc( pix->x11Screen(), false ),
+        kde_xget_temp_gc( pix->x11Info().screen(), false ),
         0,
         0,
         pix->width(),