diff --git a/generators/comicbook/generator_comicbook.cpp b/generators/comicbook/generator_comicbook.cpp index a0d03fad1..dbc126392 100644 --- a/generators/comicbook/generator_comicbook.cpp +++ b/generators/comicbook/generator_comicbook.cpp @@ -10,7 +10,7 @@ #include "generator_comicbook.h" #include -#include +#include #include #include @@ -22,15 +22,14 @@ static KAboutData createAboutData() { KAboutData aboutData( - "okular_comicbook", - "okular_comicbook", - ki18n( "ComicBook Backend" ), - "0.4", - ki18n( "A renderer for various comic book formats" ), - KAboutData::License_GPL, - ki18n( "© 2007-2008 Tobias Koenig" ) + QStringLiteral("okular_comicbook"), + i18n( "ComicBook Backend" ), + QStringLiteral("0.4"), + i18n( "A renderer for various comic book formats" ), + KAboutLicense::GPL, + i18n( "© 2007-2008 Tobias Koenig" ) ); - aboutData.addAuthor( ki18n( "Tobias Koenig" ), KLocalizedString(), "tokoe@kde.org" ); + aboutData.addAuthor( QStringLiteral("Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") ); return aboutData; } diff --git a/generators/dvi/TeXFontDefinition.h b/generators/dvi/TeXFontDefinition.h index 46c735ed4..ddaa15abf 100644 --- a/generators/dvi/TeXFontDefinition.h +++ b/generators/dvi/TeXFontDefinition.h @@ -16,7 +16,7 @@ #define _FONT_H #include - +#include #include #include diff --git a/generators/dvi/dviFile.h b/generators/dvi/dviFile.h index eb7c7d9de..f54ea3ac1 100644 --- a/generators/dvi/dviFile.h +++ b/generators/dvi/dviFile.h @@ -16,7 +16,7 @@ #include #include #include - +#include class fontPool; class pageSize; diff --git a/generators/dvi/dviRenderer.h b/generators/dvi/dviRenderer.h index b07716f63..85d35df33 100644 --- a/generators/dvi/dviRenderer.h +++ b/generators/dvi/dviRenderer.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include class Anchor; class DocumentWidget; diff --git a/generators/dvi/dviexport.cpp b/generators/dvi/dviexport.cpp index b52a1b58f..2d31cf378 100644 --- a/generators/dvi/dviexport.cpp +++ b/generators/dvi/dviexport.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include diff --git a/generators/dvi/dviexport.h b/generators/dvi/dviexport.h index fe6208014..f7126527e 100644 --- a/generators/dvi/dviexport.h +++ b/generators/dvi/dviexport.h @@ -22,7 +22,7 @@ #include #include -#include +#include class dviRenderer; diff --git a/generators/dvi/generator_dvi.cpp b/generators/dvi/generator_dvi.cpp index 0777af719..0dd16b596 100644 --- a/generators/dvi/generator_dvi.cpp +++ b/generators/dvi/generator_dvi.cpp @@ -49,13 +49,12 @@ static const int DviDebug = 4713; static KAboutData createAboutData() { KAboutData aboutData( - "okular_dvi", - "okular_dvi", - ki18n( "DVI Backend" ), - "0.3.6", - ki18n( "A DVI file renderer" ), - KAboutData::License_GPL, - ki18n( "© 2006 Luigi Toscano" ) + QStringLiteral("okular_dvi"), + i18n( "DVI Backend" ), + QStringLiteral("0.3.6"), + i18n( "A DVI file renderer" ), + KAboutLicense::GPL, + i18n( "© 2006 Luigi Toscano" ) ); return aboutData; } diff --git a/generators/dvi/psgs.h b/generators/dvi/psgs.h index 43df2116e..63393d307 100644 --- a/generators/dvi/psgs.h +++ b/generators/dvi/psgs.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/generators/fax/generator_fax.cpp b/generators/fax/generator_fax.cpp index 38873ef67..3d84f0df6 100644 --- a/generators/fax/generator_fax.cpp +++ b/generators/fax/generator_fax.cpp @@ -12,7 +12,7 @@ #include "faxdocument.h" #include -#include +#include #include #include @@ -23,15 +23,14 @@ static KAboutData createAboutData() { KAboutData aboutData( - "okular_fax", - "okular_fax", - ki18n( "Fax Backend" ), - "0.1.1", - ki18n( "A G3/G4 fax document backend" ), - KAboutData::License_GPL, - ki18n( "© 2008 Tobias Koenig" ) + QStringLiteral("okular_fax"), + i18n( "Fax Backend" ), + QStringLiteral("0.1.1"), + i18n( "A G3/G4 fax document backend" ), + KAboutLicense::GPL, + i18n( "© 2008 Tobias Koenig" ) ); - aboutData.addAuthor( ki18n( "Tobias Koenig" ), KLocalizedString(), "tokoe@kde.org" ); + aboutData.addAuthor( QStringLiteral( "Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") ); return aboutData; } diff --git a/generators/fictionbook/generator_fb.cpp b/generators/fictionbook/generator_fb.cpp index 466fb724d..870498627 100644 --- a/generators/fictionbook/generator_fb.cpp +++ b/generators/fictionbook/generator_fb.cpp @@ -18,15 +18,14 @@ static KAboutData createAboutData() { KAboutData aboutData( - "okular_fictionbook", - "okular_fictionbook", - ki18n( "Fiction Book Backend" ), - "0.1.5", - ki18n( "A renderer for FictionBook eBooks" ), - KAboutData::License_GPL, - ki18n( "© 2007-2008 Tobias Koenig" ) + QStringLiteral("okular_fictionbook"), + i18n( "Fiction Book Backend" ), + QStringLiteral("0.1.5"), + i18n( "A renderer for FictionBook eBooks" ), + KAboutLicense::GPL, + i18n( "© 2007-2008 Tobias Koenig" ) ); - aboutData.addAuthor( ki18n( "Tobias Koenig" ), KLocalizedString(), "tokoe@kde.org" ); + aboutData.addAuthor( QStringLiteral( "Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") ); return aboutData; } diff --git a/generators/ooo/generator_ooo.cpp b/generators/ooo/generator_ooo.cpp index 7067c2fbf..5ed291582 100644 --- a/generators/ooo/generator_ooo.cpp +++ b/generators/ooo/generator_ooo.cpp @@ -19,15 +19,14 @@ static KAboutData createAboutData() { KAboutData aboutData( - "okular_ooo", - "okular_ooo", - ki18n( "OpenDocument Text Backend" ), - "0.2.3", - ki18n( "A renderer for OpenDocument Text documents" ), - KAboutData::License_GPL, - ki18n( "© 2006-2008 Tobias Koenig" ) + QStringLiteral("okular_ooo"), + i18n( "OpenDocument Text Backend" ), + QStringLiteral("0.2.3"), + i18n( "A renderer for OpenDocument Text documents" ), + KAboutLicense::GPL, + i18n( "© 2006-2008 Tobias Koenig" ) ); - aboutData.addAuthor( ki18n( "Tobias Koenig" ), KLocalizedString(), "tokoe@kde.org" ); + aboutData.addAuthor( QStringLiteral( "Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") ); return aboutData; } diff --git a/generators/plucker/generator_plucker.cpp b/generators/plucker/generator_plucker.cpp index 4ffdead26..3aef8bd80 100644 --- a/generators/plucker/generator_plucker.cpp +++ b/generators/plucker/generator_plucker.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -23,15 +23,14 @@ static KAboutData createAboutData() { KAboutData aboutData( - "okular_plucker", - "okular_plucker", - ki18n( "Plucker Document Backend" ), - "0.1.1", - ki18n( "A renderer for Plucker eBooks" ), - KAboutData::License_GPL, - ki18n( "© 2007-2008 Tobias Koenig" ) + QStringLiteral("okular_plucker"), + i18n( "Plucker Document Backend" ), + QStringLiteral("0.1.1"), + i18n( "A renderer for Plucker eBooks" ), + KAboutLicense::GPL, + i18n( "© 2007-2008 Tobias Koenig" ) ); - aboutData.addAuthor( ki18n( "Tobias Koenig" ), KLocalizedString(), "tokoe@kde.org" ); + aboutData.addAuthor( QStringLiteral("Tobias Koenig" ), QString(), QStringLiteral("tokoe@kde.org") ); return aboutData; } diff --git a/generators/tiff/generator_tiff.cpp b/generators/tiff/generator_tiff.cpp index bc692dec3..930ed430d 100644 --- a/generators/tiff/generator_tiff.cpp +++ b/generators/tiff/generator_tiff.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -161,16 +161,15 @@ static Okular::Rotation readTiffRotation( TIFF *tiff ) static KAboutData createAboutData() { KAboutData aboutData( - "okular_tiff", - "okular_tiff", - ki18n( "TIFF Backend" ), - "0.2.4", - ki18n( "A TIFF backend" ), - KAboutData::License_GPL, - ki18n( "© 2006-2008 Pino Toscano" ), - ki18nc( "This represents the libtiff version, as string with copyrights as well; can be left as-is.", "%1" ).subs( TIFFGetVersion() ) + QStringLiteral("okular_tiff"), + i18n( "TIFF Backend" ), + QStringLiteral("0.2.4"), + i18n( "A TIFF backend" ), + KAboutLicense::GPL, + i18n( "© 2006-2008 Pino Toscano" ), + i18nc( "This represents the libtiff version, as string with copyrights as well; can be left as-is.", "%1" ).arg( TIFFGetVersion() ) ); - aboutData.addAuthor( ki18n( "Pino Toscano" ), KLocalizedString(), "pino@kde.org" ); + aboutData.addAuthor( QStringLiteral( "Pino Toscano" ), QString(), QStringLiteral("pino@kde.org") ); return aboutData; } diff --git a/generators/xps/generator_xps.cpp b/generators/xps/generator_xps.cpp index 2399a9656..8be109cc4 100644 --- a/generators/xps/generator_xps.cpp +++ b/generators/xps/generator_xps.cpp @@ -42,19 +42,18 @@ const int XpsDebug = 4712; static KAboutData createAboutData() { KAboutData aboutData( - "okular_xps", - "okular_xps", - ki18n( "XPS Backend" ), - "0.3.3", - ki18n( "An XPS backend" ), - KAboutData::License_GPL, - ki18n( "© 2006-2007 Brad Hards\n" + QStringLiteral("okular_xps"), + i18n( "XPS Backend" ), + QStringLiteral("0.3.3"), + i18n( "An XPS backend" ), + KAboutLicense::GPL, + i18n( "© 2006-2007 Brad Hards\n" "© 2007 Jiri Klement\n" "© 2008 Pino Toscano" ) ); - aboutData.addAuthor( ki18n( "Brad Hards" ), KLocalizedString(), "bradh@frogmouth.net" ); - aboutData.addAuthor( ki18n( "Jiri Klement" ), KLocalizedString(), "jiri.klement@gmail.com" ); - aboutData.addAuthor( ki18n( "Pino Toscano" ), KLocalizedString(), "pino@kde.org" ); + aboutData.addAuthor( QStringLiteral( "Brad Hards" ), QString(), QStringLiteral("bradh@frogmouth.net") ); + aboutData.addAuthor( QStringLiteral( "Jiri Klement" ), QString(), QStringLiteral("jiri.klement@gmail.com") ); + aboutData.addAuthor( QStringLiteral( "Pino Toscano" ), QString(), QStringLiteral("pino@kde.org") ); return aboutData; }