Remove unneeded kapplication.h includes

krita/plugins/formats/bmp/kis_bmp_export.cpp

@@ -22,7 +22,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/bmp/kis_bmp_import.cpp

@@ -21,10 +21,10 @@
 
 #include <QCheckBox>
 #include <QSlider>
+#include <QApplication>
 
 #include <kio/netaccess.h>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/exr/exr_converter.cc

@@ -30,7 +30,8 @@
 #include <ImfStringAttribute.h>
 #include "exr_extra_tags.h"
 
-#include <kapplication.h>
+#include <QApplication>
+
 #include <kmessagebox.h>
 
 #include <kio/netaccess.h>

krita/plugins/formats/exr/exr_export.cc

@@ -21,8 +21,8 @@
 
 #include <QCheckBox>
 #include <QSlider>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 
@@ -84,7 +84,7 @@ KoFilter::ConversionStatus exrExport::convert(const QByteArray& from, const QByt
     widget.flatten->setChecked(cfg.getBool("flatten", false));
 
     if (!m_chain->manager()->getBatchMode() ) {
-        kapp->restoreOverrideCursor();
+        qApp->restoreOverrideCursor();
         if (dialog.exec() == QDialog::Rejected) {
             return KoFilter::UserCancelled;
         }

krita/plugins/formats/flipbook/kis_flipbook_import.cpp

@@ -22,7 +22,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/heightmap/kis_heightmap_export.cpp

@@ -20,9 +20,9 @@
 
 #include <qendian.h>
 #include <QDataStream>
+#include <QApplication>
 
 #include <kpluginfactory.h>
-#include <kapplication.h>
 
 #include <KoColorSpace.h>
 #include <KoColorSpaceConstants.h>
@@ -94,7 +94,7 @@ KoFilter::ConversionStatus KisHeightMapExport::convert(const QByteArray& from, c
     optionsHeightMap.setupUi(wdg);
 
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    qApp->restoreOverrideCursor();
 
     QString filterConfig = KisConfig().exportConfiguration("HeightMap");
     KisPropertiesConfiguration cfg;

krita/plugins/formats/heightmap/kis_heightmap_import.cpp

@@ -26,7 +26,6 @@
 #include <qendian.h>
 #include <QCursor>
 
-#include <kapplication.h>
 #include <kpluginfactory.h>
 
 #include <KoFilterManager.h>
@@ -103,7 +102,7 @@ KoFilter::ConversionStatus KisHeightMapImport::convert(const QByteArray& from, c
         return KoFilter::FileNotFound;
     }
 
-    kapp->restoreOverrideCursor();
+    qApp->restoreOverrideCursor();
 
     KDialog* kdb = new KDialog(0);
     kdb->setWindowTitle(i18n("R16 HeightMap Import Options"));

krita/plugins/formats/jp2/jp2_converter.cc

@@ -21,8 +21,8 @@
 #include <openjpeg.h>
 
 #include <QFileInfo>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <kmessagebox.h>
 
 #include <kio/netaccess.h>

krita/plugins/formats/jp2/jp2_export.cc

@@ -20,8 +20,8 @@
 
 #include <QCheckBox>
 #include <QSlider>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 
@@ -88,7 +88,7 @@ KoFilter::ConversionStatus jp2Export::convert(const QByteArray& from, const QByt
     optionsJP2.qualityLevel->setValue(cfg.getInt("quality", 100));
     
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    qApp->restoreOverrideCursor();
 
     if (!m_chain->manager()->getBatchMode()) {
         if (kdb->exec() == QDialog::Rejected) {

krita/plugins/formats/jpeg/kis_jpeg_converter.cc

@@ -36,8 +36,8 @@ extern "C" {
 
 #include <QFile>
 #include <QBuffer>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kde_file.h>

krita/plugins/formats/jpeg/kis_jpeg_export.cc

@@ -24,8 +24,8 @@
 #include <QColor>
 #include <QString>
 #include <QStringList>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 #include <kcolorbutton.h>
@@ -115,7 +115,7 @@ KoFilter::ConversionStatus KisJPEGExport::convert(const QByteArray& from, const
     frm.setEnabledFilters(cfg.getString("filters").split(','));
 
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    qApp->restoreOverrideCursor();
 
     if (!m_chain->manager()->getBatchMode()) {
         if (kdb->exec() == QDialog::Rejected) {

krita/plugins/formats/kranimseq/kranim_sequence.cpp

@@ -22,7 +22,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/oiio/kis_oiio_export.cpp

@@ -22,7 +22,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/oiio/kis_oiio_import.cpp

@@ -24,7 +24,6 @@
 
 #include <kio/netaccess.h>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/ora/ora_converter.cc

@@ -17,7 +17,7 @@
 
 #include "ora_converter.h"
 
-#include <kapplication.h>
+#include <QApplication>
 
 #include <kio/netaccess.h>
 

krita/plugins/formats/ora/ora_export.cc

@@ -20,7 +20,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 #include <kmessagebox.h>

krita/plugins/formats/pdf/kis_pdf_import.cpp

@@ -27,9 +27,9 @@
 #include <QFile>
 #include <QImage>
 #include <QRadioButton>
+#include <QApplication>
 
 // KDE's headers
-#include <kapplication.h>
 #include <kis_debug.h>
 #include <kis_paint_device.h>
 #include <kdialog.h>
@@ -120,7 +120,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const QByteArray& , const Q
 
     KisPDFImportWidget* wdg = new KisPDFImportWidget(pdoc, kdb);
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    qApp->restoreOverrideCursor();
     if (kdb->exec() == QDialog::Rejected) {
         delete pdoc;
         delete kdb;

krita/plugins/formats/png/kis_png_export.cc

@@ -21,8 +21,8 @@
 
 #include <QCheckBox>
 #include <QSlider>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 #include <kmessagebox.h>
@@ -170,7 +170,7 @@ KoFilter::ConversionStatus KisPNGExport::convert(const QByteArray& from, const Q
         wdg->bnTransparencyFillColor->setColor(QColor(rgb[0].toInt(), rgb[1].toInt(), rgb[2].toInt()));
 
         kdb->setMainWidget(wdg);
-        kapp->restoreOverrideCursor();
+        qApp->restoreOverrideCursor();
         if (hasVisibleWidgets()) {
             if (!m_chain->manager()->getBatchMode()) {
                 if (kdb->exec() == QDialog::Rejected) {

krita/plugins/formats/ppm/kis_ppm_export.cpp

@@ -19,7 +19,6 @@
 #include "kis_ppm_export.h"
 
 #include <kpluginfactory.h>
-#include <kapplication.h>
 
 #include <KoColorSpace.h>
 #include <KoColorSpaceConstants.h>
@@ -42,6 +41,9 @@
 #include <KoColorModelStandardIds.h>
 #include "kis_iterator_ng.h"
 
+#include <QApplication>
+
+
 K_PLUGIN_FACTORY(KisPPMExportFactory, registerPlugin<KisPPMExport>();)
 K_EXPORT_PLUGIN(KisPPMExportFactory("krita"))
 
@@ -160,7 +162,7 @@ KoFilter::ConversionStatus KisPPMExport::convert(const QByteArray& from, const Q
     optionsPPM.setupUi(wdg);
 
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    qApp->restoreOverrideCursor();
 
     QString filterConfig = KisConfig().exportConfiguration("PPM");
     KisPropertiesConfiguration cfg;

krita/plugins/formats/psd/psd_export.cc

@@ -20,7 +20,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 #include <kmessagebox.h>

krita/plugins/formats/psd/psd_loader.cpp

@@ -17,7 +17,7 @@
  */
 #include "psd_loader.h"
 
-#include <kapplication.h>
+#include <QApplication>
 
 #include <kio/netaccess.h>
 

krita/plugins/formats/psd/psd_saver.cpp

@@ -17,8 +17,6 @@
  */
 #include "psd_saver.h"
 
-#include <kapplication.h>
-
 #include <KoColorSpace.h>
 #include <KoColorModelStandardIds.h>
 #include <KoColorProfile.h>

krita/plugins/formats/qml/qml_converter.cc

@@ -20,7 +20,6 @@
 #include <QFileInfo>
 #include <QDir>
 
-#include <kapplication.h>
 #include <kurl.h>
 
 #include <kis_image.h>

krita/plugins/formats/qml/qml_export.cc

@@ -20,7 +20,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/tga/kis_tga_export.cpp

@@ -22,7 +22,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/tga/kis_tga_import.cpp

@@ -22,10 +22,10 @@
 #include <QCheckBox>
 #include <QBuffer>
 #include <QSlider>
+#include <QApplication>
 
 #include <kio/netaccess.h>
 
-#include <kapplication.h>
 #include <kdialog.h>
 #include <kpluginfactory.h>
 

krita/plugins/formats/tiff/kis_dlg_options_tiff.cpp

@@ -23,8 +23,8 @@
 #include <QGroupBox>
 #include <QSlider>
 #include <QStackedWidget>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <kcombobox.h>
 #include <klocale.h>
 
@@ -45,7 +45,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(QWidget *parent)
     connect(optionswdg->kComboBoxCompressionType, SIGNAL(activated(int)), this, SLOT(activated(int)));
     connect(optionswdg->flatten, SIGNAL(toggled(bool)), this, SLOT(flattenToggled(bool)));
     setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    qApp->restoreOverrideCursor();
     setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
 
     QString filterConfig = KisConfig().exportConfiguration("TIFF");

krita/plugins/formats/tiff/kis_tiff_converter.cc

@@ -22,8 +22,8 @@
 #include <stdio.h>
 
 #include <QFile>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <KoDocumentInfo.h>
 
 #include <kio/netaccess.h>

krita/plugins/formats/tiff/kis_tiff_export.cc

@@ -22,7 +22,6 @@
 #include <QCheckBox>
 #include <QSlider>
 
-#include <kapplication.h>
 #include <kpluginfactory.h>
 
 #include <KoFilterChain.h>

krita/sdk/tests/filestest.h

@@ -27,7 +27,6 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kmimetype.h>
-#include <kapplication.h>
 #include <kdebug.h>
 #include <kio/job.h>
 

krita/ui/dialogs/kis_dlg_preferences.cc

@@ -52,7 +52,6 @@
 #include <KoIcon.h>
 #include <KoConfig.h>
 
-#include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <klineedit.h>

krita/ui/kis_import_catcher.cc

@@ -23,7 +23,6 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kmimetype.h>
-#include <kapplication.h>
 #include <kdebug.h>
 #include <kio/job.h>
 

krita/ui/kis_part2.cpp

@@ -40,7 +40,6 @@
 #include <KoShapeBasedDocumentBase.h>
 #include <KoResourceServerProvider.h>
 
-#include <kapplication.h>
 #include <kmessagebox.h>
 
 #include <QApplication>

krita/ui/kis_png_converter.cpp

@@ -34,8 +34,8 @@
 
 #include <QBuffer>
 #include <QFile>
+#include <QApplication>
 
-#include <kapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kio/netaccess.h>

krita/ui/kis_view2.cpp

@@ -121,7 +121,6 @@
 #include "widgets/kis_floating_message.h"
 
 #include <QPoint>
-#include <kapplication.h>
 #include "kis_node_commands_adapter.h"
 #include <kis_paintop_preset.h>
 #include "kis_favorite_resource_manager.h"

krita/ui/widgets/kis_floating_message.cpp

@@ -31,7 +31,6 @@
 #include <QTimer>
 #include <QRegExp>
 
-#include <kapplication.h>
 #include <kwindowsystem.h>
 
 #include <KoIcon.h>

libs/odf/tests/TestStorage.cpp

@@ -21,7 +21,6 @@
 #include <QFile>
 #include <QDir>
 #include <kcmdlineargs.h>
-#include <kapplication.h>
 
 #include <KoStore.h>
 #include <KoEncryptionChecker.h>

plugins/chartshape/ChartShape.cpp

@@ -36,7 +36,6 @@
 
 // KDE
 #include <kdebug.h>
-#include <kapplication.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kurl.h>