diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 23:57:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 23:57:47 -0600 |
| commit | 6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch) | |
| tree | 7e66b929b5455837f22ea54ed91fc9af6f64f7bf /filters | |
| parent | 68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff) | |
| download | koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'filters')
| -rw-r--r-- | filters/chalk/gmagick/kis_image_magick_converter.cc | 6 | ||||
| -rw-r--r-- | filters/chalk/magick/kis_image_magick_converter.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index 22982cc5..59f35ce3 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -309,7 +309,7 @@ namespace { static bool init = false; if (!init) { - KApplication *app = KApplication::kApplication(); + TDEApplication *app = TDEApplication::kApplication(); InitializeMagick(*app -> argv()); atexit(DestroyMagick); @@ -330,7 +330,7 @@ namespace { #if 0 MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *) { - KApplication *app = KApplication::kApplication(); + TDEApplication *app = TDEApplication::kApplication(); Q_ASSERT(app); @@ -343,7 +343,7 @@ namespace { #else unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *) { - KApplication *app = KApplication::kApplication(); + TDEApplication *app = TDEApplication::kApplication(); Q_ASSERT(app); diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index ec70f179..e83bbe56 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -257,7 +257,7 @@ namespace { static bool init = false; if (!init) { - KApplication *app = KApplication::kApplication(); + TDEApplication *app = TDEApplication::kApplication(); InitializeMagick(*app -> argv()); atexit(DestroyMagick); @@ -278,7 +278,7 @@ namespace { #ifdef HAVE_MAGICK6 MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *) { - KApplication *app = KApplication::kApplication(); + TDEApplication *app = TDEApplication::kApplication(); Q_ASSERT(app); @@ -291,7 +291,7 @@ namespace { #else unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *) { - KApplication *app = KApplication::kApplication(); + TDEApplication *app = TDEApplication::kApplication(); Q_ASSERT(app); |