[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/kviewshell
From:       Brad Hards <bradh () frogmouth ! net>
Date:       2006-08-05 8:22:36
Message-ID: 1154766156.865255.4709.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 569913 by bhards:

Compile fixes. 3 of the changes are just a missing
#include line for KIcon.

The change to the PDF plugin is required to match the Qt4
bindings for poppler (at least in the latest devel 
snapshot - 0.5.3)


 M  +1 -0      plugins/dvi/kdvi_multipage.cpp  
 M  +4 -1      plugins/pdf/pdfRenderer.cpp  
 M  +1 -0      shell/kviewpart.cpp  
 M  +1 -0      shell/kviewshell.cpp  


--- trunk/KDE/kdegraphics/kviewshell/plugins/dvi/kdvi_multipage.cpp #569912:569913
@@ -17,6 +17,7 @@
 #include <kaction.h>
 #include <kconfigdialog.h>
 #include <kfiledialog.h>
+#include <kicon.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- trunk/KDE/kdegraphics/kviewshell/plugins/pdf/pdfRenderer.cpp #569912:569913
@@ -623,7 +623,10 @@
   int paperHeight = dummy.height();
 #warning THIS BLOCKS THE GUI FOR SOME TIME, AN ASYNC METHOD WOULD BE BETTER.
 #warning FIND OUT WHAT THE PRINT METHOD REALLY DOES
-  return document->print(filename, pageList, 600, 600, 0, paperWidth, paperHeight);
+#warning TODO: This method appears to have changed in the qt4 poppler bindings
+  // was: return document->print(filename, pageList, 600, 600, 0, paperWidth, paperHeight);
+  // might now be:
+  return document->print(filename, pageList, 600, 600, 0);
 }
 
 
--- trunk/KDE/kdegraphics/kviewshell/shell/kviewpart.cpp #569912:569913
@@ -30,6 +30,7 @@
 #include <kfilterdev.h>
 #include <kglobal.h>
 #include <kiconloader.h>
+#include <kicon.h>
 #include <kinputdialog.h>
 #include <kinstance.h>
 #include <klocale.h>
--- trunk/KDE/kdegraphics/kviewshell/shell/kviewshell.cpp #569912:569913
@@ -22,6 +22,7 @@
 #include <kedittoolbar.h>
 #include <kglobal.h>
 #include <kkeydialog.h>
+#include <kicon.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kmenubar.h>
[prev in list] [next in list] [prev in thread] [next in thread]