clean the headers

svn path=/trunk/KDE/kdegraphics/okular/; revision=656768

core/area.h

@@ -536,7 +536,7 @@ bool RegularArea<NormalizedShape, Shape>::isNull() const
     if ( this->isEmpty() )
         return false;
 
-    foreach ( const NormalizedShape& ns, *this )
+    Q_FOREACH ( const NormalizedShape& ns, *this )
         if ( !givePtr(ns)->isNull() )
             return false;
 
@@ -552,7 +552,7 @@ bool RegularArea<NormalizedShape, Shape>::intersects( const NormalizedShape& rec
     if ( this->isEmpty() )
         return false;
 
-    foreach ( const NormalizedShape& ns, *this )
+    Q_FOREACH ( const NormalizedShape& ns, *this )
         if ( !givePtr(ns)->isNull() && givePtr(ns)->intersects( rect ) )
             return true;
 
@@ -568,9 +568,9 @@ bool RegularArea<NormalizedShape, Shape>::intersects( const RegularArea<Normaliz
     if ( this->isEmpty() )
         return false;
 
-    foreach ( const NormalizedShape& ns, this )
+    Q_FOREACH ( const NormalizedShape& ns, this )
     {
-        foreach ( const Shape& shape, area )
+        Q_FOREACH ( const Shape& shape, area )
         {
             if ( !ns->isNull() && ns->intersects( shape ) )
                 return true;
@@ -586,7 +586,7 @@ void RegularArea<NormalizedShape, Shape>::appendArea( const RegularArea<Normaliz
     if ( !this )
         return false;
 
-    foreach( const Shape& shape, area )
+    Q_FOREACH ( const Shape& shape, area )
         this->append( shape );
 }
 
@@ -627,7 +627,7 @@ bool RegularArea<NormalizedShape, Shape>::contains( double x, double y ) const
     if ( this->isEmpty() )
         return false;
 
-    foreach ( const NormalizedShape& ns, this )
+    Q_FOREACH ( const NormalizedShape& ns, this )
         if ( ns->contains( x, y ) )
             return true;
 
@@ -654,7 +654,7 @@ QList<Shape> RegularArea<NormalizedShape, Shape>::geometry( int xScale, int ySca
 
     QList<Shape> ret;
     Shape t;
-    foreach( const NormalizedShape& ns, *this )
+    Q_FOREACH ( const NormalizedShape& ns, *this )
     {
         t = givePtr(ns)->geometry( xScale, yScale );
         t.translate( dx, dy );

core/audioplayer.h

@@ -10,7 +10,7 @@
 #ifndef _OKULAR_AUDIOPLAYER_H_
 #define _OKULAR_AUDIOPLAYER_H_
 
-#include <core/okular_export.h>
+#include <okular/core/okular_export.h>
 
 #include <QtCore/QObject>
 

core/form.h

@@ -10,8 +10,8 @@
 #ifndef _OKULAR_FORM_H_
 #define _OKULAR_FORM_H_
 
-#include <core/okular_export.h>
-#include <core/area.h>
+#include <okular/core/okular_export.h>
+#include <okular/core/area.h>
 
 #include <QtCore/QStringList>
 

core/generator.h

@@ -13,7 +13,7 @@
 
 #include <okular/core/okular_export.h>
 #include <okular/core/global.h>
-#include <core/pagesize.h>
+#include <okular/core/pagesize.h>
 
 #include <QtCore/QList>
 #include <QtCore/QObject>

core/pagesize.h

@@ -14,7 +14,7 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QString>
 
-#include <core/okular_export.h>
+#include <okular/core/okular_export.h>
 
 namespace Okular {
 

interfaces/configinterface.h

@@ -12,6 +12,8 @@
 
 #include <okular/core/okular_export.h>
 
+#include <QtCore/QObject>
+
 class KConfigDialog;
 
 namespace Okular {

interfaces/guiinterface.h

@@ -12,6 +12,8 @@
 
 #include <okular/core/okular_export.h>
 
+#include <QtCore/QObject>
+
 class QToolBox;
 class KActionCollection;
 

interfaces/printinterface.h

@@ -12,6 +12,8 @@
 
 #include <okular/core/okular_export.h>
 
+#include <QtCore/QObject>
+
 class KPrintDialogPage;
 
 namespace Okular {