Commit 0d47b627 authored by Albert Astals Cid's avatar Albert Astals Cid

krazy include order issues

svn path=/trunk/KDE/kdegraphics/okular/; revision=655893
parent 61471368
......@@ -7,13 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
#include "ui_dlgaccessibilitybase.h"
#include "dlgaccessibility.h"
#include "ui_dlgaccessibilitybase.h"
DlgAccessibility::DlgAccessibility( QWidget * parent )
: QWidget( parent )
{
m_dlg = new Ui_DlgAccessibilityBase();
m_dlg->setupUi( this );
Ui_DlgAccessibilityBase *dlg = new Ui_DlgAccessibilityBase();
dlg->setupUi( this );
}
......@@ -12,15 +12,10 @@
#include <qwidget.h>
class Ui_DlgAccessibilityBase;
class DlgAccessibility : public QWidget
{
public:
DlgAccessibility( QWidget * parent = 0 );
protected:
Ui_DlgAccessibilityBase * m_dlg;
};
#endif
......@@ -7,11 +7,11 @@
* (at your option) any later version. *
***************************************************************************/
#include "dlgdebug.h"
#include <qcheckbox.h>
#include <qlayout.h>
#include "dlgdebug.h"
#define DEBUG_SIMPLE_BOOL( cfgname, layout ) \
{ \
QCheckBox * foo = new QCheckBox( cfgname, this ); \
......
......@@ -7,14 +7,14 @@
* (at your option) any later version. *
***************************************************************************/
#include "dlggeneral.h"
#include <kauthorized.h>
#include <config-okular.h>
#include "ui_dlggeneralbase.h"
#include "dlggeneral.h"
DlgGeneral::DlgGeneral( QWidget * parent )
: QWidget( parent )
{
......
......@@ -7,13 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
#include "ui_dlgidentitybase.h"
#include "dlgidentity.h"
#include "ui_dlgidentitybase.h"
DlgIdentity::DlgIdentity( QWidget * parent )
: QWidget( parent )
{
m_dlg = new Ui_DlgIdentityBase();
m_dlg->setupUi( this );
Ui_DlgIdentityBase *dlg = new Ui_DlgIdentityBase();
dlg->setupUi( this );
}
......@@ -18,9 +18,6 @@ class DlgIdentity : public QWidget
{
public:
DlgIdentity( QWidget * parent = 0 );
protected:
Ui_DlgIdentityBase * m_dlg;
};
#endif
......@@ -7,13 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
#include "dlgperformance.h"
#include <qfont.h>
#include <kiconloader.h>
#include "ui_dlgperformancebase.h"
#include "dlgperformance.h"
DlgPerformance::DlgPerformance( QWidget * parent )
: QWidget( parent )
{
......
......@@ -7,13 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
#include "ui_dlgpresentationbase.h"
#include "dlgpresentation.h"
#include "ui_dlgpresentationbase.h"
DlgPresentation::DlgPresentation( QWidget * parent )
: QWidget( parent )
{
m_dlg = new Ui_DlgPresentationBase();
m_dlg->setupUi( this );
Ui_DlgPresentationBase *dlg = new Ui_DlgPresentationBase();
dlg->setupUi( this );
}
......@@ -12,15 +12,10 @@
#include <qwidget.h>
class Ui_DlgPresentationBase;
class DlgPresentation : public QWidget
{
public:
DlgPresentation( QWidget * parent = 0 );
protected:
Ui_DlgPresentationBase * m_dlg;
};
#endif
......@@ -7,6 +7,9 @@
* (at your option) any later version. *
***************************************************************************/
// reimplementing this
#include "preferencesdialog.h"
#include <klocale.h>
// single config pages
......@@ -17,9 +20,6 @@
#include "dlgidentity.h"
#include "dlgdebug.h"
// reimplementing this
#include "preferencesdialog.h"
PreferencesDialog::PreferencesDialog( QWidget * parent, KConfigSkeleton * skeleton )
: KConfigDialog( parent, "preferences", skeleton )
{
......
......@@ -7,13 +7,12 @@
* (at your option) any later version. *
***************************************************************************/
#include "annotations.h"
// qt/kde includes
#include <QtGui/QApplication>
#include <QtGui/QColor>
// local includes
#include "annotations.h"
using namespace Okular;
//BEGIN AnnotationUtils implementation
......
......@@ -7,13 +7,14 @@
* (at your option) any later version. *
***************************************************************************/
#include "area.h"
#include <QtCore/QRect>
#include <QtGui/QPolygonF>
#include <math.h>
#include "annotations.h"
#include "area.h"
#include "link.h"
#include "sourcereference.h"
......
......@@ -7,6 +7,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "audioplayer.h"
// qt/kde includes
#include <qhash.h>
#include <qsignalmapper.h>
......@@ -19,7 +21,6 @@
#include <phonon/mediaobject.h>
// local includes
#include "audioplayer.h"
#include "link.h"
#include "sound.h"
......
......@@ -7,6 +7,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "bookmarkmanager.h"
// qt/kde includes
#include <qhash.h>
#include <qset.h>
......@@ -17,7 +19,6 @@
#include <kstandarddirs.h>
// local includes
#include "bookmarkmanager.h"
#include "document.h"
using namespace Okular;
......
......@@ -7,6 +7,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "chooseenginedialog.h"
#include <QtGui/QComboBox>
#include <QtGui/QLabel>
......@@ -14,8 +16,6 @@
#include "ui_chooseenginewidget.h"
#include "chooseenginedialog.h"
ChooseEngineDialog::ChooseEngineDialog( const QStringList &generators, const KMimeType::Ptr &mime, QWidget * parent )
: KDialog( parent )
{
......
......@@ -8,6 +8,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "document.h"
// qt/kde/system includes
#include <QtCore/QtAlgorithms>
#include <QtCore/QFile>
......@@ -38,7 +40,6 @@
#include "audioplayer.h"
#include "bookmarkmanager.h"
#include "chooseenginedialog.h"
#include "document.h"
#include "generator.h"
#include "interfaces/configinterface.h"
#include "interfaces/guiinterface.h"
......
......@@ -768,7 +768,7 @@ class OKULAR_EXPORT VisiblePageRect
* @param pageNumber The page number where the rectangle is located.
* @param rectangle The rectangle in normalized coordinates.
*/
VisiblePageRect( int pageNumber = -1, const NormalizedRect &rectangle = NormalizedRect() );
explicit VisiblePageRect( int pageNumber = -1, const NormalizedRect &rectangle = NormalizedRect() );
/**
* The page number where the rectangle is located.
......
......@@ -7,6 +7,9 @@
* (at your option) any later version. *
***************************************************************************/
#include "generator.h"
#include "generator_p.h"
#include <qset.h>
#include <kaboutdata.h>
......@@ -16,8 +19,6 @@
#include <klocale.h>
#include "document.h"
#include "generator.h"
#include "generator_p.h"
#include "page.h"
using namespace Okular;
......
......@@ -11,6 +11,7 @@
#define OKULAR_THREADEDGENERATOR_P_H
#include <QtCore/QThread>
#include <QtGui/QImage>
namespace Okular {
......
......@@ -7,12 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
#include "link.h"
// kde includes
#include <klocale.h>
// local includes
#include "document.h"
#include "link.h"
#include "sound.h"
using namespace Okular;
......
......@@ -6,6 +6,9 @@
* (at your option) any later version. *
***************************************************************************/
#include "page.h"
#include "page_p.h"
// qt/kde includes
#include <QtCore/QSet>
#include <QtCore/QString>
......@@ -20,8 +23,6 @@
#include "area.h"
#include "form.h"
#include "link.h"
#include "page.h"
#include "page_p.h"
#include "pagecontroller_p.h"
#include "pagesize.h"
#include "pagetransition.h"
......
......@@ -7,12 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
#include "pagecontroller_p.h"
// qt/kde includes
#include <kglobal.h>
// local includes
#include "page_p.h"
#include "pagecontroller_p.h"
#include "rotationjob.h"
K_GLOBAL_STATIC( Okular::PageController, page_controller_self )
......
......@@ -7,10 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
#include <QtGui/QMatrix>
#include "rotationjob.h"
#include <QtGui/QMatrix>
using namespace Okular;
RotationJob::RotationJob( const QImage &image, Rotation oldRotation, Rotation newRotation, int id )
......
......@@ -7,11 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
#include <QtCore/QVariant>
// local includes
#include "sound.h"
#include <QtCore/QVariant>
using namespace Okular;
class Sound::Private
......
......@@ -7,10 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
#include <QtCore/QString>
#include "sourcereference.h"
#include <QtCore/QString>
using namespace Okular;
class SourceReference::Private
......
......@@ -7,13 +7,14 @@
* (at your option) any later version. *
***************************************************************************/
#include "textdocumentgenerator.h"
#include "textdocumentgenerator_p.h"
#include <QtCore/QFile>
#include <QtCore/QStack>
#include <QtCore/QTextStream>
#include <QtGui/QAbstractTextDocumentLayout>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#include <QtGui/QTextDocument>
#include <klocale.h>
#include <kprinter.h>
......@@ -24,8 +25,6 @@
#include <okular/core/textpage.h>
#include "document.h"
#include "textdocumentgenerator.h"
#include "textdocumentgenerator_p.h"
using namespace Okular;
......
......@@ -10,7 +10,9 @@
#ifndef _OKULAR_TEXTDOCUMENTGENERATOR_P_H_
#define _OKULAR_TEXTDOCUMENTGENERATOR_P_H_
#include <QtGui/QAbstractTextDocumentLayout>
#include <QtGui/QTextBlock>
#include <QtGui/QTextDocument>
#include "document.h"
#include "link.h"
......
......@@ -7,13 +7,14 @@
* (at your option) any later version. *
***************************************************************************/
#include "textpage.h"
#include <QtCore/QMap>
#include <kdebug.h>
#include "area.h"
#include "misc.h"
#include "textpage.h"
using namespace Okular;
......
......@@ -7,11 +7,12 @@
* (at your option) any later version. *
***************************************************************************/
#include "document.h"
#include <QtGui/QImage>
#include <kzip.h>
#include "document.h"
#include "unrar.h"
using namespace ComicBook;
......
......@@ -7,14 +7,14 @@
* (at your option) any later version. *
***************************************************************************/
#include "generator_comicbook.h"
#include <QtGui/QPainter>
#include <kprinter.h>
#include <okular/core/page.h>
#include "generator_comicbook.h"
OKULAR_EXPORT_PLUGIN(ComicBookGenerator)
ComicBookGenerator::ComicBookGenerator()
......
......@@ -7,13 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
#include "unrar.h"
#include <QtCore/QFile>
#include <QtCore/QProcess>
#include <ktempdir.h>
#include "unrar.h"
Unrar::Unrar()
: QObject( 0 ), mTempDir( 0 ), mErrorOccured( false )
{
......
......@@ -291,7 +291,7 @@ Okular::ObjectRect* DjVuGenerator::convertKDjVuLink( int page, KDjVu::Link * lin
vp.pageNumber = ( target.at(0) == QLatin1Char( '+' ) || target.at(0) == QLatin1Char( '-' ) ) ? page + tmppage : tmppage - 1;
newpage = vp.pageNumber;
}
newlink = new Okular::LinkGoto( QString::null, vp );
newlink = new Okular::LinkGoto( QString(), vp );
}
break;
}
......
......@@ -7,6 +7,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "converter.h"
#include <QtCore/QDate>
#include <QtCore/QUrl>
#include <QtGui/QAbstractTextDocumentLayout>
......@@ -22,7 +24,6 @@
#include <okular/core/document.h>
#include <okular/core/link.h>
#include "converter.h"
#include "document.h"
using namespace FictionBook;
......
......@@ -7,13 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
#include "document.h"
#include <QtCore/QFile>
#include <klocale.h>
#include <kzip.h>
#include "document.h"
using namespace FictionBook;
Document::Document( const QString &fileName )
......
......@@ -7,9 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
#include "converter.h"
#include "generator_fb.h"
#include "converter.h"
OKULAR_EXPORT_PLUGIN(FictionBookGenerator)
FictionBookGenerator::FictionBookGenerator()
......
......@@ -7,6 +7,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "generator_kimgio.h"
#include <QtCore/QBuffer>
#include <QtGui/QImageReader>
#include <QtGui/QPainter>
......@@ -16,8 +18,6 @@
#include <okular/core/page.h>
#include "generator_kimgio.h"
OKULAR_EXPORT_PLUGIN(KIMGIOGenerator)
KIMGIOGenerator::KIMGIOGenerator()
......
......@@ -7,6 +7,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "converter.h"
#include <QtCore/QUrl>
#include <QtGui/QTextCursor>
#include <QtGui/QTextDocument>
......@@ -23,7 +25,6 @@
#include <klocale.h>
#include "converter.h"
#include "document.h"
#include "styleinformation.h"
#include "styleparser.h"
......
......@@ -7,11 +7,11 @@
* (at your option) any later version. *
***************************************************************************/
#include "document.h"
#include <klocale.h>
#include <kzip.h>
#include "document.h"
using namespace OOO;
Document::Document( const QString &fileName )
......
......@@ -7,9 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
#include "formatproperty.h"
#include <QtGui/QTextFormat>
#include "formatproperty.h"
#include "styleinformation.h"
using namespace OOO;
......
......@@ -7,9 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
#include "converter.h"
#include "generator_ooo.h"
#include "converter.h"
OKULAR_EXPORT_PLUGIN(KOOOGenerator)
KOOOGenerator::KOOOGenerator()
......
......@@ -7,6 +7,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "styleparser.h"
#include <QtCore/QDateTime>
#include <QtGui/QFont>
#include <QtXml/QDomDocument>
......@@ -18,7 +20,6 @@
#include "document.h"
#include "styleinformation.h"
#include "styleparser.h"
using namespace OOO;
......
......@@ -10,6 +10,9 @@
#ifndef OOO_STYLEPARSER_H
#define OOO_STYLEPARSER_H
#include "formatproperty.h"
class QDomDocument;
class QDomElement;
namespace OOO {
......
......@@ -9,11 +9,10 @@
#define UNSTABLE_POPPLER_QT4
#include <poppler-qt4.h>
// local includes
#include "formfields.h"
#include <poppler-qt4.h>
PopplerFormFieldText::PopplerFormFieldText( Poppler::FormFieldText * field )
: Okular::FormFieldText(), m_field( field )
{
......
......@@ -8,6 +8,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "generator_pdf.h"
// qt/kde includes
#include <qcolor.h>
#include <qfile.h>
......@@ -23,7 +25,6 @@
#include <kdebug.h>
#include <kglobal.h>
#include <okular/core/document.h>
#include <okular/core/link.h>
#include <okular/core/page.h>
#include <okular/core/annotations.h>
......@@ -33,7 +34,6 @@
#include <okular/core/textpage.h>
// local includes
#include "generator_pdf.h"
#include "settings.h"
#include <config-okular.h>
......
......@@ -18,6 +18,7 @@
#include <qmutex.h>
#include <qthread.h>
#include <okular/core/document.h>
#include <okular/core/generator.h>
#include <okular/interfaces/configinterface.h>
......
......@@ -7,6 +7,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "generator_tiff.h"
#include <qdatetime.h>
#include <qfile.h>
#include <qimage.h>
......@@ -19,8 +21,6 @@
#include <okular/core/document.h>
#include <okular/core/page.h>
#include "generator_tiff.h"
#include <tiff.h>
#include <tiffio.h>
......
......@@ -17,10 +17,10 @@
02110-1301, USA.
*/
#include "generator_xps.h"
#include <qdatetime.h>
#include <qfile.h>
#include <qfontdatabase.h>
#include <qimage.h>
#include <qlist.h>
#include <qpainter.h>
#include <qpixmap.h>
......@@ -34,7 +34,6 @@
#include <okular/core/document.h>
#include <okular/core/page.h>
#include <okular/core/area.h>