Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 10 insertions, 10 deletions

diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cpp b/filters/chalk/gmagick/kis_image_magick_converter.cpp
index f25449ec..01e1ee14 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cpp
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cpp
@@ -309,7 +309,7 @@ namespace {
         static bool init = false;
 
         if (!init) {
-            TDEApplication *app = TDEApplication::kApplication();
+            TDEApplication *app = tdeApp;
 
             InitializeMagick(*app -> argv());
             atexit(DestroyMagick);
@@ -330,7 +330,7 @@ namespace {
 #if 0
     MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
-        TDEApplication *app = TDEApplication::kApplication();
+        TDEApplication *app = tdeApp;
 
         Q_ASSERT(app);
 
@@ -343,7 +343,7 @@ namespace {
 #else
     unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
-        TDEApplication *app = TDEApplication::kApplication();
+        TDEApplication *app = tdeApp;
 
         Q_ASSERT(app);
 
diff --git a/filters/chalk/jpeg/kis_jpeg_export.cpp b/filters/chalk/jpeg/kis_jpeg_export.cpp
index 042a3c8e..e876fe1a 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.cpp
+++ b/filters/chalk/jpeg/kis_jpeg_export.cpp
@@ -97,7 +97,7 @@ KoFilter::ConversionStatus KisJPEGExport::convert(const TQCString& from, const T
  
     KisWdgOptionsJPEG* wdg = new KisWdgOptionsJPEG(kdb);
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     if(kdb->exec() == TQDialog::Rejected)
     {
         return KoFilter::OK; // FIXME Cancel doesn't exist :(
diff --git a/filters/chalk/magick/kis_image_magick_converter.cpp b/filters/chalk/magick/kis_image_magick_converter.cpp
index 5f8bafa3..5ea939e4 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cpp
+++ b/filters/chalk/magick/kis_image_magick_converter.cpp
@@ -257,7 +257,7 @@ namespace {
         static bool init = false;
 
         if (!init) {
-            TDEApplication *app = TDEApplication::kApplication();
+            TDEApplication *app = tdeApp;
 
             InitializeMagick(*app -> argv());
             atexit(DestroyMagick);
@@ -278,7 +278,7 @@ namespace {
 #ifdef HAVE_MAGICK6
     MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
-        TDEApplication *app = TDEApplication::kApplication();
+        TDEApplication *app = tdeApp;
 
         Q_ASSERT(app);
 
@@ -291,7 +291,7 @@ namespace {
 #else
     unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
-        TDEApplication *app = TDEApplication::kApplication();
+        TDEApplication *app = tdeApp;
 
         Q_ASSERT(app);
 
diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp
index efcc4ad6..c1822ebb 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -112,7 +112,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ
     
     KisPDFImportWidget* wdg = new KisPDFImportWidget(pdoc, kdb);
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     if(kdb->exec() == TQDialog::Rejected)
     {
         delete pdoc;
diff --git a/filters/chalk/png/kis_png_export.cpp b/filters/chalk/png/kis_png_export.cpp
index bb071ff2..f2fb548c 100644
--- a/filters/chalk/png/kis_png_export.cpp
+++ b/filters/chalk/png/kis_png_export.cpp
@@ -89,7 +89,7 @@ KoFilter::ConversionStatus KisPNGExport::convert(const TQCString& from, const TQ
     wdg->alpha->setChecked(isThereAlpha);
     wdg->alpha->setEnabled(isThereAlpha);
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     if(kdb->exec() == TQDialog::Rejected)
     {
         return KoFilter::OK; // FIXME Cancel doesn't exist :(
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
index 43857e9b..e0f5ba91 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
@@ -38,7 +38,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name)
     connect(optionswdg->kComboBoxCompressionType, TQ_SIGNAL(activated ( int )), this, TQ_SLOT(activated ( int ) ));
     connect(optionswdg->flatten, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(flattenToggled( bool) ) );
     setMainWidget(optionswdg);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
 }