2007-04-28 Albert Astals Cid <aacid@kde.org>

        * qt4/*: Stop requyring users to declare UNSTABLE_POPPLER_QT4

23 files changed, 2 insertions, 32 deletions

diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 99710d13..5d198671 100644
--- a/qt4/src/Doxyfile
+++ b/qt4/src/Doxyfile
@@ -986,7 +986,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = UNSTABLE_POPPLER_QT4
+PREDEFINED             = 
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
diff --git a/qt4/src/Mainpage.dox b/qt4/src/Mainpage.dox
index 6694e469..167b2484 100644
--- a/qt4/src/Mainpage.dox
+++ b/qt4/src/Mainpage.dox
@@ -30,10 +30,9 @@ URL</a>.
 @section req How to use the Poppler Qt4 interface library in three easy steps
 
 Programmer who would like to use the Poppler Qt4 interface library
-simply need to add the following two lines to their C++ source files:
+simply need to add the following line to their C++ source files:
 
 @code
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 @endcode
 
diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
index 8c50c622..4ad0f6cc 100644
--- a/qt4/src/poppler-document.cc
+++ b/qt4/src/poppler-document.cc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define UNSTABLE_POPPLER_QT4
-
 #include "poppler-qt4.h"
 
 #include <config.h>
diff --git a/qt4/src/poppler-embeddedfile.cc b/qt4/src/poppler-embeddedfile.cc
index 7b31bc8b..04e9cb2a 100644
--- a/qt4/src/poppler-embeddedfile.cc
+++ b/qt4/src/poppler-embeddedfile.cc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define UNSTABLE_POPPLER_QT4
-
 #include <QtCore/QString>
 #include <QtCore/QDateTime>
 
diff --git a/qt4/src/poppler-fontinfo.cc b/qt4/src/poppler-fontinfo.cc
index d757fe37..aaccbb1e 100644
--- a/qt4/src/poppler-fontinfo.cc
+++ b/qt4/src/poppler-fontinfo.cc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define UNSTABLE_POPPLER_QT4
-
 #include "poppler-qt4.h"
 #include "poppler-private.h"
 
diff --git a/qt4/src/poppler-form.cc b/qt4/src/poppler-form.cc
index 073a2b66..7faf35f5 100644
--- a/qt4/src/poppler-form.cc
+++ b/qt4/src/poppler-form.cc
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 #include <QtCore/QSizeF>
 #include <Form.h>
diff --git a/qt4/src/poppler-link.cc b/qt4/src/poppler-link.cc
index 5c0aff28..4947995c 100644
--- a/qt4/src/poppler-link.cc
+++ b/qt4/src/poppler-link.cc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define UNSTABLE_POPPLER_QT4
-
 #include <poppler-qt4.h>
 #include <poppler-private.h>
 
diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
index be9359f8..51d33526 100644
--- a/qt4/src/poppler-page.cc
+++ b/qt4/src/poppler-page.cc
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 #include <QtCore/QFile>
 #include <QtCore/QMap>
diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index 346885e0..7a253984 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -20,8 +20,6 @@
 #ifndef __POPPLER_QT_H__
 #define __POPPLER_QT_H__
 
-#ifdef UNSTABLE_POPPLER_QT4
-
 #include <QtCore/QByteArray>
 #include <QtCore/QDateTime>
 #include <QtCore/QSet>
@@ -864,6 +862,5 @@ height = dummy.height();
     };
 
 }
-#endif
 
 #endif
diff --git a/qt4/src/poppler-sound.cc b/qt4/src/poppler-sound.cc
index 7cc713e8..29062c8c 100644
--- a/qt4/src/poppler-sound.cc
+++ b/qt4/src/poppler-sound.cc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define UNSTABLE_POPPLER_QT4
-
 #include "Object.h"
 #include "Stream.h"
 #include "Sound.h"
diff --git a/qt4/src/poppler-textbox.cc b/qt4/src/poppler-textbox.cc
index cd7cb83b..87706554 100644
--- a/qt4/src/poppler-textbox.cc
+++ b/qt4/src/poppler-textbox.cc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define UNSTABLE_POPPLER_QT4
-
 #include "poppler-qt4.h"
 #include "poppler-private.h"
 
diff --git a/qt4/tests/check_attachments.cpp b/qt4/tests/check_attachments.cpp
index 537598c9..7c4a6975 100644
--- a/qt4/tests/check_attachments.cpp
+++ b/qt4/tests/check_attachments.cpp
@@ -1,6 +1,5 @@
 #include <QtTest/QtTest>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 #include <QtCore/QFile>
diff --git a/qt4/tests/check_dateConversion.cpp b/qt4/tests/check_dateConversion.cpp
index 214e975a..171712cb 100644
--- a/qt4/tests/check_dateConversion.cpp
+++ b/qt4/tests/check_dateConversion.cpp
@@ -3,7 +3,6 @@
 Q_DECLARE_METATYPE(QDate)
 Q_DECLARE_METATYPE(QTime)
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 class TestDateConv: public QObject
diff --git a/qt4/tests/check_fonts.cpp b/qt4/tests/check_fonts.cpp
index aa7b5c85..df5b41a2 100644
--- a/qt4/tests/check_fonts.cpp
+++ b/qt4/tests/check_fonts.cpp
@@ -1,6 +1,5 @@
 #include <QtTest/QtTest>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 class TestFontsData: public QObject
diff --git a/qt4/tests/check_metadata.cpp b/qt4/tests/check_metadata.cpp
index 8ef3f58d..a1e7ea65 100644
--- a/qt4/tests/check_metadata.cpp
+++ b/qt4/tests/check_metadata.cpp
@@ -1,6 +1,5 @@
 #include <QtTest/QtTest>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 class TestMetaData: public QObject
diff --git a/qt4/tests/check_pagelayout.cpp b/qt4/tests/check_pagelayout.cpp
index 6f19e2db..dbdb93ea 100644
--- a/qt4/tests/check_pagelayout.cpp
+++ b/qt4/tests/check_pagelayout.cpp
@@ -1,6 +1,5 @@
 #include <QtTest/QtTest>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 class TestPageLayout: public QObject
diff --git a/qt4/tests/check_pagemode.cpp b/qt4/tests/check_pagemode.cpp
index ee7d8fe6..9df07ff3 100644
--- a/qt4/tests/check_pagemode.cpp
+++ b/qt4/tests/check_pagemode.cpp
@@ -1,6 +1,5 @@
 #include <QtTest/QtTest>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 class TestPageMode: public QObject
diff --git a/qt4/tests/check_permissions.cpp b/qt4/tests/check_permissions.cpp
index 35de55f8..eec78edf 100644
--- a/qt4/tests/check_permissions.cpp
+++ b/qt4/tests/check_permissions.cpp
@@ -1,6 +1,5 @@
 #include <QtTest/QtTest>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 class TestPermissions: public QObject
diff --git a/qt4/tests/poppler-attachments.cpp b/qt4/tests/poppler-attachments.cpp
index 1c806a38..04f17557 100644
--- a/qt4/tests/poppler-attachments.cpp
+++ b/qt4/tests/poppler-attachments.cpp
@@ -1,7 +1,6 @@
 #include <QtCore/QtCore>
 #include <iostream>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 int main( int argc, char **argv )
diff --git a/qt4/tests/poppler-fonts.cpp b/qt4/tests/poppler-fonts.cpp
index 460987af..008da139 100644
--- a/qt4/tests/poppler-fonts.cpp
+++ b/qt4/tests/poppler-fonts.cpp
@@ -1,7 +1,6 @@
 #include <QtCore/QtCore>
 #include <iostream>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 int main( int argc, char **argv )
diff --git a/qt4/tests/stress-poppler-qt4.cpp b/qt4/tests/stress-poppler-qt4.cpp
index a212c4ef..975b523f 100644
--- a/qt4/tests/stress-poppler-qt4.cpp
+++ b/qt4/tests/stress-poppler-qt4.cpp
@@ -3,7 +3,6 @@
 #include <QtGui/QtGui>
 #include <ctype.h>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 int main( int argc, char **argv )
diff --git a/qt4/tests/test-password-qt4.cpp b/qt4/tests/test-password-qt4.cpp
index 306023f5..736be3ac 100644
--- a/qt4/tests/test-password-qt4.cpp
+++ b/qt4/tests/test-password-qt4.cpp
@@ -3,7 +3,6 @@
 #include <QtGui/QtGui>
 #include <ctype.h>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 class PDFDisplay : public QWidget           // picture display widget
diff --git a/qt4/tests/test-poppler-qt4.cpp b/qt4/tests/test-poppler-qt4.cpp
index 3cc49049..8775cfe8 100644
--- a/qt4/tests/test-poppler-qt4.cpp
+++ b/qt4/tests/test-poppler-qt4.cpp
@@ -3,7 +3,6 @@
 #include <QtGui/QtGui>
 #include <ctype.h>
 
-#define UNSTABLE_POPPLER_QT4
 #include <poppler-qt4.h>
 
 class PDFDisplay : public QWidget           // picture display widget