diff options
Diffstat (limited to 'filters')
28 files changed, 57 insertions, 57 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) ); } diff --git a/filters/kformula/latex/latexexport.cpp b/filters/kformula/latex/latexexport.cpp index d47e36bd..6c0c3428 100644 --- a/filters/kformula/latex/latexexport.cpp +++ b/filters/kformula/latex/latexexport.cpp @@ -72,7 +72,7 @@ KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQ return KoFilter::FileNotFound; } - KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 ); + KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 ); KFormula::Document* doc = new KFormula::Document; wrapper->document( doc ); KFormula::Container* formula = doc->createFormula(); diff --git a/filters/kformula/mathml/mathmlexport.cpp b/filters/kformula/mathml/mathmlexport.cpp index 37951d2d..cf0f307a 100644 --- a/filters/kformula/mathml/mathmlexport.cpp +++ b/filters/kformula/mathml/mathmlexport.cpp @@ -72,7 +72,7 @@ KoFilter::ConversionStatus MathMLExport::convert( const TQCString& from, const T return KoFilter::FileNotFound; } - KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 ); + KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 ); KFormula::Document* doc = new KFormula::Document; wrapper->document( doc ); KFormula::Container* formula = doc->createFormula(); diff --git a/filters/kformula/mathml/mathmlimport.cpp b/filters/kformula/mathml/mathmlimport.cpp index b8fa07ed..a204e0a4 100644 --- a/filters/kformula/mathml/mathmlimport.cpp +++ b/filters/kformula/mathml/mathmlimport.cpp @@ -59,7 +59,7 @@ KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const T return KoFilter::FileNotFound; } - KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 ); + KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 ); KFormula::Document* doc = new KFormula::Document; wrapper->document( doc ); KFormula::Container* formula = doc->createFormula(); diff --git a/filters/kformula/png/pngexport.cpp b/filters/kformula/png/pngexport.cpp index 47b0d316..820f8105 100644 --- a/filters/kformula/png/pngexport.cpp +++ b/filters/kformula/png/pngexport.cpp @@ -53,14 +53,14 @@ KoFilter::ConversionStatus PNGExport::convert( const TQCString& from, const TQCS KoStoreDevice* in = m_chain->storageFile( "root", KoStore::Read ); if(!in) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); KMessageBox::error( 0, i18n( "Failed to read data." ), i18n( "PNG Export Error" ) ); return KoFilter::FileNotFound; } TQDomDocument dom( "KFORMULA" ); if ( !dom.setContent( in, false ) ) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); KMessageBox::error( 0, i18n( "Malformed XML data." ), i18n( "PNG Export Error" ) ); return KoFilter::WrongFormat; } diff --git a/filters/kformula/png/pngexportdia.cpp b/filters/kformula/png/pngexportdia.cpp index c63d276d..18d76221 100644 --- a/filters/kformula/png/pngexportdia.cpp +++ b/filters/kformula/png/pngexportdia.cpp @@ -43,8 +43,8 @@ PNGExportDia::PNGExportDia( const TQDomDocument &dom, const TQString &outFile, T : KDialogBase( parent, name, true, i18n("PNG Export Filter Parameters" ), Ok|Cancel ), _fileOut( outFile ) { - kapp->restoreOverrideCursor(); - wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 ); + tdeApp->restoreOverrideCursor(); + wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 ); KFormula::Document* doc = new KFormula::Document; wrapper->document( doc ); formula = doc->createFormula(); diff --git a/filters/kformula/svg/svgexport.cpp b/filters/kformula/svg/svgexport.cpp index 35896ac1..62e20620 100644 --- a/filters/kformula/svg/svgexport.cpp +++ b/filters/kformula/svg/svgexport.cpp @@ -69,7 +69,7 @@ SvgExport::convert(const TQCString& from, const TQCString& to) TQDomElement docNode = domIn.documentElement(); // Read the document from the XML tree. - KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 ); + KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 ); KFormula::Document* kformulaDoc = new KFormula::Document; wrapper->document( kformulaDoc ); KFormula::Container* formula = kformulaDoc->createFormula(); diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.cpp b/filters/kivio/imageexport/kivio_imageexportdialog.cpp index 1ed8fc0d..84001c81 100644 --- a/filters/kivio/imageexport/kivio_imageexportdialog.cpp +++ b/filters/kivio/imageexport/kivio_imageexportdialog.cpp @@ -34,7 +34,7 @@ namespace Kivio ImageExportDialog::ImageExportDialog(TQWidget* parent, const char* name) : KDialogBase(parent, name, false, i18n("Export to Image"), Ok|Cancel) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); m_mainWidget = new ImageExportWidget(this); setMainWidget(m_mainWidget); } diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index ed65970d..914f75b4 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -57,7 +57,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /* m_codec( TQTextCodec::codecForName( "UTF-8" ) ) { setCaption( i18n( "Import" ) ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQStringList encodings; encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); @@ -113,12 +113,12 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /* CSVDialog::~CSVDialog() { saveSettings(); - kapp->setOverrideCursor(TQt::waitCursor); + tdeApp->setOverrideCursor(TQt::waitCursor); } void CSVDialog::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("CSVDialog Settings"); m_textquote = config->readEntry("textquote", "\"")[0]; m_delimiter = config->readEntry("delimiter", ","); @@ -145,7 +145,7 @@ void CSVDialog::loadSettings() void CSVDialog::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("CSVDialog Settings"); TQString q = m_textquote; config->writeEntry("textquote", q); @@ -165,7 +165,7 @@ void CSVDialog::fillTable( ) TQChar x; TQString field; - kapp->setOverrideCursor(TQt::waitCursor); + tdeApp->setOverrideCursor(TQt::waitCursor); for (row = 0; row < m_dialog->m_sheet->numRows(); ++row) for (column = 0; column < m_dialog->m_sheet->numCols(); ++column) @@ -358,7 +358,7 @@ void CSVDialog::fillTable( ) } fillComboBox(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } void CSVDialog::fillComboBox() diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index 10a692c9..2b40f438 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -54,7 +54,7 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent ) m_delimiter( "," ), m_textquote('"') { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQStringList encodings; encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); @@ -96,13 +96,13 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent ) CSVExportDialog::~CSVExportDialog() { saveSettings(); - kapp->setOverrideCursor(TQt::waitCursor); + tdeApp->setOverrideCursor(TQt::waitCursor); delete m_delimiterValidator; } void CSVExportDialog::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("CSVDialog Settings"); m_textquote = config->readEntry("textquote", "\"")[0]; m_delimiter = config->readEntry("delimiter", ","); @@ -136,7 +136,7 @@ void CSVExportDialog::loadSettings() void CSVExportDialog::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("CSVDialog Settings"); TQString q = m_textquote; config->writeEntry("textquote", q); diff --git a/filters/kspread/html/exportdialog.cpp b/filters/kspread/html/exportdialog.cpp index f0dd28d2..b79263ca 100644 --- a/filters/kspread/html/exportdialog.cpp +++ b/filters/kspread/html/exportdialog.cpp @@ -35,7 +35,7 @@ ExportDialog::ExportDialog( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n("Export Sheet to HTML"), Ok|Cancel, No, true ), m_mainwidget( new ExportWidget( this ) ) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); connect( m_mainwidget->mCustomButton, TQ_SIGNAL( toggled( bool ) ), m_mainwidget->mCustomURL, TQ_SLOT( setEnabled( bool ) ) ); @@ -58,7 +58,7 @@ void ExportDialog::selectAll() ExportDialog::~ExportDialog() { - kapp->setOverrideCursor(TQt::waitCursor); + tdeApp->setOverrideCursor(TQt::waitCursor); } TQTextCodec *ExportDialog::encoding() const diff --git a/filters/kspread/latex/export/formula.cpp b/filters/kspread/latex/export/formula.cpp index 1d805a2a..43e39ffe 100644 --- a/filters/kspread/latex/export/formula.cpp +++ b/filters/kspread/latex/export/formula.cpp @@ -155,7 +155,7 @@ void Formula::generate(TQTextStream &out) // a new KFormula::Document for every formula is not the best idea. // better to have only one such beast for the whole document. - KFormula::Document formulaDoc( kapp->sessionConfig() ); + KFormula::Document formulaDoc( tdeApp->sessionConfig() ); KFormula::Container* formula = new KFormula::Container( &formulaDoc ); if ( !formula->load( doc ) ) { diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp index b088afe1..2b383b7e 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp @@ -61,7 +61,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare { int i = 0; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); /* Recent files */ _config = new TDEConfig("kspreadlatexexportdialog"); @@ -82,10 +82,10 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare } _iface = new LatexExportIface(this); - if(!kapp->dcopClient()->isRegistered() ) + if(!tdeApp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs("FilterConfigDia"); - kapp->dcopClient()->setDefaultObject(_iface->objId()); + tdeApp->dcopClient()->registerAs("FilterConfigDia"); + tdeApp->dcopClient()->setDefaultObject(_iface->objId()); } /* All these items inserted must not be translated so they are inserted here diff --git a/filters/kword/ascii/ExportDialog.cpp b/filters/kword/ascii/ExportDialog.cpp index 577fb72b..011995a0 100644 --- a/filters/kword/ascii/ExportDialog.cpp +++ b/filters/kword/ascii/ExportDialog.cpp @@ -38,7 +38,7 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent) m_dialog(new ExportDialogUI(this)) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQStringList encodings; encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); @@ -58,7 +58,7 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent) AsciiExportDialog :: ~AsciiExportDialog(void) { - kapp->setOverrideCursor(TQt::waitCursor); + tdeApp->setOverrideCursor(TQt::waitCursor); } TQTextCodec* AsciiExportDialog::getCodec(void) const diff --git a/filters/kword/ascii/ImportDialog.cpp b/filters/kword/ascii/ImportDialog.cpp index 09c81a09..269a4b99 100644 --- a/filters/kword/ascii/ImportDialog.cpp +++ b/filters/kword/ascii/ImportDialog.cpp @@ -38,7 +38,7 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent) m_dialog(new ImportDialogUI(this)) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQStringList encodings; encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); @@ -57,7 +57,7 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent) AsciiImportDialog :: ~AsciiImportDialog(void) { - kapp->setOverrideCursor(TQt::waitCursor); + tdeApp->setOverrideCursor(TQt::waitCursor); } TQTextCodec* AsciiImportDialog::getCodec(void) const diff --git a/filters/kword/html/export/ExportDialog.cpp b/filters/kword/html/export/ExportDialog.cpp index 2da90934..9b071571 100644 --- a/filters/kword/html/export/ExportDialog.cpp +++ b/filters/kword/html/export/ExportDialog.cpp @@ -42,7 +42,7 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent) m_dialog(new ExportDialogUI(this)) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQStringList encodingList; @@ -64,7 +64,7 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent) HtmlExportDialog :: ~HtmlExportDialog(void) { - kapp->setOverrideCursor(TQt::waitCursor); + tdeApp->setOverrideCursor(TQt::waitCursor); } void HtmlExportDialog::setCSSEnabled( bool b ) diff --git a/filters/kword/latex/export/formula.cpp b/filters/kword/latex/export/formula.cpp index 98f17379..324301b1 100644 --- a/filters/kword/latex/export/formula.cpp +++ b/filters/kword/latex/export/formula.cpp @@ -165,7 +165,7 @@ void Formula::generate(TQTextStream &out) // a new KFormula::Document for every formula is not the best idea. // better to have only one such beast for the whole document. - KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 ); + KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 ); KFormula::Document* formulaDoc = new KFormula::Document; wrapper->document( formulaDoc ); diff --git a/filters/kword/latex/export/kwordlatexexportdia.cpp b/filters/kword/latex/export/kwordlatexexportdia.cpp index 3498bcdb..69f596bd 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cpp +++ b/filters/kword/latex/export/kwordlatexexportdia.cpp @@ -62,7 +62,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent, { int i = 0; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); pathPictures->setMode(KFile::Directory); /* Recent files */ @@ -84,10 +84,10 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent, } _iface = new LatexExportIface(this); - if(!kapp->dcopClient()->isRegistered() ) + if(!tdeApp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs("FilterConfigDia"); - kapp->dcopClient()->setDefaultObject(_iface->objId()); + tdeApp->dcopClient()->registerAs("FilterConfigDia"); + tdeApp->dcopClient()->setDefaultObject(_iface->objId()); } /* All these items inserted must not be translated so they are inserted here diff --git a/filters/kword/latex/import/lateximportdia.cpp b/filters/kword/latex/import/lateximportdia.cpp index f0dd908b..24dd0aa9 100644 --- a/filters/kword/latex/import/lateximportdia.cpp +++ b/filters/kword/latex/import/lateximportdia.cpp @@ -50,12 +50,12 @@ LATEXImportDia::LATEXImportDia(KoStore* out, TQWidget *parent, const char *name) DCOPObject("FilterConfigDia"), _out(out) { _out = out; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); createDialog(); - if(!kapp->dcopClient()->isRegistered() ) + if(!tdeApp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs("FilterConfigDia"); - kapp->dcopClient()->setDefaultObject(objId()); + tdeApp->dcopClient()->registerAs("FilterConfigDia"); + tdeApp->dcopClient()->setDefaultObject(objId()); } } diff --git a/filters/kword/mswrite/ImportDialog.cpp b/filters/kword/mswrite/ImportDialog.cpp index f5ca040f..65eea56a 100644 --- a/filters/kword/mswrite/ImportDialog.cpp +++ b/filters/kword/mswrite/ImportDialog.cpp @@ -39,7 +39,7 @@ MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent) : KDialogBase(parent, 0, true, i18n("KWord's MS Write Import Filter"), Ok|Cancel, No, true), m_dialog(new ImportDialogUI(this)) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); m_dialog->comboBoxEncoding->insertStringList(TDEGlobal::charsets()->availableEncodingNames()); //m_dialog->comboBoxEncoding->insertStringList(TDEGlobal::charsets()->descriptiveEncodingNames()); @@ -54,7 +54,7 @@ MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent) MSWriteImportDialog :: ~MSWriteImportDialog(void) { - kapp->setOverrideCursor(TQt::waitCursor); + tdeApp->setOverrideCursor(TQt::waitCursor); } TQTextCodec* MSWriteImportDialog::getCodec(void) const diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp index 6c455e04..ffb621cd 100644 --- a/filters/libdialogfilter/exportsizedia.cpp +++ b/filters/libdialogfilter/exportsizedia.cpp @@ -41,7 +41,7 @@ ExportSizeDia::ExportSizeDia( int width, int height, : KDialogBase( parent, name, true, i18n("Export Filter Parameters" ), Ok|Cancel ) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); setupGUI(); diff --git a/filters/xsltfilter/export/xsltexportdia.cpp b/filters/xsltfilter/export/xsltexportdia.cpp index bf141f90..054a4517 100644 --- a/filters/xsltfilter/export/xsltexportdia.cpp +++ b/filters/xsltfilter/export/xsltexportdia.cpp @@ -56,7 +56,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge _format = format; setCaption(i18n("Export XSLT Configuration")); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); /* Recent files */ _config = new TDEConfig("xsltdialog"); diff --git a/filters/xsltfilter/import/xsltimportdia.cpp b/filters/xsltfilter/import/xsltimportdia.cpp index 9052e4ec..7877bb58 100644 --- a/filters/xsltfilter/import/xsltimportdia.cpp +++ b/filters/xsltfilter/import/xsltimportdia.cpp @@ -102,7 +102,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* pa } xsltList->insertStringList(_namesList); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } /* @@ -200,7 +200,7 @@ void XSLTImportDia::chooseCommonSlot() */ void XSLTImportDia::okSlot() { - kapp->setOverrideCursor(TQCursor(TQt::WaitCursor)); + tdeApp->setOverrideCursor(TQCursor(TQt::WaitCursor)); hide(); if(_currentFile.url().isEmpty()) return; |