[poppler] poppler/qt: Makefile.am,1.5,1.6 poppler-qt.h,1.10,1.11

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/qt
In directory gabe:/tmp/cvs-serv6716/qt

Modified Files:
	Makefile.am poppler-qt.h 
Log Message:
2005-12-03  Kristian Høgsberg  <krh at redhat.com>

        * qt/Makefile.am (noinst_PROGRAMS): Only build qt test program if
        splash is enabled.

        * poppler/CairoOutputDev.cc: Remove unused grid snapping code,
        sidestepping #4507.

        * glib/poppler-document.h (PopplerPermissions): Breaking enum
        definition over multiple lines confuses glib-mkenums (#4600).

        * poppler/Makefile.am (libpoppler_la_LIBADD): Add FREETYPE_LIBS
        (#4515).

        * poppler/TextOutputDev.cc:
        * qt/poppler-qt.h: GCC-4.1 fixes (#5031).




Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/qt/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	3 Dec 2005 22:20:54 -0000	1.5
+++ Makefile.am	3 Dec 2005 23:23:53 -0000	1.6
@@ -24,8 +24,12 @@
 	$(POPPLER_QT_LIBS)			\
 	$(FREETYPE_LIBS)
 
+if BUILD_SPLASH_OUTPUT
+
 noinst_PROGRAMS = test-poppler-qt
 
+endif
+
 test_poppler_qt_SOURCES =			\
        test-poppler-qt.cpp
 

Index: poppler-qt.h
===================================================================
RCS file: /cvs/poppler/poppler/qt/poppler-qt.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- poppler-qt.h	3 Dec 2005 22:20:54 -0000	1.10
+++ poppler-qt.h	3 Dec 2005 23:23:53 -0000	1.11
@@ -249,7 +249,7 @@
     UseOC
   };
   
-  static Document *Document::load(const QString & filePath);
+  static Document *load(const QString & filePath);
   
   Page *getPage(int index) const{ return new Page(this, index); }
   
@@ -291,11 +291,11 @@
   */
   bool scanForFonts( int numPages, QValueList<FontInfo> *fontList ) const;
 
-  Document::~Document();
+  ~Document();
   
 private:
   DocumentData *data;
-  Document::Document(DocumentData *dataA);
+  Document(DocumentData *dataA);
 };
 
 }